21436 大型游乐设施-无动力游乐设施-空中飞人系列，设备完成使用登记正常生产监管码，办理改造变更登记之后，设备无监管码信息

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

@@ -11,6 +11,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.google.common.collect.ImmutableMap;
 import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.common.api.enums.ReginStepEnum;
@@ -59,6 +60,7 @@ import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
 import javax.servlet.http.HttpServletResponse;
 import java.text.SimpleDateFormat;
 import java.util.*;
@@ -66,8 +68,8 @@ import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.Collectors;
+
 import static com.yeejoin.amos.boot.module.jg.biz.service.impl.JgUseRegistrationServiceImpl.getAuditPassedDate;
-import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 
 /**
  * 移装变更登记登记服务实现类
@@ -207,7 +209,7 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
                         throw new BadRequest("区内移装只能选择与设备地址中相同地市进行移装！");
                     }
                 });
-            } else{
+            } else {
                 deviceList.forEach(device -> {
                     String deviceCity = Arrays.stream(((String) device.get("USE_PLACE_CODE")).split("#"))
                             .skip(1)
@@ -923,14 +925,13 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
                     useRegistrationCode.set(commonServiceImpl.generateRegistrationCode(device.getEquId(), supervisoryCode, transfer.getReceiveCompanyCode(), false));
                     useRegistrationCodeList.add(String.valueOf(useRegistrationCode));
                     isUpdateRegistrationCode.set(true);
-                }else{
-                    IdxBizJgUseInfo useInfo = useInfoService.getOneData(device.getEquId());
+                } else {
                     JSONObject newPosition = JSON.parseObject(historyData.getChangeData());
                     String county = newPosition.getString("transferCounty").split("_")[0];
                     boolean shouldUpdateCode = Arrays.stream(ReginStepEnum.values())
                             .map(ReginStepEnum::getCode)
                             .anyMatch(code -> code.equals(county));
-                    if (shouldUpdateCode){
+                    if (shouldUpdateCode) {
                         Map<String, String> supervisoryCodeMap = this.createSupervisoryCode(historyData);
                         supervisoryCode = supervisoryCodeMap.get("superviseCode");
                         code96333 = supervisoryCodeMap.get("code96333");
@@ -1004,7 +1005,8 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
      * @param record  设备Id
      * @param newData 设备移装的新数据
      */
-    public void replacementHistoryData(String record, JgChangeRegistrationTransfer transfer, JgRegistrationHistory newData, String supervisoryCode, String code96333) {
+    public void replacementHistoryData(String record, JgChangeRegistrationTransfer transfer,
+                                       JgRegistrationHistory newData, String supervisoryCode, String code96333) {
 
         if (!ValidationUtil.isEmpty(record) && !ValidationUtil.isEmpty(transfer.getApplyNo())) {
             //查询设备旧数据
@@ -1110,7 +1112,9 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
                 }
                 useInfo.setEquState("1");
                 useInfoService.saveOrUpdateData(useInfo);
-                otherInfo.setSupervisoryCode(supervisoryCode);
+                if (!StringUtils.isEmpty(supervisoryCode)) {
+                    otherInfo.setSupervisoryCode(supervisoryCode);
+                }
                 otherInfo.setCode96333(code96333);
                 otherInfoService.saveOrUpdateData(otherInfo);
             }
@@ -1143,7 +1147,8 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
      * @param useRegistrationCode      使用注册登记证编号
      * @param isUpdateRegistrationCode 是否更新使用登记证编号
      */
-    public void updateRegisterInfoAndEsData(String equId, JgRegistrationHistory newData, String useRegistrationCode, String supervisoryCode, String code96333, AtomicBoolean isUpdateRegistrationCode) {
+    public void updateRegisterInfoAndEsData(String equId, JgRegistrationHistory newData, String useRegistrationCode,
+                                            String supervisoryCode, String code96333, AtomicBoolean isUpdateRegistrationCode) {
         //更新使用注册登记证编号
         if (isUpdateRegistrationCode.get()) {
             idxBizJgRegisterInfoMapper.updateUseOrgCodeByEquip(equId, useRegistrationCode);
@@ -1215,7 +1220,9 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
         if (isUpdateRegistrationCode.get()) {
             map1.put("EQU_STATE", "1");
             map1.put("USE_ORG_CODE", useRegistrationCode);
-            map1.put("SUPERVISORY_CODE", supervisoryCode);
+            if (!StringUtils.isEmpty(supervisoryCode)) {
+                map1.put("SUPERVISORY_CODE", supervisoryCode);
+            }
             map1.put("CODE96333", code96333);
         }
         resultMap.put(equId, map1);