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

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

@@ -642,6 +642,7 @@ public class JgOverDesignServiceLifeServiceImpl extends BaseService<JgOverDesign
         List<Map<String, Object>> equipmentLists = (List<Map<String, Object>>) jsonObject.get("equipmentLists");
         List<String> useOrgCodes = equipmentLists.stream()
                 .map(obj -> Objects.toString(obj.get("useOrgCode"), ""))
+                .distinct()
                 .collect(Collectors.toList());
         List<String> records = equipmentLists.stream()
                 .map(v -> Objects.toString(v.get("record"), ""))
@@ -771,46 +772,61 @@ public class JgOverDesignServiceLifeServiceImpl extends BaseService<JgOverDesign
         List<JgUseRegistrationManage> registrationList = useRegistrationManageService.lambdaQuery()
                 .in(JgUseRegistrationManage::getUseRegistrationCode, useOrgCodes)
                 .eq(JgUseRegistrationManage::getIsDelete, 0)
-                .eq(JgUseRegistrationManage::getCertificateStatus, CertificateStatusEnum.YIDENGJI.getName()).list();
+                .eq(JgUseRegistrationManage::getCertificateStatus, CertificateStatusEnum.YIDENGJI.getName())
+                .list();
+
         if (!CollectionUtils.isEmpty(registrationList)) {
-            useRegistrationManageService.updateBatchById(
-                    registrationList.stream().peek(v -> {
+            registrationList.forEach(v -> {
                 v.setIsOverDesign("1");
                 v.setVersion(v.getVersion() + 1);
-                    }).collect(Collectors.toList())
-            );
-            FeignClientResult<AgencyUserModel> agencyUserModelFeignClientResult = Privilege.agencyUserClient.queryByUserId(jgOverDesignServiceLife.getCreateUserId());
-            registrationList.forEach(v->{
-                JgCertificateChangeRecord jgCertificateChangeRecord = new JgCertificateChangeRecord();
-                jgCertificateChangeRecord.setApplyNo(jgOverDesignServiceLife.getApplyNo());
-                jgCertificateChangeRecord.setReceiveOrgName(jgOverDesignServiceLife.getReceiveOrgName());
-                jgCertificateChangeRecord.setAuditPassDate(new Date());
-                jgCertificateChangeRecord.setRegType(BusinessTypeEnum.JG_OVER_DESIGN_SERVICE_LIFE.getName());
-                jgCertificateChangeRecord.setRegDate(jgOverDesignServiceLife.getCreateDate());
-                jgCertificateChangeRecord.setChangeContent(jgOverDesignServiceLife.getUseUnitName()+"的"+agencyUserModelFeignClientResult.getResult().getRealName() +"办理了【" + BusinessTypeEnum.JG_OVER_DESIGN_SERVICE_LIFE.getName() + "】," + "单号【" + jgOverDesignServiceLife.getApplyNo() +
-                        "】" + ",办理日期" + DateUtil.format(jgOverDesignServiceLife.getCreateDate(), DatePattern.NORM_DATE_PATTERN));
-                jgCertificateChangeRecord.setRecUserId(jgOverDesignServiceLife.getRecUserId());
-                jgCertificateChangeRecord.setRecDate(new Date());
-                jgCertificateChangeRecord.setCreateDate(new Date());
-                jgCertificateChangeRecord.setCreateUserId(jgOverDesignServiceLife.getCreateUserId());
-                jgCertificateChangeRecord.setUseRegistrationCode(jgOverDesignServiceLife.getUseRegistrationCode());
-                jgCertificateChangeRecord.setCertificateNo(v.getCertificateNo());
-                jgCertificateChangeRecord.setUseUnitCreditCode(jgOverDesignServiceLife.getUseUnitCreditCode());
-                jgCertificateChangeRecord.setUseUnitName(jgOverDesignServiceLife.getUseUnitName());
-                jgCertificateChangeRecord.setEquCategory(jgOverDesignServiceLife.getEquCategoryName());
-                jgCertificateChangeRecord.setReceiveCompanyCode(jgOverDesignServiceLife.getReceiveOrgCode());
-                jgCertificateChangeRecord.setRoutePath(taskV2Model.getRoutePath());
-                // 保存证流水信息
-                jgCertificateChangeRecordService.save(jgCertificateChangeRecord);
-                List<JgCertificateChangeRecordEq> changeRecordEqs = designInfoList.stream().map(p->{
-                    JgCertificateChangeRecordEq jgCertificateChangeRecordEq = new JgCertificateChangeRecordEq();
-                    jgCertificateChangeRecordEq.setEquId(p.getRecord());
-                    jgCertificateChangeRecordEq.setChangeRecordId(jgCertificateChangeRecord.getSequenceNbr().toString());
-                    return jgCertificateChangeRecordEq;
-                }).collect(toList());
-                jgCertificateChangeRecordEqService.saveBatch(changeRecordEqs);
             });
+            useRegistrationManageService.updateBatchById(registrationList);
+        }
+
+        FeignClientResult<AgencyUserModel> agencyUserResult = Privilege.agencyUserClient.queryByUserId(jgOverDesignServiceLife.getCreateUserId());
+        String realName = agencyUserResult.getResult().getRealName();
+
+        List<JgCertificateChangeRecord> certificateChangeRecords = new ArrayList<>();
+        List<JgCertificateChangeRecordEq> certificateChangeRecordEqs = new ArrayList<>();
+
+        Date now = new Date();
+        for (JgUseRegistrationManage v : registrationList) {
+            JgCertificateChangeRecord record = new JgCertificateChangeRecord();
+            record.setApplyNo(jgOverDesignServiceLife.getApplyNo());
+            record.setReceiveOrgName(jgOverDesignServiceLife.getReceiveOrgName());
+            record.setAuditPassDate(now);
+            record.setRegType(BusinessTypeEnum.JG_OVER_DESIGN_SERVICE_LIFE.getName());
+            record.setRegDate(jgOverDesignServiceLife.getCreateDate());
+            record.setChangeContent(jgOverDesignServiceLife.getUseUnitName() + "的" + realName +
+                    "办理了【" + BusinessTypeEnum.JG_OVER_DESIGN_SERVICE_LIFE.getName() + "】,单号【" +
+                    jgOverDesignServiceLife.getApplyNo() + "】,办理日期" +
+                    DateUtil.format(jgOverDesignServiceLife.getCreateDate(), DatePattern.NORM_DATE_PATTERN));
+            record.setRecUserId(jgOverDesignServiceLife.getRecUserId());
+            record.setRecDate(now);
+            record.setCreateDate(now);
+            record.setCreateUserId(jgOverDesignServiceLife.getCreateUserId());
+            record.setUseRegistrationCode(jgOverDesignServiceLife.getUseRegistrationCode());
+            record.setCertificateNo(v.getCertificateNo());
+            record.setUseUnitCreditCode(jgOverDesignServiceLife.getUseUnitCreditCode());
+            record.setUseUnitName(jgOverDesignServiceLife.getUseUnitName());
+            record.setEquCategory(jgOverDesignServiceLife.getEquCategoryName());
+            record.setReceiveCompanyCode(jgOverDesignServiceLife.getReceiveOrgCode());
+            record.setRoutePath(taskV2Model.getRoutePath());
+            certificateChangeRecords.add(record);
+        }
+
+        jgCertificateChangeRecordService.saveBatch(certificateChangeRecords);
+        for (JgCertificateChangeRecord record : certificateChangeRecords) {
+            List<JgCertificateChangeRecordEq> eqs = designInfoList.stream()
+                    .map(p -> {
+                        JgCertificateChangeRecordEq eq = new JgCertificateChangeRecordEq();
+                        eq.setEquId(p.getRecord());
+                        eq.setChangeRecordId(record.getSequenceNbr().toString());
+                        return eq;
+                    }).collect(toList());
+            certificateChangeRecordEqs.addAll(eqs);
         }
+        jgCertificateChangeRecordEqService.saveBatch(certificateChangeRecordEqs);
     }
 
     private void buildTask(JgOverDesignServiceLife jgOverDesignServiceLife, WorkflowResultDto workflowResultDto) {