1.1.设备注销报废初稿代码提交

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

@@ -91,6 +91,8 @@ public class JgScrapCancelDto extends BaseDto {
     private String promoter;
 
     @ApiModelProperty(value = "终审通过时间")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonSerialize(using = BizCustomDateSerializer.class)
     private Date auditPassDate;
 
     @ApiModelProperty(value = "下一步任务ID")

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

@@ -26,7 +26,6 @@ import com.yeejoin.amos.boot.module.jg.api.vo.SortVo;
 import com.yeejoin.amos.boot.module.jg.biz.feign.TzsServiceFeignClient;
 import com.yeejoin.amos.boot.module.jg.biz.service.IIdxBizJgRegisterInfoService;
 import com.yeejoin.amos.boot.module.jg.flc.api.fegin.WorkFlowFeignService;
-import com.yeejoin.amos.boot.module.ymt.api.entity.OtherInfo;
 import com.yeejoin.amos.boot.module.ymt.api.entity.SuperviseInfo;
 import com.yeejoin.amos.boot.module.ymt.api.enums.ApplicationFormTypeEnum;
 import com.yeejoin.amos.boot.module.ymt.api.enums.EquimentEnum;
@@ -276,7 +275,6 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
      * @param noticeParams  参数
      */
     private void setUseRegisterInfo(JgScrapCancel jgScrapCancel, Map<String, Object> noticeParams) {
-        List<JgScrapCancelEq> JgScrapCancelEqList = new ArrayList<>();
         // 判断是否是报废气瓶业务处理
         if (CancelTypeEnum.SCRAPPED.getCode().equals(noticeParams.get("cancelType")) &&
                 CylinderTypeEnum.CYLINDER.getCode().equals(noticeParams.get("EQU_CATEGORY_CODE"))) {
@@ -449,7 +447,6 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
             // 发起流程
             if (!StringUtils.hasText(jgScrapCancelDto.getInstanceId())) {
                 // 未进流程直接发起并执行
-
                 List<ProcessTaskDTO> processTasks;
                 ActWorkflowBatchDTO actWorkflowBatchDTO = new ActWorkflowBatchDTO();
                 List<ActWorkflowStartDTO> list = new ArrayList<>();
@@ -505,40 +502,67 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
             }
             JgScrapCancel cancel = new JgScrapCancel();
             BeanUtils.copyProperties(jgScrapCancelDto, cancel);
+            this.setUseRegisterInfo(cancel, new HashMap<>(pageData));
             this.updateById(cancel);
             JgScrapCancel jgScrapCancel = new JgScrapCancel();
             BeanUtils.copyProperties(jgScrapCancelDto, jgScrapCancel, "useUnitName", "useUnitName");
-            LambdaUpdateWrapper<JgScrapCancelEq> updateWrapper = new LambdaUpdateWrapper<>();
-            updateWrapper.eq(JgScrapCancelEq::getEquipTransferId, jgScrapCancel.getSequenceNbr());
-            JgScrapCancelEq jgScrapCancelEq = new JgScrapCancelEq();
-            jgScrapCancelEq.setEquId(jgScrapCancelDto.getRecord());
-            jgScrapCancelEqMapper.update(jgScrapCancelEq, updateWrapper);
-
+            this.insertJgScrapCancelEqAfterDelete(jgScrapCancel, pageData);
             commonService.saveExecuteFlowData2Redis(jgScrapCancel.getInstanceId(), buildInstanceRuntimeData(jgScrapCancel));
         } else {
-            if (!ObjectUtils.isEmpty(jgScrapCancelDto.getSEQUENCE_NBR()) && !"null".equals(jgScrapCancelDto.getSEQUENCE_NBR())) {
-                LambdaQueryWrapper<OtherInfo> otherLambda = new QueryWrapper<OtherInfo>().lambda();
-                otherLambda.eq(OtherInfo::getRecord, jgScrapCancelDto.getSEQUENCE_NBR());
-                OtherInfo otherInfo = otherInfoMapper.selectOne(otherLambda);
-                String supervisoryCode = otherInfo.getSupervisoryCode();
-                jgScrapCancelDto.setSupervisoryCode(supervisoryCode);
-            }
             // 更新操作
             JgScrapCancel bean = new JgScrapCancel();
             BeanUtils.copyProperties(jgScrapCancelDto, bean);
             bean.setCancelCertificate(JSON.toJSONString(jgScrapCancelDto.getCancelCertificateList()));
+            this.setUseRegisterInfo(bean, new HashMap<>(pageData));
             this.updateById(bean);
-            LambdaUpdateWrapper<JgScrapCancelEq> updateWrapper = new LambdaUpdateWrapper<>();
-            updateWrapper.eq(JgScrapCancelEq::getEquipTransferId, jgScrapCancelDto.getSequenceNbr());
-            JgScrapCancelEq jgScrapCancelEq = new JgScrapCancelEq();
-            jgScrapCancelEq.setEquId(jgScrapCancelDto.getRecord());
-            jgScrapCancelEqMapper.update(jgScrapCancelEq, updateWrapper);
+            this.insertJgScrapCancelEqAfterDelete(bean, pageData);
         }
-        save2HisData(pageData, jgScrapCancelDto.getSequenceNbr().toString());
-        commonService.saveOrUpdateHistory(getRegistrationClass(jgScrapCancelDto.getCancelType()), pageData, jgScrapCancelDto.getRecord(), jgScrapCancelDto.getSequenceNbr().toString());
+        commonService.saveOrUpdateHistory(getRegistrationClass(jgScrapCancelDto.getCancelType()), pageData, "", jgScrapCancelDto.getSequenceNbr().toString());
         return jgScrapCancelDto;
     }
 
+    private void insertJgScrapCancelEqAfterDelete(JgScrapCancel jgScrapCancel, JSONObject pageData) {
+        this.deleteJgScrapCancelEq(jgScrapCancel);
+        List<JgScrapCancelEq> JgScrapCancelEqList = new ArrayList<>();
+        // 判断是否是报废气瓶业务处理
+        if (CancelTypeEnum.SCRAPPED.getCode().equals(pageData.get("cancelType")) &&
+                CylinderTypeEnum.CYLINDER.getCode().equals(pageData.get("EQU_CATEGORY_CODE"))) {
+            List<Map<String, Object>> list = (List<Map<String, Object>>) pageData.get("equipments");
+            for (Map<String, Object> equip : list) {
+                JgScrapCancelEq jgScrapCancelEq = new JgScrapCancelEq();
+                jgScrapCancelEq.setEquId(equip.get("SEQUENCE_NBR").toString());
+                jgScrapCancelEq.setUseRegistrationCode(equip.get("USE_ORG_CODE").toString());
+                jgScrapCancelEq.setEquipTransferId(String.valueOf(jgScrapCancel.getSequenceNbr()));
+                jgScrapCancelEq.setEquCode(equip.get("EQU_CODE") != null ? equip.get("EQU_CODE").toString() : "");
+                JgScrapCancelEqList.add(jgScrapCancelEq);
+            }
+        } else {
+            List<Map<String, Object>> certificates;
+            // 证列表
+            if (CylinderTypeEnum.SPECIAL_CYLINDER.getCode().equals(pageData.get("EQU_CATEGORY_CODE"))) {
+                certificates = (List<Map<String, Object>>) pageData.get("cylCertificates");
+            } else {
+                certificates = (List<Map<String, Object>>) pageData.get("certificates");
+            }
+            // 使用登记证表idList
+            List<String> registrationIdList = certificates.stream().map(item -> item.get("sequenceNbr").toString()).collect(Collectors.toList());
+            List<JSONObject> equipmentList = jgUseRegistrationManageService.queryEquByCertificateSeqList(registrationIdList.stream().map(Long::parseLong).collect(Collectors.toList()));
+            for (JSONObject equip : equipmentList) {
+                JgScrapCancelEq jgScrapCancelEq = new JgScrapCancelEq();
+                jgScrapCancelEq.setUseRegistrationCode(equip.getString("USE_ORG_CODE"));
+                jgScrapCancelEq.setEquipTransferId(String.valueOf(jgScrapCancel.getSequenceNbr()));
+                jgScrapCancelEq.setEquId(equip.getString("SEQUENCE_NBR"));
+                jgScrapCancelEq.setEquCode(equip.getString("EQU_CODE"));
+                JgScrapCancelEqList.add(jgScrapCancelEq);
+            }
+        }
+        jgScrapCancelEqService.saveBatch(JgScrapCancelEqList);
+    }
+
+    private void deleteJgScrapCancelEq(JgScrapCancel jgScrapCancel) {
+        jgScrapCancelEqMapper.delete(new LambdaQueryWrapper<JgScrapCancelEq>().eq(JgScrapCancelEq::getEquipTransferId, jgScrapCancel.getSequenceNbr()));
+    }
+
     private String getRegistrationClass(String cancelType) {
         return CancelTypeEnum.SCRAPPED.getCode().equals(cancelType) ? CancelTypeEnum.SCRAPPED.getName() : CancelTypeEnum.TRANSFER.getName();
     }
@@ -829,7 +853,7 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
     private void updateInfoOther(JgScrapCancel jgScrapCancel, String routePath) {
         LambdaQueryWrapper<JgScrapCancelEq> lambdaEq = new LambdaQueryWrapper<>();
         lambdaEq.eq(JgScrapCancelEq::getEquipTransferId, jgScrapCancel.getSequenceNbr());
-        lambdaEq.select(JgScrapCancelEq::getEquId);
+        lambdaEq.select(JgScrapCancelEq::getEquId, JgScrapCancelEq::getUseRegistrationCode);
         List<JgScrapCancelEq> jgScrapCancelEqList = jgScrapCancelEqMapper.selectList(lambdaEq);
         Map<String, Object> map1 = new HashMap<>();
         List<String> equipIds = jgScrapCancelEqList.stream().map(JgScrapCancelEq::getEquId).collect(Collectors.toList());