Ver código fonte

报价费用审核 选的车牌号晋ABC等,但是在审核这边显示的车牌是1401 1402

lipf 4 semanas atrás
pai
commit
4f32c9bdbd

+ 10 - 0
tenant/organization/src/main/java/com/jzg/organization/service/PtlAreaLicenseService.java

@@ -44,4 +44,14 @@ public interface PtlAreaLicenseService extends IService<PtlAreaLicense> {
      */
     String convertAreaNumber2License(Map<String,PtlAreaLicense> areaLicenseMap , String areaNumbers);
 
+    /**
+     * 将地区编码转换为对应的车牌号
+     *
+     * @param areaNumbers 地区编码,支持多个拼接,例如1401,1402,1403
+     * @return String 地区车牌号,例如晋A,晋B,晋C
+     * @author lipf
+     * @date 2026/5/21 9:53
+     */
+    String convertAreaNumber2License(String areaNumbers);
+
 }

+ 9 - 1
tenant/organization/src/main/java/com/jzg/organization/service/impl/PtlAgreementUndwrtRulesServiceImpl.java

@@ -1,6 +1,7 @@
 package com.jzg.organization.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -55,6 +56,8 @@ public class PtlAgreementUndwrtRulesServiceImpl extends ServiceImpl<PtlAgreement
 
     @Autowired
     private PtlAgreementService ptlAgreementService;
+    @Autowired
+    private PtlAreaLicenseService ptlAreaLicenseService;
 
     /**
      * 协议规则列表
@@ -774,15 +777,20 @@ public class PtlAgreementUndwrtRulesServiceImpl extends ServiceImpl<PtlAgreement
             }
         }
         if (linkList.getMinArray() != null) {
+            StringBuilder licenseInfo = new StringBuilder();
             for(int i=0;i<linkList.getMinArray().length;i++) {
                 int finalI = i;
                 if(ptlAgreementUndwrtRulesAttr.getAttrCode().equals("LicenseNo") || ptlAgreementUndwrtRulesAttr.getAttrCode().equals("LicenseArea")) {
-                    returnMsg.append(linkList.getMinArray()[i]).append(",");
+                    licenseInfo.append(linkList.getMinArray()[i]).append(",");
                 }else {
                     PtlAgreementUndwrtRulesDictLabal ptlAgreementUndwrtRulesDictLabal = ptlAgreementUndwrtRulesAttr.getDictLabal().stream().filter(x -> x.getCode().equals(linkList.getMinArray()[finalI])).findAny().get();
                     returnMsg.append(ptlAgreementUndwrtRulesDictLabal.getName()).append(",");
                 }
             }
+            if(StrUtil.isNotEmpty(licenseInfo.toString())){
+                String licenseName = ptlAreaLicenseService.convertAreaNumber2License(licenseInfo.toString());
+                returnMsg.append(licenseName).append(",");
+            }
         }
         return returnMsg.toString();
     }

+ 14 - 0
tenant/organization/src/main/java/com/jzg/organization/service/impl/PtlAreaLicenseServiceImpl.java

@@ -97,4 +97,18 @@ public class PtlAreaLicenseServiceImpl extends ServiceImpl<PtlAreaLicenseMapper,
         log.info("地区编码[{}]转换后的车牌编码是[{}]",areaNumbers,collect);
         return collect;
     }
+
+    /**
+     * 将地区编码转换为对应的车牌号
+     *
+     * @param areaNumbers 地区编码,支持多个拼接,例如1401,1402,1403
+     * @return String 地区车牌号,例如晋A,晋B,晋C
+     * @author lipf
+     * @date 2026/5/21 9:53
+     */
+    @Override
+    public String convertAreaNumber2License(String areaNumbers) {
+        Map<String, PtlAreaLicense> areaLicenseMap = this.queryAllAreaLicenseMap();
+        return this.convertAreaNumber2License(areaLicenseMap, areaNumbers);
+    }
 }