楚江ERP:客户资信变更详情核心人员

 package com.lframework.xingyun.sc.bo.customer.credit;
 
 
+import com.lframework.xingyun.sc.entity.CorePersonnelHistory;
+
 import java.util.List;
 
 /**
@@ -9,6 +11,16 @@ import java.util.List;
 public class ChangeData {
     private List<ChangeItem> otherChangeList;
 
+    /**
+     * 核心人员变更前
+     */
+    private List<CorePersonnelHistory> personnelBeforeChangeList;
+
+    /**
+     * 核心人员变更后
+     */
+    private List<CorePersonnelHistory> personnelAfterChangeList;
+
     public List<ChangeItem> getOtherChangeList() {
         return otherChangeList;
     }
@@ -16,4 +28,20 @@ public class ChangeData {
     public void setOtherChangeList(List<ChangeItem> otherChangeList) {
         this.otherChangeList = otherChangeList;
     }
+
+    public List<CorePersonnelHistory> getPersonnelBeforeChangeList() {
+        return personnelBeforeChangeList;
+    }
+
+    public void setPersonnelBeforeChangeList(List<CorePersonnelHistory> personnelBeforeChangeList) {
+        this.personnelBeforeChangeList = personnelBeforeChangeList;
+    }
+
+    public List<CorePersonnelHistory> getPersonnelAfterChangeList() {
+        return personnelAfterChangeList;
+    }
+
+    public void setPersonnelAfterChangeList(List<CorePersonnelHistory> personnelAfterChangeList) {
+        this.personnelAfterChangeList = personnelAfterChangeList;
+    }
 }

@@ -3,7 +3,6 @@ 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;
@@ -14,11 +13,17 @@ 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.CorePersonnel;
+import com.lframework.xingyun.sc.entity.CorePersonnelHistory;
 import com.lframework.xingyun.sc.entity.CustomerCredit;
 import com.lframework.xingyun.sc.entity.CustomerCreditHistory;
+import com.lframework.xingyun.sc.service.customer.CorePersonnelHistoryService;
+import com.lframework.xingyun.sc.service.customer.CorePersonnelService;
 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.QueryCorePersonnelHistoryVo;
+import com.lframework.xingyun.sc.vo.customer.credit.QueryCorePersonnelVo;
 import com.lframework.xingyun.sc.vo.customer.credit.QueryCustomerCreditHistoryVo;
 import io.swagger.annotations.ApiImplicitParam;
 import com.lframework.starter.web.core.components.resp.InvokeResultBuilder;
@@ -50,6 +55,10 @@ public class CustomerCreditHistoryController extends DefaultBaseController {
     private CustomerCreditHistoryService customerCreditHistoryService;
     @Resource
     private CustomerCreditService customerCreditService;
+    @Resource
+    private CorePersonnelHistoryService corePersonnelHistoryService;
+    @Resource
+    private CorePersonnelService corePersonnelService;
 
     /**
      * 查询列表
@@ -129,166 +138,62 @@ public class CustomerCreditHistoryController extends DefaultBaseController {
         int sort = Integer.parseInt(data.getSort());
         //变更次数
         int size = query.size();
-        List<ChangeItem> differencesWithIndex = new ArrayList<>();
+        List<ChangeItem> differencesWithIndex;
+        //核心人员变更前
+        List<CorePersonnelHistory> personnelBeforeChangeList;
+        //核心人员变更后
+        List<CorePersonnelHistory> personnelAfterChangeList;
+
+        ChangeData result = new ChangeData();
         if (sort + 1 <= size) {
             //data与customerCreditHistory的比较，其中data与为变更前，customerCreditHistory为变更后
             CustomerCreditHistory customerCreditHistory = map.get(String.valueOf(sort + 1));
             differencesWithIndex = customerCreditHistoryService.getDifferencesWithIndex(data, customerCreditHistory);
-
+            //核心人员变更前
+            String idBefore = data.getId();
+            QueryCorePersonnelHistoryVo corePersonnelHistoryVo = new QueryCorePersonnelHistoryVo();
+            corePersonnelHistoryVo.setCreditHistoryId(idBefore);
+            personnelBeforeChangeList = corePersonnelHistoryService.query(corePersonnelHistoryVo);
+
+            //核心人员变更后
+            String idAfter = customerCreditHistory.getId();
+            QueryCorePersonnelHistoryVo corePersonnelHistoryVo1 = new QueryCorePersonnelHistoryVo();
+            corePersonnelHistoryVo1.setCreditHistoryId(idAfter);
+            personnelAfterChangeList = corePersonnelHistoryService.query(corePersonnelHistoryVo1);
+
+            //添加变更记录
+            corePersonnelHistoryService.updateWithChangeInfo(personnelBeforeChangeList, personnelAfterChangeList);
+            result.setPersonnelBeforeChangeList(personnelBeforeChangeList);
+            result.setPersonnelAfterChangeList(personnelAfterChangeList);
         } 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());
+            CustomerCreditHistory customerCreditHistory = customerCreditHistoryService.changeCustomerCredit(customerCredit);
             differencesWithIndex = customerCreditHistoryService.getDifferencesWithIndex(data, customerCreditHistory);
+            //核心人员变更前
+            String idBefore = data.getId();
+            QueryCorePersonnelHistoryVo corePersonnelHistoryVo = new QueryCorePersonnelHistoryVo();
+            corePersonnelHistoryVo.setCreditHistoryId(idBefore);
+            personnelBeforeChangeList = corePersonnelHistoryService.query(corePersonnelHistoryVo);
+
+            //核心人员变更后
+            String idAfter = customerCredit.getId();
+            QueryCorePersonnelVo queryCorePersonnelVo = new QueryCorePersonnelVo();
+            queryCorePersonnelVo.setCreditId(idAfter);
+            List<CorePersonnel> query1 = corePersonnelService.query(queryCorePersonnelVo);
+            List<CorePersonnelHistory> query2 = new ArrayList<>();
+            if (query1 != null) {
+                for (CorePersonnel corePersonnel : query1) {
+                    CorePersonnelHistory corePersonnelHistory = corePersonnelHistoryService.changeCorePersonnel(corePersonnel);
+                    query2.add(corePersonnelHistory);
+                }
+            }
+            //添加变更记录
+            corePersonnelHistoryService.updateWithChangeInfo(personnelBeforeChangeList, query2);
+            result.setPersonnelBeforeChangeList(personnelBeforeChangeList);
+            result.setPersonnelAfterChangeList(query2);
         }
 
-        ChangeData result = new ChangeData();
         result.setOtherChangeList(differencesWithIndex);
 
         return InvokeResultBuilder.success(result);

@@ -48,46 +48,97 @@ public class CorePersonnelHistory extends BaseEntity implements BaseDto {
     private String name;
 
     /**
+     * 姓名是否变更
+     */
+    private Boolean nameChange;
+
+    /**
      * 性别
      */
     private String sex;
 
     /**
+     * 性别是否变更
+     */
+    private Boolean sexChange;
+
+    /**
      * 籍贯
      */
     private String nativePlace;
 
     /**
+     * 籍贯是否变更
+     */
+    private Boolean nativePlaceChange;
+
+    /**
      * 年龄
      */
     private String age;
 
     /**
+     * 年龄是否变更
+     */
+    private Boolean ageChange;
+
+    /**
      * 职务
      */
     private String position;
 
     /**
+     * 职务是否变更
+     */
+    private Boolean positionChange;
+
+    /**
      * 手机
      */
     private String mobile;
 
     /**
+     * 手机是否变更
+     */
+    private Boolean mobileChange;
+
+
+    /**
      * 固定电话
      */
     private String phone;
 
     /**
+     * 固定电话是否变更
+     */
+    private Boolean phoneChange;
+
+    /**
      * 邮箱地址
      */
     private String email;
 
     /**
+     * 邮箱地址是否变更
+     */
+    private Boolean emailChange;
+
+    /**
      * 现住址
      */
     private String address;
 
     /**
+     * 现住址是否变更
+     */
+    private Boolean addressChange;
+
+    /**
+     * 新增/删除/变更
+     */
+    private String type;
+
+    /**
      * 创建人ID
      */
     @TableField(fill = FieldFill.INSERT)

@@ -12,6 +12,7 @@ import com.lframework.starter.web.core.annotations.oplog.OpLog;
 import com.lframework.starter.web.core.utils.PageHelperUtil;
 import com.lframework.starter.common.utils.Assert;
 import com.lframework.starter.web.inner.components.oplog.OtherOpLogType;
+import com.lframework.xingyun.sc.entity.CorePersonnel;
 import com.lframework.xingyun.sc.entity.CorePersonnelHistory;
 import com.lframework.xingyun.sc.mappers.CorePersonnelHistoryMapper;
 import com.lframework.xingyun.sc.service.customer.CorePersonnelHistoryService;
@@ -22,7 +23,7 @@ import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 
-import java.util.List;
+import java.util.*;
 
 @Service
 public class CorePersonnelHistoryServiceImpl extends BaseMpServiceImpl<CorePersonnelHistoryMapper, CorePersonnelHistory> implements CorePersonnelHistoryService {
@@ -106,6 +107,141 @@ public class CorePersonnelHistoryServiceImpl extends BaseMpServiceImpl<CorePerso
         getBaseMapper().deleteById(id);
     }
 
+
+    /**
+     * 完善两个核心人员列表中的 type 和 xxxChange 字段
+     * 不增删对象，仅完善字段
+     *
+     * @param personnelBeforeChangeList 变更前列表（会被完善字段）
+     * @param personnelAfterChangeList  变更后列表（会被完善字段）
+     */
+    public void updateWithChangeInfo(
+            List<CorePersonnelHistory> personnelBeforeChangeList,
+            List<CorePersonnelHistory> personnelAfterChangeList) {
+
+        // 允许 null 输入
+        if (personnelBeforeChangeList == null) personnelBeforeChangeList = new ArrayList<>();
+        if (personnelAfterChangeList == null) personnelAfterChangeList = new ArrayList<>();
+
+        // 构建 Map<id, obj> 便于快速查找
+        Map<String, CorePersonnelHistory> beforeMap = toMap(personnelBeforeChangeList);
+        Map<String, CorePersonnelHistory> afterMap = toMap(personnelAfterChangeList);
+
+        // === 1. 处理变更前列表：判断是 DELETE 还是 UPDATE ===
+        for (CorePersonnelHistory beforeItem : personnelBeforeChangeList) {
+            String id = beforeItem.getPersonnelId();
+            CorePersonnelHistory afterItem = afterMap.get(id);
+
+            if (afterItem == null) {
+                // 只在 before 中存在 → 删除
+                beforeItem.setType("DELETE");
+                setAllChangeFields(beforeItem, false); // 删除时字段无变化
+            } else {
+                // 在前后都存在 → 修改
+                beforeItem.setType("UPDATE");
+                // 比较字段，设置 change 标志
+                compareAndSetChanges(beforeItem, beforeItem, afterItem);
+            }
+        }
+
+        // === 2. 处理变更后列表：判断是 ADD 还是 UPDATE ===
+        for (CorePersonnelHistory afterItem : personnelAfterChangeList) {
+            String id = afterItem.getPersonnelId();
+            CorePersonnelHistory beforeItem = beforeMap.get(id);
+
+            if (beforeItem == null) {
+                // 只在 after 中存在 → 新增
+                afterItem.setType("ADD");
+                setAllChangeFields(afterItem, false); // 新增时字段视为“未变”（或可设 true）
+            } else {
+                // 在前后都存在 → 修改
+                afterItem.setType("UPDATE");
+                // 比较字段，设置 change 标志
+                compareAndSetChanges(afterItem, beforeItem, afterItem);
+            }
+        }
+    }
+
+    // 辅助方法：转为 Map<id, entity>
+    private Map<String, CorePersonnelHistory> toMap(List<CorePersonnelHistory> list) {
+        Map<String, CorePersonnelHistory> map = new HashMap<>();
+        for (CorePersonnelHistory obj : list) {
+            if (obj != null && obj.getPersonnelId() != null) {
+                map.put(obj.getPersonnelId(), obj);
+            }
+        }
+        return map;
+    }
+
+    // 辅助方法：设置所有 change 字段
+    private void setAllChangeFields(CorePersonnelHistory item, boolean value) {
+        if (item == null) return;
+        item.setNameChange(value);
+        item.setSexChange(value);
+        item.setNativePlaceChange(value);
+        item.setAgeChange(value);
+        item.setPositionChange(value);
+        item.setMobileChange(value);
+        item.setPhoneChange(value);
+        item.setEmailChange(value);
+        item.setAddressChange(value);
+    }
+
+    /**
+     * 比较 before 和 after，将变化的字段在 target 上设为 true
+     */
+    private void compareAndSetChanges(
+            CorePersonnelHistory target,
+            CorePersonnelHistory before,
+            CorePersonnelHistory after) {
+
+        if (target == null || before == null || after == null) return;
+
+        target.setNameChange(!Objects.equals(before.getName(), after.getName()));
+        target.setSexChange(!Objects.equals(before.getSex(), after.getSex()));
+        target.setNativePlaceChange(!Objects.equals(before.getNativePlace(), after.getNativePlace()));
+        target.setAgeChange(!Objects.equals(before.getAge(), after.getAge()));
+        target.setPositionChange(!Objects.equals(before.getPosition(), after.getPosition()));
+        target.setMobileChange(!Objects.equals(before.getMobile(), after.getMobile()));
+        target.setPhoneChange(!Objects.equals(before.getPhone(), after.getPhone()));
+        target.setEmailChange(!Objects.equals(before.getEmail(), after.getEmail()));
+        target.setAddressChange(!Objects.equals(before.getAddress(), after.getAddress()));
+    }
+
+    public CorePersonnelHistory changeCorePersonnel(CorePersonnel vo) {
+        CorePersonnelHistory data = new CorePersonnelHistory();
+        data.setPersonId(vo.getPersonId());
+        data.setName(vo.getName());
+        if (!StringUtil.isBlank(vo.getSex())) {
+            data.setSex(vo.getSex());
+        }
+        if (!StringUtil.isBlank(vo.getNativePlace())) {
+            data.setNativePlace(vo.getNativePlace());
+        }
+        if (!StringUtil.isBlank(vo.getAge())) {
+            data.setAge(vo.getAge());
+        }
+        if (!StringUtil.isBlank(vo.getPosition())) {
+            data.setPosition(vo.getPosition());
+        }
+        if (!StringUtil.isBlank(vo.getMobile())) {
+            data.setMobile(vo.getMobile());
+        }
+        if (!StringUtil.isBlank(vo.getPhone())) {
+            data.setPhone(vo.getPhone());
+        }
+        if (!StringUtil.isBlank(vo.getEmail())) {
+            data.setEmail(vo.getEmail());
+        }
+        if (!StringUtil.isBlank(vo.getAddress())) {
+            data.setAddress(vo.getAddress());
+        }
+        if (!StringUtil.isBlank(vo.getPersonId())) {
+            data.setPersonId(vo.getPersonId());
+        }
+        return data;
+    }
+
     @CacheEvict(value = CorePersonnelHistory.CACHE_NAME, key = "@cacheVariables.tenantId() + #key")
     @Override
     public void cleanCacheByKey(Serializable key) {

@@ -16,6 +16,7 @@ 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.CustomerCredit;
 import com.lframework.xingyun.sc.entity.CustomerCreditHistory;
 import com.lframework.xingyun.sc.mappers.CustomerCreditHistoryMapper;
 import com.lframework.xingyun.sc.service.customer.CustomerCreditHistoryService;
@@ -379,6 +380,157 @@ public class CustomerCreditHistoryServiceImpl extends BaseMpServiceImpl<Customer
         return list;
     }
 
+    public CustomerCreditHistory changeCustomerCredit(CustomerCredit customerCredit) {
+        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());
+        return customerCreditHistory;
+    }
+
     @CacheEvict(value = CustomerCreditHistory.CACHE_NAME, key = "@cacheVariables.tenantId() + #key")
     @Override
     public void cleanCacheByKey(Serializable key) {

@@ -2,6 +2,7 @@ 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.entity.CorePersonnel;
 import com.lframework.xingyun.sc.entity.CorePersonnelHistory;
 import com.lframework.xingyun.sc.vo.customer.credit.CreateCorePersonnelHistoryVo;
 import com.lframework.xingyun.sc.vo.customer.credit.QueryCorePersonnelHistoryVo;
@@ -46,4 +47,14 @@ public interface CorePersonnelHistoryService extends BaseMpService<CorePersonnel
      * @return
      */
     void deleteById(String id);
+
+    /**
+     * 更新两个核心人员列表，填充 type 和 xxxChange 字段
+     *
+     * @param beforeList 变更前列表（会被修改：设置 type 和 change 字段）
+     * @param afterList  变更后列表（会被修改：设置 type 和 change 字段）
+     */
+    void updateWithChangeInfo(List<CorePersonnelHistory> beforeList, List<CorePersonnelHistory> afterList);
+
+    CorePersonnelHistory changeCorePersonnel(CorePersonnel vo);
 }

@@ -3,6 +3,7 @@ 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.CustomerCredit;
 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;
@@ -53,4 +54,6 @@ public interface CustomerCreditHistoryService extends BaseMpService<CustomerCred
      * 比较两个 CustomerCreditHistory 对象，返回字段变更描述
      */
     List<ChangeItem> getDifferencesWithIndex(CustomerCreditHistory data, CustomerCreditHistory customerCreditHistory);
+
+    CustomerCreditHistory changeCustomerCredit(CustomerCredit customerCredit);
 }