Skip to content

F
fill-system
Commit 1bf50526 authored by 赵啸非's avatar 赵啸非
Browse files
Options

修改打包脚本

parent 8be3582d
Pipeline #2500 canceled with stages
      Show whitespace changes
      Inline Side-by-side
      Showing with 1207 additions and 1219 deletions
      fill-manager/db/module.sql
      View file @ 1bf50526
      ......@@ -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
      View file @ 1bf50526
      ......@@ -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/model/MatterDatumPrintQuery.java
      View file @ 1bf50526
      ......@@ -6,7 +6,7 @@ import com.mortals.xhx.module.matter.model.MatterDatumPrintEntity;
      * 打印提交查询对象
      *
      * @author zxfei
      * @date 2023-02-23
      * @date 2023-02-27
      */
      public class MatterDatumPrintQuery extends MatterDatumPrintEntity {
      /** 开始 主键，自增长 */
      ......@@ -44,6 +44,46 @@ public class MatterDatumPrintQuery extends MatterDatumPrintEntity {
      /** 打印订单排除列表 */
      private List <String> orderIdNotList;
      /** 身份证号 */
      private List<String> idCardList;
      /** 身份证号排除列表 */
      private List <String> idCardNotList;
      /** 身份证名称 */
      private List<String> idNameList;
      /** 身份证名称排除列表 */
      private List <String> idNameNotList;
      /** 手机号码 */
      private List<String> mobileList;
      /** 手机号码排除列表 */
      private List <String> mobileNotList;
      /** 开始 事项id */
      private Long matterIdStart;
      /** 结束 事项id */
      private Long matterIdEnd;
      /** 增加 事项id */
      private Long matterIdIncrement;
      /** 事项id列表 */
      private List <Long> matterIdList;
      /** 事项id排除列表 */
      private List <Long> matterIdNotList;
      /** 事项名称 */
      private List<String> matterNameList;
      /** 事项名称排除列表 */
      private List <String> matterNameNotList;
      /** 事项编码 */
      private List<String> matterCodeList;
      /** 事项编码排除列表 */
      private List <String> matterCodeNotList;
      /** 开始 材料Id */
      private Long materialIdStart;
      ......@@ -64,20 +104,30 @@ public class MatterDatumPrintQuery extends MatterDatumPrintEntity {
      /** 材料名排除列表 */
      private List <String> materialNameNotList;
      /** 设备编码 */
      private List<String> deviceCodeList;
      /** 设备编码排除列表 */
      private List <String> deviceCodeNotList;
      /** 设备名称 */
      private List<String> deviceNameList;
      /** 设备名称排除列表 */
      private List <String> deviceNameNotList;
      /** 开始 材料页数 */
      private Integer pageStart;
      private Integer printPageStart;
      /** 结束 材料页数 */
      private Integer pageEnd;
      private Integer printPageEnd;
      /** 增加 材料页数 */
      private Integer pageIncrement;
      private Integer printPageIncrement;
      /** 材料页数列表 */
      private List <Integer> pageList;
      private List <Integer> printPageList;
      /** 材料页数排除列表 */
      private List <Integer> pageNotList;
      private List <Integer> printPageNotList;
      /** 开始 打印类型(1.本地打印,2.在线打印) */
      private Integer typeStart;
      ......@@ -131,56 +181,6 @@ public class MatterDatumPrintQuery extends MatterDatumPrintEntity {
      /** 结束 修改时间 */
      private String updateTimeEnd;
      /** 身份证号 */
      private List<String> idCardList;
      /** 身份证号排除列表 */
      private List <String> idCardNotList;
      /** 身份证名称 */
      private List<String> idNameList;
      /** 身份证名称排除列表 */
      private List <String> idNameNotList;
      /** 手机号码 */
      private List<String> mobileList;
      /** 手机号码排除列表 */
      private List <String> mobileNotList;
      /** 开始 事项id */
      private Long matterIdStart;
      /** 结束 事项id */
      private Long matterIdEnd;
      /** 增加 事项id */
      private Long matterIdIncrement;
      /** 事项id列表 */
      private List <Long> matterIdList;
      /** 事项id排除列表 */
      private List <Long> matterIdNotList;
      /** 事项名称 */
      private List<String> matterNameList;
      /** 事项名称排除列表 */
      private List <String> matterNameNotList;
      /** 事项编码 */
      private List<String> matterCodeList;
      /** 事项编码排除列表 */
      private List <String> matterCodeNotList;
      /** 设备编码 */
      private List<String> deviceCodeList;
      /** 设备编码排除列表 */
      private List <String> deviceCodeNotList;
      /** 设备名称 */
      private List<String> deviceNameList;
      /** 设备名称排除列表 */
      private List <String> deviceNameNotList;
      /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
      private List<MatterDatumPrintQuery> orConditionList;
      ......@@ -384,792 +384,792 @@ public class MatterDatumPrintQuery extends MatterDatumPrintEntity {
      }
      /**
      * 获取 开始 材料Id
      * @return materialIdStart
      * 获取 身份证号
      * @return idCardList
      */
      public Long getMaterialIdStart(){
      return this.materialIdStart;
      public List<String> getIdCardList(){
      return this.idCardList;
      }
      /**
      * 设置 开始 材料Id
      * @param materialIdStart
      * 设置 身份证号
      * @param idCardList
      */
      public void setMaterialIdStart(Long materialIdStart){
      this.materialIdStart = materialIdStart;
      public void setIdCardList(List<String> idCardList){
      this.idCardList = idCardList;
      }
      /**
      * 获取 结束 材料Id
      * @return $materialIdEnd
      * 获取 身份证号
      * @return idCardNotList
      */
      public Long getMaterialIdEnd(){
      return this.materialIdEnd;
      public List<String> getIdCardNotList(){
      return this.idCardNotList;
      }
      /**
      * 设置 结束 材料Id
      * @param materialIdEnd
      * 设置 身份证号
      * @param idCardNotList
      */
      public void setMaterialIdEnd(Long materialIdEnd){
      this.materialIdEnd = materialIdEnd;
      public void setIdCardNotList(List<String> idCardNotList){
      this.idCardNotList = idCardNotList;
      }
      /**
      * 获取 增加 材料Id
      * @return materialIdIncrement
      * 获取 身份证名称
      * @return idNameList
      */
      public Long getMaterialIdIncrement(){
      return this.materialIdIncrement;
      public List<String> getIdNameList(){
      return this.idNameList;
      }
      /**
      * 设置 增加 材料Id
      * @param materialIdIncrement
      * 设置 身份证名称
      * @param idNameList
      */
      public void setMaterialIdIncrement(Long materialIdIncrement){
      this.materialIdIncrement = materialIdIncrement;
      public void setIdNameList(List<String> idNameList){
      this.idNameList = idNameList;
      }
      /**
      * 获取 材料Id
      * @return materialIdList
      * 获取 身份证名称
      * @return idNameNotList
      */
      public List<Long> getMaterialIdList(){
      return this.materialIdList;
      public List<String> getIdNameNotList(){
      return this.idNameNotList;
      }
      /**
      * 设置 材料Id
      * @param materialIdList
      * 设置 身份证名称
      * @param idNameNotList
      */
      public void setMaterialIdList(List<Long> materialIdList){
      this.materialIdList = materialIdList;
      public void setIdNameNotList(List<String> idNameNotList){
      this.idNameNotList = idNameNotList;
      }
      /**
      * 获取 材料Id
      * @return materialIdNotList
      * 获取 手机号码
      * @return mobileList
      */
      public List<Long> getMaterialIdNotList(){
      return this.materialIdNotList;
      public List<String> getMobileList(){
      return this.mobileList;
      }
      /**
      * 设置 材料Id
      * @param materialIdNotList
      * 设置 手机号码
      * @param mobileList
      */
      public void setMaterialIdNotList(List<Long> materialIdNotList){
      this.materialIdNotList = materialIdNotList;
      public void setMobileList(List<String> mobileList){
      this.mobileList = mobileList;
      }
      /**
      * 获取 材料名
      * @return materialNameList
      * 获取 手机号码
      * @return mobileNotList
      */
      public List<String> getMaterialNameList(){
      return this.materialNameList;
      public List<String> getMobileNotList(){
      return this.mobileNotList;
      }
      /**
      * 设置 材料名
      * @param materialNameList
      * 设置 手机号码
      * @param mobileNotList
      */
      public void setMaterialNameList(List<String> materialNameList){
      this.materialNameList = materialNameList;
      public void setMobileNotList(List<String> mobileNotList){
      this.mobileNotList = mobileNotList;
      }
      /**
      * 获取 材料名
      * @return materialNameNotList
      * 获取 开始 事项id
      * @return matterIdStart
      */
      public List<String> getMaterialNameNotList(){
      return this.materialNameNotList;
      public Long getMatterIdStart(){
      return this.matterIdStart;
      }
      /**
      * 设置 材料名
      * @param materialNameNotList
      * 设置 开始 事项id
      * @param matterIdStart
      */
      public void setMaterialNameNotList(List<String> materialNameNotList){
      this.materialNameNotList = materialNameNotList;
      public void setMatterIdStart(Long matterIdStart){
      this.matterIdStart = matterIdStart;
      }
      /**
      * 获取 开始 材料页数
      * @return pageStart
      * 获取 结束 事项id
      * @return $matterIdEnd
      */
      public Integer getPageStart(){
      return this.pageStart;
      public Long getMatterIdEnd(){
      return this.matterIdEnd;
      }
      /**
      * 设置 开始 材料页数
      * @param pageStart
      * 设置 结束 事项id
      * @param matterIdEnd
      */
      public void setPageStart(Integer pageStart){
      this.pageStart = pageStart;
      public void setMatterIdEnd(Long matterIdEnd){
      this.matterIdEnd = matterIdEnd;
      }
      /**
      * 获取 结束 材料页数
      * @return $pageEnd
      * 获取 增加 事项id
      * @return matterIdIncrement
      */
      public Integer getPageEnd(){
      return this.pageEnd;
      public Long getMatterIdIncrement(){
      return this.matterIdIncrement;
      }
      /**
      * 设置 结束 材料页数
      * @param pageEnd
      * 设置 增加 事项id
      * @param matterIdIncrement
      */
      public void setPageEnd(Integer pageEnd){
      this.pageEnd = pageEnd;
      public void setMatterIdIncrement(Long matterIdIncrement){
      this.matterIdIncrement = matterIdIncrement;
      }
      /**
      * 获取 增加 材料页数
      * @return pageIncrement
      * 获取 事项id
      * @return matterIdList
      */
      public Integer getPageIncrement(){
      return this.pageIncrement;
      public List<Long> getMatterIdList(){
      return this.matterIdList;
      }
      /**
      * 设置 增加 材料页数
      * @param pageIncrement
      * 设置 事项id
      * @param matterIdList
      */
      public void setPageIncrement(Integer pageIncrement){
      this.pageIncrement = pageIncrement;
      public void setMatterIdList(List<Long> matterIdList){
      this.matterIdList = matterIdList;
      }
      /**
      * 获取 材料页数
      * @return pageList
      * 获取 事项id
      * @return matterIdNotList
      */
      public List<Integer> getPageList(){
      return this.pageList;
      public List<Long> getMatterIdNotList(){
      return this.matterIdNotList;
      }
      /**
      * 设置 材料页数
      * @param pageList
      * 设置 事项id
      * @param matterIdNotList
      */
      public void setPageList(List<Integer> pageList){
      this.pageList = pageList;
      public void setMatterIdNotList(List<Long> matterIdNotList){
      this.matterIdNotList = matterIdNotList;
      }
      /**
      * 获取 材料页数
      * @return pageNotList
      */
      public List<Integer> getPageNotList(){
      return this.pageNotList;
      * 获取 事项名称
      * @return matterNameList
      */
      public List<String> getMatterNameList(){
      return this.matterNameList;
      }
      /**
      * 设置 材料页数
      * @param pageNotList
      * 设置 事项名称
      * @param matterNameList
      */
      public void setPageNotList(List<Integer> pageNotList){
      this.pageNotList = pageNotList;
      public void setMatterNameList(List<String> matterNameList){
      this.matterNameList = matterNameList;
      }
      /**
      * 获取 开始 打印类型(1.本地打印,2.在线打印)
      * @return typeStart
      * 获取 事项名称
      * @return matterNameNotList
      */
      public Integer getTypeStart(){
      return this.typeStart;
      public List<String> getMatterNameNotList(){
      return this.matterNameNotList;
      }
      /**
      * 设置 开始 打印类型(1.本地打印,2.在线打印)
      * @param typeStart
      * 设置 事项名称
      * @param matterNameNotList
      */
      public void setTypeStart(Integer typeStart){
      this.typeStart = typeStart;
      public void setMatterNameNotList(List<String> matterNameNotList){
      this.matterNameNotList = matterNameNotList;
      }
      /**
      * 获取 结束 打印类型(1.本地打印,2.在线打印)
      * @return $typeEnd
      * 获取 事项编码
      * @return matterCodeList
      */
      public Integer getTypeEnd(){
      return this.typeEnd;
      public List<String> getMatterCodeList(){
      return this.matterCodeList;
      }
      /**
      * 设置 结束 打印类型(1.本地打印,2.在线打印)
      * @param typeEnd
      * 设置 事项编码
      * @param matterCodeList
      */
      public void setTypeEnd(Integer typeEnd){
      this.typeEnd = typeEnd;
      public void setMatterCodeList(List<String> matterCodeList){
      this.matterCodeList = matterCodeList;
      }
      /**
      * 获取 增加 打印类型(1.本地打印,2.在线打印)
      * @return typeIncrement
      * 获取 事项编码
      * @return matterCodeNotList
      */
      public Integer getTypeIncrement(){
      return this.typeIncrement;
      public List<String> getMatterCodeNotList(){
      return this.matterCodeNotList;
      }
      /**
      * 设置 增加 打印类型(1.本地打印,2.在线打印)
      * @param typeIncrement
      * 设置 事项编码
      * @param matterCodeNotList
      */
      public void setTypeIncrement(Integer typeIncrement){
      this.typeIncrement = typeIncrement;
      public void setMatterCodeNotList(List<String> matterCodeNotList){
      this.matterCodeNotList = matterCodeNotList;
      }
      /**
      * 获取 打印类型(1.本地打印,2.在线打印)
      * @return typeList
      * 获取 开始 材料Id
      * @return materialIdStart
      */
      public List<Integer> getTypeList(){
      return this.typeList;
      public Long getMaterialIdStart(){
      return this.materialIdStart;
      }
      /**
      * 设置 打印类型(1.本地打印,2.在线打印)
      * @param typeList
      * 设置 开始 材料Id
      * @param materialIdStart
      */
      public void setTypeList(List<Integer> typeList){
      this.typeList = typeList;
      public void setMaterialIdStart(Long materialIdStart){
      this.materialIdStart = materialIdStart;
      }
      /**
      * 获取 打印类型(1.本地打印,2.在线打印)
      * @return typeNotList
      * 获取 结束 材料Id
      * @return $materialIdEnd
      */
      public List<Integer> getTypeNotList(){
      return this.typeNotList;
      public Long getMaterialIdEnd(){
      return this.materialIdEnd;
      }
      /**
      * 设置 打印类型(1.本地打印,2.在线打印)
      * @param typeNotList
      * 设置 结束 材料Id
      * @param materialIdEnd
      */
      public void setTypeNotList(List<Integer> typeNotList){
      this.typeNotList = typeNotList;
      public void setMaterialIdEnd(Long materialIdEnd){
      this.materialIdEnd = materialIdEnd;
      }
      /**
      * 获取 合成doc后地址
      * @return docPathList
      * 获取 增加 材料Id
      * @return materialIdIncrement
      */
      public List<String> getDocPathList(){
      return this.docPathList;
      public Long getMaterialIdIncrement(){
      return this.materialIdIncrement;
      }
      /**
      * 设置 合成doc后地址
      * @param docPathList
      * 设置 增加 材料Id
      * @param materialIdIncrement
      */
      public void setDocPathList(List<String> docPathList){
      this.docPathList = docPathList;
      public void setMaterialIdIncrement(Long materialIdIncrement){
      this.materialIdIncrement = materialIdIncrement;
      }
      /**
      * 获取 合成doc后地址
      * @return docPathNotList
      * 获取 材料Id
      * @return materialIdList
      */
      public List<String> getDocPathNotList(){
      return this.docPathNotList;
      public List<Long> getMaterialIdList(){
      return this.materialIdList;
      }
      /**
      * 设置 合成doc后地址
      * @param docPathNotList
      * 设置 材料Id
      * @param materialIdList
      */
      public void setDocPathNotList(List<String> docPathNotList){
      this.docPathNotList = docPathNotList;
      public void setMaterialIdList(List<Long> materialIdList){
      this.materialIdList = materialIdList;
      }
      /**
      * 获取 提交的表单
      * @return formContentList
      * 获取 材料Id
      * @return materialIdNotList
      */
      public List<String> getFormContentList(){
      return this.formContentList;
      public List<Long> getMaterialIdNotList(){
      return this.materialIdNotList;
      }
      /**
      * 设置 提交的表单
      * @param formContentList
      * 设置 材料Id
      * @param materialIdNotList
      */
      public void setFormContentList(List<String> formContentList){
      this.formContentList = formContentList;
      public void setMaterialIdNotList(List<Long> materialIdNotList){
      this.materialIdNotList = materialIdNotList;
      }
      /**
      * 获取 提交的表单
      * @return formContentNotList
      * 获取 材料名
      * @return materialNameList
      */
      public List<String> getFormContentNotList(){
      return this.formContentNotList;
      public List<String> getMaterialNameList(){
      return this.materialNameList;
      }
      /**
      * 设置 提交的表单
      * @param formContentNotList
      * 设置 材料名
      * @param materialNameList
      */
      public void setFormContentNotList(List<String> formContentNotList){
      this.formContentNotList = formContentNotList;
      public void setMaterialNameList(List<String> materialNameList){
      this.materialNameList = materialNameList;
      }
      /**
      * 获取 开始 创建时间
      * @return createTimeStart
      * 获取 材料名
      * @return materialNameNotList
      */
      public String getCreateTimeStart(){
      return this.createTimeStart;
      public List<String> getMaterialNameNotList(){
      return this.materialNameNotList;
      }
      /**
      * 设置 开始 创建时间
      * @param createTimeStart
      * 设置 材料名
      * @param materialNameNotList
      */
      public void setCreateTimeStart(String createTimeStart){
      this.createTimeStart = createTimeStart;
      public void setMaterialNameNotList(List<String> materialNameNotList){
      this.materialNameNotList = materialNameNotList;
      }
      /**
      * 获取 结束 创建时间
      * @return createTimeEnd
      * 获取 设备编码
      * @return deviceCodeList
      */
      public String getCreateTimeEnd(){
      return this.createTimeEnd;
      public List<String> getDeviceCodeList(){
      return this.deviceCodeList;
      }
      /**
      * 设置 结束 创建时间
      * @param createTimeEnd
      * 设置 设备编码
      * @param deviceCodeList
      */
      public void setCreateTimeEnd(String createTimeEnd){
      this.createTimeEnd = createTimeEnd;
      public void setDeviceCodeList(List<String> deviceCodeList){
      this.deviceCodeList = deviceCodeList;
      }
      /**
      * 获取 开始 创建用户
      * @return createUserIdStart
      * 获取 设备编码
      * @return deviceCodeNotList
      */
      public Long getCreateUserIdStart(){
      return this.createUserIdStart;
      public List<String> getDeviceCodeNotList(){
      return this.deviceCodeNotList;
      }
      /**
      * 设置 开始 创建用户
      * @param createUserIdStart
      * 设置 设备编码
      * @param deviceCodeNotList
      */
      public void setCreateUserIdStart(Long createUserIdStart){
      this.createUserIdStart = createUserIdStart;
      public void setDeviceCodeNotList(List<String> deviceCodeNotList){
      this.deviceCodeNotList = deviceCodeNotList;
      }
      /**
      * 获取 结束 创建用户
      * @return $createUserIdEnd
      * 获取 设备名称
      * @return deviceNameList
      */
      public Long getCreateUserIdEnd(){
      return this.createUserIdEnd;
      public List<String> getDeviceNameList(){
      return this.deviceNameList;
      }
      /**
      * 设置 结束 创建用户
      * @param createUserIdEnd
      * 设置 设备名称
      * @param deviceNameList
      */
      public void setCreateUserIdEnd(Long createUserIdEnd){
      this.createUserIdEnd = createUserIdEnd;
      public void setDeviceNameList(List<String> deviceNameList){
      this.deviceNameList = deviceNameList;
      }
      /**
      * 获取 增加 创建用户
      * @return createUserIdIncrement
      * 获取 设备名称
      * @return deviceNameNotList
      */
      public Long getCreateUserIdIncrement(){
      return this.createUserIdIncrement;
      public List<String> getDeviceNameNotList(){
      return this.deviceNameNotList;
      }
      /**
      * 设置 增加 创建用户
      * @param createUserIdIncrement
      * 设置 设备名称
      * @param deviceNameNotList
      */
      public void setCreateUserIdIncrement(Long createUserIdIncrement){
      this.createUserIdIncrement = createUserIdIncrement;
      public void setDeviceNameNotList(List<String> deviceNameNotList){
      this.deviceNameNotList = deviceNameNotList;
      }
      /**
      * 获取 创建用户
      * @return createUserIdList
      * 获取 开始 材料页数
      * @return printPageStart
      */
      public List<Long> getCreateUserIdList(){
      return this.createUserIdList;
      public Integer getPrintPageStart(){
      return this.printPageStart;
      }
      /**
      * 设置 创建用户
      * @param createUserIdList
      * 设置 开始 材料页数
      * @param printPageStart
      */
      public void setCreateUserIdList(List<Long> createUserIdList){
      this.createUserIdList = createUserIdList;
      public void setPrintPageStart(Integer printPageStart){
      this.printPageStart = printPageStart;
      }
      /**
      * 获取 创建用户
      * @return createUserIdNotList
      * 获取 结束 材料页数
      * @return $printPageEnd
      */
      public List<Long> getCreateUserIdNotList(){
      return this.createUserIdNotList;
      public Integer getPrintPageEnd(){
      return this.printPageEnd;
      }
      /**
      * 设置 创建用户
      * @param createUserIdNotList
      * 设置 结束 材料页数
      * @param printPageEnd
      */
      public void setCreateUserIdNotList(List<Long> createUserIdNotList){
      this.createUserIdNotList = createUserIdNotList;
      public void setPrintPageEnd(Integer printPageEnd){
      this.printPageEnd = printPageEnd;
      }
      /**
      * 获取 开始 修改时间
      * @return updateTimeStart
      * 获取 增加 材料页数
      * @return printPageIncrement
      */
      public String getUpdateTimeStart(){
      return this.updateTimeStart;
      public Integer getPrintPageIncrement(){
      return this.printPageIncrement;
      }
      /**
      * 设置 开始 修改时间
      * @param updateTimeStart
      * 设置 增加 材料页数
      * @param printPageIncrement
      */
      public void setUpdateTimeStart(String updateTimeStart){
      this.updateTimeStart = updateTimeStart;
      public void setPrintPageIncrement(Integer printPageIncrement){
      this.printPageIncrement = printPageIncrement;
      }
      /**
      * 获取 结束 修改时间
      * @return updateTimeEnd
      * 获取 材料页数
      * @return printPageList
      */
      public String getUpdateTimeEnd(){
      return this.updateTimeEnd;
      public List<Integer> getPrintPageList(){
      return this.printPageList;
      }
      /**
      * 设置 结束 修改时间
      * @param updateTimeEnd
      * 设置 材料页数
      * @param printPageList
      */
      public void setUpdateTimeEnd(String updateTimeEnd){
      this.updateTimeEnd = updateTimeEnd;
      public void setPrintPageList(List<Integer> printPageList){
      this.printPageList = printPageList;
      }
      /**
      * 获取 身份证号
      * @return idCardList
      * 获取 材料页数
      * @return printPageNotList
      */
      public List<String> getIdCardList(){
      return this.idCardList;
      public List<Integer> getPrintPageNotList(){
      return this.printPageNotList;
      }
      /**
      * 设置 身份证号
      * @param idCardList
      * 设置 材料页数
      * @param printPageNotList
      */
      public void setIdCardList(List<String> idCardList){
      this.idCardList = idCardList;
      public void setPrintPageNotList(List<Integer> printPageNotList){
      this.printPageNotList = printPageNotList;
      }
      /**
      * 获取 身份证号
      * @return idCardNotList
      * 获取 开始 打印类型(1.本地打印,2.在线打印)
      * @return typeStart
      */
      public List<String> getIdCardNotList(){
      return this.idCardNotList;
      public Integer getTypeStart(){
      return this.typeStart;
      }
      /**
      * 设置 身份证号
      * @param idCardNotList
      * 设置 开始 打印类型(1.本地打印,2.在线打印)
      * @param typeStart
      */
      public void setIdCardNotList(List<String> idCardNotList){
      this.idCardNotList = idCardNotList;
      public void setTypeStart(Integer typeStart){
      this.typeStart = typeStart;
      }
      /**
      * 获取 身份证名称
      * @return idNameList
      * 获取 结束 打印类型(1.本地打印,2.在线打印)
      * @return $typeEnd
      */
      public List<String> getIdNameList(){
      return this.idNameList;
      public Integer getTypeEnd(){
      return this.typeEnd;
      }
      /**
      * 设置 身份证名称
      * @param idNameList
      * 设置 结束 打印类型(1.本地打印,2.在线打印)
      * @param typeEnd
      */
      public void setIdNameList(List<String> idNameList){
      this.idNameList = idNameList;
      public void setTypeEnd(Integer typeEnd){
      this.typeEnd = typeEnd;
      }
      /**
      * 获取 身份证名称
      * @return idNameNotList
      * 获取 增加 打印类型(1.本地打印,2.在线打印)
      * @return typeIncrement
      */
      public List<String> getIdNameNotList(){
      return this.idNameNotList;
      public Integer getTypeIncrement(){
      return this.typeIncrement;
      }
      /**
      * 设置 身份证名称
      * @param idNameNotList
      * 设置 增加 打印类型(1.本地打印,2.在线打印)
      * @param typeIncrement
      */
      public void setIdNameNotList(List<String> idNameNotList){
      this.idNameNotList = idNameNotList;
      public void setTypeIncrement(Integer typeIncrement){
      this.typeIncrement = typeIncrement;
      }
      /**
      * 获取 手机号码
      * @return mobileList
      * 获取 打印类型(1.本地打印,2.在线打印)
      * @return typeList
      */
      public List<String> getMobileList(){
      return this.mobileList;
      public List<Integer> getTypeList(){
      return this.typeList;
      }
      /**
      * 设置 手机号码
      * @param mobileList
      * 设置 打印类型(1.本地打印,2.在线打印)
      * @param typeList
      */
      public void setMobileList(List<String> mobileList){
      this.mobileList = mobileList;
      public void setTypeList(List<Integer> typeList){
      this.typeList = typeList;
      }
      /**
      * 获取 手机号码
      * @return mobileNotList
      * 获取 打印类型(1.本地打印,2.在线打印)
      * @return typeNotList
      */
      public List<String> getMobileNotList(){
      return this.mobileNotList;
      public List<Integer> getTypeNotList(){
      return this.typeNotList;
      }
      /**
      * 设置 手机号码
      * @param mobileNotList
      * 设置 打印类型(1.本地打印,2.在线打印)
      * @param typeNotList
      */
      public void setMobileNotList(List<String> mobileNotList){
      this.mobileNotList = mobileNotList;
      public void setTypeNotList(List<Integer> typeNotList){
      this.typeNotList = typeNotList;
      }
      /**
      * 获取 开始 事项id
      * @return matterIdStart
      * 获取 合成doc后地址
      * @return docPathList
      */
      public Long getMatterIdStart(){
      return this.matterIdStart;
      public List<String> getDocPathList(){
      return this.docPathList;
      }
      /**
      * 设置 开始 事项id
      * @param matterIdStart
      * 设置 合成doc后地址
      * @param docPathList
      */
      public void setMatterIdStart(Long matterIdStart){
      this.matterIdStart = matterIdStart;
      public void setDocPathList(List<String> docPathList){
      this.docPathList = docPathList;
      }
      /**
      * 获取 结束 事项id
      * @return $matterIdEnd
      * 获取 合成doc后地址
      * @return docPathNotList
      */
      public Long getMatterIdEnd(){
      return this.matterIdEnd;
      public List<String> getDocPathNotList(){
      return this.docPathNotList;
      }
      /**
      * 设置 结束 事项id
      * @param matterIdEnd
      * 设置 合成doc后地址
      * @param docPathNotList
      */
      public void setMatterIdEnd(Long matterIdEnd){
      this.matterIdEnd = matterIdEnd;
      public void setDocPathNotList(List<String> docPathNotList){
      this.docPathNotList = docPathNotList;
      }
      /**
      * 获取 增加 事项id
      * @return matterIdIncrement
      * 获取 提交的表单
      * @return formContentList
      */
      public Long getMatterIdIncrement(){
      return this.matterIdIncrement;
      public List<String> getFormContentList(){
      return this.formContentList;
      }
      /**
      * 设置 增加 事项id
      * @param matterIdIncrement
      * 设置 提交的表单
      * @param formContentList
      */
      public void setMatterIdIncrement(Long matterIdIncrement){
      this.matterIdIncrement = matterIdIncrement;
      public void setFormContentList(List<String> formContentList){
      this.formContentList = formContentList;
      }
      /**
      * 获取 事项id
      * @return matterIdList
      * 获取 提交的表单
      * @return formContentNotList
      */
      public List<Long> getMatterIdList(){
      return this.matterIdList;
      public List<String> getFormContentNotList(){
      return this.formContentNotList;
      }
      /**
      * 设置 事项id
      * @param matterIdList
      * 设置 提交的表单
      * @param formContentNotList
      */
      public void setMatterIdList(List<Long> matterIdList){
      this.matterIdList = matterIdList;
      public void setFormContentNotList(List<String> formContentNotList){
      this.formContentNotList = formContentNotList;
      }
      /**
      * 获取 事项id
      * @return matterIdNotList
      * 获取 开始 创建时间
      * @return createTimeStart
      */
      public List<Long> getMatterIdNotList(){
      return this.matterIdNotList;
      public String getCreateTimeStart(){
      return this.createTimeStart;
      }
      /**
      * 设置 事项id
      * @param matterIdNotList
      * 设置 开始 创建时间
      * @param createTimeStart
      */
      public void setMatterIdNotList(List<Long> matterIdNotList){
      this.matterIdNotList = matterIdNotList;
      public void setCreateTimeStart(String createTimeStart){
      this.createTimeStart = createTimeStart;
      }
      /**
      * 获取 事项名称
      * @return matterNameList
      * 获取 结束 创建时间
      * @return createTimeEnd
      */
      public List<String> getMatterNameList(){
      return this.matterNameList;
      public String getCreateTimeEnd(){
      return this.createTimeEnd;
      }
      /**
      * 设置 事项名称
      * @param matterNameList
      * 设置 结束 创建时间
      * @param createTimeEnd
      */
      public void setMatterNameList(List<String> matterNameList){
      this.matterNameList = matterNameList;
      public void setCreateTimeEnd(String createTimeEnd){
      this.createTimeEnd = createTimeEnd;
      }
      /**
      * 获取 事项名称
      * @return matterNameNotList
      * 获取 开始 创建用户
      * @return createUserIdStart
      */
      public List<String> getMatterNameNotList(){
      return this.matterNameNotList;
      public Long getCreateUserIdStart(){
      return this.createUserIdStart;
      }
      /**
      * 设置 事项名称
      * @param matterNameNotList
      * 设置 开始 创建用户
      * @param createUserIdStart
      */
      public void setMatterNameNotList(List<String> matterNameNotList){
      this.matterNameNotList = matterNameNotList;
      public void setCreateUserIdStart(Long createUserIdStart){
      this.createUserIdStart = createUserIdStart;
      }
      /**
      * 获取 事项编码
      * @return matterCodeList
      * 获取 结束 创建用户
      * @return $createUserIdEnd
      */
      public List<String> getMatterCodeList(){
      return this.matterCodeList;
      public Long getCreateUserIdEnd(){
      return this.createUserIdEnd;
      }
      /**
      * 设置 事项编码
      * @param matterCodeList
      * 设置 结束 创建用户
      * @param createUserIdEnd
      */
      public void setMatterCodeList(List<String> matterCodeList){
      this.matterCodeList = matterCodeList;
      public void setCreateUserIdEnd(Long createUserIdEnd){
      this.createUserIdEnd = createUserIdEnd;
      }
      /**
      * 获取 事项编码
      * @return matterCodeNotList
      * 获取 增加 创建用户
      * @return createUserIdIncrement
      */
      public List<String> getMatterCodeNotList(){
      return this.matterCodeNotList;
      public Long getCreateUserIdIncrement(){
      return this.createUserIdIncrement;
      }
      /**
      * 设置 事项编码
      * @param matterCodeNotList
      * 设置 增加 创建用户
      * @param createUserIdIncrement
      */
      public void setMatterCodeNotList(List<String> matterCodeNotList){
      this.matterCodeNotList = matterCodeNotList;
      public void setCreateUserIdIncrement(Long createUserIdIncrement){
      this.createUserIdIncrement = createUserIdIncrement;
      }
      /**
      * 获取 设备编码
      * @return deviceCodeList
      * 获取 创建用户
      * @return createUserIdList
      */
      public List<String> getDeviceCodeList(){
      return this.deviceCodeList;
      public List<Long> getCreateUserIdList(){
      return this.createUserIdList;
      }
      /**
      * 设置 设备编码
      * @param deviceCodeList
      * 设置 创建用户
      * @param createUserIdList
      */
      public void setDeviceCodeList(List<String> deviceCodeList){
      this.deviceCodeList = deviceCodeList;
      public void setCreateUserIdList(List<Long> createUserIdList){
      this.createUserIdList = createUserIdList;
      }
      /**
      * 获取 设备编码
      * @return deviceCodeNotList
      * 获取 创建用户
      * @return createUserIdNotList
      */
      public List<String> getDeviceCodeNotList(){
      return this.deviceCodeNotList;
      public List<Long> getCreateUserIdNotList(){
      return this.createUserIdNotList;
      }
      /**
      * 设置 设备编码
      * @param deviceCodeNotList
      * 设置 创建用户
      * @param createUserIdNotList
      */
      public void setDeviceCodeNotList(List<String> deviceCodeNotList){
      this.deviceCodeNotList = deviceCodeNotList;
      public void setCreateUserIdNotList(List<Long> createUserIdNotList){
      this.createUserIdNotList = createUserIdNotList;
      }
      /**
      * 获取 设备名称
      * @return deviceNameList
      * 获取 开始 修改时间
      * @return updateTimeStart
      */
      public List<String> getDeviceNameList(){
      return this.deviceNameList;
      public String getUpdateTimeStart(){
      return this.updateTimeStart;
      }
      /**
      * 设置 设备名称
      * @param deviceNameList
      * 设置 开始 修改时间
      * @param updateTimeStart
      */
      public void setDeviceNameList(List<String> deviceNameList){
      this.deviceNameList = deviceNameList;
      public void setUpdateTimeStart(String updateTimeStart){
      this.updateTimeStart = updateTimeStart;
      }
      /**
      * 获取 设备名称
      * @return deviceNameNotList
      * 获取 结束 修改时间
      * @return updateTimeEnd
      */
      public List<String> getDeviceNameNotList(){
      return this.deviceNameNotList;
      public String getUpdateTimeEnd(){
      return this.updateTimeEnd;
      }
      /**
      * 设置 设备名称
      * @param deviceNameNotList
      * 设置 结束 修改时间
      * @param updateTimeEnd
      */
      public void setDeviceNameNotList(List<String> deviceNameNotList){
      this.deviceNameNotList = deviceNameNotList;
      public void setUpdateTimeEnd(String updateTimeEnd){
      this.updateTimeEnd = updateTimeEnd;
      }
      /**
      ......@@ -1266,36 +1266,185 @@ public class MatterDatumPrintQuery extends MatterDatumPrintEntity {
      * 设置 站点id
      * @param siteIdList
      */
      public MatterDatumPrintQuery siteIdList(List<Long> siteIdList){
      this.siteIdList = siteIdList;
      public MatterDatumPrintQuery siteIdList(List<Long> siteIdList){
      this.siteIdList = siteIdList;
      return this;
      }
      /**
      * 设置 站点id
      * @param siteIdNotList
      */
      public MatterDatumPrintQuery siteIdNotList(List<Long> siteIdNotList){
      this.siteIdNotList = siteIdNotList;
      return this;
      }
      /**
      * 设置 打印订单
      * @param orderId
      */
      public MatterDatumPrintQuery orderId(String orderId){
      setOrderId(orderId);
      return this;
      }
      /**
      * 设置 打印订单
      * @param orderIdList
      */
      public MatterDatumPrintQuery orderIdList(List<String> orderIdList){
      this.orderIdList = orderIdList;
      return this;
      }
      /**
      * 设置 身份证号
      * @param idCard
      */
      public MatterDatumPrintQuery idCard(String idCard){
      setIdCard(idCard);
      return this;
      }
      /**
      * 设置 身份证号
      * @param idCardList
      */
      public MatterDatumPrintQuery idCardList(List<String> idCardList){
      this.idCardList = idCardList;
      return this;
      }
      /**
      * 设置 身份证名称
      * @param idName
      */
      public MatterDatumPrintQuery idName(String idName){
      setIdName(idName);
      return this;
      }
      /**
      * 设置 身份证名称
      * @param idNameList
      */
      public MatterDatumPrintQuery idNameList(List<String> idNameList){
      this.idNameList = idNameList;
      return this;
      }
      /**
      * 设置 手机号码
      * @param mobile
      */
      public MatterDatumPrintQuery mobile(String mobile){
      setMobile(mobile);
      return this;
      }
      /**
      * 设置 手机号码
      * @param mobileList
      */
      public MatterDatumPrintQuery mobileList(List<String> mobileList){
      this.mobileList = mobileList;
      return this;
      }
      /**
      * 设置 事项id
      * @param matterId
      */
      public MatterDatumPrintQuery matterId(Long matterId){
      setMatterId(matterId);
      return this;
      }
      /**
      * 设置 开始 事项id
      * @param matterIdStart
      */
      public MatterDatumPrintQuery matterIdStart(Long matterIdStart){
      this.matterIdStart = matterIdStart;
      return this;
      }
      /**
      * 设置 结束 事项id
      * @param matterIdEnd
      */
      public MatterDatumPrintQuery matterIdEnd(Long matterIdEnd){
      this.matterIdEnd = matterIdEnd;
      return this;
      }
      /**
      * 设置 增加 事项id
      * @param matterIdIncrement
      */
      public MatterDatumPrintQuery matterIdIncrement(Long matterIdIncrement){
      this.matterIdIncrement = matterIdIncrement;
      return this;
      }
      /**
      * 设置 事项id
      * @param matterIdList
      */
      public MatterDatumPrintQuery matterIdList(List<Long> matterIdList){
      this.matterIdList = matterIdList;
      return this;
      }
      /**
      * 设置 事项id
      * @param matterIdNotList
      */
      public MatterDatumPrintQuery matterIdNotList(List<Long> matterIdNotList){
      this.matterIdNotList = matterIdNotList;
      return this;
      }
      /**
      * 设置 事项名称
      * @param matterName
      */
      public MatterDatumPrintQuery matterName(String matterName){
      setMatterName(matterName);
      return this;
      }
      /**
      * 设置 站点id
      * @param siteIdNotList
      * 设置 事项名称
      * @param matterNameList
      */
      public MatterDatumPrintQuery siteIdNotList(List<Long> siteIdNotList){
      this.siteIdNotList = siteIdNotList;
      public MatterDatumPrintQuery matterNameList(List<String> matterNameList){
      this.matterNameList = matterNameList;
      return this;
      }
      /**
      * 设置 打印订单
      * @param orderId
      * 设置 事项编码
      * @param matterCode
      */
      public MatterDatumPrintQuery orderId(String orderId){
      setOrderId(orderId);
      public MatterDatumPrintQuery matterCode(String matterCode){
      setMatterCode(matterCode);
      return this;
      }
      /**
      * 设置 打印订单
      * @param orderIdList
      * 设置 事项编码
      * @param matterCodeList
      */
      public MatterDatumPrintQuery orderIdList(List<String> orderIdList){
      this.orderIdList = orderIdList;
      public MatterDatumPrintQuery matterCodeList(List<String> matterCodeList){
      this.matterCodeList = matterCodeList;
      return this;
      }
      ......@@ -1372,57 +1521,95 @@ public class MatterDatumPrintQuery extends MatterDatumPrintEntity {
      return this;
      }
      /**
      * 设置 设备编码
      * @param deviceCode
      */
      public MatterDatumPrintQuery deviceCode(String deviceCode){
      setDeviceCode(deviceCode);
      return this;
      }
      /**
      * 设置 设备编码
      * @param deviceCodeList
      */
      public MatterDatumPrintQuery deviceCodeList(List<String> deviceCodeList){
      this.deviceCodeList = deviceCodeList;
      return this;
      }
      /**
      * 设置 设备名称
      * @param deviceName
      */
      public MatterDatumPrintQuery deviceName(String deviceName){
      setDeviceName(deviceName);
      return this;
      }
      /**
      * 设置 设备名称
      * @param deviceNameList
      */
      public MatterDatumPrintQuery deviceNameList(List<String> deviceNameList){
      this.deviceNameList = deviceNameList;
      return this;
      }
      /**
      * 设置 材料页数
      * @param page
      * @param printPage
      */
      public MatterDatumPrintQuery page(Integer page){
      setPage(page);
      public MatterDatumPrintQuery printPage(Integer printPage){
      setPrintPage(printPage);
      return this;
      }
      /**
      * 设置 开始 材料页数
      * @param pageStart
      * @param printPageStart
      */
      public MatterDatumPrintQuery pageStart(Integer pageStart){
      this.pageStart = pageStart;
      public MatterDatumPrintQuery printPageStart(Integer printPageStart){
      this.printPageStart = printPageStart;
      return this;
      }
      /**
      * 设置 结束 材料页数
      * @param pageEnd
      * @param printPageEnd
      */
      public MatterDatumPrintQuery pageEnd(Integer pageEnd){
      this.pageEnd = pageEnd;
      public MatterDatumPrintQuery printPageEnd(Integer printPageEnd){
      this.printPageEnd = printPageEnd;
      return this;
      }
      /**
      * 设置 增加 材料页数
      * @param pageIncrement
      * @param printPageIncrement
      */
      public MatterDatumPrintQuery pageIncrement(Integer pageIncrement){
      this.pageIncrement = pageIncrement;
      public MatterDatumPrintQuery printPageIncrement(Integer printPageIncrement){
      this.printPageIncrement = printPageIncrement;
      return this;
      }
      /**
      * 设置 材料页数
      * @param pageList
      * @param printPageList
      */
      public MatterDatumPrintQuery pageList(List<Integer> pageList){
      this.pageList = pageList;
      public MatterDatumPrintQuery printPageList(List<Integer> printPageList){
      this.printPageList = printPageList;
      return this;
      }
      /**
      * 设置 材料页数
      * @param pageNotList
      * @param printPageNotList
      */
      public MatterDatumPrintQuery pageNotList(List<Integer> pageNotList){
      this.pageNotList = pageNotList;
      public MatterDatumPrintQuery printPageNotList(List<Integer> printPageNotList){
      this.printPageNotList = printPageNotList;
      return this;
      }
      ......@@ -1574,193 +1761,6 @@ public class MatterDatumPrintQuery extends MatterDatumPrintEntity {
      }
      /**
      * 设置 身份证号
      * @param idCard
      */
      public MatterDatumPrintQuery idCard(String idCard){
      setIdCard(idCard);
      return this;
      }
      /**
      * 设置 身份证号
      * @param idCardList
      */
      public MatterDatumPrintQuery idCardList(List<String> idCardList){
      this.idCardList = idCardList;
      return this;
      }
      /**
      * 设置 身份证名称
      * @param idName
      */
      public MatterDatumPrintQuery idName(String idName){
      setIdName(idName);
      return this;
      }
      /**
      * 设置 身份证名称
      * @param idNameList
      */
      public MatterDatumPrintQuery idNameList(List<String> idNameList){
      this.idNameList = idNameList;
      return this;
      }
      /**
      * 设置 手机号码
      * @param mobile
      */
      public MatterDatumPrintQuery mobile(String mobile){
      setMobile(mobile);
      return this;
      }
      /**
      * 设置 手机号码
      * @param mobileList
      */
      public MatterDatumPrintQuery mobileList(List<String> mobileList){
      this.mobileList = mobileList;
      return this;
      }
      /**
      * 设置 事项id
      * @param matterId
      */
      public MatterDatumPrintQuery matterId(Long matterId){
      setMatterId(matterId);
      return this;
      }
      /**
      * 设置 开始 事项id
      * @param matterIdStart
      */
      public MatterDatumPrintQuery matterIdStart(Long matterIdStart){
      this.matterIdStart = matterIdStart;
      return this;
      }
      /**
      * 设置 结束 事项id
      * @param matterIdEnd
      */
      public MatterDatumPrintQuery matterIdEnd(Long matterIdEnd){
      this.matterIdEnd = matterIdEnd;
      return this;
      }
      /**
      * 设置 增加 事项id
      * @param matterIdIncrement
      */
      public MatterDatumPrintQuery matterIdIncrement(Long matterIdIncrement){
      this.matterIdIncrement = matterIdIncrement;
      return this;
      }
      /**
      * 设置 事项id
      * @param matterIdList
      */
      public MatterDatumPrintQuery matterIdList(List<Long> matterIdList){
      this.matterIdList = matterIdList;
      return this;
      }
      /**
      * 设置 事项id
      * @param matterIdNotList
      */
      public MatterDatumPrintQuery matterIdNotList(List<Long> matterIdNotList){
      this.matterIdNotList = matterIdNotList;
      return this;
      }
      /**
      * 设置 事项名称
      * @param matterName
      */
      public MatterDatumPrintQuery matterName(String matterName){
      setMatterName(matterName);
      return this;
      }
      /**
      * 设置 事项名称
      * @param matterNameList
      */
      public MatterDatumPrintQuery matterNameList(List<String> matterNameList){
      this.matterNameList = matterNameList;
      return this;
      }
      /**
      * 设置 事项编码
      * @param matterCode
      */
      public MatterDatumPrintQuery matterCode(String matterCode){
      setMatterCode(matterCode);
      return this;
      }
      /**
      * 设置 事项编码
      * @param matterCodeList
      */
      public MatterDatumPrintQuery matterCodeList(List<String> matterCodeList){
      this.matterCodeList = matterCodeList;
      return this;
      }
      /**
      * 设置 设备编码
      * @param deviceCode
      */
      public MatterDatumPrintQuery deviceCode(String deviceCode){
      setDeviceCode(deviceCode);
      return this;
      }
      /**
      * 设置 设备编码
      * @param deviceCodeList
      */
      public MatterDatumPrintQuery deviceCodeList(List<String> deviceCodeList){
      this.deviceCodeList = deviceCodeList;
      return this;
      }
      /**
      * 设置 设备名称
      * @param deviceName
      */
      public MatterDatumPrintQuery deviceName(String deviceName){
      setDeviceName(deviceName);
      return this;
      }
      /**
      * 设置 设备名称
      * @param deviceNameList
      */
      public MatterDatumPrintQuery deviceNameList(List<String> deviceNameList){
      this.deviceNameList = deviceNameList;
      return this;
      }
      /**
      * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
      * @return orConditionList
      ......
      fill-manager/src/main/java/com/mortals/xhx/module/matter/service/impl/MatterDatumPrintServiceImpl.java
      View file @ 1bf50526
      ......@@ -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/main/resources/sqlmap/module/matter/MatterDatumPrintMapper.xml
      View file @ 1bf50526
      ......@@ -8,23 +8,23 @@
      <id property="id" column="id" />
      <result property="siteId" column="siteId" />
      <result property="orderId" column="orderId" />
      <result property="materialId" column="materialId" />
      <result property="materialName" column="materialName" />
      <result property="page" column="page" />
      <result property="type" column="type" />
      <result property="docPath" column="docPath" />
      <result property="formContent" column="formContent" />
      <result property="createTime" column="createTime" />
      <result property="createUserId" column="createUserId" />
      <result property="updateTime" column="updateTime" />
      <result property="idCard" column="idCard" />
      <result property="idName" column="idName" />
      <result property="mobile" column="mobile" />
      <result property="matterId" column="matterId" />
      <result property="matterName" column="matterName" />
      <result property="matterCode" column="matterCode" />
      <result property="materialId" column="materialId" />
      <result property="materialName" column="materialName" />
      <result property="deviceCode" column="deviceCode" />
      <result property="deviceName" column="deviceName" />
      <result property="printPage" column="printPage" />
      <result property="type" column="type" />
      <result property="docPath" column="docPath" />
      <result property="formContent" column="formContent" />
      <result property="createTime" column="createTime" />
      <result property="createUserId" column="createUserId" />
      <result property="updateTime" column="updateTime" />
      </resultMap>
      ......@@ -41,14 +41,38 @@
      <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('orderId') or colPickMode == 1 and data.containsKey('orderId')))">
      a.orderId,
      </if>
      <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('idCard') or colPickMode == 1 and data.containsKey('idCard')))">
      a.idCard,
      </if>
      <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('idName') or colPickMode == 1 and data.containsKey('idName')))">
      a.idName,
      </if>
      <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('mobile') or colPickMode == 1 and data.containsKey('mobile')))">
      a.mobile,
      </if>
      <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('matterId') or colPickMode == 1 and data.containsKey('matterId')))">
      a.matterId,
      </if>
      <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('matterName') or colPickMode == 1 and data.containsKey('matterName')))">
      a.matterName,
      </if>
      <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('matterCode') or colPickMode == 1 and data.containsKey('matterCode')))">
      a.matterCode,
      </if>
      <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('materialId') or colPickMode == 1 and data.containsKey('materialId')))">
      a.materialId,
      </if>
      <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('materialName') or colPickMode == 1 and data.containsKey('materialName')))">
      a.materialName,
      </if>
      <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('page') or colPickMode == 1 and data.containsKey('page')))">
      a.page,
      <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deviceCode') or colPickMode == 1 and data.containsKey('deviceCode')))">
      a.deviceCode,
      </if>
      <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deviceName') or colPickMode == 1 and data.containsKey('deviceName')))">
      a.deviceName,
      </if>
      <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('printPage') or colPickMode == 1 and data.containsKey('printPage')))">
      a.printPage,
      </if>
      <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('type') or colPickMode == 1 and data.containsKey('type')))">
      a.type,
      ......@@ -68,47 +92,23 @@
      <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))">
      a.updateTime,
      </if>
      <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('idCard') or colPickMode == 1 and data.containsKey('idCard')))">
      a.idCard,
      </if>
      <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('idName') or colPickMode == 1 and data.containsKey('idName')))">
      a.idName,
      </if>
      <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('mobile') or colPickMode == 1 and data.containsKey('mobile')))">
      a.mobile,
      </if>
      <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('matterId') or colPickMode == 1 and data.containsKey('matterId')))">
      a.matterId,
      </if>
      <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('matterName') or colPickMode == 1 and data.containsKey('matterName')))">
      a.matterName,
      </if>
      <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('matterCode') or colPickMode == 1 and data.containsKey('matterCode')))">
      a.matterCode,
      </if>
      <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deviceCode') or colPickMode == 1 and data.containsKey('deviceCode')))">
      a.deviceCode,
      </if>
      <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deviceName') or colPickMode == 1 and data.containsKey('deviceName')))">
      a.deviceName,
      </if>
      </trim>
      </sql>
      <!-- 新增 区分主键自增加还是业务插入 -->
      <insert id="insert" parameterType="MatterDatumPrintEntity" useGeneratedKeys="true" keyProperty="id">
      insert into mortals_xhx_matter_datum_print
      (siteId,orderId,materialId,materialName,page,type,docPath,formContent,createTime,createUserId,updateTime,idCard,idName,mobile,matterId,matterName,matterCode,deviceCode,deviceName)
      (siteId,orderId,idCard,idName,mobile,matterId,matterName,matterCode,materialId,materialName,deviceCode,deviceName,printPage,type,docPath,formContent,createTime,createUserId,updateTime)
      VALUES
      (#{siteId},#{orderId},#{materialId},#{materialName},#{page},#{type},#{docPath},#{formContent},#{createTime},#{createUserId},#{updateTime},#{idCard},#{idName},#{mobile},#{matterId},#{matterName},#{matterCode},#{deviceCode},#{deviceName})
      (#{siteId},#{orderId},#{idCard},#{idName},#{mobile},#{matterId},#{matterName},#{matterCode},#{materialId},#{materialName},#{deviceCode},#{deviceName},#{printPage},#{type},#{docPath},#{formContent},#{createTime},#{createUserId},#{updateTime})
      </insert>
      <!-- 批量新增 -->
      <insert id="insertBatch" parameterType="paramDto">
      insert into mortals_xhx_matter_datum_print
      (siteId,orderId,materialId,materialName,page,type,docPath,formContent,createTime,createUserId,updateTime,idCard,idName,mobile,matterId,matterName,matterCode,deviceCode,deviceName)
      (siteId,orderId,idCard,idName,mobile,matterId,matterName,matterCode,materialId,materialName,deviceCode,deviceName,printPage,type,docPath,formContent,createTime,createUserId,updateTime)
      VALUES
      <foreach collection="data.dataList" item="item" index="index" separator="," >
      (#{item.siteId},#{item.orderId},#{item.materialId},#{item.materialName},#{item.page},#{item.type},#{item.docPath},#{item.formContent},#{item.createTime},#{item.createUserId},#{item.updateTime},#{item.idCard},#{item.idName},#{item.mobile},#{item.matterId},#{item.matterName},#{item.matterCode},#{item.deviceCode},#{item.deviceName})
      (#{item.siteId},#{item.orderId},#{item.idCard},#{item.idName},#{item.mobile},#{item.matterId},#{item.matterName},#{item.matterCode},#{item.materialId},#{item.materialName},#{item.deviceCode},#{item.deviceName},#{item.printPage},#{item.type},#{item.docPath},#{item.formContent},#{item.createTime},#{item.createUserId},#{item.updateTime})
      </foreach>
      </insert>
      ......@@ -127,6 +127,27 @@
      <if test="(colPickMode==0 and data.containsKey('orderId')) or (colPickMode==1 and !data.containsKey('orderId'))">
      a.orderId=#{data.orderId},
      </if>
      <if test="(colPickMode==0 and data.containsKey('idCard')) or (colPickMode==1 and !data.containsKey('idCard'))">
      a.idCard=#{data.idCard},
      </if>
      <if test="(colPickMode==0 and data.containsKey('idName')) or (colPickMode==1 and !data.containsKey('idName'))">
      a.idName=#{data.idName},
      </if>
      <if test="(colPickMode==0 and data.containsKey('mobile')) or (colPickMode==1 and !data.containsKey('mobile'))">
      a.mobile=#{data.mobile},
      </if>
      <if test="(colPickMode==0 and data.containsKey('matterId')) or (colPickMode==1 and !data.containsKey('matterId'))">
      a.matterId=#{data.matterId},
      </if>
      <if test="(colPickMode==0 and data.containsKey('matterIdIncrement')) or (colPickMode==1 and !data.containsKey('matterIdIncrement'))">
      a.matterId=ifnull(a.matterId,0) + #{data.matterIdIncrement},
      </if>
      <if test="(colPickMode==0 and data.containsKey('matterName')) or (colPickMode==1 and !data.containsKey('matterName'))">
      a.matterName=#{data.matterName},
      </if>
      <if test="(colPickMode==0 and data.containsKey('matterCode')) or (colPickMode==1 and !data.containsKey('matterCode'))">
      a.matterCode=#{data.matterCode},
      </if>
      <if test="(colPickMode==0 and data.containsKey('materialId')) or (colPickMode==1 and !data.containsKey('materialId'))">
      a.materialId=#{data.materialId},
      </if>
      ......@@ -136,11 +157,17 @@
      <if test="(colPickMode==0 and data.containsKey('materialName')) or (colPickMode==1 and !data.containsKey('materialName'))">
      a.materialName=#{data.materialName},
      </if>
      <if test="(colPickMode==0 and data.containsKey('page')) or (colPickMode==1 and !data.containsKey('page'))">
      a.page=#{data.page},
      <if test="(colPickMode==0 and data.containsKey('deviceCode')) or (colPickMode==1 and !data.containsKey('deviceCode'))">
      a.deviceCode=#{data.deviceCode},
      </if>
      <if test="(colPickMode==0 and data.containsKey('deviceName')) or (colPickMode==1 and !data.containsKey('deviceName'))">
      a.deviceName=#{data.deviceName},
      </if>
      <if test="(colPickMode==0 and data.containsKey('pageIncrement')) or (colPickMode==1 and !data.containsKey('pageIncrement'))">
      a.page=ifnull(a.page,0) + #{data.pageIncrement},
      <if test="(colPickMode==0 and data.containsKey('printPage')) or (colPickMode==1 and !data.containsKey('printPage'))">
      a.printPage=#{data.printPage},
      </if>
      <if test="(colPickMode==0 and data.containsKey('printPageIncrement')) or (colPickMode==1 and !data.containsKey('printPageIncrement'))">
      a.printPage=ifnull(a.printPage,0) + #{data.printPageIncrement},
      </if>
      <if test="(colPickMode==0 and data.containsKey('type')) or (colPickMode==1 and !data.containsKey('type'))">
      a.type=#{data.type},
      ......@@ -166,33 +193,6 @@
      <if test="(colPickMode==0 and data.containsKey('updateTime')) or (colPickMode==1 and !data.containsKey('updateTime'))">
      a.updateTime=#{data.updateTime},
      </if>
      <if test="(colPickMode==0 and data.containsKey('idCard')) or (colPickMode==1 and !data.containsKey('idCard'))">
      a.idCard=#{data.idCard},
      </if>
      <if test="(colPickMode==0 and data.containsKey('idName')) or (colPickMode==1 and !data.containsKey('idName'))">
      a.idName=#{data.idName},
      </if>
      <if test="(colPickMode==0 and data.containsKey('mobile')) or (colPickMode==1 and !data.containsKey('mobile'))">
      a.mobile=#{data.mobile},
      </if>
      <if test="(colPickMode==0 and data.containsKey('matterId')) or (colPickMode==1 and !data.containsKey('matterId'))">
      a.matterId=#{data.matterId},
      </if>
      <if test="(colPickMode==0 and data.containsKey('matterIdIncrement')) or (colPickMode==1 and !data.containsKey('matterIdIncrement'))">
      a.matterId=ifnull(a.matterId,0) + #{data.matterIdIncrement},
      </if>
      <if test="(colPickMode==0 and data.containsKey('matterName')) or (colPickMode==1 and !data.containsKey('matterName'))">
      a.matterName=#{data.matterName},
      </if>
      <if test="(colPickMode==0 and data.containsKey('matterCode')) or (colPickMode==1 and !data.containsKey('matterCode'))">
      a.matterCode=#{data.matterCode},
      </if>
      <if test="(colPickMode==0 and data.containsKey('deviceCode')) or (colPickMode==1 and !data.containsKey('deviceCode'))">
      a.deviceCode=#{data.deviceCode},
      </if>
      <if test="(colPickMode==0 and data.containsKey('deviceName')) or (colPickMode==1 and !data.containsKey('deviceName'))">
      a.deviceName=#{data.deviceName},
      </if>
      </trim>
      <trim suffixOverrides="where" suffix="">
      where
      ......@@ -224,6 +224,53 @@
      </if>
      </foreach>
      </trim>
      <trim prefix="idCard=(case" suffix="ELSE idCard end),">
      <foreach collection="data.dataList" item="item" index="index" separator="" >
      <if test="(colPickMode==0 and item.containsKey('idCard')) or (colPickMode==1 and !item.containsKey('idCard'))">
      when a.id=#{item.id} then #{item.idCard}
      </if>
      </foreach>
      </trim>
      <trim prefix="idName=(case" suffix="ELSE idName end),">
      <foreach collection="data.dataList" item="item" index="index" separator="" >
      <if test="(colPickMode==0 and item.containsKey('idName')) or (colPickMode==1 and !item.containsKey('idName'))">
      when a.id=#{item.id} then #{item.idName}
      </if>
      </foreach>
      </trim>
      <trim prefix="mobile=(case" suffix="ELSE mobile end),">
      <foreach collection="data.dataList" item="item" index="index" separator="" >
      <if test="(colPickMode==0 and item.containsKey('mobile')) or (colPickMode==1 and !item.containsKey('mobile'))">
      when a.id=#{item.id} then #{item.mobile}
      </if>
      </foreach>
      </trim>
      <trim prefix="matterId=(case" suffix="ELSE matterId end),">
      <foreach collection="data.dataList" item="item" index="index" separator="" >
      <choose>
      <when test="(colPickMode==0 and item.containsKey('matterId')) or (colPickMode==1 and !item.containsKey('matterId'))">
      when a.id=#{item.id} then #{item.matterId}
      </when>
      <when test="(colPickMode==0 and item.containsKey('matterIdIncrement')) or (colPickMode==1 and !item.containsKey('matterIdIncrement'))">
      when a.id=#{item.id} then ifnull(a.matterId,0) + #{item.matterIdIncrement}
      </when>
      </choose>
      </foreach>
      </trim>
      <trim prefix="matterName=(case" suffix="ELSE matterName end),">
      <foreach collection="data.dataList" item="item" index="index" separator="" >
      <if test="(colPickMode==0 and item.containsKey('matterName')) or (colPickMode==1 and !item.containsKey('matterName'))">
      when a.id=#{item.id} then #{item.matterName}
      </if>
      </foreach>
      </trim>
      <trim prefix="matterCode=(case" suffix="ELSE matterCode end),">
      <foreach collection="data.dataList" item="item" index="index" separator="" >
      <if test="(colPickMode==0 and item.containsKey('matterCode')) or (colPickMode==1 and !item.containsKey('matterCode'))">
      when a.id=#{item.id} then #{item.matterCode}
      </if>
      </foreach>
      </trim>
      <trim prefix="materialId=(case" suffix="ELSE materialId end),">
      <foreach collection="data.dataList" item="item" index="index" separator="" >
      <choose>
      ......@@ -243,14 +290,28 @@
      </if>
      </foreach>
      </trim>
      <trim prefix="page=(case" suffix="ELSE page end),">
      <trim prefix="deviceCode=(case" suffix="ELSE deviceCode end),">
      <foreach collection="data.dataList" item="item" index="index" separator="" >
      <if test="(colPickMode==0 and item.containsKey('deviceCode')) or (colPickMode==1 and !item.containsKey('deviceCode'))">
      when a.id=#{item.id} then #{item.deviceCode}
      </if>
      </foreach>
      </trim>
      <trim prefix="deviceName=(case" suffix="ELSE deviceName end),">
      <foreach collection="data.dataList" item="item" index="index" separator="" >
      <if test="(colPickMode==0 and item.containsKey('deviceName')) or (colPickMode==1 and !item.containsKey('deviceName'))">
      when a.id=#{item.id} then #{item.deviceName}
      </if>
      </foreach>
      </trim>
      <trim prefix="printPage=(case" suffix="ELSE printPage end),">
      <foreach collection="data.dataList" item="item" index="index" separator="" >
      <choose>
      <when test="(colPickMode==0 and item.containsKey('page')) or (colPickMode==1 and !item.containsKey('page'))">
      when a.id=#{item.id} then #{item.page}
      <when test="(colPickMode==0 and item.containsKey('printPage')) or (colPickMode==1 and !item.containsKey('printPage'))">
      when a.id=#{item.id} then #{item.printPage}
      </when>
      <when test="(colPickMode==0 and item.containsKey('pageIncrement')) or (colPickMode==1 and !item.containsKey('pageIncrement'))">
      when a.id=#{item.id} then ifnull(a.page,0) + #{item.pageIncrement}
      <when test="(colPickMode==0 and item.containsKey('printPageIncrement')) or (colPickMode==1 and !item.containsKey('printPageIncrement'))">
      when a.id=#{item.id} then ifnull(a.printPage,0) + #{item.printPageIncrement}
      </when>
      </choose>
      </foreach>
      ......@@ -307,67 +368,6 @@
      </if>
      </foreach>
      </trim>
      <trim prefix="idCard=(case" suffix="ELSE idCard end),">
      <foreach collection="data.dataList" item="item" index="index" separator="" >
      <if test="(colPickMode==0 and item.containsKey('idCard')) or (colPickMode==1 and !item.containsKey('idCard'))">
      when a.id=#{item.id} then #{item.idCard}
      </if>
      </foreach>
      </trim>
      <trim prefix="idName=(case" suffix="ELSE idName end),">
      <foreach collection="data.dataList" item="item" index="index" separator="" >
      <if test="(colPickMode==0 and item.containsKey('idName')) or (colPickMode==1 and !item.containsKey('idName'))">
      when a.id=#{item.id} then #{item.idName}
      </if>
      </foreach>
      </trim>
      <trim prefix="mobile=(case" suffix="ELSE mobile end),">
      <foreach collection="data.dataList" item="item" index="index" separator="" >
      <if test="(colPickMode==0 and item.containsKey('mobile')) or (colPickMode==1 and !item.containsKey('mobile'))">
      when a.id=#{item.id} then #{item.mobile}
      </if>
      </foreach>
      </trim>
      <trim prefix="matterId=(case" suffix="ELSE matterId end),">
      <foreach collection="data.dataList" item="item" index="index" separator="" >
      <choose>
      <when test="(colPickMode==0 and item.containsKey('matterId')) or (colPickMode==1 and !item.containsKey('matterId'))">
      when a.id=#{item.id} then #{item.matterId}
      </when>
      <when test="(colPickMode==0 and item.containsKey('matterIdIncrement')) or (colPickMode==1 and !item.containsKey('matterIdIncrement'))">
      when a.id=#{item.id} then ifnull(a.matterId,0) + #{item.matterIdIncrement}
      </when>
      </choose>
      </foreach>
      </trim>
      <trim prefix="matterName=(case" suffix="ELSE matterName end),">
      <foreach collection="data.dataList" item="item" index="index" separator="" >
      <if test="(colPickMode==0 and item.containsKey('matterName')) or (colPickMode==1 and !item.containsKey('matterName'))">
      when a.id=#{item.id} then #{item.matterName}
      </if>
      </foreach>
      </trim>
      <trim prefix="matterCode=(case" suffix="ELSE matterCode end),">
      <foreach collection="data.dataList" item="item" index="index" separator="" >
      <if test="(colPickMode==0 and item.containsKey('matterCode')) or (colPickMode==1 and !item.containsKey('matterCode'))">
      when a.id=#{item.id} then #{item.matterCode}
      </if>
      </foreach>
      </trim>
      <trim prefix="deviceCode=(case" suffix="ELSE deviceCode end),">
      <foreach collection="data.dataList" item="item" index="index" separator="" >
      <if test="(colPickMode==0 and item.containsKey('deviceCode')) or (colPickMode==1 and !item.containsKey('deviceCode'))">
      when a.id=#{item.id} then #{item.deviceCode}
      </if>
      </foreach>
      </trim>
      <trim prefix="deviceName=(case" suffix="ELSE deviceName end),">
      <foreach collection="data.dataList" item="item" index="index" separator="" >
      <if test="(colPickMode==0 and item.containsKey('deviceName')) or (colPickMode==1 and !item.containsKey('deviceName'))">
      when a.id=#{item.id} then #{item.deviceName}
      </if>
      </foreach>
      </trim>
      </trim>
      where id in
      <foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
      ......@@ -492,13 +492,13 @@
      ${_conditionType_} a.id is null
      </if>
      </if>
      <if test="conditionParamRef.containsKey('idList')">
      <if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
      ${_conditionType_} a.id in
      <foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('idNotList')">
      <if test="conditionParamRef.containsKey('idNotList') and conditionParamRef.idNotList.size() > 0">
      ${_conditionType_} a.id not in
      <foreach collection="conditionParamRef.idNotList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      ......@@ -519,13 +519,13 @@
      ${_conditionType_} a.siteId is null
      </if>
      </if>
      <if test="conditionParamRef.containsKey('siteIdList')">
      <if test="conditionParamRef.containsKey('siteIdList') and conditionParamRef.siteIdList.size() > 0">
      ${_conditionType_} a.siteId in
      <foreach collection="conditionParamRef.siteIdList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('siteIdNotList')">
      <if test="conditionParamRef.containsKey('siteIdNotList') and conditionParamRef.siteIdNotList.size() > 0">
      ${_conditionType_} a.siteId not in
      <foreach collection="conditionParamRef.siteIdNotList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      ......@@ -547,34 +547,166 @@
      ${_conditionType_} a.orderId is null
      </if>
      </if>
      <if test="conditionParamRef.containsKey('orderIdList')">
      <if test="conditionParamRef.containsKey('orderIdList') and conditionParamRef.orderIdList.size() > 0">
      ${_conditionType_} a.orderId in
      <foreach collection="conditionParamRef.orderIdList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('orderIdNotList')">
      <if test="conditionParamRef.containsKey('orderIdNotList') and conditionParamRef.orderIdNotList.size() > 0">
      ${_conditionType_} a.orderId not in
      <foreach collection="conditionParamRef.orderIdNotList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('materialId')">
      <if test="conditionParamRef.materialId != null ">
      ${_conditionType_} a.materialId = #{${_conditionParam_}.materialId}
      <if test="conditionParamRef.containsKey('idCard')">
      <if test="conditionParamRef.idCard != null and conditionParamRef.idCard != ''">
      ${_conditionType_} a.idCard like #{${_conditionParam_}.idCard}
      </if>
      <if test="conditionParamRef.materialId == null">
      ${_conditionType_} a.materialId is null
      <if test="conditionParamRef.idCard == null">
      ${_conditionType_} a.idCard is null
      </if>
      </if>
      <if test="conditionParamRef.containsKey('materialIdList')">
      ${_conditionType_} a.materialId in
      <foreach collection="conditionParamRef.materialIdList" open="(" close=")" index="index" item="item" separator=",">
      <if test="conditionParamRef.containsKey('idCardList') and conditionParamRef.idCardList.size() > 0">
      ${_conditionType_} a.idCard in
      <foreach collection="conditionParamRef.idCardList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('materialIdNotList')">
      ${_conditionType_} a.materialId not in
      <if test="conditionParamRef.containsKey('idCardNotList') and conditionParamRef.idCardNotList.size() > 0">
      ${_conditionType_} a.idCard not in
      <foreach collection="conditionParamRef.idCardNotList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('idName')">
      <if test="conditionParamRef.idName != null and conditionParamRef.idName != ''">
      ${_conditionType_} a.idName like #{${_conditionParam_}.idName}
      </if>
      <if test="conditionParamRef.idName == null">
      ${_conditionType_} a.idName is null
      </if>
      </if>
      <if test="conditionParamRef.containsKey('idNameList') and conditionParamRef.idNameList.size() > 0">
      ${_conditionType_} a.idName in
      <foreach collection="conditionParamRef.idNameList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('idNameNotList') and conditionParamRef.idNameNotList.size() > 0">
      ${_conditionType_} a.idName not in
      <foreach collection="conditionParamRef.idNameNotList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('mobile')">
      <if test="conditionParamRef.mobile != null and conditionParamRef.mobile != ''">
      ${_conditionType_} a.mobile like #{${_conditionParam_}.mobile}
      </if>
      <if test="conditionParamRef.mobile == null">
      ${_conditionType_} a.mobile is null
      </if>
      </if>
      <if test="conditionParamRef.containsKey('mobileList') and conditionParamRef.mobileList.size() > 0">
      ${_conditionType_} a.mobile in
      <foreach collection="conditionParamRef.mobileList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('mobileNotList') and conditionParamRef.mobileNotList.size() > 0">
      ${_conditionType_} a.mobile not in
      <foreach collection="conditionParamRef.mobileNotList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('matterId')">
      <if test="conditionParamRef.matterId != null ">
      ${_conditionType_} a.matterId = #{${_conditionParam_}.matterId}
      </if>
      <if test="conditionParamRef.matterId == null">
      ${_conditionType_} a.matterId is null
      </if>
      </if>
      <if test="conditionParamRef.containsKey('matterIdList') and conditionParamRef.matterIdList.size() > 0">
      ${_conditionType_} a.matterId in
      <foreach collection="conditionParamRef.matterIdList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('matterIdNotList') and conditionParamRef.matterIdNotList.size() > 0">
      ${_conditionType_} a.matterId not in
      <foreach collection="conditionParamRef.matterIdNotList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('matterIdStart') and conditionParamRef.matterIdStart != null">
      ${_conditionType_} a.matterId <![CDATA[ >= ]]> #{${_conditionParam_}.matterIdStart}
      </if>
      <if test="conditionParamRef.containsKey('matterIdEnd') and conditionParamRef.matterIdEnd != null">
      ${_conditionType_} a.matterId <![CDATA[ <= ]]> #{${_conditionParam_}.matterIdEnd}
      </if>
      <if test="conditionParamRef.containsKey('matterName')">
      <if test="conditionParamRef.matterName != null and conditionParamRef.matterName != ''">
      ${_conditionType_} a.matterName like #{${_conditionParam_}.matterName}
      </if>
      <if test="conditionParamRef.matterName == null">
      ${_conditionType_} a.matterName is null
      </if>
      </if>
      <if test="conditionParamRef.containsKey('matterNameList') and conditionParamRef.matterNameList.size() > 0">
      ${_conditionType_} a.matterName in
      <foreach collection="conditionParamRef.matterNameList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('matterNameNotList') and conditionParamRef.matterNameNotList.size() > 0">
      ${_conditionType_} a.matterName not in
      <foreach collection="conditionParamRef.matterNameNotList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('matterCode')">
      <if test="conditionParamRef.matterCode != null and conditionParamRef.matterCode != ''">
      ${_conditionType_} a.matterCode like #{${_conditionParam_}.matterCode}
      </if>
      <if test="conditionParamRef.matterCode == null">
      ${_conditionType_} a.matterCode is null
      </if>
      </if>
      <if test="conditionParamRef.containsKey('matterCodeList') and conditionParamRef.matterCodeList.size() > 0">
      ${_conditionType_} a.matterCode in
      <foreach collection="conditionParamRef.matterCodeList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('matterCodeNotList') and conditionParamRef.matterCodeNotList.size() > 0">
      ${_conditionType_} a.matterCode not in
      <foreach collection="conditionParamRef.matterCodeNotList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('materialId')">
      <if test="conditionParamRef.materialId != null ">
      ${_conditionType_} a.materialId = #{${_conditionParam_}.materialId}
      </if>
      <if test="conditionParamRef.materialId == null">
      ${_conditionType_} a.materialId is null
      </if>
      </if>
      <if test="conditionParamRef.containsKey('materialIdList') and conditionParamRef.materialIdList.size() > 0">
      ${_conditionType_} a.materialId in
      <foreach collection="conditionParamRef.materialIdList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('materialIdNotList') and conditionParamRef.materialIdNotList.size() > 0">
      ${_conditionType_} a.materialId not in
      <foreach collection="conditionParamRef.materialIdNotList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      ......@@ -595,43 +727,85 @@
      ${_conditionType_} a.materialName is null
      </if>
      </if>
      <if test="conditionParamRef.containsKey('materialNameList')">
      <if test="conditionParamRef.containsKey('materialNameList') and conditionParamRef.materialNameList.size() > 0">
      ${_conditionType_} a.materialName in
      <foreach collection="conditionParamRef.materialNameList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('materialNameNotList')">
      <if test="conditionParamRef.containsKey('materialNameNotList') and conditionParamRef.materialNameNotList.size() > 0">
      ${_conditionType_} a.materialName not in
      <foreach collection="conditionParamRef.materialNameNotList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('page')">
      <if test="conditionParamRef.page != null ">
      ${_conditionType_} a.page = #{${_conditionParam_}.page}
      <if test="conditionParamRef.containsKey('deviceCode')">
      <if test="conditionParamRef.deviceCode != null and conditionParamRef.deviceCode != ''">
      ${_conditionType_} a.deviceCode like #{${_conditionParam_}.deviceCode}
      </if>
      <if test="conditionParamRef.deviceCode == null">
      ${_conditionType_} a.deviceCode is null
      </if>
      </if>
      <if test="conditionParamRef.containsKey('deviceCodeList') and conditionParamRef.deviceCodeList.size() > 0">
      ${_conditionType_} a.deviceCode in
      <foreach collection="conditionParamRef.deviceCodeList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('deviceCodeNotList') and conditionParamRef.deviceCodeNotList.size() > 0">
      ${_conditionType_} a.deviceCode not in
      <foreach collection="conditionParamRef.deviceCodeNotList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('deviceName')">
      <if test="conditionParamRef.deviceName != null and conditionParamRef.deviceName != ''">
      ${_conditionType_} a.deviceName like #{${_conditionParam_}.deviceName}
      </if>
      <if test="conditionParamRef.page == null">
      ${_conditionType_} a.page is null
      <if test="conditionParamRef.deviceName == null">
      ${_conditionType_} a.deviceName is null
      </if>
      </if>
      <if test="conditionParamRef.containsKey('pageList')">
      ${_conditionType_} a.page in
      <foreach collection="conditionParamRef.pageList" open="(" close=")" index="index" item="item" separator=",">
      <if test="conditionParamRef.containsKey('deviceNameList') and conditionParamRef.deviceNameList.size() > 0">
      ${_conditionType_} a.deviceName in
      <foreach collection="conditionParamRef.deviceNameList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('pageNotList')">
      ${_conditionType_} a.page not in
      <foreach collection="conditionParamRef.pageNotList" open="(" close=")" index="index" item="item" separator=",">
      <if test="conditionParamRef.containsKey('deviceNameNotList') and conditionParamRef.deviceNameNotList.size() > 0">
      ${_conditionType_} a.deviceName not in
      <foreach collection="conditionParamRef.deviceNameNotList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('pageStart') and conditionParamRef.pageStart != null">
      ${_conditionType_} a.page <![CDATA[ >= ]]> #{${_conditionParam_}.pageStart}
      <if test="conditionParamRef.containsKey('printPage')">
      <if test="conditionParamRef.printPage != null ">
      ${_conditionType_} a.printPage = #{${_conditionParam_}.printPage}
      </if>
      <if test="conditionParamRef.containsKey('pageEnd') and conditionParamRef.pageEnd != null">
      ${_conditionType_} a.page <![CDATA[ <= ]]> #{${_conditionParam_}.pageEnd}
      <if test="conditionParamRef.printPage == null">
      ${_conditionType_} a.printPage is null
      </if>
      </if>
      <if test="conditionParamRef.containsKey('printPageList') and conditionParamRef.printPageList.size() > 0">
      ${_conditionType_} a.printPage in
      <foreach collection="conditionParamRef.printPageList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('printPageNotList') and conditionParamRef.printPageNotList.size() > 0">
      ${_conditionType_} a.printPage not in
      <foreach collection="conditionParamRef.printPageNotList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('printPageStart') and conditionParamRef.printPageStart != null">
      ${_conditionType_} a.printPage <![CDATA[ >= ]]> #{${_conditionParam_}.printPageStart}
      </if>
      <if test="conditionParamRef.containsKey('printPageEnd') and conditionParamRef.printPageEnd != null">
      ${_conditionType_} a.printPage <![CDATA[ <= ]]> #{${_conditionParam_}.printPageEnd}
      </if>
      <if test="conditionParamRef.containsKey('type')">
      ......@@ -642,13 +816,13 @@
      ${_conditionType_} a.type is null
      </if>
      </if>
      <if test="conditionParamRef.containsKey('typeList')">
      <if test="conditionParamRef.containsKey('typeList') and conditionParamRef.typeList.size() > 0">
      ${_conditionType_} a.type in
      <foreach collection="conditionParamRef.typeList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('typeNotList')">
      <if test="conditionParamRef.containsKey('typeNotList') and conditionParamRef.typeNotList.size() > 0">
      ${_conditionType_} a.type not in
      <foreach collection="conditionParamRef.typeNotList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      ......@@ -670,13 +844,13 @@
      ${_conditionType_} a.docPath is null
      </if>
      </if>
      <if test="conditionParamRef.containsKey('docPathList')">
      <if test="conditionParamRef.containsKey('docPathList') and conditionParamRef.docPathList.size() > 0">
      ${_conditionType_} a.docPath in
      <foreach collection="conditionParamRef.docPathList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('docPathNotList')">
      <if test="conditionParamRef.containsKey('docPathNotList') and conditionParamRef.docPathNotList.size() > 0">
      ${_conditionType_} a.docPath not in
      <foreach collection="conditionParamRef.docPathNotList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      ......@@ -691,13 +865,13 @@
      ${_conditionType_} a.formContent is null
      </if>
      </if>
      <if test="conditionParamRef.containsKey('formContentList')">
      <if test="conditionParamRef.containsKey('formContentList') and conditionParamRef.formContentList.size() > 0">
      ${_conditionType_} a.formContent in
      <foreach collection="conditionParamRef.formContentList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('formContentNotList')">
      <if test="conditionParamRef.containsKey('formContentNotList') and conditionParamRef.formContentNotList.size() > 0">
      ${_conditionType_} a.formContent not in
      <foreach collection="conditionParamRef.formContentNotList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      ......@@ -726,13 +900,13 @@
      ${_conditionType_} a.createUserId is null
      </if>
      </if>
      <if test="conditionParamRef.containsKey('createUserIdList')">
      <if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
      ${_conditionType_} a.createUserId in
      <foreach collection="conditionParamRef.createUserIdList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('createUserIdNotList')">
      <if test="conditionParamRef.containsKey('createUserIdNotList') and conditionParamRef.createUserIdNotList.size() > 0">
      ${_conditionType_} a.createUserId not in
      <foreach collection="conditionParamRef.createUserIdNotList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      ......@@ -760,180 +934,6 @@
      <if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''">
      ${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
      </if>
      <if test="conditionParamRef.containsKey('idCard')">
      <if test="conditionParamRef.idCard != null and conditionParamRef.idCard != ''">
      ${_conditionType_} a.idCard like #{${_conditionParam_}.idCard}
      </if>
      <if test="conditionParamRef.idCard == null">
      ${_conditionType_} a.idCard is null
      </if>
      </if>
      <if test="conditionParamRef.containsKey('idCardList')">
      ${_conditionType_} a.idCard in
      <foreach collection="conditionParamRef.idCardList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('idCardNotList')">
      ${_conditionType_} a.idCard not in
      <foreach collection="conditionParamRef.idCardNotList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('idName')">
      <if test="conditionParamRef.idName != null and conditionParamRef.idName != ''">
      ${_conditionType_} a.idName like #{${_conditionParam_}.idName}
      </if>
      <if test="conditionParamRef.idName == null">
      ${_conditionType_} a.idName is null
      </if>
      </if>
      <if test="conditionParamRef.containsKey('idNameList')">
      ${_conditionType_} a.idName in
      <foreach collection="conditionParamRef.idNameList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('idNameNotList')">
      ${_conditionType_} a.idName not in
      <foreach collection="conditionParamRef.idNameNotList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('mobile')">
      <if test="conditionParamRef.mobile != null and conditionParamRef.mobile != ''">
      ${_conditionType_} a.mobile like #{${_conditionParam_}.mobile}
      </if>
      <if test="conditionParamRef.mobile == null">
      ${_conditionType_} a.mobile is null
      </if>
      </if>
      <if test="conditionParamRef.containsKey('mobileList')">
      ${_conditionType_} a.mobile in
      <foreach collection="conditionParamRef.mobileList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('mobileNotList')">
      ${_conditionType_} a.mobile not in
      <foreach collection="conditionParamRef.mobileNotList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('matterId')">
      <if test="conditionParamRef.matterId != null ">
      ${_conditionType_} a.matterId = #{${_conditionParam_}.matterId}
      </if>
      <if test="conditionParamRef.matterId == null">
      ${_conditionType_} a.matterId is null
      </if>
      </if>
      <if test="conditionParamRef.containsKey('matterIdList')">
      ${_conditionType_} a.matterId in
      <foreach collection="conditionParamRef.matterIdList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('matterIdNotList')">
      ${_conditionType_} a.matterId not in
      <foreach collection="conditionParamRef.matterIdNotList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('matterIdStart') and conditionParamRef.matterIdStart != null">
      ${_conditionType_} a.matterId <![CDATA[ >= ]]> #{${_conditionParam_}.matterIdStart}
      </if>
      <if test="conditionParamRef.containsKey('matterIdEnd') and conditionParamRef.matterIdEnd != null">
      ${_conditionType_} a.matterId <![CDATA[ <= ]]> #{${_conditionParam_}.matterIdEnd}
      </if>
      <if test="conditionParamRef.containsKey('matterName')">
      <if test="conditionParamRef.matterName != null and conditionParamRef.matterName != ''">
      ${_conditionType_} a.matterName like #{${_conditionParam_}.matterName}
      </if>
      <if test="conditionParamRef.matterName == null">
      ${_conditionType_} a.matterName is null
      </if>
      </if>
      <if test="conditionParamRef.containsKey('matterNameList')">
      ${_conditionType_} a.matterName in
      <foreach collection="conditionParamRef.matterNameList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('matterNameNotList')">
      ${_conditionType_} a.matterName not in
      <foreach collection="conditionParamRef.matterNameNotList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('matterCode')">
      <if test="conditionParamRef.matterCode != null and conditionParamRef.matterCode != ''">
      ${_conditionType_} a.matterCode like #{${_conditionParam_}.matterCode}
      </if>
      <if test="conditionParamRef.matterCode == null">
      ${_conditionType_} a.matterCode is null
      </if>
      </if>
      <if test="conditionParamRef.containsKey('matterCodeList')">
      ${_conditionType_} a.matterCode in
      <foreach collection="conditionParamRef.matterCodeList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('matterCodeNotList')">
      ${_conditionType_} a.matterCode not in
      <foreach collection="conditionParamRef.matterCodeNotList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('deviceCode')">
      <if test="conditionParamRef.deviceCode != null and conditionParamRef.deviceCode != ''">
      ${_conditionType_} a.deviceCode like #{${_conditionParam_}.deviceCode}
      </if>
      <if test="conditionParamRef.deviceCode == null">
      ${_conditionType_} a.deviceCode is null
      </if>
      </if>
      <if test="conditionParamRef.containsKey('deviceCodeList')">
      ${_conditionType_} a.deviceCode in
      <foreach collection="conditionParamRef.deviceCodeList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('deviceCodeNotList')">
      ${_conditionType_} a.deviceCode not in
      <foreach collection="conditionParamRef.deviceCodeNotList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('deviceName')">
      <if test="conditionParamRef.deviceName != null and conditionParamRef.deviceName != ''">
      ${_conditionType_} a.deviceName like #{${_conditionParam_}.deviceName}
      </if>
      <if test="conditionParamRef.deviceName == null">
      ${_conditionType_} a.deviceName is null
      </if>
      </if>
      <if test="conditionParamRef.containsKey('deviceNameList')">
      ${_conditionType_} a.deviceName in
      <foreach collection="conditionParamRef.deviceNameList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('deviceNameNotList')">
      ${_conditionType_} a.deviceName not in
      <foreach collection="conditionParamRef.deviceNameNotList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      </sql>
      <sql id="_orderCols_">
      <if test="orderColList != null and !orderColList.isEmpty()">
      ......@@ -962,6 +962,36 @@
      <if test='orderCol.orderId != null and "DESC".equalsIgnoreCase(orderCol.orderId)'>DESC</if>
      ,
      </if>
      <if test="orderCol.containsKey('idCard')">
      a.idCard
      <if test='orderCol.idCard != null and "DESC".equalsIgnoreCase(orderCol.idCard)'>DESC</if>
      ,
      </if>
      <if test="orderCol.containsKey('idName')">
      a.idName
      <if test='orderCol.idName != null and "DESC".equalsIgnoreCase(orderCol.idName)'>DESC</if>
      ,
      </if>
      <if test="orderCol.containsKey('mobile')">
      a.mobile
      <if test='orderCol.mobile != null and "DESC".equalsIgnoreCase(orderCol.mobile)'>DESC</if>
      ,
      </if>
      <if test="orderCol.containsKey('matterId')">
      a.matterId
      <if test='orderCol.matterId != null and "DESC".equalsIgnoreCase(orderCol.matterId)'>DESC</if>
      ,
      </if>
      <if test="orderCol.containsKey('matterName')">
      a.matterName
      <if test='orderCol.matterName != null and "DESC".equalsIgnoreCase(orderCol.matterName)'>DESC</if>
      ,
      </if>
      <if test="orderCol.containsKey('matterCode')">
      a.matterCode
      <if test='orderCol.matterCode != null and "DESC".equalsIgnoreCase(orderCol.matterCode)'>DESC</if>
      ,
      </if>
      <if test="orderCol.containsKey('materialId')">
      a.materialId
      <if test='orderCol.materialId != null and "DESC".equalsIgnoreCase(orderCol.materialId)'>DESC</if>
      ......@@ -972,9 +1002,19 @@
      <if test='orderCol.materialName != null and "DESC".equalsIgnoreCase(orderCol.materialName)'>DESC</if>
      ,
      </if>
      <if test="orderCol.containsKey('page')">
      a.page
      <if test='orderCol.page != null and "DESC".equalsIgnoreCase(orderCol.page)'>DESC</if>
      <if test="orderCol.containsKey('deviceCode')">
      a.deviceCode
      <if test='orderCol.deviceCode != null and "DESC".equalsIgnoreCase(orderCol.deviceCode)'>DESC</if>
      ,
      </if>
      <if test="orderCol.containsKey('deviceName')">
      a.deviceName
      <if test='orderCol.deviceName != null and "DESC".equalsIgnoreCase(orderCol.deviceName)'>DESC</if>
      ,
      </if>
      <if test="orderCol.containsKey('printPage')">
      a.printPage
      <if test='orderCol.printPage != null and "DESC".equalsIgnoreCase(orderCol.printPage)'>DESC</if>
      ,
      </if>
      <if test="orderCol.containsKey('type')">
      ......@@ -1007,46 +1047,6 @@
      <if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if>
      ,
      </if>
      <if test="orderCol.containsKey('idCard')">
      a.idCard
      <if test='orderCol.idCard != null and "DESC".equalsIgnoreCase(orderCol.idCard)'>DESC</if>
      ,
      </if>
      <if test="orderCol.containsKey('idName')">
      a.idName
      <if test='orderCol.idName != null and "DESC".equalsIgnoreCase(orderCol.idName)'>DESC</if>
      ,
      </if>
      <if test="orderCol.containsKey('mobile')">
      a.mobile
      <if test='orderCol.mobile != null and "DESC".equalsIgnoreCase(orderCol.mobile)'>DESC</if>
      ,
      </if>
      <if test="orderCol.containsKey('matterId')">
      a.matterId
      <if test='orderCol.matterId != null and "DESC".equalsIgnoreCase(orderCol.matterId)'>DESC</if>
      ,
      </if>
      <if test="orderCol.containsKey('matterName')">
      a.matterName
      <if test='orderCol.matterName != null and "DESC".equalsIgnoreCase(orderCol.matterName)'>DESC</if>
      ,
      </if>
      <if test="orderCol.containsKey('matterCode')">
      a.matterCode
      <if test='orderCol.matterCode != null and "DESC".equalsIgnoreCase(orderCol.matterCode)'>DESC</if>
      ,
      </if>
      <if test="orderCol.containsKey('deviceCode')">
      a.deviceCode
      <if test='orderCol.deviceCode != null and "DESC".equalsIgnoreCase(orderCol.deviceCode)'>DESC</if>
      ,
      </if>
      <if test="orderCol.containsKey('deviceName')">
      a.deviceName
      <if test='orderCol.deviceName != null and "DESC".equalsIgnoreCase(orderCol.deviceName)'>DESC</if>
      ,
      </if>
      </trim>
      </if>
      </sql>
      ......
      fill-manager/src/test/java/com/mortals/httpclient/matter/MatterDatumPrintController.http
      View file @ 1bf50526
      ......@@ -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
      }
      ......
      Markdown is supported
      0% or
      You are about to add 0 people to the discussion. Proceed with caution.
      Finish editing this message first!
      Please register or to comment