楚江ERP:客户资信关联字段完善

@@ -299,12 +299,24 @@ public class GetCustomerCreditBo extends BaseBo<CustomerCredit> {
     private String investigator;
     private String investigator;
 
 
     /**
     /**
+     * 调查人名称(非持久化字段)
+     */
+    @ApiModelProperty("调查人名称")
+    private String investigatorName;
+
+    /**
      * 主管审核
      * 主管审核
      */
      */
     @ApiModelProperty("主管审核")
     @ApiModelProperty("主管审核")
     private String supervisorReview;
     private String supervisorReview;
 
 
     /**
     /**
+     * 主管审核名称(非持久化字段)
+     */
+    @ApiModelProperty("主管审核名称")
+    private String supervisorReviewName;
+
+    /**
      * 年度总销量（万元）
      * 年度总销量（万元）
      */
      */
     @ApiModelProperty("年度总销量（万元）")
     @ApiModelProperty("年度总销量（万元）")

 package com.lframework.xingyun.sc.controller.customer;
 package com.lframework.xingyun.sc.controller.customer;
 
 
+import com.lframework.starter.common.utils.StringUtil;
 import com.lframework.starter.web.core.annotations.security.HasPermission;
 import com.lframework.starter.web.core.annotations.security.HasPermission;
 import com.lframework.starter.web.core.controller.DefaultBaseController;
 import com.lframework.starter.web.core.controller.DefaultBaseController;
 import com.lframework.starter.web.inner.bo.system.user.QuerySysUserBo;
 import com.lframework.starter.web.inner.bo.system.user.QuerySysUserBo;
 import com.lframework.starter.web.inner.entity.SysUser;
 import com.lframework.starter.web.inner.entity.SysUser;
+import com.lframework.starter.web.inner.service.system.SysUserService;
 import com.lframework.xingyun.basedata.service.customer.CustomerService;
 import com.lframework.xingyun.basedata.service.customer.CustomerService;
 import com.lframework.xingyun.sc.bo.customer.credit.GetCustomerCreditBo;
 import com.lframework.xingyun.sc.bo.customer.credit.GetCustomerCreditBo;
 import com.lframework.xingyun.sc.entity.CorePersonnel;
 import com.lframework.xingyun.sc.entity.CorePersonnel;
@@ -49,6 +51,8 @@ public class CustomerCreditController extends DefaultBaseController {
     private CustomerService customerService;
     private CustomerService customerService;
     @Resource
     @Resource
     private CorePersonnelService corePersonnelService;
     private CorePersonnelService corePersonnelService;
+    @Resource
+    private SysUserService sysUserService;
 
 
     /**
     /**
      * 查询列表
      * 查询列表
@@ -179,6 +183,16 @@ public class CustomerCreditController extends DefaultBaseController {
         vo.setCreditId(credit.getId());
         vo.setCreditId(credit.getId());
         List<CorePersonnel> corePersonnel = corePersonnelService.query(vo);
         List<CorePersonnel> corePersonnel = corePersonnelService.query(vo);
         data.setCorePersonnelList(corePersonnel);
         data.setCorePersonnelList(corePersonnel);
+        //调查人
+        if (StringUtil.isNotEmpty(credit.getInvestigator())) {
+            SysUser sysUser = sysUserService.findById(credit.getInvestigator());
+            data.setInvestigatorName(sysUser.getName());
+        }
+        //主管审核
+        if (StringUtil.isNotEmpty(credit.getSupervisorReview())) {
+            SysUser sysUser = sysUserService.findById(credit.getSupervisorReview());
+            data.setSupervisorReviewName(sysUser.getName());
+        }
         return data;
         return data;
     }
     }
 }
 }

@@ -12,6 +12,8 @@ import com.lframework.starter.web.core.components.resp.PageResult;
 import com.lframework.starter.common.utils.StringUtil;
 import com.lframework.starter.common.utils.StringUtil;
 import java.io.Serializable;
 import java.io.Serializable;
 import com.lframework.starter.common.utils.Assert;
 import com.lframework.starter.common.utils.Assert;
+import com.lframework.starter.web.inner.entity.SysUser;
+import com.lframework.starter.web.inner.service.system.SysUserService;
 import com.lframework.xingyun.basedata.entity.Customer;
 import com.lframework.xingyun.basedata.entity.Customer;
 import com.lframework.xingyun.basedata.service.customer.CustomerService;
 import com.lframework.xingyun.basedata.service.customer.CustomerService;
 import com.lframework.xingyun.sc.Label;
 import com.lframework.xingyun.sc.Label;
@@ -39,6 +41,8 @@ public class CustomerCreditHistoryServiceImpl extends BaseMpServiceImpl<Customer
 
 
     @Resource
     @Resource
     private CustomerService customerService;
     private CustomerService customerService;
+    @Resource
+    private SysUserService sysUserService;
     // 定义不需要比较的字段
     // 定义不需要比较的字段
     private static final Set<String> EXCLUDED_FIELDS = new HashSet<>(Arrays.asList(
     private static final Set<String> EXCLUDED_FIELDS = new HashSet<>(Arrays.asList(
             "id", "sort", "createById", "createBy", "updateById",
             "id", "sort", "createById", "createBy", "updateById",
@@ -287,6 +291,39 @@ public class CustomerCreditHistoryServiceImpl extends BaseMpServiceImpl<Customer
                 Object value2 = field.get(customerCreditHistory);
                 Object value2 = field.get(customerCreditHistory);
 
 
                 if (!Objects.equals(value1, value2)) {
                 if (!Objects.equals(value1, value2)) {
+                    //单位名称
+                    if ("companyId".equals(fieldName)) {
+                        if (StringUtil.isNotEmpty(data.getCompanyId())) {
+                            Customer customer1 = customerService.findById(data.getCompanyId());
+                            value1 = customer1.getName();
+                        }
+                        if (StringUtil.isNotEmpty(customerCreditHistory.getCompanyId())) {
+                            Customer customer2 = customerService.findById(customerCreditHistory.getCompanyId());
+                            value2 = customer2.getName();
+                        }
+                    }
+                    //调查人
+                    if ("investigator".equals(fieldName)) {
+                        if (StringUtil.isNotEmpty(data.getInvestigator())) {
+                            SysUser sysUser1 = sysUserService.findById(data.getInvestigator());
+                            value1 = sysUser1.getName();
+                        }
+                        if (StringUtil.isNotEmpty(customerCreditHistory.getInvestigator())) {
+                            SysUser sysUser2 = sysUserService.findById(customerCreditHistory.getInvestigator());
+                            value2 = sysUser2.getName();
+                        }
+                    }
+                    //主管审核
+                    if ("supervisorReview".equals(fieldName)) {
+                        if (StringUtil.isNotEmpty(data.getSupervisorReview())) {
+                            SysUser sysUser1 = sysUserService.findById(data.getSupervisorReview());
+                            value1 = sysUser1.getName();
+                        }
+                        if (StringUtil.isNotEmpty(customerCreditHistory.getSupervisorReview())) {
+                            SysUser sysUser2 = sysUserService.findById(customerCreditHistory.getSupervisorReview());
+                            value2 = sysUser2.getName();
+                        }
+                    }
                     // 获取中文标签，优先使用 @Label，否则用字段名
                     // 获取中文标签，优先使用 @Label，否则用字段名
                     String label = getLabel(field);
                     String label = getLabel(field);