合同提交审批、合同主信息字段修改、合同明细字段修改、合同内容校验、zt-module-base-server引入版本号引用变量修改

zt-module-contract-order/zt-module-contract-order-server/pom.xml

@@ -129,8 +129,12 @@
         <dependency>
             <groupId>com.zt.plat</groupId>
             <artifactId>zt-module-base-server</artifactId>
-            <version>3.0.41</version>
-            <scope>compile</scope>
+            <version>${revision}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.zt.plat</groupId>
+            <artifactId>zt-module-bpm-api</artifactId>
+            <version>${revision}</version>
         </dependency>
     </dependencies>
 

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

@@ -102,10 +102,11 @@ public class ContractController implements BusinessControllerMarker {
     }
 
     // TODO
-    @PostMapping("/submit/approval")
-    @Operation(summary = "提交审批")
+    @GetMapping("/submit/approval")
+    @Operation(summary = "合同提交审批")
     @PreAuthorize("@ss.hasPermission('system:contract:approval')")
-    public void submitApproval() {
+    public CommonResult<String> submitApproval(@RequestParam("id") Long id) {
+        return success(contractService.submitApproval(id));
     }
 
     // TODO

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

@@ -28,6 +28,9 @@ public class ContractDetailSaveReqVO {
     @Schema(description = "含税单价", example = "28579")
     private BigDecimal inTaxUnitPrice;
 
+    @Schema(description = "含税总价")
+    private BigDecimal allInTaxUnitPrice;
+
     @Schema(description = "金属元素缩写", example = "金属元素缩写")
     private String elementAbbreviation;
 

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

@@ -209,6 +209,14 @@ public class ContractSaveReqVO {
     @ExcelProperty("达到收款条件金额;与ERP(DDSKJE)对应，拓展信息，销售合同，且类型为SAP02COSR必填")
     private BigDecimal payeeConditionAmount;
 
+    @Schema(description = "附件对象存储")
+    @ExcelProperty("附件对象存储")
+    private String fileObject;
+
+    @Schema(description = "其它附件对象存储")
+    @ExcelProperty("其它附件对象存储")
+    private String fileObjectOther;
+
     // 模板部分查询
     @Schema(description = "模板实例主键", example = "10196")
     @ExcelProperty("模板实例主键")

zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/dataobject/contract/ContractDetailDO.java

@@ -73,4 +73,9 @@ public class ContractDetailDO extends BusinessBaseDO {
      */
     @TableField("ELEM_NUM")
     private String elementNumber;
+    /**
+     * 含税总价
+     */
+    @TableField("ALL_IN_TAX_UPRC")
+    private BigDecimal allInTaxUnitPrice;
 }

zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/dataobject/contract/ContractMainDO.java

@@ -279,4 +279,29 @@ public class ContractMainDO extends BusinessBaseDO {
      */
     @TableField("CAUS")
     private String cause;
+    /**
+     * 流程实例编号
+     */
+    @TableField("PRCS_INSC_ID")
+    private String processInstanceId;
+    /**
+     * 审批意见
+     */
+    @TableField("RVW_ONN")
+    private String reviewOpinion;
+    /**
+     * 任务节点主键
+     */
+    @TableField("TSK_NDE_ID")
+    private String taskNodeId;
+    /**
+     * 模板附件对象存储
+     */
+    @TableField("FILE_OBJ")
+    private String fileObject;
+    /**
+     * 其它附件对象存储
+     */
+    @TableField("FILE_OBJ_OTH")
+    private String fileObjectOther;
 }

zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/framework/rpc/config/RpcConfiguration.java

@@ -0,0 +1,16 @@
+package com.zt.plat.module.contractorder.framework.rpc.config;
+
+import com.zt.plat.module.bpm.api.task.BpmProcessInstanceApi;
+import com.zt.plat.module.bpm.api.task.BpmTaskApi;
+import com.zt.plat.module.infra.api.businessfile.BusinessFileApi;
+import com.zt.plat.module.infra.api.file.FileApi;
+import com.zt.plat.module.system.api.dept.DeptApi;
+import com.zt.plat.module.system.api.sequence.SequenceApi;
+import com.zt.plat.module.system.api.user.AdminUserApi;
+import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration(value = "contractorderRpcConfiguration", proxyBeanMethods = false)
+@EnableFeignClients(clients = {DeptApi.class, SequenceApi.class, BpmProcessInstanceApi.class, AdminUserApi.class, BpmTaskApi.class, BusinessFileApi.class, FileApi.class})
+public class RpcConfiguration {
+}

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

@@ -45,4 +45,12 @@ public interface ContractService {
      * @return 修改结果
      */
     Boolean update(@Valid ContractSaveReqVO reqVO);
+
+    /**
+     * 合同提交审批
+     *
+     * @param id 合同ID
+     * @return 审批结果
+     */
+    String submitApproval(Long id);
 }