fix(tcm):企业信息，企业注册bug修改

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/config/PressureVesselListener.java

@@ -171,7 +171,7 @@ public class PressureVesselListener extends AnalysisEventListener<EquipInfoCylin
     }
 
     private void checkInspectOrg(String inspectOrgCode){
-        List<Map<String, Object>> InspectOrgList = commonService.getAllInspectionInfo("检验检测机构");
+        List<Map<String, Object>> InspectOrgList = commonService.getAllInspectionInfo("检验机构");
         if (findUseCode(InspectOrgList, inspectOrgCode) == null) {
             result.append("未查询到该检验机构");
         }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/CommonServiceImpl.java

@@ -1057,8 +1057,9 @@ public class CommonServiceImpl implements ICommonService {
             if (e.get("companyName").toString().contains("行政审批局")) {
                 it.remove();
             }
-            // 删除检验检测机构
-            if (!"company".equals(e.get("level")) && e.get("companyType").toString().contains("检验检测机构")) {
+            // 删除检验机构、检测机构
+            String companyType = e.get("companyType").toString();
+            if (!"company".equals(e.get("level")) && (companyType.contains("检验机构") || companyType.contains("检测机构"))) {
                 it.remove();
             }
             if (!ObjectUtils.isEmpty(e.get("children"))) {

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/DataDockServiceImpl.java

@@ -1671,8 +1671,8 @@ public class DataDockServiceImpl {
             checkNotBlank(data.getPipeName(), "管道名称不能为空；", rowError);
             //checkNotBlank(data.getDesignUnitCreditCode(), "设计单位统一社会信用代码不能为空；", rowError);
             //checkNotBlank(data.getDesignUnitName(), "设计单位名称不能为空；", rowError);
-            //checkNotBlank(data.getInspectOrgCode(), "检验检测机构统一社会信用代码不能为空；", rowError);
-            //checkNotBlank(data.getInspectOrgName(), "检验检测机构名称不能为空；", rowError);
+            //checkNotBlank(data.getInspectOrgCode(), "检验机构\检测机构统一社会信用代码不能为空；", rowError);
+            //checkNotBlank(data.getInspectOrgName(), "检验机构\检测机构名称不能为空；", rowError);
             //checkNotBlank(data.getInspectConclusion(), "检验结论不能为空；", rowError);
             //checkNotBlank(data.getInspectType(), "检验类型不能为空；", rowError);
             //checkNotBlank(data.getInspectDate(), "检验日期不能为空；", rowError);

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/IdxBizJgRegisterInfoServiceImpl.java

@@ -142,8 +142,6 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
     public static final String WHETHER_VEHICLE_CYLINDER = "WHETHER_VEHICLE_CYLINDER";
     // 是否撬装式压力容器
     public static final String WHETHER_SKID_MOUNTED_PRESSURE_VESSEL = "WHETHER_SKID_MOUNTED_PRESSURE_VESSEL";
-    // 检验检测机构
-    public static final String INSPECTION_AND_TESTING_INSTITUTIONS = "检验检测机构";
     // 设备纳管  纳管：true 未纳管：false
     public static final String IS_INTO_MANAGEMENT = "IS_INTO_MANAGEMENT";
     public static final String IS_DO_BUSINESS = "IS_DO_BUSINESS";
@@ -4098,7 +4096,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
             useInfo.setRecDate(new Date());
             useInfo.setCreateDate(new Date());
             String source = equipInfoDto.getDataSource();
-            useInfo.setDataSource("his".equals(source) ? "jg_his" : "black".equals(source) ? "jg_his_black" : "jg");// 区分历史设备和新增设备
+            useInfo.setDataSource("his".equals(source) ? "jg_his_pl" : "black".equals(source) ? "jg_his_black_pl" : "jg_pl");// 区分历史设备和新增设备
             useInfo.setIsIntoManagement("his".equals(equipInfoDto.getDataSource()));// 历史气瓶导入为已纳管设备
 
             // 历史气瓶导入设备状态为在用
@@ -4718,7 +4716,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
             Optional.ofNullable(data.getProduceDate()).ifPresent(v -> checkDateFormatCorrect(v, "制造日期格式不正确；", result));
             //checkNotBlank(data.getInspectOrgName(), "检测机构名称不能为空；", result);
             //checkNotBlank(data.getInspectOrgCode(), "检测机构代码不能为空；", result);
-            //checkInspectOrg(data.getInspectOrgCode(), result);//查询检验检测机构
+            //checkInspectOrg(data.getInspectOrgCode(), result);//查询检验机构\检测机构
             //checkNotBlank(data.getInspectStaff(), "检测人员名称不能为空；", result);
             //checkNotBlank(data.getInspectDate(), "检测日期不能为空；", result);
             //checkNotBlank(data.getInspectReportNo(), "检验报告编号不能为空；", result);

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

@@ -40,7 +40,7 @@
             <if test="tzBaseEnterpriseInfoDto.endCreateDate != null and tzBaseEnterpriseInfoDto.endCreateDate != ''">
                     AND create_date &lt;= #{tzBaseEnterpriseInfoDto.endCreateDate}
             </if>
-            <if test="tzBaseEnterpriseInfoDto.unitType.indexOf('检验检测机构') !=-1 and tzBaseEnterpriseInfoDto.jyjcStatus!=null and tzBaseEnterpriseInfoDto.jyjcStatus!=''">
+            <if test="tzBaseEnterpriseInfoDto.unitType.indexOf('检验机构') !=-1 OR tzBaseEnterpriseInfoDto.unitType.indexOf('检测机构') !=-1 and tzBaseEnterpriseInfoDto.jyjcStatus!=null and tzBaseEnterpriseInfoDto.jyjcStatus!=''">
              use_unit_code in
                 (select distinct unit_code from tz_jyjc_opening_application
                     where

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

@@ -10,7 +10,7 @@
 		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.unit_type like  '%检验检测机构%'
+		    AND (b.unit_type LIKE '%检验机构%' OR b.unit_type LIKE '%检测机构%')
 	</select>
 	<select id="countAllRegThirdInspectCompany" resultType="java.lang.Long">
 		SELECT
@@ -24,7 +24,7 @@
 			<foreach collection="legalCmc" item="code" open="(" close=")"  separator=",">
 				#{code}
 			</foreach>
-		     and b.unit_type like  '%检验检测机构%'
+		     AND (b.unit_type LIKE '%检验机构%' OR b.unit_type LIKE '%检测机构%')
 	</select>
 	<select id="countAllOpenBizInspectCompany" resultType="java.lang.Long">
 		SELECT
@@ -150,7 +150,7 @@
 					tz_base_enterprise_info tbei
 						INNER JOIN tzs_user_info ui ON tbei.use_unit_code = ui.unit_code
 				WHERE
-					tbei.unit_type LIKE'%检验检测机构%'
+		            (tbei.unit_type LIKE '%检验机构%' OR tbei.unit_type LIKE '%检测机构%')
 				GROUP BY
 					tbei.use_unit_code
 			) u ON u."useNnitCode" = tbei.use_unit_code
@@ -165,8 +165,7 @@
 						AND joi.SUPERVISORY_CODE IS NOT NULL
 						AND joi.SUPERVISORY_CODE != ''
 						AND joi.SUPERVISORY_CODE != 'null'
-				WHERE
-					tbei.unit_type LIKE'%检验检测机构%'
+				WHERE (tbei.unit_type LIKE '%检验机构%' OR tbei.unit_type LIKE '%检测机构%')
 				GROUP BY
 					tbei.use_unit_code
 			) e ON e."useNnitCode" = tbei.use_unit_code
@@ -179,10 +178,8 @@
 					tz_base_enterprise_info tbei
 						LEFT JOIN tz_jyjc_inspection_application jia ON tbei.use_unit_code = jia.inspection_unit_code
 						LEFT JOIN tz_jyjc_inspection_result jir ON jir.application_no = jia.application_no
-				WHERE
-					tbei.unit_type LIKE'%检验检测机构%'
-				  	AND (
-						( tbei.supervise_org_code != '50' AND tbei.supervise_org_code LIKE CONCAT ( #{dpFilterParamForDetailDto.orgCode}, '%' ) )
+				WHERE (tbei.unit_type LIKE '%检验机构%' OR tbei.unit_type LIKE '%检测机构%')
+		        AND (( tbei.supervise_org_code != '50' AND tbei.supervise_org_code LIKE CONCAT ( #{dpFilterParamForDetailDto.orgCode}, '%' ) )
 						OR ( tbei.supervise_org_code = '50' AND tbei.office_region LIKE CONCAT ( '%', #{dpFilterParamForDetailDto.cityCode}, '%' ) )
 					)
 				<if test="dpFilterParamForDetailDto.timeSearchOne != null">
@@ -196,7 +193,7 @@
 				GROUP BY
 					tbei.use_unit_code
 			) i ON i.use_unit_code = tbei.use_unit_code
-		where tbei.unit_type LIKE'%检验检测机构%'
+		where (tbei.unit_type LIKE '%检验机构%' OR tbei.unit_type LIKE '%检测机构%')
 		<if test="dpFilterParamForDetailDto.companyName != null and dpFilterParamForDetailDto.companyName != ''">
 			and tbei.use_unit like concat('%',#{dpFilterParamForDetailDto.companyName},'%')
 		</if>

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

@@ -21,8 +21,7 @@
 				( SELECT org_code FROM privilege_company WHERE company_code = #{screenDto.cityCode} ) AS subquery
 					INNER JOIN tz_base_enterprise_info bi ON bi.supervise_org_code LIKE CONCAT ( subquery.org_code, '%' )
 					INNER JOIN tz_base_unit_licence bul ON bul.unit_code = bi.use_unit_code
-		WHERE
-			bi.unit_type LIKE concat ( '%', '检验检测机构', '%' )
+		WHERE (bi.unit_type LIKE '%检验机构%' OR bi.unit_type LIKE '%检测机构%')
 		  AND bul.agency_type IS NOT NULL
 		GROUP BY
 			bul.agency_type