fix(jg):超设计使用年限bug修改

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

@@ -1450,6 +1450,15 @@
                    A.use_registration_code = #{code}
                    AND tjet.is_delete = 0
                    AND tjet.apply_status != '已作废'
-             )
+                 UNION
+                 select
+                     count(1) as inUseNumber
+                 from
+                     "TZS_JG_OVER_DESIGN_SERVICE_LIFE_EQ" ae
+                     JOIN TZS_JG_OVER_DESIGN_SERVICE_LIFE a ON a.sequence_nbr = ae.over_design_id
+                 where a.use_registration_code LIKE CONCAT('%',#{code},'%')
+                   AND a.is_delete = 0
+                   AND a.status != '已作废'
+             )x
     </select>
 </mapper>

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/IdxBizJgProjectContraptionController.java

@@ -230,6 +230,19 @@ public class IdxBizJgProjectContraptionController extends BaseController {
 		return ResponseHelper.buildResponse(idxBizJgProjectContraptionServiceImpl.getNewInspectionDetailByRecord(record));
 	}
 
+	/**
+	 * 获取最新检验信息详情
+	 *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/getNewWTJYInspectionDetailByRecord")
+	@ApiOperation(httpMethod = "GET", value = "获取最新检验信息详情", notes = "获取最新检验信息详情")
+	public ResponseModel<Map<String, Object>> getNewWTJYInspectionDetailByRecord(@RequestParam("record") String record,
+																				 @RequestParam("equListCode") String equListCode) {
+		return ResponseHelper.buildResponse(idxBizJgProjectContraptionServiceImpl.getNewWTJYInspectionDetailByRecord(record,equListCode));
+	}
+
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@GetMapping(value = "/summaryBasicInfo/export")
 	@ApiOperation(httpMethod = "GET", value = "导出基本信息汇总表(长输/公用管道)", notes = "导出基本信息汇总表(长输/公用管道)")

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/JgUseRegistrationManageController.java

@@ -248,8 +248,9 @@ public class JgUseRegistrationManageController extends BaseController {
     public ResponseModel<Page<JSONObject>> queryEquByCertificateSeqList(@RequestParam(value = "current") int current,
                                                                         @RequestParam(value = "size") int size,
                                                                         @RequestParam(value = "enableType", required = false) String enableType,
-                                                                        @RequestParam(value = "sequenceNbrs", required = false) String sequenceNbrs) {
+                                                                        @RequestParam(value = "sequenceNbrs", required = false ,defaultValue = "1904096657963974658") String sequenceNbrs) {
         if (ObjectUtils.isEmpty(sequenceNbrs)) {
+//            1902999963369091074
             throw new BadRequest("请先选择使用登记证");
         }
         List<Long> collect = Arrays.stream(sequenceNbrs.split(","))

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

@@ -748,4 +748,22 @@ public class IdxBizJgProjectContraptionServiceImpl extends BaseService<IdxBizJgP
         result.put("jySeq", info.getSequenceNbr());
         return result;
     }
+
+    public Map<String, Object> getNewWTJYInspectionDetailByRecord(String record, String equListCode) {
+        return detectionInfoService.queryInspectionListByRecord(record).stream()
+                .filter(v -> "6000".equals(equListCode) || "WTJY".equals(v.getInspectType()))
+                .findFirst()
+                .map(info -> {
+                    Map<String, Object> result = new HashMap<>(Bean.BeantoMap(info));
+                    result.put("inspectReport", JSON.parseArray(info.getInspectReport()));
+                    result.put("inspectConclusionCode", info.getInspectConclusion());
+                    result.put("inspectConclusion",
+                            Optional.ofNullable(dataDictionaryServiceImpl.getByCode(info.getInspectConclusion(), "JYJL"))
+                                    .map(DataDictionary::getName)
+                                    .orElse(""));
+                    result.put("jySeq", info.getSequenceNbr());
+                    return result;
+                })
+                .orElse(Collections.emptyMap());
+    }
 }
\ 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/service/impl/JgOverDesignServiceLifeServiceImpl.java

@@ -3,6 +3,7 @@ package com.yeejoin.amos.boot.module.jg.biz.service.impl;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -70,14 +71,12 @@ import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
-
 import java.nio.charset.StandardCharsets;
 import java.time.ZoneId;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Function;
 import java.util.stream.Collectors;
-
 import static java.util.stream.Collectors.toList;
 
 /**
@@ -300,7 +299,8 @@ public class JgOverDesignServiceLifeServiceImpl extends BaseService<JgOverDesign
                     BeanUtil.copyProperties(overDesignServiceLife, taskMessageDto);
                     taskMessageDto.setEquipId(String.valueOf(map.get("equipId")));
                     dto.setModel(taskMessageDto);
-                    dto.setTaskContent("来自超设计使用年限变更业务办理," + "【申请单号：" + overDesignServiceLife.getApplyNo() + "】");
+                    dto.setTaskContent(String.format("来自%s的业务办理，【申请单号：%s】",ObjectUtils.isEmpty(overDesignServiceLife.getEquList()) ? "" : overDesignServiceLife.getEquList(),
+                            overDesignServiceLife.getApplyNo()));
                     dto.setTaskCode(overDesignServiceLife.getApplyNo());
                     dto.setTaskType(String.valueOf(BusinessTypeEnum.JG_OVER_DESIGN_SERVICE_LIFE.getCode()));
                     dto.setRelationId(String.valueOf(overDesignServiceLife.getSequenceNbr()));
@@ -635,9 +635,20 @@ public class JgOverDesignServiceLifeServiceImpl extends BaseService<JgOverDesign
         this.updateRegistrationManage(useOrgCodes);
     }
 
+    private Date castDate2TimeStr(String date) {
+        if (date == null) return null;
+        try {
+            return DateUtil.date(Long.parseLong(date));
+        } catch (NumberFormatException e) {
+            return DateUtil.parse(date, "yyyy-MM-dd");
+        }
+    }
+
     private void updateOrCreateInspectionDetection(List<Map<String, Object>> equipmentLists) {
         for (Map<String, Object> equipment : equipmentLists) {
             InspectionDetectionInfo inspectionDetectionInfo = new InspectionDetectionInfo();
+            equipment.put("NEXT_INSPECT_DATE", this.castDate2TimeStr(Objects.toString(equipment.get("NEXT_INSPECT_DATE"))));
+            equipment.put("INSPECT_DATE", this.castDate2TimeStr(Objects.toString(equipment.get("INSPECT_DATE"))));
             BeanUtil.copyProperties(equipment, inspectionDetectionInfo);
             // 处理jySeq更新逻辑
             String jySeq = Objects.toString(equipment.get("jySeq"), "");
@@ -646,7 +657,6 @@ public class JgOverDesignServiceLifeServiceImpl extends BaseService<JgOverDesign
                 if (inspectionDetectionInfoDb != null) {
                     Bean.copyExistPropertis(inspectionDetectionInfo, inspectionDetectionInfoDb);
                     inspectionDetectionInfoDb.setRecDate(new Date());
-
                     inspectionDetectionInfoMapper.updateById(inspectionDetectionInfoDb);
                 }
                 continue;
@@ -760,7 +770,10 @@ public class JgOverDesignServiceLifeServiceImpl extends BaseService<JgOverDesign
         BeanUtil.copyProperties(jgOverDesignServiceLife, taskMessageDto);
         dto.setModel(taskMessageDto);
         dto.setNextExecuteUser(workflowResultDto.getNextExecutorRoleIds());
-        dto.setTaskContent("来自超设计使用年限变更业务办理," + "【申请单号：" + jgOverDesignServiceLife.getApplyNo() + "】");
+        dto.setTaskContent(
+                String.format("来自%s的业务办理，【申请单号：%s】",
+                        ObjectUtils.isEmpty(jgOverDesignServiceLife.getEquList()) ? "" : jgOverDesignServiceLife.getEquList(),
+                        jgOverDesignServiceLife.getApplyNo()));
         dto.setFlowCode(jgOverDesignServiceLife.getNextTaskId());
         list.add(dto);
         commonService.buildTaskModel(list);
@@ -855,6 +868,8 @@ public class JgOverDesignServiceLifeServiceImpl extends BaseService<JgOverDesign
                     .collect(Collectors.toList());
             List<JgUseRegistrationManage> registrationList = useRegistrationManageService.lambdaQuery()
                     .in(JgUseRegistrationManage::getUseRegistrationCode, useOrgCodes)
+                    .eq(JgUseRegistrationManage::getIsDelete, 0)
+                    .eq(JgUseRegistrationManage::getCertificateStatus, CertificateStatusEnum.YIDENGJI.getName())
                     .list();
             String companyAndOrg = overDesignServiceLife.getReceiveCompanyCode() + "_" + overDesignServiceLife.getReceiveOrgName();
             resultDataMap.putAll(Bean.BeantoMap(overDesignServiceLife));
@@ -952,6 +967,8 @@ public class JgOverDesignServiceLifeServiceImpl extends BaseService<JgOverDesign
         if (!useOrgCodes.isEmpty()) {
             List<JgUseRegistrationManage> registrationList = useRegistrationManageService.lambdaQuery()
                     .in(JgUseRegistrationManage::getUseRegistrationCode, useOrgCodes)
+                    .eq(JgUseRegistrationManage::getIsDelete, 0)
+                    .eq(JgUseRegistrationManage::getCertificateStatus, CertificateStatusEnum.YIDENGJI.getName())
                     .list();
 
             if (!registrationList.isEmpty()) {