修改打包脚本

fill-manager/db/module.sql

@@ -219,7 +219,6 @@ CREATE TABLE mortals_xhx_matter_datum(
      PRIMARY KEY  (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='事项申请材料';
 
-
 -- ----------------------------
 -- 打印提交表
 -- ----------------------------
@@ -228,31 +227,24 @@ CREATE TABLE mortals_xhx_matter_datum_print(
        `id` bigint(20)   AUTO_INCREMENT   COMMENT '主键，自增长',
        `siteId` bigint(20)      COMMENT '站点id',
        `orderId` varchar(64)      COMMENT '打印订单',
-       `materialId` bigint(20)      COMMENT '材料Id',
-       `materialName` varchar(1024) NOT NULL     COMMENT '材料名',
-       `page` int(8)      COMMENT '材料页数',
-       `type` tinyint(2)    DEFAULT '1'  COMMENT '打印类型(1.本地打印,2.在线打印)',
-       `docPath` varchar(255)      COMMENT '合成doc后地址',
-       `formContent` mediumtext      COMMENT '提交的表单',
-       `createTime` datetime      COMMENT '创建时间',
-       `createUserId` bigint(20)      COMMENT '创建用户',
-       `updateTime` datetime      COMMENT '修改时间',
        `idCard` varchar(64)      COMMENT '身份证号',
        `idName` varchar(64)      COMMENT '身份证名称',
        `mobile` varchar(32)      COMMENT '手机号码',
        `matterId` bigint(20)      COMMENT '事项id',
        `matterName` varchar(2048)      COMMENT '事项名称',
        `matterCode` varchar(255)      COMMENT '事项编码',
+       `materialId` bigint(20)      COMMENT '材料Id',
+       `materialName` varchar(1024) NOT NULL     COMMENT '材料名',
        `deviceCode` varchar(255)      COMMENT '设备编码',
        `deviceName` varchar(255)      COMMENT '设备名称',
+       `printPage` int(9)    DEFAULT '0'  COMMENT '材料页数',
+       `type` tinyint(2)    DEFAULT '1'  COMMENT '打印类型(1.本地打印,2.在线打印)',
+       `docPath` varchar(255)      COMMENT '合成doc后地址',
+       `formContent` mediumtext      COMMENT '提交的表单',
+       `createTime` datetime      COMMENT '创建时间',
+       `createUserId` bigint(20)      COMMENT '创建用户',
+       `updateTime` datetime      COMMENT '修改时间',
        PRIMARY KEY  (`id`)
-    ,KEY `siteId` (`siteId`) USING BTREE
-    ,KEY `orderId` (`orderId`) USING BTREE
-    ,KEY `materialId` (`materialId`) USING BTREE
-    ,KEY `type` (`type`) USING BTREE
-    ,KEY `docPath` (`docPath`) USING BTREE
-    ,KEY `mobile` (`mobile`) USING BTREE
-    ,KEY `matterId` (`matterId`) USING BTREE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='打印提交';
 
 
@@ -268,3 +260,4 @@ CREATE TABLE mortals_xhx_matter_datum_print(
 
 
 
+

fill-manager/src/main/java/com/mortals/xhx/module/matter/model/MatterDatumPrintEntity.java

@@ -23,35 +23,7 @@ public class MatterDatumPrintEntity extends MatterDatumPrintVo {
     /**
      * 打印订单
      */
-    @Excel(name = "打印订单")
     private String orderId;
-    /**
-     * 材料Id
-     */
-    private Long materialId;
-    /**
-     * 材料名
-     */
-    @Excel(name = "材料名")
-    private String materialName;
-    /**
-     * 材料页数
-     */
-    @Excel(name = "材料页数")
-    private Integer page;
-    /**
-     * 打印类型(1.本地打印,2.在线打印)
-     */
-    @Excel(name = "打印类型", readConverterExp = "1=本地打印,2.在线打印")
-    private Integer type;
-    /**
-     * 合成doc后地址
-     */
-    private String docPath;
-    /**
-     * 提交的表单
-     */
-    private String formContent;
     /**
      * 身份证号
      */
@@ -79,7 +51,17 @@ public class MatterDatumPrintEntity extends MatterDatumPrintVo {
     /**
      * 事项编码
      */
+    @Excel(name = "事项编码")
     private String matterCode;
+    /**
+     * 材料Id
+     */
+    private Long materialId;
+    /**
+     * 材料名
+     */
+    @Excel(name = "材料名")
+    private String materialName;
     /**
      * 设备编码
      */
@@ -89,6 +71,23 @@ public class MatterDatumPrintEntity extends MatterDatumPrintVo {
      */
     @Excel(name = "设备名称")
     private String deviceName;
+    /**
+     * 材料页数
+     */
+    private Integer printPage;
+    /**
+     * 打印类型(1.本地打印,2.在线打印)
+     */
+    @Excel(name = "打印类型", readConverterExp = "1=本地打印,2.在线打印")
+    private Integer type;
+    /**
+     * 合成doc后地址
+     */
+    private String docPath;
+    /**
+     * 提交的表单
+     */
+    private String formContent;
 
 
 
@@ -121,90 +120,6 @@ public class MatterDatumPrintEntity extends MatterDatumPrintVo {
     public void setOrderId(String orderId){
         this.orderId = orderId;
     }
-    /**
-     * 获取 材料Id
-     * @return Long
-     */
-    public Long getMaterialId(){
-        return materialId;
-    }
-    /**
-     * 设置 材料Id
-     * @param materialId
-     */
-    public void setMaterialId(Long materialId){
-        this.materialId = materialId;
-    }
-    /**
-     * 获取 材料名
-     * @return String
-     */
-    public String getMaterialName(){
-        return materialName;
-    }
-    /**
-     * 设置 材料名
-     * @param materialName
-     */
-    public void setMaterialName(String materialName){
-        this.materialName = materialName;
-    }
-    /**
-     * 获取 材料页数
-     * @return Integer
-     */
-    public Integer getPage(){
-        return page;
-    }
-    /**
-     * 设置 材料页数
-     * @param page
-     */
-    public void setPage(Integer page){
-        this.page = page;
-    }
-    /**
-     * 获取 打印类型(1.本地打印,2.在线打印)
-     * @return Integer
-     */
-    public Integer getType(){
-        return type;
-    }
-    /**
-     * 设置 打印类型(1.本地打印,2.在线打印)
-     * @param type
-     */
-    public void setType(Integer type){
-        this.type = type;
-    }
-    /**
-     * 获取 合成doc后地址
-     * @return String
-     */
-    public String getDocPath(){
-        return docPath;
-    }
-    /**
-     * 设置 合成doc后地址
-     * @param docPath
-     */
-    public void setDocPath(String docPath){
-        this.docPath = docPath;
-    }
-    /**
-     * 获取 提交的表单
-     * @return String
-     */
-    public String getFormContent(){
-        return formContent;
-    }
-    /**
-     * 设置 提交的表单
-     * @param formContent
-     */
-    public void setFormContent(String formContent){
-        this.formContent = formContent;
-    }
     /**
      * 获取 身份证号
      * @return String
@@ -289,6 +204,34 @@ public class MatterDatumPrintEntity extends MatterDatumPrintVo {
     public void setMatterCode(String matterCode){
         this.matterCode = matterCode;
     }
+    /**
+     * 获取 材料Id
+     * @return Long
+     */
+    public Long getMaterialId(){
+        return materialId;
+    }
+    /**
+     * 设置 材料Id
+     * @param materialId
+     */
+    public void setMaterialId(Long materialId){
+        this.materialId = materialId;
+    }
+    /**
+     * 获取 材料名
+     * @return String
+     */
+    public String getMaterialName(){
+        return materialName;
+    }
+    /**
+     * 设置 材料名
+     * @param materialName
+     */
+    public void setMaterialName(String materialName){
+        this.materialName = materialName;
+    }
     /**
      * 获取 设备编码
      * @return String
@@ -317,6 +260,62 @@ public class MatterDatumPrintEntity extends MatterDatumPrintVo {
     public void setDeviceName(String deviceName){
         this.deviceName = deviceName;
     }
+    /**
+     * 获取 材料页数
+     * @return Integer
+     */
+    public Integer getPrintPage(){
+        return printPage;
+    }
+    /**
+     * 设置 材料页数
+     * @param printPage
+     */
+    public void setPrintPage(Integer printPage){
+        this.printPage = printPage;
+    }
+    /**
+     * 获取 打印类型(1.本地打印,2.在线打印)
+     * @return Integer
+     */
+    public Integer getType(){
+        return type;
+    }
+    /**
+     * 设置 打印类型(1.本地打印,2.在线打印)
+     * @param type
+     */
+    public void setType(Integer type){
+        this.type = type;
+    }
+    /**
+     * 获取 合成doc后地址
+     * @return String
+     */
+    public String getDocPath(){
+        return docPath;
+    }
+    /**
+     * 设置 合成doc后地址
+     * @param docPath
+     */
+    public void setDocPath(String docPath){
+        this.docPath = docPath;
+    }
+    /**
+     * 获取 提交的表单
+     * @return String
+     */
+    public String getFormContent(){
+        return formContent;
+    }
+    /**
+     * 设置 提交的表单
+     * @param formContent
+     */
+    public void setFormContent(String formContent){
+        this.formContent = formContent;
+    }
 
 
 
@@ -341,20 +340,20 @@ public class MatterDatumPrintEntity extends MatterDatumPrintVo {
         StringBuilder sb = new StringBuilder("");
         sb.append(",siteId:").append(getSiteId());
         sb.append(",orderId:").append(getOrderId());
-        sb.append(",materialId:").append(getMaterialId());
-        sb.append(",materialName:").append(getMaterialName());
-        sb.append(",page:").append(getPage());
-        sb.append(",type:").append(getType());
-        sb.append(",docPath:").append(getDocPath());
-        sb.append(",formContent:").append(getFormContent());
         sb.append(",idCard:").append(getIdCard());
         sb.append(",idName:").append(getIdName());
         sb.append(",mobile:").append(getMobile());
         sb.append(",matterId:").append(getMatterId());
         sb.append(",matterName:").append(getMatterName());
         sb.append(",matterCode:").append(getMatterCode());
+        sb.append(",materialId:").append(getMaterialId());
+        sb.append(",materialName:").append(getMaterialName());
         sb.append(",deviceCode:").append(getDeviceCode());
         sb.append(",deviceName:").append(getDeviceName());
+        sb.append(",printPage:").append(getPrintPage());
+        sb.append(",type:").append(getType());
+        sb.append(",docPath:").append(getDocPath());
+        sb.append(",formContent:").append(getFormContent());
         return sb.toString();
     }
 
@@ -364,18 +363,6 @@ public class MatterDatumPrintEntity extends MatterDatumPrintVo {
 
         this.orderId = null;
 
-        this.materialId = null;
-
-        this.materialName = null;
-
-        this.page = null;
-
-        this.type = 1;
-
-        this.docPath = null;
-
-        this.formContent = null;
-
         this.idCard = "";
 
         this.idName = "";
@@ -388,8 +375,20 @@ public class MatterDatumPrintEntity extends MatterDatumPrintVo {
 
         this.matterCode = "";
 
+        this.materialId = null;
+
+        this.materialName = "";
+
         this.deviceCode = "";
 
         this.deviceName = "";
+
+        this.printPage = 0;
+
+        this.type = 1;
+
+        this.docPath = "";
+
+        this.formContent = null;
     }
 }
\ No newline at end of file

fill-manager/src/main/java/com/mortals/xhx/module/matter/service/impl/MatterDatumPrintServiceImpl.java

@@ -52,7 +52,7 @@ public class MatterDatumPrintServiceImpl extends AbstractCRUDServiceImpl<MatterD
 
         String rootPath = this.filePath.endsWith("/") ? this.filePath : this.filePath + "/";
         Integer pageByDoc = WordUtil.getPageByDoc(rootPath + entity.getDocPath());
-        entity.setPage(pageByDoc);
+        entity.setPrintPage(pageByDoc);
         super.saveBefore(entity, context);
     }
 }
\ No newline at end of file

fill-manager/src/test/java/com/mortals/httpclient/matter/MatterDatumPrintController.http

@@ -22,10 +22,6 @@ Content-Type: application/json
     "orderId":"d7y4sx",
     "materialId":635,
     "materialName":"h0er7b",
-    "page":784,
-    "type":1,
-    "docPath":"7hms82",
-    "formContent":"zoqx4s",
     "page":1,
     "size":10
 }