楚江erp：客户资信区域逻辑调整

@@ -47,6 +47,12 @@ public class GetCustomerCreditBo extends BaseBo<CustomerCredit> implements BaseD
     private String region;
 
     /**
+     * 区域名称
+     */
+    @ApiModelProperty("区域名称")
+    private String regionName;
+
+    /**
      * 登记日期
      */
     @ApiModelProperty("登记日期")

@@ -42,6 +42,12 @@ public class CustomerCredit extends BaseEntity implements BaseDto {
     private String region;
 
     /**
+     * 区域名称
+     */
+    @TableField(exist = false)
+    private String regionName;
+
+    /**
      * 登记日期
      */
     private LocalDate registerDate;

@@ -13,8 +13,10 @@ import com.lframework.starter.common.utils.StringUtil;
 import java.io.Serializable;
 import com.lframework.starter.common.utils.Assert;
 import com.lframework.starter.web.inner.entity.SysDataDicItem;
+import com.lframework.starter.web.inner.entity.SysDept;
 import com.lframework.starter.web.inner.entity.SysUser;
 import com.lframework.starter.web.inner.service.system.SysDataDicItemService;
+import com.lframework.starter.web.inner.service.system.SysDeptService;
 import com.lframework.starter.web.inner.service.system.SysUserService;
 import com.lframework.xingyun.basedata.entity.Customer;
 import com.lframework.xingyun.basedata.service.customer.CustomerService;
@@ -47,6 +49,9 @@ public class CustomerCreditHistoryServiceImpl extends BaseMpServiceImpl<Customer
     private SysUserService sysUserService;
     @Resource
     private SysDataDicItemService sysDataDicItemService;
+    @Resource
+    private SysDeptService sysDeptService;
+
     // 定义不需要比较的字段
     private static final Set<String> EXCLUDED_FIELDS = new HashSet<>(Arrays.asList(
             "id", "sort", "createById", "createBy", "updateById",
@@ -314,22 +319,12 @@ public class CustomerCreditHistoryServiceImpl extends BaseMpServiceImpl<Customer
                     //区域
                     if ("region".equals(fieldName)) {
                         if (StringUtil.isNotEmpty(data.getRegion())) {
-                            List<SysDataDicItem> sysDataDicItemList = sysDataDicItemService.findByDicCode("CREDIT_ZONE");
-
-                            value1 = sysDataDicItemList.stream()
-                                    .filter(item -> data.getRegion() != null && data.getRegion().equals(item.getCode()))
-                                    .map(SysDataDicItem::getName)
-                                    .findFirst()
-                                    .orElse(data.getRegion());
+                            SysDept dept = sysDeptService.findById(data.getRegion());
+                            value1 = dept == null ? "" : dept.getName();
                         }
                         if (StringUtil.isNotEmpty(customerCreditHistory.getRegion())) {
-                            List<SysDataDicItem> sysDataDicItemList = sysDataDicItemService.findByDicCode("CREDIT_ZONE");
-
-                            value2 = sysDataDicItemList.stream()
-                                    .filter(item -> customerCreditHistory.getRegion() != null && customerCreditHistory.getRegion().equals(item.getCode()))
-                                    .map(SysDataDicItem::getName)
-                                    .findFirst()
-                                    .orElse(customerCreditHistory.getRegion());
+                            SysDept dept = sysDeptService.findById(customerCreditHistory.getRegion());
+                            value2 = dept == null ? "" : dept.getName();
                         }
                     }
                     //企业类型

@@ -1389,14 +1389,9 @@ public class CustomerCreditServiceImpl extends BaseMpServiceImpl<CustomerCreditM
         }
         //区域
         if (StringUtil.isNotEmpty(data.getRegion())) {
-            List<SysDataDicItem> sysDataDicItemList = sysDataDicItemService.findByDicCode("CREDIT_ZONE");
-
-            String regionName = sysDataDicItemList.stream()
-                    .filter(item -> data.getRegion() != null && data.getRegion().equals(item.getCode()))
-                    .map(SysDataDicItem::getName)
-                    .findFirst()
-                    .orElse(data.getRegion());
-            data.setRegion(regionName);
+            SysDept dept = sysDeptService.findById(data.getRegion());
+            String regionName = dept == null ? "" : dept.getName();
+            data.setRegionName(regionName);
         }
         if (StringUtil.isNotEmpty(data.getEnterpriseType())) {
             String enterpriseType;

@@ -6,6 +6,7 @@
         <id column="id" property="id"/>
         <result column="serial_number" property="serialNumber"/>
         <result column="region" property="region"/>
+        <result column="region_name" property="regionName"/>
         <result column="register_date" property="registerDate"/>
         <result column="customer_short_name" property="customerShortName"/>
         <result column="enterprise_type" property="enterpriseType"/>
@@ -80,6 +81,7 @@
             tb.id,
             tb.serial_number,
             tb.region,
+            d.name as region_name,
             tb.register_date,
             tb.customer_short_name,
             tb.enterprise_type,
@@ -149,6 +151,7 @@
             tb.update_time
         FROM customer_credit AS tb
         left join base_data_customer as cu on cu.id = tb.company_id
+        left join sys_dept d on tb.region = d.id
     </sql>
 
     <select id="query" resultMap="CustomerCredit">