fix(jg):车用气瓶变更三级审批处理

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/entity/JgChangeVehicleRegistrationUnit.java

@@ -251,4 +251,6 @@ public class JgChangeVehicleRegistrationUnit extends BaseEntity {
 	@TableField("transfer_to_user_ids")
     private String transferToUserIds;
 
+    @TableField(exist = false)
+    private String address;
 }

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

@@ -520,11 +520,8 @@ public class JgChangeVehicleRegistrationUnitServiceImpl extends BaseService<JgCh
                 //     param.put("SUPERVISORY_CODE", idxBizJgOtherInfo.getSupervisoryCode());
                 // }
             }
-            TzBaseEnterpriseInfo enterpriseInfo = Optional.ofNullable(jgChangeVehicleRegistrationUnit.getNewUseUnitCreditCode())
-                    .filter(org.apache.commons.lang3.ObjectUtils::isNotEmpty)
-                    .map(tzBaseEnterpriseInfoMapper::selectByUseUnitCode)
-                    .orElse(null);
-            param.put("ADDRESS", ValidationUtil.isEmpty(enterpriseInfo) ? "" : enterpriseInfo.getAddress());
+
+            param.put("ADDRESS", jgChangeVehicleRegistrationUnit.getAddress());
             param.put("ORG_BRANCH_CODE", jgChangeVehicleRegistrationUnit.getOrgBranchCode());
             param.put("ORG_BRANCH_NAME", jgChangeVehicleRegistrationUnit.getOrgBranchName());
             objMap.put(item, param);
@@ -544,6 +541,13 @@ public class JgChangeVehicleRegistrationUnitServiceImpl extends BaseService<JgCh
     })
     public void saveRecord(JgChangeVehicleRegistrationUnit jgChangeVehicleRegistrationUnit, TaskV2Model taskV2Model) {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        jgChangeVehicleRegistrationUnit.setAddress(
+                Optional.ofNullable(jgChangeVehicleRegistrationUnit.getNewUseUnitCreditCode())
+                        .filter(org.apache.commons.lang3.ObjectUtils::isNotEmpty)
+                        .map(tzBaseEnterpriseInfoMapper::selectByUseUnitCode)
+                        .map(TzBaseEnterpriseInfo::getAddress)
+                        .orElse("")
+        );
         JgUseRegistrationManage manage = jgUseRegistrationManageService.lambdaQuery()
                 .eq(JgUseRegistrationManage::getUseRegistrationCode, jgChangeVehicleRegistrationUnit.getUseRegistCode())
                 .eq(JgUseRegistrationManage::getIsDelete, 0)
@@ -627,6 +631,7 @@ public class JgChangeVehicleRegistrationUnitServiceImpl extends BaseService<JgCh
         }
         useInfo.setUseUnitName(jgChangeVehicleRegistrationUnit.getNewUseUnitName());
         useInfo.setUseUnitCreditCode(jgChangeVehicleRegistrationUnit.getNewUseUnitCreditCode());
+        useInfo.setAddress(jgChangeVehicleRegistrationUnit.getAddress());
         idxBizJgUseInfoServiceImpl.update(useInfo, lambda);
 
         // 更新监管信息