Merge branch 'test' into dev

hx-common/src/main/java/com/fjhx/common/enums/CodingRuleEnum.java

@@ -18,7 +18,7 @@ public enum CodingRuleEnum {
 
     /**
      * 外销合同
-     */
+     */ 
     CONTRACT("contract", "外销合同", Arrays.asList(
             getDefaultRule(RuleTypeEnum.CUSTOMIZE, "SC-"),
             getDefaultRule(RuleTypeEnum.DATE_FORMAT, "yyyyMM-"),

hx-sale/src/main/java/com/fjhx/sale/entity/contract/po/Contract.java

@@ -289,6 +289,11 @@ public class Contract extends BasePo {
     private String profitClearingRemark;
 
     /**
+     * 是否变更  0:未变更  1已变更
+     */
+    private String isChange;
+
+    /**
      * 原合同id
      */
     private Long oldContractId;

hx-sale/src/main/java/com/fjhx/sale/flow/ContractUpdateFlow.java

@@ -116,11 +116,8 @@ public class ContractUpdateFlow extends FlowDelegate {
             throw new ServiceException("原合同不存在");
         }
         oldContract.setStatus(FlowStatusEnum.UPDATE.getKey());
+        oldContract.setIsChange("1");
         contractService.updateById(oldContract);
-
-        // TODO 已认领数据清空，但需要保留原认领记录
-
-
     }
 
 }

hx-sale/src/main/java/com/fjhx/sale/service/contract/impl/ContractServiceImpl.java

@@ -177,10 +177,12 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
 
         IWrapper<Contract> wrapper = getWrapper();
         wrapper.orderByDesc("t1", Contract::getCreateTime);
+        wrapper.eq("t1", Contract::getIsChange,"0");//列表只展示未变更得数据
         wrapper.between("t1", Contract::getStatus, FlowStatusEnum.DRAFT.getKey(), FlowStatusEnum.CANCELLATION.getKey() - 1);
         if (StringUtils.isNotEmpty(dto.getStatus())) {
             wrapper.eq("t1", Contract::getStatus, dto.getStatus());
         }
+
         if (StringUtils.isNotEmpty(dto.getSellCorporationId())) {
             wrapper.eq("t1", Contract::getSellCorporationId, dto.getSellCorporationId());
         }