修改应用配置（通过平台也给选择服务商）

happy-cloud-wisdom/happy-cloud-wisdom-biz/src/main/java/org/jeecg/modules/hlwapplication/entity/HlwApplicationSetting.java

@@ -127,4 +127,8 @@ public class HlwApplicationSetting implements Serializable {
     @TableField(exist = false)
     List<Integer>  subIdList;  //用于应用配置里面checkbox服务商value
 
+
+    @TableField(exist = false)
+    List<Integer>  cpSubIdList;  //用于应用配置里面checkbox服务商value(通过平台)
+
 }

happy-cloud-wisdom/happy-cloud-wisdom-biz/src/main/java/org/jeecg/modules/hlwapplication/entity/HlwApplicationSubcontractor.java

@@ -43,4 +43,9 @@ public class HlwApplicationSubcontractor implements Serializable {
 	@Excel(name = "服务商id", width = 15)
     @ApiModelProperty(value = "服务商id")
     private Integer subcontractorId;
+    /**服务商id*/
+    @Excel(name = "服务商id", width = 15)
+    @ApiModelProperty(value = "服务商id")
+    private Integer cpId;
+
 }

happy-cloud-wisdom/happy-cloud-wisdom-biz/src/main/java/org/jeecg/modules/hlwapplication/service/impl/HlwApplicationSettingServiceImpl.java

@@ -8,6 +8,8 @@ import org.jeecg.modules.hlwapplication.entity.HlwApplicationSubcontractor;
 import org.jeecg.modules.hlwapplication.mapper.HlwApplicationSettingMapper;
 import org.jeecg.modules.hlwapplication.service.IHlwApplicationSettingService;
 import org.jeecg.modules.hlwapplication.service.IHlwApplicationSubcontractorService;
+import org.jeecg.modules.hlwcpmanager.entity.HlwCpSetting;
+import org.jeecg.modules.hlwcpmanager.service.IHlwCpSettingService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -23,8 +25,10 @@ import java.util.List;
  */
 @Service
 public class HlwApplicationSettingServiceImpl extends ServiceImpl<HlwApplicationSettingMapper, HlwApplicationSetting> implements IHlwApplicationSettingService {
-@Autowired
-private IHlwApplicationSubcontractorService hlwApplicationSubcontractorService;
+    @Autowired
+    private IHlwApplicationSubcontractorService hlwApplicationSubcontractorService;
+    @Autowired
+    private IHlwCpSettingService hlwCpSettingService;
     /**
      * 通过搜索条件
      *
@@ -46,6 +50,7 @@ private IHlwApplicationSubcontractorService hlwApplicationSubcontractorService;
     public void updateHlwApplicationSettingById(HlwApplicationSetting hlwApplicationSetting) {
         updateById(hlwApplicationSetting);
         hlwApplicationSubcontractorService.deleteHlwApplicationSubcontractorByAppId(hlwApplicationSetting.getId());
+        //保存不通过平台服务商
         if(hlwApplicationSetting.getIsThroughPlatform().contains("0")){
             if(hlwApplicationSetting.getSubIdList()!=null){
                 for (int i = 0; i <hlwApplicationSetting.getSubIdList().size() ; i++) {
@@ -56,5 +61,18 @@ private IHlwApplicationSubcontractorService hlwApplicationSubcontractorService;
                 }
             }
         }
+        //保存通过平台服务商
+        if(hlwApplicationSetting.getIsThroughPlatform().contains("1")){
+            if(hlwApplicationSetting.getCpSubIdList()!=null){
+                for (int i = 0; i <hlwApplicationSetting.getCpSubIdList().size() ; i++) {
+                    List<HlwCpSetting> hlwCpSettingList=hlwCpSettingService.getCpSetting(new HlwCpSetting());
+                    HlwApplicationSubcontractor hlwApplicationSubcontractor=new HlwApplicationSubcontractor();
+                    hlwApplicationSubcontractor.setApplicationId(hlwApplicationSetting.getId());
+                    hlwApplicationSubcontractor.setSubcontractorId(hlwApplicationSetting.getCpSubIdList().get(i));
+                    hlwApplicationSubcontractor.setCpId(hlwCpSettingList.get(0).getId());
+                    hlwApplicationSubcontractorService.save(hlwApplicationSubcontractor);
+                }
+            }
+        }
     }
 }

happy-cloud-wisdom/happy-cloud-wisdom-biz/src/main/java/org/jeecg/modules/hlwsubcontractor/mapper/xml/HlwSubcontractorMapper.xml

@@ -79,13 +79,22 @@
 
 
     <select id="getSubNamelist" resultType="org.jeecg.modules.hlwsubcontractor.entity.HlwSubcontractor" >
-        SELECT
+        select t.* from
+        (SELECT
         a.name as "name",
         a.id as "id",
-        case when hs.subcontractor_id is not null then true else false end as "checked"
+        case when hs.subcontractor_id is not null then true else false end as "checked",
+        1 as "isCpOn"
         FROM hlw_subcontractor a
-        left join hlw_application_subcontractor hs on hs.subcontractor_id=a.id and hs.application_id=#{0}
-
+        left join hlw_application_subcontractor hs on hs.subcontractor_id=a.id and hs.application_id=#{0} and hs.cp_id is not null
+        union all
+         SELECT
+        a.name as "name",
+        a.id as "id",
+        case when hs.subcontractor_id is not null then true else false end as "checked",
+        0 as "isCpOn"
+        FROM hlw_subcontractor a
+        left join hlw_application_subcontractor hs on hs.subcontractor_id=a.id and hs.application_id=#{0} and hs.cp_id is  null) t;
     </select>