feat(jg)： 压力管道后续业务改造变更登记

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/mapper/JgRegistrationHistoryMapper.java

@@ -15,8 +15,8 @@ public interface JgRegistrationHistoryMapper extends BaseMapper<JgRegistrationHi
     @Select("select sequence_nbr from tzs_jg_registration_history where equ_id = #{equid} and current_document_id = #{documentId}")
     Long getSequenceNbrByEquidAndDocumentId(@Param("equid") String equid, @Param("documentId") String documentId);
 
-    @Select("select sequence_nbr from tzs_jg_registration_history where registration_class = #{registratioClass} and current_document_id = #{documentId} and is_delete = 0")
-    Long getSequenceNbrByRegistratioClassAndDocumentId(@Param("registratioClass") String registratioClass, @Param("documentId") String documentId);
+    @Select("select sequence_nbr from tzs_jg_registration_history where current_document_id = #{documentId} and is_delete = 0")
+    Long getSequenceNbrByRegistratioClassAndDocumentId(@Param("documentId") String documentId);
 
     JgRegistrationHistory queryLatestRegistrationHistory(@Param("projectContraptionSeq") Long projectContraptionSeq);
 }

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

@@ -105,7 +105,6 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
     public static final String USC_UNIT_CREDIT_CODE = "USC_UNIT_CREDIT_CODE";
     private final List<String> NOT_FLOWING_STATE = Arrays.asList("使用单位待提交", "一级受理已驳回", "使用单位已撤回", "已作废", "已完成");
 
-    private final static String BUSINESS_TYPE = "改造登记";
     private final static String BUSINESS_TYPE_KEY = "changeRegistration";
     @Autowired
     TzsServiceFeignClient tzsServiceFeignClient;
@@ -304,11 +303,11 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
                 CompanyBo companyBo = commonServiceImpl.getOneCompany(jgChangeRegistrationReform.getReceiveCompanyCode());
                 jgChangeRegistrationReform.setReceiveCompanyOrgCode(companyBo.getOrgCode());
                 JgRegistrationHistory jgRegistrationHistory = new JgRegistrationHistory();
-                jgRegistrationHistory.setSequenceNbr(jgRegistrationHistoryMapper.getSequenceNbrByRegistratioClassAndDocumentId(BUSINESS_TYPE, String.valueOf(map.get("applyNo"))));
+                jgRegistrationHistory.setSequenceNbr(jgRegistrationHistoryMapper.getSequenceNbrByRegistratioClassAndDocumentId(String.valueOf(map.get("applyNo"))));
                 //使用登记编号
                 jgRegistrationHistory.setUseRegistrationCode(idxBizJgRegisterInfoMapper.getUseOrgCodeByEquip(equipId));
                 //登记类别
-                jgRegistrationHistory.setRegistrationClass(BUSINESS_TYPE);
+                jgRegistrationHistory.setRegistrationClass(BusinessTypeEnum.JG_RENOVATION_REGISTRATION.getName());
                 //设备id
                 jgRegistrationHistory.setEquId(equipId);
                 //修改数据
@@ -332,7 +331,6 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
                     JgChangeRegistrationReformEq jgChangeRegistrationReformEq = jgChangeRegistrationReformEqMapper.selectOne(new QueryWrapper<JgChangeRegistrationReformEq>().eq("equip_transfer_id", jgChangeRegistrationReform.getSequenceNbr()));
                     jgChangeRegistrationReformEq.setEquId(equipId);
                     jgChangeRegistrationReformEqMapper.updateById(jgChangeRegistrationReformEq);
-                    //jgRegistrationHistory.setSequenceNbr(jgRegistrationHistoryMapper.getSequenceNbrByRegistratioClassAndDocumentId(BUSINESS_TYPE, String.valueOf(map.get("applyNo"))));
                     jgRegistrationHistoryMapper.updateById(jgRegistrationHistory);
                 } else {
                     //暂存处理
@@ -420,7 +418,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
                 //使用登记编号
                 jgRegistrationHistory.setUseRegistrationCode(map.getString("useRegistrationCode"));
                 //登记类别
-                jgRegistrationHistory.setRegistrationClass(BUSINESS_TYPE);
+                jgRegistrationHistory.setRegistrationClass(BusinessTypeEnum.JG_RENOVATION_REGISTRATION.getName());
                 //设备id
                 jgRegistrationHistory.setEquId(jgProjectContraption.getSequenceNbr().toString());
                 //修改数据
@@ -445,7 +443,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
                     jgChangeRegistrationReformEqMapper.delete(new LambdaQueryWrapper<JgChangeRegistrationReformEq>().eq(JgChangeRegistrationReformEq::getEquipTransferId, jgChangeRegistrationReform.getSequenceNbr()));
                     saveEqRelation(reginParams, equipmentLists, jgChangeRegistrationReform);
                     // 2.历史表更新
-                    jgRegistrationHistory.setSequenceNbr(jgRegistrationHistoryMapper.getSequenceNbrByRegistratioClassAndDocumentId(BUSINESS_TYPE, String.valueOf(map.get("applyNo"))));
+                    jgRegistrationHistory.setSequenceNbr(jgRegistrationHistoryMapper.getSequenceNbrByRegistratioClassAndDocumentId(String.valueOf(map.get("applyNo"))));
                     jgRegistrationHistoryMapper.updateById(jgRegistrationHistory);
                 } else {
                     // 新增逻辑
@@ -799,10 +797,10 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
         jgCertificateChangeRecord.setApplyNo(jgChangeRegistrationReform.getApplyNo());
         jgCertificateChangeRecord.setReceiveOrgName(jgChangeRegistrationReform.getReceiveOrgName());
         jgCertificateChangeRecord.setAuditPassDate(new Date());
-        jgCertificateChangeRecord.setRegType(BUSINESS_TYPE);
+        jgCertificateChangeRecord.setRegType(BusinessTypeEnum.JG_RENOVATION_REGISTRATION.getName());
         jgCertificateChangeRecord.setRegDate(jgChangeRegistrationReform.getCreateDate());
         FeignClientResult<AgencyUserModel> agencyUserModelFeignClientResult = Privilege.agencyUserClient.queryByUserId(jgChangeRegistrationReform.getCreateUserId());
-        jgCertificateChangeRecord.setChangeContent(jgChangeRegistrationReform.getUseUnitName()+"的"+agencyUserModelFeignClientResult.getResult().getRealName() +"办理了【" + BUSINESS_TYPE + "】," + "单号【" + jgChangeRegistrationReform.getApplyNo() +
+        jgCertificateChangeRecord.setChangeContent(jgChangeRegistrationReform.getUseUnitName()+"的"+agencyUserModelFeignClientResult.getResult().getRealName() +"办理了【" + BusinessTypeEnum.JG_RENOVATION_REGISTRATION.getName() + "】," + "单号【" + jgChangeRegistrationReform.getApplyNo() +
                 "】" + ",办理日期" + DateUtil.format(jgChangeRegistrationReform.getAuditPassDate(),DatePattern.NORM_DATE_PATTERN));
         jgCertificateChangeRecord.setRecUserId(jgChangeRegistrationReform.getRecUserId());
         jgCertificateChangeRecord.setRecDate(new Date());
@@ -879,10 +877,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
     public void saveRecord(String equipId, JgChangeRegistrationReform jgChangeRegistrationReform, TaskV2Model taskV2Model) {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
         JgRegistrationHistory jgRegistrationHistory = jgRegistrationHistoryMapper.selectOne(new QueryWrapper<JgRegistrationHistory>()
-//                .eq("equ_id", equipId)
-                .eq("current_document_id", jgChangeRegistrationReform.getApplyNo())
-                .eq("registration_class", BUSINESS_TYPE));
-
+                .eq("current_document_id", jgChangeRegistrationReform.getApplyNo()));
         JSONObject object = JSONObject.parseObject(jgRegistrationHistory.getChangeData());
         // 更新使用登记证信息
         JgUseRegistrationManage useRegistrationCode = jgUseRegistrationManageService.lambdaQuery()
@@ -894,10 +889,10 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
         jgCertificateChangeRecord.setApplyNo(jgChangeRegistrationReform.getApplyNo());
         jgCertificateChangeRecord.setReceiveOrgName(jgChangeRegistrationReform.getReceiveOrgName());
         jgCertificateChangeRecord.setAuditPassDate(new Date());
-        jgCertificateChangeRecord.setRegType(BUSINESS_TYPE);
+        jgCertificateChangeRecord.setRegType(BusinessTypeEnum.JG_NAME_CHANGE_REGISTRATION.getName());
         jgCertificateChangeRecord.setRegDate(jgChangeRegistrationReform.getCreateDate());
         FeignClientResult<AgencyUserModel> agencyUserModelFeignClientResult = Privilege.agencyUserClient.queryByUserId(jgChangeRegistrationReform.getCreateUserId());
-        jgCertificateChangeRecord.setChangeContent(jgChangeRegistrationReform.getUseUnitName()+"的"+agencyUserModelFeignClientResult.getResult().getRealName() +"办理了【" + BUSINESS_TYPE + "】," + "单号【" + jgChangeRegistrationReform.getApplyNo() +
+        jgCertificateChangeRecord.setChangeContent(jgChangeRegistrationReform.getUseUnitName()+"的"+agencyUserModelFeignClientResult.getResult().getRealName() +"办理了【" + BusinessTypeEnum.JG_NAME_CHANGE_REGISTRATION.getName() + "】," + "单号【" + jgChangeRegistrationReform.getApplyNo() +
                 "】" + ",办理日期" + sdf.format(jgChangeRegistrationReform.getAuditPassDate()));
         jgCertificateChangeRecord.setRecUserId(jgChangeRegistrationReform.getRecUserId());
         jgCertificateChangeRecord.setRecDate(new Date());
@@ -1070,8 +1065,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
         this.doCompensate(jgChangeRegistrationReform);
         Map<String, Object> detail = new HashMap<>();
         JgRegistrationHistory jgRegistrationHistory = jgRegistrationHistoryMapper.selectOne(new QueryWrapper<JgRegistrationHistory>()
-                .eq("current_document_id", jgChangeRegistrationReform.getApplyNo())
-                .eq("registration_class", BUSINESS_TYPE));
+                .eq("current_document_id", jgChangeRegistrationReform.getApplyNo()));
         Map<String, Object> originalData = JSONObject.parseObject(jgRegistrationHistory.getChangeData(), Map.class);
         detail.putAll(originalData);
         jgChangeRegistrationReform.setReceiveCompanyCode(jgChangeRegistrationReform.getReceiveOrgCode() + "_" + jgChangeRegistrationReform.getReceiveOrgName());
@@ -1122,8 +1116,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
 
         JgRegistrationHistory jgRegistrationHistory = jgRegistrationHistoryMapper.selectOne(new QueryWrapper<JgRegistrationHistory>()
                 .eq("equ_id", equipId)
-                .eq("current_document_id", applyNo)
-                .eq("registration_class", BUSINESS_TYPE));
+                .eq("current_document_id", applyNo));
 
         if (!ObjectUtils.isEmpty(jgRegistrationHistory)) {
             //当前数据
@@ -1433,7 +1426,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
      */
     public String getSummaryInfo(JgChangeRegistrationReform jgChangeRegistrationReform) {
         String result = "发起【%s】的业务申请，【申请单号：%s】";
-        return String.format(result, BUSINESS_TYPE, jgChangeRegistrationReform.getApplyNo());
+        return String.format(result, BusinessTypeEnum.JG_RENOVATION_REGISTRATION.getName(), jgChangeRegistrationReform.getApplyNo());
     }
 
     /**
@@ -1458,7 +1451,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
             taskModelDto.setRelationId(String.valueOf(jgChangeRegistrationReform.getSequenceNbr()));
             taskModelDto.setModel(conveterTaskMessageDTO(jgChangeRegistrationReform));
         } else {
-            List<WorkflowResultDto> workflowResultDtoList = commonServiceImpl.buildWorkFlowInfo(Arrays.asList(processTaskDTO));
+            List<WorkflowResultDto> workflowResultDtoList = commonServiceImpl.buildWorkFlowInfo(Collections.singletonList(processTaskDTO));
             WorkflowResultDto workflowResultDto = conveterProcessTaskDTO2WorkflowResultDto(processTaskDTO);
             //工作流创建时间
             taskModelDto.setFlowCreateDate(jgChangeRegistrationReform.getCreateDate());
@@ -1615,6 +1608,8 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
             case "已完成":
                 // 1.技术参数恢复原数据
                 this.restoreTechParams(jgChangeRegistrationReform);
+                // 2.记录证履历，删除设备履历
+                this.deleteResume(jgChangeRegistrationReform);
                 break;
             default:
                 // 流程中（驳回、撤回等）
@@ -1635,6 +1630,49 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
         }
     }
 
+    private void deleteResume(JgChangeRegistrationReform jgChangeRegistrationReform) {
+        JgCertificateChangeRecord changeRecord = new JgCertificateChangeRecord();
+        changeRecord.setApplyNo(jgChangeRegistrationReform.getApplyNo());
+        changeRecord.setAuditPassDate(new Date());
+        changeRecord.setRegType(BusinessTypeEnum.JG_NAME_CHANGE_REGISTRATION.getName());
+        changeRecord.setRegDate(jgChangeRegistrationReform.getCreateDate());
+        changeRecord.setChangeContent(this.buildVoidRecordContent(jgChangeRegistrationReform));//变更内容
+        changeRecord.setUseRegistrationCode(jgChangeRegistrationReform.getUseRegistrationCode());//登记编号
+        changeRecord.setReceiveOrgName(jgChangeRegistrationReform.getReceiveOrgName());
+        changeRecord.setReceiveCompanyCode(jgChangeRegistrationReform.getReceiveCompanyCode());//接收机构公司代码
+        changeRecord.setUseUnitCreditCode(jgChangeRegistrationReform.getUseUnitCreditCode());//使用单位统一信用代码
+        changeRecord.setUseUnitName(jgChangeRegistrationReform.getUseUnitName());//使用单位名称
+        changeRecord.setCreateDate(new Date());
+        changeRecord.setRecUserId(RequestContext.getExeUserId());
+        changeRecord.setRoutePath(this.getEarlyReformRouthPath(jgChangeRegistrationReform));
+        jgCertificateChangeRecordService.save(changeRecord);
+        jgResumeInfoService.deleteByBusinessId(jgChangeRegistrationReform.getSequenceNbr() + "");
+    }
+
+    /**
+     * 查询改造变更登记的记录的证流水，取详情地址
+     * @param jgChangeRegistrationReform 单据信息
+     * @return 改造变更登记详情地址
+     */
+    private String getEarlyReformRouthPath(JgChangeRegistrationReform jgChangeRegistrationReform) {
+        JgCertificateChangeRecord certificateChangeRecord = jgCertificateChangeRecordService.lambdaQuery().eq(JgCertificateChangeRecord::getApplyNo, jgChangeRegistrationReform.getApplyNo()).select(BaseEntity::getSequenceNbr, JgCertificateChangeRecord::getRoutePath).last("limit 1").one();
+        return Optional.ofNullable(certificateChangeRecord).map(JgCertificateChangeRecord::getRoutePath).orElse(null);
+    }
+
+    /**
+     * 作废的证变更内容
+     *
+     * @param obj JgUseRegistration
+     * @return result
+     */
+    private String buildVoidRecordContent(JgChangeRegistrationReform obj) {
+        ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
+        String companyType = reginParams.getCompany().getCompanyType();
+        //监管单位 作废了【使用功能登记】 ，单号【DWBG202407050001】，作废日期2024-07-05
+        return companyType + "作废了【" + BusinessTypeEnum.JG_RENOVATION_REGISTRATION.getName() + "】，" +
+                "单号【" + obj.getApplyNo() + "】，申请日期" + DateUtil.formatDate(obj.getCreateDate());
+    }
+
     private void finishedTask(JgChangeRegistrationReform jgChangeRegistrationReform) {
         HashMap<String, Object> taskMap = new HashMap<>();
         taskMap.put("taskStatus", FlowStatusEnum.TO_BE_FINISHED.getCode());

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

@@ -2903,7 +2903,6 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
      *
      * @param useRegistrationSeqs
      * @param category
-     * @param whetherToFilterStatus 是否过滤设备状态 是：true（过滤设备状态为在用），否：false（所有的）
      * @return
      */
     public List<CompletableFuture<byte[]>> getExportSummaryBasicInfoData(List<Long> useRegistrationSeqs, String category, String type, Set<String> projectContraptionIdList) {