合同：合同变更单

房远帅
1 parent 9f71f5b6
Showing 10 changed files with 413 additions and 50 deletions
xingyun-api/src/main/resources/db/chujiang/base.sql
xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/contract/GetContractChangeApplicationBo.java
xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/contract/QueryContractChangeApplicationBo.java
xingyun-sc/src/main/java/com/lframework/xingyun/sc/controller/contract/ContractChangeApplicationController.java
xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/ContractChangeApplication.java
xingyun-sc/src/main/java/com/lframework/xingyun/sc/handlers/BusinessDataHandlerServiceImpl.java
xingyun-sc/src/main/java/com/lframework/xingyun/sc/impl/contract/ContractChangeApplicationServiceImpl.java
xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/contract/createVo/CreateContractChangeApplicationVo.java
xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/contract/queryVo/QueryContractChangeApplicationVo.java
xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/contract/updateVo/UpdateContractChangeApplicationVo.java
--- a/xingyun-api/src/main/resources/db/chujiang/base.sql
View file @ca77a0b
+++ b/xingyun-api/src/main/resources/db/chujiang/base.sql
View file @ca77a0b
@@ -1474,12 +1474,10 @@ CREATE TABLE IF NOT EXISTS `tbl_contract_change_application`
     `contract_code`    varchar(50)  NOT NULL COMMENT '合同编号',
     `contract_type`    varchar(50)  NOT NULL COMMENT '合同类型',
     `contract_stage`   varchar(20)  NOT NULL COMMENT '合同阶段(FORMAL:正式合同,STANDARD:标准合同)',
-    `change_reason`    varchar(200)          DEFAULT NULL COMMENT '变更原因',
+    `change_reason`    varchar(500)          DEFAULT NULL COMMENT '变更原因',
     `before_data_json` longtext              DEFAULT NULL COMMENT '变更前数据JSON',
     `after_data_json`  longtext              DEFAULT NULL COMMENT '变更后数据JSON',
     `approval_status`  varchar(20)  NOT NULL COMMENT '审核状态',
-    `approver_id`      varchar(32)           DEFAULT NULL COMMENT '审核人ID',
-    `approved_at`      datetime              DEFAULT NULL COMMENT '审核时间',
     `create_by_id`     varchar(32)           DEFAULT NULL COMMENT '创建人ID',
     `create_by`        varchar(50)           DEFAULT NULL COMMENT '创建人',
     `update_by_id`     varchar(32)           DEFAULT NULL COMMENT '更新人ID',
--- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/contract/GetContractChangeApplicationBo.java
View file @ca77a0b
+++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/contract/GetContractChangeApplicationBo.java
View file @ca77a0b
@@ -2,7 +2,6 @@ package com.lframework.xingyun.sc.bo.contract;
 import com.lframework.starter.web.core.bo.BaseBo;
 import com.lframework.xingyun.sc.entity.ContractChangeApplication;
-import com.lframework.xingyun.sc.vo.contract.updateVo.UpdateContractDistributorStandardVo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -86,7 +85,7 @@ public class GetContractChangeApplicationBo extends BaseBo<ContractChangeApplica
      * 变更后的合同数据
      */
     @ApiModelProperty("变更后的合同数据")
-    private UpdateContractDistributorStandardVo contractData;
+    private GetContractDistributorStandardBo contractData;
     public GetContractChangeApplicationBo() {
     }
--- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/contract/QueryContractChangeApplicationBo.java
View file @ca77a0b
+++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/contract/QueryContractChangeApplicationBo.java
View file @ca77a0b
@@ -5,6 +5,7 @@ import com.lframework.xingyun.sc.entity.ContractChangeApplication;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
 /**
@@ -76,6 +77,48 @@ public class QueryContractChangeApplicationBo extends BaseBo<ContractChangeAppli
     private String createBy;
     /**
+     * 办事处编码
+     */
+    @ApiModelProperty("办事处编码")
+    private String deptCode;
+
+    /**
+     * 办事处名称
+     */
+    @ApiModelProperty("办事处名称")
+    private String deptCodeName;
+
+    /**
+     * 生产厂编码
+     */
+    @ApiModelProperty("生产厂编码")
+    private String workshopCode;
+
+    /**
+     * 生产厂名称
+     */
+    @ApiModelProperty("生产厂名称")
+    private String workshopName;
+
+    /**
+     * 变更后的需方名称
+     */
+    @ApiModelProperty("变更后的需方名称")
+    private String buyerName;
+
+    /**
+     * 变更后的合计金额
+     */
+    @ApiModelProperty("变更后的合计金额")
+    private BigDecimal totalAmountIncludingTax;
+
+    /**
+     * 变更后的合计数量
+     */
+    @ApiModelProperty("变更后的合计数量")
+    private BigDecimal totalQuantity;
+
+    /**
      * 创建时间
      */
     @ApiModelProperty("创建时间")
--- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/controller/contract/ContractChangeApplicationController.java
View file @ca77a0b
+++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/controller/contract/ContractChangeApplicationController.java
View file @ca77a0b
 package com.lframework.xingyun.sc.controller.contract;
 import com.lframework.starter.common.exceptions.impl.DefaultClientException;
+import com.lframework.starter.web.core.annotations.security.HasPermission;
 import com.lframework.starter.web.core.components.resp.InvokeResult;
 import com.lframework.starter.web.core.components.resp.InvokeResultBuilder;
 import com.lframework.starter.web.core.components.resp.PageResult;
 import com.lframework.starter.web.core.controller.DefaultBaseController;
 import com.lframework.starter.web.core.utils.JsonUtil;
 import com.lframework.starter.web.core.utils.PageResultUtil;
+import com.lframework.starter.web.inner.dto.dic.city.DicCityDto;
+import com.lframework.starter.web.inner.entity.SysDataDicItem;
+import com.lframework.starter.web.inner.service.DicCityService;
+import com.lframework.starter.web.inner.service.system.SysDataDicItemService;
 import com.lframework.starter.web.inner.entity.SysDept;
 import com.lframework.starter.web.inner.service.system.SysDeptService;
 import com.lframework.xingyun.basedata.entity.Customer;
@@ -14,6 +19,7 @@ import com.lframework.xingyun.basedata.entity.Workshop;
 import com.lframework.xingyun.basedata.service.customer.CustomerService;
 import com.lframework.xingyun.basedata.service.workshop.WorkshopService;
 import com.lframework.xingyun.sc.bo.contract.GetContractChangeApplicationBo;
+import com.lframework.xingyun.sc.bo.contract.GetContractDistributorStandardBo;
 import com.lframework.xingyun.sc.bo.contract.QueryContractChangeApplicationBo;
 import com.lframework.xingyun.sc.bo.contract.QueryContractDistributorStandardBo;
 import com.lframework.xingyun.sc.entity.ContractChangeApplication;
@@ -23,15 +29,14 @@ import com.lframework.xingyun.sc.vo.contract.createVo.CreateContractChangeApplic
 import com.lframework.xingyun.sc.vo.contract.queryVo.QueryContractChangeApplicationVo;
 import com.lframework.xingyun.sc.vo.contract.queryVo.QueryContractChangeSelectableContractVo;
 import com.lframework.xingyun.sc.vo.contract.updateVo.UpdateContractChangeApplicationVo;
-import com.lframework.xingyun.sc.vo.contract.updateVo.UpdateContractDistributorStandardVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
-
 import javax.validation.Valid;
 import javax.validation.constraints.NotBlank;
 import java.util.Map;
@@ -56,11 +61,16 @@ public class ContractChangeApplicationController extends DefaultBaseController {
     private SysDeptService sysDeptService;
     @Autowired
     private WorkshopService workshopService;
+    @Autowired
+    private SysDataDicItemService sysDataDicItemService;
+    @Autowired
+    private DicCityService dicCityService;
     /**
      * 查询列表
      */
     @ApiOperation("查询列表")
+    @HasPermission({"contract-manage:change-contract:query"})
     @GetMapping("/query")
     public InvokeResult<PageResult<QueryContractChangeApplicationBo>> query(QueryContractChangeApplicationVo vo) {
         PageResult<ContractChangeApplication> pageResult = contractChangeApplicationService.query(getPageIndex(vo), getPageSize(vo), vo);
@@ -76,6 +86,7 @@ public class ContractChangeApplicationController extends DefaultBaseController {
      */
     @ApiOperation("根据ID查询")
     @ApiImplicitParam(value = "id", name = "id", paramType = "query", required = true)
+    @HasPermission({"contract-manage:change-contract:query","contract-manage:change-contract:review"})
     @GetMapping
     public InvokeResult<GetContractChangeApplicationBo> get(@NotBlank(message = "id不能为空！") String id) {
         ContractChangeApplication data = contractChangeApplicationService.findById(id);
@@ -84,8 +95,10 @@ public class ContractChangeApplicationController extends DefaultBaseController {
         }
         GetContractChangeApplicationBo result = new GetContractChangeApplicationBo(data);
-        if (org.apache.commons.lang3.StringUtils.isNotBlank(data.getAfterDataJson())) {
-            result.setContractData(JsonUtil.parseObject(data.getAfterDataJson(), UpdateContractDistributorStandardVo.class));
+        if (StringUtils.isNotBlank(data.getAfterDataJson())) {
+            GetContractDistributorStandardBo contractData = JsonUtil.parseObject(data.getAfterDataJson(), GetContractDistributorStandardBo.class);
+            fillContractDataDisplayInfo(contractData);
+            result.setContractData(contractData);
         }
         return InvokeResultBuilder.success(result);
     }
@@ -94,6 +107,15 @@ public class ContractChangeApplicationController extends DefaultBaseController {
      * 查询可发起变更的合同
      */
     @ApiOperation("查询可发起变更的合同")
+    @HasPermission({
+            "contract-manage:distribution-standard-contract:query",
+            "contract-manage:distribution-inventory-contract:query",
+            "contract-manage:distribution-unlocked-contract:query",
+            "contract-manage:foreign-trade-standard-contract:query",
+            "contract-manage:foreign-trade-inventory-contract:query",
+            "contract-manage:foreign-trade-unlocked-contract:query",
+            "contract-manage:processed-standard-contract:query"
+    })
     @GetMapping("/querySelectableContracts")
     public InvokeResult<PageResult<QueryContractDistributorStandardBo>> querySelectableContracts(QueryContractChangeSelectableContractVo vo) {
         PageResult<ContractDistributorStandard> pageResult = contractChangeApplicationService
@@ -138,6 +160,7 @@ public class ContractChangeApplicationController extends DefaultBaseController {
      * 新增
      */
     @ApiOperation("新增")
+    @HasPermission({"contract-manage:change-contract:add"})
     @PostMapping
     public InvokeResult<Void> create(@Valid @RequestBody CreateContractChangeApplicationVo vo) throws Exception {
         contractChangeApplicationService.create(vo);
@@ -148,6 +171,7 @@ public class ContractChangeApplicationController extends DefaultBaseController {
      * 修改
      */
     @ApiOperation("修改")
+    @HasPermission({"contract-manage:change-contract:modify","contract-manage:change-contract:approve"})
     @PutMapping
     public InvokeResult<Void> update(@Valid @RequestBody UpdateContractChangeApplicationVo vo) throws Exception {
         contractChangeApplicationService.update(vo);
@@ -159,9 +183,108 @@ public class ContractChangeApplicationController extends DefaultBaseController {
      */
     @ApiOperation("取消")
     @ApiImplicitParam(value = "id", name = "id", paramType = "query", required = true)
-    @DeleteMapping
+    @HasPermission({"contract-manage:change-contract:cancel"})
+    @PostMapping("/cancel")
     public InvokeResult<Void> cancel(@NotBlank(message = "id不能为空！") String id) {
         contractChangeApplicationService.cancelApplication(id);
         return InvokeResultBuilder.success();
     }
+
+    /**
+     * 填充变更后合同数据的展示字段
+     *
+     * @param contractData 合同数据
+     */
+    private void fillContractDataDisplayInfo(GetContractDistributorStandardBo contractData) {
+        if (contractData == null) {
+            return;
+        }
+
+        if (StringUtils.isNotBlank(contractData.getBuyer())) {
+            Customer customer = customerService.findById(contractData.getBuyer());
+            contractData.setBuyerName(customer == null ? null : customer.getName());
+        }
+        if (StringUtils.isNotBlank(contractData.getStockUpCompanyId())) {
+            Customer customer = customerService.findById(contractData.getStockUpCompanyId());
+            contractData.setStockUpCompanyName(customer == null ? null : customer.getName());
+        }
+        if (StringUtils.isNotBlank(contractData.getDeptId())) {
+            SysDept dept = sysDeptService.findById(contractData.getDeptId());
+            contractData.setDeptName(dept == null ? null : dept.getName());
+        }
+        if (StringUtils.isNotBlank(contractData.getRegion())) {
+            SysDept dept = sysDeptService.findById(contractData.getRegion());
+            contractData.setRegionName(dept == null ? null : dept.getName());
+        }
+        if (StringUtils.isNotBlank(contractData.getWorkshopId())) {
+            Workshop workshop = workshopService.findById(contractData.getWorkshopId());
+            contractData.setWorkshopName(workshop == null ? null : workshop.getName());
+        }
+
+        SysDataDicItem supplierDicItem = sysDataDicItemService.findByCode(ContractDistributorStandardController.SUPPLIER_DIC_CODE,
+                contractData.getSupplier());
+        contractData.setSupplierName(supplierDicItem == null ? null : supplierDicItem.getName());
+        SysDataDicItem unitDicItem = sysDataDicItemService.findByCode(ContractDistributorStandardController.UNIT_DIC_CODE,
+                contractData.getUnit());
+        contractData.setUnitName(unitDicItem == null ? null : unitDicItem.getName());
+        SysDataDicItem requiredDicItem = sysDataDicItemService.findByCode(ContractDistributorStandardController.CONDITIONS_REQUIRED_DIC_CODE,
+                contractData.getSpecialTerms());
+        contractData.setSpecialTermsName(requiredDicItem == null ? null : requiredDicItem.getName());
+        SysDataDicItem standardDicItem = sysDataDicItemService.findByCode(ContractDistributorStandardController.APPLICABLE_STANDARD_DIC_CODE,
+                contractData.getExecutionStandard());
+        contractData.setExecutionStandardName(standardDicItem == null ? null : standardDicItem.getName());
+
+        List<DicCityDto> dicCityDtoList = dicCityService.getChainById(contractData.getDestination());
+        if (CollectionUtils.isNotEmpty(dicCityDtoList) && dicCityDtoList.size() == 3) {
+            contractData.setProvinceId(dicCityDtoList.get(0).getId());
+            contractData.setProvinceName(dicCityDtoList.get(0).getName());
+            contractData.setCityId(dicCityDtoList.get(1).getId());
+            contractData.setCityName(dicCityDtoList.get(1).getName());
+            contractData.setDistrictId(dicCityDtoList.get(2).getId());
+            contractData.setDistrictName(dicCityDtoList.get(2).getName());
+        }
+
+        fillContractLineDisplayInfo(contractData);
+    }
+
+    /**
+     * 填充变更后合同物料行展示字段
+     *
+     * @param contractData 合同数据
+     */
+    private void fillContractLineDisplayInfo(GetContractDistributorStandardBo contractData) {
+        if (contractData == null) {
+            return;
+        }
+
+        Map<String, String> productCodeAndNameMap = sysDataDicItemService.findByDicCode(ContractDistributorStandardController.CONTRACT_PRODUCT_DIC_CODE)
+                .stream()
+                .collect(Collectors.toMap(SysDataDicItem::getCode, SysDataDicItem::getName));
+
+        if (CollectionUtils.isNotEmpty(contractData.getContractDistributorLineList())) {
+            contractData.getContractDistributorLineList().forEach(line -> line.setProductName(productCodeAndNameMap.get(line.getProductId())));
+        }
+
+        if (CollectionUtils.isNotEmpty(contractData.getContractStdProcessingLineList())) {
+            Map<String, String> rawToProdRatioCodeAndNameMap = sysDataDicItemService
+                    .findByDicCode(ContractDistributorStandardController.RAW_TO_PROD_RATIO_DIC_CODE)
+                    .stream()
+                    .collect(Collectors.toMap(SysDataDicItem::getCode, SysDataDicItem::getName));
+            Map<String, String> rawMaterialCodeAndNameMap = sysDataDicItemService
+                    .findByDicCode(ContractDistributorStandardController.RAW_MATERIAL)
+                    .stream()
+                    .collect(Collectors.toMap(SysDataDicItem::getCode, SysDataDicItem::getName));
+            Map<String, String> rawProductGradeCodeAndNameMap = sysDataDicItemService
+                    .findByDicCode(ContractDistributorStandardController.RAW_MATERIAL_GRADE)
+                    .stream()
+                    .collect(Collectors.toMap(SysDataDicItem::getCode, SysDataDicItem::getName));
+
+            contractData.getContractStdProcessingLineList().forEach(line -> {
+                line.setRawProductName(rawMaterialCodeAndNameMap.get(line.getRawProductId()));
+                line.setRawProductGradeName(rawProductGradeCodeAndNameMap.get(line.getRawProductGrade()));
+                line.setMaterialProductRatioName(rawToProdRatioCodeAndNameMap.get(line.getMaterialProductRatio()));
+                line.setProductName(productCodeAndNameMap.get(line.getProductId()));
+            });
+        }
+    }
 }
--- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/ContractChangeApplication.java
View file @ca77a0b
+++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/ContractChangeApplication.java
View file @ca77a0b
@@ -7,6 +7,7 @@ import com.lframework.starter.web.core.dto.BaseDto;
 import com.lframework.starter.web.core.entity.BaseEntity;
 import lombok.Data;
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
 /**
@@ -73,26 +74,46 @@ public class ContractChangeApplication extends BaseEntity implements BaseDto {
     private String approvalStatus;
     /**
-     * 审核人ID
+     * 办事处编码(非持久化字段)
      */
-    private String approverId;
+    @TableField(exist = false)
+    private String deptCode;
     /**
-     * 审核时间
+     * 办事处名称(非持久化字段)
      */
-    private LocalDateTime approvedAt;
+    @TableField(exist = false)
+    private String deptCodeName;
     /**
-     * 办事处编码(非持久化字段)
+     * 生产厂编码(非持久化字段)
      */
     @TableField(exist = false)
-    private String deptCode;
+    private String workshopCode;
     /**
-     * 生产厂编码(非持久化字段)
+     * 生产厂名称(非持久化字段)
      */
     @TableField(exist = false)
-    private String workshopCode;
+    private String workshopName;
+
+    /**
+     * 变更后的需方名称(非持久化字段)
+     */
+    @TableField(exist = false)
+    private String buyerName;
+
+    /**
+     * 变更后的合计金额(非持久化字段)
+     */
+    @TableField(exist = false)
+    private BigDecimal totalAmountIncludingTax;
+
+    /**
+     * 变更后的合计数量(非持久化字段)
+     */
+    @TableField(exist = false)
+    private BigDecimal totalQuantity;
     /**
      * 是否展示审核按钮(非持久化字段)
--- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/handlers/BusinessDataHandlerServiceImpl.java
View file @ca77a0b
+++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/handlers/BusinessDataHandlerServiceImpl.java
View file @ca77a0b
@@ -291,7 +291,7 @@ public class BusinessDataHandlerServiceImpl implements BusinessDataHandlerServic
                 || FlowInstanceStatus.TERMINATION.getCode().equals(flowStatus)) {
             contractChangeApplicationService.updateAuditStatus(businessId, "REFUSE");
         } else if (FlowInstanceStatus.UNDO.getCode().equals(flowStatus)) {
-            contractChangeApplicationService.updateAuditStatus(businessId, "CANCEL");
+            contractChangeApplicationService.updateAuditStatus(businessId, "REFUSE");
         }
     }
--- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/impl/contract/ContractChangeApplicationServiceImpl.java
View file @ca77a0b
+++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/impl/contract/ContractChangeApplicationServiceImpl.java
View file @ca77a0b
 package com.lframework.xingyun.sc.impl.contract;
-import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.pagehelper.PageInfo;
@@ -23,6 +22,9 @@ import com.lframework.starter.web.core.utils.PageResultUtil;
 import com.lframework.starter.web.inner.components.oplog.OtherOpLogType;
 import com.lframework.starter.web.inner.entity.SysDept;
 import com.lframework.starter.web.inner.service.system.SysDeptService;
+import com.lframework.xingyun.basedata.entity.Customer;
+import com.lframework.xingyun.basedata.service.customer.CustomerService;
+import com.lframework.xingyun.basedata.vo.customer.QueryCustomerVo;
 import com.lframework.xingyun.basedata.entity.Workshop;
 import com.lframework.xingyun.basedata.service.workshop.WorkshopService;
 import com.lframework.xingyun.sc.entity.ContractChangeApplication;
@@ -38,8 +40,6 @@ import com.lframework.xingyun.sc.service.contract.ContractChangeApplicationServi
 import com.lframework.xingyun.sc.service.contract.ContractDistributorLineService;
 import com.lframework.xingyun.sc.service.contract.ContractStdProcessingLineService;
 import com.lframework.xingyun.sc.vo.contract.createVo.CreateContractChangeApplicationVo;
-import com.lframework.xingyun.sc.vo.contract.createVo.CreateContractDistributorLineVo;
-import com.lframework.xingyun.sc.vo.contract.createVo.CreateContractStdProcessingLineVo;
 import com.lframework.xingyun.sc.vo.contract.queryVo.QueryContractChangeApplicationVo;
 import com.lframework.xingyun.sc.vo.contract.queryVo.QueryContractChangeSelectableContractVo;
 import com.lframework.xingyun.sc.vo.contract.updateVo.UpdateContractChangeApplicationVo;
@@ -59,8 +59,11 @@ import java.io.Serializable;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 /**
@@ -89,20 +92,62 @@ public class ContractChangeApplicationServiceImpl extends BaseMpServiceImpl<Cont
     private WorkshopService workshopService;
     @Resource
     private SysDeptService sysDeptService;
+    @Resource
+    private CustomerService customerService;
     @Override
     public PageResult<ContractChangeApplication> query(Integer pageIndex, Integer pageSize, QueryContractChangeApplicationVo vo) {
         Assert.greaterThanZero(pageIndex);
         Assert.greaterThanZero(pageSize);
+        List<String> buyerIds = null;
+        List<String> contractIdsByBuyer = null;
+        if (StringUtils.isNotBlank(vo.getBuyerName())) {
+            QueryCustomerVo queryCustomerVo = new QueryCustomerVo();
+            queryCustomerVo.setName(vo.getBuyerName());
+            List<Customer> customerList = customerService.query(queryCustomerVo);
+            if (CollectionUtils.isEmpty(customerList)) {
+                return PageResultUtil.convert(new PageInfo<>(Collections.emptyList()));
+            }
+
+            buyerIds = customerList.stream().map(Customer::getId).distinct().collect(Collectors.toList());
+            Wrapper<ContractDistributorStandard> contractWrapper = Wrappers.lambdaQuery(ContractDistributorStandard.class)
+                    .select(ContractDistributorStandard::getId)
+                    .in(ContractDistributorStandard::getBuyer, buyerIds);
+            contractIdsByBuyer = CollectionUtils.emptyIfNull(contractDistributorStandardMapper.selectList(contractWrapper))
+                    .stream()
+                    .map(ContractDistributorStandard::getId)
+                    .distinct()
+                    .collect(Collectors.toList());
+        }
+
         PageHelperUtil.startPage(pageIndex, pageSize);
-        Wrapper<ContractChangeApplication> wrapper = Wrappers.lambdaQuery(ContractChangeApplication.class)
+        com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper<ContractChangeApplication> wrapper =
+                Wrappers.lambdaQuery(ContractChangeApplication.class)
                 .like(StringUtils.isNotBlank(vo.getContractCode()), ContractChangeApplication::getContractCode, vo.getContractCode())
                 .eq(StringUtils.isNotBlank(vo.getContractType()), ContractChangeApplication::getContractType, vo.getContractType())
-                .eq(StringUtils.isNotBlank(vo.getContractStage()), ContractChangeApplication::getContractStage, vo.getContractStage())
-                .eq(StringUtils.isNotBlank(vo.getApprovalStatus()), ContractChangeApplication::getApprovalStatus, vo.getApprovalStatus())
-                .orderByDesc(ContractChangeApplication::getCreateTime);
+                .eq(StringUtils.isNotBlank(vo.getApprovalStatus()), ContractChangeApplication::getApprovalStatus, vo.getApprovalStatus());
+        if (CollectionUtils.isNotEmpty(buyerIds)) {
+            List<String> finalBuyerIds = buyerIds;
+            List<String> finalContractIdsByBuyer = contractIdsByBuyer;
+            wrapper.and(q -> {
+                boolean hasCondition = false;
+                if (CollectionUtils.isNotEmpty(finalContractIdsByBuyer)) {
+                    q.in(ContractChangeApplication::getContractId, finalContractIdsByBuyer);
+                    hasCondition = true;
+                }
+                for (String buyerId : finalBuyerIds) {
+                    if (hasCondition) {
+                        q.or();
+                    }
+                    q.like(ContractChangeApplication::getAfterDataJson, "\"buyer\":\"" + buyerId + "\"");
+                    hasCondition = true;
+                }
+            });
+        }
+        wrapper.orderByDesc(ContractChangeApplication::getCreateTime);
         List<ContractChangeApplication> datas = list(wrapper);
+        fillDisplayInfo(datas);
         fillShowExamine(datas);
         return PageResultUtil.convert(new PageInfo<>(datas));
     }
@@ -113,6 +158,7 @@ public class ContractChangeApplicationServiceImpl extends BaseMpServiceImpl<Cont
         if (data == null) {
             return null;
         }
+        fillDisplayInfo(Collections.singletonList(data));
         fillShowExamine(Arrays.asList(data));
         return data;
     }
@@ -201,8 +247,6 @@ public class ContractChangeApplicationServiceImpl extends BaseMpServiceImpl<Cont
         Wrapper<ContractChangeApplication> wrapper = Wrappers.lambdaUpdate(ContractChangeApplication.class)
                 .set(ContractChangeApplication::getApprovalStatus, CustomerDevelopStatus.CANCEL.name())
-                .set(ContractChangeApplication::getApprovedAt, LocalDateTime.now())
-                .set(ContractChangeApplication::getApproverId, SecurityUtil.getCurrentUser().getId())
                 .eq(ContractChangeApplication::getId, id);
         update(wrapper);
@@ -224,8 +268,6 @@ public class ContractChangeApplicationServiceImpl extends BaseMpServiceImpl<Cont
         Wrapper<ContractChangeApplication> wrapper = Wrappers.lambdaUpdate(ContractChangeApplication.class)
                 .set(ContractChangeApplication::getApprovalStatus, approvalStatus)
-                .set(ContractChangeApplication::getApprovedAt, LocalDateTime.now())
-                .set(ContractChangeApplication::getApproverId, SecurityUtil.getCurrentUser().getId())
                 .eq(ContractChangeApplication::getId, id);
         update(wrapper);
@@ -289,6 +331,125 @@ public class ContractChangeApplicationServiceImpl extends BaseMpServiceImpl<Cont
     }
     /**
+     * 填充列表展示信息
+     *
+     * @param datas 申请单列表
+     */
+    private void fillDisplayInfo(List<ContractChangeApplication> datas) {
+        if (CollectionUtils.isEmpty(datas)) {
+            return;
+        }
+
+        Map<String, UpdateContractDistributorStandardVo> afterDataMap = datas.stream()
+                .filter(item -> StringUtils.isNotBlank(item.getAfterDataJson()))
+                .collect(Collectors.toMap(ContractChangeApplication::getId,
+                        item -> JsonUtil.parseObject(item.getAfterDataJson(), UpdateContractDistributorStandardVo.class)));
+
+        List<String> contractIds = datas.stream()
+                .filter(item -> !afterDataMap.containsKey(item.getId()))
+                .map(ContractChangeApplication::getContractId)
+                .filter(StringUtils::isNotBlank)
+                .distinct()
+                .collect(Collectors.toList());
+        final Map<String, ContractDistributorStandard> contractMap;
+        if (CollectionUtils.isNotEmpty(contractIds)) {
+            Wrapper<ContractDistributorStandard> contractWrapper = Wrappers.lambdaQuery(ContractDistributorStandard.class)
+                    .select(ContractDistributorStandard::getId, ContractDistributorStandard::getDeptId,
+                            ContractDistributorStandard::getWorkshopId, ContractDistributorStandard::getBuyer,
+                            ContractDistributorStandard::getTotalAmountIncludingTax, ContractDistributorStandard::getTotalQuantity)
+                    .in(ContractDistributorStandard::getId, contractIds);
+            contractMap = CollectionUtils.emptyIfNull(contractDistributorStandardMapper.selectList(contractWrapper))
+                    .stream()
+                    .collect(Collectors.toMap(ContractDistributorStandard::getId, Function.identity()));
+        } else {
+            contractMap = Collections.emptyMap();
+        }
+
+        List<String> deptIds = new ArrayList<>();
+        List<String> workshopIds = new ArrayList<>();
+        List<String> customerIds = new ArrayList<>();
+        datas.forEach(item -> {
+            UpdateContractDistributorStandardVo afterData = afterDataMap.get(item.getId());
+            if (afterData != null) {
+                if (StringUtils.isNotBlank(afterData.getDeptId())) {
+                    deptIds.add(afterData.getDeptId());
+                }
+                if (StringUtils.isNotBlank(afterData.getWorkshopId())) {
+                    workshopIds.add(afterData.getWorkshopId());
+                }
+                if (StringUtils.isNotBlank(afterData.getBuyer())) {
+                    customerIds.add(afterData.getBuyer());
+                }
+                return;
+            }
+
+            ContractDistributorStandard contract = contractMap.get(item.getContractId());
+            if (contract != null) {
+                if (StringUtils.isNotBlank(contract.getDeptId())) {
+                    deptIds.add(contract.getDeptId());
+                }
+                if (StringUtils.isNotBlank(contract.getWorkshopId())) {
+                    workshopIds.add(contract.getWorkshopId());
+                }
+                if (StringUtils.isNotBlank(contract.getBuyer())) {
+                    customerIds.add(contract.getBuyer());
+                }
+            }
+        });
+
+        Map<String, SysDept> deptMap = CollectionUtils.emptyIfNull(sysDeptService.listByIds(deptIds.stream().distinct().collect(Collectors.toList())))
+                .stream()
+                .collect(Collectors.toMap(SysDept::getId, Function.identity()));
+        Map<String, Workshop> workshopMap = CollectionUtils.emptyIfNull(workshopService.listByIds(workshopIds.stream().distinct().collect(Collectors.toList())))
+                .stream()
+                .collect(Collectors.toMap(Workshop::getId, Function.identity()));
+        Map<String, Customer> customerMap = CollectionUtils.emptyIfNull(customerService.listByIds(customerIds.stream().distinct().collect(Collectors.toList())))
+                .stream()
+                .collect(Collectors.toMap(Customer::getId, Function.identity()));
+
+        datas.forEach(item -> {
+            String deptId = null;
+            String workshopId = null;
+            String buyerId = null;
+
+            UpdateContractDistributorStandardVo afterData = afterDataMap.get(item.getId());
+            if (afterData != null) {
+                deptId = afterData.getDeptId();
+                workshopId = afterData.getWorkshopId();
+                buyerId = afterData.getBuyer();
+                item.setTotalAmountIncludingTax(afterData.getTotalAmountIncludingTax());
+                item.setTotalQuantity(afterData.getTotalQuantity());
+            } else {
+                ContractDistributorStandard contract = contractMap.get(item.getContractId());
+                if (contract != null) {
+                    deptId = contract.getDeptId();
+                    workshopId = contract.getWorkshopId();
+                    buyerId = contract.getBuyer();
+                    item.setTotalAmountIncludingTax(contract.getTotalAmountIncludingTax());
+                    item.setTotalQuantity(contract.getTotalQuantity());
+                }
+            }
+
+            SysDept dept = deptMap.get(deptId);
+            if (dept != null) {
+                item.setDeptCode(dept.getCode());
+                item.setDeptCodeName(dept.getName());
+            }
+
+            Workshop workshop = workshopMap.get(workshopId);
+            if (workshop != null) {
+                item.setWorkshopCode(workshop.getCode());
+                item.setWorkshopName(workshop.getName());
+            }
+
+            Customer customer = customerMap.get(buyerId);
+            if (customer != null) {
+                item.setBuyerName(customer.getName());
+            }
+        });
+    }
+
+    /**
      * 获取合同，不存在则抛异常
      *
      * @param contractId 合同ID
@@ -526,6 +687,12 @@ public class ContractChangeApplicationServiceImpl extends BaseMpServiceImpl<Cont
                 .set(ContractDistributorStandard::getDesignatedConsignee, vo.getDesignatedConsignee())
                 .set(ContractDistributorStandard::getSpecialInstructions, vo.getSpecialInstructions())
                 .set(ContractDistributorStandard::getRemarks, vo.getRemarks())
+                .set(ContractDistributorStandard::getFormalFileId, vo.getFormalFileId())
+                .set(ContractDistributorStandard::getFormalFileName, vo.getFormalFileName())
+                .set(ContractDistributorStandard::getFormalStandardized, vo.getFormalStandardized())
+                .set(ContractDistributorStandard::getStandardFileId, vo.getStandardFileId())
+                .set(ContractDistributorStandard::getStandardFileName, vo.getStandardFileName())
+                .set(ContractDistributorStandard::getStandardStandardized, vo.getStandardStandardized())
                 .set(ContractDistributorStandard::getTotalQuantity, vo.getTotalQuantity())
                 .set(ContractDistributorStandard::getTotalAmountExcludingTax, vo.getTotalAmountExcludingTax())
                 .set(ContractDistributorStandard::getTotalAmountIncludingTax, vo.getTotalAmountIncludingTax())
@@ -544,21 +711,24 @@ public class ContractChangeApplicationServiceImpl extends BaseMpServiceImpl<Cont
      * @param vo 合同数据
      */
     private void overwriteDistributorLines(String contractId, UpdateContractDistributorStandardVo vo) {
-        Wrapper<ContractDistributorLine> removeWrapper = Wrappers.lambdaQuery(ContractDistributorLine.class)
-                .eq(ContractDistributorLine::getContractId, contractId);
-        contractDistributorLineService.remove(removeWrapper);
-
         if (CollectionUtils.isEmpty(vo.getContractDistributorLineList())) {
             return;
         }
         for (int i = 0; i < vo.getContractDistributorLineList().size(); i++) {
             UpdateContractDistributorLineVo lineVo = vo.getContractDistributorLineList().get(i);
-            CreateContractDistributorLineVo createVo = new CreateContractDistributorLineVo();
-            BeanUtil.copyProperties(lineVo, createVo);
-            createVo.setContractId(contractId);
-            createVo.setShowOrder(i);
-            contractDistributorLineService.create(createVo);
+            if (StringUtils.isBlank(lineVo.getId())) {
+                throw new DefaultClientException("合同变更后的普通合同行存在缺少ID的数据，不允许新增或删除物料行！");
+            }
+
+            ContractDistributorLine line = contractDistributorLineService.findById(lineVo.getId());
+            if (line == null || !StringUtils.equals(contractId, line.getContractId())) {
+                throw new DefaultClientException("合同变更后的普通合同行数据异常，存在不属于当前合同的物料行！");
+            }
+
+            lineVo.setContractId(contractId);
+            lineVo.setShowOrder(i);
+            contractDistributorLineService.update(lineVo);
         }
     }
@@ -569,21 +739,24 @@ public class ContractChangeApplicationServiceImpl extends BaseMpServiceImpl<Cont
      * @param vo 合同数据
      */
     private void overwriteProcessingLines(String contractId, UpdateContractDistributorStandardVo vo) {
-        Wrapper<ContractStdProcessingLine> removeWrapper = Wrappers.lambdaQuery(ContractStdProcessingLine.class)
-                .eq(ContractStdProcessingLine::getContractId, contractId);
-        contractStdProcessingLineService.remove(removeWrapper);
-
         if (CollectionUtils.isEmpty(vo.getContractStdProcessingLineList())) {
             return;
         }
         for (int i = 0; i < vo.getContractStdProcessingLineList().size(); i++) {
             UpdateContractStdProcessingLineVo lineVo = vo.getContractStdProcessingLineList().get(i);
-            CreateContractStdProcessingLineVo createVo = new CreateContractStdProcessingLineVo();
-            BeanUtil.copyProperties(lineVo, createVo);
-            createVo.setContractId(contractId);
-            createVo.setShowOrder(i);
-            contractStdProcessingLineService.create(createVo);
+            if (StringUtils.isBlank(lineVo.getId())) {
+                throw new DefaultClientException("合同变更后的加工合同行存在缺少ID的数据，不允许新增或删除物料行！");
+            }
+
+            ContractStdProcessingLine line = contractStdProcessingLineService.findById(lineVo.getId());
+            if (line == null || !StringUtils.equals(contractId, line.getContractId())) {
+                throw new DefaultClientException("合同变更后的加工合同行数据异常，存在不属于当前合同的物料行！");
+            }
+
+            lineVo.setContractId(contractId);
+            lineVo.setShowOrder(i);
+            contractStdProcessingLineService.update(lineVo);
         }
     }
 }
--- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/contract/createVo/CreateContractChangeApplicationVo.java
View file @ca77a0b
+++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/contract/createVo/CreateContractChangeApplicationVo.java
View file @ca77a0b
@@ -30,7 +30,7 @@ public class CreateContractChangeApplicationVo implements BaseVo, Serializable {
      * 变更原因
      */
     @ApiModelProperty(value = "变更原因")
-    @Length(message = "变更原因最多允许200个字符！")
+    @Length(message = "变更原因最多允许500个字符！")
     private String changeReason;
     /**
--- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/contract/queryVo/QueryContractChangeApplicationVo.java
View file @ca77a0b
+++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/contract/queryVo/QueryContractChangeApplicationVo.java
View file @ca77a0b
@@ -38,4 +38,10 @@ public class QueryContractChangeApplicationVo extends PageVo implements BaseVo, 
      */
     @ApiModelProperty("审核状态")
     private String approvalStatus;
+
+    /**
+     * 需方名称
+     */
+    @ApiModelProperty("需方名称")
+    private String buyerName;
 }
--- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/contract/updateVo/UpdateContractChangeApplicationVo.java
View file @ca77a0b
+++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/contract/updateVo/UpdateContractChangeApplicationVo.java
View file @ca77a0b
@@ -29,7 +29,7 @@ public class UpdateContractChangeApplicationVo implements BaseVo, Serializable {
      * 变更原因
      */
     @ApiModelProperty(value = "变更原因")
-    @Length(message = "变更原因最多允许200个字符！")
+    @Length(message = "变更原因最多允许500个字符！")
     private String changeReason;
     /**