修改单改字段类型

qcs-common/src/main/java/com/rongwei/bscommon/sys/service/impl/CommonServiceImpl.java

@@ -89,6 +89,8 @@ public class CommonServiceImpl implements CommonService {
                     if (hasMdfForms.size() > 0) {
                         continue;
                     }
+                    qcsMdfFormVo.setDatasource("修改单系统");
+                    qcsMdfFormVo.setIssend("未下发");
                     qcsMdfFormDoList.add(qcsMdfFormVo);
                     for (QcsMdfSectionVo qcsMdfSectionVo : qcsMdfFormVo.getSections()) {
                         if (qcsMdfSectionVo.getFormid() == null) {

qcs-entity/src/main/java/com/rongwei/bsentity/domain/QcsMdfFileDo.java

@@ -27,7 +27,7 @@ public class QcsMdfFileDo extends BaseDo {
      * ID
      */
     @TableField("ID")
-    private Integer id;
+    private String id;
     /**
      * 租户ID
      */
@@ -42,7 +42,7 @@ public class QcsMdfFileDo extends BaseDo {
      * 创建人
      */
     @TableField("ADMINID")
-    private Integer adminid;
+    private String adminid;
     /**
      * 内容显示的url
      */
@@ -62,7 +62,7 @@ public class QcsMdfFileDo extends BaseDo {
      * 修改单id
      */
     @TableField("FORMID")
-    private Integer formid;
+    private String formid;
     /**
      * 附件名称
      */
@@ -77,12 +77,12 @@ public class QcsMdfFileDo extends BaseDo {
      * 排号组id
      */
     @TableField("ROWSID")
-    private Integer rowsid;
+    private String rowsid;
     /**
      * 序列组id
      */
     @TableField("SECTIONID")
-    private Integer sectionid;
+    private String sectionid;
 
 
 }

qcs-entity/src/main/java/com/rongwei/bsentity/domain/QcsMdfFormDo.java

@@ -7,6 +7,8 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.math.BigDecimal;
+
 /**
  * <p>
  *
@@ -27,7 +29,7 @@ public class QcsMdfFormDo extends BaseDo {
      * ID
      */
     @TableField("ID")
-    private Integer id;
+    private String id;
     /**
      * 租户ID
      */
@@ -42,7 +44,7 @@ public class QcsMdfFormDo extends BaseDo {
      * adminId
      */
     @TableField("ADMINID")
-    private Integer adminid;
+    private String adminid;
     /**
      * 创单姓名
      */
@@ -52,7 +54,7 @@ public class QcsMdfFormDo extends BaseDo {
      * 用户权限 1->仅查看 2->编辑 3->校对按钮 4->审核按钮 5->发送邮件按钮 6 -> 修改单 审核人 仅支持上传签名
      */
     @TableField("AUTH")
-    private Integer auth;
+    private String auth;
     /**
      * baseEmailsStr
      */
@@ -92,7 +94,7 @@ public class QcsMdfFormDo extends BaseDo {
      * 审批人id
      */
     @TableField("DTWHOAPPROVEADMINID")
-    private Integer dtwhoapproveadminid;
+    private String dtwhoapproveadminid;
     /**
      * 审批人名字
      */
@@ -122,7 +124,7 @@ public class QcsMdfFormDo extends BaseDo {
      * 项目主管id
      */
     @TableField("MANAGEADMINID")
-    private Integer manageadminid;
+    private String manageadminid;
     /**
      * 项目主管名称
      */
@@ -132,7 +134,7 @@ public class QcsMdfFormDo extends BaseDo {
      * 总编号id
      */
     @TableField("NUMBERID")
-    private Integer numberid;
+    private String numberid;
     /**
      * 总编号名称
      */
@@ -162,7 +164,7 @@ public class QcsMdfFormDo extends BaseDo {
      * 项目id
      */
     @TableField("PROJECTID")
-    private Integer projectid;
+    private String projectid;
     /**
      * 整改编号
      */
@@ -197,7 +199,7 @@ public class QcsMdfFormDo extends BaseDo {
      * 修改源id
      */
     @TableField("SOURCEID")
-    private Integer sourceid;
+    private String sourceid;
     /**
      * 修改源头名称
      */
@@ -212,7 +214,7 @@ public class QcsMdfFormDo extends BaseDo {
      * 修改单状态 1:新增 2:待校对 3:校对退回 4:待审核 5:审核退回 6:审核通过
      */
     @TableField("STATUS")
-    private Integer status;
+    private String status;
     /**
      * 类型编码
      */
@@ -229,5 +231,27 @@ public class QcsMdfFormDo extends BaseDo {
     @TableField("UPDATETIME")
     private String updatetime;
 
+    /**
+     * 合计金额
+     */
+    @TableField("TOTALAMOUNT")
+    private BigDecimal totalamount;
+
+    /**
+     * 实际金额
+     */
+    @TableField("ACTAMOUNT")
+    private BigDecimal actamount;
+    /**
+     * 是否下发(1是0否)
+     */
+    @TableField("ISSEND")
+    private String issend;
+    /**
+     * 数据来源
+     */
+    @TableField("DATASOURCE")
+    private String datasource;
+
 
 }

qcs-entity/src/main/java/com/rongwei/bsentity/domain/QcsMdfRowDo.java

@@ -27,7 +27,7 @@ public class QcsMdfRowDo extends BaseDo {
      * ID
      */
     @TableField("ID")
-    private Integer id;
+    private String id;
     /**
      * 租户ID
      */
@@ -52,22 +52,22 @@ public class QcsMdfRowDo extends BaseDo {
      * 创建人
      */
     @TableField("ADMINID")
-    private Integer adminid;
+    private String adminid;
     /**
      * 修改单id
      */
     @TableField("FORMID")
-    private Integer formid;
+    private String formid;
     /**
      * 序列组id
      */
     @TableField("SECTIONID")
-    private Integer sectionid;
+    private String sectionid;
     /**
      * 任务部件 id
      */
     @TableField("TASKDESIGNID")
-    private Integer taskdesignid;
+    private String taskdesignid;
     /**
      * 任务部件名称
      */

qcs-entity/src/main/java/com/rongwei/bsentity/domain/QcsMdfSectionDo.java

@@ -28,7 +28,7 @@ public class QcsMdfSectionDo extends BaseDo {
      * ID
      */
     @TableField("ID")
-    private Integer id;
+    private String id;
     /**
      * 租户ID
      */
@@ -48,17 +48,17 @@ public class QcsMdfSectionDo extends BaseDo {
      * 创建人
      */
     @TableField("ADMINID")
-    private Integer adminid;
+    private String adminid;
     /**
      * 修改单id
      */
     @TableField("FORMID")
-    private Integer formid;
+    private String formid;
     /**
      * 设计错误部件id
      */
     @TableField("ERRORDESIGNID")
-    private Integer errordesignid;
+    private String errordesignid;
     /**
      * 设计错误部件名称
      */
@@ -108,7 +108,7 @@ public class QcsMdfSectionDo extends BaseDo {
      * 修改单修改人id
      */
     @TableField("MODIFYADMINID")
-    private Integer modifyadminid;
+    private String modifyadminid;
     /**
      * 修改单修改人名称
      */
@@ -118,7 +118,7 @@ public class QcsMdfSectionDo extends BaseDo {
      * 修改单校对人id
      */
     @TableField("DTWHOCOLLATEADMINID")
-    private Integer dtwhocollateadminid;
+    private String dtwhocollateadminid;
     /**
      * 修改单校对人名称
      */
@@ -128,7 +128,7 @@ public class QcsMdfSectionDo extends BaseDo {
      * 审批人id
      */
     @TableField("DTWHOAPPROVEADMINID")
-    private Integer dtwhoapproveadminid;
+    private String dtwhoapproveadminid;
     /**
      * 审批人名字
      */
@@ -143,7 +143,7 @@ public class QcsMdfSectionDo extends BaseDo {
      * 校对表错误 0:未勾选 1: 勾选
      */
     @TableField("ERRORTABLE")
-    private Integer errortable;
+    private String errortable;
     /**
      * 错误设计图号
      */
@@ -153,17 +153,17 @@ public class QcsMdfSectionDo extends BaseDo {
      * 设计人id
      */
     @TableField("DTDESIGNERUSERADMINID")
-    private Integer dtdesigneruseradminid;
+    private String dtdesigneruseradminid;
     /**
      * 校对人id
      */
     @TableField("DTWHOCOLLATEUSERADMINID")
-    private Integer dtwhocollateuseradminid;
+    private String dtwhocollateuseradminid;
     /**
      * 审核人id
      */
     @TableField("DTWHOAPPROVEUSERADMINID")
-    private Integer dtwhoapproveuseradminid;
+    private String dtwhoapproveuseradminid;
     /**
      * 设计人id(图纸平台)
      */