fix(jg):管道编辑检验重复，企业查询录入时间bug

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/EquipInfoCylinderExcelDto.java

@@ -160,128 +160,134 @@ public class EquipInfoCylinderExcelDto extends BaseDto {
     @DateTimeFormat("yyyy-MM-dd")
     private String inspectDate;
 
+    @ApiModelProperty(value = "下次检验日期")
+    @ExcelProperty(value = "下次检验日期", index = 27)
+    @NotBlank(message = "下次检验日期不能为空")
+    @DateTimeFormat("yyyy-MM-dd")
+    private String nextInspectDate;
+
     @ApiModelProperty(value = "检验报告编号")
-    @ExcelProperty(value = "检验报告编号", index = 27)
+    @ExcelProperty(value = "检验报告编号", index = 28)
     private String inspectReportNo;
 
     //技术参数
-    @ExcelProperty(value = "额定质量(kg)", index = 28)
+    @ExcelProperty(value = "额定质量(kg)", index = 29)
     @ApiModelProperty(value = "额定质量(kg)")
     private String ratedQuality;
 
-    @ExcelProperty(value = "使用环境温度(℃)", index = 29)
+    @ExcelProperty(value = "使用环境温度(℃)", index = 30)
     @ApiModelProperty(value = "使用环境温度(℃)")
     private String ambientTemperature;
 
-    @ExcelProperty(value = "单瓶容积(m3)", index = 30)
+    @ExcelProperty(value = "单瓶容积(m3)", index = 31)
     @ApiModelProperty(value = "单瓶容积(m3)")
     @NotBlank(message = "单瓶容积(m3)不能为空")
     private String singleBottleVolume;
 
-    @ExcelProperty(value = "型号", index = 31)
+    @ExcelProperty(value = "型号", index = 32)
     @ApiModelProperty(value = "型号")
     private String modelNumber;
 
-    @ExcelProperty(value = "充装介质", index = 32)
+    @ExcelProperty(value = "充装介质", index = 33)
     @ApiModelProperty(value = "充装介质")
     @NotBlank(message = "充装介质不能为空")
     private String chargingMedium;
 
-    @ExcelProperty(value = "规格", index = 33)
+    @ExcelProperty(value = "规格", index = 34)
     @ApiModelProperty(value = "规格")
     private String specification;
 
-    @ExcelProperty(value = "外径", index = 34)
+    @ExcelProperty(value = "外径", index = 35)
     @ApiModelProperty(value = "外径")
     private String outsideDiameter;
 
-    @ExcelProperty(value = "壁厚", index = 35)
+    @ExcelProperty(value = "壁厚", index = 36)
     @ApiModelProperty(value = "壁厚")
     private String wallThickness;
 
-    @ExcelProperty(value = "长度", index = 36)
+    @ExcelProperty(value = "长度", index = 37)
     @ApiModelProperty(value = "长度")
     private String length;
 
-    @ExcelProperty(value = "公称工作压力(MPa)", index = 37)
+    @ExcelProperty(value = "公称工作压力(MPa)", index = 38)
     @ApiModelProperty(value = "公称工作压力(MPa)")
     @NotBlank(message = "公称工作压力(MPa)不能为空")
     private String nominalWorkingPressure;
 
-    @ExcelProperty(value = "材料(管路)", index = 38)
+    @ExcelProperty(value = "材料(管路)", index = 39)
     @ApiModelProperty(value = "材料(管路)")
     private String piping;
 
-    @ExcelProperty(value = "无损检测方法(气瓶)", index = 39, converter = NondestructConverter.class)
+    @ExcelProperty(value = "无损检测方法(气瓶)", index = 40, converter = NondestructConverter.class)
     @ApiModelProperty(value = "无损检测方法(气瓶)")
     private String qpLossless;//5988
 
-    @ExcelProperty(value = "材料(瓶体)", index = 40)
+    @ExcelProperty(value = "材料(瓶体)", index = 41)
     @ApiModelProperty(value = "材料(瓶体)")
     private String bottleBody;
 
-    @ExcelProperty(value = "材料(端塞)", index = 41)
+    @ExcelProperty(value = "材料(端塞)", index = 42)
     @ApiModelProperty(value = "材料(端塞)")
     private String endPlug;
 
-    @ExcelProperty(value = "无损检测比例(管路)(%)", index = 42)
+    @ExcelProperty(value = "无损检测比例(管路)(%)", index = 43)
     @ApiModelProperty(value = "无损检测比例(管路)(%)")
     private String glRatio;
 
-    @ExcelProperty(value = "无损检测比例(气瓶)(%)", index = 43)
+    @ExcelProperty(value = "无损检测比例(气瓶)(%)", index = 44)
     @ApiModelProperty(value = "无损检测比例(气瓶)(%)")
     private String qpRatio;
 
-    @ExcelProperty(value = "无损检测方法(管路)", index = 44, converter = NondestructConverter.class)
+    @ExcelProperty(value = "无损检测方法(管路)", index = 45, converter = NondestructConverter.class)
     @ApiModelProperty(value = "无损检测方法(管路)")
     private String glLossless;
 
-    @ExcelProperty(value = "耐压实验压力(气瓶)(Mpa)", index = 45)
+    @ExcelProperty(value = "耐压实验压力(气瓶)(Mpa)", index = 46)
     @ApiModelProperty(value = "耐压实验压力(气瓶)(Mpa)")
     private String qpPressure;
 
-    @ExcelProperty(value = "耐压实验压力(管路)(Mpa)", index = 46)
+    @ExcelProperty(value = "耐压实验压力(管路)(Mpa)", index = 47)
     @ApiModelProperty(value = "耐压实验压力(管路)(Mpa)")
     private String glPressure;
 
-    @ExcelProperty(value = "气密性试验压力(气瓶)(Mpa)", index = 47)
+    @ExcelProperty(value = "气密性试验压力(气瓶)(Mpa)", index = 48)
     @ApiModelProperty(value = "气密性试验压力(气瓶)(Mpa)")
     private String qpAirTightness;
 
-    @ExcelProperty(value = "气体置换后压力(MPa)", index = 48)
+    @ExcelProperty(value = "气体置换后压力(MPa)", index = 49)
     @ApiModelProperty(value = "气体置换后压力(MPa)")
     private String displacementPressure;
 
-    @ExcelProperty(value = "热处理方式", index = 49)
+    @ExcelProperty(value = "热处理方式", index = 50)
     @ApiModelProperty(value = "热处理方式")
     private String heatTreatmentMethod;
 
-    @ExcelProperty(value = "气密性实验压力(管路)(MPa)", index = 50)
+    @ExcelProperty(value = "气密性实验压力(管路)(MPa)", index = 51)
     @ApiModelProperty(value = "气密性实验压力(管路)(MPa)")
     private String glAirTightness;
 
-    @ExcelProperty(value = "气瓶安装位置", index = 51)
+    @ExcelProperty(value = "气瓶安装位置", index = 52)
     @ApiModelProperty(value = "气瓶安装位置")
     private String installationPosition;
 
-    @ExcelProperty(value = "瓶体内含氧量(%)", index = 52)
+    @ExcelProperty(value = "瓶体内含氧量(%)", index = 53)
     @ApiModelProperty(value = "瓶体内含氧量(%)")
     private String oxygen;
 
-    @ExcelProperty(value = "热处理温度(℃)", index = 53)
+    @ExcelProperty(value = "热处理温度(℃)", index = 54)
     @ApiModelProperty(value = "热处理温度(℃)")
     private String qpHeatTreatmentTemperature;
 
     /**
      * 信息化管理字段-信息化管理情况
      */
-    @ExcelProperty(value = "信息化管理情况", index = 54, converter = InformationSituationConverter.class)
+    @ExcelProperty(value = "信息化管理情况", index = 55, converter = InformationSituationConverter.class)
     private String informationSituation;
 
     /**
      * 信息化管理字段-二维码或者电子标签编号
      */
-    @ExcelProperty(value = "二维码或者电子标签编号", index = 55)
+    @ExcelProperty(value = "二维码或者电子标签编号", index = 56)
     private String informationManageCode;
 
     @ExcelIgnore

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/edit/process/equip/CommonEquipDataProcessService.java

@@ -61,6 +61,7 @@ import org.springframework.stereotype.Component;
 import org.springframework.util.ObjectUtils;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
+import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 
 import javax.annotation.PostConstruct;
 import java.io.IOException;
@@ -1142,4 +1143,14 @@ public class CommonEquipDataProcessService {
             this.updateUseOrgCode2NewPipeline(e, useRegistrationCode);
         });
     }
-}
+
+    public void beforeCheckForUseOrgCode(ProjectContraptionChangeDataDto dto) {
+        LambdaQueryWrapper<IdxBizJgProjectContraption> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(IdxBizJgProjectContraption::getUseRegistrationCode, dto.getUseRegistrationCode())
+                .ne(BaseEntity::getSequenceNbr, dto.getProjectContraptionId());
+        if (idxBizJgProjectContraptionServiceImpl.count(queryWrapper) > 0) {
+            throw new BadRequest("使用登记证编号已存在！");
+        }
+        jgRegisterInfoService.checkUseRegistrationCode(dto.getUseRegistrationCode(), "unit");
+    }
+}
\ No newline at end of file

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/edit/process/equip/SingleEquipChangeProcess.java

@@ -15,6 +15,7 @@ import com.yeejoin.amos.boot.module.jg.biz.edit.process.biz.DefaultBizDataChange
 import com.yeejoin.amos.boot.module.jg.biz.edit.process.biz.strategy.IBizDataChangeHandleStrategy;
 import com.yeejoin.amos.boot.module.jg.biz.edit.process.equip.strategy.HandleResult;
 import com.yeejoin.amos.boot.module.jg.biz.edit.process.equip.strategy.IEquipChangeDataProcessStrategy;
+import com.yeejoin.amos.boot.module.jg.biz.service.impl.IdxBizJgRegisterInfoServiceImpl;
 import com.yeejoin.amos.boot.module.ymt.api.entity.*;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -52,6 +53,7 @@ public class SingleEquipChangeProcess implements IEquipChangeDataProcessStrategy
     private final RestHighLevelClient restHighLevelClient;
 
     private final EsEquipmentDao esEquipmentDao;
+    private final IdxBizJgRegisterInfoServiceImpl idxBizJgRegisterInfoServiceImpl;
 
 
     @Override
@@ -265,7 +267,6 @@ public class SingleEquipChangeProcess implements IEquipChangeDataProcessStrategy
         return orgCode;
     }
 
-
     private void beforeCheckForUseOrgCode(IdxBizJgUseInfo useInfoOld, IdxBizJgRegisterInfo registerInfoNew) {
         // 1.使用登记证编辑时重复性校验
         if (!CylinderTypeEnum.CYLINDER.getCode().equals(registerInfoNew.getEquCategory())) {  // 非气瓶逻辑,所有设备不能重复
@@ -286,7 +287,7 @@ public class SingleEquipChangeProcess implements IEquipChangeDataProcessStrategy
                 }
             }
         }
-
+        idxBizJgRegisterInfoServiceImpl.checkUseRegistrationCode(registerInfoNew.getUseOrgCode(), "unit");
     }
 
     @Override

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/edit/process/equip/SingleProjectEquipChangeProcess.java

@@ -19,15 +19,11 @@ import com.yeejoin.amos.boot.module.jg.biz.edit.process.equip.strategy.HandleRes
 import com.yeejoin.amos.boot.module.jg.biz.edit.process.equip.strategy.IEquipChangeDataProcessStrategy;
 import com.yeejoin.amos.boot.module.jg.biz.edit.typeHandler.PieLineLevelTypeHandler;
 import com.yeejoin.amos.boot.module.jg.biz.service.impl.IdxBizJgRegisterInfoServiceImpl;
-import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgConstructionInfo;
-import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgInspectionDetectionInfo;
-import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgRegisterInfo;
-import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgUseInfo;
+import com.yeejoin.amos.boot.module.ymt.api.entity.*;
 import lombok.RequiredArgsConstructor;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Component;
-import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 
 import java.util.*;
 import java.util.function.Function;
@@ -76,7 +72,10 @@ public class SingleProjectEquipChangeProcess implements IEquipChangeDataProcessS
         // 2.装置基本信息校验、保存(前端返回的装置信息为大写 需注意)
         ProjectContraptionChangeDataDto projectContraptionChangeDataDto = CommonEquipDataProcessService.castMap2Bean(changeData, ProjectContraptionChangeDataDto.class);
         this.setNameForDictKey(projectContraptionChangeDataDto);
-
+        // 校验使用登记证编号是否重复
+        if (Objects.toString(projectContraptionChangeDataDto.getDataSource(), "").startsWith("jg_his")) {
+            commonEquipDataProcessService.beforeCheckForUseOrgCode(projectContraptionChangeDataDto);
+        }
         pieLineDataChangeService.update(projectContraptionChangeDataDto, allChangeColumns);
         Boolean isRequireTemporarySave = data.getBoolean(DefaultBizDataChangeHandler.IS_REQUIRES_TEMPORARY_SAVE);
         JSONArray oldPieLineJSONArray = data.getJSONArray(DefaultBizDataChangeHandler.TEMPORARY_PIPELINES_DATA);

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

@@ -4444,17 +4444,19 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
             inspectionDetectionInfo.setRecDate(new Date());
             inspectionDetectionInfo.setInspectType("ZZJDJY");
             inspectionDetectionInfo.setInspectConclusion("6040");// 默认合格
-            // 根据条件确定增加的年数
-            Optional.ofNullable(data.getInspectDate())
-                    .filter(s -> !s.trim().isEmpty())
-                    .map(dateStr -> LocalDate.parse(dateStr, DateTimeFormatter.ofPattern("yyyy-MM-dd")))
-                    .ifPresent(inspectDate -> {
-                        inspectionDetectionInfo.setInspectDate(Date.from(inspectDate.atStartOfDay(ZoneId.systemDefault()).toInstant()));
-                        // 计算下次检测日期（加 3 年或 4 年）
-                        int plusYears = SPECIAL_CYLINDER.getCode().equals(equipInfoDto.getEquDefineCode()) ? 3 : 4;
-                        LocalDate nextInspectDate = inspectDate.plusYears(plusYears);
-                        inspectionDetectionInfo.setNextInspectDate(Date.from(nextInspectDate.atStartOfDay(ZoneId.systemDefault()).toInstant()));
-                    });
+            inspectionDetectionInfo.setInspectDate(DateUtil.parse(data.getInspectDate(), "yyyy-MM-dd"));
+            inspectionDetectionInfo.setNextInspectDate(DateUtil.parse(data.getNextInspectDate(), "yyyy-MM-dd"));
+            // 根据条件确定增加的年数(杨生元说监管让去掉，企业自己输入)
+//            Optional.ofNullable(data.getInspectDate())
+//                    .filter(s -> !s.trim().isEmpty())
+//                    .map(dateStr -> LocalDate.parse(dateStr, DateTimeFormatter.ofPattern("yyyy-MM-dd")))
+//                    .ifPresent(inspectDate -> {
+//                        inspectionDetectionInfo.setInspectDate(Date.from(inspectDate.atStartOfDay(ZoneId.systemDefault()).toInstant()));
+//                        // 计算下次检测日期（加 3 年或 4 年）
+//                        int plusYears = SPECIAL_CYLINDER.getCode().equals(equipInfoDto.getEquDefineCode()) ? 3 : 4;
+//                        LocalDate nextInspectDate = inspectDate.plusYears(plusYears);
+//                        inspectionDetectionInfo.setNextInspectDate(Date.from(nextInspectDate.atStartOfDay(ZoneId.systemDefault()).toInstant()));
+//                    });
             inspectionDetectionInfoList.add(inspectionDetectionInfo);
 
             // 其他信息

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/java/com/yeejoin/amos/boot/module/tcm/api/dto/TzBaseEnterpriseInfoDto.java

@@ -347,6 +347,9 @@ public class TzBaseEnterpriseInfoDto extends BaseDto {
 	@ApiModelProperty(value = "创建时间")
 	protected Date createDateEnd;
 
+	@ApiModelProperty(value = "创建时间")
+	protected String createDate;
+
 	/**
 	 * 单位类型集合
 	 */

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/resources/mapper/TzBaseEnterpriseInfoMapper.xml

@@ -36,8 +36,15 @@
 
 	<select id="page"
 		resultType="com.yeejoin.amos.boot.module.tcm.api.dto.TzBaseEnterpriseInfoDto">
-		SELECT
-		*,
+		SELECT "sequence_nbr","use_unit_code","supervise_code","use_unit_certificate","unit_type","use_code","use_unit","supervise_org_code",
+		"supervise_org_name","key_unit","class_places","province","city","district","street","community",
+		"address","legal_person","legal_phone","use_contact","contact_phone","safety_one","safety_one_id","safety_one_phone",
+		"safety_two","safety_two_id","safety_two_phone","longitude","latitude","sync_date","sync_state","app_id","rec_date","rec_user_id",
+		"governing_body","data_sources","industry","registration_authority","approval_time","operating_status","mainten_person","mainten_telephone",
+		"sqa","quality_person","quality_telephone","technical_person","is_delete","rec_user_name","equip_category","unit_business_license","unit_exequatur",
+		"safety_two_photo","safety_one_photo","sqa_phone","qr_code","industry_supervisor","regulatory_labels",
+		"register_type","other_accessories","status" ,"org_code","office_region","office_address",
+		DATE_FORMAT(create_date,'%Y-%m-%d') as createDate,
 		CONCAT(province,'/',city,'/',district) AS region,
 		CONCAT(street,'/',address) AS full_address
 		FROM
@@ -84,7 +91,15 @@
 	</select>
 
 	<select id="pageList" resultType="com.yeejoin.amos.boot.module.tcm.api.dto.TzBaseEnterpriseInfoDto">
-		SELECT *,
+		SELECT "sequence_nbr","use_unit_code","supervise_code","use_unit_certificate","unit_type","use_code","use_unit","supervise_org_code",
+		"supervise_org_name","key_unit","class_places","province","city","district","street","community",
+		"address","legal_person","legal_phone","use_contact","contact_phone","safety_one","safety_one_id","safety_one_phone",
+		"safety_two","safety_two_id","safety_two_phone","longitude","latitude","sync_date","sync_state","app_id","rec_date","rec_user_id",
+		"governing_body","data_sources","industry","registration_authority","approval_time","operating_status","mainten_person","mainten_telephone",
+		"sqa","quality_person","quality_telephone","technical_person","is_delete","rec_user_name","equip_category","unit_business_license","unit_exequatur",
+		"safety_two_photo","safety_one_photo","sqa_phone","qr_code","industry_supervisor","regulatory_labels",
+		"register_type","other_accessories","status" ,"org_code","office_region","office_address",
+		DATE_FORMAT(create_date,'%Y-%m-%d') as createDate,
 		CONCAT(province,'/',city,'/',district) AS region,
 		CONCAT(street,'/',address) AS full_address
 		FROM tz_base_enterprise_info