refactor(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/DataDockServiceImpl.java

@@ -2584,7 +2584,7 @@ public class DataDockServiceImpl {
             otherInfo.setSupervisoryCode(String.valueOf(result.get("superviseCode")));
             // 历史登记时 96333如果自行输入则不再进行生成插入
             if (StringUtils.isEmpty(otherInfo.getCode96333())) {
-                otherInfo.setCode96333(ObjectUtils.isEmpty(result.get("code96333")) ? "" : String.valueOf(result.get("code96333")));
+                otherInfo.setCode96333(ObjectUtils.isEmpty(result.get("code96333")) ? null : String.valueOf(result.get("code96333")));
             }
             // 更新使用登记业务表
             jgUseRegistration.setSupervisoryCode(String.valueOf(result.get("superviseCode")));

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

@@ -3378,7 +3378,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
         if (isCopy) {
             // 复制且有无96333识别码选择 无 96333码置空
             if ("2".equals(otherInfo.getCode96333Type())) {
-                otherInfo.setCode96333("");
+                otherInfo.setCode96333(null);
             }
             // 监管码置空
             otherInfo.setSupervisoryCode("");
@@ -3388,7 +3388,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
         }
         // 编辑时，如果选择<无96333识别码>，则把已经入库的数据清除掉
         if (OPERATEEDIT.equals(operateType) && "2".equals(otherInfo.getCode96333Type())) {
-            otherInfo.setCode96333("");
+            otherInfo.setCode96333(null);
         }
         iIdxBizJgOtherInfoService.saveOrUpdateData(otherInfo);
 

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

@@ -859,7 +859,7 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
                 .put("superviseCode", superviseCode)
                 .put("code96333", Optional.ofNullable(result)
                         .map(r -> (String) r.get("code96333"))
-                        .orElse(""))
+                        .orElse(null))
                 .build();
     }
 
@@ -916,7 +916,7 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
     private String buildRecordContent(JgChangeRegistrationTransfer obj) {
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy年MM月dd日");
         FeignClientResult<AgencyUserModel> agencyUserModelFeignClientResult = Privilege.agencyUserClient.queryByUserId(obj.getCreateUserId());
-        return obj.getUseUnitName()+"的"+agencyUserModelFeignClientResult.getResult().getRealName() + "办理了【移装变更登记】，单号【"
+        return obj.getUseUnitName() + "的" + agencyUserModelFeignClientResult.getResult().getRealName() + "办理了【移装变更登记】，单号【"
                 + obj.getApplyNo() + "】，移装后地址为" + obj.getFullAddress() + "，申请日期" + simpleDateFormat.format(new Date());
     }
 
@@ -1003,7 +1003,7 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
                 ).list();
 
         // 区外移装更新是否报废字段为1，区内移装不变
-        if (isUpdateRegistrationCode){
+        if (isUpdateRegistrationCode) {
             useRegistrationManageService.lambdaUpdate()
                     .set(JgUseRegistrationManage::getIsScrap, 1)
                     // TODO 区外移装，业务已限制需要先注销证，这主要目的是将韩城、杨凌的特殊《区内逻辑》但是需要新生成的证的把之前证改成已注销
@@ -1043,12 +1043,12 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
                     registrationManageNew.setCertificateStatus("已登记");
                     registrationManageNew.setApplyNo(transfer.getApplyNo());
                     //新增-区外，或者区内是韩城和杨凌的进行
-                    if (isUpdateRegistrationCode){
+                    if (isUpdateRegistrationCode) {
                         registrationManageNew.setSequenceNbr(null);
                         registrationManageNew.setCertificateNo(commonServiceImpl.generateCertificateNo(equType, registrationManageNew.getAuditPassDate(), transfer.getReceiveCompanyCode()));
                     }
                     // 更新时，需更新原证的版本信息，扫码使用
-                    if(registrationManageNew.getSequenceNbr() != null){
+                    if (registrationManageNew.getSequenceNbr() != null) {
                         registrationManageNew.setVersion(registrationManageNew.getVersion() + 1);
                         registrationManageNew.setChangeReason(BusinessTypeEnum.JG_CHANGE_REGISTRATION.getName());
                     } else {
@@ -1059,7 +1059,7 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
                     String orgBranchCodeName = historyJson.getString("orgBranchCode");
                     String orgBranchName = historyJson.getString("orgBranchName");
                     String[] orgBranchArray = orgBranchCodeName.split("_");
-                    if(orgBranchArray.length > 1){
+                    if (orgBranchArray.length > 1) {
                         registrationManageNew.setSuperviseOrgCode(orgBranchArray[0]);
                         registrationManageNew.setSuperviseOrgName(StringUtil.isNotEmpty(orgBranchName) ? orgBranchName : orgBranchArray[1]);
                     }
@@ -1620,7 +1620,7 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
 
     @Override
     public boolean beforeCheck(JgChangeRegistrationTransfer jgChangeRegistrationTransfer) {
-        return jgChangeRegistrationTransfer.getInstanceId() != null && !jgChangeRegistrationTransfer.getStatus().equals(FlowStatusEnum.TO_BE_FINISHED.getName()) &&!jgChangeRegistrationTransfer.getStatus().equals(FlowStatusEnum.TO_BE_DISCARD.getName());
+        return jgChangeRegistrationTransfer.getInstanceId() != null && !jgChangeRegistrationTransfer.getStatus().equals(FlowStatusEnum.TO_BE_FINISHED.getName()) && !jgChangeRegistrationTransfer.getStatus().equals(FlowStatusEnum.TO_BE_DISCARD.getName());
     }
 
     @Override

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

@@ -3058,7 +3058,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                 otherInfo.setSupervisoryCode(String.valueOf(result.get("superviseCode")));
                 // 历史登记时 96333如果自行输入则不再进行生成插入
                 if(StringUtils.isEmpty(otherInfo.getCode96333())){
-                    otherInfo.setCode96333(ObjectUtils.isEmpty(result.get("code96333")) ? "" : String.valueOf(result.get("code96333")));
+                    otherInfo.setCode96333(ObjectUtils.isEmpty(result.get("code96333")) ? null : String.valueOf(result.get("code96333")));
                 }
                 // 更新使用登记业务表
                 jgUseRegistration.setSupervisoryCode(String.valueOf(result.get("superviseCode")));

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/entity/IdxBizJgOtherInfo.java

 package com.yeejoin.amos.boot.module.ymt.api.entity;
 
 import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.yeejoin.amos.boot.biz.common.annotation.FieldDisplayDefine;
@@ -75,7 +76,7 @@ public class IdxBizJgOtherInfo extends TzsBaseEntity implements IBaseChangeData
     /**
      *
      */
-	@TableField("\"CODE96333\"")
+	@TableField(value = "\"CODE96333\"", updateStrategy = FieldStrategy.IGNORED)
     @FieldDisplayDefine(value = "96333识别码")
     private String code96333;