1.自测发现的大屏企业数据过滤问题bug修改

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/java/com/yeejoin/amos/boot/module/statistics/api/dto/SkjsCompanyCountItemDto.java

@@ -50,11 +50,11 @@ public class SkjsCompanyCountItemDto {
     private String sjdw;
 
     public void setDefaultValues() {
-        this.sydw = "";
-        this.zzdw = "";
-        this.agwdw = "";
-        this.czdw = "";
-        this.jyjcjg = "";
-        this.sjdw = "";
+        this.sydw = "0";
+        this.zzdw = "0";
+        this.agwdw = "0";
+        this.czdw = "0";
+        this.jyjcjg = "0";
+        this.sjdw = "0";
     }
 }
\ No newline at end of file

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/java/com/yeejoin/amos/boot/module/statistics/api/dto/SkjsEquipCountItemDto.java

@@ -68,14 +68,14 @@ public class SkjsEquipCountItemDto {
     private String qp;
 
     public void setDefaultValues() {
-        this.dt = "";
-        this.qzjx = "";
-        this.kysd = "";
-        this.dxylss = "";
-        this.cc = "";
-        this.gl = "";
-        this.ylrq = "";
-        this.ylgd = "";
-        this.qp = "";
+        this.dt = "0";
+        this.qzjx = "0";
+        this.kysd = "0";
+        this.dxylss = "0";
+        this.cc = "0";
+        this.gl = "0";
+        this.qp = "0";
+        this.ylrq = "0";
+        this.ylgd = "0";
     }
 }
\ No newline at end of file

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/resources/mapper/EnterpriseBizMapper.xml

@@ -81,8 +81,7 @@
                     test="tzBaseEnterpriseInfoDto.legalPhone!=null and tzBaseEnterpriseInfoDto.legalPhone!='' ">
                 AND legal_phone LIKE CONCAT('%',#{tzBaseEnterpriseInfoDto.legalPhone},'%')
             </if>
-            <if
-                    test="tzBaseEnterpriseInfoDto.superviseOrgCode!=null and tzBaseEnterpriseInfoDto.superviseOrgCode!='' ">
+            <if test="tzBaseEnterpriseInfoDto.superviseOrgCode!=null and tzBaseEnterpriseInfoDto.superviseOrgCode!='' ">
                 AND supervise_org_code LIKE CONCAT('%',#{tzBaseEnterpriseInfoDto.superviseOrgCode},'%')
             </if>
             <if
@@ -97,12 +96,15 @@
             </if>
             <if test="orgCodeList != null and !orgCodeList.isEmpty()">
                 AND (
-                <foreach collection="orgCodeList" item="item" separator=" OR ">
-                    supervise_org_code LIKE CONCAT('%', #{item}, '%')
+                <foreach collection="orgCodeList" item="orgCode" separator="and" open="(" close=")">
+                    (supervise_org_code != '50' and supervise_org_code LIKE CONCAT (#{orgCode}, '%'))
                 </foreach>
+                <if test="tzBaseEnterpriseInfoDto.cityCode!=null and tzBaseEnterpriseInfoDto.cityCode!='' ">
+                    or (a.supervise_org_code = '50' and a.office_region LIKE CONCAT ('%',
+                    #{tzBaseEnterpriseInfoDto.cityCode}, '%'))
+                </if>
                 )
             </if>
-
             <if test="tzBaseEnterpriseInfoDto.industrySupervisor!=null and tzBaseEnterpriseInfoDto.industrySupervisor!='' ">
                 AND (industry_supervisor = #{tzBaseEnterpriseInfoDto.industrySupervisor}
                 <if test=" tzBaseEnterpriseInfoDto.industrySupervisor == '6527' ">

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/service/impl/EnterpriseBizServiceImpl.java

@@ -64,10 +64,16 @@ public class EnterpriseBizServiceImpl {
     public IPage<TzBaseEnterpriseInfoDto> page(PageParam pageParam, TzBaseEnterpriseInfoDto tzBaseEnterpriseInfoDto) {
         List<String> orgCodeList = new ArrayList<>();
         if (tzBaseEnterpriseInfoDto.getSuperviseKey() != null) {
-            FeignClientResult<CompanyModel> result = Privilege.companyClient
-                    .seleteOne(Long.valueOf(tzBaseEnterpriseInfoDto.getSuperviseKey()));
-            if (result.getResult() != null) {
-                tzBaseEnterpriseInfoDto.setSuperviseOrgCode(result.getResult().getOrgCode());
+            if(tzBaseEnterpriseInfoDto.getSuperviseKey().contains("_")){
+                String regionCode = tzBaseEnterpriseInfoDto.getSuperviseKey().split("_")[0];
+                String orgCode = stCommonService.getAndSetOrgCode(regionCode);
+                tzBaseEnterpriseInfoDto.setSuperviseOrgCode(orgCode);
+            } else {
+                FeignClientResult<CompanyModel> result = Privilege.companyClient
+                        .seleteOne(Long.valueOf(tzBaseEnterpriseInfoDto.getSuperviseKey()));
+                if (result.getResult() != null) {
+                    tzBaseEnterpriseInfoDto.setSuperviseOrgCode(result.getResult().getOrgCode());
+                }
             }
         }
         Page<TzBaseEnterpriseInfoDto> page = new Page<>(pageParam.getCurrent(), pageParam.getSize());
@@ -80,7 +86,6 @@ public class EnterpriseBizServiceImpl {
                 }
             }
         }
-
         if (tzBaseEnterpriseInfoDto.getCityCode() != null) {
             String orgCode = stCommonService.getAndSetOrgCode(tzBaseEnterpriseInfoDto.getCityCode());
             if (orgCode == null) {
@@ -88,8 +93,8 @@ public class EnterpriseBizServiceImpl {
             }
             orgCodeList.add(orgCode);
         }
-
         List<String> unitTypeList = new ArrayList<>();
+
         unitTypeList.add(tzBaseEnterpriseInfoDto.getUnitType());
         if (UnitTypeEnum.SYDW.getName().equals(tzBaseEnterpriseInfoDto.getUnitType())) {
             unitTypeList.add(UnitTypeEnum.GRZT.getName());