Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_register

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-api/src/main/java/com/yeejoin/amos/boot/module/elevator/api/entity/AlertStatistics.java

@@ -92,11 +92,13 @@ public class AlertStatistics extends BaseEntity {
     /**
      * 平均救援时长（分钟）
      */
+    @TableField(exist = false)
     private String avgTime;
 
     /**
      * 30分钟内到达次数
      */
+    @TableField(exist = false)
     private Integer withinThirtyRescue;
 
     /**

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgUseRegistrationManageMapper.xml

@@ -445,9 +445,9 @@
         LEFT JOIN idx_biz_jg_register_info ri ON ri.USE_ORG_CODE=tjur.use_registration_code
         LEFT JOIN idx_biz_jg_use_info ui on ui."RECORD" = ri."RECORD"
         WHERE
-        ui."DATA_SOURCE" like 'jg_his%'
-        and ui."DATA_SOURCE" not like 'jg_his_black%'
-        and (ri."USE_ORG_CODE" is not null or ri."USE_ORG_CODE" != '')
+        ui.DATA_SOURCE like 'jg_his%'
+        and ui.DATA_SOURCE not like 'jg_his_black%'
+        and (ri.USE_ORG_CODE is not null or ri.USE_ORG_CODE != '')
         and tjur.is_delete=0
         and tjur.certificate_status='已登记'
         and tjur.use_unit_credit_code=#{useUnitCreditCode}

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

@@ -412,13 +412,12 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
 
         if("unit".equals(jgUseRegistration.getManageType())){
             if (registerInfo.getEquList().equals(EquipmentClassifityEnum.YLGD.getCode())){
-                if(inspectionDetectionInfo.getInspectReportNo() != null && inspectionDetectionInfo.getInspectReport() != null) {
                 // 压力管道逻辑，根据设备record + 检验报告编号判定唯一一条检验流水，有进行更新，无则进行插入
-                    String record = equipment.get("record").toString();
+                String record = (String) equipment.get("record");
                 inspectionDetectionInfo.setInspectConclusion((String) equipment.get("inspectConclusionCode"));
+                inspectionDetectionInfo.setSequenceNbr((String) equipment.get("jySeq"));
                 saveEquipOfPieLineInspectData(record, inspectionDetectionInfo);
             }
-            }
         } else {
             // 其他逻辑
             if (equipment.get("jySeq") != null) {
@@ -443,22 +442,18 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
 
     private void saveEquipOfPieLineInspectData(String record, InspectionDetectionInfo inspectionDetectionInfo) {
         // 检验机构 + 设备+ 检验报告编号时 ， 是唯一的为了防止老数据有重复的，程序健壮，故使用list进行处理
-        LambdaQueryWrapper<InspectionDetectionInfo> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(AbstractEquipBaseEntity::getRecord, record)
-                .eq(!StringUtils.isEmpty(inspectionDetectionInfo.getInspectReportNo()), InspectionDetectionInfo::getInspectReportNo, inspectionDetectionInfo.getInspectReportNo())
-                .eq(InspectionDetectionInfo::getInspectOrgCode, inspectionDetectionInfo.getInspectOrgCode());
-        List<InspectionDetectionInfo> inspectionDetectionInfos = inspectionDetectionInfoMapper.selectList(wrapper);
-        if(inspectionDetectionInfos.isEmpty()){
-            inspectionDetectionInfo.setRecord(record);
+        // LambdaQueryWrapper<InspectionDetectionInfo> wrapper = new LambdaQueryWrapper<>();
+        // wrapper.eq(AbstractEquipBaseEntity::getRecord, record)
+        //      .eq(!StringUtils.isEmpty(inspectionDetectionInfo.getInspectReportNo()), InspectionDetectionInfo::getInspectReportNo, inspectionDetectionInfo.getInspectReportNo())
+        //    .eq(InspectionDetectionInfo::getInspectOrgCode, inspectionDetectionInfo.getInspectOrgCode());
+        // List<InspectionDetectionInfo> inspectionDetectionInfos = inspectionDetectionInfoMapper.selectList(wrapper);
         inspectionDetectionInfo.setRecDate(new Date());
+        if (Objects.isNull(inspectionDetectionInfo.getSequenceNbr())) {
             inspectionDetectionInfo.setSequenceNbr(sequence.nextId() + "");
+            inspectionDetectionInfo.setRecord(record);
             inspectionDetectionInfoMapper.insert(inspectionDetectionInfo);
         } else {
-            for (InspectionDetectionInfo inspectionDetectionInfo1 : inspectionDetectionInfos) {
-                Bean.copyExistPropertis(inspectionDetectionInfo, inspectionDetectionInfo1);
-                inspectionDetectionInfo1.setRecDate(new Date());
-                inspectionDetectionInfoMapper.updateById(inspectionDetectionInfo1);
-            }
+            inspectionDetectionInfoMapper.updateById(inspectionDetectionInfo);
         }
     }
 

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

@@ -203,13 +203,13 @@ public class TzBaseEnterpriseInfoServiceImpl
 		List<BaseUnitLicence> unitLicences = baseUnitLicenceService.list(new LambdaQueryWrapper<BaseUnitLicence>()
 				.eq(BaseUnitLicence::getUnitCode, tzBaseEnterpriseInfo.getUseCode()));
 		List<BaseUnitLicenceDto> unitLicenceDtos = new ArrayList<>();
-		List<BaseUnitLicence> unitLicencesCollect;
-		if ("监管机构".equals(companyType)) {
-			unitLicencesCollect = unitLicences;
-		} else {
-			// 解决脏数据问题，脏数据不再显示
-			unitLicencesCollect = unitLicences.stream()
-					.filter(baseUnitLicence -> baseUnitLicence.getCertTypeCode() !=  null && COMPANY_TYPE_CERT_TYPE_MAP.get(companyType).contains((baseUnitLicence.getCertTypeCode())))
+		List<BaseUnitLicence> unitLicencesCollect = Optional.ofNullable(unitLicences).orElse(Collections.emptyList());
+		if (!"监管机构".equals(companyType)) {
+			List<String> certTypeList = Arrays.asList(Optional.ofNullable(COMPANY_TYPE_CERT_TYPE_MAP.get(companyType))
+					.orElse("")
+					.split(","));
+			unitLicencesCollect = unitLicencesCollect.stream()
+					.filter(unit -> unit.getCertTypeCode() != null && certTypeList.contains(unit.getCertTypeCode()))
 					.collect(Collectors.toList());
 		}
 		if (!ValidationUtil.isEmpty(unitLicencesCollect)) {