refactor(amos-boot-module-jg): 优化 96333 二维码生成逻辑

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

@@ -5,17 +5,17 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.yeejoin.amos.boot.biz.common.annotation.FieldMapping;
-import com.yeejoin.amos.boot.biz.common.annotation.ResultFieldMapping;
-import com.yeejoin.amos.boot.biz.common.utils.SnowflakeIdUtil;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.google.common.collect.ImmutableMap;
+import com.yeejoin.amos.boot.biz.common.annotation.FieldMapping;
+import com.yeejoin.amos.boot.biz.common.annotation.ResultFieldMapping;
 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.biz.common.utils.SnowflakeIdUtil;
 import com.yeejoin.amos.boot.module.common.api.enums.ReginStepEnum;
 import com.yeejoin.amos.boot.module.jg.api.common.StringUtil;
 import com.yeejoin.amos.boot.module.jg.api.dto.*;
@@ -33,6 +33,7 @@ import com.yeejoin.amos.boot.module.jg.biz.feign.TzsServiceFeignClient;
 import com.yeejoin.amos.boot.module.jg.biz.service.*;
 import com.yeejoin.amos.boot.module.ymt.api.entity.*;
 import com.yeejoin.amos.boot.module.ymt.api.enums.ApplicationFormTypeEnum;
+import com.yeejoin.amos.boot.module.ymt.api.enums.EquipmentClassifityEnum;
 import com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.IdxBizJgOtherInfoMapper;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.IdxBizJgRegisterInfoMapper;
@@ -829,6 +830,19 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
     private Map<String, String> create96333Code(JgRegistrationHistory historyData, String record) {
         Map<String, Object> changeData = JSON.parseObject(historyData.getChangeData(), Map.class);
         List<JSONObject> registrationList = (List<JSONObject>) changeData.get("registrationList");
+        IdxBizJgOtherInfo otherInfo = otherInfoService.getOneData(record);
+        String superviseCode = otherInfo.getSupervisoryCode();
+        String equListCode = Optional.ofNullable(registrationList)
+                .flatMap(list -> list.stream()
+                        .findFirst()
+                        .map(json -> json.getString("equListCode")))
+                .orElse("");
+        // 非电梯不生成96333码
+        if (!EquipmentClassifityEnum.DT.getCode().equals(equListCode)) {
+            return ImmutableMap.<String, String>builder()
+                    .put("superviseCode", superviseCode)
+                    .build();
+        }
         String equCategoryCode = Optional.ofNullable(registrationList)
                 .flatMap(list -> list.stream()
                         .findFirst()
@@ -843,8 +857,6 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
                 .orElse("");
         String isXiXian = "0".equals(changeData.get("transferIsXixian")) ? "null" : "1";
         // 移转不需要重新生成监管码，只需要新生成96333码，接口上送superviseCode则不再生成监管码
-        IdxBizJgOtherInfo otherInfo = otherInfoService.getOneData(record);
-        String superviseCode = otherInfo.getSupervisoryCode();
         ImmutableMap<String, Object> map = ImmutableMap.<String, Object>builder()
                 .put("cityCode", cityCode)
                 .put("countyCode", countyCode)