1.检验检测大屏接口中评增加统计项

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/java/com/yeejoin/amos/boot/module/statistics/api/mapper/JYJCStatisticsMapper.java

@@ -31,7 +31,7 @@ public interface JYJCStatisticsMapper {
      * @param regionCode 区域行政区划编码
      * @return 检验机构总量
      */
-    Long countAllRegThirdInspectCompany(@Param("orgCode") String orgCode, @Param("legalCmc") String legalCmc, @Param("regionCode") String regionCode);
+    Long countAllRegThirdInspectCompany(@Param("orgCode") String orgCode, @Param("legalCmc") List<String> legalCmc, @Param("regionCode") String regionCode);
 
     /**
      * 业务开通机构数量

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

@@ -8,8 +8,9 @@
 		from
 			tz_base_enterprise_info b
 		where
-			(b.supervise_org_code != '50' and b.supervise_org_code LIKE CONCAT (#{orgCode}, '%'))
-			or (b.supervise_org_code = '50' and b.office_region LIKE CONCAT ('%', #{regionCode}, '%'))
+			((b.supervise_org_code != '50' and b.supervise_org_code LIKE CONCAT (#{orgCode}, '%'))
+			or (b.supervise_org_code = '50' and b.office_region LIKE CONCAT ('%', #{regionCode}, '%')))
+			and b.unit_type like  '%检验检测机构%'
 	</select>
 	<select id="countAllRegThirdInspectCompany" resultType="java.lang.Long">
 		SELECT
@@ -19,7 +20,11 @@
 		where
 			((b.supervise_org_code != '50' and b.supervise_org_code LIKE CONCAT (#{orgCode}, '%'))
 			or (b.supervise_org_code = '50' and b.office_region LIKE CONCAT ('%', #{regionCode}, '%')))
-			and b.use_unit_code not in (#{legalCmc})
+			and b.use_unit_code not in
+			<foreach collection="legalCmc" item="code" open="(" close=")"  separator=",">
+				#{code}
+			</foreach>
+		     and b.unit_type like  '%检验检测机构%'
 	</select>
 	<select id="countAllOpenBizInspectCompany" resultType="java.lang.Long">
 		SELECT

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/JYJCDPStatisticsServiceImpl.java

@@ -373,7 +373,7 @@ public class JYJCDPStatisticsServiceImpl {
     }
 
     private void countAllRegThirdInspectCompany(Map<String, Object> result, String orgCode, String regionCode) {
-        Long num = jyjcStatisticsMapper.countAllRegThirdInspectCompany(orgCode, legalCompanyCodes, regionCode);
+        Long num = jyjcStatisticsMapper.countAllRegThirdInspectCompany(orgCode, Arrays.asList(legalCompanyCodes.split(",")), regionCode);
         result.put("thirdInspectionAgencyCount", num);
     }