Merge branch 'develop_tzs_register' of…

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

@@ -425,6 +425,7 @@ public class DataDockServiceImpl {
         if (!ValidationUtil.isEmpty(designInfo)) {
             designInfo.setRecord(record);
             designInfo.setRecDate(new Date());
+            designInfo.setDesignIsComplete("2");
             idxBizJgDesignInfoService.save(designInfo);
         }
     }
@@ -982,7 +983,7 @@ public class DataDockServiceImpl {
                     }
                 }
                 if (equCodeList.contains(data.getEquCode())) {
-                    rowError.append("设备代码不能重复；");
+                    rowError.append("设备代码不能重复,").append(data.getEquCode());
                 }
                 this.checkEquCodeUniqueness(data.getEquCode(), rowError);
             } else {

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

@@ -4315,6 +4315,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
             }
             designInfo.setDesignDoc(designDoc);
             designInfo.setDesignStandard(designStandard);
+            designInfo.setDesignIsComplete("2");
             designInfo.setOtherAccessoriesDes(otherAccessoriesDes);
             designInfoList.add(designInfo);
 

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

@@ -1291,7 +1291,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                                 .applyNo(jgUseRegistration.getApplyNo())
                                 .businessType(BusinessTypeEnum.JG_USAGE_REGISTRATION.getName())
                                 .businessId(jgUseRegistration.getSequenceNbr() + "")
-                                .equId(Objects.toString(equipmentMap.get("equipId"),""))
+                                .equId(Objects.toString(equipmentMap.get("record"),""))
                                 .approvalUnit(jgUseRegistration.getReceiveOrgName())
                                 .approvalUnitCode(jgUseRegistration.getReceiveCompanyCode())
                                 .changeContent(BusinessTypeEnum.JG_USAGE_REGISTRATION.getName() + "业务办理")