楚江ERP：上传合同附件，提交审核

@@ -109,8 +109,16 @@ create table if not exists `tbl_contract_distributor_standard`
     `special_instructions`       TEXT COMMENT '特别说明',
     `special_instructions`       TEXT COMMENT '特别说明',
     `remarks`                    TEXT COMMENT '备注',
     `remarks`                    TEXT COMMENT '备注',
     `status`                     varchar(20)  not null DEFAULT 'DRAFT' COMMENT '状态',
     `status`                     varchar(20)  not null DEFAULT 'DRAFT' COMMENT '状态',
-    `type`                       varchar(20)  COMMENT '合同类型',
-    `parent_id`                  varchar(32)  COMMENT '父合同id',
+    `type`                       varchar(20) COMMENT '合同类型',
+    `parent_id`                  varchar(32) COMMENT '父合同id',
+    `formal_file_id`             VARCHAR(100) COMMENT '正式合同文件ID',
+    `formal_file_name`           VARCHAR(255) COMMENT '正式合同文件名称',
+    `formal_standardized`        TINYINT(1) COMMENT '正式合同是否规范 (0-不规范, 1-规范)',
+    `formal_approved`            TINYINT(1) DEFAULT 0 COMMENT '正式合同是否审批通过 (0-未通过, 1-已通过)',
+    `standard_file_id`           VARCHAR(100) COMMENT '标准合同文件ID',
+    `standard_file_name`         VARCHAR(255) COMMENT '标准合同文件名称',
+    `standard_standardized`      TINYINT(1) COMMENT '标准合同是否规范 (0-不规范, 1-规范)',
+    `standard_approved`          TINYINT(1) DEFAULT 0 COMMENT '标准合同是否审批通过 (0-未通过, 1-已通过)',
     `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',

@@ -292,6 +292,54 @@ public class GetContractDistributorStandardBo extends BaseBo<ContractDistributor
     @ApiModelProperty("经销标准合同物料行")
     @ApiModelProperty("经销标准合同物料行")
     private List<GetContractDistributorLineBo> contractDistributorLineList;
     private List<GetContractDistributorLineBo> contractDistributorLineList;
 
 
+    /**
+     * 正式合同文件ID
+     */
+    @ApiModelProperty("正式合同文件ID")
+    private String formalFileId;
+
+    /**
+     * 正式合同文件名称
+     */
+    @ApiModelProperty("正式合同文件名称")
+    private String formalFileName;
+
+    /**
+     * 正式合同是否规范 (0-不规范, 1-规范)
+     */
+    @ApiModelProperty("正式合同是否规范 (0-不规范, 1-规范)")
+    private Boolean formalStandardized;
+
+    /**
+     * 正式合同是否审批通过 (0-未通过, 1-已通过)
+     */
+    @ApiModelProperty("正式合同是否审批通过 (0-未通过, 1-已通过)")
+    private Boolean formalApproved;
+
+    /**
+     * 标准合同文件ID
+     */
+    @ApiModelProperty("标准合同文件ID")
+    private String standardFileId;
+
+    /**
+     * 标准合同文件名称
+     */
+    @ApiModelProperty("标准合同文件名称")
+    private String standardFileName;
+
+    /**
+     * 标准合同是否规范 (0-不规范, 1-规范)
+     */
+    @ApiModelProperty("标准合同是否规范 (0-不规范, 1-规范)")
+    private Boolean standardStandardized;
+
+    /**
+     * 标准合同是否审批通过 (0-未通过, 1-已通过)
+     */
+    @ApiModelProperty("标准合同是否审批通过 (0-未通过, 1-已通过)")
+    private Boolean standardApproved;
+
     public GetContractDistributorStandardBo() {
     public GetContractDistributorStandardBo() {
 
 
     }
     }

@@ -294,4 +294,21 @@ public class ContractDistributorStandardController extends DefaultBaseController
         stringBuilder.append(generateCodeService.generate(GenerateCodeTypePool.CONTRACT));
         stringBuilder.append(generateCodeService.generate(GenerateCodeTypePool.CONTRACT));
         return InvokeResultBuilder.success(stringBuilder.toString());
         return InvokeResultBuilder.success(stringBuilder.toString());
     }
     }
+
+    /**
+     * 上传合同附件
+     */
+    @ApiOperation("上传合同附件")
+    @PostMapping("/uploadFormalContract")
+    public InvokeResult<Void> uploadFormalContract(@RequestBody UpdateContractDistributorStandardVo vo) {
+        if (StringUtils.isBlank(vo.getFormalFileId()) || StringUtils.isBlank(vo.getId())) {
+            throw new DefaultClientException("参数错误！");
+        }
+
+        contractDistributorStandardService.uploadFormalContract(vo);
+
+        contractDistributorStandardService.cleanCacheByKey(vo.getId());
+
+        return InvokeResultBuilder.success();
+    }
 }
 }

@@ -158,7 +158,7 @@ public class ContractDistributorStandard extends BaseEntity implements BaseDto {
     private String remarks;
     private String remarks;
 
 
     /**
     /**
-     * 状态（DRAFT:草稿;FORMAL:正式;DELETED:删除）
+     * 状态（DRAFT:草稿;FORMAL:正式;STANDARD:标准;DELETED:删除）
      */
      */
     private String status;
     private String status;
 
 
@@ -173,6 +173,46 @@ public class ContractDistributorStandard extends BaseEntity implements BaseDto {
     private String parentId;
     private String parentId;
 
 
     /**
     /**
+     * 正式合同文件ID
+     */
+    private String formalFileId;
+
+    /**
+     * 正式合同文件名称
+     */
+    private String formalFileName;
+
+    /**
+     * 正式合同是否规范 (0-不规范, 1-规范)
+     */
+    private Boolean formalStandardized;
+
+    /**
+     * 正式合同是否审批通过 (0-未通过, 1-已通过)
+     */
+    private Boolean formalApproved;
+
+    /**
+     * 标准合同文件ID
+     */
+    private String standardFileId;
+
+    /**
+     * 标准合同文件名称
+     */
+    private String standardFileName;
+
+    /**
+     * 标准合同是否规范 (0-不规范, 1-规范)
+     */
+    private Boolean standardStandardized;
+
+    /**
+     * 标准合同是否审批通过 (0-未通过, 1-已通过)
+     */
+    private Boolean standardApproved;
+
+    /**
      * 创建人ID
      * 创建人ID
      */
      */
     @TableField(fill = FieldFill.INSERT)
     @TableField(fill = FieldFill.INSERT)

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.pagehelper.PageInfo;
 import com.github.pagehelper.PageInfo;
+import com.lframework.starter.bpm.service.FlowInstanceWrapperService;
 import com.lframework.xingyun.sc.entity.ContractDistributorLine;
 import com.lframework.xingyun.sc.entity.ContractDistributorLine;
 import com.lframework.xingyun.sc.entity.ContractDistributorStandard;
 import com.lframework.xingyun.sc.entity.ContractDistributorStandard;
 import com.lframework.starter.web.core.impl.BaseMpServiceImpl;
 import com.lframework.starter.web.core.impl.BaseMpServiceImpl;
@@ -42,8 +43,14 @@ import java.util.stream.Collectors;
 public class ContractDistributorStandardServiceImpl extends
 public class ContractDistributorStandardServiceImpl extends
         BaseMpServiceImpl<ContractDistributorStandardMapper, ContractDistributorStandard> implements ContractDistributorStandardService {
         BaseMpServiceImpl<ContractDistributorStandardMapper, ContractDistributorStandard> implements ContractDistributorStandardService {
 
 
+    private static final String FORMAL_FLAG = "FORMAL_CONTRACT"; // 正式合同审批
+    private static final String STANDARD_FLAG = "STANDARD_CONTRACT"; // 标准合同审批
+
     @Autowired
     @Autowired
     private ContractDistributorLineService contractDistributorLineService;
     private ContractDistributorLineService contractDistributorLineService;
+    @Autowired
+    private FlowInstanceWrapperService flowInstanceWrapperService;
+
 
 
     @Override
     @Override
     public PageResult<ContractDistributorStandard> query(Integer pageIndex, Integer pageSize, QueryContractDistributorStandardVo vo) {
     public PageResult<ContractDistributorStandard> query(Integer pageIndex, Integer pageSize, QueryContractDistributorStandardVo vo) {
@@ -220,6 +227,35 @@ public class ContractDistributorStandardServiceImpl extends
         OpLogUtil.setExtra(vo);
         OpLogUtil.setExtra(vo);
     }
     }
 
 
+    @OpLog(type = OtherOpLogType.class, name = "上传合同附件，ID：{}", params = {"#id"})
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void uploadFormalContract(UpdateContractDistributorStandardVo vo) {
+        ContractDistributorStandard data = getBaseMapper().selectById(vo.getId());
+        if (ObjectUtil.isNull(data)) {
+            throw new DefaultClientException("合同不存在！");
+        }
+
+        LambdaUpdateWrapper<ContractDistributorStandard> updateWrapper = Wrappers.lambdaUpdate(ContractDistributorStandard.class)
+                .set(ContractDistributorStandard::getFormalFileId, vo.getFormalFileId())
+                .set(ContractDistributorStandard::getFormalFileName, vo.getFormalFileName())
+                .set(ContractDistributorStandard::getFormalStandardized, vo.getFormalStandardized())
+                .set(ContractDistributorStandard::getStatus, "FORMAL")
+                .eq(ContractDistributorStandard::getId, vo.getId());
+
+        getBaseMapper().update(updateWrapper);
+
+        OpLogUtil.setVariable("id", data.getId());
+        OpLogUtil.setExtra(vo);
+
+        data.setFormalFileId(vo.getFormalFileId());
+        data.setFormalFileName(vo.getFormalFileName());
+        data.setFormalStandardized(vo.getFormalStandardized());
+
+        // 开启审核
+        flowInstanceWrapperService.startInstance(FORMAL_FLAG, data.getId(), FORMAL_FLAG, data);
+    }
+
     @CacheEvict(value = ContractDistributorStandard.CACHE_NAME, key = "@cacheVariables.tenantId() + #key")
     @CacheEvict(value = ContractDistributorStandard.CACHE_NAME, key = "@cacheVariables.tenantId() + #key")
     @Override
     @Override
     public void cleanCacheByKey(Serializable key) {
     public void cleanCacheByKey(Serializable key) {

@@ -52,4 +52,11 @@ public interface ContractDistributorStandardService extends BaseMpService<Contra
      */
      */
     void update(UpdateContractDistributorStandardVo vo);
     void update(UpdateContractDistributorStandardVo vo);
 
 
+    /**
+     * 上传合同附件
+     *
+     * @param vo
+     */
+    void uploadFormalContract(UpdateContractDistributorStandardVo vo);
+
 }
 }

@@ -244,4 +244,56 @@ public class CreateContractDistributorStandardVo implements BaseVo, Serializable
     @ApiModelProperty(value = "经销标准合同物料行", required = true)
     @ApiModelProperty(value = "经销标准合同物料行", required = true)
     @NotNull(message = "经销标准合同物料行不可为空！")
     @NotNull(message = "经销标准合同物料行不可为空！")
     private List<CreateContractDistributorLineVo> contractDistributorLineList;
     private List<CreateContractDistributorLineVo> contractDistributorLineList;
+
+    /**
+     * 正式合同文件ID
+     */
+    @ApiModelProperty(value = "正式合同文件ID")
+    private String formalFileId;
+
+    /**
+     * 正式合同文件名称
+     */
+    @ApiModelProperty(value = "正式合同文件名称")
+    private String formalFileName;
+
+    /**
+     * 正式合同是否规范 (0-不规范, 1-规范)
+     */
+    @ApiModelProperty(value = "正式合同是否规范 (0-不规范, 1-规范)")
+    @TypeMismatch(message = "正式合同是否规范 (0-不规范, 1-规范)格式有误！")
+    private Boolean formalStandardized;
+
+    /**
+     * 正式合同是否审批通过 (0-未通过, 1-已通过)
+     */
+    @ApiModelProperty(value = "正式合同是否审批通过 (0-未通过, 1-已通过)")
+    @TypeMismatch(message = "正式合同是否审批通过 (0-未通过, 1-已通过)格式有误！")
+    private Boolean formalApproved;
+
+    /**
+     * 标准合同文件ID
+     */
+    @ApiModelProperty(value = "标准合同文件ID")
+    private String standardFileId;
+
+    /**
+     * 标准合同文件名称
+     */
+    @ApiModelProperty(value = "标准合同文件名称")
+    private String standardFileName;
+
+    /**
+     * 标准合同是否规范 (0-不规范, 1-规范)
+     */
+    @ApiModelProperty(value = "标准合同是否规范 (0-不规范, 1-规范)")
+    @TypeMismatch(message = "标准合同是否规范 (0-不规范, 1-规范)格式有误！")
+    private Boolean standardStandardized;
+
+    /**
+     * 标准合同是否审批通过 (0-未通过, 1-已通过)
+     */
+    @ApiModelProperty(value = "标准合同是否审批通过 (0-未通过, 1-已通过)")
+    @TypeMismatch(message = "标准合同是否审批通过 (0-未通过, 1-已通过)格式有误！")
+    private Boolean standardApproved;
 }
 }

@@ -248,4 +248,56 @@ public class UpdateContractDistributorStandardVo implements BaseVo, Serializable
     @ApiModelProperty(value = "经销标准合同物料行", required = true)
     @ApiModelProperty(value = "经销标准合同物料行", required = true)
     @NotNull(message = "经销标准合同物料行不可为空！")
     @NotNull(message = "经销标准合同物料行不可为空！")
     private List<UpdateContractDistributorLineVo> contractDistributorLineList;
     private List<UpdateContractDistributorLineVo> contractDistributorLineList;
+
+    /**
+     * 正式合同文件ID
+     */
+    @ApiModelProperty(value = "正式合同文件ID")
+    private String formalFileId;
+
+    /**
+     * 正式合同文件名称
+     */
+    @ApiModelProperty(value = "正式合同文件名称")
+    private String formalFileName;
+
+    /**
+     * 正式合同是否规范 (0-不规范, 1-规范)
+     */
+    @ApiModelProperty(value = "正式合同是否规范 (0-不规范, 1-规范)")
+    @TypeMismatch(message = "正式合同是否规范 (0-不规范, 1-规范)格式有误！")
+    private Boolean formalStandardized;
+
+    /**
+     * 正式合同是否审批通过 (0-未通过, 1-已通过)
+     */
+    @ApiModelProperty(value = "正式合同是否审批通过 (0-未通过, 1-已通过)")
+    @TypeMismatch(message = "正式合同是否审批通过 (0-未通过, 1-已通过)格式有误！")
+    private Boolean formalApproved;
+
+    /**
+     * 标准合同文件ID
+     */
+    @ApiModelProperty(value = "标准合同文件ID")
+    private String standardFileId;
+
+    /**
+     * 标准合同文件名称
+     */
+    @ApiModelProperty(value = "标准合同文件名称")
+    private String standardFileName;
+
+    /**
+     * 标准合同是否规范 (0-不规范, 1-规范)
+     */
+    @ApiModelProperty(value = "标准合同是否规范 (0-不规范, 1-规范)")
+    @TypeMismatch(message = "标准合同是否规范 (0-不规范, 1-规范)格式有误！")
+    private Boolean standardStandardized;
+
+    /**
+     * 标准合同是否审批通过 (0-未通过, 1-已通过)
+     */
+    @ApiModelProperty(value = "标准合同是否审批通过 (0-未通过, 1-已通过)")
+    @TypeMismatch(message = "标准合同是否审批通过 (0-未通过, 1-已通过)格式有误！")
+    private Boolean standardApproved;
 }
 }

@@ -41,6 +41,14 @@
         <result column="total_amount_including_tax" property="totalAmountIncludingTax"/>
         <result column="total_amount_including_tax" property="totalAmountIncludingTax"/>
         <result column="type" property="type"/>
         <result column="type" property="type"/>
         <result column="parent_id" property="parentId"/>
         <result column="parent_id" property="parentId"/>
+        <result column="formal_file_id" property="formalFileId"/>
+        <result column="formal_file_name" property="formalFileName"/>
+        <result column="formal_standardized" property="formalStandardized"/>
+        <result column="formal_approved" property="formalApproved"/>
+        <result column="standard_file_id" property="standardFileId"/>
+        <result column="standard_file_name" property="standardFileName"/>
+        <result column="standard_standardized" property="standardStandardized"/>
+        <result column="standard_approved" property="standardApproved"/>
     </resultMap>
     </resultMap>
 
 
     <sql id="ContractDistributorStandard_sql">
     <sql id="ContractDistributorStandard_sql">
@@ -82,7 +90,15 @@
             tb.total_amount_excluding_tax,
             tb.total_amount_excluding_tax,
             tb.total_amount_including_tax,
             tb.total_amount_including_tax,
             tb.type,
             tb.type,
-            tb.parent_id
+            tb.parent_id,
+            tb.formal_file_id,
+            tb.formal_file_name,
+            tb.formal_standardized,
+            tb.formal_approved,
+            tb.standard_file_id,
+            tb.standard_file_name,
+            tb.standard_standardized,
+            tb.standard_approved
         FROM tbl_contract_distributor_standard AS tb
         FROM tbl_contract_distributor_standard AS tb
     </sql>
     </sql>