浏览代码

企业服务商账户管理所用去重平台服务商

LiFei 4 年之前
父节点
当前提交
b4759f6976

+ 2 - 0
happy-cloud-wisdom/happy-cloud-wisdom-biz/src/main/java/org/jeecg/modules/api/controller/HlwCompanySubcontractorApiController.java

@@ -97,11 +97,13 @@ public class HlwCompanySubcontractorApiController extends JeecgController<HlwCom
         Integer applicationId = jsonObject.getInteger("applicationId");
         Integer pageSize = jsonObject.getInteger("pageSize");
         Integer applicationType = jsonObject.getInteger("applicationType");
+        Integer repeatType = jsonObject.getInteger("repeatType");
         log.info("companyCode========={}", companyCode);
         //根据companyCode获取HlwCompany实体
         HlwCompany hlwCompany = hlwCompanyService.getByCompanyCode(companyCode);
         HlwCompanySubcontractor hlwCompanySubcontractor = new HlwCompanySubcontractor();
         hlwCompanySubcontractor.setCompanyId(hlwCompany.getId());
+        hlwCompanySubcontractor.setRepeatType(repeatType);
         if (hlwCompany != null) {
             if (pageSize == -1) {
                 //设置为“-1”表示不进行分页

+ 8 - 0
happy-cloud-wisdom/happy-cloud-wisdom-biz/src/main/java/org/jeecg/modules/hlwaccount/entity/HlwCompanySubcontractor.java

@@ -137,4 +137,12 @@ public class HlwCompanySubcontractor implements Serializable {
      */
     @TableField(exist = false)
     private Integer cpSubcontractorId;
+
+
+
+    /**
+     * 开心灵工所用(去掉通过平台重复的平台)
+     */
+    @TableField(exist = false)
+    private Integer repeatType;
 }

+ 3 - 0
happy-cloud-wisdom/happy-cloud-wisdom-biz/src/main/java/org/jeecg/modules/hlwaccount/mapper/xml/HlwCompanySubcontractorMapper.xml

@@ -87,6 +87,9 @@
         left join hlw_company_cp_subcontractor hccs on hccs.company_cp_id=b.id
         left join hlw_subcontractor hsa on hsa.id=hccs.subcontractor_id
         WHERE b.company_id = #{hlwCompanySubcontractor.companyId}
+        <if test="hlwCompanySubcontractor.repeatType!=null">
+            group by  b.id
+        </if>
         ) t
     </select>