Merge branch 'dev' into 'test'

合并

See merge request jygk/dsc-base!12

zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/enums/ErrorCodeConstants.java

@@ -23,5 +23,6 @@ public interface ErrorCodeConstants {
     ErrorCode CONTRACT_STATUS_NOT_APPROVAL = new ErrorCode(1_027_000_008, "{}状态合同不允许审核");
     ErrorCode CONTRACT_ERP_COMPANY_PLEASE_BIND = new ErrorCode(1_027_000_009, "请先绑定{}ERP公司信息");
     ErrorCode CONTRACT_STATUS_NOT_DELETE = new ErrorCode(1_027_000_010, "{}状态合同不允许删除");
-    ErrorCode CONTRACT_ERP_RCV_DLVY_NOT_EXISTS = new ErrorCode(1_027_000_010, "不存在的收支类型或收支类型为空");
+    ErrorCode CONTRACT_ERP_RCV_DLVY_NOT_EXISTS = new ErrorCode(1_027_000_011, "不存在的收支类型或收支类型为空");
+    ErrorCode CONTRACT_STATUS_NOT_ARCHIVE = new ErrorCode(1_027_000_012, "{}状态合同不允许归档");
 }

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

@@ -13,6 +13,8 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.annotation.Resource;
 import jakarta.validation.Valid;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.core.io.ByteArrayResource;
+import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -101,35 +103,35 @@ public class ContractController implements BusinessControllerMarker {
     @PostMapping("/download")
     @Operation(summary = "下载文件")
     @PreAuthorize("@ss.hasPermission('base:contract:download')")
-    public void download(@RequestBody List<Long> ids) {
+    public ResponseEntity<ByteArrayResource> download(@RequestBody List<Long> ids) {
-        contractService.download(ids);
+        return contractService.download(ids);
     }
 
-    // TODO
+    @PostMapping("/cancel")
-    @PostMapping("/preview")
+    @Operation(summary = "作废")
-    @Operation(summary = "预览文件 TODO")
+    @PreAuthorize("@ss.hasPermission('base:contract:cancel')")
-    @PreAuthorize("@ss.hasPermission('base:contract:preview')")
+    public CommonResult<Boolean> cancel(@RequestBody List<Long> ids) {
-    public void preview() {
+        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));
     }
 
-    // TODO
     @PostMapping("/archive")
-    @Operation(summary = "归档 TODO")
+    @Operation(summary = "归档")
     @PreAuthorize("@ss.hasPermission('base:contract:archive')")
-    public void archive() {
+    public CommonResult<Boolean> archive(@RequestBody List<Long> ids) {
+        return success(contractService.archive(ids));
     }
 
     @GetMapping("/submit/approval")
     @Operation(summary = "合同提交审批")
     @PreAuthorize("@ss.hasPermission('base:contract:approval')")
-    public CommonResult<String> submitApproval(@RequestParam("id") Long id) {
+    public CommonResult<Boolean> submitApproval(@RequestParam("id") Long id) {
         return success(contractService.submitApproval(id));
     }
 
@@ -141,13 +143,6 @@ public class ContractController implements BusinessControllerMarker {
         return success(contractService.approval(reqVO));
     }
 
-    // TODO
-    @PostMapping("/view/approval")
-    @Operation(summary = "查看审批 TODO")
-    @PreAuthorize("@ss.hasPermission('base:contract:approval')")
-    public void viewApproval() {
-    }
-
     @PostMapping("/submit/erp")
     @Operation(summary = "提交ERP")
     @PreAuthorize("@ss.hasPermission('base:contract:erp')")

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

@@ -162,9 +162,6 @@ public class ContractSaveReqVO {
     @Schema(description = "备注;与ERP(BZXX)对应", example = "备注")
     private String remark;
 
-    // 物料信息
-    private List<DetailSaveReqVO> detail;
-
     // 扩展信息
     @Schema(description = "原币金额-变更后;与ERP(BGHHTYBZJE)对应，拓展信息")
     private BigDecimal changeCooAmount;
@@ -216,6 +213,9 @@ public class ContractSaveReqVO {
     @Schema(description = "模板实例主键", example = "10196")
     private Long instanceId;
 
+    // 物料信息
+    private List<DetailSaveReqVO> detail;
+
     // 合同动态表单
     private List<TemplateInstanceDataSaveReqVO> dynamicsFields;
 

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

@@ -1,5 +1,6 @@
 package com.zt.plat.module.contractorder.controller.admin.contract.vo.contract;
 
+import cn.hutool.json.JSONArray;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotNull;
 import lombok.Data;
@@ -45,7 +46,7 @@ public class FormulaSaveReqVO {
     private String elementName;
 
     @Schema(description = "结算类型，多条使用逗号分隔（字典：PRCH_STLM_TP）", example = "1")
-    private String settlementType;
+    private JSONArray settlementType;
 
     // 基础系数配置
     private List<CoefficientSaveReqVO> coefficients;

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

@@ -6,6 +6,8 @@ import com.zt.plat.module.contractorder.api.dto.contract.ContractRespDTO;
 import com.zt.plat.module.contractorder.controller.admin.contract.vo.contract.*;
 import com.zt.plat.module.contractorder.dal.dataobject.contract.ContractMainDO;
 import jakarta.validation.Valid;
+import org.springframework.core.io.ByteArrayResource;
+import org.springframework.http.ResponseEntity;
 
 import java.util.List;
 
@@ -54,7 +56,7 @@ public interface ContractService {
      * @param id 合同ID
      * @return 提交审批结果
      */
-    String submitApproval(Long id);
+    Boolean submitApproval(Long id);
 
     /**
      * 合同审批
@@ -164,6 +166,31 @@ public interface ContractService {
      * 下载文件
      *
      * @param ids 合同ID集合
+     * @return 压缩文件流
      */
-    void download(List<Long> ids);
+    ResponseEntity<ByteArrayResource> download(List<Long> ids);
+
+    /**
+     * 归档
+     *
+     * @param ids 合同ID集合
+     * @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 {
             // 存在映射表则更新