合同：合同变更完善

@@ -497,23 +497,6 @@ public class GetContractDistributorStandardBo extends BaseBo<ContractDistributor
     @ApiModelProperty(value = "是否可拆分")
     @ApiModelProperty(value = "是否可拆分")
     private Boolean canSplit;
     private Boolean canSplit;
 
 
-    /**
-     * 是否可发起合同变更
-     */
-    @ApiModelProperty(value = "是否可发起合同变更")
-    private Boolean canCreateChange;
-
-    /**
-     * 是否可锁规
-     */
-    @ApiModelProperty(value = "是否可锁规")
-    private Boolean canSpecLock;
-
-    /**
-     * 是否可发起锁规延期申请
-     */
-    @ApiModelProperty(value = "是否可发起锁规延期申请")
-    private Boolean canCreateSpecLockDelay;
 
 
     /**
     /**
      * 是否可锁价
      * 是否可锁价

@@ -271,24 +271,6 @@ public class QueryContractDistributorStandardBo extends BaseBo<ContractDistribut
     private Boolean canSplit;
     private Boolean canSplit;
 
 
     /**
     /**
-     * 是否可发起合同变更
-     */
-    @ApiModelProperty(value = "是否可发起合同变更")
-    private Boolean canCreateChange;
-
-    /**
-     * 是否可锁规
-     */
-    @ApiModelProperty(value = "是否可锁规")
-    private Boolean canSpecLock;
-
-    /**
-     * 是否可发起锁规延期申请
-     */
-    @ApiModelProperty(value = "是否可发起锁规延期申请")
-    private Boolean canCreateSpecLockDelay;
-
-    /**
      * 是否可锁价
      * 是否可锁价
      */
      */
     @ApiModelProperty(value = "是否可锁价")
     @ApiModelProperty(value = "是否可锁价")

@@ -379,24 +379,6 @@ public class ContractDistributorStandard extends BaseEntity implements BaseDto {
     private Boolean canSplit;
     private Boolean canSplit;
 
 
     /**
     /**
-     * 是否可发起合同变更
-     */
-    @TableField(exist = false)
-    private Boolean canCreateChange;
-
-    /**
-     * 是否可锁规
-     */
-    @TableField(exist = false)
-    private Boolean canSpecLock;
-
-    /**
-     * 是否可发起锁规延期申请
-     */
-    @TableField(exist = false)
-    private Boolean canCreateSpecLockDelay;
-
-    /**
      * 是否可锁价
      * 是否可锁价
      */
      */
     @TableField(exist = false)
     @TableField(exist = false)

@@ -1367,6 +1367,10 @@ public class ContractDistributorStandardServiceImpl extends
             throw new DefaultClientException("合同不存在！");
             throw new DefaultClientException("合同不存在！");
         }
         }
 
 
+        if(hasUnfinishedContractChange(data)){
+            throw new DefaultClientException("合同变更中，无法锁价！");
+        }
+
         List<UpdateContractDistributorLineVo> lineVoList = vo.getContractDistributorLineList();
         List<UpdateContractDistributorLineVo> lineVoList = vo.getContractDistributorLineList();
         if (CollectionUtils.isEmpty(lineVoList)) {
         if (CollectionUtils.isEmpty(lineVoList)) {
             throw new DefaultClientException("合同行数据为空！");
             throw new DefaultClientException("合同行数据为空！");
@@ -1495,6 +1499,10 @@ public class ContractDistributorStandardServiceImpl extends
             throw new DefaultClientException("合同不存在！");
             throw new DefaultClientException("合同不存在！");
         }
         }
 
 
+        if(hasUnfinishedContractChange(data)){
+            throw new DefaultClientException("合同变更中，无法锁规！");
+        }
+
         List<UpdateContractDistributorLineVo> lineVoList = vo.getContractDistributorLineList();
         List<UpdateContractDistributorLineVo> lineVoList = vo.getContractDistributorLineList();
         if (CollectionUtils.isEmpty(lineVoList)) {
         if (CollectionUtils.isEmpty(lineVoList)) {
             throw new DefaultClientException("合同行数据为空！");
             throw new DefaultClientException("合同行数据为空！");
@@ -1582,6 +1590,20 @@ public class ContractDistributorStandardServiceImpl extends
 //        createPurchaseOrderInfo(data, "PRODUCTION");
 //        createPurchaseOrderInfo(data, "PRODUCTION");
     }
     }
 
 
+    /**
+     * 是否存在未结束的合同变更
+     *
+     * @param data 合同
+     * @return 是否存在未结束的合同变更
+     */
+    private boolean hasUnfinishedContractChange(ContractDistributorStandard data) {
+        if (data == null) {
+            return false;
+        }
+        String rootContractId = StringUtils.isBlank(data.getParentId()) ? data.getId() : data.getParentId();
+        return contractChangeApplicationService.hasUnfinishedApplication(rootContractId);
+    }
+
     private String buildSpecificationLockContractCode(String contractCode, String contractType, int lockBatchNo) {
     private String buildSpecificationLockContractCode(String contractCode, String contractType, int lockBatchNo) {
         if (!isOpenSpecContract(contractType) || StringUtils.isBlank(contractCode)) {
         if (!isOpenSpecContract(contractType) || StringUtils.isBlank(contractCode)) {
             return contractCode;
             return contractCode;

@@ -65,6 +65,8 @@
         <result column="standardized_at" property="standardizedAt"/>
         <result column="standardized_at" property="standardizedAt"/>
         <result column="title" property="title"/>
         <result column="title" property="title"/>
         <result column="change_reason" property="changeReason"/>
         <result column="change_reason" property="changeReason"/>
+        <result column="price_lock_user_id" property="priceLockUserId"/>
+        <result column="changed" property="changed"/>
     </resultMap>
     </resultMap>
 
 
     <sql id="ContractDistributorStandard_sql">
     <sql id="ContractDistributorStandard_sql">
@@ -129,7 +131,9 @@
                tb.formalized_at,
                tb.formalized_at,
                tb.standardized_at,
                tb.standardized_at,
                tb.title,
                tb.title,
-               tb.change_reason
+               tb.change_reason,
+               tb.price_lock_user_id,
+               tb.changed
         FROM tbl_contract_distributor_standard AS tb
         FROM tbl_contract_distributor_standard AS tb
     </sql>
     </sql>