朱园亮 / xingyun-erp · Commits

Commit 69173fe612770516ec99f9ebc057389ea4d04a03

Authored by yeqianyong
1 parent 03532262

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

Inline Side-by-side
Showing 6 changed files with 27 additions and 22 deletions
@@ -47,6 +47,12 @@ public class GetCustomerCreditBo extends BaseBo<CustomerCredit> implements BaseD @@ -47,6 +47,12 @@ public class GetCustomerCreditBo extends BaseBo<CustomerCredit> implements BaseD
47 private String region; 47 private String region;
48 48
49 /** 49 /**
  50 + * 区域名称
  51 + */
  52 + @ApiModelProperty("区域名称")
  53 + private String regionName;
  54 +
  55 + /**
50 * 登记日期 56 * 登记日期
51 */ 57 */
52 @ApiModelProperty("登记日期") 58 @ApiModelProperty("登记日期")
@@ -42,6 +42,12 @@ public class CustomerCredit extends BaseEntity implements BaseDto { @@ -42,6 +42,12 @@ public class CustomerCredit extends BaseEntity implements BaseDto {
42 private String region; 42 private String region;
43 43
44 /** 44 /**
  45 + * 区域名称
  46 + */
  47 + @TableField(exist = false)
  48 + private String regionName;
  49 +
  50 + /**
45 * 登记日期 51 * 登记日期
46 */ 52 */
47 private LocalDate registerDate; 53 private LocalDate registerDate;
@@ -13,8 +13,10 @@ import com.lframework.starter.common.utils.StringUtil; @@ -13,8 +13,10 @@ import com.lframework.starter.common.utils.StringUtil;
13 import java.io.Serializable; 13 import java.io.Serializable;
14 import com.lframework.starter.common.utils.Assert; 14 import com.lframework.starter.common.utils.Assert;
15 import com.lframework.starter.web.inner.entity.SysDataDicItem; 15 import com.lframework.starter.web.inner.entity.SysDataDicItem;
  16 +import com.lframework.starter.web.inner.entity.SysDept;
16 import com.lframework.starter.web.inner.entity.SysUser; 17 import com.lframework.starter.web.inner.entity.SysUser;
17 import com.lframework.starter.web.inner.service.system.SysDataDicItemService; 18 import com.lframework.starter.web.inner.service.system.SysDataDicItemService;
  19 +import com.lframework.starter.web.inner.service.system.SysDeptService;
18 import com.lframework.starter.web.inner.service.system.SysUserService; 20 import com.lframework.starter.web.inner.service.system.SysUserService;
19 import com.lframework.xingyun.basedata.entity.Customer; 21 import com.lframework.xingyun.basedata.entity.Customer;
20 import com.lframework.xingyun.basedata.service.customer.CustomerService; 22 import com.lframework.xingyun.basedata.service.customer.CustomerService;
@@ -47,6 +49,9 @@ public class CustomerCreditHistoryServiceImpl extends BaseMpServiceImpl<Customer @@ -47,6 +49,9 @@ public class CustomerCreditHistoryServiceImpl extends BaseMpServiceImpl<Customer
47 private SysUserService sysUserService; 49 private SysUserService sysUserService;
48 @Resource 50 @Resource
49 private SysDataDicItemService sysDataDicItemService; 51 private SysDataDicItemService sysDataDicItemService;
  52 + @Resource
  53 + private SysDeptService sysDeptService;
  54 +
50 // 定义不需要比较的字段 55 // 定义不需要比较的字段
51 private static final Set<String> EXCLUDED_FIELDS = new HashSet<>(Arrays.asList( 56 private static final Set<String> EXCLUDED_FIELDS = new HashSet<>(Arrays.asList(
52 "id", "sort", "createById", "createBy", "updateById", 57 "id", "sort", "createById", "createBy", "updateById",
@@ -314,22 +319,12 @@ public class CustomerCreditHistoryServiceImpl extends BaseMpServiceImpl<Customer @@ -314,22 +319,12 @@ public class CustomerCreditHistoryServiceImpl extends BaseMpServiceImpl<Customer
314 //区域 319 //区域
315 if ("region".equals(fieldName)) { 320 if ("region".equals(fieldName)) {
316 if (StringUtil.isNotEmpty(data.getRegion())) { 321 if (StringUtil.isNotEmpty(data.getRegion())) {
317 - List<SysDataDicItem> sysDataDicItemList = sysDataDicItemService.findByDicCode("CREDIT_ZONE");  
318 -  
319 - value1 = sysDataDicItemList.stream()  
320 - .filter(item -> data.getRegion() != null && data.getRegion().equals(item.getCode()))  
321 - .map(SysDataDicItem::getName)  
322 - .findFirst()  
323 - .orElse(data.getRegion()); 322 + SysDept dept = sysDeptService.findById(data.getRegion());
  323 + value1 = dept == null ? "" : dept.getName();
324 } 324 }
325 if (StringUtil.isNotEmpty(customerCreditHistory.getRegion())) { 325 if (StringUtil.isNotEmpty(customerCreditHistory.getRegion())) {
326 - List<SysDataDicItem> sysDataDicItemList = sysDataDicItemService.findByDicCode("CREDIT_ZONE");  
327 -  
328 - value2 = sysDataDicItemList.stream()  
329 - .filter(item -> customerCreditHistory.getRegion() != null && customerCreditHistory.getRegion().equals(item.getCode()))  
330 - .map(SysDataDicItem::getName)  
331 - .findFirst()  
332 - .orElse(customerCreditHistory.getRegion()); 326 + SysDept dept = sysDeptService.findById(customerCreditHistory.getRegion());
  327 + value2 = dept == null ? "" : dept.getName();
333 } 328 }
334 } 329 }
335 //企业类型 330 //企业类型
@@ -1389,14 +1389,9 @@ public class CustomerCreditServiceImpl extends BaseMpServiceImpl<CustomerCreditM @@ -1389,14 +1389,9 @@ public class CustomerCreditServiceImpl extends BaseMpServiceImpl<CustomerCreditM
1389 } 1389 }
1390 //区域 1390 //区域
1391 if (StringUtil.isNotEmpty(data.getRegion())) { 1391 if (StringUtil.isNotEmpty(data.getRegion())) {
1392 - List<SysDataDicItem> sysDataDicItemList = sysDataDicItemService.findByDicCode("CREDIT_ZONE");  
1393 -  
1394 - String regionName = sysDataDicItemList.stream()  
1395 - .filter(item -> data.getRegion() != null && data.getRegion().equals(item.getCode()))  
1396 - .map(SysDataDicItem::getName)  
1397 - .findFirst()  
1398 - .orElse(data.getRegion());  
1399 - data.setRegion(regionName); 1392 + SysDept dept = sysDeptService.findById(data.getRegion());
  1393 + String regionName = dept == null ? "" : dept.getName();
  1394 + data.setRegionName(regionName);
1400 } 1395 }
1401 if (StringUtil.isNotEmpty(data.getEnterpriseType())) { 1396 if (StringUtil.isNotEmpty(data.getEnterpriseType())) {
1402 String enterpriseType; 1397 String enterpriseType;
@@ -6,6 +6,7 @@ @@ -6,6 +6,7 @@
6 <id column="id" property="id"/> 6 <id column="id" property="id"/>
7 <result column="serial_number" property="serialNumber"/> 7 <result column="serial_number" property="serialNumber"/>
8 <result column="region" property="region"/> 8 <result column="region" property="region"/>
  9 + <result column="region_name" property="regionName"/>
9 <result column="register_date" property="registerDate"/> 10 <result column="register_date" property="registerDate"/>
10 <result column="customer_short_name" property="customerShortName"/> 11 <result column="customer_short_name" property="customerShortName"/>
11 <result column="enterprise_type" property="enterpriseType"/> 12 <result column="enterprise_type" property="enterpriseType"/>
@@ -80,6 +81,7 @@ @@ -80,6 +81,7 @@
80 tb.id, 81 tb.id,
81 tb.serial_number, 82 tb.serial_number,
82 tb.region, 83 tb.region,
  84 + d.name as region_name,
83 tb.register_date, 85 tb.register_date,
84 tb.customer_short_name, 86 tb.customer_short_name,
85 tb.enterprise_type, 87 tb.enterprise_type,
@@ -149,6 +151,7 @@ @@ -149,6 +151,7 @@
149 tb.update_time 151 tb.update_time
150 FROM customer_credit AS tb 152 FROM customer_credit AS tb
151 left join base_data_customer as cu on cu.id = tb.company_id 153 left join base_data_customer as cu on cu.id = tb.company_id
  154 + left join sys_dept d on tb.region = d.id
152 </sql> 155 </sql>
153 156
154 <select id="query" resultMap="CustomerCredit"> 157 <select id="query" resultMap="CustomerCredit">