表单修改

.gitignore

@@ -73,3 +73,4 @@ functions/mock
 screenshot
 .firebase
 sessionStore
+!/LOG_FILE_IS_UNDEFINED

zjugis-business/src/main/java/com/zjugis/business/bean/response/ContractSubResp.java

@@ -1,5 +1,6 @@
 package com.zjugis.business.bean.response;
 
+import java.math.BigDecimal;
 import java.time.LocalDate;
 
 /**
@@ -19,12 +20,12 @@ public class ContractSubResp {
     /**
      * 是否已签订 { 0,"未签"},{1,"已签"},{ 2,"待拿回"},{ 3,"不签"}
      */
-    private Object isSign;
+    private Integer isSign;
 
     /**
      * 质量把控人ID
      */
-    private Object qualityControllerId;
+    private String qualityControllerId;
 
     /**
      * 父级合同ID
@@ -34,7 +35,17 @@ public class ContractSubResp {
     /**
      * 分/外包费
      */
-    private Object contractAmount;
+    private BigDecimal contractAmount;
+
+    private LocalDate contractOn;
+
+    private LocalDate contractOff;
+
+    private LocalDate planSignDate;
+
+    private String bz;
+
+    private String paymentTerms;
 
     /**
      * 分包理由/外包理由
@@ -49,12 +60,12 @@ public class ContractSubResp {
     /**
      * 分包费用承担方式
      */
-    private Object subShareWay;
+    private Integer subShareWay;
 
     /**
      * 公司认定金额
      */
-    private Object confirmAmount;
+    private BigDecimal confirmAmount;
 
     /**
      * 合同名称
@@ -74,7 +85,7 @@ public class ContractSubResp {
     /**
      * 流程状态
      */
-    private Object flowStatus;
+    private Integer flowStatus;
 
     /**
      * 供应商联系人
@@ -84,7 +95,7 @@ public class ContractSubResp {
     /**
      * 供应商ID
      */
-    private Object customerId;
+    private String customerId;
 
     /**
      * 项目id
@@ -103,12 +114,12 @@ public class ContractSubResp {
     /**
      * 已付款金额
      */
-    private Object payAmount;
+    private BigDecimal payAmount;
 
     /**
      * 合同分类 1-分包合同 2-外包合同
      */
-    private Object contractType;
+    private Integer contractType;
 
     private String qualityController;
 

zjugis-business/src/main/java/com/zjugis/business/framework/rpc/config/RpcSystemConfiguration.java

@@ -1,5 +1,6 @@
 package com.zjugis.business.framework.rpc.config;
 
+import com.zjugis.framework.workflow.rpc.remote.WorkflowClient;
 import com.zjugis.module.adm.api.attendance.AttendanceSheetApi;
 import com.zjugis.module.adm.api.staff.StaffApi;
 import com.zjugis.module.adm.api.workday.WorkdayApi;
@@ -23,6 +24,6 @@ import org.springframework.context.annotation.Configuration;
  * @Version 1.0
  */
 @Configuration(proxyBeanMethods = false)
-@EnableFeignClients(clients = {AdminUserApi.class, DeptApi.class, DictDataApi.class, AttendanceSheetApi.class, CompanyApi.class, RoleApi.class, WorkdayApi.class, ConfigApi.class, PostApi.class, DeptLeaderApi.class, DistrictApi.class, StaffApi.class, DingApi.class, PermissionApi.class})
+@EnableFeignClients(clients = {AdminUserApi.class, DeptApi.class, DictDataApi.class, AttendanceSheetApi.class, CompanyApi.class, RoleApi.class, WorkdayApi.class, ConfigApi.class, PostApi.class, DeptLeaderApi.class, DistrictApi.class, StaffApi.class, DingApi.class, PermissionApi.class, WorkflowClient.class})
 public class RpcSystemConfiguration {
 }

zjugis-workflow/src/main/java/com/zjugis/z_workflow/base/mybatis/methods/BatchInsertByList.java

@@ -77,7 +77,7 @@ public class BatchInsertByList extends AbstractMethod {
             if ("DATE".equals(jdbcType)) {
                 jdbcType = "TIMESTAMP";
             }
-            if (jdbcType.equals("TIMESTAMP") && !("oracle").equals(databaseId.toLowerCase())) {
+            if ("TIMESTAMP".equals(jdbcType) && !("oracle").equalsIgnoreCase(databaseId)) {
                 itemColumnBuilder.append("TO_TIMESTAMP(#{item." + fieldInfo.getProperty() + "},'yyyy-mm-dd hh24:mi:ss'),\n");
             } else {
                 itemColumnBuilder.append("#{item." + fieldInfo.getProperty() + ",jdbcType="+jdbcType+"},\n");
@@ -89,7 +89,7 @@ public class BatchInsertByList extends AbstractMethod {
         if ("DATE".equals(jdbcType)) {
             jdbcType = "TIMESTAMP";
         }
-        if (jdbcType.equals("TIMESTAMP") && !("oracle").equals(databaseId.toLowerCase())) {
+        if ("TIMESTAMP".equals(jdbcType) && !("oracle").equalsIgnoreCase(databaseId)) {
             itemColumnBuilder.append("TO_TIMESTAMP(#{item." + fieldInfo.getProperty() + "},'yyyy-mm-dd hh24:mi:ss'),\n");
         } else {
             itemColumnBuilder.append("#{item." + fieldInfo.getProperty() + ",jdbcType="+jdbcType+"}");