添加应用白名单接口

fill-manager/db/module.sql

@@ -220,26 +220,39 @@ CREATE TABLE mortals_xhx_matter_datum(
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='事项申请材料';
 
 
-
 -- ----------------------------
 -- 打印提交表
 -- ----------------------------
 DROP TABLE IF EXISTS `mortals_xhx_matter_datum_print`;
-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) COMMENT '打印类型(1.本地打印,2.在线打印)',
-    `docPath`      varchar(255) COMMENT '合成doc后地址',
-    `formContent`  mediumtext COMMENT '提交的表单',
-    `createTime`   datetime COMMENT '创建时间',
-    `createUserId` bigint(20) COMMENT '创建用户',
-    `updateTime`   datetime COMMENT '修改时间',
-    PRIMARY KEY (`id`)
+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 '事项编码',
+       `deviceCode` varchar(255)      COMMENT '设备编码',
+       `deviceName` varchar(255)      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='打印提交';
 
 
@@ -254,3 +267,4 @@ CREATE TABLE mortals_xhx_matter_datum_print
 
 
 
+

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

@@ -10,7 +10,7 @@ import com.mortals.xhx.module.matter.model.vo.MatterDatumPrintVo;
  * 打印提交实体对象
  *
  * @author zxfei
- * @date 2022-12-09
+ * @date 2023-02-23
  */
 
 public class MatterDatumPrintEntity extends MatterDatumPrintVo {
@@ -48,6 +48,38 @@ public class MatterDatumPrintEntity extends MatterDatumPrintVo {
      * 提交的表单
      */
     private String formContent;
+    /**
+     * 身份证号
+     */
+    private String idCard;
+    /**
+     * 身份证名称
+     */
+    private String idName;
+    /**
+     * 手机号码
+     */
+    private String mobile;
+    /**
+     * 事项id
+     */
+    private Long matterId;
+    /**
+     * 事项名称
+     */
+    private String matterName;
+    /**
+     * 事项编码
+     */
+    private String matterCode;
+    /**
+     * 设备编码
+     */
+    private String deviceCode;
+    /**
+     * 设备名称
+     */
+    private String deviceName;
 
 
 
@@ -164,6 +196,118 @@ public class MatterDatumPrintEntity extends MatterDatumPrintVo {
     public void setFormContent(String formContent){
         this.formContent = formContent;
     }
+    /**
+     * 获取 身份证号
+     * @return String
+     */
+    public String getIdCard(){
+        return idCard;
+    }
+    /**
+     * 设置 身份证号
+     * @param idCard
+     */
+    public void setIdCard(String idCard){
+        this.idCard = idCard;
+    }
+    /**
+     * 获取 身份证名称
+     * @return String
+     */
+    public String getIdName(){
+        return idName;
+    }
+    /**
+     * 设置 身份证名称
+     * @param idName
+     */
+    public void setIdName(String idName){
+        this.idName = idName;
+    }
+    /**
+     * 获取 手机号码
+     * @return String
+     */
+    public String getMobile(){
+        return mobile;
+    }
+    /**
+     * 设置 手机号码
+     * @param mobile
+     */
+    public void setMobile(String mobile){
+        this.mobile = mobile;
+    }
+    /**
+     * 获取 事项id
+     * @return Long
+     */
+    public Long getMatterId(){
+        return matterId;
+    }
+    /**
+     * 设置 事项id
+     * @param matterId
+     */
+    public void setMatterId(Long matterId){
+        this.matterId = matterId;
+    }
+    /**
+     * 获取 事项名称
+     * @return String
+     */
+    public String getMatterName(){
+        return matterName;
+    }
+    /**
+     * 设置 事项名称
+     * @param matterName
+     */
+    public void setMatterName(String matterName){
+        this.matterName = matterName;
+    }
+    /**
+     * 获取 事项编码
+     * @return String
+     */
+    public String getMatterCode(){
+        return matterCode;
+    }
+    /**
+     * 设置 事项编码
+     * @param matterCode
+     */
+    public void setMatterCode(String matterCode){
+        this.matterCode = matterCode;
+    }
+    /**
+     * 获取 设备编码
+     * @return String
+     */
+    public String getDeviceCode(){
+        return deviceCode;
+    }
+    /**
+     * 设置 设备编码
+     * @param deviceCode
+     */
+    public void setDeviceCode(String deviceCode){
+        this.deviceCode = deviceCode;
+    }
+    /**
+     * 获取 设备名称
+     * @return String
+     */
+    public String getDeviceName(){
+        return deviceName;
+    }
+    /**
+     * 设置 设备名称
+     * @param deviceName
+     */
+    public void setDeviceName(String deviceName){
+        this.deviceName = deviceName;
+    }
 
 
 
@@ -194,6 +338,14 @@ public class MatterDatumPrintEntity extends MatterDatumPrintVo {
         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(",deviceCode:").append(getDeviceCode());
+        sb.append(",deviceName:").append(getDeviceName());
         return sb.toString();
     }
 
@@ -207,12 +359,28 @@ public class MatterDatumPrintEntity extends MatterDatumPrintVo {
 
         this.materialName = null;
 
-        this.page = 0;
+        this.page = null;
 
         this.type = 1;
 
-        this.docPath = "";
+        this.docPath = null;
+
+        this.formContent = null;
+
+        this.idCard = "";
+
+        this.idName = "";
+
+        this.mobile = "";
+
+        this.matterId = null;
+
+        this.matterName = "";
+
+        this.matterCode = "";
+
+        this.deviceCode = "";
 
-        this.formContent = "";
+        this.deviceName = "";
     }
 }
\ No newline at end of file

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

@@ -6,7 +6,7 @@ import com.mortals.xhx.module.matter.model.MatterDatumPrintEntity;
  * 打印提交查询对象
  *
  * @author zxfei
- * @date 2022-12-09
+ * @date 2023-02-23
  */
 public class MatterDatumPrintQuery extends MatterDatumPrintEntity {
     /** 开始 主键，自增长 */
@@ -21,6 +21,9 @@ public class MatterDatumPrintQuery extends MatterDatumPrintEntity {
     /** 主键，自增长列表 */
     private List <Long> idList;
 
+    /** 主键，自增长排除列表 */
+    private List <Long> idNotList;
+
     /** 开始 站点id */
     private Long siteIdStart;
 
@@ -33,9 +36,14 @@ public class MatterDatumPrintQuery extends MatterDatumPrintEntity {
     /** 站点id列表 */
     private List <Long> siteIdList;
 
+    /** 站点id排除列表 */
+    private List <Long> siteIdNotList;
+
     /** 打印订单 */
     private List<String> orderIdList;
 
+    /** 打印订单排除列表 */
+    private List <String> orderIdNotList;
     /** 开始 材料Id */
     private Long materialIdStart;
 
@@ -48,9 +56,14 @@ public class MatterDatumPrintQuery extends MatterDatumPrintEntity {
     /** 材料Id列表 */
     private List <Long> materialIdList;
 
+    /** 材料Id排除列表 */
+    private List <Long> materialIdNotList;
+
     /** 材料名 */
     private List<String> materialNameList;
 
+    /** 材料名排除列表 */
+    private List <String> materialNameNotList;
     /** 开始 材料页数 */
     private Integer pageStart;
 
@@ -63,6 +76,9 @@ public class MatterDatumPrintQuery extends MatterDatumPrintEntity {
     /** 材料页数列表 */
     private List <Integer> pageList;
 
+    /** 材料页数排除列表 */
+    private List <Integer> pageNotList;
+
     /** 开始 打印类型(1.本地打印,2.在线打印) */
     private Integer typeStart;
 
@@ -75,12 +91,19 @@ public class MatterDatumPrintQuery extends MatterDatumPrintEntity {
     /** 打印类型(1.本地打印,2.在线打印)列表 */
     private List <Integer> typeList;
 
+    /** 打印类型(1.本地打印,2.在线打印)排除列表 */
+    private List <Integer> typeNotList;
+
     /** 合成doc后地址 */
     private List<String> docPathList;
 
+    /** 合成doc后地址排除列表 */
+    private List <String> docPathNotList;
     /** 提交的表单 */
     private List<String> formContentList;
 
+    /** 提交的表单排除列表 */
+    private List <String> formContentNotList;
     /** 开始 创建时间 */
     private String createTimeStart;
 
@@ -99,12 +122,65 @@ public class MatterDatumPrintQuery extends MatterDatumPrintEntity {
     /** 创建用户列表 */
     private List <Long> createUserIdList;
 
+    /** 创建用户排除列表 */
+    private List <Long> createUserIdNotList;
+
     /** 开始 修改时间 */
     private String updateTimeStart;
 
     /** 结束 修改时间 */
     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;
 
@@ -177,6 +253,23 @@ public class MatterDatumPrintQuery extends MatterDatumPrintEntity {
         this.idList = idList;
     }
 
+    /**
+     * 获取 主键，自增长
+     * @return idNotList
+     */
+    public List<Long> getIdNotList(){
+        return this.idNotList;
+    }
+
+    /**
+     * 设置 主键，自增长
+     * @param idNotList
+     */
+    public void setIdNotList(List<Long> idNotList){
+        this.idNotList = idNotList;
+    }
+
+
     /**
      * 获取 开始 站点id
      * @return siteIdStart
@@ -241,6 +334,23 @@ public class MatterDatumPrintQuery extends MatterDatumPrintEntity {
         this.siteIdList = siteIdList;
     }
 
+    /**
+     * 获取 站点id
+     * @return siteIdNotList
+     */
+    public List<Long> getSiteIdNotList(){
+        return this.siteIdNotList;
+    }
+
+    /**
+     * 设置 站点id
+     * @param siteIdNotList
+     */
+    public void setSiteIdNotList(List<Long> siteIdNotList){
+        this.siteIdNotList = siteIdNotList;
+    }
+
+
     /**
      * 获取 打印订单
      * @return orderIdList
@@ -256,6 +366,23 @@ public class MatterDatumPrintQuery extends MatterDatumPrintEntity {
     public void setOrderIdList(List<String> orderIdList){
         this.orderIdList = orderIdList;
     }
+
+    /**
+     * 获取 打印订单
+     * @return orderIdNotList
+     */
+    public List<String> getOrderIdNotList(){
+        return this.orderIdNotList;
+    }
+
+    /**
+     * 设置 打印订单
+     * @param orderIdNotList
+     */
+    public void setOrderIdNotList(List<String> orderIdNotList){
+        this.orderIdNotList = orderIdNotList;
+    }
+
     /**
      * 获取 开始 材料Id
      * @return materialIdStart
@@ -320,6 +447,23 @@ public class MatterDatumPrintQuery extends MatterDatumPrintEntity {
         this.materialIdList = materialIdList;
     }
 
+    /**
+     * 获取 材料Id
+     * @return materialIdNotList
+     */
+    public List<Long> getMaterialIdNotList(){
+        return this.materialIdNotList;
+    }
+
+    /**
+     * 设置 材料Id
+     * @param materialIdNotList
+     */
+    public void setMaterialIdNotList(List<Long> materialIdNotList){
+        this.materialIdNotList = materialIdNotList;
+    }
+
+
     /**
      * 获取 材料名
      * @return materialNameList
@@ -335,6 +479,23 @@ public class MatterDatumPrintQuery extends MatterDatumPrintEntity {
     public void setMaterialNameList(List<String> materialNameList){
         this.materialNameList = materialNameList;
     }
+
+    /**
+     * 获取 材料名
+     * @return materialNameNotList
+     */
+    public List<String> getMaterialNameNotList(){
+        return this.materialNameNotList;
+    }
+
+    /**
+     * 设置 材料名
+     * @param materialNameNotList
+     */
+    public void setMaterialNameNotList(List<String> materialNameNotList){
+        this.materialNameNotList = materialNameNotList;
+    }
+
     /**
      * 获取 开始 材料页数
      * @return pageStart
@@ -399,6 +560,23 @@ public class MatterDatumPrintQuery extends MatterDatumPrintEntity {
         this.pageList = pageList;
     }
 
+    /**
+     * 获取 材料页数
+     * @return pageNotList
+     */
+    public List<Integer> getPageNotList(){
+        return this.pageNotList;
+    }
+
+    /**
+     * 设置 材料页数
+     * @param pageNotList
+     */
+    public void setPageNotList(List<Integer> pageNotList){
+        this.pageNotList = pageNotList;
+    }
+
+
     /**
      * 获取 开始 打印类型(1.本地打印,2.在线打印)
      * @return typeStart
@@ -463,6 +641,23 @@ public class MatterDatumPrintQuery extends MatterDatumPrintEntity {
         this.typeList = typeList;
     }
 
+    /**
+     * 获取 打印类型(1.本地打印,2.在线打印)
+     * @return typeNotList
+     */
+    public List<Integer> getTypeNotList(){
+        return this.typeNotList;
+    }
+
+    /**
+     * 设置 打印类型(1.本地打印,2.在线打印)
+     * @param typeNotList
+     */
+    public void setTypeNotList(List<Integer> typeNotList){
+        this.typeNotList = typeNotList;
+    }
+
+
     /**
      * 获取 合成doc后地址
      * @return docPathList
@@ -478,6 +673,23 @@ public class MatterDatumPrintQuery extends MatterDatumPrintEntity {
     public void setDocPathList(List<String> docPathList){
         this.docPathList = docPathList;
     }
+
+    /**
+     * 获取 合成doc后地址
+     * @return docPathNotList
+     */
+    public List<String> getDocPathNotList(){
+        return this.docPathNotList;
+    }
+
+    /**
+     * 设置 合成doc后地址
+     * @param docPathNotList
+     */
+    public void setDocPathNotList(List<String> docPathNotList){
+        this.docPathNotList = docPathNotList;
+    }
+
     /**
      * 获取 提交的表单
      * @return formContentList
@@ -493,6 +705,23 @@ public class MatterDatumPrintQuery extends MatterDatumPrintEntity {
     public void setFormContentList(List<String> formContentList){
         this.formContentList = formContentList;
     }
+
+    /**
+     * 获取 提交的表单
+     * @return formContentNotList
+     */
+    public List<String> getFormContentNotList(){
+        return this.formContentNotList;
+    }
+
+    /**
+     * 设置 提交的表单
+     * @param formContentNotList
+     */
+    public void setFormContentNotList(List<String> formContentNotList){
+        this.formContentNotList = formContentNotList;
+    }
+
     /**
      * 获取 开始 创建时间
      * @return createTimeStart
@@ -589,6 +818,23 @@ public class MatterDatumPrintQuery extends MatterDatumPrintEntity {
         this.createUserIdList = createUserIdList;
     }
 
+    /**
+     * 获取 创建用户
+     * @return createUserIdNotList
+     */
+    public List<Long> getCreateUserIdNotList(){
+        return this.createUserIdNotList;
+    }
+
+    /**
+     * 设置 创建用户
+     * @param createUserIdNotList
+     */
+    public void setCreateUserIdNotList(List<Long> createUserIdNotList){
+        this.createUserIdNotList = createUserIdNotList;
+    }
+
+
     /**
      * 获取 开始 修改时间
      * @return updateTimeStart
@@ -621,6 +867,311 @@ public class MatterDatumPrintQuery extends MatterDatumPrintEntity {
         this.updateTimeEnd = updateTimeEnd;
     }
 
+    /**
+     * 获取 身份证号
+     * @return idCardList
+     */
+    public List<String> getIdCardList(){
+        return this.idCardList;
+    }
+
+    /**
+     * 设置 身份证号
+     * @param idCardList
+     */
+    public void setIdCardList(List<String> idCardList){
+        this.idCardList = idCardList;
+    }
+
+    /**
+     * 获取 身份证号
+     * @return idCardNotList
+     */
+    public List<String> getIdCardNotList(){
+        return this.idCardNotList;
+    }
+
+    /**
+     * 设置 身份证号
+     * @param idCardNotList
+     */
+    public void setIdCardNotList(List<String> idCardNotList){
+        this.idCardNotList = idCardNotList;
+    }
+
+    /**
+     * 获取 身份证名称
+     * @return idNameList
+     */
+    public List<String> getIdNameList(){
+        return this.idNameList;
+    }
+
+    /**
+     * 设置 身份证名称
+     * @param idNameList
+     */
+    public void setIdNameList(List<String> idNameList){
+        this.idNameList = idNameList;
+    }
+
+    /**
+     * 获取 身份证名称
+     * @return idNameNotList
+     */
+    public List<String> getIdNameNotList(){
+        return this.idNameNotList;
+    }
+
+    /**
+     * 设置 身份证名称
+     * @param idNameNotList
+     */
+    public void setIdNameNotList(List<String> idNameNotList){
+        this.idNameNotList = idNameNotList;
+    }
+
+    /**
+     * 获取 手机号码
+     * @return mobileList
+     */
+    public List<String> getMobileList(){
+        return this.mobileList;
+    }
+
+    /**
+     * 设置 手机号码
+     * @param mobileList
+     */
+    public void setMobileList(List<String> mobileList){
+        this.mobileList = mobileList;
+    }
+
+    /**
+     * 获取 手机号码
+     * @return mobileNotList
+     */
+    public List<String> getMobileNotList(){
+        return this.mobileNotList;
+    }
+
+    /**
+     * 设置 手机号码
+     * @param mobileNotList
+     */
+    public void setMobileNotList(List<String> mobileNotList){
+        this.mobileNotList = mobileNotList;
+    }
+
+    /**
+     * 获取 开始 事项id
+     * @return matterIdStart
+     */
+    public Long getMatterIdStart(){
+        return this.matterIdStart;
+    }
+
+    /**
+     * 设置 开始 事项id
+     * @param matterIdStart
+     */
+    public void setMatterIdStart(Long matterIdStart){
+        this.matterIdStart = matterIdStart;
+    }
+
+    /**
+     * 获取 结束 事项id
+     * @return $matterIdEnd
+     */
+    public Long getMatterIdEnd(){
+        return this.matterIdEnd;
+    }
+
+    /**
+     * 设置 结束 事项id
+     * @param matterIdEnd
+     */
+    public void setMatterIdEnd(Long matterIdEnd){
+        this.matterIdEnd = matterIdEnd;
+    }
+
+    /**
+     * 获取 增加 事项id
+     * @return matterIdIncrement
+     */
+    public Long getMatterIdIncrement(){
+        return this.matterIdIncrement;
+    }
+
+    /**
+     * 设置 增加 事项id
+     * @param matterIdIncrement
+     */
+    public void setMatterIdIncrement(Long matterIdIncrement){
+        this.matterIdIncrement = matterIdIncrement;
+    }
+
+    /**
+     * 获取 事项id
+     * @return matterIdList
+     */
+    public List<Long> getMatterIdList(){
+        return this.matterIdList;
+    }
+
+    /**
+     * 设置 事项id
+     * @param matterIdList
+     */
+    public void setMatterIdList(List<Long> matterIdList){
+        this.matterIdList = matterIdList;
+    }
+
+    /**
+     * 获取 事项id
+     * @return matterIdNotList
+     */
+    public List<Long> getMatterIdNotList(){
+        return this.matterIdNotList;
+    }
+
+    /**
+     * 设置 事项id
+     * @param matterIdNotList
+     */
+    public void setMatterIdNotList(List<Long> matterIdNotList){
+        this.matterIdNotList = matterIdNotList;
+    }
+
+
+    /**
+     * 获取 事项名称
+     * @return matterNameList
+     */
+    public List<String> getMatterNameList(){
+        return this.matterNameList;
+    }
+
+    /**
+     * 设置 事项名称
+     * @param matterNameList
+     */
+    public void setMatterNameList(List<String> matterNameList){
+        this.matterNameList = matterNameList;
+    }
+
+    /**
+     * 获取 事项名称
+     * @return matterNameNotList
+     */
+    public List<String> getMatterNameNotList(){
+        return this.matterNameNotList;
+    }
+
+    /**
+     * 设置 事项名称
+     * @param matterNameNotList
+     */
+    public void setMatterNameNotList(List<String> matterNameNotList){
+        this.matterNameNotList = matterNameNotList;
+    }
+
+    /**
+     * 获取 事项编码
+     * @return matterCodeList
+     */
+    public List<String> getMatterCodeList(){
+        return this.matterCodeList;
+    }
+
+    /**
+     * 设置 事项编码
+     * @param matterCodeList
+     */
+    public void setMatterCodeList(List<String> matterCodeList){
+        this.matterCodeList = matterCodeList;
+    }
+
+    /**
+     * 获取 事项编码
+     * @return matterCodeNotList
+     */
+    public List<String> getMatterCodeNotList(){
+        return this.matterCodeNotList;
+    }
+
+    /**
+     * 设置 事项编码
+     * @param matterCodeNotList
+     */
+    public void setMatterCodeNotList(List<String> matterCodeNotList){
+        this.matterCodeNotList = matterCodeNotList;
+    }
+
+    /**
+     * 获取 设备编码
+     * @return deviceCodeList
+     */
+    public List<String> getDeviceCodeList(){
+        return this.deviceCodeList;
+    }
+
+    /**
+     * 设置 设备编码
+     * @param deviceCodeList
+     */
+    public void setDeviceCodeList(List<String> deviceCodeList){
+        this.deviceCodeList = deviceCodeList;
+    }
+
+    /**
+     * 获取 设备编码
+     * @return deviceCodeNotList
+     */
+    public List<String> getDeviceCodeNotList(){
+        return this.deviceCodeNotList;
+    }
+
+    /**
+     * 设置 设备编码
+     * @param deviceCodeNotList
+     */
+    public void setDeviceCodeNotList(List<String> deviceCodeNotList){
+        this.deviceCodeNotList = deviceCodeNotList;
+    }
+
+    /**
+     * 获取 设备名称
+     * @return deviceNameList
+     */
+    public List<String> getDeviceNameList(){
+        return this.deviceNameList;
+    }
+
+    /**
+     * 设置 设备名称
+     * @param deviceNameList
+     */
+    public void setDeviceNameList(List<String> deviceNameList){
+        this.deviceNameList = deviceNameList;
+    }
+
+    /**
+     * 获取 设备名称
+     * @return deviceNameNotList
+     */
+    public List<String> getDeviceNameNotList(){
+        return this.deviceNameNotList;
+    }
+
+    /**
+     * 设置 设备名称
+     * @param deviceNameNotList
+     */
+    public void setDeviceNameNotList(List<String> deviceNameNotList){
+        this.deviceNameNotList = deviceNameNotList;
+    }
+
     /**
      * 设置  主键，自增长
      * @param id
@@ -666,6 +1217,15 @@ public class MatterDatumPrintQuery extends MatterDatumPrintEntity {
         return this;
     }
 
+    /**
+     * 设置 主键，自增长
+     * @param idNotList
+     */
+    public MatterDatumPrintQuery idNotList(List<Long> idNotList){
+        this.idNotList = idNotList;
+        return this;
+    }
+
     /**
      * 设置  站点id
      * @param siteId
@@ -711,6 +1271,15 @@ public class MatterDatumPrintQuery extends MatterDatumPrintEntity {
         return this;
     }
 
+    /**
+     * 设置 站点id
+     * @param siteIdNotList
+     */
+    public MatterDatumPrintQuery siteIdNotList(List<Long> siteIdNotList){
+        this.siteIdNotList = siteIdNotList;
+        return this;
+    }
+
 
     /**
      * 设置 打印订单
@@ -775,6 +1344,15 @@ public class MatterDatumPrintQuery extends MatterDatumPrintEntity {
         return this;
     }
 
+    /**
+     * 设置 材料Id
+     * @param materialIdNotList
+     */
+    public MatterDatumPrintQuery materialIdNotList(List<Long> materialIdNotList){
+        this.materialIdNotList = materialIdNotList;
+        return this;
+    }
+
 
     /**
      * 设置 材料名
@@ -839,6 +1417,15 @@ public class MatterDatumPrintQuery extends MatterDatumPrintEntity {
         return this;
     }
 
+    /**
+     * 设置 材料页数
+     * @param pageNotList
+     */
+    public MatterDatumPrintQuery pageNotList(List<Integer> pageNotList){
+        this.pageNotList = pageNotList;
+        return this;
+    }
+
     /**
      * 设置  打印类型(1.本地打印,2.在线打印)
      * @param type
@@ -884,6 +1471,15 @@ public class MatterDatumPrintQuery extends MatterDatumPrintEntity {
         return this;
     }
 
+    /**
+     * 设置 打印类型(1.本地打印,2.在线打印)
+     * @param typeNotList
+     */
+    public MatterDatumPrintQuery typeNotList(List<Integer> typeNotList){
+        this.typeNotList = typeNotList;
+        return this;
+    }
+
 
     /**
      * 设置 合成doc后地址
@@ -968,6 +1564,202 @@ public class MatterDatumPrintQuery extends MatterDatumPrintEntity {
         return this;
     }
 
+    /**
+     * 设置 创建用户
+     * @param createUserIdNotList
+     */
+    public MatterDatumPrintQuery createUserIdNotList(List<Long> createUserIdNotList){
+        this.createUserIdNotList = createUserIdNotList;
+        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;
+    }
+
+    /**
+     * 设置 事项名称
+     * @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)

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

 package com.mortals.xhx.module.matter.service.impl;
+
 import com.mortals.xhx.base.system.upload.service.UploadService;
 import com.mortals.xhx.common.utils.WordUtil;
 import com.mortals.xhx.module.matter.model.MatterDatumEntity;
 import com.mortals.xhx.module.matter.service.MatterDatumService;
+import com.mortals.xhx.module.matter.service.MatterService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
@@ -12,28 +14,41 @@ import com.mortals.framework.model.Context;
 import com.mortals.xhx.module.matter.dao.MatterDatumPrintDao;
 import com.mortals.xhx.module.matter.model.MatterDatumPrintEntity;
 import com.mortals.xhx.module.matter.service.MatterDatumPrintService;
+import org.springframework.util.ObjectUtils;
+
 /**
-* MatterDatumPrintService
-* 打印提交 service实现
-*
-* @author zxfei
-* @date 2022-12-09
-*/
+ * MatterDatumPrintService
+ * 打印提交 service实现
+ *
+ * @author zxfei
+ * @date 2022-12-09
+ */
 @Service("matterDatumPrintService")
 public class MatterDatumPrintServiceImpl extends AbstractCRUDServiceImpl<MatterDatumPrintDao, MatterDatumPrintEntity, Long> implements MatterDatumPrintService {
 
     @Autowired
     private UploadService uploadService;
+    @Autowired
+    private MatterService matterService;
+    @Autowired
+    private MatterDatumService matterDatumService;
 
     @Value("${upload.path}")
     private String filePath;
+
     @Override
     protected void saveBefore(MatterDatumPrintEntity entity, Context context) throws AppException {
-       // MatterDatumEntity matterDatumEntity = matterDatumService.get(entity.getMaterialId());
+        // MatterDatumEntity matterDatumEntity = matterDatumService.get(entity.getMaterialId());
+        if (!ObjectUtils.isEmpty(entity.getMaterialId())) {
+            MatterDatumEntity matterDatumEntity = matterDatumService.get(entity.getMaterialId());
+            if (!ObjectUtils.isEmpty(matterDatumEntity)) {
+                entity.setMatterId(matterDatumEntity.getMatterId());
+                entity.setMatterName(matterDatumEntity.getMatterName());
+            }
+        }
 
         String rootPath = this.filePath.endsWith("/") ? this.filePath : this.filePath + "/";
-
-        Integer pageByDoc = WordUtil.getPageByDoc(rootPath+entity.getDocPath());
+        Integer pageByDoc = WordUtil.getPageByDoc(rootPath + entity.getDocPath());
         entity.setPage(pageByDoc);
         super.saveBefore(entity, context);
     }

fill-manager/src/main/resources/sqlmap/module/matter/MatterDatumPrintMapper.xml

@@ -17,6 +17,14 @@
         <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="deviceCode" column="deviceCode" />
+        <result property="deviceName" column="deviceName" />
 
     </resultMap>
 
@@ -60,23 +68,47 @@
             <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)
+        (siteId,orderId,materialId,materialName,page,type,docPath,formContent,createTime,createUserId,updateTime,idCard,idName,mobile,matterId,matterName,matterCode,deviceCode,deviceName)
         VALUES
-        (#{siteId},#{orderId},#{materialId},#{materialName},#{page},#{type},#{docPath},#{formContent},#{createTime},#{createUserId},#{updateTime})
+        (#{siteId},#{orderId},#{materialId},#{materialName},#{page},#{type},#{docPath},#{formContent},#{createTime},#{createUserId},#{updateTime},#{idCard},#{idName},#{mobile},#{matterId},#{matterName},#{matterCode},#{deviceCode},#{deviceName})
     </insert>
 
     <!-- 批量新增 -->
     <insert id="insertBatch" parameterType="paramDto">
         insert into mortals_xhx_matter_datum_print
-        (siteId,orderId,materialId,materialName,page,type,docPath,formContent,createTime,createUserId,updateTime)
+        (siteId,orderId,materialId,materialName,page,type,docPath,formContent,createTime,createUserId,updateTime,idCard,idName,mobile,matterId,matterName,matterCode,deviceCode,deviceName)
         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.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})
         </foreach>
     </insert>
 
@@ -134,6 +166,33 @@
             <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
@@ -248,6 +307,67 @@
                     </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=")">
@@ -378,6 +498,12 @@
                 #{item}
             </foreach>
         </if>
+        <if test="conditionParamRef.containsKey('idNotList')">
+            ${_conditionType_} a.id not in
+            <foreach collection="conditionParamRef.idNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
         <if test="conditionParamRef.containsKey('idStart') and conditionParamRef.idStart != null">
             ${_conditionType_} a.id <![CDATA[ >= ]]> #{${_conditionParam_}.idStart}
         </if>
@@ -399,6 +525,12 @@
                 #{item}
             </foreach>
         </if>
+        <if test="conditionParamRef.containsKey('siteIdNotList')">
+            ${_conditionType_} a.siteId not in
+            <foreach collection="conditionParamRef.siteIdNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
         <if test="conditionParamRef.containsKey('siteIdStart') and conditionParamRef.siteIdStart != null">
             ${_conditionType_} a.siteId <![CDATA[ >= ]]> #{${_conditionParam_}.siteIdStart}
         </if>
@@ -421,6 +553,12 @@
                 #{item}
             </foreach>
         </if>
+        <if test="conditionParamRef.containsKey('orderIdNotList')">
+            ${_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}
@@ -435,6 +573,12 @@
                 #{item}
             </foreach>
         </if>
+        <if test="conditionParamRef.containsKey('materialIdNotList')">
+            ${_conditionType_} a.materialId not in
+            <foreach collection="conditionParamRef.materialIdNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
         <if test="conditionParamRef.containsKey('materialIdStart') and conditionParamRef.materialIdStart != null">
             ${_conditionType_} a.materialId <![CDATA[ >= ]]> #{${_conditionParam_}.materialIdStart}
         </if>
@@ -457,6 +601,12 @@
                 #{item}
             </foreach>
         </if>
+        <if test="conditionParamRef.containsKey('materialNameNotList')">
+            ${_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}
@@ -471,6 +621,12 @@
                 #{item}
             </foreach>
         </if>
+        <if test="conditionParamRef.containsKey('pageNotList')">
+            ${_conditionType_} a.page not in
+            <foreach collection="conditionParamRef.pageNotList" 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>
@@ -492,6 +648,12 @@
                 #{item}
             </foreach>
         </if>
+        <if test="conditionParamRef.containsKey('typeNotList')">
+            ${_conditionType_} a.type not in
+            <foreach collection="conditionParamRef.typeNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
         <if test="conditionParamRef.containsKey('typeStart') and conditionParamRef.typeStart != null">
             ${_conditionType_} a.type <![CDATA[ >= ]]> #{${_conditionParam_}.typeStart}
         </if>
@@ -514,6 +676,12 @@
                 #{item}
             </foreach>
         </if>
+        <if test="conditionParamRef.containsKey('docPathNotList')">
+            ${_conditionType_} a.docPath not in
+            <foreach collection="conditionParamRef.docPathNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
 
         <if test="conditionParamRef.containsKey('formContent')">
             <if test="conditionParamRef.formContent != null and conditionParamRef.formContent != ''">
@@ -529,6 +697,12 @@
                 #{item}
             </foreach>
         </if>
+        <if test="conditionParamRef.containsKey('formContentNotList')">
+            ${_conditionType_} a.formContent not in
+            <foreach collection="conditionParamRef.formContentNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
 
         <if test="conditionParamRef.containsKey('createTime')">
             <if test="conditionParamRef.createTime != null ">
@@ -558,6 +732,12 @@
                 #{item}
             </foreach>
         </if>
+        <if test="conditionParamRef.containsKey('createUserIdNotList')">
+            ${_conditionType_} a.createUserId not in
+            <foreach collection="conditionParamRef.createUserIdNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
         <if test="conditionParamRef.containsKey('createUserIdStart') and conditionParamRef.createUserIdStart != null">
             ${_conditionType_} a.createUserId <![CDATA[ >= ]]> #{${_conditionParam_}.createUserIdStart}
         </if>
@@ -580,6 +760,180 @@
         <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()">
@@ -653,6 +1007,46 @@
                     <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>