楚江ERP：上传双方盖章合同

@@ -126,6 +126,8 @@ create table if not exists `tbl_contract_distributor_standard`
     `standard_approver_id`       varchar(32) COMMENT '标准合同审批人ID',
     `standard_approver_id`       varchar(32) COMMENT '标准合同审批人ID',
     `standard_time`               datetime COMMENT '标准合同审批完成时间',
     `standard_time`               datetime COMMENT '标准合同审批完成时间',
     `price_spec_locked`          TINYINT(1) COMMENT '是否已完成锁价/锁规',
     `price_spec_locked`          TINYINT(1) COMMENT '是否已完成锁价/锁规',
+    `signed_contract_file_id`    VARCHAR(100) COMMENT '双方盖章合同ID',
+    `signed_contract_file_name`  VARCHAR(255) COMMENT '双方盖章合同名称',
     `create_by_id`               varchar(32)  not null comment '创建人ID',
     `create_by_id`               varchar(32)  not null comment '创建人ID',
     `create_by`                  varchar(20)  not null comment '创建人',
     `create_by`                  varchar(20)  not null comment '创建人',
     `update_by_id`               varchar(32)  not null comment '更新人ID',
     `update_by_id`               varchar(32)  not null comment '更新人ID',

@@ -383,6 +383,18 @@ public class GetContractDistributorStandardBo extends BaseBo<ContractDistributor
     @ApiModelProperty(value = "标准合同审批完成时间")
     @ApiModelProperty(value = "标准合同审批完成时间")
     private LocalDateTime standardTime;
     private LocalDateTime standardTime;
 
 
+    /**
+     * 双方盖章合同ID
+     */
+    @ApiModelProperty(value = "双方盖章合同ID")
+    private String signedContractFileId;
+
+    /**
+     * 双方盖章合同名称
+     */
+    @ApiModelProperty(value = "双方盖章合同名称")
+    private String signedContractFileName;
+
     public GetContractDistributorStandardBo() {
     public GetContractDistributorStandardBo() {
 
 
     }
     }

@@ -185,6 +185,19 @@ public class QueryContractDistributorStandardBo extends BaseBo<ContractDistribut
     @ApiModelProperty(value = "是否已完成锁价/锁规")
     @ApiModelProperty(value = "是否已完成锁价/锁规")
     private Boolean priceSpecLocked;
     private Boolean priceSpecLocked;
 
 
+    /**
+     * 双方盖章合同ID
+     */
+    @ApiModelProperty(value = "双方盖章合同ID")
+    private String signedContractFileId;
+
+    /**
+     * 双方盖章合同名称
+     */
+    @ApiModelProperty(value = "双方盖章合同名称")
+    private String signedContractFileName;
+
+
     public QueryContractDistributorStandardBo() {
     public QueryContractDistributorStandardBo() {
 
 
     }
     }

@@ -374,6 +374,24 @@ public class ContractDistributorStandardController extends DefaultBaseController
         return InvokeResultBuilder.success();
         return InvokeResultBuilder.success();
     }
     }
 
 
+
+    /**
+     * 上传双方盖章合同
+     */
+    @ApiModelProperty("上传双方盖章合同")
+    @PostMapping("/uploadSignedContractFile")
+    public InvokeResult<Void> uploadSignedContractFile(@RequestBody UpdateContractDistributorStandardVo vo) {
+        if (vo == null || StringUtils.isBlank(vo.getId())) {
+            throw new DefaultClientException("参数错误！");
+        }
+
+        contractDistributorStandardService.uploadSignedContractFile(vo);
+
+        contractDistributorStandardService.cleanCacheByKey(vo.getId());
+
+        return InvokeResultBuilder.success();
+    }
+
     /**
     /**
      * 删除合同
      * 删除合同
      */
      */

@@ -299,6 +299,16 @@ public class ContractDistributorStandard extends BaseEntity implements BaseDto {
     private Boolean priceSpecLocked;
     private Boolean priceSpecLocked;
 
 
     /**
     /**
+     * 双方盖章合同ID
+     */
+    private String signedContractFileId;
+
+    /**
+     * 双方盖章合同名称
+     */
+    private String signedContractFileName;
+
+    /**
      * 是否展示正式合同审核按钮(非持久化字段)
      * 是否展示正式合同审核按钮(非持久化字段)
      */
      */
     @TableField(exist = false)
     @TableField(exist = false)

@@ -342,9 +342,9 @@ public class ContractDistributorStandardServiceImpl extends
                 .set(ContractDistributorStandard::getStandardFileName, vo.getStandardFileName())
                 .set(ContractDistributorStandard::getStandardFileName, vo.getStandardFileName())
                 .set(ContractDistributorStandard::getStandardStandardized, vo.getStandardStandardized())
                 .set(ContractDistributorStandard::getStandardStandardized, vo.getStandardStandardized())
                 .set(ContractDistributorStandard::getStandardApproved, CustomerDevelopStatus.AUDIT.name());
                 .set(ContractDistributorStandard::getStandardApproved, CustomerDevelopStatus.AUDIT.name());
-        if (!data.getStatus().equals("STANDARD") && "DISTRIB_STD".equals(data.getType())) { // 只有经销标准合同才修改状态
+        if (!data.getStatus().equals("STANDARD")
+                && ("DISTRIB_STD".equals(data.getType()) || "INTL_STD_CONTRACT".equals(data.getType()))) { // 只有经销(外贸)标准合同才修改状态
             updateWrapper.set(ContractDistributorStandard::getStatus, "STANDARD");
             updateWrapper.set(ContractDistributorStandard::getStatus, "STANDARD");
-
         }
         }
 
 
         updateWrapper.eq(ContractDistributorStandard::getId, vo.getId());
         updateWrapper.eq(ContractDistributorStandard::getId, vo.getId());
@@ -362,6 +362,26 @@ public class ContractDistributorStandardServiceImpl extends
         flowInstanceWrapperService.startInstance(STANDARD_FLAG, data.getId(), STANDARD_FLAG, data);
         flowInstanceWrapperService.startInstance(STANDARD_FLAG, data.getId(), STANDARD_FLAG, data);
     }
     }
 
 
+    @OpLog(type = OtherOpLogType.class, name = "上传双方盖章合同附件，ID：{}", params = {"#id"})
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void uploadSignedContractFile(UpdateContractDistributorStandardVo vo) {
+        ContractDistributorStandard data = getBaseMapper().selectById(vo.getId());
+        if (ObjectUtil.isNull(data)) {
+            throw new DefaultClientException("合同不存在！");
+        }
+
+        LambdaUpdateWrapper<ContractDistributorStandard> wrapper = Wrappers.lambdaUpdate(ContractDistributorStandard.class)
+                .set(ContractDistributorStandard::getSignedContractFileId, vo.getSignedContractFileId())
+                .set(ContractDistributorStandard::getSignedContractFileName, vo.getSignedContractFileName())
+                .eq(ContractDistributorStandard::getId, vo.getId());
+
+        getBaseMapper().update(wrapper);
+
+        OpLogUtil.setVariable("id", data.getId());
+        OpLogUtil.setExtra(vo);
+    }
+
     @Override
     @Override
     @OpLog(type = OtherOpLogType.class, name = "正式合同附件审批完成，ID：{}， 审批状态：{}", params = {"#id", "#formalApproved"})
     @OpLog(type = OtherOpLogType.class, name = "正式合同附件审批完成，ID：{}， 审批状态：{}", params = {"#id", "#formalApproved"})
     @Transactional(rollbackFor = Exception.class)
     @Transactional(rollbackFor = Exception.class)

@@ -66,6 +66,13 @@ public interface ContractDistributorStandardService extends BaseMpService<Contra
      */
      */
     void uploadStandardContract(UpdateContractDistributorStandardVo vo);
     void uploadStandardContract(UpdateContractDistributorStandardVo vo);
 
 
+    /**
+     * 上传双方盖章合同
+     *
+     * @param vo
+     */
+    void uploadSignedContractFile(UpdateContractDistributorStandardVo vo);
+
     void updateFormalContractStatus(String id, String formalApproved);
     void updateFormalContractStatus(String id, String formalApproved);
 
 
     void updateStandardContractStatus(String id, String standardApproved);
     void updateStandardContractStatus(String id, String standardApproved);

@@ -331,4 +331,17 @@ public class UpdateContractDistributorStandardVo implements BaseVo, Serializable
      */
      */
     @ApiModelProperty(value = "标准合同审批完成时间")
     @ApiModelProperty(value = "标准合同审批完成时间")
     private LocalDateTime standardTime;
     private LocalDateTime standardTime;
+
+    /**
+     * 双方盖章合同ID
+     */
+    @ApiModelProperty(value = "双方盖章合同ID")
+    private String signedContractFileId;
+
+    /**
+     * 双方盖章合同名称
+     */
+    @ApiModelProperty(value = "双方盖章合同名称")
+    private String signedContractFileName;
+
 }
 }

@@ -56,6 +56,8 @@
         <result column="standard_approver_id" property="standardApproverId"/>
         <result column="standard_approver_id" property="standardApproverId"/>
         <result column="standard_time" property="standardTime"/>
         <result column="standard_time" property="standardTime"/>
         <result column="price_spec_locked" property="priceSpecLocked"/>
         <result column="price_spec_locked" property="priceSpecLocked"/>
+        <result column="signed_contract_file_id" property="signedContractFileId"/>
+        <result column="signed_contract_file_name" property="signedContractFileName"/>
     </resultMap>
     </resultMap>
 
 
     <sql id="ContractDistributorStandard_sql">
     <sql id="ContractDistributorStandard_sql">
@@ -112,7 +114,9 @@
             tb.standard_approved,
             tb.standard_approved,
             tb.standard_approver_id,
             tb.standard_approver_id,
             tb.standard_time,
             tb.standard_time,
-            tb.price_spec_locked
+            tb.price_spec_locked,
+            tb.signed_contract_file_id,
+            tb.signed_contract_file_name
         FROM tbl_contract_distributor_standard AS tb
         FROM tbl_contract_distributor_standard AS tb
     </sql>
     </sql>