Merge remote-tracking branch 'origin/develop_tzs_register_to_0715' into…

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

@@ -2476,11 +2476,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             // 使用登记信息
             JgUseRegistration jgUseRegistration = new JgUseRegistration();
             jgUseRegistration.setRegDate(new Date());
-            LambdaQueryWrapper<IdxBizJgOtherInfo> otherLambda = new QueryWrapper<IdxBizJgOtherInfo>().lambda();
-            otherLambda.eq(IdxBizJgOtherInfo::getRecord, map.get("equipId"));
-            IdxBizJgOtherInfo otherInfo = otherInfoMapper.selectOne(otherLambda);
-            String supervisoryCode = otherInfo.getSupervisoryCode();
-            jgUseRegistration.setSupervisoryCode(supervisoryCode);
+
             if (!ObjectUtils.isEmpty(map.get("otherAccessories"))) {
                 jgUseRegistration.setOtherAccessories(JSONObject.toJSONString(map.get("otherAccessories")));
             }
@@ -2587,7 +2583,8 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                 LambdaQueryWrapper<IdxBizJgRegisterInfo> lambdaReg = new QueryWrapper<IdxBizJgRegisterInfo>().lambda();
                 lambdaReg.eq(IdxBizJgRegisterInfo::getRecord, jgRelationEquip.getEquId());
                 IdxBizJgRegisterInfo registerInfo = idxBizJgRegisterInfoMapper.selectOne(lambdaReg);
-                registerInfo.setUseOrgCode(ValidationUtil.isEmpty(map.get("useRegistrationCode")) ? "" : String.valueOf(map.get("useRegistrationCode")));
+                registerInfo.setUseOrgCode(jgUseRegistration.getUseRegistrationCode());
+                idxBizJgRegisterInfoMapper.updateById(registerInfo);
 
                 // 查询设备制造信息
                 LambdaQueryWrapper<IdxBizJgFactoryInfo> factoryInfoWrapper = new LambdaQueryWrapper<>();
@@ -2615,6 +2612,14 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                 useInfo.setEstateUnitCreditCode(String.valueOf(map.get("estateUnitName")).split("_")[0]);
                 useInfo.setEstateUnitName(String.valueOf(map.get("estateUnitName")).split("_")[1]);
                 useInfoMapper.updateById(useInfo);
+
+                LambdaQueryWrapper<IdxBizJgOtherInfo> otherLambda = new QueryWrapper<IdxBizJgOtherInfo>().lambda();
+                otherLambda.eq(IdxBizJgOtherInfo::getRecord, map.get("equipId"));
+                IdxBizJgOtherInfo otherInfo = otherInfoMapper.selectOne(otherLambda);
+
+                // 生成监管码 96333码
+                this.createCode(map, jgUseRegistration, registerInfo, useInfo, otherInfo);
+
                 // 更新es
                 updateEsData(usePlace, map, otherInfo, jgUseRegistration, map);
 

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/resources/json/superviseBusinessCategory.json

@@ -30,7 +30,8 @@
     {
       "name": "移装告知",
       "code": "GZ_YZ",
-      "image": "upload/tzs/common/image/移装告知.png"
+      "image": "upload/tzs/common/image/移装告知.png",
+      "disable": true
     }
   ],
   "DJGL": [
@@ -47,7 +48,8 @@
     {
       "name": "移装变更登记",
       "code": "DJ_YZ",
-      "image": "upload/tzs/common/image/移装变更登记.png"
+      "image": "upload/tzs/common/image/移装变更登记.png",
+      "disable": true
     },
     {
       "name": "单位变更登记",
@@ -78,12 +80,14 @@
     {
       "name": "设备启用",
       "code": "SB_QY",
-      "image": "upload/tzs/common/image/设备启用.png"
+      "image": "upload/tzs/common/image/设备启用.png",
+      "disable": true
     },
     {
       "name": "设备停用",
       "code": "SB_TY",
-      "image": "upload/tzs/common/image/设备停用.png"
+      "image": "upload/tzs/common/image/设备停用.png",
+      "disable": true
     },
     {
       "name": "注销",