楚江ERP:客户资信变更详情

房远帅
1 parent 6e7cbbf8
Showing 8 changed files with 514 additions and 20 deletions
xingyun-sc/src/main/java/com/lframework/xingyun/sc/Label.java
xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/customer/credit/ChangeData.java
xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/customer/credit/ChangeItem.java
xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/customer/credit/GetCustomerCreditHistoryBo.java
xingyun-sc/src/main/java/com/lframework/xingyun/sc/controller/customer/CustomerCreditHistoryController.java
xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/CustomerCreditHistory.java
xingyun-sc/src/main/java/com/lframework/xingyun/sc/impl/customer/CustomerCreditHistoryServiceImpl.java
xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/customer/CustomerCreditHistoryService.java
--- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/Label.java 0 → 100644
View file @53450aa
+++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/Label.java 0 → 100644
View file @53450aa
+package com.lframework.xingyun.sc;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Retention(RetentionPolicy.RUNTIME) // 必须是 RUNTIME，才能在运行时通过反射读取
+@Target(ElementType.FIELD) // 用于字段
+public @interface Label {
+    String value();
+}
--- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/customer/credit/ChangeData.java 0 → 100644
View file @53450aa
+++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/customer/credit/ChangeData.java 0 → 100644
View file @53450aa
+package com.lframework.xingyun.sc.bo.customer.credit;
+
+
+import java.util.List;
+
+/**
+ * 变更数据
+ */
+public class ChangeData {
+    private List<ChangeItem> otherChangeList;
+
+    public List<ChangeItem> getOtherChangeList() {
+        return otherChangeList;
+    }
+
+    public void setOtherChangeList(List<ChangeItem> otherChangeList) {
+        this.otherChangeList = otherChangeList;
+    }
+}
--- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/customer/credit/ChangeItem.java 0 → 100644
View file @53450aa
+++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/customer/credit/ChangeItem.java 0 → 100644
View file @53450aa
+package com.lframework.xingyun.sc.bo.customer.credit;
+
+
+/**
+ * 字段变更项实体，用于审计、日志、审批展示
+ */
+public class ChangeItem {
+    /**
+     * 序号（从1开始）
+     */
+    private Integer serialNumber;
+
+    /**
+     * 变更前的值
+     */
+    private String beforeChange;
+
+    /**
+     * 变更后的值
+     */
+    private String afterChange;
+
+    // 构造函数（可选）
+    public ChangeItem() {
+    }
+
+    public ChangeItem(Integer serialNumber, String beforeChange, String afterChange) {
+        this.serialNumber = serialNumber;
+        this.beforeChange = beforeChange;
+        this.afterChange = afterChange;
+    }
+
+    // Getter 和 Setter
+    public Integer getSerialNumber() {
+        return serialNumber;
+    }
+
+    public void setSerialNumber(Integer serialNumber) {
+        this.serialNumber = serialNumber;
+    }
+
+    public String getBeforeChange() {
+        return beforeChange;
+    }
+
+    public void setBeforeChange(String beforeChange) {
+        this.beforeChange = beforeChange;
+    }
+
+    public String getAfterChange() {
+        return afterChange;
+    }
+
+    public void setAfterChange(String afterChange) {
+        this.afterChange = afterChange;
+    }
+
+    @Override
+    public String toString() {
+        return "ChangeItem{" +
+                "serialNumber=" + serialNumber +
+                ", beforeChange='" + beforeChange + '\'' +
+                ", afterChange='" + afterChange + '\'' +
+                '}';
+    }
+}
--- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/customer/credit/GetCustomerCreditHistoryBo.java
View file @53450aa
+++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/customer/credit/GetCustomerCreditHistoryBo.java
View file @53450aa
@@ -83,6 +83,12 @@ public class GetCustomerCreditHistoryBo extends BaseBo<CustomerCreditHistory> {
     private String companyId;
     /**
+     * 单位名称(非持久化字段)
+     */
+    @ApiModelProperty("单位名称")
+    private String companyName;
+
+    /**
      * 企业性质
      */
     @ApiModelProperty("企业性质")
--- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/controller/customer/CustomerCreditHistoryController.java
View file @53450aa
+++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/controller/customer/CustomerCreditHistoryController.java
View file @53450aa
 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.controller.DefaultBaseController;
+import com.lframework.starter.web.core.utils.IdUtil;
 import com.lframework.starter.web.core.utils.PageResultUtil;
 import com.lframework.starter.web.core.components.resp.PageResult;
 import com.lframework.starter.web.core.components.resp.InvokeResult;
+
+import javax.annotation.Resource;
 import javax.validation.constraints.NotBlank;
+
+import com.lframework.xingyun.sc.bo.customer.credit.ChangeData;
+import com.lframework.xingyun.sc.bo.customer.credit.ChangeItem;
 import com.lframework.xingyun.sc.bo.customer.credit.GetCustomerCreditHistoryBo;
+import com.lframework.xingyun.sc.entity.CustomerCredit;
 import com.lframework.xingyun.sc.entity.CustomerCreditHistory;
 import com.lframework.xingyun.sc.service.customer.CustomerCreditHistoryService;
+import com.lframework.xingyun.sc.service.customer.CustomerCreditService;
 import com.lframework.xingyun.sc.vo.customer.credit.CreateCustomerCreditHistoryVo;
 import com.lframework.xingyun.sc.vo.customer.credit.QueryCustomerCreditHistoryVo;
 import io.swagger.annotations.ApiImplicitParam;
@@ -18,14 +27,13 @@ import io.swagger.annotations.ApiOperation;
 import com.lframework.starter.common.utils.CollectionUtil;
 import io.swagger.annotations.Api;
 import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import javax.validation.Valid;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
-import java.util.List;
+import java.util.*;
 import java.util.stream.Collectors;
 /**
@@ -38,8 +46,10 @@ import java.util.stream.Collectors;
 @RequestMapping("/customerCreditHistory")
 public class CustomerCreditHistoryController extends DefaultBaseController {
-    @Autowired
+    @Resource
     private CustomerCreditHistoryService customerCreditHistoryService;
+    @Resource
+    private CustomerCreditService customerCreditService;
     /**
      * 查询列表
@@ -91,20 +101,195 @@ public class CustomerCreditHistoryController extends DefaultBaseController {
     }
     /**
-     * 根据ID查询
+     * 根据ID查询变更记录
      */
-    @ApiOperation("根据ID查询")
+    @ApiOperation("根据ID查询变更记录")
     @ApiImplicitParam(value = "id", name = "id", paramType = "query", required = true)
     @HasPermission({"customerCreditHistory:customercredithistory:query"})
-    @GetMapping
-    public InvokeResult<GetCustomerCreditHistoryBo> get(@NotBlank(message = "id不能为空！") String id) {
+    @GetMapping("/getById")
+    public InvokeResult<ChangeData> get(@NotBlank(message = "id不能为空！") String id) {
         CustomerCreditHistory data = customerCreditHistoryService.findById(id);
         if (data == null) {
             throw new DefaultClientException("客户资信历史记录表不存在！");
         }
+        //客户资信ID
+        String creditId = data.getCreditId();
+        QueryCustomerCreditHistoryVo vo = new QueryCustomerCreditHistoryVo();
+        vo.setCreditId(creditId);
+        List<CustomerCreditHistory> query = customerCreditHistoryService.query(vo);
+        Map<String, CustomerCreditHistory> map = query.stream()
+                .filter(item -> item.getSort() != null)
+                .collect(Collectors.toMap(
+                        CustomerCreditHistory::getSort,
+                        item -> item,
+                        (a, b) -> a  // 保留第一个，去重
+                ));
+        //第几次变更
+        int sort = Integer.parseInt(data.getSort());
+        //变更次数
+        int size = query.size();
+        List<ChangeItem> differencesWithIndex = new ArrayList<>();
+        if (sort + 1 <= size) {
+            //data与customerCreditHistory的比较，其中data与为变更前，customerCreditHistory为变更后
+            CustomerCreditHistory customerCreditHistory = map.get(String.valueOf(sort + 1));
+            differencesWithIndex = customerCreditHistoryService.getDifferencesWithIndex(data, customerCreditHistory);
+
+        } else {
+            //现在的数据与这data相对比，其中data为变更前，customerCredit为变更后
+            CustomerCredit customerCredit = customerCreditService.findById(creditId);
+            CustomerCreditHistory customerCreditHistory = new CustomerCreditHistory();
+            if (!StringUtil.isBlank(customerCredit.getSerialNumber())) {
+                customerCreditHistory.setSerialNumber(customerCredit.getSerialNumber());
+            }
+            if (!StringUtil.isBlank(customerCredit.getRegion())) {
+                customerCreditHistory.setRegion(customerCredit.getRegion());
+            }
+            if (customerCredit.getRegisterDate() != null) {
+                customerCreditHistory.setRegisterDate(customerCredit.getRegisterDate());
+            }
+            if (!StringUtil.isBlank(customerCredit.getCustomerShortName())) {
+                customerCreditHistory.setCustomerShortName(customerCredit.getCustomerShortName());
+            }
+            customerCreditHistory.setEnterpriseType(customerCredit.getEnterpriseType());
+            customerCreditHistory.setCompanyId(customerCredit.getCompanyId());
+            if (!StringUtil.isBlank(customerCredit.getCompanyNature())) {
+                customerCreditHistory.setCompanyNature(customerCredit.getCompanyNature());
+            }
+            if (!StringUtil.isBlank(customerCredit.getCompanyAddress())) {
+                customerCreditHistory.setCompanyAddress(customerCredit.getCompanyAddress());
+            }
+            if (customerCredit.getRegisteredCapital() != null) {
+                customerCreditHistory.setRegisteredCapital(customerCredit.getRegisteredCapital());
+            }
+            if (!StringUtil.isBlank(customerCredit.getBankAccount())) {
+                customerCreditHistory.setBankAccount(customerCredit.getBankAccount());
+            }
+            if (!StringUtil.isBlank(customerCredit.getBankName())) {
+                customerCreditHistory.setBankName(customerCredit.getBankName());
+            }
+            if (!StringUtil.isBlank(customerCredit.getTaxNumber())) {
+                customerCreditHistory.setTaxNumber(customerCredit.getTaxNumber());
+            }
+            if (customerCredit.getRegistrationTime() != null) {
+                customerCreditHistory.setRegistrationTime(customerCredit.getRegistrationTime());
+            }
+            if (!StringUtil.isBlank(customerCredit.getBusinessYears())) {
+                customerCreditHistory.setBusinessYears(customerCredit.getBusinessYears());
+            }
+            if (!StringUtil.isBlank(customerCredit.getBusinessScope())) {
+                customerCreditHistory.setBusinessScope(customerCredit.getBusinessScope());
+            }
+            if (!StringUtil.isBlank(customerCredit.getBusinessProperty())) {
+                customerCreditHistory.setBusinessProperty(customerCredit.getBusinessProperty());
+            }
+            if (customerCredit.getLandArea() != null) {
+                customerCreditHistory.setLandArea(customerCredit.getLandArea());
+            }
+            if (!StringUtil.isBlank(customerCredit.getStorageConditions())) {
+                customerCreditHistory.setStorageConditions(customerCredit.getStorageConditions());
+            }
+            if (customerCredit.getEmployeeCount() != null) {
+                customerCreditHistory.setEmployeeCount(customerCredit.getEmployeeCount());
+            }
+            if (!StringUtil.isBlank(customerCredit.getEquipmentAttributes())) {
+                customerCreditHistory.setEquipmentAttributes(customerCredit.getEquipmentAttributes());
+            }
+            if (!StringUtil.isBlank(customerCredit.getAssetEvaluation())) {
+                customerCreditHistory.setAssetEvaluation(customerCredit.getAssetEvaluation());
+            }
+            if (!StringUtil.isBlank(customerCredit.getLastYearSales())) {
+                customerCreditHistory.setLastYearSales(customerCredit.getLastYearSales());
+            }
+            if (!StringUtil.isBlank(customerCredit.getMonthlyAvgSales())) {
+                customerCreditHistory.setMonthlyAvgSales(customerCredit.getMonthlyAvgSales());
+            }
+            if (!StringUtil.isBlank(customerCredit.getInvoiceItemUnit())) {
+                customerCreditHistory.setInvoiceItemUnit(customerCredit.getInvoiceItemUnit());
+            }
+            if (!StringUtil.isBlank(customerCredit.getCertificationCertificate())) {
+                customerCreditHistory.setCertificationCertificate(customerCredit.getCertificationCertificate());
+            }
+            if (!StringUtil.isBlank(customerCredit.getProductMatch())) {
+                customerCreditHistory.setProductMatch(customerCredit.getProductMatch());
+            }
+            if (!StringUtil.isBlank(customerCredit.getMajorCustomers())) {
+                customerCreditHistory.setMajorCustomers(customerCredit.getMajorCustomers());
+            }
+            if (!StringUtil.isBlank(customerCredit.getMainProjects())) {
+                customerCreditHistory.setMainProjects(customerCredit.getMainProjects());
+            }
+            if (!StringUtil.isBlank(customerCredit.getIndustryInvolved())) {
+                customerCreditHistory.setIndustryInvolved(customerCredit.getIndustryInvolved());
+            }
+            if (!StringUtil.isBlank(customerCredit.getIndustryExperience())) {
+                customerCreditHistory.setIndustryExperience(customerCredit.getIndustryExperience());
+            }
+            if (!StringUtil.isBlank(customerCredit.getHasDispute())) {
+                customerCreditHistory.setHasDispute(customerCredit.getHasDispute());
+            }
+            if (!StringUtil.isBlank(customerCredit.getCooperationStartDate())) {
+                customerCreditHistory.setCooperationStartDate(customerCredit.getCooperationStartDate());
+            }
+            if (!StringUtil.isBlank(customerCredit.getMonthlyAvgVolume())) {
+                customerCreditHistory.setMonthlyAvgVolume(customerCredit.getMonthlyAvgVolume());
+            }
+            if (!StringUtil.isBlank(customerCredit.getIsVerbalAgreement())) {
+                customerCreditHistory.setIsVerbalAgreement(customerCredit.getIsVerbalAgreement());
+            }
+            if (!StringUtil.isBlank(customerCredit.getOtherAgreements())) {
+                customerCreditHistory.setOtherAgreements(customerCredit.getOtherAgreements());
+            }
+            if (!StringUtil.isBlank(customerCredit.getHasLongTermContract())) {
+                customerCreditHistory.setHasLongTermContract(customerCredit.getHasLongTermContract());
+            }
+            if (!StringUtil.isBlank(customerCredit.getContractType())) {
+                customerCreditHistory.setContractType(customerCredit.getContractType());
+            }
+            if (!StringUtil.isBlank(customerCredit.getHasInterruption())) {
+                customerCreditHistory.setHasInterruption(customerCredit.getHasInterruption());
+            }
+            if (!StringUtil.isBlank(customerCredit.getSettlementPeriod())) {
+                customerCreditHistory.setSettlementPeriod(customerCredit.getSettlementPeriod());
+            }
+            if (!StringUtil.isBlank(customerCredit.getMaterialSupplyPlan())) {
+                customerCreditHistory.setMaterialSupplyPlan(customerCredit.getMaterialSupplyPlan());
+            }
+            customerCreditHistory.setSuggestedCategory(customerCredit.getSuggestedCategory());
+            if (!StringUtil.isBlank(customerCredit.getCreditLimit())) {
+                customerCreditHistory.setCreditLimit(customerCredit.getCreditLimit());
+            }
+            if (!StringUtil.isBlank(customerCredit.getInvestigator())) {
+                customerCreditHistory.setInvestigator(customerCredit.getInvestigator());
+            }
+            if (!StringUtil.isBlank(customerCredit.getSupervisorReview())) {
+                customerCreditHistory.setSupervisorReview(customerCredit.getSupervisorReview());
+            }
+            if (!StringUtil.isBlank(customerCredit.getAnnualTotalSales())) {
+                customerCreditHistory.setAnnualTotalSales(customerCredit.getAnnualTotalSales());
+            }
+            if (!StringUtil.isBlank(customerCredit.getMainIndustry())) {
+                customerCreditHistory.setMainIndustry(customerCredit.getMainIndustry());
+            }
+            if (!StringUtil.isBlank(customerCredit.getAnnualMaterialOverview())) {
+                customerCreditHistory.setAnnualMaterialOverview(customerCredit.getAnnualMaterialOverview());
+            }
+            if (!StringUtil.isBlank(customerCredit.getCompanySettlementPeriod())) {
+                customerCreditHistory.setCompanySettlementPeriod(customerCredit.getCompanySettlementPeriod());
+            }
+            if (!StringUtil.isBlank(customerCredit.getCompanyCreditLimit())) {
+                customerCreditHistory.setCompanyCreditLimit(customerCredit.getCompanyCreditLimit());
+            }
+            if (!StringUtil.isBlank(customerCredit.getCompanyMaterialSupplyPlan())) {
+                customerCreditHistory.setCompanyMaterialSupplyPlan(customerCredit.getCompanyMaterialSupplyPlan());
+            }
+            customerCreditHistory.setCompanySuggestedCategory(customerCredit.getCompanySuggestedCategory());
+            customerCreditHistory.setStatus(customerCredit.getStatus());
+            differencesWithIndex = customerCreditHistoryService.getDifferencesWithIndex(data, customerCreditHistory);
+        }
-        GetCustomerCreditHistoryBo result = new GetCustomerCreditHistoryBo(data);
+        ChangeData result = new ChangeData();
+        result.setOtherChangeList(differencesWithIndex);
         return InvokeResultBuilder.success(result);
     }
--- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/CustomerCreditHistory.java
View file @53450aa
+++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/CustomerCreditHistory.java
View file @53450aa
@@ -8,6 +8,7 @@ import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.lframework.starter.web.core.entity.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.lframework.xingyun.sc.Label;
 import lombok.Data;
 /**
@@ -42,251 +43,307 @@ public class CustomerCreditHistory extends BaseEntity implements BaseDto {
     /**
      * 编号
      */
+    @Label("编号")
     private String serialNumber;
     /**
      * 区域
      */
+    @Label("区域")
     private String region;
     /**
      * 登记日期
      */
+    @Label("登记日期")
     private LocalDate registerDate;
     /**
      * 客户简称
      */
+    @Label("客户简称")
     private String customerShortName;
     /**
      * 企业类型：经销商（distributor）、终端（terminal）
      */
+    @Label("企业类型")
     private String enterpriseType;
     /**
      * 单位名称
      */
+    @Label("单位名称")
     private String companyId;
     /**
      * 企业性质
      */
+    @Label("企业性质")
     private String companyNature;
     /**
      * 单位地址
      */
+    @Label("单位地址")
     private String companyAddress;
     /**
      * 注册资本（单位：万元）
      */
+    @Label("注册资本")
     private BigDecimal registeredCapital;
     /**
      * 账号
      */
+    @Label("账号")
     private String bankAccount;
     /**
      * 开户行
      */
+    @Label("开户行")
     private String bankName;
     /**
      * 税号
      */
+    @Label("税号")
     private String taxNumber;
     /**
      * 注册时间
      */
+    @Label("注册时间")
     private LocalDate registrationTime;
     /**
      * 经营年限（年）
      */
+    @Label("经营年限")
     private String businessYears;
     /**
      * 经营范围
      */
+    @Label("经营范围")
     private String businessScope;
     /**
      * 经营场地属性
      */
+    @Label("经营场地属性")
     private String businessProperty;
     /**
      * 占地面积（平方米）
      */
+    @Label("占地面积")
     private String landArea;
     /**
      * 仓储条件
      */
+    @Label("仓储条件")
     private String storageConditions;
     /**
      * 员工人数
      */
+    @Label("员工人数")
     private Integer employeeCount;
     /**
      * 设备属性
      */
+    @Label("设备属性")
     private String equipmentAttributes;
     /**
      * 资产评估
      */
+    @Label("资产评估")
     private String assetEvaluation;
     /**
      * 上年度销售额（万元）
      */
+    @Label("上年度销售额")
     private String lastYearSales;
     /**
      * 月均销量（万元）
      */
+    @Label("月均销量")
     private String monthlyAvgSales;
     /**
      * 销项发票所开品名与计量单位
      */
+    @Label("销项发票所开品名与计量单位")
     private String invoiceItemUnit;
     /**
-     * 认证证书我司售于产品与经营范围是否匹配
+     * 认证证书
+     */
+    @Label("认证证书")
+    private String certificationCertificate;
+
+    /**
+     * 我司售于产品与经营范围是否匹配
      */
+    @Label("我司售于产品与经营范围是否匹配")
     private String productMatch;
     /**
      * 主要客户
      */
+    @Label("主要客户")
     private String majorCustomers;
     /**
      * 主营项目
      */
+    @Label("主营项目")
     private String mainProjects;
     /**
      * 从事行业
      */
+    @Label("从事行业")
     private String industryInvolved;
     /**
      * 在该行业中的经验
      */
+    @Label("在该行业中的经验")
     private String industryExperience;
     /**
      * 是否与其他企业有经济纠纷 违规信息 拖欠员工薪资等
      */
+    @Label("是否与其他企业有经济纠纷 违规信息 拖欠员工薪资等")
     private String hasDispute;
     /**
      * 与我司合作时间
      */
+    @Label("与我司合作时间")
     private String cooperationStartDate;
     /**
      * 月均操作量
      */
+    @Label("月均操作量")
     private String monthlyAvgVolume;
     /**
      * 是否口头协议操作
      */
+    @Label("是否口头协议操作")
     private String isVerbalAgreement;
     /**
      * 是否签订其他协议（列举）
      */
+    @Label("是否签订其他协议（列举）")
     private String otherAgreements;
     /**
      * 与我司操作是否签订长年合同
      */
+    @Label("与我司操作是否签订长年合同")
     private String hasLongTermContract;
     /**
      * 合同类型
      */
+    @Label("合同类型")
     private String contractType;
     /**
      * 是否有过中断及中断原因
      */
+    @Label("是否有过中断及中断原因")
     private String hasInterruption;
     /**
-     * 结算期限
+     * 结算期限（办事处）
      */
+    @Label("结算期限（办事处）")
     private String settlementPeriod;
     /**
-     * 加工料提供时间
+     * 加工操作方案(办事处)
      */
+    @Label("加工操作方案（办事处）")
     private String materialSupplyPlan;
     /**
      * 建议客户分类：AAA、AA、A、BBB、BB、B、C、D
      */
+    @Label("建议客户分类")
     private String suggestedCategory;
     /**
      * 授信额度（万元）
      */
+    @Label("授信额度")
     private String creditLimit;
     /**
      * 调查人
      */
+    @Label("调查人")
     private String investigator;
     /**
      * 主管审核
      */
+    @Label("主管审核")
     private String supervisorReview;
     /**
      * 年度总销量（万元）
      */
+    @Label("年度总销量")
     private String annualTotalSales;
     /**
      * 主要行业
      */
+    @Label("主要行业")
     private String mainIndustry;
     /**
      * 年度款料概况
      */
+    @Label("年度款料概况")
     private String annualMaterialOverview;
     /**
-     * 结算期限
+     * 结算期限（公司评审）
      */
+    @Label("结算期限（公司评审）")
     private String companySettlementPeriod;
     /**
      * 授信额度（万元）
      */
+    @Label("授信额度")
     private String companyCreditLimit;
     /**
-     * 加工料提供时间
+     * 加工操作方案（公司评审）
      */
+    @Label("加工操作方案（公司评审）")
     private String companyMaterialSupplyPlan;
     /**
-     * 建议客户分类：AAA、AA、A、BBB、BB、B、C、D
+     * 客户分类：AAA、AA、A、BBB、BB、B、C、D
      */
+    @Label("客户分类")
     private String companySuggestedCategory;
     /**
@@ -330,9 +387,4 @@ public class CustomerCreditHistory extends BaseEntity implements BaseDto {
      */
     private String status;
-    /**
-     * 认证证书
-     */
-    private String certificationCertificate;
-
 }
--- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/impl/customer/CustomerCreditHistoryServiceImpl.java
View file @53450aa
+++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/impl/customer/CustomerCreditHistoryServiceImpl.java
View file @53450aa
@@ -12,6 +12,10 @@ import com.lframework.starter.web.core.components.resp.PageResult;
 import com.lframework.starter.common.utils.StringUtil;
 import java.io.Serializable;
 import com.lframework.starter.common.utils.Assert;
+import com.lframework.xingyun.basedata.entity.Customer;
+import com.lframework.xingyun.basedata.service.customer.CustomerService;
+import com.lframework.xingyun.sc.Label;
+import com.lframework.xingyun.sc.bo.customer.credit.ChangeItem;
 import com.lframework.xingyun.sc.entity.CustomerCreditHistory;
 import com.lframework.xingyun.sc.mappers.CustomerCreditHistoryMapper;
 import com.lframework.xingyun.sc.service.customer.CustomerCreditHistoryService;
@@ -22,11 +26,27 @@ import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
-import java.util.List;
+import javax.annotation.Resource;
+import java.lang.reflect.Field;
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+import java.util.*;
 @Service
 public class CustomerCreditHistoryServiceImpl extends BaseMpServiceImpl<CustomerCreditHistoryMapper, CustomerCreditHistory> implements CustomerCreditHistoryService {
+    @Resource
+    private CustomerService customerService;
+    // 定义不需要比较的字段
+    private static final Set<String> EXCLUDED_FIELDS = new HashSet<>(Arrays.asList(
+            "id", "sort", "createById", "createBy", "updateById",
+            "updateBy", "createTime", "updateTime", "status"
+    ));
+
+    // LocalDate 格式化器
+    private static final DateTimeFormatter DATE_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+
     @Override
     public PageResult<CustomerCreditHistory> query(Integer pageIndex, Integer pageSize, QueryCustomerCreditHistoryVo vo) {
@@ -232,6 +252,133 @@ public class CustomerCreditHistoryServiceImpl extends BaseMpServiceImpl<Customer
         getBaseMapper().deleteById(id);
     }
+    /**
+     * 比较两个对象，返回 List<ChangeItem>
+     * 内层 map:
+     *   1 -> 整体序号（从 1 开始）
+     *   2 -> 变更前值
+     *   3 -> 变更后值
+     */
+    public List<ChangeItem> getDifferencesWithIndex(
+            CustomerCreditHistory data,
+            CustomerCreditHistory customerCreditHistory) {
+
+        Map<String, Map<Integer, String>> result = new LinkedHashMap<>();
+        Class<?> clazz = CustomerCreditHistory.class;
+
+        if (data == null || customerCreditHistory == null) {
+            return null;
+        }
+
+        int index = 1; // 变更序号
+
+        try {
+            for (Field field : clazz.getDeclaredFields()) {
+                String fieldName = field.getName();
+
+                if (EXCLUDED_FIELDS.contains(fieldName)) {
+                    continue;
+                }
+
+                field.setAccessible(true);
+
+                Object value1 = field.get(data);
+                Object value2 = field.get(customerCreditHistory);
+
+                if (!Objects.equals(value1, value2)) {
+                    // 获取中文标签，优先使用 @Label，否则用字段名
+                    String label = getLabel(field);
+
+                    Map<Integer, String> changeMap = new LinkedHashMap<>();
+                    changeMap.put(1, String.valueOf(index));
+                    changeMap.put(2, formatValue(value1));
+                    changeMap.put(3, formatValue(value2));
+
+                    result.put(label, changeMap);
+                    index++;
+                }
+            }
+        } catch (IllegalAccessException e) {
+            throw new RuntimeException("字段访问异常", e);
+        }
+
+        List<ChangeItem> changeItems = toChangeItemList(result);
+
+        return changeItems;
+
+    }
+
+    /**
+     * 获取字段的中文标签
+     */
+    private String getLabel(Field field) {
+        Label label = field.getAnnotation(Label.class);
+        return label != null ? label.value() : field.getName(); // 没有注解则返回字段名
+    }
+
+    /**
+     * 格式化各种类型的值为可读字符串
+     */
+    private static String formatValue(Object value) {
+        if (value == null) {
+            return "null";
+        }
+
+        if (value instanceof Boolean) {
+            return (Boolean) value ? "是" : "否";
+        }
+
+        if (value instanceof LocalDate) {
+            return ((LocalDate) value).format(DATE_FORMATTER);
+        }
+
+        if (value instanceof BigDecimal) {
+            return ((BigDecimal) value).stripTrailingZeros().toPlainString();
+        }
+
+        if (value instanceof String) {
+            return (String) value;
+        }
+
+        if (value instanceof Integer) {
+            return value.toString();
+        }
+
+        return value.toString();
+    }
+
+    /**
+     * 将嵌套 Map 转换为 List<ChangeItem>
+     *
+     * @param differencesMap key: 中文字段名, value: {1:序号, 2:变更前, 3:变更后}
+     * @return List<ChangeItem>
+     */
+    public List<ChangeItem> toChangeItemList(Map<String, Map<Integer, String>> differencesMap) {
+        List<ChangeItem> list = new ArrayList<>();
+
+        for (Map.Entry<String, Map<Integer, String>> entry : differencesMap.entrySet()) {
+            String fieldName = entry.getKey();           // 中文字段名，如“区域”
+            Map<Integer, String> changeData = entry.getValue();
+
+            ChangeItem item = new ChangeItem();
+            item.setSerialNumber(Integer.valueOf(changeData.get(1))); // 序号
+            String beforeChange = changeData.get(2);
+            if (changeData.get(2) == null) {
+                beforeChange = "";
+            }
+            String afterChange = changeData.get(3);
+            if (changeData.get(3) == null) {
+                afterChange = "";
+            }
+            item.setBeforeChange(fieldName + ":" + beforeChange);     // 变更前
+            item.setAfterChange(fieldName + ":" + afterChange);      // 变更后
+
+            list.add(item);
+        }
+
+        return list;
+    }
+
     @CacheEvict(value = CustomerCreditHistory.CACHE_NAME, key = "@cacheVariables.tenantId() + #key")
     @Override
     public void cleanCacheByKey(Serializable key) {
--- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/customer/CustomerCreditHistoryService.java
View file @53450aa
+++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/customer/CustomerCreditHistoryService.java
View file @53450aa
@@ -2,10 +2,12 @@ package com.lframework.xingyun.sc.service.customer;
 import com.lframework.starter.web.core.service.BaseMpService;
 import com.lframework.starter.web.core.components.resp.PageResult;
+import com.lframework.xingyun.sc.bo.customer.credit.ChangeItem;
 import com.lframework.xingyun.sc.entity.CustomerCreditHistory;
 import com.lframework.xingyun.sc.vo.customer.credit.CreateCustomerCreditHistoryVo;
 import com.lframework.xingyun.sc.vo.customer.credit.QueryCustomerCreditHistoryVo;
 import java.util.List;
+import java.util.Map;
 /**
  * 客户资信历史记录表 Service
@@ -46,4 +48,9 @@ public interface CustomerCreditHistoryService extends BaseMpService<CustomerCred
      * @return
      */
     void deleteById(String id);
+
+    /**
+     * 比较两个 CustomerCreditHistory 对象，返回字段变更描述
+     */
+    List<ChangeItem> getDifferencesWithIndex(CustomerCreditHistory data, CustomerCreditHistory customerCreditHistory);
 }