feat(销售合同):合同经办人变更bug

src/main/java/com/inkasso/factoring/acceptanceManagement/service/impl/CAcceptanceBasicInfoServiceImpl.java

@@ -14,6 +14,7 @@ import com.github.pagehelper.util.StringUtil;
 import com.google.common.collect.Lists;
 import com.inkasso.adapter.exception.BusinessException;
 import com.inkasso.adapter.exception.ServiceException;
+import com.inkasso.adapter.util.BeanUtilsProxy;
 import com.inkasso.adapter.util.CodeUtil;
 import com.inkasso.adapter.util.CollectionUtil;
 import com.inkasso.adapter.util.ValidatorUtil;
@@ -63,12 +64,8 @@ import com.inkasso.factoring.invoicemanage.service.InvoiceBasicInfoService;
 import com.inkasso.factoring.purchManagement.entity.*;
 import com.inkasso.factoring.purchManagement.entity.vo.PurchContractCompletedVo;
 import com.inkasso.factoring.purchManagement.service.*;
-import com.inkasso.factoring.salesManagement.entity.CSalesContractBasicInfo;
-import com.inkasso.factoring.salesManagement.entity.CSalesContractManagement;
-import com.inkasso.factoring.salesManagement.entity.CSalesContractPersonInfo;
-import com.inkasso.factoring.salesManagement.service.ICSalesContractBasicInfoService;
-import com.inkasso.factoring.salesManagement.service.ICSalesContractManagementService;
-import com.inkasso.factoring.salesManagement.service.ICSalesContractPersonInfoService;
+import com.inkasso.factoring.salesManagement.entity.*;
+import com.inkasso.factoring.salesManagement.service.*;
 import com.inkasso.factoring.settlement.entity.SettlementBasicInfo;
 import com.inkasso.factoring.settlement.entity.SettlementGoodsInfo;
 import com.inkasso.factoring.settlement.service.SettlementBasicInfoService;
@@ -170,6 +167,10 @@ public class CAcceptanceBasicInfoServiceImpl extends ServiceImpl<CAcceptanceBasi
     private ISysAttachmentRefService attachmentRefService;
     @Autowired
     private FileStorageService fileStorageService;
+    @Autowired
+    private ICSalesContractSupplementInfoService salesContractSupplementInfoService;
+    @Autowired
+    private ICSalesContractSupplementPersonInfoService salesContractSupplementPersonInfoService;
 
 
 
@@ -214,6 +215,18 @@ public class CAcceptanceBasicInfoServiceImpl extends ServiceImpl<CAcceptanceBasi
         List<CSalesContractPersonInfo> salesContractPersonInfos = salesContractPersonInfoService.lambdaQuery()
                 .eq(CSalesContractPersonInfo::getcSalesContractBasicInfoId, salesContractBasicInfo.getId())
                 .eq(CSalesContractPersonInfo::getType, SalesContractPersonTypeEnum.SALESCONTRACTPERSONTYPE_ACCEPTANCE.getCode()).list();
+        CSalesContractSupplementInfo salesContractSupplementInfo = salesContractSupplementInfoService.lambdaQuery()
+                .eq(CSalesContractSupplementInfo::getcSalesContractManagementId, salesContractManagement.getId())
+                .eq(CSalesContractSupplementInfo::getChangeType,1)
+                .orderByDesc(CSalesContractSupplementInfo::getGmtCreate).last("limit 1").one();
+        if(salesContractSupplementInfo!=null){
+            //查询具体变更的人员信息
+            List<CSalesContractSupplementPersonInfo> list = salesContractSupplementPersonInfoService.lambdaQuery().eq(CSalesContractSupplementPersonInfo::getcSalesContractSupplementInfoId, salesContractSupplementInfo.getId()).list();
+            if(CollectionUtil.isNotEmpty(list)){
+                salesContractPersonInfos = BeanUtilsProxy.copyPropertiesList(list, CSalesContractPersonInfo.class);
+            }
+        }
+
         List<CAcceptancePersonInfo> acceptancePersonInfos = new ArrayList<>();
         purchContractSellers.forEach(r -> {
             CAcceptancePersonInfo acceptancePersonInfo = new CAcceptancePersonInfo();