新增作废接口

新增完结接口
修改合同新增逻辑：设置erp甲乙方公司编号、名称
保存erp合同映射表是设置删除状态

zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/ContractController.java

@@ -107,18 +107,18 @@ public class ContractController implements BusinessControllerMarker {
         return contractService.download(ids);
     }
 
-    // TODO
     @PostMapping("/cancel")
-    @Operation(summary = "作废 TODO")
+    @Operation(summary = "作废")
     @PreAuthorize("@ss.hasPermission('base:contract:cancel')")
-    public void cancel() {
+    public CommonResult<Boolean> cancel(@RequestBody List<Long> ids) {
+        return success(contractService.cancel(ids));
     }
 
-    // TODO
     @PostMapping("/complete")
-    @Operation(summary = "完结 TODO")
+    @Operation(summary = "完结")
     @PreAuthorize("@ss.hasPermission('base:contract:complete')")
-    public void complete() {
+    public CommonResult<Boolean> complete(@RequestBody List<Long> ids) {
+        return success(contractService.complete(ids));
     }
 
     @PostMapping("/archive")

zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/contract/ContractService.java

@@ -177,4 +177,20 @@ public interface ContractService {
      * @return 归档结果
      */
     Boolean archive(List<Long> ids);
+
+    /**
+     * 作废
+     *
+     * @param ids 合同ID集合
+     * @return 作废结果
+     */
+    Boolean cancel(List<Long> ids);
+
+    /**
+     * 完结
+     *
+     * @param ids 合同ID集合
+     * @return 完结结果
+     */
+    Boolean complete(List<Long> ids);
 }

zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpContractServiceImpl.java

@@ -242,6 +242,7 @@ public class ErpContractServiceImpl implements ErpContractService {
         ErpContractDO erpContractDO = getErpContractByMainId(erpContract.getContractMainId());
         if (erpContractDO == null) {
             // 不存在映射表则新增
+            erpContract.setDeleted(false);
             erpContractMapper.insert(erpContract);
         } else {
             // 存在映射表则更新