fix(jg)：使用登记证编号规则修改

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

@@ -1750,7 +1750,7 @@ public class CommonServiceImpl implements ICommonService {
      * @param supervisoryCompanyCode 接收机构单位代码
      * @return 使用登记编号
      */
-    public String generateRegistrationCode(String equipId, String supervisoryCode, String supervisoryCompanyCode) {
+    public String generateRegistrationCode(String equipId, String supervisoryCode, String supervisoryCompanyCode, boolean isUnit) {
         // 根据设备id查询设备类别、品种
         LambdaQueryWrapper<RegistrationInfo> equipWrapper = new LambdaQueryWrapper<>();
         equipWrapper.eq(RegistrationInfo::getRecord, equipId);
@@ -1765,16 +1765,14 @@ public class CommonServiceImpl implements ICommonService {
                         EquipTypeEnum.getMessage(equCategory.substring(0, 1));
 
                 // 设备代码中间两位
-                String equipType2MidDigits;
-                equipType2MidDigits = equCategory.substring(1, 3);
-                //if (ValidationUtil.isEmpty(equDefine)) {
-                    // 没有设备品种的设备取设备类别代码中间两位
-
-                //}
-                //else {
-                //    // 设备品种代码中间两位
-                //    equipType2MidDigits = equDefine.substring(1, 3);
-                //}
+                String equipType2MidDigits = equCategory.substring(1, 3);
+                //台套还是取品种的中间两位
+                if (!isUnit) {
+                    if (!ValidationUtil.isEmpty(equDefine)) {
+                        equipType2MidDigits = equDefine.substring(1, 3);
+                    }
+                }
+
                 // 登记机关代号
                 String city = supervisoryCode.substring(0, 1);
                 // 西咸新区监管码对应的设备使用登记证还按咸阳(D)生成

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

@@ -920,7 +920,7 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
                     Map<String, String> supervisoryCodeMap = this.createSupervisoryCode(historyData);
                     supervisoryCode = supervisoryCodeMap.get("superviseCode");
                     code96333 = supervisoryCodeMap.get("code96333");
-                    useRegistrationCode.set(commonServiceImpl.generateRegistrationCode(device.getEquId(), supervisoryCode, transfer.getReceiveCompanyCode()));
+                    useRegistrationCode.set(commonServiceImpl.generateRegistrationCode(device.getEquId(), supervisoryCode, transfer.getReceiveCompanyCode(), false));
                     useRegistrationCodeList.add(String.valueOf(useRegistrationCode));
                     isUpdateRegistrationCode.set(true);
                 }else{
@@ -934,7 +934,7 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
                         Map<String, String> supervisoryCodeMap = this.createSupervisoryCode(historyData);
                         supervisoryCode = supervisoryCodeMap.get("superviseCode");
                         code96333 = supervisoryCodeMap.get("code96333");
-                        useRegistrationCode.set(commonServiceImpl.generateRegistrationCode(device.getEquId(), supervisoryCode, transfer.getReceiveCompanyCode()));
+                        useRegistrationCode.set(commonServiceImpl.generateRegistrationCode(device.getEquId(), supervisoryCode, transfer.getReceiveCompanyCode(), false));
                         useRegistrationCodeList.add(String.valueOf(useRegistrationCode));
                         isUpdateRegistrationCode.set(true);
                     }

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

@@ -1204,7 +1204,8 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         if (!ObjectUtils.isEmpty(jgUseRegistration.getSupervisoryCode())) {
             if ("unit".equals(jgUseRegistration.getManageType())) {
                 if ((Boolean) mapData.get("isFirstEquip")) {
-                    String code = flag ? useRegistrationCode : commonServiceImpl.generateRegistrationCode(String.valueOf(mapData.get("equipId")), jgUseRegistration.getSupervisoryCode(), jgUseRegistration.getReceiveCompanyCode());
+                    String code = flag ? useRegistrationCode : commonServiceImpl.generateRegistrationCode(String.valueOf(mapData.get("equipId")), jgUseRegistration.getSupervisoryCode(),
+                            jgUseRegistration.getReceiveCompanyCode(), true);
                     jgUseRegistration.setUseRegistrationCode(code);
                     jgUseRegistration.setAuditPassDate(new Date());
                     registerInfo.setUseOrgCode(code);
@@ -1224,7 +1225,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                     idxBizJgRegisterInfoService.update(lambda);
                 }
             } else {
-                String code = commonServiceImpl.generateRegistrationCode(String.valueOf(mapData.get("equipId")), jgUseRegistration.getSupervisoryCode(), jgUseRegistration.getReceiveCompanyCode());
+                String code = commonServiceImpl.generateRegistrationCode(String.valueOf(mapData.get("equipId")), jgUseRegistration.getSupervisoryCode(), jgUseRegistration.getReceiveCompanyCode(), false);
                 jgUseRegistration.setUseRegistrationCode(code);
                 jgUseRegistration.setAuditPassDate(new Date());
                 registerInfo.setUseOrgCode(code);