1.历史特殊登记生成管道的监管码

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

@@ -1133,8 +1133,8 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                 mapData.put("isFirstMerge", isFirstMerge);
                 // 装置表写入使用登记证编号、将装置名称写入到使用登记表
                 updateRegAndProjectContraption(jgUseRegistration, mapData, jgProjectContraption);
-                //首次合并，给工程装置生成设备代码和监管码
-                if (isFirstMerge){
+                // 首次合并 + 特殊登记，给工程装置生成设备代码和监管码
+                if (isFirstMerge || "2".equals(jgUseRegistration.getRegType())) {
                     Map<String, Object> createCodeMap = new HashMap<>();
                     createCodeMap.put("cityCode", jgProjectContraption.getCity());
                     createCodeMap.put("countyCode", jgProjectContraption.getCounty());
@@ -1165,7 +1165,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                     LambdaQueryWrapper<IdxBizJgOtherInfo> lambdaOth = new QueryWrapper<IdxBizJgOtherInfo>().lambda();
                     lambdaOth.eq(IdxBizJgOtherInfo::getRecord, String.valueOf(mapData.get("equipId")));
                     IdxBizJgOtherInfo otherInfo = otherInfoMapper.selectOne(lambdaOth);
-                    if (jgProjectContraption != null &&  (isMerge || (Boolean) mapData.get("isFirstMerge"))) {
+                    if (jgProjectContraption != null && (isMerge || (Boolean) mapData.get("isFirstMerge") || "2".equals(jgUseRegistration.getRegType()))) {
                         otherInfo.setSupervisoryCode(jgProjectContraption.getSupervisoryCode());
                         registerInfo.setEquCode(jgProjectContraption.getEquCode());
                     }
@@ -1175,7 +1175,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
 //                    equipment.put("inspectOrgName", mapData.getOrDefault("inspectOrgName", ""));
 //                    equipment.put("inspectConclusion", inspectConclusionName);
                     // 更新设备信息 && 生成使用登记证编号 && 同步es
-                    processMapData(sequenceNbr, mapData, jgUseRegistration, jgRegistrationHistory, registerInfo, otherInfo, taskV2Model,
+                    this.processMapData(sequenceNbr, mapData, jgUseRegistration, jgRegistrationHistory, registerInfo, otherInfo, taskV2Model,
                             jsonObject, flag, useRegistrationCode, equipment, isMerge);
                     // 查询设备制造信息
                     LambdaQueryWrapper<IdxBizJgFactoryInfo> factoryInfoWrapper = new LambdaQueryWrapper<>();
@@ -1577,7 +1577,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         jgUseRegistration.setSupervisoryCode(otherInfo.getSupervisoryCode());
 
         // 更新设备信息
-        updateEquipMessage(String.valueOf(sequenceNbr), jgUseRegistration, mapData, registerInfo, otherInfo, flag, useRegistrationCode, equipment);
+        this.updateEquipMessage(String.valueOf(sequenceNbr), jgUseRegistration, mapData, registerInfo, otherInfo, flag, useRegistrationCode, equipment);
         // 生成使用登记证编号
         if (!ObjectUtils.isEmpty(jgUseRegistration.getSupervisoryCode())) {
             if ("unit".equals(jgUseRegistration.getManageType())) {