楚江ERP：删除合同

@@ -311,4 +311,35 @@ public class ContractDistributorStandardController extends DefaultBaseController
 
         return InvokeResultBuilder.success();
     }
+
+    /**
+     * 上传标准合同附件
+     */
+    @ApiOperation("上传标准合同附件")
+    @PostMapping("/uploadStandardContract")
+    public InvokeResult<Void> uploadStandardContract(@RequestBody UpdateContractDistributorStandardVo vo) {
+        if (StringUtils.isBlank(vo.getStandardFileId()) || StringUtils.isBlank(vo.getId())) {
+            throw new DefaultClientException("参数错误！");
+        }
+
+        contractDistributorStandardService.uploadStandardContract(vo);
+
+        contractDistributorStandardService.cleanCacheByKey(vo.getId());
+
+        return InvokeResultBuilder.success();
+    }
+
+    /**
+     * 删除合同
+     */
+    @ApiOperation("删除")
+    @DeleteMapping
+    public InvokeResult<Void> delete(@NotBlank(message = "id不能为空！") String id) {
+
+        contractDistributorStandardService.deleteContract(id);
+
+        contractDistributorStandardService.cleanCacheByKey(id);
+
+        return InvokeResultBuilder.success();
+    }
 }

@@ -43,7 +43,6 @@ import javax.annotation.Resource;
 import java.io.Serializable;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
@@ -286,6 +285,37 @@ public class ContractDistributorStandardServiceImpl extends
         flowInstanceWrapperService.startInstance(FORMAL_FLAG, data.getId(), FORMAL_FLAG, data);
     }
 
+    @OpLog(type = OtherOpLogType.class, name = "上传标准合同附件，ID：{}", params = {"#id"})
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void uploadStandardContract(UpdateContractDistributorStandardVo vo) {
+        ContractDistributorStandard data = getBaseMapper().selectById(vo.getId());
+        if (ObjectUtil.isNull(data)) {
+            throw new DefaultClientException("合同不存在！");
+        }
+
+
+        LambdaUpdateWrapper<ContractDistributorStandard> updateWrapper = Wrappers.lambdaUpdate(ContractDistributorStandard.class)
+                .set(ContractDistributorStandard::getStandardFileId, vo.getStandardFileId())
+                .set(ContractDistributorStandard::getStandardFileName, vo.getStandardFileName())
+                .set(ContractDistributorStandard::getStandardStandardized, vo.getStandardStandardized())
+                .set(ContractDistributorStandard::getStatus, "STANDARD")
+                .set(ContractDistributorStandard::getStandardApproved, CustomerDevelopStatus.AUDIT.name())
+                .eq(ContractDistributorStandard::getId, vo.getId());
+
+        getBaseMapper().update(updateWrapper);
+
+        OpLogUtil.setVariable("id", data.getId());
+        OpLogUtil.setExtra(vo);
+
+        data.setStandardFileId(vo.getStandardFileId());
+        data.setStandardFileName(vo.getStandardFileName());
+        data.setStandardStandardized(vo.getStandardStandardized());
+
+        // 开启审核
+        flowInstanceWrapperService.startInstance(STANDARD_FLAG, data.getId(), STANDARD_FLAG, data);
+    }
+
     @Override
     @OpLog(type = OtherOpLogType.class, name = "正式合同附件审批完成，ID：{}， 审批状态：{}", params = {"#id", "#formalApproved"})
     @Transactional(rollbackFor = Exception.class)
@@ -336,6 +366,28 @@ public class ContractDistributorStandardServiceImpl extends
         OpLogUtil.setExtra(vo);
     }
 
+    @Override
+    @OpLog(type = OtherOpLogType.class, name = "合同删除，ID：{}", params = {"#id"})
+    @Transactional(rollbackFor = Exception.class)
+    public void deleteContract(String id) {
+        ContractDistributorStandard data = getBaseMapper().selectById(id);
+        if (ObjectUtil.isNull(data)) {
+            throw new DefaultClientException("合同不存在！");
+        }
+
+        Wrapper<ContractDistributorStandard> wrapper = Wrappers.lambdaUpdate(ContractDistributorStandard.class)
+                .set(ContractDistributorStandard::getStatus, "DELETED")
+                .eq(ContractDistributorStandard::getId, id);
+        getBaseMapper().update(wrapper);
+
+        UpdateContractDistributorStandardVo vo = new UpdateContractDistributorStandardVo();
+        vo.setId(id);
+        vo.setStatus("DELETED");
+
+        OpLogUtil.setVariable("id", id);
+        OpLogUtil.setExtra(vo);
+    }
+
     @CacheEvict(value = ContractDistributorStandard.CACHE_NAME, key = "@cacheVariables.tenantId() + #key")
     @Override
     public void cleanCacheByKey(Serializable key) {

@@ -59,8 +59,17 @@ public interface ContractDistributorStandardService extends BaseMpService<Contra
      */
     void uploadFormalContract(UpdateContractDistributorStandardVo vo);
 
+    /**
+     * 上传标准合同附件
+     *
+     * @param vo
+     */
+    void uploadStandardContract(UpdateContractDistributorStandardVo vo);
+
     void updateFormalContractStatus(String id, String formalApproved);
 
     void updateStandardContractStatus(String id, String standardApproved);
 
+    void deleteContract(String id);
+
 }
\ No newline at end of file