电子表单小程序相关接口

fill-manager/src/main/java/com/mortals/xhx/common/utils/AESUtil.java

+package com.mortals.xhx.common.utils;
+
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.util.Base64Utils;
+
+import javax.crypto.Cipher;
+import javax.crypto.spec.IvParameterSpec;
+import javax.crypto.spec.SecretKeySpec;
+
+/**
+ * AES加密工具类
+ *
+ */
+public class AESUtil {
+    /**
+     * 日志相关
+     */
+    private static final Logger LOGGER = LoggerFactory.getLogger(AESUtil.class);
+    /**
+     * 编码
+     */
+    private static final String ENCODING = "UTF-8";
+    /**
+     * 算法定义
+     */
+    private static final String AES_ALGORITHM = "AES";
+    /**
+     * 指定填充方式
+     */
+    private static final String CIPHER_PADDING = "AES/ECB/PKCS5Padding";
+    private static final String CIPHER_CBC_PADDING = "AES/CBC/PKCS5Padding";
+    /**
+     * 偏移量(CBC中使用，增强加密算法强度)
+     */
+    private static final String IV_SEED = "tdrdadq59tbss5n7";
+
+    /**
+     * AES加密
+     * @param content 待加密内容
+     * @param aesKey  密码
+     * @return
+     */
+    public static String encrypt(String content, String aesKey){
+        if(StringUtils.isBlank(content)){
+            LOGGER.info("AES encrypt: the content is null!");
+            return null;
+        }
+        //判断秘钥是否为16位
+        if(StringUtils.isNotBlank(aesKey) && aesKey.length() == 16){
+            try {
+                //对密码进行编码
+                byte[] bytes = aesKey.getBytes(ENCODING);
+                //设置加密算法，生成秘钥
+                SecretKeySpec skeySpec = new SecretKeySpec(bytes, AES_ALGORITHM);
+                // "算法/模式/补码方式"
+                Cipher cipher = Cipher.getInstance(CIPHER_PADDING);
+                //选择加密
+                cipher.init(Cipher.ENCRYPT_MODE, skeySpec);
+                //根据待加密内容生成字节数组
+                byte[] encrypted = cipher.doFinal(content.getBytes(ENCODING));
+                //返回base64字符串
+                return Base64Utils.encodeToString(encrypted);
+            } catch (Exception e) {
+                LOGGER.info("AES encrypt exception:" + e.getMessage());
+                throw new RuntimeException(e);
+            }
+
+        }else {
+            LOGGER.info("AES encrypt: the aesKey is null or error!");
+            return null;
+        }
+    }
+
+    /**
+     * 解密
+     *
+     * @param content 待解密内容
+     * @param aesKey  密码
+     * @return
+     */
+    public static String decrypt(String content, String aesKey){
+        if(StringUtils.isBlank(content)){
+            LOGGER.info("AES decrypt: the content is null!");
+            return null;
+        }
+        //判断秘钥是否为16位
+        if(StringUtils.isNotBlank(aesKey) && aesKey.length() == 16){
+            try {
+                //对密码进行编码
+                byte[] bytes = aesKey.getBytes(ENCODING);
+                //设置解密算法，生成秘钥
+                SecretKeySpec skeySpec = new SecretKeySpec(bytes, AES_ALGORITHM);
+                // "算法/模式/补码方式"
+                Cipher cipher = Cipher.getInstance(CIPHER_PADDING);
+                //选择解密
+                cipher.init(Cipher.DECRYPT_MODE, skeySpec);
+
+                //先进行Base64解码
+                byte[] decodeBase64 = Base64Utils.decodeFromString(content);
+
+                //根据待解密内容进行解密
+                byte[] decrypted = cipher.doFinal(decodeBase64);
+                //将字节数组转成字符串
+                return new String(decrypted, ENCODING);
+            } catch (Exception e) {
+                LOGGER.info("AES decrypt exception:" + e.getMessage());
+                throw new RuntimeException(e);
+            }
+
+        }else {
+            LOGGER.info("AES decrypt: the aesKey is null or error!");
+            return null;
+        }
+    }
+
+    /**
+     * AES_CBC加密
+     *
+     * @param content 待加密内容
+     * @param aesKey  密码
+     * @return
+     */
+    public static String encryptCBC(String content, String aesKey){
+        if(StringUtils.isBlank(content)){
+            LOGGER.info("AES_CBC encrypt: the content is null!");
+            return null;
+        }
+        //判断秘钥是否为16位
+        if(StringUtils.isNotBlank(aesKey) && aesKey.length() == 16){
+            try {
+                //对密码进行编码
+                byte[] bytes = aesKey.getBytes(ENCODING);
+                //设置加密算法，生成秘钥
+                SecretKeySpec skeySpec = new SecretKeySpec(bytes, AES_ALGORITHM);
+                // "算法/模式/补码方式"
+                Cipher cipher = Cipher.getInstance(CIPHER_CBC_PADDING);
+                //偏移
+                IvParameterSpec iv = new IvParameterSpec(IV_SEED.getBytes(ENCODING));
+                //选择加密
+                cipher.init(Cipher.ENCRYPT_MODE, skeySpec, iv);
+                //根据待加密内容生成字节数组
+                byte[] encrypted = cipher.doFinal(content.getBytes(ENCODING));
+                //返回base64字符串
+                return Base64Utils.encodeToString(encrypted);
+            } catch (Exception e) {
+                LOGGER.info("AES_CBC encrypt exception:" + e.getMessage());
+                throw new RuntimeException(e);
+            }
+
+        }else {
+            LOGGER.info("AES_CBC encrypt: the aesKey is null or error!");
+            return null;
+        }
+    }
+
+    /**
+     * AES_CBC解密
+     *
+     * @param content 待解密内容
+     * @param aesKey  密码
+     * @return
+     */
+    public static String decryptCBC(String content, String aesKey){
+        if(StringUtils.isBlank(content)){
+            LOGGER.info("AES_CBC decrypt: the content is null!");
+            return null;
+        }
+        //判断秘钥是否为16位
+        if(StringUtils.isNotBlank(aesKey) && aesKey.length() == 16){
+            try {
+                //对密码进行编码
+                byte[] bytes = aesKey.getBytes(ENCODING);
+                //设置解密算法，生成秘钥
+                SecretKeySpec skeySpec = new SecretKeySpec(bytes, AES_ALGORITHM);
+                //偏移
+                IvParameterSpec iv = new IvParameterSpec(IV_SEED.getBytes(ENCODING));
+                // "算法/模式/补码方式"
+                Cipher cipher = Cipher.getInstance(CIPHER_CBC_PADDING);
+                //选择解密
+                cipher.init(Cipher.DECRYPT_MODE, skeySpec, iv);
+
+                //先进行Base64解码
+                byte[] decodeBase64 = Base64Utils.decodeFromString(content);
+
+                //根据待解密内容进行解密
+                byte[] decrypted = cipher.doFinal(decodeBase64);
+                //将字节数组转成字符串
+                return new String(decrypted, ENCODING);
+            } catch (Exception e) {
+                LOGGER.info("AES_CBC decrypt exception:" + e.getMessage());
+                throw new RuntimeException(e);
+            }
+
+        }else {
+            LOGGER.info("AES_CBC decrypt: the aesKey is null or error!");
+            return null;
+        }
+    }
+
+    public static void main(String[] args) {
+        // AES支持三种长度的密钥：128位、192位、256位。
+        // 代码中这种就是128位的加密密钥，16字节 * 8位/字节 = 128位。
+        String random = "0000000671595991";
+//        System.out.println("随机key:" + random);
+//        System.out.println();
+//
+//        System.out.println("---------加密---------");
+//        String aesResult = encrypt("511181198903042414", random);
+//        System.out.println("aes加密结果:" + aesResult);
+//        System.out.println();
+//
+//        System.out.println("---------解密---------");
+//        String decrypt = decrypt(aesResult, random);
+//        System.out.println("aes解密结果:" + decrypt);
+//        System.out.println();
+//
+//
+        System.out.println("--------AES_CBC加密解密---------");
+        String cbcResult = encryptCBC("511181198903042414", random);
+        System.out.println("aes_cbc加密结果:" + cbcResult);
+        System.out.println(cbcResult);
+        System.out.println("R2tB6mi08cAZytixt0nANWQJxrr4pwpjsBVpQ82I4JM=");
+
+        System.out.println("---------解密CBC---------");
+        String cbcDecrypt = decryptCBC("R2tB6mi08cAZytixt0nANWQJxrr4pwpjsBVpQ82I4JM=", random);
+        System.out.println("aes解密结果:" + cbcDecrypt);
+
+        System.out.println();
+
+    }
+}
+

fill-manager/src/main/java/com/mortals/xhx/common/utils/WXCreateQRCodeUtil.java

+package com.mortals.xhx.common.utils;
+
+import cn.hutool.http.HttpRequest;
+import cn.hutool.http.HttpResponse;
+import cn.hutool.http.HttpUtil;
+import com.alibaba.fastjson.JSONObject;
+import lombok.extern.slf4j.Slf4j;
+
+import javax.imageio.ImageIO;
+import java.awt.image.BufferedImage;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.nio.Buffer;
+import java.nio.ByteBuffer;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.nio.file.StandardOpenOption;
+import java.util.HashMap;
+import java.util.Locale;
+
+/**
+ * 微信扫码二维码生成器
+ */
+@Slf4j
+public class WXCreateQRCodeUtil {
+
+    private static String ACCESS_TOKEN = "access_token";
+    private static String ACCESS_TOKEN_URL = "https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid=%s&secret=%s";
+    private static String CREATE_QRCODE_URL = "https://api.weixin.qq.com/cgi-bin/wxaapp/createwxaqrcode?access_token=%s";
+
+    /***
+     *
+     * @param path
+     * @param appID
+     * @param appSecret
+     * @param qRCodeFilePath
+     */
+    public static String createWeiXinQRCode(String path,String appID,String appSecret,String qRCodeFilePath){
+
+        String accessTokenUrl = String.format(ACCESS_TOKEN_URL,appID,appSecret);
+        try {
+            String rsp = HttpUtil.get(accessTokenUrl,new HashMap<>());
+//            System.out.println("获取token:");
+//            System.out.println(rsp);
+            JSONObject jsonObject = JSONObject.parseObject(rsp);
+            if(jsonObject.containsKey(ACCESS_TOKEN)){
+                String accessToken = jsonObject.getString(ACCESS_TOKEN);
+                String createwxaqrcode = String.format(CREATE_QRCODE_URL,accessToken);
+                HashMap<String, Object> paramsMap = new HashMap<>();
+                paramsMap.put("path",path);
+                paramsMap.put("width",430);
+                HttpResponse response = HttpRequest.post(createwxaqrcode).body(JSONObject.toJSONString(paramsMap)).execute();
+                // 获取响应状态码
+                int status = response.getStatus();
+                if(status==200) {
+                    // 获取响应的字节流
+                    InputStream inputStream = response.bodyStream();
+                    saveImageFromInputStream(inputStream, qRCodeFilePath);
+                    return qRCodeFilePath;
+                }else {
+                    log.info("请求微信二维码创建失败，失败响应:{}",response.body());
+                    return null;
+                }
+            }else {
+                log.info("获取微信ACCESS_TOKEN失败");
+                return null;
+            }
+        }catch (Exception e){
+            log.info("创建二维码发生异常:{}",e.getMessage());
+            return null;
+        }
+    }
+
+    public static void saveImageFromInputStream(InputStream inputStream, String outputPath) throws IOException {
+        try (FileOutputStream outputStream = new FileOutputStream(outputPath)) {
+            byte[] buffer = new byte[1024];
+            int bytesRead;
+            while ((bytesRead = inputStream.read(buffer)) != -1) {
+                outputStream.write(buffer, 0, bytesRead);
+            }
+        }
+    }
+
+//    public static void main(String[] args) {
+//        String ss = createQRCode("/pages/index/index?query=123","wxd3d6df0ebaf88f98","fe4c83e34f89956960aa0f1f9e8f38b1");
+//
+//        System.out.println(ss);
+//    }
+}

fill-manager/src/main/java/com/mortals/xhx/module/datum/model/DatumInfoFieldEntity.java

@@ -75,6 +75,30 @@ public class DatumInfoFieldEntity extends DatumInfoFieldVo {
      * 身份证号
      */
     private String idCard;
+    /**
+     * 微信openid
+     */
+    private String openId;
+    /**
+     * 手机号码
+     */
+    private String mobile;
+    /**
+     * 事项id
+     */
+    private Long matterId;
+    /**
+     * 事项名称
+     */
+    private String matterName;
+    /**
+     * 材料id
+     */
+    private Long materialId;
+    /**
+     * 材料名称
+     */
+    private String materialName;
     @Override
     public int hashCode() {
         return this.getId().hashCode();
@@ -106,5 +130,11 @@ public class DatumInfoFieldEntity extends DatumInfoFieldVo {
         this.fieldOrderNo = 0;
         this.remark = "";
         this.idCard = "";
+        this.idCard = "";
+        this.mobile = "";
+        this.matterId = null;
+        this.matterName = "";
+        this.materialId = null;
+        this.materialName = "";
     }
 }
\ No newline at end of file

fill-manager/src/main/java/com/mortals/xhx/module/datum/model/DatumInfoFieldQuery.java

@@ -3,27 +3,42 @@ package com.mortals.xhx.module.datum.model;
 import java.util.List;
 import com.mortals.xhx.module.datum.model.DatumInfoFieldEntity;
 /**
- * 填单用户信息字段查询对象
+ * 用户填单信息字段查询对象
  *
  * @author zxfei
- * @date 2024-04-23
+ * @date 2025-06-08
  */
 public class DatumInfoFieldQuery extends DatumInfoFieldEntity {
-    /** 开始 序号，主键，自增长 */
+    /** 开始 主键ID，主键，自增长 */
     private Long idStart;
 
-    /** 结束 序号，主键，自增长 */
+    /** 结束 主键ID，主键，自增长 */
     private Long idEnd;
 
-    /** 增加 序号，主键，自增长 */
+    /** 增加 主键ID，主键，自增长 */
     private Long idIncrement;
 
-    /** 序号，主键，自增长列表 */
+    /** 主键ID，主键，自增长列表 */
     private List <Long> idList;
 
-    /** 序号，主键，自增长排除列表 */
+    /** 主键ID，主键，自增长排除列表 */
     private List <Long> idNotList;
 
+    /** 微信openid */
+    private List<String> openIdList;
+
+    /** 微信openid排除列表 */
+    private List <String> openIdNotList;
+    /** 身份证号码 */
+    private List<String> idCardList;
+
+    /** 身份证号码排除列表 */
+    private List <String> idCardNotList;
+    /** 手机号码 */
+    private List<String> mobileList;
+
+    /** 手机号码排除列表 */
+    private List <String> mobileNotList;
     /** 开始 填单打印id */
     private Long datumPrintIdStart;
 
@@ -49,20 +64,20 @@ public class DatumInfoFieldQuery extends DatumInfoFieldEntity {
 
     /** 字段名称排除列表 */
     private List <String> fieldNameNotList;
-    /** 字段类型（input.单行输入框,textarea.多行输入框,SELECT.下拉选项框,date.日期选择框,checkbox.多项选择框） */
+    /** 字段类型 */
     private List<String> fieldTypeList;
 
-    /** 字段类型（input.单行输入框,textarea.多行输入框,SELECT.下拉选项框,date.日期选择框,checkbox.多项选择框）排除列表 */
+    /** 字段类型排除列表 */
     private List <String> fieldTypeNotList;
-    /** 字段类型值，当字段类型为多选，单选时候，预设复选值 */
+    /** 字段类型值 */
     private List<String> fieldTypeValueList;
 
-    /** 字段类型值，当字段类型为多选，单选时候，预设复选值排除列表 */
+    /** 字段类型值排除列表 */
     private List <String> fieldTypeValueNotList;
-    /** 数据类型（number.数字,string.字符串,arrays.数组,obj.对象） */
+    /** 数据类型 */
     private List<String> dataTypeList;
 
-    /** 数据类型（number.数字,string.字符串,arrays.数组,obj.对象）排除列表 */
+    /** 数据类型排除列表 */
     private List <String> dataTypeNotList;
     /** 字段值 */
     private List<String> fieldValueList;
@@ -74,19 +89,19 @@ public class DatumInfoFieldQuery extends DatumInfoFieldEntity {
 
     /** 字段默认值排除列表 */
     private List <String> defaultValueNotList;
-    /** 开始 数据长度，默认128 */
+    /** 开始 数据长度 */
     private Integer fieldLenStart;
 
-    /** 结束 数据长度，默认128 */
+    /** 结束 数据长度 */
     private Integer fieldLenEnd;
 
-    /** 增加 数据长度，默认128 */
+    /** 增加 数据长度 */
     private Integer fieldLenIncrement;
 
-    /** 数据长度，默认128列表 */
+    /** 数据长度列表 */
     private List <Integer> fieldLenList;
 
-    /** 数据长度，默认128排除列表 */
+    /** 数据长度排除列表 */
     private List <Integer> fieldLenNotList;
 
     /** 开始 是否允许为空，(0.否,1.是) */
@@ -145,47 +160,82 @@ public class DatumInfoFieldQuery extends DatumInfoFieldEntity {
     /** 结束 创建时间 */
     private String createTimeEnd;
 
-    /** 开始 创建用户 */
+    /** 开始 创建人id */
     private Long createUserIdStart;
 
-    /** 结束 创建用户 */
+    /** 结束 创建人id */
     private Long createUserIdEnd;
 
-    /** 增加 创建用户 */
+    /** 增加 创建人id */
     private Long createUserIdIncrement;
 
-    /** 创建用户列表 */
+    /** 创建人id列表 */
     private List <Long> createUserIdList;
 
-    /** 创建用户排除列表 */
+    /** 创建人id排除列表 */
     private List <Long> createUserIdNotList;
 
-    /** 开始 修改时间 */
+    /** 开始 更新时间 */
     private String updateTimeStart;
 
-    /** 结束 修改时间 */
+    /** 结束 更新时间 */
     private String updateTimeEnd;
 
-    /** 开始 修改用户 */
+    /** 开始 更新人id */
     private Long updateUserIdStart;
 
-    /** 结束 修改用户 */
+    /** 结束 更新人id */
     private Long updateUserIdEnd;
 
-    /** 增加 修改用户 */
+    /** 增加 更新人id */
     private Long updateUserIdIncrement;
 
-    /** 修改用户列表 */
+    /** 更新人id列表 */
     private List <Long> updateUserIdList;
 
-    /** 修改用户排除列表 */
+    /** 更新人id排除列表 */
     private List <Long> updateUserIdNotList;
 
-    /** 身份证号 */
-    private List<String> idCardList;
+    /** 开始 事项id */
+    private Long matterIdStart;
 
-    /** 身份证号排除列表 */
-    private List <String> idCardNotList;
+    /** 结束 事项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;
+    /** 开始 材料id */
+    private Long materialIdStart;
+
+    /** 结束 材料id */
+    private Long materialIdEnd;
+
+    /** 增加 材料id */
+    private Long materialIdIncrement;
+
+    /** 材料id列表 */
+    private List <Long> materialIdList;
+
+    /** 材料id排除列表 */
+    private List <Long> materialIdNotList;
+
+    /** 材料名称 */
+    private List<String> materialNameList;
+
+    /** 材料名称排除列表 */
+    private List <String> materialNameNotList;
     /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
     private List<DatumInfoFieldQuery> orConditionList;
 
@@ -195,7 +245,7 @@ public class DatumInfoFieldQuery extends DatumInfoFieldEntity {
     public DatumInfoFieldQuery(){}
 
     /**
-     * 获取 开始 序号，主键，自增长
+     * 获取 开始 主键ID，主键，自增长
      * @return idStart
      */
     public Long getIdStart(){
@@ -203,7 +253,7 @@ public class DatumInfoFieldQuery extends DatumInfoFieldEntity {
     }
 
     /**
-     * 设置 开始 序号，主键，自增长
+     * 设置 开始 主键ID，主键，自增长
      * @param idStart
      */
     public void setIdStart(Long idStart){
@@ -211,7 +261,7 @@ public class DatumInfoFieldQuery extends DatumInfoFieldEntity {
     }
 
     /**
-     * 获取 结束 序号，主键，自增长
+     * 获取 结束 主键ID，主键，自增长
      * @return $idEnd
      */
     public Long getIdEnd(){
@@ -219,7 +269,7 @@ public class DatumInfoFieldQuery extends DatumInfoFieldEntity {
     }
 
     /**
-     * 设置 结束 序号，主键，自增长
+     * 设置 结束 主键ID，主键，自增长
      * @param idEnd
      */
     public void setIdEnd(Long idEnd){
@@ -227,7 +277,7 @@ public class DatumInfoFieldQuery extends DatumInfoFieldEntity {
     }
 
     /**
-     * 获取 增加 序号，主键，自增长
+     * 获取 增加 主键ID，主键，自增长
      * @return idIncrement
      */
     public Long getIdIncrement(){
@@ -235,7 +285,7 @@ public class DatumInfoFieldQuery extends DatumInfoFieldEntity {
     }
 
     /**
-     * 设置 增加 序号，主键，自增长
+     * 设置 增加 主键ID，主键，自增长
      * @param idIncrement
      */
     public void setIdIncrement(Long idIncrement){
@@ -243,7 +293,7 @@ public class DatumInfoFieldQuery extends DatumInfoFieldEntity {
     }
 
     /**
-     * 获取 序号，主键，自增长
+     * 获取 主键ID，主键，自增长
      * @return idList
      */
     public List<Long> getIdList(){
@@ -251,7 +301,7 @@ public class DatumInfoFieldQuery extends DatumInfoFieldEntity {
     }
 
     /**
-     * 设置 序号，主键，自增长
+     * 设置 主键ID，主键，自增长
      * @param idList
      */
     public void setIdList(List<Long> idList){
@@ -259,7 +309,7 @@ public class DatumInfoFieldQuery extends DatumInfoFieldEntity {
     }
 
     /**
-     * 获取 序号，主键，自增长
+     * 获取 主键ID，主键，自增长
      * @return idNotList
      */
     public List<Long> getIdNotList(){
@@ -267,7 +317,7 @@ public class DatumInfoFieldQuery extends DatumInfoFieldEntity {
     }
 
     /**
-     * 设置 序号，主键，自增长
+     * 设置 主键ID，主键，自增长
      * @param idNotList
      */
     public void setIdNotList(List<Long> idNotList){
@@ -275,6 +325,102 @@ public class DatumInfoFieldQuery extends DatumInfoFieldEntity {
     }
 
 
+    /**
+     * 获取 微信openid
+     * @return openIdList
+     */
+    public List<String> getOpenIdList(){
+        return this.openIdList;
+    }
+
+    /**
+     * 设置 微信openid
+     * @param openIdList
+     */
+    public void setOpenIdList(List<String> openIdList){
+        this.openIdList = openIdList;
+    }
+
+    /**
+     * 获取 微信openid
+     * @return openIdNotList
+     */
+    public List<String> getOpenIdNotList(){
+        return this.openIdNotList;
+    }
+
+    /**
+     * 设置 微信openid
+     * @param openIdNotList
+     */
+    public void setOpenIdNotList(List<String> openIdNotList){
+        this.openIdNotList = openIdNotList;
+    }
+
+    /**
+     * 获取 身份证号码
+     * @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 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 datumPrintIdStart
@@ -421,7 +567,7 @@ public class DatumInfoFieldQuery extends DatumInfoFieldEntity {
     }
 
     /**
-     * 获取 字段类型（input.单行输入框,textarea.多行输入框,SELECT.下拉选项框,date.日期选择框,checkbox.多项选择框）
+     * 获取 字段类型
      * @return fieldTypeList
      */
     public List<String> getFieldTypeList(){
@@ -429,7 +575,7 @@ public class DatumInfoFieldQuery extends DatumInfoFieldEntity {
     }
 
     /**
-     * 设置 字段类型（input.单行输入框,textarea.多行输入框,SELECT.下拉选项框,date.日期选择框,checkbox.多项选择框）
+     * 设置 字段类型
      * @param fieldTypeList
      */
     public void setFieldTypeList(List<String> fieldTypeList){
@@ -437,7 +583,7 @@ public class DatumInfoFieldQuery extends DatumInfoFieldEntity {
     }
 
     /**
-     * 获取 字段类型（input.单行输入框,textarea.多行输入框,SELECT.下拉选项框,date.日期选择框,checkbox.多项选择框）
+     * 获取 字段类型
      * @return fieldTypeNotList
      */
     public List<String> getFieldTypeNotList(){
@@ -445,7 +591,7 @@ public class DatumInfoFieldQuery extends DatumInfoFieldEntity {
     }
 
     /**
-     * 设置 字段类型（input.单行输入框,textarea.多行输入框,SELECT.下拉选项框,date.日期选择框,checkbox.多项选择框）
+     * 设置 字段类型
      * @param fieldTypeNotList
      */
     public void setFieldTypeNotList(List<String> fieldTypeNotList){
@@ -453,7 +599,7 @@ public class DatumInfoFieldQuery extends DatumInfoFieldEntity {
     }
 
     /**
-     * 获取 字段类型值，当字段类型为多选，单选时候，预设复选值
+     * 获取 字段类型值
      * @return fieldTypeValueList
      */
     public List<String> getFieldTypeValueList(){
@@ -461,7 +607,7 @@ public class DatumInfoFieldQuery extends DatumInfoFieldEntity {
     }
 
     /**
-     * 设置 字段类型值，当字段类型为多选，单选时候，预设复选值
+     * 设置 字段类型值
      * @param fieldTypeValueList
      */
     public void setFieldTypeValueList(List<String> fieldTypeValueList){
@@ -469,7 +615,7 @@ public class DatumInfoFieldQuery extends DatumInfoFieldEntity {
     }
 
     /**
-     * 获取 字段类型值，当字段类型为多选，单选时候，预设复选值
+     * 获取 字段类型值
      * @return fieldTypeValueNotList
      */
     public List<String> getFieldTypeValueNotList(){
@@ -477,7 +623,7 @@ public class DatumInfoFieldQuery extends DatumInfoFieldEntity {
     }
 
     /**
-     * 设置 字段类型值，当字段类型为多选，单选时候，预设复选值
+     * 设置 字段类型值
      * @param fieldTypeValueNotList
      */
     public void setFieldTypeValueNotList(List<String> fieldTypeValueNotList){
@@ -485,7 +631,7 @@ public class DatumInfoFieldQuery extends DatumInfoFieldEntity {
     }
 
     /**
-     * 获取 数据类型（number.数字,string.字符串,arrays.数组,obj.对象）
+     * 获取 数据类型
      * @return dataTypeList
      */
     public List<String> getDataTypeList(){
@@ -493,7 +639,7 @@ public class DatumInfoFieldQuery extends DatumInfoFieldEntity {
     }
 
     /**
-     * 设置 数据类型（number.数字,string.字符串,arrays.数组,obj.对象）
+     * 设置 数据类型
      * @param dataTypeList
      */
     public void setDataTypeList(List<String> dataTypeList){
@@ -501,7 +647,7 @@ public class DatumInfoFieldQuery extends DatumInfoFieldEntity {
     }
 
     /**
-     * 获取 数据类型（number.数字,string.字符串,arrays.数组,obj.对象）
+     * 获取 数据类型
      * @return dataTypeNotList
      */
     public List<String> getDataTypeNotList(){
@@ -509,7 +655,7 @@ public class DatumInfoFieldQuery extends DatumInfoFieldEntity {
     }
 
     /**
-     * 设置 数据类型（number.数字,string.字符串,arrays.数组,obj.对象）
+     * 设置 数据类型
      * @param dataTypeNotList
      */
     public void setDataTypeNotList(List<String> dataTypeNotList){
@@ -581,7 +727,7 @@ public class DatumInfoFieldQuery extends DatumInfoFieldEntity {
     }
 
     /**
-     * 获取 开始 数据长度，默认128
+     * 获取 开始 数据长度
      * @return fieldLenStart
      */
     public Integer getFieldLenStart(){
@@ -589,7 +735,7 @@ public class DatumInfoFieldQuery extends DatumInfoFieldEntity {
     }
 
     /**
-     * 设置 开始 数据长度，默认128
+     * 设置 开始 数据长度
      * @param fieldLenStart
      */
     public void setFieldLenStart(Integer fieldLenStart){
@@ -597,7 +743,7 @@ public class DatumInfoFieldQuery extends DatumInfoFieldEntity {
     }
 
     /**
-     * 获取 结束 数据长度，默认128
+     * 获取 结束 数据长度
      * @return $fieldLenEnd
      */
     public Integer getFieldLenEnd(){
@@ -605,7 +751,7 @@ public class DatumInfoFieldQuery extends DatumInfoFieldEntity {
     }
 
     /**
-     * 设置 结束 数据长度，默认128
+     * 设置 结束 数据长度
      * @param fieldLenEnd
      */
     public void setFieldLenEnd(Integer fieldLenEnd){
@@ -613,7 +759,7 @@ public class DatumInfoFieldQuery extends DatumInfoFieldEntity {
     }
 
     /**
-     * 获取 增加 数据长度，默认128
+     * 获取 增加 数据长度
      * @return fieldLenIncrement
      */
     public Integer getFieldLenIncrement(){
@@ -621,7 +767,7 @@ public class DatumInfoFieldQuery extends DatumInfoFieldEntity {
     }
 
     /**
-     * 设置 增加 数据长度，默认128
+     * 设置 增加 数据长度
      * @param fieldLenIncrement
      */
     public void setFieldLenIncrement(Integer fieldLenIncrement){
@@ -629,7 +775,7 @@ public class DatumInfoFieldQuery extends DatumInfoFieldEntity {
     }
 
     /**
-     * 获取 数据长度，默认128
+     * 获取 数据长度
      * @return fieldLenList
      */
     public List<Integer> getFieldLenList(){
@@ -637,7 +783,7 @@ public class DatumInfoFieldQuery extends DatumInfoFieldEntity {
     }
 
     /**
-     * 设置 数据长度，默认128
+     * 设置 数据长度
      * @param fieldLenList
      */
     public void setFieldLenList(List<Integer> fieldLenList){
@@ -645,7 +791,7 @@ public class DatumInfoFieldQuery extends DatumInfoFieldEntity {
     }
 
     /**
-     * 获取 数据长度，默认128
+     * 获取 数据长度
      * @return fieldLenNotList
      */
     public List<Integer> getFieldLenNotList(){
@@ -653,7 +799,7 @@ public class DatumInfoFieldQuery extends DatumInfoFieldEntity {
     }
 
     /**
-     * 设置 数据长度，默认128
+     * 设置 数据长度
      * @param fieldLenNotList
      */
     public void setFieldLenNotList(List<Integer> fieldLenNotList){
@@ -969,7 +1115,7 @@ public class DatumInfoFieldQuery extends DatumInfoFieldEntity {
     }
 
     /**
-     * 获取 开始 创建用户
+     * 获取 开始 创建人id
      * @return createUserIdStart
      */
     public Long getCreateUserIdStart(){
@@ -977,7 +1123,7 @@ public class DatumInfoFieldQuery extends DatumInfoFieldEntity {
     }
 
     /**
-     * 设置 开始 创建用户
+     * 设置 开始 创建人id
      * @param createUserIdStart
      */
     public void setCreateUserIdStart(Long createUserIdStart){
@@ -985,7 +1131,7 @@ public class DatumInfoFieldQuery extends DatumInfoFieldEntity {
     }
 
     /**
-     * 获取 结束 创建用户
+     * 获取 结束 创建人id
      * @return $createUserIdEnd
      */
     public Long getCreateUserIdEnd(){
@@ -993,7 +1139,7 @@ public class DatumInfoFieldQuery extends DatumInfoFieldEntity {
     }
 
     /**
-     * 设置 结束 创建用户
+     * 设置 结束 创建人id
      * @param createUserIdEnd
      */
     public void setCreateUserIdEnd(Long createUserIdEnd){
@@ -1001,7 +1147,7 @@ public class DatumInfoFieldQuery extends DatumInfoFieldEntity {
     }
 
     /**
-     * 获取 增加 创建用户
+     * 获取 增加 创建人id
      * @return createUserIdIncrement
      */
     public Long getCreateUserIdIncrement(){
@@ -1009,7 +1155,7 @@ public class DatumInfoFieldQuery extends DatumInfoFieldEntity {
     }
 
     /**
-     * 设置 增加 创建用户
+     * 设置 增加 创建人id
      * @param createUserIdIncrement
      */
     public void setCreateUserIdIncrement(Long createUserIdIncrement){
@@ -1017,7 +1163,7 @@ public class DatumInfoFieldQuery extends DatumInfoFieldEntity {
     }
 
     /**
-     * 获取 创建用户
+     * 获取 创建人id
      * @return createUserIdList
      */
     public List<Long> getCreateUserIdList(){
@@ -1025,7 +1171,7 @@ public class DatumInfoFieldQuery extends DatumInfoFieldEntity {
     }
 
     /**
-     * 设置 创建用户
+     * 设置 创建人id
      * @param createUserIdList
      */
     public void setCreateUserIdList(List<Long> createUserIdList){
@@ -1033,7 +1179,7 @@ public class DatumInfoFieldQuery extends DatumInfoFieldEntity {
     }
 
     /**
-     * 获取 创建用户
+     * 获取 创建人id
      * @return createUserIdNotList
      */
     public List<Long> getCreateUserIdNotList(){
@@ -1041,7 +1187,7 @@ public class DatumInfoFieldQuery extends DatumInfoFieldEntity {
     }
 
     /**
-     * 设置 创建用户
+     * 设置 创建人id
      * @param createUserIdNotList
      */
     public void setCreateUserIdNotList(List<Long> createUserIdNotList){
@@ -1050,7 +1196,7 @@ public class DatumInfoFieldQuery extends DatumInfoFieldEntity {
 
 
     /**
-     * 获取 开始 修改时间
+     * 获取 开始 更新时间
      * @return updateTimeStart
      */
     public String getUpdateTimeStart(){
@@ -1058,7 +1204,7 @@ public class DatumInfoFieldQuery extends DatumInfoFieldEntity {
     }
 
     /**
-     * 设置 开始 修改时间
+     * 设置 开始 更新时间
      * @param updateTimeStart
      */
     public void setUpdateTimeStart(String updateTimeStart){
@@ -1066,7 +1212,7 @@ public class DatumInfoFieldQuery extends DatumInfoFieldEntity {
     }
 
     /**
-     * 获取 结束 修改时间
+     * 获取 结束 更新时间
      * @return updateTimeEnd
      */
     public String getUpdateTimeEnd(){
@@ -1074,7 +1220,7 @@ public class DatumInfoFieldQuery extends DatumInfoFieldEntity {
     }
 
     /**
-     * 设置 结束 修改时间
+     * 设置 结束 更新时间
      * @param updateTimeEnd
      */
     public void setUpdateTimeEnd(String updateTimeEnd){
@@ -1082,7 +1228,7 @@ public class DatumInfoFieldQuery extends DatumInfoFieldEntity {
     }
 
     /**
-     * 获取 开始 修改用户
+     * 获取 开始 更新人id
      * @return updateUserIdStart
      */
     public Long getUpdateUserIdStart(){
@@ -1090,7 +1236,7 @@ public class DatumInfoFieldQuery extends DatumInfoFieldEntity {
     }
 
     /**
-     * 设置 开始 修改用户
+     * 设置 开始 更新人id
      * @param updateUserIdStart
      */
     public void setUpdateUserIdStart(Long updateUserIdStart){
@@ -1098,7 +1244,7 @@ public class DatumInfoFieldQuery extends DatumInfoFieldEntity {
     }
 
     /**
-     * 获取 结束 修改用户
+     * 获取 结束 更新人id
      * @return $updateUserIdEnd
      */
     public Long getUpdateUserIdEnd(){
@@ -1106,7 +1252,7 @@ public class DatumInfoFieldQuery extends DatumInfoFieldEntity {
     }
 
     /**
-     * 设置 结束 修改用户
+     * 设置 结束 更新人id
      * @param updateUserIdEnd
      */
     public void setUpdateUserIdEnd(Long updateUserIdEnd){
@@ -1114,7 +1260,7 @@ public class DatumInfoFieldQuery extends DatumInfoFieldEntity {
     }
 
     /**
-     * 获取 增加 修改用户
+     * 获取 增加 更新人id
      * @return updateUserIdIncrement
      */
     public Long getUpdateUserIdIncrement(){
@@ -1122,7 +1268,7 @@ public class DatumInfoFieldQuery extends DatumInfoFieldEntity {
     }
 
     /**
-     * 设置 增加 修改用户
+     * 设置 增加 更新人id
      * @param updateUserIdIncrement
      */
     public void setUpdateUserIdIncrement(Long updateUserIdIncrement){
@@ -1130,7 +1276,7 @@ public class DatumInfoFieldQuery extends DatumInfoFieldEntity {
     }
 
     /**
-     * 获取 修改用户
+     * 获取 更新人id
      * @return updateUserIdList
      */
     public List<Long> getUpdateUserIdList(){
@@ -1138,7 +1284,7 @@ public class DatumInfoFieldQuery extends DatumInfoFieldEntity {
     }
 
     /**
-     * 设置 修改用户
+     * 设置 更新人id
      * @param updateUserIdList
      */
     public void setUpdateUserIdList(List<Long> updateUserIdList){
@@ -1146,7 +1292,7 @@ public class DatumInfoFieldQuery extends DatumInfoFieldEntity {
     }
 
     /**
-     * 获取 修改用户
+     * 获取 更新人id
      * @return updateUserIdNotList
      */
     public List<Long> getUpdateUserIdNotList(){
@@ -1154,7 +1300,7 @@ public class DatumInfoFieldQuery extends DatumInfoFieldEntity {
     }
 
     /**
-     * 设置 修改用户
+     * 设置 更新人id
      * @param updateUserIdNotList
      */
     public void setUpdateUserIdNotList(List<Long> updateUserIdNotList){
@@ -1163,39 +1309,233 @@ public class DatumInfoFieldQuery extends DatumInfoFieldEntity {
 
 
     /**
-     * 获取 身份证号
-     * @return idCardList
+     * 获取 开始 事项id
+     * @return matterIdStart
      */
-    public List<String> getIdCardList(){
-        return this.idCardList;
+    public Long getMatterIdStart(){
+        return this.matterIdStart;
     }
 
     /**
-     * 设置 身份证号
-     * @param idCardList
+     * 设置 开始 事项id
+     * @param matterIdStart
      */
-    public void setIdCardList(List<String> idCardList){
-        this.idCardList = idCardList;
+    public void setMatterIdStart(Long matterIdStart){
+        this.matterIdStart = matterIdStart;
     }
 
     /**
-     * 获取 身份证号
-     * @return idCardNotList
+     * 获取 结束 事项id
+     * @return $matterIdEnd
      */
-    public List<String> getIdCardNotList(){
-        return this.idCardNotList;
+    public Long getMatterIdEnd(){
+        return this.matterIdEnd;
     }
 
     /**
-     * 设置 身份证号
-     * @param idCardNotList
+     * 设置 结束 事项id
+     * @param matterIdEnd
      */
-    public void setIdCardNotList(List<String> idCardNotList){
-        this.idCardNotList = idCardNotList;
+    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;
+    }
+
+    /**
+     * 获取 开始 材料id
+     * @return materialIdStart
+     */
+    public Long getMaterialIdStart(){
+        return this.materialIdStart;
+    }
+
+    /**
+     * 设置 开始 材料id
+     * @param materialIdStart
+     */
+    public void setMaterialIdStart(Long materialIdStart){
+        this.materialIdStart = materialIdStart;
+    }
+
+    /**
+     * 获取 结束 材料id
+     * @return $materialIdEnd
+     */
+    public Long getMaterialIdEnd(){
+        return this.materialIdEnd;
+    }
+
+    /**
+     * 设置 结束 材料id
+     * @param materialIdEnd
+     */
+    public void setMaterialIdEnd(Long materialIdEnd){
+        this.materialIdEnd = materialIdEnd;
+    }
+
+    /**
+     * 获取 增加 材料id
+     * @return materialIdIncrement
+     */
+    public Long getMaterialIdIncrement(){
+        return this.materialIdIncrement;
+    }
+
+    /**
+     * 设置 增加 材料id
+     * @param materialIdIncrement
+     */
+    public void setMaterialIdIncrement(Long materialIdIncrement){
+        this.materialIdIncrement = materialIdIncrement;
+    }
+
+    /**
+     * 获取 材料id
+     * @return materialIdList
+     */
+    public List<Long> getMaterialIdList(){
+        return this.materialIdList;
+    }
+
+    /**
+     * 设置 材料id
+     * @param materialIdList
+     */
+    public void setMaterialIdList(List<Long> materialIdList){
+        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
+     */
+    public List<String> getMaterialNameList(){
+        return this.materialNameList;
     }
 
     /**
-     * 设置  序号，主键，自增长
+     * 设置 材料名称
+     * @param materialNameList
+     */
+    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;
+    }
+
+    /**
+     * 设置  主键ID，主键，自增长
      * @param id
      */
     public DatumInfoFieldQuery id(Long id){
@@ -1204,7 +1544,7 @@ public class DatumInfoFieldQuery extends DatumInfoFieldEntity {
     }
 
     /**
-     * 设置 开始 序号，主键，自增长
+     * 设置 开始 主键ID，主键，自增长
      * @param idStart
      */
     public DatumInfoFieldQuery idStart(Long idStart){
@@ -1213,7 +1553,7 @@ public class DatumInfoFieldQuery extends DatumInfoFieldEntity {
     }
 
     /**
-     * 设置 结束 序号，主键，自增长
+     * 设置 结束 主键ID，主键，自增长
      * @param idEnd
      */
     public DatumInfoFieldQuery idEnd(Long idEnd){
@@ -1222,7 +1562,7 @@ public class DatumInfoFieldQuery extends DatumInfoFieldEntity {
     }
 
     /**
-     * 设置 增加 序号，主键，自增长
+     * 设置 增加 主键ID，主键，自增长
      * @param idIncrement
      */
     public DatumInfoFieldQuery idIncrement(Long idIncrement){
@@ -1231,7 +1571,7 @@ public class DatumInfoFieldQuery extends DatumInfoFieldEntity {
     }
 
     /**
-     * 设置 序号，主键，自增长
+     * 设置 主键ID，主键，自增长
      * @param idList
      */
     public DatumInfoFieldQuery idList(List<Long> idList){
@@ -1240,7 +1580,7 @@ public class DatumInfoFieldQuery extends DatumInfoFieldEntity {
     }
 
     /**
-     * 设置 序号，主键，自增长
+     * 设置 主键ID，主键，自增长
      * @param idNotList
      */
     public DatumInfoFieldQuery idNotList(List<Long> idNotList){
@@ -1248,6 +1588,63 @@ public class DatumInfoFieldQuery extends DatumInfoFieldEntity {
         return this;
     }
 
+
+    /**
+     * 设置 微信openid
+     * @param openId
+     */
+    public DatumInfoFieldQuery openId(String openId){
+        setOpenId(openId);
+        return this;
+    }
+
+    /**
+     * 设置 微信openid
+     * @param openIdList
+     */
+    public DatumInfoFieldQuery openIdList(List<String> openIdList){
+        this.openIdList = openIdList;
+        return this;
+    }
+
+
+    /**
+     * 设置 身份证号码
+     * @param idCard
+     */
+    public DatumInfoFieldQuery idCard(String idCard){
+        setIdCard(idCard);
+        return this;
+    }
+
+    /**
+     * 设置 身份证号码
+     * @param idCardList
+     */
+    public DatumInfoFieldQuery idCardList(List<String> idCardList){
+        this.idCardList = idCardList;
+        return this;
+    }
+
+
+    /**
+     * 设置 手机号码
+     * @param mobile
+     */
+    public DatumInfoFieldQuery mobile(String mobile){
+        setMobile(mobile);
+        return this;
+    }
+
+    /**
+     * 设置 手机号码
+     * @param mobileList
+     */
+    public DatumInfoFieldQuery mobileList(List<String> mobileList){
+        this.mobileList = mobileList;
+        return this;
+    }
+
     /**
      * 设置  填单打印id
      * @param datumPrintId
@@ -1342,7 +1739,7 @@ public class DatumInfoFieldQuery extends DatumInfoFieldEntity {
 
 
     /**
-     * 设置 字段类型（input.单行输入框,textarea.多行输入框,SELECT.下拉选项框,date.日期选择框,checkbox.多项选择框）
+     * 设置 字段类型
      * @param fieldType
      */
     public DatumInfoFieldQuery fieldType(String fieldType){
@@ -1351,7 +1748,7 @@ public class DatumInfoFieldQuery extends DatumInfoFieldEntity {
     }
 
     /**
-     * 设置 字段类型（input.单行输入框,textarea.多行输入框,SELECT.下拉选项框,date.日期选择框,checkbox.多项选择框）
+     * 设置 字段类型
      * @param fieldTypeList
      */
     public DatumInfoFieldQuery fieldTypeList(List<String> fieldTypeList){
@@ -1361,7 +1758,7 @@ public class DatumInfoFieldQuery extends DatumInfoFieldEntity {
 
 
     /**
-     * 设置 字段类型值，当字段类型为多选，单选时候，预设复选值
+     * 设置 字段类型值
      * @param fieldTypeValue
      */
     public DatumInfoFieldQuery fieldTypeValue(String fieldTypeValue){
@@ -1370,7 +1767,7 @@ public class DatumInfoFieldQuery extends DatumInfoFieldEntity {
     }
 
     /**
-     * 设置 字段类型值，当字段类型为多选，单选时候，预设复选值
+     * 设置 字段类型值
      * @param fieldTypeValueList
      */
     public DatumInfoFieldQuery fieldTypeValueList(List<String> fieldTypeValueList){
@@ -1380,7 +1777,7 @@ public class DatumInfoFieldQuery extends DatumInfoFieldEntity {
 
 
     /**
-     * 设置 数据类型（number.数字,string.字符串,arrays.数组,obj.对象）
+     * 设置 数据类型
      * @param dataType
      */
     public DatumInfoFieldQuery dataType(String dataType){
@@ -1389,7 +1786,7 @@ public class DatumInfoFieldQuery extends DatumInfoFieldEntity {
     }
 
     /**
-     * 设置 数据类型（number.数字,string.字符串,arrays.数组,obj.对象）
+     * 设置 数据类型
      * @param dataTypeList
      */
     public DatumInfoFieldQuery dataTypeList(List<String> dataTypeList){
@@ -1436,7 +1833,7 @@ public class DatumInfoFieldQuery extends DatumInfoFieldEntity {
     }
 
     /**
-     * 设置  数据长度，默认128
+     * 设置  数据长度
      * @param fieldLen
      */
     public DatumInfoFieldQuery fieldLen(Integer fieldLen){
@@ -1445,7 +1842,7 @@ public class DatumInfoFieldQuery extends DatumInfoFieldEntity {
     }
 
     /**
-     * 设置 开始 数据长度，默认128
+     * 设置 开始 数据长度
      * @param fieldLenStart
      */
     public DatumInfoFieldQuery fieldLenStart(Integer fieldLenStart){
@@ -1454,7 +1851,7 @@ public class DatumInfoFieldQuery extends DatumInfoFieldEntity {
     }
 
     /**
-     * 设置 结束 数据长度，默认128
+     * 设置 结束 数据长度
      * @param fieldLenEnd
      */
     public DatumInfoFieldQuery fieldLenEnd(Integer fieldLenEnd){
@@ -1463,7 +1860,7 @@ public class DatumInfoFieldQuery extends DatumInfoFieldEntity {
     }
 
     /**
-     * 设置 增加 数据长度，默认128
+     * 设置 增加 数据长度
      * @param fieldLenIncrement
      */
     public DatumInfoFieldQuery fieldLenIncrement(Integer fieldLenIncrement){
@@ -1472,7 +1869,7 @@ public class DatumInfoFieldQuery extends DatumInfoFieldEntity {
     }
 
     /**
-     * 设置 数据长度，默认128
+     * 设置 数据长度
      * @param fieldLenList
      */
     public DatumInfoFieldQuery fieldLenList(List<Integer> fieldLenList){
@@ -1481,7 +1878,7 @@ public class DatumInfoFieldQuery extends DatumInfoFieldEntity {
     }
 
     /**
-     * 设置 数据长度，默认128
+     * 设置 数据长度
      * @param fieldLenNotList
      */
     public DatumInfoFieldQuery fieldLenNotList(List<Integer> fieldLenNotList){
@@ -1672,7 +2069,7 @@ public class DatumInfoFieldQuery extends DatumInfoFieldEntity {
 
 
     /**
-     * 设置  创建用户
+     * 设置  创建人id
      * @param createUserId
      */
     public DatumInfoFieldQuery createUserId(Long createUserId){
@@ -1681,7 +2078,7 @@ public class DatumInfoFieldQuery extends DatumInfoFieldEntity {
     }
 
     /**
-     * 设置 开始 创建用户
+     * 设置 开始 创建人id
      * @param createUserIdStart
      */
     public DatumInfoFieldQuery createUserIdStart(Long createUserIdStart){
@@ -1690,7 +2087,7 @@ public class DatumInfoFieldQuery extends DatumInfoFieldEntity {
     }
 
     /**
-     * 设置 结束 创建用户
+     * 设置 结束 创建人id
      * @param createUserIdEnd
      */
     public DatumInfoFieldQuery createUserIdEnd(Long createUserIdEnd){
@@ -1699,7 +2096,7 @@ public class DatumInfoFieldQuery extends DatumInfoFieldEntity {
     }
 
     /**
-     * 设置 增加 创建用户
+     * 设置 增加 创建人id
      * @param createUserIdIncrement
      */
     public DatumInfoFieldQuery createUserIdIncrement(Long createUserIdIncrement){
@@ -1708,7 +2105,7 @@ public class DatumInfoFieldQuery extends DatumInfoFieldEntity {
     }
 
     /**
-     * 设置 创建用户
+     * 设置 创建人id
      * @param createUserIdList
      */
     public DatumInfoFieldQuery createUserIdList(List<Long> createUserIdList){
@@ -1717,7 +2114,7 @@ public class DatumInfoFieldQuery extends DatumInfoFieldEntity {
     }
 
     /**
-     * 设置 创建用户
+     * 设置 创建人id
      * @param createUserIdNotList
      */
     public DatumInfoFieldQuery createUserIdNotList(List<Long> createUserIdNotList){
@@ -1727,7 +2124,7 @@ public class DatumInfoFieldQuery extends DatumInfoFieldEntity {
 
 
     /**
-     * 设置  修改用户
+     * 设置  更新人id
      * @param updateUserId
      */
     public DatumInfoFieldQuery updateUserId(Long updateUserId){
@@ -1736,7 +2133,7 @@ public class DatumInfoFieldQuery extends DatumInfoFieldEntity {
     }
 
     /**
-     * 设置 开始 修改用户
+     * 设置 开始 更新人id
      * @param updateUserIdStart
      */
     public DatumInfoFieldQuery updateUserIdStart(Long updateUserIdStart){
@@ -1745,7 +2142,7 @@ public class DatumInfoFieldQuery extends DatumInfoFieldEntity {
     }
 
     /**
-     * 设置 结束 修改用户
+     * 设置 结束 更新人id
      * @param updateUserIdEnd
      */
     public DatumInfoFieldQuery updateUserIdEnd(Long updateUserIdEnd){
@@ -1754,7 +2151,7 @@ public class DatumInfoFieldQuery extends DatumInfoFieldEntity {
     }
 
     /**
-     * 设置 增加 修改用户
+     * 设置 增加 更新人id
      * @param updateUserIdIncrement
      */
     public DatumInfoFieldQuery updateUserIdIncrement(Long updateUserIdIncrement){
@@ -1763,7 +2160,7 @@ public class DatumInfoFieldQuery extends DatumInfoFieldEntity {
     }
 
     /**
-     * 设置 修改用户
+     * 设置 更新人id
      * @param updateUserIdList
      */
     public DatumInfoFieldQuery updateUserIdList(List<Long> updateUserIdList){
@@ -1772,7 +2169,7 @@ public class DatumInfoFieldQuery extends DatumInfoFieldEntity {
     }
 
     /**
-     * 设置 修改用户
+     * 设置 更新人id
      * @param updateUserIdNotList
      */
     public DatumInfoFieldQuery updateUserIdNotList(List<Long> updateUserIdNotList){
@@ -1780,22 +2177,149 @@ public class DatumInfoFieldQuery extends DatumInfoFieldEntity {
         return this;
     }
 
+    /**
+     * 设置  事项id
+     * @param matterId
+     */
+    public DatumInfoFieldQuery matterId(Long matterId){
+        setMatterId(matterId);
+        return this;
+    }
+
+    /**
+     * 设置 开始 事项id
+     * @param matterIdStart
+     */
+    public DatumInfoFieldQuery matterIdStart(Long matterIdStart){
+        this.matterIdStart = matterIdStart;
+        return this;
+    }
 
     /**
-     * 设置 身份证号
-     * @param idCard
+     * 设置 结束 事项id
+     * @param matterIdEnd
      */
-    public DatumInfoFieldQuery idCard(String idCard){
-        setIdCard(idCard);
+    public DatumInfoFieldQuery matterIdEnd(Long matterIdEnd){
+        this.matterIdEnd = matterIdEnd;
         return this;
     }
 
     /**
-     * 设置 身份证号
-     * @param idCardList
+     * 设置 增加 事项id
+     * @param matterIdIncrement
      */
-    public DatumInfoFieldQuery idCardList(List<String> idCardList){
-        this.idCardList = idCardList;
+    public DatumInfoFieldQuery matterIdIncrement(Long matterIdIncrement){
+        this.matterIdIncrement = matterIdIncrement;
+        return this;
+    }
+
+    /**
+     * 设置 事项id
+     * @param matterIdList
+     */
+    public DatumInfoFieldQuery matterIdList(List<Long> matterIdList){
+        this.matterIdList = matterIdList;
+        return this;
+    }
+
+    /**
+     * 设置 事项id
+     * @param matterIdNotList
+     */
+    public DatumInfoFieldQuery matterIdNotList(List<Long> matterIdNotList){
+        this.matterIdNotList = matterIdNotList;
+        return this;
+    }
+
+
+    /**
+     * 设置 事项名称
+     * @param matterName
+     */
+    public DatumInfoFieldQuery matterName(String matterName){
+        setMatterName(matterName);
+        return this;
+    }
+
+    /**
+     * 设置 事项名称
+     * @param matterNameList
+     */
+    public DatumInfoFieldQuery matterNameList(List<String> matterNameList){
+        this.matterNameList = matterNameList;
+        return this;
+    }
+
+    /**
+     * 设置  材料id
+     * @param materialId
+     */
+    public DatumInfoFieldQuery materialId(Long materialId){
+        setMaterialId(materialId);
+        return this;
+    }
+
+    /**
+     * 设置 开始 材料id
+     * @param materialIdStart
+     */
+    public DatumInfoFieldQuery materialIdStart(Long materialIdStart){
+        this.materialIdStart = materialIdStart;
+        return this;
+    }
+
+    /**
+     * 设置 结束 材料id
+     * @param materialIdEnd
+     */
+    public DatumInfoFieldQuery materialIdEnd(Long materialIdEnd){
+        this.materialIdEnd = materialIdEnd;
+        return this;
+    }
+
+    /**
+     * 设置 增加 材料id
+     * @param materialIdIncrement
+     */
+    public DatumInfoFieldQuery materialIdIncrement(Long materialIdIncrement){
+        this.materialIdIncrement = materialIdIncrement;
+        return this;
+    }
+
+    /**
+     * 设置 材料id
+     * @param materialIdList
+     */
+    public DatumInfoFieldQuery materialIdList(List<Long> materialIdList){
+        this.materialIdList = materialIdList;
+        return this;
+    }
+
+    /**
+     * 设置 材料id
+     * @param materialIdNotList
+     */
+    public DatumInfoFieldQuery materialIdNotList(List<Long> materialIdNotList){
+        this.materialIdNotList = materialIdNotList;
+        return this;
+    }
+
+
+    /**
+     * 设置 材料名称
+     * @param materialName
+     */
+    public DatumInfoFieldQuery materialName(String materialName){
+        setMaterialName(materialName);
+        return this;
+    }
+
+    /**
+     * 设置 材料名称
+     * @param materialNameList
+     */
+    public DatumInfoFieldQuery materialNameList(List<String> materialNameList){
+        this.materialNameList = materialNameList;
         return this;
     }
 

fill-manager/src/main/java/com/mortals/xhx/module/h5/TerminalController.java

+package com.mortals.xhx.module.h5;
+
+import cn.hutool.http.HttpUtil;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.mortals.framework.annotation.UnAuth;
+import com.mortals.framework.common.Rest;
+import com.mortals.framework.exception.AppException;
+import com.mortals.framework.model.OrderCol;
+import com.mortals.framework.model.PageInfo;
+import com.mortals.framework.model.Result;
+import com.mortals.framework.service.IUser;
+import com.mortals.framework.util.DataUtil;
+import com.mortals.framework.util.StringUtils;
+import com.mortals.framework.web.BaseJsonBodyController;
+import com.mortals.xhx.common.code.YesNoEnum;
+import com.mortals.xhx.feign.base.pdu.SitePdu;
+import com.mortals.xhx.feign.rsp.ApiResp;
+import com.mortals.xhx.module.h5.pdu.MobileCodePdu;
+import com.mortals.xhx.module.user.model.UserFillHistoryEntity;
+import com.mortals.xhx.module.user.service.UserFillHistoryService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.util.ObjectUtils;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.*;
+
+/**
+ * 终端访问接口
+ */
+@RestController
+@RequestMapping("terminal/h5")
+@Slf4j
+public class TerminalController extends BaseJsonBodyController {
+
+    /** php接口访问地址 */
+    @Value("${server.php:http://112.19.80.237:8090}")
+    private String phpServer;
+    @Autowired
+    private UserFillHistoryService userFillHistoryService;
+
+    /**
+     * 发送手机验证码
+     * @param pdu
+     * @return
+     */
+    @PostMapping({"mobile/code/send"})
+    @UnAuth
+    public Rest<Object> msgCodeSend(@RequestBody MobileCodePdu pdu) {
+        Rest<Object> ret = new Rest();
+        Map<String, Object> model = new HashMap();
+        String busiDesc = "获取手机验证码";
+
+        int code = 1;
+        try {
+            String url = phpServer + "/wechat/homebase/msgCode";
+            String resp = HttpUtil.createPost(url).header("siteid",pdu.getSiteId()).form("phone",pdu.getPhone()).execute().body();
+            JSONObject jsonObject = JSONObject.parseObject(resp);
+            if(jsonObject.getIntValue("code")==1){
+                model.put("message_info", busiDesc + "成功");
+            }else {
+                code = -1;
+                model.put("message_info", jsonObject.getString("msg"));
+            }
+            this.recordSysLog(this.request, busiDesc + " 【成功】");
+        } catch (Exception var9) {
+            code = -1;
+            model.put("message_info", "手机验证码接口调用异常");
+            this.doException(this.request, busiDesc, model, var9);
+        }
+        ret.setCode(code);
+        ret.setMsg(model.get("message_info") == null ? "" : model.remove("message_info").toString());
+        return ret;
+    }
+
+    /**
+     * 验证手机号
+     * @param pdu
+     * @return
+     */
+    @PostMapping({"mobile/code/check"})
+    @UnAuth
+    public Rest<Object> msgCodeCheck(@RequestBody MobileCodePdu pdu) {
+        Rest<Object> ret = new Rest();
+        Map<String, Object> model = new HashMap();
+        String busiDesc = "校验手机验证码";
+
+        int code = 1;
+        try {
+            String url = phpServer + "/wechat/homebase/checkMsgCode";
+            Map<String, Object> paramsMap = new HashMap<>();
+            paramsMap.put("phone",pdu.getPhone());
+            paramsMap.put("code",pdu.getCode());
+            String resp = HttpUtil.createPost(url).header("siteid",pdu.getSiteId()).form(paramsMap).execute().body();
+            JSONObject jsonObject = JSONObject.parseObject(resp);
+            if(jsonObject.getIntValue("code")==1){
+                model.put("message_info", busiDesc + "成功");
+            }else {
+                code = -1;
+                model.put("message_info", jsonObject.getString("msg"));
+            }
+            this.recordSysLog(this.request, busiDesc + " 【成功】");
+        } catch (Exception var9) {
+            code = -1;
+            model.put("message_info", "手机验证码校验接口调用异常");
+            this.doException(this.request, busiDesc, model, var9);
+        }
+        ret.setCode(code);
+        ret.setMsg(model.get("message_info") == null ? "" : model.remove("message_info").toString());
+        return ret;
+    }
+
+    /**
+     * 获取我的填单列表
+     * @param query
+     * @return
+     */
+    @PostMapping({"fill/history/list"})
+    @UnAuth
+    public Rest<Object> historyList(@RequestBody UserFillHistoryEntity query) {
+        Rest<Object> ret = new Rest();
+        Map<String, Object> model = new HashMap();
+        String busiDesc = "填单设备终端用户获取填单记录列表";
+
+        int code = 1;
+        try {
+            if(StringUtils.isNotEmpty(query.getMobile())||StringUtils.isNotEmpty(query.getIdCard())) {
+                PageInfo pageInfo = this.buildPageInfo(query);
+                this.buildPermisionSql(query);
+                Result<UserFillHistoryEntity> result = userFillHistoryService.find(query, pageInfo, this.getContext());
+                model.put("data", result.getList());
+                model.put("pageInfo", result.getPageInfo());
+                this.parsePageInfo(model, result.getPageInfo());
+                model.put("message_info", busiDesc + "成功");
+            }else {
+                throw new AppException("请输入手机号码或者身份证号码");
+            }
+            this.recordSysLog(this.request, busiDesc + " 【成功】");
+        } catch (Exception var9) {
+            code = -1;
+            model.put("message_info", "填单设备终端用户获取填单记录列表异常");
+            this.doException(this.request, busiDesc, model, var9);
+        }
+        ret.setCode(code);
+        ret.setData(model);
+        ret.setMsg(model.get("message_info") == null ? "" : model.remove("message_info").toString());
+        return ret;
+    }
+
+
+    protected PageInfo buildPageInfo(UserFillHistoryEntity query) {
+        PageInfo pageInfo = new PageInfo();
+        if (!ObjectUtils.isEmpty(query) && !ObjectUtils.isEmpty(query.getPage())) {
+            pageInfo.setCurrPage(query.getPage());
+        }
+
+        if (!ObjectUtils.isEmpty(query) && !ObjectUtils.isEmpty(query.getSize())) {
+            pageInfo.setPrePageResult(query.getSize());
+        }
+
+        if (ObjectUtils.isEmpty(query.getOrderColList())) {
+            query.setOrderColList(Arrays.asList(new OrderCol("id", "desc")));
+        }
+
+        return pageInfo;
+    }
+
+    protected void parsePageInfo(Map<String, Object> model, PageInfo pageInfo) {
+        model.put("total", pageInfo.getTotalResult());
+        model.put("per_page", pageInfo.getPrePageResult());
+        model.put("current_page", pageInfo.getCurrPage());
+        model.put("last_page", pageInfo.getTotalPage());
+        model.put("pageInfo", pageInfo);
+    }
+
+    protected void buildPermisionSql(UserFillHistoryEntity query) {
+        String sql = (String)this.request.getAttribute("DATA_PERMISSION_SEARCH_SQL");
+        if (!ObjectUtils.isEmpty(sql)) {
+            query.setPermissionSql(sql);
+        }
+
+    }
+
+    public static void main(String[] args) {
+        try {
+            String url = "http://192.168.0.98:8090" + "/wechat/homebase/msgCode";
+            Map<String, String> header = new HashMap<>();
+            header.put("siteid","1");
+            Map<String, String> paramsMap = new HashMap<>();
+            paramsMap.put("phone","kYaxRIs67vzhGBdE6Vz74g==");
+            String resp = resp = cn.hutool.http.HttpUtil.createPost(url).header("siteid","1").form("phone","kYaxRIs67vzhGBdE6Vz74g==").execute().body();
+            System.out.println("==============================");
+            System.out.println(resp);
+        }catch (Exception e){
+
+        }
+
+    }
+}

fill-manager/src/main/java/com/mortals/xhx/module/h5/WeChatMiniProgramController.java

+package com.mortals.xhx.module.h5;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.mortals.framework.annotation.RepeatSubmit;
+import com.mortals.framework.annotation.UnAuth;
+import com.mortals.framework.ap.GlobalSysInfo;
+import com.mortals.framework.common.Rest;
+import com.mortals.framework.exception.AppException;
+import com.mortals.framework.model.Context;
+import com.mortals.framework.model.OrderCol;
+import com.mortals.framework.model.PageInfo;
+import com.mortals.framework.model.Result;
+import com.mortals.framework.utils.BeanUtil;
+import com.mortals.framework.web.BaseJsonBodyController;
+import com.mortals.xhx.common.key.Constant;
+import com.mortals.xhx.module.datum.model.DatumInfoFieldEntity;
+import com.mortals.xhx.module.datum.model.DatumInfoFieldQuery;
+import com.mortals.xhx.module.datum.service.DatumInfoFieldService;
+import com.mortals.xhx.module.h5.pdu.WechatInfo;
+import com.mortals.xhx.module.h5.utils.WechatInfoUtil;
+import com.mortals.xhx.module.home.pdu.HomeQueryPdu;
+import com.mortals.xhx.module.hotword.model.HotwordEntity;
+import com.mortals.xhx.module.hotword.model.HotwordQuery;
+import com.mortals.xhx.module.hotword.service.HotwordService;
+import com.mortals.xhx.module.matter.model.MatterDatumEntity;
+import com.mortals.xhx.module.matter.model.MatterDatumQuery;
+import com.mortals.xhx.module.matter.model.MatterEntity;
+import com.mortals.xhx.module.matter.service.MatterDatumService;
+import com.mortals.xhx.module.matter.service.MatterService;
+import com.mortals.xhx.module.user.model.SearchHistoryEntity;
+import com.mortals.xhx.module.user.model.SearchHistoryQuery;
+import com.mortals.xhx.module.user.model.UserFillHistoryEntity;
+import com.mortals.xhx.module.user.service.SearchHistoryService;
+import com.mortals.xhx.module.user.service.UserFillHistoryService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
+import org.checkerframework.checker.units.qual.A;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.util.ObjectUtils;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * 微信小程序访问接口
+ */
+@RestController
+@RequestMapping("wx/h5")
+@Slf4j
+public class WeChatMiniProgramController extends BaseJsonBodyController {
+
+    /** php接口访问地址 */
+    @Value("${server.php:http://192.168.0.98:8090}")
+    private String phpServer;
+    private static String ACTION = "/wechat/homebase/realInfo";
+    @Autowired
+    private HotwordService hotwordService;
+    @Autowired
+    private SearchHistoryService searchHistoryService;
+    @Autowired
+    private DatumInfoFieldService datumInfoFieldService;
+    @Autowired
+    private MatterService matterService;
+    @Autowired
+    private MatterDatumService matterDatumService;
+    @Autowired
+    private UserFillHistoryService userFillHistoryService;
+
+    /**
+     * 首页数据，历史搜索和热搜
+     * @param homeQueryPdu
+     * @return
+     */
+    @PostMapping({"home/info"})
+    @UnAuth
+    public Rest<Object> h5HomePageInfo(@RequestBody HomeQueryPdu homeQueryPdu) {
+        log.info("h5HomePageInfo:{}", JSON.toJSONString(homeQueryPdu));
+
+        Rest<Object> ret = new Rest();
+        Map<String, Object> model = new HashMap();
+        String busiDesc = "获取首页数据";
+        int code = VALUE_RESULT_SUCCESS;
+        try {
+            HotwordQuery hotwordQuery = new HotwordQuery();
+            hotwordQuery.siteId(homeQueryPdu.getSiteId());
+            List<OrderCol> orderColList = new ArrayList<>();
+            orderColList.add(new OrderCol("wordsSource", OrderCol.ASCENDING));
+            orderColList.add(new OrderCol("searchCount", OrderCol.DESCENDING));
+            hotwordQuery.setOrderColList(orderColList);
+
+            PageInfo pageInfo = new PageInfo();
+            int nums = GlobalSysInfo.getParamIntValue(Constant.PARAMS_HOTWORDS_DEFAULT_NUM, 10);
+            pageInfo.setPrePageResult(nums);
+            List<HotwordEntity> hotwordEntities = hotwordService.find(hotwordQuery, pageInfo, null).getList();
+            model.put("hotWords", hotwordEntities);
+            model.put("searchHistory", Collections.emptyList());
+            try {
+                String authtoken = request.getHeader("Authtoken");
+                String phpUrl = phpServer + ACTION;
+                WechatInfo wechatInfo = WechatInfoUtil.getWxInfo(phpUrl, authtoken);
+                if(wechatInfo!=null){
+                    SearchHistoryQuery historyQuery = new SearchHistoryQuery();
+                    historyQuery.setOpenId(wechatInfo.getOpenid());
+                    historyQuery.setMobile(wechatInfo.getEnphone());
+                    historyQuery.setIdCard(wechatInfo.getEnidcard());
+                    historyQuery.setOrderColList(Arrays.asList(new OrderCol("createTime", OrderCol.DESCENDING)));
+                    pageInfo.setPrePageResult(5);
+                    List<SearchHistoryEntity> historyEntities = searchHistoryService.find(historyQuery,pageInfo,null).getList();
+                    model.put("searchHistory", historyEntities);
+                }
+            }catch (Exception e){
+                log.info(e.getMessage());
+            }
+            model.put("message_info", busiDesc + "成功");
+            this.recordSysLog(this.request, busiDesc + " 【成功】");
+        } catch (Exception var9) {
+            code = VALUE_RESULT_FAILURE;
+            this.doException(this.request, busiDesc, model, var9);
+        }
+        ret.setCode(code);
+        ret.setData(model);
+        ret.setDict(model.get("dict"));
+        ret.setMsg(model.get("message_info") == null ? "" : model.remove("message_info").toString());
+        // log.info("home resp:{}", JSON.toJSONString(ret));
+        return ret;
+    }
+
+    /**
+     * 获取我的数字资产列表
+     * @return
+     */
+    @PostMapping(value = "datum/info/field/list")
+    @UnAuth
+    public Rest<Object> fieldList() {
+        Map<String, Object> model = new HashMap<>();
+        Context context = this.getContext();
+        String busiDesc = "查询我的数字资产";
+        try {
+            DatumInfoFieldQuery query = new DatumInfoFieldQuery();
+            String authtoken = request.getHeader("Authtoken");
+            String phpUrl = phpServer + ACTION;
+            WechatInfo wechatInfo = WechatInfoUtil.getWxInfo(phpUrl, authtoken);
+            if(wechatInfo!=null){
+                String openId = wechatInfo.getOpenid();
+                String mobile = wechatInfo.getEnphone();
+                String idCard = wechatInfo.getEnidcard();
+                query.setOrConditionList(Arrays.asList(new DatumInfoFieldQuery().openId(openId),new DatumInfoFieldQuery().mobile(mobile),new DatumInfoFieldQuery().idCard(idCard)));
+            }
+            Rest<List<DatumInfoFieldEntity>> rest = datumInfoFieldService.distinctList(query, context);
+            model.put(KEY_RESULT_DATA, rest.getData());
+            recordSysLog(request, busiDesc + " 【成功】");
+        } catch (Exception e) {
+            this.doException(request, busiDesc, model, e);
+            return Rest.fail(e.getMessage());
+        }
+
+        return Rest.ok(model);
+    }
+
+    /**
+     * 修改我的数字资产列表
+     * @return
+     */
+    @PostMapping({"datum/info/field/save"})
+    @RepeatSubmit
+    @UnAuth
+    public Rest<Object> fieldSave(@RequestBody DatumInfoFieldEntity entity) {
+        Map<String, Object> model = new HashMap();
+        Context context = this.getContext();
+        String busiDesc = "修改我的数字资产";
+        try {
+            if(entity.getId()==null){
+                throw new AppException("id不能为空");
+            }
+            entity.setUpdateTime(new Date());
+            entity.setUpdateUserId(1L);
+            this.datumInfoFieldService.update(entity, context);
+            model.put("id", entity.getId());
+            model.put("entity", entity);
+            model.put("message_info", busiDesc + "成功");
+            this.recordSysLog(this.request, busiDesc + " 【成功】 [id:" + entity.getId() + "]");
+        } catch (Exception e) {
+            this.doException(this.request, busiDesc, model, e);
+            return Rest.fail(e.getMessage());
+        }
+        return Rest.ok(model);
+    }
+
+    /**
+     * 删除我的数字资产列表
+     * @return
+     */
+    @PostMapping({"datum/info/field/delete"})
+    @UnAuth
+    public Rest<Object> h5Delete(@RequestBody DatumInfoFieldEntity entity) {
+        Context context = this.getContext();
+        if (entity.getId() == null) {
+            return Rest.fail("请至少选择一条记录");
+        } else {
+            Map<String, Object> model = new HashMap();
+            String busiDesc = "删除记录";
+            try {
+                int iRet = this.datumInfoFieldService.remove(entity.getId(), context);
+                model.put("message_info",  "删除成功!删除条数:" + iRet);
+                this.recordSysLog(this.request, busiDesc + " 【成功】 [id:" + entity.getId() + "]");
+            } catch (Exception e) {
+                this.doException(this.request, busiDesc, model, e);
+                return Rest.fail(e.getMessage());
+            }
+            return Rest.ok(model);
+        }
+    }
+
+    /**
+     * 小程序搜索事项或者材料
+     * @param query
+     * @return
+     */
+    @PostMapping({"home/search"})
+    @UnAuth
+    public Rest<Object> homeSearch(@RequestBody MatterEntity query) {
+        Rest<Object> ret = new Rest();
+        Map<String, Object> model = new HashMap();
+        int code=1;
+        Context context = this.getContext();
+        PageInfo pageInfo = this.buildPageInfo(query);
+        String content = query.getMatterName();
+        query.setMatterName("%" + content + "%");
+        this.buildPermisionSql(query);
+        Result<MatterEntity> result = this.matterService.find(query, pageInfo, context);
+        model.put("matterList", result.getList());
+        MatterDatumQuery matterDatumQuery = new MatterDatumQuery();
+        matterDatumQuery.setMaterialName(query.getMatterName());
+        Result<MatterDatumEntity> result1 = this.matterDatumService.find(matterDatumQuery, pageInfo, context);
+        model.put("matterDatumList", result1.getList());
+        try {
+            String authtoken = request.getHeader("Authtoken");
+            String phpUrl = phpServer + ACTION;
+            WechatInfo wechatInfo = WechatInfoUtil.getWxInfo(phpUrl, authtoken);
+            if(wechatInfo!=null){
+                SearchHistoryEntity historyEntity = new SearchHistoryEntity();
+                historyEntity.initAttrValue();
+                historyEntity.setOpenId(wechatInfo.getOpenid());
+                historyEntity.setMobile(wechatInfo.getEnphone());
+                historyEntity.setIdCard(wechatInfo.getEnidcard());
+                historyEntity.setContent(content);
+                historyEntity.setCreateTime(new Date());
+                historyEntity.setCreateUserId(1L);
+                searchHistoryService.save(historyEntity);
+            }
+        }catch (Exception e){
+            code=-1;
+            log.info(e.getMessage());
+        }
+        ret.setCode(code);
+        ret.setData(model);
+        ret.setDict(model.get("dict"));
+        ret.setMsg(model.get("message_info") == null ? "" : model.remove("message_info").toString());
+        return ret;
+    }
+
+    protected PageInfo buildPageInfo(MatterEntity query) {
+        PageInfo pageInfo = new PageInfo();
+        if (!ObjectUtils.isEmpty(query) && !ObjectUtils.isEmpty(query.getPage())) {
+            pageInfo.setCurrPage(query.getPage());
+        }
+
+        if (!ObjectUtils.isEmpty(query) && !ObjectUtils.isEmpty(query.getSize())) {
+            pageInfo.setPrePageResult(query.getSize());
+        }
+
+        if (ObjectUtils.isEmpty(query.getOrderColList())) {
+            query.setOrderColList(Arrays.asList(new OrderCol("id", "desc")));
+        }
+
+        return pageInfo;
+    }
+
+    protected void buildPermisionSql(MatterEntity query) {
+        String sql = (String)this.request.getAttribute("DATA_PERMISSION_SEARCH_SQL");
+        if (!ObjectUtils.isEmpty(sql)) {
+            query.setPermissionSql(sql);
+        }
+
+    }
+
+    /**
+     * 小程序保存填单信息
+     * @param entity
+     * @return
+     */
+    @PostMapping({"user/fill/history/save"})
+    @RepeatSubmit
+    @UnAuth
+    public String saveFillHistory(@RequestBody UserFillHistoryEntity entity) {
+        Map<String, Object> model = new HashMap();
+        Context context = this.getContext();
+        int code = 1;
+        String busiDesc = "微信小程序保存填单记录";
+        try {
+            if (entity.newEntity()) {
+                UserFillHistoryEntity initEntity = new UserFillHistoryEntity();
+                initEntity.initAttrValue();
+                BeanUtils.copyProperties(entity, initEntity, BeanUtil.getNullPropertyNames(entity));
+                entity = initEntity;
+                initEntity.setCreateTime(new Date());
+                initEntity.setCreateUserId(1L);
+                String authtoken = request.getHeader("Authtoken");
+                String phpUrl = phpServer + ACTION;
+                WechatInfo wechatInfo = WechatInfoUtil.getWxInfo(phpUrl, authtoken);
+                if(wechatInfo!=null){
+                    initEntity.setOpenId(wechatInfo.getOpenid());
+                    initEntity.setMobile(wechatInfo.getEnphone());
+                    initEntity.setIdCard(wechatInfo.getEnidcard());
+                }
+                this.userFillHistoryService.save(initEntity, context);
+            } else {
+                entity.setUpdateTime(new Date());
+                entity.setUpdateUserId(1L);
+                this.userFillHistoryService.update(entity, context);
+            }
+            model.put("id", entity.getId());
+            model.put("entity", entity);
+            model.put("message_info", busiDesc + "成功");
+            this.recordSysLog(this.request, busiDesc + " 【成功】 [id:" + entity.getId() + "]");
+        } catch (Exception var9) {
+            this.doException(this.request, busiDesc, model, var9);
+            model.put("entity", entity);
+            code = -1;
+        }
+        JSONObject ret = new JSONObject();
+        ret.put("code", code);
+        ret.put("msg", model.remove("message_info"));
+        ret.put("data", model);
+        return ret.toJSONString();
+    }
+
+    /**
+     * 小程序获取事项材料详情
+     * @param query
+     * @return
+     */
+    @PostMapping({"matter/datum/info"})
+    @UnAuth
+    public String datumInfo(@RequestBody MatterDatumEntity query) {
+        Map<String, Object> model = new HashMap();
+        String busiDesc = "事项材料";
+        if (query.getId() == null) {
+            return this.createFailJsonResp("请选择待查看" + busiDesc + "信息");
+        } else {
+            JSONObject ret = new JSONObject();
+            Context context = this.getContext();
+            try {
+                MatterDatumEntity entity = this.matterDatumService.get(query.getId(), context);
+                if (entity == null) {
+                    throw new Exception(busiDesc + "，不存在或已被删除");
+                }
+                ret.put("data", entity);
+                List<MatterDatumEntity> datumEntityList = matterDatumService.find(new MatterDatumQuery().matterId(entity.getMatterId()));
+                ret.put("datumList", datumEntityList);
+
+                String authtoken = request.getHeader("Authtoken");
+                String phpUrl = phpServer + ACTION;
+                WechatInfo wechatInfo = WechatInfoUtil.getWxInfo(phpUrl, authtoken);
+                if(wechatInfo!=null){
+                    DatumInfoFieldQuery datumInfoFieldQuery = new DatumInfoFieldQuery();
+                    datumInfoFieldQuery.setMatterId(entity.getMatterId());
+                    datumInfoFieldQuery.setMaterialId(entity.getId());
+                    String openId = wechatInfo.getOpenid();
+                    String mobile = wechatInfo.getEnphone();
+                    String idCard = wechatInfo.getEnidcard();
+                    datumInfoFieldQuery.setOrConditionList(Arrays.asList(new DatumInfoFieldQuery().openId(openId),new DatumInfoFieldQuery().mobile(mobile),new DatumInfoFieldQuery().idCard(idCard)));
+                    datumInfoFieldQuery.setOrderColList(Arrays.asList(new OrderCol("createTime", OrderCol.DESCENDING)));
+                    List<DatumInfoFieldEntity> fieldEntities = datumInfoFieldService.find(datumInfoFieldQuery);
+                    if(CollectionUtils.isNotEmpty(fieldEntities)){
+                        Map<String,String> fieldMap = fieldEntities.stream().collect(Collectors.toMap(x -> x.getFieldCode(), y -> y.getFieldValue(), (o, n) -> n));
+                        JSONObject formTemplate = JSONObject.parseObject(entity.getFormContent());
+                        JSONArray formList = formTemplate.getJSONArray("list");
+                        for (int j = 0; j < formList.size(); j++) {
+                            JSONObject jsonObject = formList.getJSONObject(j);
+                            String key = jsonObject.getString("id");
+                            if(fieldMap.containsKey(key)){
+                                jsonObject.put("value",fieldMap.get(key));
+                            }
+                        }
+                        entity.setFormContent(formTemplate.toJSONString());
+                        ret.put("data", entity);
+                    }
+                }
+                if (!ObjectUtils.isEmpty(context) && !ObjectUtils.isEmpty(context.getUser())) {
+                    this.recordSysLog(this.request, busiDesc + " 【成功】");
+                }
+            } catch (Exception var8) {
+                this.doException(this.request, busiDesc, model, var8);
+                Object msg = model.get("message_info");
+                return this.createFailJsonResp(msg == null ? "系统异常" : msg.toString());
+            }
+            ret.put("code", 1);
+            ret.put("msg", model.remove("message_info"));
+            ret.put("dict", model.remove("dict"));
+            return ret.toJSONString();
+        }
+    }
+}

fill-manager/src/main/java/com/mortals/xhx/module/h5/pdu/MobileCodePdu.java

+package com.mortals.xhx.module.h5.pdu;
+
+import lombok.Data;
+
+@Data
+public class MobileCodePdu {
+    /**手机号码 加密后*/
+    private String phone;
+    /**验证码*/
+    private String code;
+
+    private String siteId;
+}

fill-manager/src/main/java/com/mortals/xhx/module/h5/pdu/WechatInfo.java

+package com.mortals.xhx.module.h5.pdu;
+
+import lombok.Data;
+
+@Data
+public class WechatInfo {
+    /** 加密后的身份证号码 */
+    private String enidcard;
+    /** 加密后的姓名 */
+    private String enname;
+    /** 加密后的手机号码 */
+    private String enphone;
+
+    private String openid;
+
+}

fill-manager/src/main/java/com/mortals/xhx/module/h5/utils/WechatInfoUtil.java

+package com.mortals.xhx.module.h5.utils;
+
+import com.alibaba.fastjson.JSONObject;
+import com.mortals.framework.exception.AppException;
+import com.mortals.framework.util.HttpUtil;
+import com.mortals.xhx.module.h5.pdu.WechatInfo;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class WechatInfoUtil {
+
+    public static WechatInfo getWxInfo(String url, String authtoken) {
+        try {
+            Map<String, String> headerMap = new HashMap<>();
+            headerMap.put("Authtoken",authtoken);
+            Map<String, String> paramsMap = new HashMap<>();
+            String resp = HttpUtil.doPost(url, headerMap,paramsMap);
+            JSONObject jsonObject = JSONObject.parseObject(resp);
+            if(jsonObject.getIntValue("code")==1){
+                WechatInfo wechatInfo = JSONObject.parseObject(jsonObject.getString("data"),WechatInfo.class);
+                return wechatInfo;
+            }else {
+                throw new AppException("用户没有实名信息");
+            }
+        }catch (Exception e) {
+            throw new AppException(e.getMessage());
+        }
+    }
+}

fill-manager/src/main/java/com/mortals/xhx/module/user/dao/SearchHistoryDao.java

+package com.mortals.xhx.module.user.dao;
+
+import com.mortals.framework.dao.ICRUDDao;
+import com.mortals.xhx.module.user.model.SearchHistoryEntity;
+import java.util.List;
+/**
+* 用户搜索历史记录Dao
+* 用户搜索历史记录 DAO接口
+*
+* @author zxfei
+* @date 2025-06-08
+*/
+
+public interface  SearchHistoryDao extends ICRUDDao<SearchHistoryEntity,Long>{
+
+
+}

fill-manager/src/main/java/com/mortals/xhx/module/user/dao/UserFillHistoryDao.java

+package com.mortals.xhx.module.user.dao;
+
+import com.mortals.framework.dao.ICRUDDao;
+import com.mortals.xhx.module.user.model.UserFillHistoryEntity;
+import java.util.List;
+/**
+* 用户填单记录Dao
+* 用户填单记录 DAO接口
+*
+* @author zxfei
+* @date 2025-06-08
+*/
+
+public interface  UserFillHistoryDao extends ICRUDDao<UserFillHistoryEntity,Long>{
+
+
+}

fill-manager/src/main/java/com/mortals/xhx/module/user/dao/ibatis/SearchHistoryDaoImpl.java

+package com.mortals.xhx.module.user.dao.ibatis;
+
+
+import org.springframework.stereotype.Repository;
+import com.mortals.xhx.module.user.dao.SearchHistoryDao;
+import com.mortals.xhx.module.user.model.SearchHistoryEntity;
+import java.util.Date;
+import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
+import java.util.List;
+/**
+* 用户搜索历史记录DaoImpl DAO接口
+*
+* @author zxfei
+* @date 2025-06-08
+*/
+@Repository("searchHistoryDao")
+public class SearchHistoryDaoImpl extends BaseCRUDDaoMybatis<SearchHistoryEntity,Long> implements SearchHistoryDao {
+
+
+
+}

fill-manager/src/main/java/com/mortals/xhx/module/user/dao/ibatis/UserFillHistoryDaoImpl.java

+package com.mortals.xhx.module.user.dao.ibatis;
+
+
+import org.springframework.stereotype.Repository;
+import com.mortals.xhx.module.user.dao.UserFillHistoryDao;
+import com.mortals.xhx.module.user.model.UserFillHistoryEntity;
+import java.util.Date;
+import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
+import java.util.List;
+/**
+* 用户填单记录DaoImpl DAO接口
+*
+* @author zxfei
+* @date 2025-06-08
+*/
+@Repository("userFillHistoryDao")
+public class UserFillHistoryDaoImpl extends BaseCRUDDaoMybatis<UserFillHistoryEntity,Long> implements UserFillHistoryDao {
+
+
+
+}

fill-manager/src/main/java/com/mortals/xhx/module/user/model/SearchHistoryEntity.java

+package com.mortals.xhx.module.user.model;
+import java.util.List;
+import java.util.ArrayList;
+import java.math.BigDecimal;
+import cn.hutool.core.date.DateUtil;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mortals.framework.annotation.Excel;
+import com.mortals.framework.model.BaseEntityLong;
+import com.mortals.xhx.module.user.model.vo.SearchHistoryVo;
+import lombok.Data;
+/**
+* 用户搜索历史记录实体对象
+*
+* @author zxfei
+* @date 2025-06-08
+*/
+@Data
+public class SearchHistoryEntity extends SearchHistoryVo {
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 微信openid
+    */
+    @Excel(name = "微信openid")
+    private String openId;
+    /**
+    * 身份证号码
+    */
+    private String idCard;
+    /**
+    * 手机号码
+    */
+    private String mobile;
+    /**
+    * 搜索内容
+    */
+    private String content;
+    @Override
+    public int hashCode() {
+         return this.getId().hashCode();
+    }
+    @Override
+    public boolean equals(Object obj) {
+        if (obj == null) return false;
+        if (obj instanceof SearchHistoryEntity) {
+            SearchHistoryEntity tmp = (SearchHistoryEntity) obj;
+            if (this.getId() == tmp.getId()) {
+                 return true;
+            }
+        }
+        return false;
+    }
+
+    public void initAttrValue(){
+            this.openId = "";
+            this.idCard = "";
+            this.mobile = "";
+            this.content = "";
+    }
+}
\ No newline at end of file

fill-manager/src/main/java/com/mortals/xhx/module/user/model/SearchHistoryQuery.java

+package com.mortals.xhx.module.user.model;
+
+import java.util.List;
+import com.mortals.xhx.module.user.model.SearchHistoryEntity;
+/**
+* 用户搜索历史记录查询对象
+*
+* @author zxfei
+* @date 2025-06-08
+*/
+public class SearchHistoryQuery extends SearchHistoryEntity {
+    /** 开始 主键ID，主键，自增长 */
+    private Long idStart;
+
+    /** 结束 主键ID，主键，自增长 */
+    private Long idEnd;
+
+    /** 增加 主键ID，主键，自增长 */
+    private Long idIncrement;
+
+    /** 主键ID，主键，自增长列表 */
+    private List <Long> idList;
+
+    /** 主键ID，主键，自增长排除列表 */
+    private List <Long> idNotList;
+
+    /** 微信openid */
+    private List<String> openIdList;
+
+    /** 微信openid排除列表 */
+    private List <String> openIdNotList;
+    /** 身份证号码 */
+    private List<String> idCardList;
+
+    /** 身份证号码排除列表 */
+    private List <String> idCardNotList;
+    /** 手机号码 */
+    private List<String> mobileList;
+
+    /** 手机号码排除列表 */
+    private List <String> mobileNotList;
+    /** 搜索内容 */
+    private List<String> contentList;
+
+    /** 搜索内容排除列表 */
+    private List <String> contentNotList;
+    /** 开始 创建时间 */
+    private String createTimeStart;
+
+    /** 结束 创建时间 */
+    private String createTimeEnd;
+
+    /** 开始 创建人id */
+    private Long createUserIdStart;
+
+    /** 结束 创建人id */
+    private Long createUserIdEnd;
+
+    /** 增加 创建人id */
+    private Long createUserIdIncrement;
+
+    /** 创建人id列表 */
+    private List <Long> createUserIdList;
+
+    /** 创建人id排除列表 */
+    private List <Long> createUserIdNotList;
+
+    /** 开始 更新时间 */
+    private String updateTimeStart;
+
+    /** 结束 更新时间 */
+    private String updateTimeEnd;
+
+    /** 开始 更新人id */
+    private Long updateUserIdStart;
+
+    /** 结束 更新人id */
+    private Long updateUserIdEnd;
+
+    /** 增加 更新人id */
+    private Long updateUserIdIncrement;
+
+    /** 更新人id列表 */
+    private List <Long> updateUserIdList;
+
+    /** 更新人id排除列表 */
+    private List <Long> updateUserIdNotList;
+
+    /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
+    private List<SearchHistoryQuery> orConditionList;
+
+    /** AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4) */
+    private List<SearchHistoryQuery> andConditionList;
+
+    public SearchHistoryQuery(){}
+
+    /**
+    * 获取 开始 主键ID，主键，自增长
+    * @return idStart
+    */
+    public Long getIdStart(){
+        return this.idStart;
+    }
+
+    /**
+    * 设置 开始 主键ID，主键，自增长
+    * @param idStart
+    */
+    public void setIdStart(Long idStart){
+        this.idStart = idStart;
+    }
+
+    /**
+    * 获取 结束 主键ID，主键，自增长
+    * @return $idEnd
+    */
+    public Long getIdEnd(){
+        return this.idEnd;
+    }
+
+    /**
+    * 设置 结束 主键ID，主键，自增长
+    * @param idEnd
+    */
+    public void setIdEnd(Long idEnd){
+        this.idEnd = idEnd;
+    }
+
+    /**
+    * 获取 增加 主键ID，主键，自增长
+    * @return idIncrement
+    */
+    public Long getIdIncrement(){
+        return this.idIncrement;
+    }
+
+    /**
+    * 设置 增加 主键ID，主键，自增长
+    * @param idIncrement
+    */
+    public void setIdIncrement(Long idIncrement){
+        this.idIncrement = idIncrement;
+    }
+
+    /**
+    * 获取 主键ID，主键，自增长
+    * @return idList
+    */
+    public List<Long> getIdList(){
+        return this.idList;
+    }
+
+    /**
+    * 设置 主键ID，主键，自增长
+    * @param idList
+    */
+    public void setIdList(List<Long> idList){
+        this.idList = idList;
+    }
+
+    /**
+    * 获取 主键ID，主键，自增长
+    * @return idNotList
+    */
+    public List<Long> getIdNotList(){
+        return this.idNotList;
+    }
+
+    /**
+    * 设置 主键ID，主键，自增长
+    * @param idNotList
+    */
+    public void setIdNotList(List<Long> idNotList){
+        this.idNotList = idNotList;
+    }
+
+
+    /**
+    * 获取 微信openid
+    * @return openIdList
+    */
+    public List<String> getOpenIdList(){
+        return this.openIdList;
+    }
+
+    /**
+    * 设置 微信openid
+    * @param openIdList
+    */
+    public void setOpenIdList(List<String> openIdList){
+        this.openIdList = openIdList;
+    }
+
+    /**
+    * 获取 微信openid
+    * @return openIdNotList
+    */
+    public List<String> getOpenIdNotList(){
+        return this.openIdNotList;
+    }
+
+    /**
+    * 设置 微信openid
+    * @param openIdNotList
+    */
+    public void setOpenIdNotList(List<String> openIdNotList){
+        this.openIdNotList = openIdNotList;
+    }
+
+    /**
+    * 获取 身份证号码
+    * @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 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;
+    }
+
+    /**
+    * 获取 搜索内容
+    * @return contentList
+    */
+    public List<String> getContentList(){
+        return this.contentList;
+    }
+
+    /**
+    * 设置 搜索内容
+    * @param contentList
+    */
+    public void setContentList(List<String> contentList){
+        this.contentList = contentList;
+    }
+
+    /**
+    * 获取 搜索内容
+    * @return contentNotList
+    */
+    public List<String> getContentNotList(){
+        return this.contentNotList;
+    }
+
+    /**
+    * 设置 搜索内容
+    * @param contentNotList
+    */
+    public void setContentNotList(List<String> contentNotList){
+        this.contentNotList = contentNotList;
+    }
+
+    /**
+    * 获取 开始 创建时间
+    * @return createTimeStart
+    */
+    public String getCreateTimeStart(){
+        return this.createTimeStart;
+    }
+
+    /**
+    * 设置 开始 创建时间
+    * @param createTimeStart
+    */
+    public void setCreateTimeStart(String createTimeStart){
+        this.createTimeStart = createTimeStart;
+    }
+
+    /**
+    * 获取 结束 创建时间
+    * @return createTimeEnd
+    */
+    public String getCreateTimeEnd(){
+        return this.createTimeEnd;
+    }
+
+    /**
+    * 设置 结束 创建时间
+    * @param createTimeEnd
+    */
+    public void setCreateTimeEnd(String createTimeEnd){
+        this.createTimeEnd = createTimeEnd;
+    }
+
+    /**
+    * 获取 开始 创建人id
+    * @return createUserIdStart
+    */
+    public Long getCreateUserIdStart(){
+        return this.createUserIdStart;
+    }
+
+    /**
+    * 设置 开始 创建人id
+    * @param createUserIdStart
+    */
+    public void setCreateUserIdStart(Long createUserIdStart){
+        this.createUserIdStart = createUserIdStart;
+    }
+
+    /**
+    * 获取 结束 创建人id
+    * @return $createUserIdEnd
+    */
+    public Long getCreateUserIdEnd(){
+        return this.createUserIdEnd;
+    }
+
+    /**
+    * 设置 结束 创建人id
+    * @param createUserIdEnd
+    */
+    public void setCreateUserIdEnd(Long createUserIdEnd){
+        this.createUserIdEnd = createUserIdEnd;
+    }
+
+    /**
+    * 获取 增加 创建人id
+    * @return createUserIdIncrement
+    */
+    public Long getCreateUserIdIncrement(){
+        return this.createUserIdIncrement;
+    }
+
+    /**
+    * 设置 增加 创建人id
+    * @param createUserIdIncrement
+    */
+    public void setCreateUserIdIncrement(Long createUserIdIncrement){
+        this.createUserIdIncrement = createUserIdIncrement;
+    }
+
+    /**
+    * 获取 创建人id
+    * @return createUserIdList
+    */
+    public List<Long> getCreateUserIdList(){
+        return this.createUserIdList;
+    }
+
+    /**
+    * 设置 创建人id
+    * @param createUserIdList
+    */
+    public void setCreateUserIdList(List<Long> createUserIdList){
+        this.createUserIdList = createUserIdList;
+    }
+
+    /**
+    * 获取 创建人id
+    * @return createUserIdNotList
+    */
+    public List<Long> getCreateUserIdNotList(){
+        return this.createUserIdNotList;
+    }
+
+    /**
+    * 设置 创建人id
+    * @param createUserIdNotList
+    */
+    public void setCreateUserIdNotList(List<Long> createUserIdNotList){
+        this.createUserIdNotList = createUserIdNotList;
+    }
+
+
+    /**
+    * 获取 开始 更新时间
+    * @return updateTimeStart
+    */
+    public String getUpdateTimeStart(){
+        return this.updateTimeStart;
+    }
+
+    /**
+    * 设置 开始 更新时间
+    * @param updateTimeStart
+    */
+    public void setUpdateTimeStart(String updateTimeStart){
+        this.updateTimeStart = updateTimeStart;
+    }
+
+    /**
+    * 获取 结束 更新时间
+    * @return updateTimeEnd
+    */
+    public String getUpdateTimeEnd(){
+        return this.updateTimeEnd;
+    }
+
+    /**
+    * 设置 结束 更新时间
+    * @param updateTimeEnd
+    */
+    public void setUpdateTimeEnd(String updateTimeEnd){
+        this.updateTimeEnd = updateTimeEnd;
+    }
+
+    /**
+    * 获取 开始 更新人id
+    * @return updateUserIdStart
+    */
+    public Long getUpdateUserIdStart(){
+        return this.updateUserIdStart;
+    }
+
+    /**
+    * 设置 开始 更新人id
+    * @param updateUserIdStart
+    */
+    public void setUpdateUserIdStart(Long updateUserIdStart){
+        this.updateUserIdStart = updateUserIdStart;
+    }
+
+    /**
+    * 获取 结束 更新人id
+    * @return $updateUserIdEnd
+    */
+    public Long getUpdateUserIdEnd(){
+        return this.updateUserIdEnd;
+    }
+
+    /**
+    * 设置 结束 更新人id
+    * @param updateUserIdEnd
+    */
+    public void setUpdateUserIdEnd(Long updateUserIdEnd){
+        this.updateUserIdEnd = updateUserIdEnd;
+    }
+
+    /**
+    * 获取 增加 更新人id
+    * @return updateUserIdIncrement
+    */
+    public Long getUpdateUserIdIncrement(){
+        return this.updateUserIdIncrement;
+    }
+
+    /**
+    * 设置 增加 更新人id
+    * @param updateUserIdIncrement
+    */
+    public void setUpdateUserIdIncrement(Long updateUserIdIncrement){
+        this.updateUserIdIncrement = updateUserIdIncrement;
+    }
+
+    /**
+    * 获取 更新人id
+    * @return updateUserIdList
+    */
+    public List<Long> getUpdateUserIdList(){
+        return this.updateUserIdList;
+    }
+
+    /**
+    * 设置 更新人id
+    * @param updateUserIdList
+    */
+    public void setUpdateUserIdList(List<Long> updateUserIdList){
+        this.updateUserIdList = updateUserIdList;
+    }
+
+    /**
+    * 获取 更新人id
+    * @return updateUserIdNotList
+    */
+    public List<Long> getUpdateUserIdNotList(){
+        return this.updateUserIdNotList;
+    }
+
+    /**
+    * 设置 更新人id
+    * @param updateUserIdNotList
+    */
+    public void setUpdateUserIdNotList(List<Long> updateUserIdNotList){
+        this.updateUserIdNotList = updateUserIdNotList;
+    }
+
+
+    /**
+    * 设置  主键ID，主键，自增长
+    * @param id
+    */
+    public SearchHistoryQuery id(Long id){
+	    setId(id);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 主键ID，主键，自增长
+    * @param idStart
+    */
+    public SearchHistoryQuery idStart(Long idStart){
+		this.idStart = idStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 主键ID，主键，自增长
+    * @param idEnd
+    */
+    public SearchHistoryQuery idEnd(Long idEnd){
+		this.idEnd = idEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 主键ID，主键，自增长
+    * @param idIncrement
+    */
+    public SearchHistoryQuery idIncrement(Long idIncrement){
+		this.idIncrement = idIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 主键ID，主键，自增长
+    * @param idList
+    */
+    public SearchHistoryQuery idList(List<Long> idList){
+        this.idList = idList;
+		return this;
+        }
+
+        /**
+        * 设置 主键ID，主键，自增长
+        * @param idNotList
+        */
+        public SearchHistoryQuery idNotList(List<Long> idNotList){
+        this.idNotList = idNotList;
+        return this;
+        }
+
+
+	/**
+    * 设置 微信openid
+    * @param openId
+    */
+    public SearchHistoryQuery openId(String openId){
+        setOpenId(openId);
+		return this;
+    }
+
+    /**
+    * 设置 微信openid
+    * @param openIdList
+    */
+    public SearchHistoryQuery openIdList(List<String> openIdList){
+        this.openIdList = openIdList;
+		return this;
+    }
+
+
+	/**
+    * 设置 身份证号码
+    * @param idCard
+    */
+    public SearchHistoryQuery idCard(String idCard){
+        setIdCard(idCard);
+		return this;
+    }
+
+    /**
+    * 设置 身份证号码
+    * @param idCardList
+    */
+    public SearchHistoryQuery idCardList(List<String> idCardList){
+        this.idCardList = idCardList;
+		return this;
+    }
+
+
+	/**
+    * 设置 手机号码
+    * @param mobile
+    */
+    public SearchHistoryQuery mobile(String mobile){
+        setMobile(mobile);
+		return this;
+    }
+
+    /**
+    * 设置 手机号码
+    * @param mobileList
+    */
+    public SearchHistoryQuery mobileList(List<String> mobileList){
+        this.mobileList = mobileList;
+		return this;
+    }
+
+
+	/**
+    * 设置 搜索内容
+    * @param content
+    */
+    public SearchHistoryQuery content(String content){
+        setContent(content);
+		return this;
+    }
+
+    /**
+    * 设置 搜索内容
+    * @param contentList
+    */
+    public SearchHistoryQuery contentList(List<String> contentList){
+        this.contentList = contentList;
+		return this;
+    }
+
+
+    /**
+    * 设置  创建人id
+    * @param createUserId
+    */
+    public SearchHistoryQuery createUserId(Long createUserId){
+	    setCreateUserId(createUserId);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 创建人id
+    * @param createUserIdStart
+    */
+    public SearchHistoryQuery createUserIdStart(Long createUserIdStart){
+		this.createUserIdStart = createUserIdStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 创建人id
+    * @param createUserIdEnd
+    */
+    public SearchHistoryQuery createUserIdEnd(Long createUserIdEnd){
+		this.createUserIdEnd = createUserIdEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 创建人id
+    * @param createUserIdIncrement
+    */
+    public SearchHistoryQuery createUserIdIncrement(Long createUserIdIncrement){
+		this.createUserIdIncrement = createUserIdIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 创建人id
+    * @param createUserIdList
+    */
+    public SearchHistoryQuery createUserIdList(List<Long> createUserIdList){
+        this.createUserIdList = createUserIdList;
+		return this;
+        }
+
+        /**
+        * 设置 创建人id
+        * @param createUserIdNotList
+        */
+        public SearchHistoryQuery createUserIdNotList(List<Long> createUserIdNotList){
+        this.createUserIdNotList = createUserIdNotList;
+        return this;
+        }
+
+
+    /**
+    * 设置  更新人id
+    * @param updateUserId
+    */
+    public SearchHistoryQuery updateUserId(Long updateUserId){
+	    setUpdateUserId(updateUserId);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 更新人id
+    * @param updateUserIdStart
+    */
+    public SearchHistoryQuery updateUserIdStart(Long updateUserIdStart){
+		this.updateUserIdStart = updateUserIdStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 更新人id
+    * @param updateUserIdEnd
+    */
+    public SearchHistoryQuery updateUserIdEnd(Long updateUserIdEnd){
+		this.updateUserIdEnd = updateUserIdEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 更新人id
+    * @param updateUserIdIncrement
+    */
+    public SearchHistoryQuery updateUserIdIncrement(Long updateUserIdIncrement){
+		this.updateUserIdIncrement = updateUserIdIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 更新人id
+    * @param updateUserIdList
+    */
+    public SearchHistoryQuery updateUserIdList(List<Long> updateUserIdList){
+        this.updateUserIdList = updateUserIdList;
+		return this;
+        }
+
+        /**
+        * 设置 更新人id
+        * @param updateUserIdNotList
+        */
+        public SearchHistoryQuery updateUserIdNotList(List<Long> updateUserIdNotList){
+        this.updateUserIdNotList = updateUserIdNotList;
+        return this;
+        }
+
+    /**
+    * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
+    * @return orConditionList
+    */
+    public List<SearchHistoryQuery> getOrConditionList(){
+    return this.orConditionList;
+    }
+
+    /**
+    * 设置 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
+    * @param orConditionList
+    */
+    public void setOrConditionList(List<SearchHistoryQuery> orConditionList){
+        this.orConditionList = orConditionList;
+    }
+
+    /**
+    * 获取 AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
+    * @return andConditionList
+    */
+    public List<SearchHistoryQuery> getAndConditionList(){
+        return this.andConditionList;
+    }
+
+    /**
+    * 设置 AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
+    * @param andConditionList
+    */
+    public void setAndConditionList(List<SearchHistoryQuery> andConditionList){
+        this.andConditionList = andConditionList;
+    }
+
+}
\ No newline at end of file

fill-manager/src/main/java/com/mortals/xhx/module/user/model/UserFillHistoryEntity.java

+package com.mortals.xhx.module.user.model;
+import java.util.List;
+import java.util.ArrayList;
+import java.math.BigDecimal;
+import cn.hutool.core.date.DateUtil;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mortals.framework.annotation.Excel;
+import com.mortals.framework.model.BaseEntityLong;
+import com.mortals.xhx.module.user.model.vo.UserFillHistoryVo;
+import lombok.Data;
+/**
+* 用户填单记录实体对象
+*
+* @author zxfei
+* @date 2025-06-08
+*/
+@Data
+public class UserFillHistoryEntity extends UserFillHistoryVo {
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 微信openid
+    */
+    @Excel(name = "微信openid")
+    private String openId;
+    /**
+    * 身份证号码
+    */
+    private String idCard;
+    /**
+    * 手机号码
+    */
+    private String mobile;
+    /**
+    * 事项id
+    */
+    private Long matterId;
+    /**
+    * 事项名称
+    */
+    private String matterName;
+    /**
+    * 材料id
+    */
+    private Long materialId;
+    /**
+    * 材料名称
+    */
+    private String materialName;
+    /**
+    * 预览地址
+    */
+    private String preViewPath;
+    /**
+    * 提交的表单
+    */
+    private String formContent;
+    /**
+    * 合成doc后地址
+    */
+    private String docPath;
+    /**
+    * 表单值
+    */
+    private String formValue;
+    @Override
+    public int hashCode() {
+         return this.getId().hashCode();
+    }
+    @Override
+    public boolean equals(Object obj) {
+        if (obj == null) return false;
+        if (obj instanceof UserFillHistoryEntity) {
+            UserFillHistoryEntity tmp = (UserFillHistoryEntity) obj;
+            if (this.getId() == tmp.getId()) {
+                 return true;
+            }
+        }
+        return false;
+    }
+
+    public void initAttrValue(){
+            this.openId = "";
+            this.idCard = "";
+            this.mobile = "";
+            this.matterId = null;
+            this.matterName = "";
+            this.materialId = null;
+            this.materialName = "";
+            this.preViewPath = "";
+            this.formContent = "";
+            this.docPath = "";
+            this.formValue = "";
+    }
+}
\ No newline at end of file

fill-manager/src/main/java/com/mortals/xhx/module/user/model/UserFillHistoryQuery.java

+package com.mortals.xhx.module.user.model;
+
+import java.util.List;
+import com.mortals.xhx.module.user.model.UserFillHistoryEntity;
+/**
+* 用户填单记录查询对象
+*
+* @author zxfei
+* @date 2025-06-08
+*/
+public class UserFillHistoryQuery extends UserFillHistoryEntity {
+    /** 开始 主键ID，主键，自增长 */
+    private Long idStart;
+
+    /** 结束 主键ID，主键，自增长 */
+    private Long idEnd;
+
+    /** 增加 主键ID，主键，自增长 */
+    private Long idIncrement;
+
+    /** 主键ID，主键，自增长列表 */
+    private List <Long> idList;
+
+    /** 主键ID，主键，自增长排除列表 */
+    private List <Long> idNotList;
+
+    /** 微信openid */
+    private List<String> openIdList;
+
+    /** 微信openid排除列表 */
+    private List <String> openIdNotList;
+    /** 身份证号码 */
+    private List<String> idCardList;
+
+    /** 身份证号码排除列表 */
+    private List <String> idCardNotList;
+    /** 手机号码 */
+    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;
+    /** 开始 材料id */
+    private Long materialIdStart;
+
+    /** 结束 材料id */
+    private Long materialIdEnd;
+
+    /** 增加 材料id */
+    private Long materialIdIncrement;
+
+    /** 材料id列表 */
+    private List <Long> materialIdList;
+
+    /** 材料id排除列表 */
+    private List <Long> materialIdNotList;
+
+    /** 材料名称 */
+    private List<String> materialNameList;
+
+    /** 材料名称排除列表 */
+    private List <String> materialNameNotList;
+    /** 预览地址 */
+    private List<String> preViewPathList;
+
+    /** 预览地址排除列表 */
+    private List <String> preViewPathNotList;
+    /** 提交的表单 */
+    private List<String> formContentList;
+
+    /** 提交的表单排除列表 */
+    private List <String> formContentNotList;
+    /** 合成doc后地址 */
+    private List<String> docPathList;
+
+    /** 合成doc后地址排除列表 */
+    private List <String> docPathNotList;
+    /** 表单值 */
+    private List<String> formValueList;
+
+    /** 表单值排除列表 */
+    private List <String> formValueNotList;
+    /** 开始 创建时间 */
+    private String createTimeStart;
+
+    /** 结束 创建时间 */
+    private String createTimeEnd;
+
+    /** 开始 创建人id */
+    private Long createUserIdStart;
+
+    /** 结束 创建人id */
+    private Long createUserIdEnd;
+
+    /** 增加 创建人id */
+    private Long createUserIdIncrement;
+
+    /** 创建人id列表 */
+    private List <Long> createUserIdList;
+
+    /** 创建人id排除列表 */
+    private List <Long> createUserIdNotList;
+
+    /** 开始 更新时间 */
+    private String updateTimeStart;
+
+    /** 结束 更新时间 */
+    private String updateTimeEnd;
+
+    /** 开始 更新人id */
+    private Long updateUserIdStart;
+
+    /** 结束 更新人id */
+    private Long updateUserIdEnd;
+
+    /** 增加 更新人id */
+    private Long updateUserIdIncrement;
+
+    /** 更新人id列表 */
+    private List <Long> updateUserIdList;
+
+    /** 更新人id排除列表 */
+    private List <Long> updateUserIdNotList;
+
+    /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
+    private List<UserFillHistoryQuery> orConditionList;
+
+    /** AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4) */
+    private List<UserFillHistoryQuery> andConditionList;
+
+    public UserFillHistoryQuery(){}
+
+    /**
+    * 获取 开始 主键ID，主键，自增长
+    * @return idStart
+    */
+    public Long getIdStart(){
+        return this.idStart;
+    }
+
+    /**
+    * 设置 开始 主键ID，主键，自增长
+    * @param idStart
+    */
+    public void setIdStart(Long idStart){
+        this.idStart = idStart;
+    }
+
+    /**
+    * 获取 结束 主键ID，主键，自增长
+    * @return $idEnd
+    */
+    public Long getIdEnd(){
+        return this.idEnd;
+    }
+
+    /**
+    * 设置 结束 主键ID，主键，自增长
+    * @param idEnd
+    */
+    public void setIdEnd(Long idEnd){
+        this.idEnd = idEnd;
+    }
+
+    /**
+    * 获取 增加 主键ID，主键，自增长
+    * @return idIncrement
+    */
+    public Long getIdIncrement(){
+        return this.idIncrement;
+    }
+
+    /**
+    * 设置 增加 主键ID，主键，自增长
+    * @param idIncrement
+    */
+    public void setIdIncrement(Long idIncrement){
+        this.idIncrement = idIncrement;
+    }
+
+    /**
+    * 获取 主键ID，主键，自增长
+    * @return idList
+    */
+    public List<Long> getIdList(){
+        return this.idList;
+    }
+
+    /**
+    * 设置 主键ID，主键，自增长
+    * @param idList
+    */
+    public void setIdList(List<Long> idList){
+        this.idList = idList;
+    }
+
+    /**
+    * 获取 主键ID，主键，自增长
+    * @return idNotList
+    */
+    public List<Long> getIdNotList(){
+        return this.idNotList;
+    }
+
+    /**
+    * 设置 主键ID，主键，自增长
+    * @param idNotList
+    */
+    public void setIdNotList(List<Long> idNotList){
+        this.idNotList = idNotList;
+    }
+
+
+    /**
+    * 获取 微信openid
+    * @return openIdList
+    */
+    public List<String> getOpenIdList(){
+        return this.openIdList;
+    }
+
+    /**
+    * 设置 微信openid
+    * @param openIdList
+    */
+    public void setOpenIdList(List<String> openIdList){
+        this.openIdList = openIdList;
+    }
+
+    /**
+    * 获取 微信openid
+    * @return openIdNotList
+    */
+    public List<String> getOpenIdNotList(){
+        return this.openIdNotList;
+    }
+
+    /**
+    * 设置 微信openid
+    * @param openIdNotList
+    */
+    public void setOpenIdNotList(List<String> openIdNotList){
+        this.openIdNotList = openIdNotList;
+    }
+
+    /**
+    * 获取 身份证号码
+    * @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 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;
+    }
+
+    /**
+    * 获取 开始 材料id
+    * @return materialIdStart
+    */
+    public Long getMaterialIdStart(){
+        return this.materialIdStart;
+    }
+
+    /**
+    * 设置 开始 材料id
+    * @param materialIdStart
+    */
+    public void setMaterialIdStart(Long materialIdStart){
+        this.materialIdStart = materialIdStart;
+    }
+
+    /**
+    * 获取 结束 材料id
+    * @return $materialIdEnd
+    */
+    public Long getMaterialIdEnd(){
+        return this.materialIdEnd;
+    }
+
+    /**
+    * 设置 结束 材料id
+    * @param materialIdEnd
+    */
+    public void setMaterialIdEnd(Long materialIdEnd){
+        this.materialIdEnd = materialIdEnd;
+    }
+
+    /**
+    * 获取 增加 材料id
+    * @return materialIdIncrement
+    */
+    public Long getMaterialIdIncrement(){
+        return this.materialIdIncrement;
+    }
+
+    /**
+    * 设置 增加 材料id
+    * @param materialIdIncrement
+    */
+    public void setMaterialIdIncrement(Long materialIdIncrement){
+        this.materialIdIncrement = materialIdIncrement;
+    }
+
+    /**
+    * 获取 材料id
+    * @return materialIdList
+    */
+    public List<Long> getMaterialIdList(){
+        return this.materialIdList;
+    }
+
+    /**
+    * 设置 材料id
+    * @param materialIdList
+    */
+    public void setMaterialIdList(List<Long> materialIdList){
+        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
+    */
+    public List<String> getMaterialNameList(){
+        return this.materialNameList;
+    }
+
+    /**
+    * 设置 材料名称
+    * @param materialNameList
+    */
+    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 preViewPathList
+    */
+    public List<String> getPreViewPathList(){
+        return this.preViewPathList;
+    }
+
+    /**
+    * 设置 预览地址
+    * @param preViewPathList
+    */
+    public void setPreViewPathList(List<String> preViewPathList){
+        this.preViewPathList = preViewPathList;
+    }
+
+    /**
+    * 获取 预览地址
+    * @return preViewPathNotList
+    */
+    public List<String> getPreViewPathNotList(){
+        return this.preViewPathNotList;
+    }
+
+    /**
+    * 设置 预览地址
+    * @param preViewPathNotList
+    */
+    public void setPreViewPathNotList(List<String> preViewPathNotList){
+        this.preViewPathNotList = preViewPathNotList;
+    }
+
+    /**
+    * 获取 提交的表单
+    * @return formContentList
+    */
+    public List<String> getFormContentList(){
+        return this.formContentList;
+    }
+
+    /**
+    * 设置 提交的表单
+    * @param formContentList
+    */
+    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;
+    }
+
+    /**
+    * 获取 合成doc后地址
+    * @return docPathList
+    */
+    public List<String> getDocPathList(){
+        return this.docPathList;
+    }
+
+    /**
+    * 设置 合成doc后地址
+    * @param docPathList
+    */
+    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 formValueList
+    */
+    public List<String> getFormValueList(){
+        return this.formValueList;
+    }
+
+    /**
+    * 设置 表单值
+    * @param formValueList
+    */
+    public void setFormValueList(List<String> formValueList){
+        this.formValueList = formValueList;
+    }
+
+    /**
+    * 获取 表单值
+    * @return formValueNotList
+    */
+    public List<String> getFormValueNotList(){
+        return this.formValueNotList;
+    }
+
+    /**
+    * 设置 表单值
+    * @param formValueNotList
+    */
+    public void setFormValueNotList(List<String> formValueNotList){
+        this.formValueNotList = formValueNotList;
+    }
+
+    /**
+    * 获取 开始 创建时间
+    * @return createTimeStart
+    */
+    public String getCreateTimeStart(){
+        return this.createTimeStart;
+    }
+
+    /**
+    * 设置 开始 创建时间
+    * @param createTimeStart
+    */
+    public void setCreateTimeStart(String createTimeStart){
+        this.createTimeStart = createTimeStart;
+    }
+
+    /**
+    * 获取 结束 创建时间
+    * @return createTimeEnd
+    */
+    public String getCreateTimeEnd(){
+        return this.createTimeEnd;
+    }
+
+    /**
+    * 设置 结束 创建时间
+    * @param createTimeEnd
+    */
+    public void setCreateTimeEnd(String createTimeEnd){
+        this.createTimeEnd = createTimeEnd;
+    }
+
+    /**
+    * 获取 开始 创建人id
+    * @return createUserIdStart
+    */
+    public Long getCreateUserIdStart(){
+        return this.createUserIdStart;
+    }
+
+    /**
+    * 设置 开始 创建人id
+    * @param createUserIdStart
+    */
+    public void setCreateUserIdStart(Long createUserIdStart){
+        this.createUserIdStart = createUserIdStart;
+    }
+
+    /**
+    * 获取 结束 创建人id
+    * @return $createUserIdEnd
+    */
+    public Long getCreateUserIdEnd(){
+        return this.createUserIdEnd;
+    }
+
+    /**
+    * 设置 结束 创建人id
+    * @param createUserIdEnd
+    */
+    public void setCreateUserIdEnd(Long createUserIdEnd){
+        this.createUserIdEnd = createUserIdEnd;
+    }
+
+    /**
+    * 获取 增加 创建人id
+    * @return createUserIdIncrement
+    */
+    public Long getCreateUserIdIncrement(){
+        return this.createUserIdIncrement;
+    }
+
+    /**
+    * 设置 增加 创建人id
+    * @param createUserIdIncrement
+    */
+    public void setCreateUserIdIncrement(Long createUserIdIncrement){
+        this.createUserIdIncrement = createUserIdIncrement;
+    }
+
+    /**
+    * 获取 创建人id
+    * @return createUserIdList
+    */
+    public List<Long> getCreateUserIdList(){
+        return this.createUserIdList;
+    }
+
+    /**
+    * 设置 创建人id
+    * @param createUserIdList
+    */
+    public void setCreateUserIdList(List<Long> createUserIdList){
+        this.createUserIdList = createUserIdList;
+    }
+
+    /**
+    * 获取 创建人id
+    * @return createUserIdNotList
+    */
+    public List<Long> getCreateUserIdNotList(){
+        return this.createUserIdNotList;
+    }
+
+    /**
+    * 设置 创建人id
+    * @param createUserIdNotList
+    */
+    public void setCreateUserIdNotList(List<Long> createUserIdNotList){
+        this.createUserIdNotList = createUserIdNotList;
+    }
+
+
+    /**
+    * 获取 开始 更新时间
+    * @return updateTimeStart
+    */
+    public String getUpdateTimeStart(){
+        return this.updateTimeStart;
+    }
+
+    /**
+    * 设置 开始 更新时间
+    * @param updateTimeStart
+    */
+    public void setUpdateTimeStart(String updateTimeStart){
+        this.updateTimeStart = updateTimeStart;
+    }
+
+    /**
+    * 获取 结束 更新时间
+    * @return updateTimeEnd
+    */
+    public String getUpdateTimeEnd(){
+        return this.updateTimeEnd;
+    }
+
+    /**
+    * 设置 结束 更新时间
+    * @param updateTimeEnd
+    */
+    public void setUpdateTimeEnd(String updateTimeEnd){
+        this.updateTimeEnd = updateTimeEnd;
+    }
+
+    /**
+    * 获取 开始 更新人id
+    * @return updateUserIdStart
+    */
+    public Long getUpdateUserIdStart(){
+        return this.updateUserIdStart;
+    }
+
+    /**
+    * 设置 开始 更新人id
+    * @param updateUserIdStart
+    */
+    public void setUpdateUserIdStart(Long updateUserIdStart){
+        this.updateUserIdStart = updateUserIdStart;
+    }
+
+    /**
+    * 获取 结束 更新人id
+    * @return $updateUserIdEnd
+    */
+    public Long getUpdateUserIdEnd(){
+        return this.updateUserIdEnd;
+    }
+
+    /**
+    * 设置 结束 更新人id
+    * @param updateUserIdEnd
+    */
+    public void setUpdateUserIdEnd(Long updateUserIdEnd){
+        this.updateUserIdEnd = updateUserIdEnd;
+    }
+
+    /**
+    * 获取 增加 更新人id
+    * @return updateUserIdIncrement
+    */
+    public Long getUpdateUserIdIncrement(){
+        return this.updateUserIdIncrement;
+    }
+
+    /**
+    * 设置 增加 更新人id
+    * @param updateUserIdIncrement
+    */
+    public void setUpdateUserIdIncrement(Long updateUserIdIncrement){
+        this.updateUserIdIncrement = updateUserIdIncrement;
+    }
+
+    /**
+    * 获取 更新人id
+    * @return updateUserIdList
+    */
+    public List<Long> getUpdateUserIdList(){
+        return this.updateUserIdList;
+    }
+
+    /**
+    * 设置 更新人id
+    * @param updateUserIdList
+    */
+    public void setUpdateUserIdList(List<Long> updateUserIdList){
+        this.updateUserIdList = updateUserIdList;
+    }
+
+    /**
+    * 获取 更新人id
+    * @return updateUserIdNotList
+    */
+    public List<Long> getUpdateUserIdNotList(){
+        return this.updateUserIdNotList;
+    }
+
+    /**
+    * 设置 更新人id
+    * @param updateUserIdNotList
+    */
+    public void setUpdateUserIdNotList(List<Long> updateUserIdNotList){
+        this.updateUserIdNotList = updateUserIdNotList;
+    }
+
+
+    /**
+    * 设置  主键ID，主键，自增长
+    * @param id
+    */
+    public UserFillHistoryQuery id(Long id){
+	    setId(id);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 主键ID，主键，自增长
+    * @param idStart
+    */
+    public UserFillHistoryQuery idStart(Long idStart){
+		this.idStart = idStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 主键ID，主键，自增长
+    * @param idEnd
+    */
+    public UserFillHistoryQuery idEnd(Long idEnd){
+		this.idEnd = idEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 主键ID，主键，自增长
+    * @param idIncrement
+    */
+    public UserFillHistoryQuery idIncrement(Long idIncrement){
+		this.idIncrement = idIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 主键ID，主键，自增长
+    * @param idList
+    */
+    public UserFillHistoryQuery idList(List<Long> idList){
+        this.idList = idList;
+		return this;
+        }
+
+        /**
+        * 设置 主键ID，主键，自增长
+        * @param idNotList
+        */
+        public UserFillHistoryQuery idNotList(List<Long> idNotList){
+        this.idNotList = idNotList;
+        return this;
+        }
+
+
+	/**
+    * 设置 微信openid
+    * @param openId
+    */
+    public UserFillHistoryQuery openId(String openId){
+        setOpenId(openId);
+		return this;
+    }
+
+    /**
+    * 设置 微信openid
+    * @param openIdList
+    */
+    public UserFillHistoryQuery openIdList(List<String> openIdList){
+        this.openIdList = openIdList;
+		return this;
+    }
+
+
+	/**
+    * 设置 身份证号码
+    * @param idCard
+    */
+    public UserFillHistoryQuery idCard(String idCard){
+        setIdCard(idCard);
+		return this;
+    }
+
+    /**
+    * 设置 身份证号码
+    * @param idCardList
+    */
+    public UserFillHistoryQuery idCardList(List<String> idCardList){
+        this.idCardList = idCardList;
+		return this;
+    }
+
+
+	/**
+    * 设置 手机号码
+    * @param mobile
+    */
+    public UserFillHistoryQuery mobile(String mobile){
+        setMobile(mobile);
+		return this;
+    }
+
+    /**
+    * 设置 手机号码
+    * @param mobileList
+    */
+    public UserFillHistoryQuery mobileList(List<String> mobileList){
+        this.mobileList = mobileList;
+		return this;
+    }
+
+    /**
+    * 设置  事项id
+    * @param matterId
+    */
+    public UserFillHistoryQuery matterId(Long matterId){
+	    setMatterId(matterId);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 事项id
+    * @param matterIdStart
+    */
+    public UserFillHistoryQuery matterIdStart(Long matterIdStart){
+		this.matterIdStart = matterIdStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 事项id
+    * @param matterIdEnd
+    */
+    public UserFillHistoryQuery matterIdEnd(Long matterIdEnd){
+		this.matterIdEnd = matterIdEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 事项id
+    * @param matterIdIncrement
+    */
+    public UserFillHistoryQuery matterIdIncrement(Long matterIdIncrement){
+		this.matterIdIncrement = matterIdIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 事项id
+    * @param matterIdList
+    */
+    public UserFillHistoryQuery matterIdList(List<Long> matterIdList){
+        this.matterIdList = matterIdList;
+		return this;
+        }
+
+        /**
+        * 设置 事项id
+        * @param matterIdNotList
+        */
+        public UserFillHistoryQuery matterIdNotList(List<Long> matterIdNotList){
+        this.matterIdNotList = matterIdNotList;
+        return this;
+        }
+
+
+	/**
+    * 设置 事项名称
+    * @param matterName
+    */
+    public UserFillHistoryQuery matterName(String matterName){
+        setMatterName(matterName);
+		return this;
+    }
+
+    /**
+    * 设置 事项名称
+    * @param matterNameList
+    */
+    public UserFillHistoryQuery matterNameList(List<String> matterNameList){
+        this.matterNameList = matterNameList;
+		return this;
+    }
+
+    /**
+    * 设置  材料id
+    * @param materialId
+    */
+    public UserFillHistoryQuery materialId(Long materialId){
+	    setMaterialId(materialId);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 材料id
+    * @param materialIdStart
+    */
+    public UserFillHistoryQuery materialIdStart(Long materialIdStart){
+		this.materialIdStart = materialIdStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 材料id
+    * @param materialIdEnd
+    */
+    public UserFillHistoryQuery materialIdEnd(Long materialIdEnd){
+		this.materialIdEnd = materialIdEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 材料id
+    * @param materialIdIncrement
+    */
+    public UserFillHistoryQuery materialIdIncrement(Long materialIdIncrement){
+		this.materialIdIncrement = materialIdIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 材料id
+    * @param materialIdList
+    */
+    public UserFillHistoryQuery materialIdList(List<Long> materialIdList){
+        this.materialIdList = materialIdList;
+		return this;
+        }
+
+        /**
+        * 设置 材料id
+        * @param materialIdNotList
+        */
+        public UserFillHistoryQuery materialIdNotList(List<Long> materialIdNotList){
+        this.materialIdNotList = materialIdNotList;
+        return this;
+        }
+
+
+	/**
+    * 设置 材料名称
+    * @param materialName
+    */
+    public UserFillHistoryQuery materialName(String materialName){
+        setMaterialName(materialName);
+		return this;
+    }
+
+    /**
+    * 设置 材料名称
+    * @param materialNameList
+    */
+    public UserFillHistoryQuery materialNameList(List<String> materialNameList){
+        this.materialNameList = materialNameList;
+		return this;
+    }
+
+
+	/**
+    * 设置 预览地址
+    * @param preViewPath
+    */
+    public UserFillHistoryQuery preViewPath(String preViewPath){
+        setPreViewPath(preViewPath);
+		return this;
+    }
+
+    /**
+    * 设置 预览地址
+    * @param preViewPathList
+    */
+    public UserFillHistoryQuery preViewPathList(List<String> preViewPathList){
+        this.preViewPathList = preViewPathList;
+		return this;
+    }
+
+
+	/**
+    * 设置 提交的表单
+    * @param formContent
+    */
+    public UserFillHistoryQuery formContent(String formContent){
+        setFormContent(formContent);
+		return this;
+    }
+
+    /**
+    * 设置 提交的表单
+    * @param formContentList
+    */
+    public UserFillHistoryQuery formContentList(List<String> formContentList){
+        this.formContentList = formContentList;
+		return this;
+    }
+
+
+	/**
+    * 设置 合成doc后地址
+    * @param docPath
+    */
+    public UserFillHistoryQuery docPath(String docPath){
+        setDocPath(docPath);
+		return this;
+    }
+
+    /**
+    * 设置 合成doc后地址
+    * @param docPathList
+    */
+    public UserFillHistoryQuery docPathList(List<String> docPathList){
+        this.docPathList = docPathList;
+		return this;
+    }
+
+
+	/**
+    * 设置 表单值
+    * @param formValue
+    */
+    public UserFillHistoryQuery formValue(String formValue){
+        setFormValue(formValue);
+		return this;
+    }
+
+    /**
+    * 设置 表单值
+    * @param formValueList
+    */
+    public UserFillHistoryQuery formValueList(List<String> formValueList){
+        this.formValueList = formValueList;
+		return this;
+    }
+
+
+    /**
+    * 设置  创建人id
+    * @param createUserId
+    */
+    public UserFillHistoryQuery createUserId(Long createUserId){
+	    setCreateUserId(createUserId);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 创建人id
+    * @param createUserIdStart
+    */
+    public UserFillHistoryQuery createUserIdStart(Long createUserIdStart){
+		this.createUserIdStart = createUserIdStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 创建人id
+    * @param createUserIdEnd
+    */
+    public UserFillHistoryQuery createUserIdEnd(Long createUserIdEnd){
+		this.createUserIdEnd = createUserIdEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 创建人id
+    * @param createUserIdIncrement
+    */
+    public UserFillHistoryQuery createUserIdIncrement(Long createUserIdIncrement){
+		this.createUserIdIncrement = createUserIdIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 创建人id
+    * @param createUserIdList
+    */
+    public UserFillHistoryQuery createUserIdList(List<Long> createUserIdList){
+        this.createUserIdList = createUserIdList;
+		return this;
+        }
+
+        /**
+        * 设置 创建人id
+        * @param createUserIdNotList
+        */
+        public UserFillHistoryQuery createUserIdNotList(List<Long> createUserIdNotList){
+        this.createUserIdNotList = createUserIdNotList;
+        return this;
+        }
+
+
+    /**
+    * 设置  更新人id
+    * @param updateUserId
+    */
+    public UserFillHistoryQuery updateUserId(Long updateUserId){
+	    setUpdateUserId(updateUserId);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 更新人id
+    * @param updateUserIdStart
+    */
+    public UserFillHistoryQuery updateUserIdStart(Long updateUserIdStart){
+		this.updateUserIdStart = updateUserIdStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 更新人id
+    * @param updateUserIdEnd
+    */
+    public UserFillHistoryQuery updateUserIdEnd(Long updateUserIdEnd){
+		this.updateUserIdEnd = updateUserIdEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 更新人id
+    * @param updateUserIdIncrement
+    */
+    public UserFillHistoryQuery updateUserIdIncrement(Long updateUserIdIncrement){
+		this.updateUserIdIncrement = updateUserIdIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 更新人id
+    * @param updateUserIdList
+    */
+    public UserFillHistoryQuery updateUserIdList(List<Long> updateUserIdList){
+        this.updateUserIdList = updateUserIdList;
+		return this;
+        }
+
+        /**
+        * 设置 更新人id
+        * @param updateUserIdNotList
+        */
+        public UserFillHistoryQuery updateUserIdNotList(List<Long> updateUserIdNotList){
+        this.updateUserIdNotList = updateUserIdNotList;
+        return this;
+        }
+
+    /**
+    * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
+    * @return orConditionList
+    */
+    public List<UserFillHistoryQuery> getOrConditionList(){
+    return this.orConditionList;
+    }
+
+    /**
+    * 设置 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
+    * @param orConditionList
+    */
+    public void setOrConditionList(List<UserFillHistoryQuery> orConditionList){
+        this.orConditionList = orConditionList;
+    }
+
+    /**
+    * 获取 AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
+    * @return andConditionList
+    */
+    public List<UserFillHistoryQuery> getAndConditionList(){
+        return this.andConditionList;
+    }
+
+    /**
+    * 设置 AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
+    * @param andConditionList
+    */
+    public void setAndConditionList(List<UserFillHistoryQuery> andConditionList){
+        this.andConditionList = andConditionList;
+    }
+
+}
\ No newline at end of file

fill-manager/src/main/java/com/mortals/xhx/module/user/model/vo/SearchHistoryVo.java

+package com.mortals.xhx.module.user.model.vo;
+import com.mortals.framework.model.BaseEntityLong;
+import com.mortals.xhx.module.user.model.SearchHistoryEntity;
+import java.util.ArrayList;
+import java.util.List;
+import lombok.Data;
+import com.mortals.framework.annotation.Excel;
+import java.math.BigDecimal;
+import java.util.Date;
+/**
+* 用户搜索历史记录视图对象
+*
+* @author zxfei
+* @date 2025-06-08
+*/
+@Data
+public class SearchHistoryVo extends BaseEntityLong {
+
+    /** 主键ID，主键，自增长列表 */
+    private List <Long> idList;
+
+
+}
\ No newline at end of file

fill-manager/src/main/java/com/mortals/xhx/module/user/model/vo/UserFillHistoryVo.java

+package com.mortals.xhx.module.user.model.vo;
+import com.mortals.framework.model.BaseEntityLong;
+import com.mortals.xhx.module.user.model.UserFillHistoryEntity;
+import java.util.ArrayList;
+import java.util.List;
+import lombok.Data;
+import com.mortals.framework.annotation.Excel;
+import java.math.BigDecimal;
+import java.util.Date;
+/**
+* 用户填单记录视图对象
+*
+* @author zxfei
+* @date 2025-06-08
+*/
+@Data
+public class UserFillHistoryVo extends BaseEntityLong {
+
+    /** 主键ID，主键，自增长列表 */
+    private List <Long> idList;
+
+
+}
\ No newline at end of file

fill-manager/src/main/java/com/mortals/xhx/module/user/service/SearchHistoryService.java

+package com.mortals.xhx.module.user.service;
+import com.mortals.framework.service.ICRUDService;
+import com.mortals.xhx.module.user.model.SearchHistoryEntity;
+import com.mortals.xhx.module.user.dao.SearchHistoryDao;
+/**
+* SearchHistoryService
+*
+* 用户搜索历史记录 service接口
+*
+* @author zxfei
+* @date 2025-06-08
+*/
+public interface SearchHistoryService extends ICRUDService<SearchHistoryEntity,Long>{
+
+    SearchHistoryDao getDao();
+}
\ No newline at end of file

fill-manager/src/main/java/com/mortals/xhx/module/user/service/UserFillHistoryService.java

+package com.mortals.xhx.module.user.service;
+import com.mortals.framework.service.ICRUDService;
+import com.mortals.xhx.module.user.model.UserFillHistoryEntity;
+import com.mortals.xhx.module.user.dao.UserFillHistoryDao;
+/**
+* UserFillHistoryService
+*
+* 用户填单记录 service接口
+*
+* @author zxfei
+* @date 2025-06-08
+*/
+public interface UserFillHistoryService extends ICRUDService<UserFillHistoryEntity,Long>{
+
+    UserFillHistoryDao getDao();
+}
\ No newline at end of file

fill-manager/src/main/java/com/mortals/xhx/module/user/service/impl/SearchHistoryServiceImpl.java

+package com.mortals.xhx.module.user.service.impl;
+import com.mortals.framework.model.PageInfo;
+import org.springframework.beans.BeanUtils;
+import java.util.function.Function;
+import org.springframework.stereotype.Service;
+import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
+import com.mortals.framework.exception.AppException;
+import com.mortals.framework.model.Context;
+import com.mortals.xhx.module.user.dao.SearchHistoryDao;
+import com.mortals.xhx.module.user.model.SearchHistoryEntity;
+import com.mortals.xhx.module.user.service.SearchHistoryService;
+import lombok.extern.slf4j.Slf4j;
+/**
+* SearchHistoryService
+* 用户搜索历史记录 service实现
+*
+* @author zxfei
+* @date 2025-06-08
+*/
+@Service("searchHistoryService")
+@Slf4j
+public class SearchHistoryServiceImpl extends AbstractCRUDServiceImpl<SearchHistoryDao, SearchHistoryEntity, Long> implements SearchHistoryService {
+    
+}
\ No newline at end of file

fill-manager/src/main/java/com/mortals/xhx/module/user/service/impl/UserFillHistoryServiceImpl.java

+package com.mortals.xhx.module.user.service.impl;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.mortals.framework.model.PageInfo;
+import com.mortals.framework.utils.BeanUtil;
+import com.mortals.xhx.common.utils.StringUtils;
+import com.mortals.xhx.module.datum.model.DatumInfoFieldEntity;
+import com.mortals.xhx.module.datum.model.DatumInfoFieldQuery;
+import com.mortals.xhx.module.datum.service.DatumInfoFieldService;
+import com.mortals.xhx.module.matter.model.MatterDatumEntity;
+import com.mortals.xhx.module.matter.service.MatterDatumService;
+import org.apache.commons.collections4.CollectionUtils;
+import org.springframework.beans.BeanUtils;
+
+import java.util.*;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
+import com.mortals.framework.exception.AppException;
+import com.mortals.framework.model.Context;
+import com.mortals.xhx.module.user.dao.UserFillHistoryDao;
+import com.mortals.xhx.module.user.model.UserFillHistoryEntity;
+import com.mortals.xhx.module.user.service.UserFillHistoryService;
+import lombok.extern.slf4j.Slf4j;
+/**
+* UserFillHistoryService
+* 用户填单记录 service实现
+*
+* @author zxfei
+* @date 2025-06-08
+*/
+@Service("userFillHistoryService")
+@Slf4j
+public class UserFillHistoryServiceImpl extends AbstractCRUDServiceImpl<UserFillHistoryDao, UserFillHistoryEntity, Long> implements UserFillHistoryService {
+
+    @Autowired
+    private MatterDatumService matterDatumService;
+    @Autowired
+    private DatumInfoFieldService datumInfoFieldService;
+
+    @Override
+    protected void validData(UserFillHistoryEntity entity, Context context) throws AppException {
+        if(entity.getMaterialId()==null){
+            throw new AppException("材料id不能为空");
+        }
+        MatterDatumEntity datumEntity = matterDatumService.get(entity.getMaterialId());
+        if(datumEntity==null){
+            throw new AppException("材料id错误");
+        }
+        entity.setMaterialName(datumEntity.getMaterialName());
+        entity.setMatterId(datumEntity.getMatterId());
+        entity.setMatterName(datumEntity.getMatterName());
+        entity.setPreViewPath(datumEntity.getPreViewPath());
+        if(StringUtils.isNotEmpty(entity.getFormValue())){
+            JSONObject value = JSONObject.parseObject(entity.getFormValue());
+            JSONObject formTemplate = JSONObject.parseObject(datumEntity.getFormContent());
+            JSONArray formList = formTemplate.getJSONArray("list");
+            for (int j = 0; j < formList.size(); j++) {
+                JSONObject jsonObject = formList.getJSONObject(j);
+                String key = jsonObject.getString("id");
+                if(value.containsKey(key)){
+                    jsonObject.put("value",value.getString(key));
+                }
+            }
+            entity.setFormContent(formTemplate.toJSONString());
+        }
+    }
+
+    @Override
+    protected void saveAfter(UserFillHistoryEntity entity, Context context) throws AppException {
+        saveUserDatumField(entity);
+    }
+    @Override
+    protected void updateAfter(UserFillHistoryEntity entity, Context context) throws AppException {
+        saveUserDatumField(entity);
+    }
+
+    private void saveUserDatumField(UserFillHistoryEntity entity){
+        if(StringUtils.isNotEmpty(entity.getFormContent())){
+            List<DatumInfoFieldEntity> datumInfoFieldList = datumInfoFieldService.find(new DatumInfoFieldQuery().openId(entity.getOpenId()).matterId(entity.getMatterId()).materialId(entity.getMaterialId()));
+            Map<String,DatumInfoFieldEntity> fieldMap = new HashMap<>();
+            if(CollectionUtils.isNotEmpty(datumInfoFieldList)){
+                fieldMap = datumInfoFieldList.stream().collect(Collectors.toMap(i->i.getFieldCode(),Function.identity()));
+            }
+            List<DatumInfoFieldEntity> updateList = new ArrayList<>();
+            List<DatumInfoFieldEntity> addList = new ArrayList<>();
+            JSONObject formTemplate = JSONObject.parseObject(entity.getFormContent());
+            JSONArray formList = formTemplate.getJSONArray("list");
+            for (int j = 0; j < formList.size(); j++) {
+                JSONObject jsonObject = formList.getJSONObject(j);
+                String key = jsonObject.getString("id");
+                String value = jsonObject.getString("value");
+                if(fieldMap.containsKey(key)){
+                    fieldMap.get(key).setFieldValue(value);
+                    fieldMap.get(key).setUpdateUserId(1L);
+                    fieldMap.get(key).setUpdateTime(new Date());
+                    updateList.add(fieldMap.get(key));
+                }else {
+                    DatumInfoFieldEntity newEntity = new DatumInfoFieldEntity();
+                    newEntity.initAttrValue();
+                    BeanUtils.copyProperties(entity,newEntity, BeanUtil.getNullPropertyNames(entity));
+                    newEntity.setFieldCode(key);
+                    newEntity.setFieldValue(value);
+                    newEntity.setFieldName(jsonObject.getString("label"));
+                    newEntity.setFieldLen(jsonObject.getIntValue("maxLength"));
+                    newEntity.setFieldNull(jsonObject.getIntValue("required"));
+                    //newEntity.setFieldOrderNo(jsonObject.getString("label"));
+                    newEntity.setFieldType(jsonObject.getString("compType"));
+                    newEntity.setFieldTypeValue(jsonObject.getString("label"));
+                    addList.add(newEntity);
+                }
+            }
+            if(updateList.size()>0){
+                datumInfoFieldService.update(updateList);
+            }
+            if(addList.size()>0){
+                datumInfoFieldService.save(addList);
+            }
+        }
+    }
+}
\ No newline at end of file

fill-manager/src/main/java/com/mortals/xhx/module/user/web/SearchHistoryController.java

+package com.mortals.xhx.module.user.web;
+import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
+import com.mortals.xhx.base.system.param.service.ParamService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+import com.mortals.framework.model.Context;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
+import com.mortals.xhx.module.user.model.SearchHistoryEntity;
+import com.mortals.xhx.module.user.service.SearchHistoryService;
+import org.apache.commons.lang3.ArrayUtils;
+import com.mortals.framework.util.StringUtils;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import com.alibaba.fastjson.JSONObject;
+import java.util.Arrays;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import static com.mortals.framework.ap.SysConstains.*;
+import com.mortals.xhx.common.code.*;
+/**
+*
+* 用户搜索历史记录
+*
+* @author zxfei
+* @date 2025-06-08
+*/
+@RestController
+@RequestMapping("search/history")
+public class SearchHistoryController extends BaseCRUDJsonBodyMappingController<SearchHistoryService,SearchHistoryEntity,Long> {
+
+    @Autowired
+    private ParamService paramService;
+
+    public SearchHistoryController(){
+        super.setModuleDesc( "用户搜索历史记录");
+    }
+
+    @Override
+    protected void init(Map<String, Object> model, Context context) {
+        super.init(model, context);
+    }
+
+
+}
\ No newline at end of file

fill-manager/src/main/java/com/mortals/xhx/module/user/web/UserFillHistoryController.java

+package com.mortals.xhx.module.user.web;
+import com.mortals.framework.annotation.RepeatSubmit;
+import com.mortals.framework.annotation.UnAuth;
+import com.mortals.framework.exception.AppException;
+import com.mortals.framework.model.BaseEntity;
+import com.mortals.framework.service.IUser;
+import com.mortals.framework.util.HttpUtil;
+import com.mortals.framework.utils.BeanUtil;
+import com.mortals.framework.utils.ReflectUtils;
+import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
+import com.mortals.xhx.base.system.param.service.ParamService;
+import com.mortals.xhx.module.user.model.SearchHistoryEntity;
+import com.mortals.xhx.module.user.model.SearchHistoryQuery;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+import com.mortals.framework.model.Context;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
+import com.mortals.xhx.module.user.model.UserFillHistoryEntity;
+import com.mortals.xhx.module.user.service.UserFillHistoryService;
+import org.apache.commons.lang3.ArrayUtils;
+import com.mortals.framework.util.StringUtils;
+
+import java.util.*;
+import java.util.stream.Collectors;
+import com.alibaba.fastjson.JSONObject;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import static com.mortals.framework.ap.SysConstains.*;
+import com.mortals.xhx.common.code.*;
+/**
+*
+* 用户填单记录
+*
+* @author zxfei
+* @date 2025-06-08
+*/
+@RestController
+@RequestMapping("user/fill/history")
+public class UserFillHistoryController extends BaseCRUDJsonBodyMappingController<UserFillHistoryService,UserFillHistoryEntity,Long> {
+
+    @Autowired
+    private ParamService paramService;
+
+    @Value("${server.php:http://192.168.0.98:8090}")
+    private String phpServer;
+
+
+    public UserFillHistoryController(){
+        super.setModuleDesc( "用户填单记录");
+    }
+
+    @Override
+    protected void init(Map<String, Object> model, Context context) {
+        super.init(model, context);
+    }
+
+    @PostMapping({"h5/save"})
+    @RepeatSubmit
+    @UnAuth
+    public String saveH5(@RequestBody UserFillHistoryEntity entity) {
+        Map<String, Object> model = new HashMap();
+        Context context = this.getContext();
+        int code = 1;
+        String busiDesc = "H5保存" + this.getModuleDesc();
+        try {
+            this.saveBefore(entity, model, context);
+            if (entity.newEntity()) {
+                UserFillHistoryEntity initEntity = new UserFillHistoryEntity();
+                initEntity.initAttrValue();
+                BeanUtils.copyProperties(entity, initEntity, BeanUtil.getNullPropertyNames(entity));
+                entity = initEntity;
+                busiDesc = "H5新增" + this.getModuleDesc();
+                initEntity.setCreateTime(new Date());
+                initEntity.setCreateUserId(1L);
+
+                String authtoken = request.getHeader("Authtoken");
+                String phpUrl = phpServer + "/wechat/homebase/realInfo";
+                JSONObject resp = getWxInfo(phpUrl,authtoken);
+                if(resp!=null){
+                    initEntity.setOpenId(resp.getString("openId"));
+                    initEntity.setMobile(resp.getString("mobile"));
+                    initEntity.setIdCard(resp.getString("idCard"));
+                }
+                this.service.save(initEntity, context);
+            } else {
+                busiDesc = "H5修改" + this.getModuleDesc();
+                entity.setUpdateTime(new Date());
+                entity.setUpdateUserId(1L);
+
+                this.service.update(entity, context);
+            }
+
+            model.put("id", entity.getId());
+            code = this.saveAfter(entity, model, context);
+            model.put("entity", entity);
+            model.put("message_info", busiDesc + "成功");
+            this.recordSysLog(this.request, busiDesc + " 【成功】 [id:" + entity.getId() + "]");
+        } catch (Exception var9) {
+            this.doException(this.request, busiDesc, model, var9);
+            model.put("entity", entity);
+            this.init(model, context);
+            code = this.saveException(entity, model, context, var9);
+        }
+
+        this.init(model, context);
+        JSONObject ret = new JSONObject();
+        ret.put("code", code);
+        ret.put("msg", model.remove("message_info"));
+        ret.put("data", model);
+        return ret.toJSONString();
+    }
+
+    private JSONObject getWxInfo(String url,String authtoken) {
+        String resp = null;
+        try {
+            Map<String, String> headerMap = new HashMap<>();
+            headerMap.put("Authtoken",authtoken);
+            Map<String, String> paramsMap = new HashMap<>();
+            resp = HttpUtil.doPost(url, headerMap,paramsMap);
+            JSONObject jsonObject = JSONObject.parseObject(resp);
+            if(jsonObject.getIntValue("code")==1){
+                String openId = JSONObject.parseObject(jsonObject.getString("data")).getString("openid");
+                String enphone = JSONObject.parseObject(jsonObject.getString("data")).getString("enphone");
+                String enidcard = JSONObject.parseObject(jsonObject.getString("data")).getString("enidcard");
+//                String idCard = AESUtil.decryptCBC(enidcard,RANDOM);
+//                String mobile = AESUtil.decryptCBC(enphone,RANDOM);
+                JSONObject result = new JSONObject();
+                result.put("openId",openId);
+                result.put("idCard",enidcard);
+                result.put("mobile",enphone);
+                return result;
+            }else {
+                throw new AppException("用户没有实名信息");
+            }
+        }catch (Exception e) {
+            throw new AppException(e.getMessage());
+        }
+    }
+
+}
\ No newline at end of file

fill-manager/src/main/resources/sqlmap/module/datum/DatumInfoFieldMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "mybatis-3-mapper.dtd">
+"mybatis-3-mapper.dtd">
 <mapper namespace="com.mortals.xhx.module.datum.dao.ibatis.DatumInfoFieldDaoImpl">
 
     <!-- 字段和属性映射 -->
     <resultMap type="DatumInfoFieldEntity" id="DatumInfoFieldEntity-Map">
             <id  property="id" column="id" />
-        <result property="datumPrintId" column="datum_print_id" />
+            <result property="openId" column="openId" />
+            <result property="idCard" column="idCard" />
+            <result property="mobile" column="mobile" />
+            <result property="datumPrintId" column="datumPrintId" />
             <result property="fieldCode" column="fieldCode" />
             <result property="fieldName" column="fieldName" />
             <result property="fieldType" column="fieldType" />
@@ -23,19 +26,29 @@
             <result property="createUserId" column="createUserId" />
             <result property="updateTime" column="updateTime" />
             <result property="updateUserId" column="updateUserId" />
-        <result property="idCard" column="idCard" />
-
+            <result property="matterId" column="matterId" />
+            <result property="matterName" column="matterName" />
+            <result property="materialId" column="materialId" />
+            <result property="materialName" column="materialName" />
     </resultMap>
 
-
     <!-- 表所有列 -->
     <sql id="_columns">
         <trim suffixOverrides="," suffix="">
                 <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('id') or colPickMode == 1 and data.containsKey('id')))">
                     a.id,
                 </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('openId') or colPickMode == 1 and data.containsKey('openId')))">
+                    a.openId,
+                </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('mobile') or colPickMode == 1 and data.containsKey('mobile')))">
+                    a.mobile,
+                </if>
                 <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('datumPrintId') or colPickMode == 1 and data.containsKey('datumPrintId')))">
-                a.datum_print_id,
+                    a.datumPrintId,
                 </if>
                 <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('fieldCode') or colPickMode == 1 and data.containsKey('fieldCode')))">
                     a.fieldCode,
@@ -85,26 +98,35 @@
                 <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateUserId') or colPickMode == 1 and data.containsKey('updateUserId')))">
                     a.updateUserId,
                 </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 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('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>
         </trim>
     </sql>
     <!-- 新增 区分主键自增加还是业务插入 -->
     <insert id="insert" parameterType="DatumInfoFieldEntity"  useGeneratedKeys="true" keyProperty="id">
         insert into mortals_xhx_datum_info_field
-        (datum_print_id,fieldCode,fieldName,fieldType,fieldTypeValue,dataType,fieldValue,defaultValue,fieldLen,fieldNull,isList,fieldOrderNo,remark,createTime,createUserId,updateTime,updateUserId,idCard)
+        (openId,idCard,mobile,datumPrintId,fieldCode,fieldName,fieldType,fieldTypeValue,dataType,fieldValue,defaultValue,fieldLen,fieldNull,isList,fieldOrderNo,remark,createTime,createUserId,updateTime,updateUserId,matterId,matterName,materialId,materialName)
         VALUES
-        (#{datumPrintId},#{fieldCode},#{fieldName},#{fieldType},#{fieldTypeValue},#{dataType},#{fieldValue},#{defaultValue},#{fieldLen},#{fieldNull},#{isList},#{fieldOrderNo},#{remark},#{createTime},#{createUserId},#{updateTime},#{updateUserId},#{idCard})
+        (#{openId},#{idCard},#{mobile},#{datumPrintId},#{fieldCode},#{fieldName},#{fieldType},#{fieldTypeValue},#{dataType},#{fieldValue},#{defaultValue},#{fieldLen},#{fieldNull},#{isList},#{fieldOrderNo},#{remark},#{createTime},#{createUserId},#{updateTime},#{updateUserId},#{matterId},#{matterName},#{materialId},#{materialName})
     </insert>
 
     <!-- 批量新增 -->
     <insert id="insertBatch" parameterType="paramDto">
         insert into mortals_xhx_datum_info_field
-        (datum_print_id,fieldCode,fieldName,fieldType,fieldTypeValue,dataType,fieldValue,defaultValue,fieldLen,fieldNull,isList,fieldOrderNo,remark,createTime,createUserId,updateTime,updateUserId,idCard)
+        (openId,idCard,mobile,datumPrintId,fieldCode,fieldName,fieldType,fieldTypeValue,dataType,fieldValue,defaultValue,fieldLen,fieldNull,isList,fieldOrderNo,remark,createTime,createUserId,updateTime,updateUserId,matterId,matterName,materialId,materialName)
         VALUES
         <foreach collection="data.dataList" item="item" index="index" separator="," >
-            (#{item.datumPrintId},#{item.fieldCode},#{item.fieldName},#{item.fieldType},#{item.fieldTypeValue},#{item.dataType},#{item.fieldValue},#{item.defaultValue},#{item.fieldLen},#{item.fieldNull},#{item.isList},#{item.fieldOrderNo},#{item.remark},#{item.createTime},#{item.createUserId},#{item.updateTime},#{item.updateUserId},#{item.idCard})
+            (#{item.openId},#{item.idCard},#{item.mobile},#{item.datumPrintId},#{item.fieldCode},#{item.fieldName},#{item.fieldType},#{item.fieldTypeValue},#{item.dataType},#{item.fieldValue},#{item.defaultValue},#{item.fieldLen},#{item.fieldNull},#{item.isList},#{item.fieldOrderNo},#{item.remark},#{item.createTime},#{item.createUserId},#{item.updateTime},#{item.updateUserId},#{item.matterId},#{item.matterName},#{item.materialId},#{item.materialName})
         </foreach>
     </insert>
 
@@ -114,11 +136,20 @@
         update mortals_xhx_datum_info_field as a
         set
         <trim suffixOverrides="," suffix="">
+            <if test="(colPickMode==0 and data.containsKey('openId')) or (colPickMode==1 and !data.containsKey('openId'))">
+                a.openId=#{data.openId},
+            </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('mobile')) or (colPickMode==1 and !data.containsKey('mobile'))">
+                a.mobile=#{data.mobile},
+            </if>
             <if test="(colPickMode==0 and data.containsKey('datumPrintId')) or (colPickMode==1 and !data.containsKey('datumPrintId'))">
-                a.datum_print_id=#{data.datumPrintId},
+                a.datumPrintId=#{data.datumPrintId},
             </if>
             <if test="(colPickMode==0 and data.containsKey('datumPrintIdIncrement')) or (colPickMode==1 and !data.containsKey('datumPrintIdIncrement'))">
-                a.datum_print_id=ifnull(a.datum_print_id,0) + #{data.datumPrintIdIncrement},
+                a.datumPrintId=ifnull(a.datumPrintId,0) + #{data.datumPrintIdIncrement},
             </if>
             <if test="(colPickMode==0 and data.containsKey('fieldCode')) or (colPickMode==1 and !data.containsKey('fieldCode'))">
                 a.fieldCode=#{data.fieldCode},
@@ -186,8 +217,23 @@
             <if test="(colPickMode==0 and data.containsKey('updateUserIdIncrement')) or (colPickMode==1 and !data.containsKey('updateUserIdIncrement'))">
                 a.updateUserId=ifnull(a.updateUserId,0) + #{data.updateUserIdIncrement},
             </if>
-            <if test="(colPickMode==0 and data.containsKey('idCard')) or (colPickMode==1 and !data.containsKey('idCard'))">
-                a.idCard=#{data.idCard},
+            <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('materialId')) or (colPickMode==1 and !data.containsKey('materialId'))">
+                a.materialId=#{data.materialId},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('materialIdIncrement')) or (colPickMode==1 and !data.containsKey('materialIdIncrement'))">
+                a.materialId=ifnull(a.materialId,0) + #{data.materialIdIncrement},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('materialName')) or (colPickMode==1 and !data.containsKey('materialName'))">
+                a.materialName=#{data.materialName},
             </if>
         </trim>
         <trim suffixOverrides="where" suffix="">
@@ -201,14 +247,35 @@
     <update id="updateBatch" parameterType="paramDto">
         update mortals_xhx_datum_info_field as a
         <trim prefix="set" suffixOverrides=",">
-            <trim prefix="datum_print_id=(case" suffix="ELSE datum_print_id end),">
+                <trim prefix="openId=(case" suffix="ELSE openId end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('openId')) or (colPickMode==1 and !item.containsKey('openId'))">
+                            when a.id=#{item.id} then #{item.openId}
+                        </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="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="datumPrintId=(case" suffix="ELSE datumPrintId end),">
                             <foreach collection="data.dataList" item="item" index="index" separator="" >
                                 <choose>
                                     <when test="(colPickMode==0 and item.containsKey('datumPrintId')) or (colPickMode==1 and !item.containsKey('datumPrintId'))">
                                         when a.id=#{item.id} then #{item.datumPrintId}
                                     </when>
                                     <when test="(colPickMode==0 and item.containsKey('datumPrintIdIncrement')) or (colPickMode==1 and !item.containsKey('datumPrintIdIncrement'))">
-                            when a.id=#{item.id} then ifnull(a.datum_print_id,0) + #{item.datumPrintIdIncrement}
+                                        when a.id=#{item.id} then ifnull(a.datumPrintId,0) + #{item.datumPrintIdIncrement}
                                     </when>
                                 </choose>
                             </foreach>
@@ -355,10 +422,41 @@
                                 </choose>
                             </foreach>
                         </trim>
-            <trim prefix="idCard=(case" suffix="ELSE idCard end),">
+                        <trim prefix="matterId=(case" suffix="ELSE matterId 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}
+                                <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="materialId=(case" suffix="ELSE materialId end),">
+                            <foreach collection="data.dataList" item="item" index="index" separator="" >
+                                <choose>
+                                    <when test="(colPickMode==0 and item.containsKey('materialId')) or (colPickMode==1 and !item.containsKey('materialId'))">
+                                        when a.id=#{item.id} then #{item.materialId}
+                                    </when>
+                                    <when test="(colPickMode==0 and item.containsKey('materialIdIncrement')) or (colPickMode==1 and !item.containsKey('materialIdIncrement'))">
+                                        when a.id=#{item.id} then ifnull(a.materialId,0) + #{item.materialIdIncrement}
+                                    </when>
+                                </choose>
+                            </foreach>
+                        </trim>
+                <trim prefix="materialName=(case" suffix="ELSE materialName end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('materialName')) or (colPickMode==1 and !item.containsKey('materialName'))">
+                            when a.id=#{item.id} then #{item.materialName}
                         </if>
                     </foreach>
                 </trim>
@@ -376,7 +474,7 @@
     </select>
     <!-- 根据主健删除 -->
     <delete id="deleteByKey" parameterType="paramDto">
-        delete a.* from mortals_xhx_datum_info_field as a where a.id=#{condition.id}
+        delete  from mortals_xhx_datum_info_field  where id=#{condition.id}
     </delete>
     <!-- 根据主健删除一批，针对单一主健有效 -->
     <delete id="deleteByKeys">
@@ -473,6 +571,10 @@
     <!-- 条件映射-代参数 -->
     <sql id="_condition_param_">
         <bind name="conditionParamRef" value="${_conditionParam_}"/>
+        <if test="permissionSql != null and permissionSql != ''">
+            ${permissionSql}
+        </if>
+
         <if test="conditionParamRef.containsKey('id')">
             <if test="conditionParamRef.id != null">
                 ${_conditionType_} a.id=#{${_conditionParam_}.id}
@@ -505,31 +607,94 @@
                 ${_conditionType_} a.id <![CDATA[ <= ]]> #{${_conditionParam_}.idEnd}
             </if>
 
+
+            <if test="conditionParamRef.containsKey('openId')">
+                <if test="conditionParamRef.openId != null and conditionParamRef.openId != ''">
+                    ${_conditionType_} a.openId like #{${_conditionParam_}.openId}
+                </if>
+                <if test="conditionParamRef.openId == null">
+                    ${_conditionType_} a.openId is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('openIdList') and conditionParamRef.openIdList.size() > 0">
+                ${_conditionType_} a.openId in
+                <foreach collection="conditionParamRef.openIdList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('openIdNotList') and conditionParamRef.openIdNotList.size() > 0">
+                ${_conditionType_} a.openId not in
+                <foreach collection="conditionParamRef.openIdNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </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') 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('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('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('datumPrintId')">
                 <if test="conditionParamRef.datumPrintId != null ">
-                ${_conditionType_} a.datum_print_id = #{${_conditionParam_}.datumPrintId}
+                    ${_conditionType_} a.datumPrintId = #{${_conditionParam_}.datumPrintId}
                 </if>
                 <if test="conditionParamRef.datumPrintId == null">
-                ${_conditionType_} a.datum_print_id is null
+                    ${_conditionType_} a.datumPrintId is null
                 </if>
             </if>
             <if test="conditionParamRef.containsKey('datumPrintIdList') and conditionParamRef.datumPrintIdList.size() > 0">
-            ${_conditionType_} a.datum_print_id in
+                ${_conditionType_} a.datumPrintId in
                 <foreach collection="conditionParamRef.datumPrintIdList" open="(" close=")" index="index" item="item" separator=",">
                     #{item}
                 </foreach>
             </if>
             <if test="conditionParamRef.containsKey('datumPrintIdNotList') and conditionParamRef.datumPrintIdNotList.size() > 0">
-            ${_conditionType_} a.datum_print_id not in
+                ${_conditionType_} a.datumPrintId not in
                 <foreach collection="conditionParamRef.datumPrintIdNotList" open="(" close=")" index="index" item="item" separator=",">
                     #{item}
                 </foreach>
             </if>
             <if test="conditionParamRef.containsKey('datumPrintIdStart') and conditionParamRef.datumPrintIdStart != null">
-            ${_conditionType_} a.datum_print_id <![CDATA[ >= ]]> #{${_conditionParam_}.datumPrintIdStart}
+                ${_conditionType_} a.datumPrintId <![CDATA[ >= ]]> #{${_conditionParam_}.datumPrintIdStart}
             </if>
             <if test="conditionParamRef.containsKey('datumPrintIdEnd') and conditionParamRef.datumPrintIdEnd != null">
-            ${_conditionType_} a.datum_print_id <![CDATA[ <= ]]> #{${_conditionParam_}.datumPrintIdEnd}
+                ${_conditionType_} a.datumPrintId <![CDATA[ <= ]]> #{${_conditionParam_}.datumPrintIdEnd}
             </if>
 
 
@@ -892,24 +1057,99 @@
                 ${_conditionType_} a.updateUserId <![CDATA[ <= ]]> #{${_conditionParam_}.updateUserIdEnd}
             </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('idCard')">
-            <if test="conditionParamRef.idCard != null and conditionParamRef.idCard != ''">
-                ${_conditionType_} a.idCard like #{${_conditionParam_}.idCard}
+            <if test="conditionParamRef.containsKey('matterName')">
+                <if test="conditionParamRef.matterName != null and conditionParamRef.matterName != ''">
+                    ${_conditionType_} a.matterName like #{${_conditionParam_}.matterName}
                 </if>
-            <if test="conditionParamRef.idCard == null">
-                ${_conditionType_} a.idCard is null
+                <if test="conditionParamRef.matterName == null">
+                    ${_conditionType_} a.matterName is null
                 </if>
             </if>
-        <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=",">
+            <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('idCardNotList') and conditionParamRef.idCardNotList.size() > 0">
-            ${_conditionType_} a.idCard not in
-            <foreach collection="conditionParamRef.idCardNotList" open="(" close=")" index="index" item="item" separator=",">
+            <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('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>
+            </if>
+            <if test="conditionParamRef.containsKey('materialIdStart') and conditionParamRef.materialIdStart != null">
+                ${_conditionType_} a.materialId <![CDATA[ >= ]]> #{${_conditionParam_}.materialIdStart}
+            </if>
+            <if test="conditionParamRef.containsKey('materialIdEnd') and conditionParamRef.materialIdEnd != null">
+                ${_conditionType_} a.materialId <![CDATA[ <= ]]> #{${_conditionParam_}.materialIdEnd}
+            </if>
+
+
+            <if test="conditionParamRef.containsKey('materialName')">
+                <if test="conditionParamRef.materialName != null and conditionParamRef.materialName != ''">
+                    ${_conditionType_} a.materialName like #{${_conditionParam_}.materialName}
+                </if>
+                <if test="conditionParamRef.materialName == null">
+                    ${_conditionType_} a.materialName is null
+                </if>
+            </if>
+            <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') and conditionParamRef.materialNameNotList.size() > 0">
+                ${_conditionType_} a.materialName not in
+                <foreach collection="conditionParamRef.materialNameNotList" open="(" close=")" index="index" item="item" separator=",">
                     #{item}
                 </foreach>
             </if>
@@ -973,12 +1213,27 @@
                         </foreach>
                         ,
                     </if>
+                    <if test="conditionParamRef.containsKey('matterIdList') and conditionParamRef.matterIdList.size() > 0">
+                        field(a.matterId,
+                        <foreach collection="conditionParamRef.matterIdList" open="" close=")" index="index" item="item" separator=",">
+                            #{item}
+                        </foreach>
+                        ,
+                    </if>
+                    <if test="conditionParamRef.containsKey('materialIdList') and conditionParamRef.materialIdList.size() > 0">
+                        field(a.materialId,
+                        <foreach collection="conditionParamRef.materialIdList" open="" close=")" index="index" item="item" separator=",">
+                            #{item}
+                        </foreach>
+                        ,
+                    </if>
             <trim suffixOverrides=","  suffix="">
                 <foreach collection="orderColList" open="" close="" index="index" item="item" separator=",">
                      a.${item.colName} ${item.sortKind}
                 </foreach>
             </trim>
         </if>
+
         <if test="(orderColList == null or orderColList.isEmpty()) and orderCol != null and !orderCol.isEmpty()">
             order by
                     <if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
@@ -1037,14 +1292,43 @@
                         </foreach>
                         ,
                     </if>
+                    <if test="conditionParamRef.containsKey('matterIdList') and conditionParamRef.matterIdList.size() > 0">
+                        field(a.matterId,
+                        <foreach collection="conditionParamRef.matterIdList" open="" close=")" index="index" item="item" separator=",">
+                            #{item}
+                        </foreach>
+                        ,
+                    </if>
+                    <if test="conditionParamRef.containsKey('materialIdList') and conditionParamRef.materialIdList.size() > 0">
+                        field(a.materialId,
+                        <foreach collection="conditionParamRef.materialIdList" open="" close=")" index="index" item="item" separator=",">
+                            #{item}
+                        </foreach>
+                        ,
+                    </if>
             <trim suffixOverrides=","  suffix="">
                     <if test="orderCol.containsKey('id')">
                         a.id
                         <if test='orderCol.id != null and "DESC".equalsIgnoreCase(orderCol.id)'>DESC</if>
                         ,
                     </if>
+                    <if test="orderCol.containsKey('openId')">
+                        a.openId
+                        <if test='orderCol.openId != null and "DESC".equalsIgnoreCase(orderCol.openId)'>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('mobile')">
+                        a.mobile
+                        <if test='orderCol.mobile != null and "DESC".equalsIgnoreCase(orderCol.mobile)'>DESC</if>
+                        ,
+                    </if>
                     <if test="orderCol.containsKey('datumPrintId')">
-                    a.datum_print_id
+                        a.datumPrintId
                         <if test='orderCol.datumPrintId != null and "DESC".equalsIgnoreCase(orderCol.datumPrintId)'>DESC</if>
                         ,
                     </if>
@@ -1128,9 +1412,24 @@
                         <if test='orderCol.updateUserId != null and "DESC".equalsIgnoreCase(orderCol.updateUserId)'>DESC</if>
                         ,
                     </if>
-                <if test="orderCol.containsKey('idCard')">
-                    a.idCard
-                    <if test='orderCol.idCard != null and "DESC".equalsIgnoreCase(orderCol.idCard)'>DESC</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('materialId')">
+                        a.materialId
+                        <if test='orderCol.materialId != null and "DESC".equalsIgnoreCase(orderCol.materialId)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('materialName')">
+                        a.materialName
+                        <if test='orderCol.materialName != null and "DESC".equalsIgnoreCase(orderCol.materialName)'>DESC</if>
                         ,
                     </if>
             </trim>

fill-manager/src/main/resources/sqlmap/module/user/SearchHistoryMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"mybatis-3-mapper.dtd">
+<mapper namespace="com.mortals.xhx.module.user.dao.ibatis.SearchHistoryDaoImpl">
+
+    <!-- 字段和属性映射 -->
+    <resultMap type="SearchHistoryEntity" id="SearchHistoryEntity-Map">
+            <id  property="id" column="id" />
+            <result property="openId" column="openId" />
+            <result property="idCard" column="idCard" />
+            <result property="mobile" column="mobile" />
+            <result property="content" column="content" />
+            <result property="createTime" column="createTime" />
+            <result property="createUserId" column="createUserId" />
+            <result property="updateTime" column="updateTime" />
+            <result property="updateUserId" column="updateUserId" />
+    </resultMap>
+
+    <!-- 表所有列 -->
+    <sql id="_columns">
+        <trim suffixOverrides="," suffix="">
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('id') or colPickMode == 1 and data.containsKey('id')))">
+                    a.id,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('openId') or colPickMode == 1 and data.containsKey('openId')))">
+                    a.openId,
+                </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('mobile') or colPickMode == 1 and data.containsKey('mobile')))">
+                    a.mobile,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('content') or colPickMode == 1 and data.containsKey('content')))">
+                    a.content,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createTime') or colPickMode == 1 and data.containsKey('createTime')))">
+                    a.createTime,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createUserId') or colPickMode == 1 and data.containsKey('createUserId')))">
+                    a.createUserId,
+                </if>
+                <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('updateUserId') or colPickMode == 1 and data.containsKey('updateUserId')))">
+                    a.updateUserId,
+                </if>
+        </trim>
+    </sql>
+    <!-- 新增 区分主键自增加还是业务插入 -->
+    <insert id="insert" parameterType="SearchHistoryEntity"  useGeneratedKeys="true" keyProperty="id">
+        insert into mortals_xhx_search_history
+        (openId,idCard,mobile,content,createTime,createUserId,updateTime,updateUserId)
+        VALUES
+        (#{openId},#{idCard},#{mobile},#{content},#{createTime},#{createUserId},#{updateTime},#{updateUserId})
+    </insert>
+
+    <!-- 批量新增 -->
+    <insert id="insertBatch" parameterType="paramDto">
+        insert into mortals_xhx_search_history
+        (openId,idCard,mobile,content,createTime,createUserId,updateTime,updateUserId)
+        VALUES
+        <foreach collection="data.dataList" item="item" index="index" separator="," >
+            (#{item.openId},#{item.idCard},#{item.mobile},#{item.content},#{item.createTime},#{item.createUserId},#{item.updateTime},#{item.updateUserId})
+        </foreach>
+    </insert>
+
+
+    <!-- 根据ParamDto更新 -->
+    <update id="update" parameterType="paramDto">
+        update mortals_xhx_search_history as a
+        set
+        <trim suffixOverrides="," suffix="">
+            <if test="(colPickMode==0 and data.containsKey('openId')) or (colPickMode==1 and !data.containsKey('openId'))">
+                a.openId=#{data.openId},
+            </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('mobile')) or (colPickMode==1 and !data.containsKey('mobile'))">
+                a.mobile=#{data.mobile},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('content')) or (colPickMode==1 and !data.containsKey('content'))">
+                a.content=#{data.content},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('createTime')) or (colPickMode==1 and !data.containsKey('createTime'))">
+                a.createTime=#{data.createTime},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('createUserId')) or (colPickMode==1 and !data.containsKey('createUserId'))">
+                a.createUserId=#{data.createUserId},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('createUserIdIncrement')) or (colPickMode==1 and !data.containsKey('createUserIdIncrement'))">
+                a.createUserId=ifnull(a.createUserId,0) + #{data.createUserIdIncrement},
+            </if>
+            <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('updateUserId')) or (colPickMode==1 and !data.containsKey('updateUserId'))">
+                a.updateUserId=#{data.updateUserId},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('updateUserIdIncrement')) or (colPickMode==1 and !data.containsKey('updateUserIdIncrement'))">
+                a.updateUserId=ifnull(a.updateUserId,0) + #{data.updateUserIdIncrement},
+            </if>
+        </trim>
+        <trim suffixOverrides="where" suffix="">
+            where
+            <trim prefixOverrides="and" prefix="">
+                <include refid="_condition_"/>
+            </trim>
+        </trim>
+    </update>
+    <!-- 批量更新 -->
+    <update id="updateBatch" parameterType="paramDto">
+        update mortals_xhx_search_history as a
+        <trim prefix="set" suffixOverrides=",">
+                <trim prefix="openId=(case" suffix="ELSE openId end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('openId')) or (colPickMode==1 and !item.containsKey('openId'))">
+                            when a.id=#{item.id} then #{item.openId}
+                        </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="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="content=(case" suffix="ELSE content end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('content')) or (colPickMode==1 and !item.containsKey('content'))">
+                            when a.id=#{item.id} then #{item.content}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="createTime=(case" suffix="ELSE createTime end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('createTime')) or (colPickMode==1 and !item.containsKey('createTime'))">
+                            when a.id=#{item.id} then #{item.createTime}
+                        </if>
+                    </foreach>
+                </trim>
+                        <trim prefix="createUserId=(case" suffix="ELSE createUserId end),">
+                            <foreach collection="data.dataList" item="item" index="index" separator="" >
+                                <choose>
+                                    <when test="(colPickMode==0 and item.containsKey('createUserId')) or (colPickMode==1 and !item.containsKey('createUserId'))">
+                                        when a.id=#{item.id} then #{item.createUserId}
+                                    </when>
+                                    <when test="(colPickMode==0 and item.containsKey('createUserIdIncrement')) or (colPickMode==1 and !item.containsKey('createUserIdIncrement'))">
+                                        when a.id=#{item.id} then ifnull(a.createUserId,0) + #{item.createUserIdIncrement}
+                                    </when>
+                                </choose>
+                            </foreach>
+                        </trim>
+                <trim prefix="updateTime=(case" suffix="ELSE updateTime end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('updateTime')) or (colPickMode==1 and !item.containsKey('updateTime'))">
+                            when a.id=#{item.id} then #{item.updateTime}
+                        </if>
+                    </foreach>
+                </trim>
+                        <trim prefix="updateUserId=(case" suffix="ELSE updateUserId end),">
+                            <foreach collection="data.dataList" item="item" index="index" separator="" >
+                                <choose>
+                                    <when test="(colPickMode==0 and item.containsKey('updateUserId')) or (colPickMode==1 and !item.containsKey('updateUserId'))">
+                                        when a.id=#{item.id} then #{item.updateUserId}
+                                    </when>
+                                    <when test="(colPickMode==0 and item.containsKey('updateUserIdIncrement')) or (colPickMode==1 and !item.containsKey('updateUserIdIncrement'))">
+                                        when a.id=#{item.id} then ifnull(a.updateUserId,0) + #{item.updateUserIdIncrement}
+                                    </when>
+                                </choose>
+                            </foreach>
+                        </trim>
+        </trim>
+        where id in
+        <foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
+            #{item.id}
+        </foreach>
+    </update>
+    <!-- 根据主健查询 -->
+    <select id="getByKey" parameterType="paramDto" resultMap="SearchHistoryEntity-Map">
+        select <include refid="_columns"/>
+        from mortals_xhx_search_history as a
+        where a.id=#{condition.id}
+    </select>
+    <!-- 根据主健删除 -->
+    <delete id="deleteByKey" parameterType="paramDto">
+        delete  from mortals_xhx_search_history  where id=#{condition.id}
+    </delete>
+    <!-- 根据主健删除一批，针对单一主健有效 -->
+    <delete id="deleteByKeys">
+        delete from mortals_xhx_search_history where id in
+        <foreach collection="array" item="item" index="index" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </delete>
+    <!-- 根据主健列表删除一批，针对单一主健有效 -->
+    <delete id="deleteByKeyList">
+        delete from mortals_xhx_search_history where id in
+        <foreach collection="list" item="item" index="index" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </delete>
+
+    <!-- 根据对象列表删除一批，针对单一主健有效 -->
+    <delete id="deleteByEntityList">
+        delete from mortals_xhx_search_history where id in
+        <foreach collection="list" item="item" index="index" open="(" separator="," close=")">
+            #{item.id}
+        </foreach>
+    </delete>
+    <!-- 根据paramDto删除一批 -->
+    <delete id="deleteByMap" parameterType="paramDto">
+        delete a.* from mortals_xhx_search_history as a
+        <trim suffixOverrides="where" suffix="">
+            where
+            <trim prefixOverrides="and" prefix="">
+                <include refid="_condition_"/>
+            </trim>
+        </trim>
+    </delete>
+    <!-- 获取列表 -->
+    <select id="getList" parameterType="paramDto" resultMap="SearchHistoryEntity-Map">
+        select <include refid="_columns"/>
+        from mortals_xhx_search_history as a
+        <trim suffixOverrides="where" suffix="">
+            where
+            <trim prefixOverrides="and" prefix="">
+                <include refid="_condition_"/>
+            </trim>
+        </trim>
+        <include refid="_orderCols_"/>
+    </select>
+
+
+
+    <!-- 获取 -->
+    <select id="getListCount" parameterType="paramDto" resultType="int">
+        select count(1)
+        from mortals_xhx_search_history as a
+        <trim suffixOverrides="where" suffix="">
+            where
+            <trim prefixOverrides="and" prefix="">
+                <include refid="_condition_"/>
+            </trim>
+        </trim>
+    </select>
+    <!-- 条件映射 -->
+    <sql id="_condition_">
+        <if test="condition != null and !condition.isEmpty()">
+            <!-- 条件映射-普通条件 -->
+            <include refid="_condition_param_">
+                <property name="_conditionParam_" value="condition"/>
+                <property name="_conditionType_" value="and"/>
+            </include>
+            <!-- 条件映射-集合之间使用AND，集合中元素使用OR-(list[0].1 or list[0].2) and (list[1].3 or list[1].4) -->
+            <if test="condition.containsKey('andConditionList') and !condition.andConditionList.isEmpty()">
+                and
+                <foreach collection="condition.andConditionList" open="(" close=")" index="index" item="andCondition" separator=" and ">
+                    <trim prefixOverrides="or" prefix="(" suffix=")">
+                        <include refid="_condition_param_">
+                            <property name="_conditionParam_" value="andCondition"/>
+                            <property name="_conditionType_" value="or"/>
+                        </include>
+                    </trim>
+                </foreach>
+            </if>
+            <!-- 条件映射-集合之间使用OR，集合中元素使用AND-(list[0].1 and list[0].2) or (list[1].3 and list[1].4) -->
+            <if test="condition.containsKey('orConditionList') and !condition.orConditionList.isEmpty()">
+                or
+                <foreach collection="condition.orConditionList" open="(" close=")" index="index" item="orCondition" separator=" or ">
+                    <trim prefixOverrides="and" prefix="(" suffix=")">
+                        <include refid="_condition_param_">
+                            <property name="_conditionParam_" value="orCondition"/>
+                            <property name="_conditionType_" value="and"/>
+                        </include>
+                    </trim>
+                </foreach>
+            </if>
+        </if>
+    </sql>
+    <!-- 条件映射-代参数 -->
+    <sql id="_condition_param_">
+        <bind name="conditionParamRef" value="${_conditionParam_}"/>
+        <if test="permissionSql != null and permissionSql != ''">
+            ${permissionSql}
+        </if>
+
+        <if test="conditionParamRef.containsKey('id')">
+            <if test="conditionParamRef.id != null">
+                ${_conditionType_} a.id=#{${_conditionParam_}.id}
+            </if>
+        </if>
+            <if test="conditionParamRef.containsKey('id')">
+                <if test="conditionParamRef.id != null ">
+                    ${_conditionType_} a.id = #{${_conditionParam_}.id}
+                </if>
+                <if test="conditionParamRef.id == null">
+                    ${_conditionType_} a.id is null
+                </if>
+            </if>
+            <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') and conditionParamRef.idNotList.size() > 0">
+                ${_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>
+            <if test="conditionParamRef.containsKey('idEnd') and conditionParamRef.idEnd != null">
+                ${_conditionType_} a.id <![CDATA[ <= ]]> #{${_conditionParam_}.idEnd}
+            </if>
+
+
+            <if test="conditionParamRef.containsKey('openId')">
+                <if test="conditionParamRef.openId != null and conditionParamRef.openId != ''">
+                    ${_conditionType_} a.openId like #{${_conditionParam_}.openId}
+                </if>
+                <if test="conditionParamRef.openId == null">
+                    ${_conditionType_} a.openId is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('openIdList') and conditionParamRef.openIdList.size() > 0">
+                ${_conditionType_} a.openId in
+                <foreach collection="conditionParamRef.openIdList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('openIdNotList') and conditionParamRef.openIdNotList.size() > 0">
+                ${_conditionType_} a.openId not in
+                <foreach collection="conditionParamRef.openIdNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </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') 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('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('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('content')">
+                <if test="conditionParamRef.content != null and conditionParamRef.content != ''">
+                    ${_conditionType_} a.content like #{${_conditionParam_}.content}
+                </if>
+                <if test="conditionParamRef.content == null">
+                    ${_conditionType_} a.content is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('contentList') and conditionParamRef.contentList.size() > 0">
+                ${_conditionType_} a.content in
+                <foreach collection="conditionParamRef.contentList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('contentNotList') and conditionParamRef.contentNotList.size() > 0">
+                ${_conditionType_} a.content not in
+                <foreach collection="conditionParamRef.contentNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('createTime')">
+                <if test="conditionParamRef.createTime != null ">
+                    ${_conditionType_} a.createTime = #{${_conditionParam_}.createTime}
+                </if>
+                <if test="conditionParamRef.createTime == null">
+                    ${_conditionType_} a.createTime is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('createTimeStart') and conditionParamRef.createTimeStart != null and conditionParamRef.createTimeStart!=''">
+                ${_conditionType_} a.createTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
+            </if>
+            <if test="conditionParamRef.containsKey('createTimeEnd') and conditionParamRef.createTimeEnd != null and conditionParamRef.createTimeEnd!=''">
+                ${_conditionType_} a.createTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
+            </if>
+            <if test="conditionParamRef.containsKey('createUserId')">
+                <if test="conditionParamRef.createUserId != null ">
+                    ${_conditionType_} a.createUserId = #{${_conditionParam_}.createUserId}
+                </if>
+                <if test="conditionParamRef.createUserId == null">
+                    ${_conditionType_} a.createUserId is null
+                </if>
+            </if>
+            <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') and conditionParamRef.createUserIdNotList.size() > 0">
+                ${_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>
+            <if test="conditionParamRef.containsKey('createUserIdEnd') and conditionParamRef.createUserIdEnd != null">
+                ${_conditionType_} a.createUserId <![CDATA[ <= ]]> #{${_conditionParam_}.createUserIdEnd}
+            </if>
+
+
+            <if test="conditionParamRef.containsKey('updateTime')">
+                <if test="conditionParamRef.updateTime != null ">
+                    ${_conditionType_} a.updateTime = #{${_conditionParam_}.updateTime}
+                </if>
+                <if test="conditionParamRef.updateTime == null">
+                    ${_conditionType_} a.updateTime is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('updateTimeStart') and conditionParamRef.updateTimeStart != null and conditionParamRef.updateTimeStart!=''">
+                ${_conditionType_} a.updateTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
+            </if>
+            <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('updateUserId')">
+                <if test="conditionParamRef.updateUserId != null ">
+                    ${_conditionType_} a.updateUserId = #{${_conditionParam_}.updateUserId}
+                </if>
+                <if test="conditionParamRef.updateUserId == null">
+                    ${_conditionType_} a.updateUserId is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('updateUserIdList') and conditionParamRef.updateUserIdList.size() > 0">
+                ${_conditionType_} a.updateUserId in
+                <foreach collection="conditionParamRef.updateUserIdList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('updateUserIdNotList') and conditionParamRef.updateUserIdNotList.size() > 0">
+                ${_conditionType_} a.updateUserId not in
+                <foreach collection="conditionParamRef.updateUserIdNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('updateUserIdStart') and conditionParamRef.updateUserIdStart != null">
+                ${_conditionType_} a.updateUserId <![CDATA[ >= ]]> #{${_conditionParam_}.updateUserIdStart}
+            </if>
+            <if test="conditionParamRef.containsKey('updateUserIdEnd') and conditionParamRef.updateUserIdEnd != null">
+                ${_conditionType_} a.updateUserId <![CDATA[ <= ]]> #{${_conditionParam_}.updateUserIdEnd}
+            </if>
+
+    </sql>
+    <sql id="_orderCols_">
+        <if test="orderColList != null and !orderColList.isEmpty()">
+            order by
+                    <if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
+                        field(a.id,
+                        <foreach collection="conditionParamRef.idList" open="" close=")" index="index" item="item" separator=",">
+                            #{item}
+                        </foreach>
+                        ,
+                    </if>
+                    <if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
+                        field(a.createUserId,
+                        <foreach collection="conditionParamRef.createUserIdList" open="" close=")" index="index" item="item" separator=",">
+                            #{item}
+                        </foreach>
+                        ,
+                    </if>
+                    <if test="conditionParamRef.containsKey('updateUserIdList') and conditionParamRef.updateUserIdList.size() > 0">
+                        field(a.updateUserId,
+                        <foreach collection="conditionParamRef.updateUserIdList" open="" close=")" index="index" item="item" separator=",">
+                            #{item}
+                        </foreach>
+                        ,
+                    </if>
+            <trim suffixOverrides=","  suffix="">
+                <foreach collection="orderColList" open="" close="" index="index" item="item" separator=",">
+                     a.${item.colName} ${item.sortKind}
+                </foreach>
+            </trim>
+        </if>
+
+        <if test="(orderColList == null or orderColList.isEmpty()) and orderCol != null and !orderCol.isEmpty()">
+            order by
+                    <if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
+                        field(a.id,
+                        <foreach collection="conditionParamRef.idList" open="" close=")" index="index" item="item" separator=",">
+                            #{item}
+                        </foreach>
+                        ,
+                    </if>
+                    <if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
+                        field(a.createUserId,
+                        <foreach collection="conditionParamRef.createUserIdList" open="" close=")" index="index" item="item" separator=",">
+                            #{item}
+                        </foreach>
+                        ,
+                    </if>
+                    <if test="conditionParamRef.containsKey('updateUserIdList') and conditionParamRef.updateUserIdList.size() > 0">
+                        field(a.updateUserId,
+                        <foreach collection="conditionParamRef.updateUserIdList" open="" close=")" index="index" item="item" separator=",">
+                            #{item}
+                        </foreach>
+                        ,
+                    </if>
+            <trim suffixOverrides=","  suffix="">
+                    <if test="orderCol.containsKey('id')">
+                        a.id
+                        <if test='orderCol.id != null and "DESC".equalsIgnoreCase(orderCol.id)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('openId')">
+                        a.openId
+                        <if test='orderCol.openId != null and "DESC".equalsIgnoreCase(orderCol.openId)'>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('mobile')">
+                        a.mobile
+                        <if test='orderCol.mobile != null and "DESC".equalsIgnoreCase(orderCol.mobile)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('content')">
+                        a.content
+                        <if test='orderCol.content != null and "DESC".equalsIgnoreCase(orderCol.content)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('createTime')">
+                        a.createTime
+                        <if test='orderCol.createTime != null and "DESC".equalsIgnoreCase(orderCol.createTime)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('createUserId')">
+                        a.createUserId
+                        <if test='orderCol.createUserId != null and "DESC".equalsIgnoreCase(orderCol.createUserId)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('updateTime')">
+                        a.updateTime
+                        <if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('updateUserId')">
+                        a.updateUserId
+                        <if test='orderCol.updateUserId != null and "DESC".equalsIgnoreCase(orderCol.updateUserId)'>DESC</if>
+                        ,
+                    </if>
+            </trim>
+        </if>
+
+
+    </sql>
+    <sql id="_group_by_">
+        <if test="groupList != null and !groupList.isEmpty()">
+            GROUP BY
+            <trim suffixOverrides=","  suffix="">
+                <foreach collection="groupList" open="" close="" index="index" item="item" separator=",">
+                    ${item}
+                </foreach>
+            </trim>
+        </if>
+    </sql>
+</mapper>
\ No newline at end of file

fill-manager/src/main/resources/sqlmap/module/user/UserFillHistoryMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"mybatis-3-mapper.dtd">
+<mapper namespace="com.mortals.xhx.module.user.dao.ibatis.UserFillHistoryDaoImpl">
+
+    <!-- 字段和属性映射 -->
+    <resultMap type="UserFillHistoryEntity" id="UserFillHistoryEntity-Map">
+            <id  property="id" column="id" />
+            <result property="openId" column="openId" />
+            <result property="idCard" column="idCard" />
+            <result property="mobile" column="mobile" />
+            <result property="matterId" column="matterId" />
+            <result property="matterName" column="matterName" />
+            <result property="materialId" column="materialId" />
+            <result property="materialName" column="materialName" />
+            <result property="preViewPath" column="preViewPath" />
+            <result property="formContent" column="formContent" />
+            <result property="docPath" column="docPath" />
+            <result property="formValue" column="formValue" />
+            <result property="createTime" column="createTime" />
+            <result property="createUserId" column="createUserId" />
+            <result property="updateTime" column="updateTime" />
+            <result property="updateUserId" column="updateUserId" />
+    </resultMap>
+
+    <!-- 表所有列 -->
+    <sql id="_columns">
+        <trim suffixOverrides="," suffix="">
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('id') or colPickMode == 1 and data.containsKey('id')))">
+                    a.id,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('openId') or colPickMode == 1 and data.containsKey('openId')))">
+                    a.openId,
+                </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('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('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('preViewPath') or colPickMode == 1 and data.containsKey('preViewPath')))">
+                    a.preViewPath,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('formContent') or colPickMode == 1 and data.containsKey('formContent')))">
+                    a.formContent,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('docPath') or colPickMode == 1 and data.containsKey('docPath')))">
+                    a.docPath,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('formValue') or colPickMode == 1 and data.containsKey('formValue')))">
+                    a.formValue,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createTime') or colPickMode == 1 and data.containsKey('createTime')))">
+                    a.createTime,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createUserId') or colPickMode == 1 and data.containsKey('createUserId')))">
+                    a.createUserId,
+                </if>
+                <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('updateUserId') or colPickMode == 1 and data.containsKey('updateUserId')))">
+                    a.updateUserId,
+                </if>
+        </trim>
+    </sql>
+    <!-- 新增 区分主键自增加还是业务插入 -->
+    <insert id="insert" parameterType="UserFillHistoryEntity"  useGeneratedKeys="true" keyProperty="id">
+        insert into mortals_xhx_user_fill_history
+        (openId,idCard,mobile,matterId,matterName,materialId,materialName,preViewPath,formContent,docPath,formValue,createTime,createUserId,updateTime,updateUserId)
+        VALUES
+        (#{openId},#{idCard},#{mobile},#{matterId},#{matterName},#{materialId},#{materialName},#{preViewPath},#{formContent},#{docPath},#{formValue},#{createTime},#{createUserId},#{updateTime},#{updateUserId})
+    </insert>
+
+    <!-- 批量新增 -->
+    <insert id="insertBatch" parameterType="paramDto">
+        insert into mortals_xhx_user_fill_history
+        (openId,idCard,mobile,matterId,matterName,materialId,materialName,preViewPath,formContent,docPath,formValue,createTime,createUserId,updateTime,updateUserId)
+        VALUES
+        <foreach collection="data.dataList" item="item" index="index" separator="," >
+            (#{item.openId},#{item.idCard},#{item.mobile},#{item.matterId},#{item.matterName},#{item.materialId},#{item.materialName},#{item.preViewPath},#{item.formContent},#{item.docPath},#{item.formValue},#{item.createTime},#{item.createUserId},#{item.updateTime},#{item.updateUserId})
+        </foreach>
+    </insert>
+
+
+    <!-- 根据ParamDto更新 -->
+    <update id="update" parameterType="paramDto">
+        update mortals_xhx_user_fill_history as a
+        set
+        <trim suffixOverrides="," suffix="">
+            <if test="(colPickMode==0 and data.containsKey('openId')) or (colPickMode==1 and !data.containsKey('openId'))">
+                a.openId=#{data.openId},
+            </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('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('materialId')) or (colPickMode==1 and !data.containsKey('materialId'))">
+                a.materialId=#{data.materialId},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('materialIdIncrement')) or (colPickMode==1 and !data.containsKey('materialIdIncrement'))">
+                a.materialId=ifnull(a.materialId,0) + #{data.materialIdIncrement},
+            </if>
+            <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('preViewPath')) or (colPickMode==1 and !data.containsKey('preViewPath'))">
+                a.preViewPath=#{data.preViewPath},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('formContent')) or (colPickMode==1 and !data.containsKey('formContent'))">
+                a.formContent=#{data.formContent},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('docPath')) or (colPickMode==1 and !data.containsKey('docPath'))">
+                a.docPath=#{data.docPath},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('formValue')) or (colPickMode==1 and !data.containsKey('formValue'))">
+                a.formValue=#{data.formValue},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('createTime')) or (colPickMode==1 and !data.containsKey('createTime'))">
+                a.createTime=#{data.createTime},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('createUserId')) or (colPickMode==1 and !data.containsKey('createUserId'))">
+                a.createUserId=#{data.createUserId},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('createUserIdIncrement')) or (colPickMode==1 and !data.containsKey('createUserIdIncrement'))">
+                a.createUserId=ifnull(a.createUserId,0) + #{data.createUserIdIncrement},
+            </if>
+            <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('updateUserId')) or (colPickMode==1 and !data.containsKey('updateUserId'))">
+                a.updateUserId=#{data.updateUserId},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('updateUserIdIncrement')) or (colPickMode==1 and !data.containsKey('updateUserIdIncrement'))">
+                a.updateUserId=ifnull(a.updateUserId,0) + #{data.updateUserIdIncrement},
+            </if>
+        </trim>
+        <trim suffixOverrides="where" suffix="">
+            where
+            <trim prefixOverrides="and" prefix="">
+                <include refid="_condition_"/>
+            </trim>
+        </trim>
+    </update>
+    <!-- 批量更新 -->
+    <update id="updateBatch" parameterType="paramDto">
+        update mortals_xhx_user_fill_history as a
+        <trim prefix="set" suffixOverrides=",">
+                <trim prefix="openId=(case" suffix="ELSE openId end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('openId')) or (colPickMode==1 and !item.containsKey('openId'))">
+                            when a.id=#{item.id} then #{item.openId}
+                        </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="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="materialId=(case" suffix="ELSE materialId end),">
+                            <foreach collection="data.dataList" item="item" index="index" separator="" >
+                                <choose>
+                                    <when test="(colPickMode==0 and item.containsKey('materialId')) or (colPickMode==1 and !item.containsKey('materialId'))">
+                                        when a.id=#{item.id} then #{item.materialId}
+                                    </when>
+                                    <when test="(colPickMode==0 and item.containsKey('materialIdIncrement')) or (colPickMode==1 and !item.containsKey('materialIdIncrement'))">
+                                        when a.id=#{item.id} then ifnull(a.materialId,0) + #{item.materialIdIncrement}
+                                    </when>
+                                </choose>
+                            </foreach>
+                        </trim>
+                <trim prefix="materialName=(case" suffix="ELSE materialName end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('materialName')) or (colPickMode==1 and !item.containsKey('materialName'))">
+                            when a.id=#{item.id} then #{item.materialName}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="preViewPath=(case" suffix="ELSE preViewPath end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('preViewPath')) or (colPickMode==1 and !item.containsKey('preViewPath'))">
+                            when a.id=#{item.id} then #{item.preViewPath}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="formContent=(case" suffix="ELSE formContent end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('formContent')) or (colPickMode==1 and !item.containsKey('formContent'))">
+                            when a.id=#{item.id} then #{item.formContent}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="docPath=(case" suffix="ELSE docPath end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('docPath')) or (colPickMode==1 and !item.containsKey('docPath'))">
+                            when a.id=#{item.id} then #{item.docPath}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="formValue=(case" suffix="ELSE formValue end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('formValue')) or (colPickMode==1 and !item.containsKey('formValue'))">
+                            when a.id=#{item.id} then #{item.formValue}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="createTime=(case" suffix="ELSE createTime end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('createTime')) or (colPickMode==1 and !item.containsKey('createTime'))">
+                            when a.id=#{item.id} then #{item.createTime}
+                        </if>
+                    </foreach>
+                </trim>
+                        <trim prefix="createUserId=(case" suffix="ELSE createUserId end),">
+                            <foreach collection="data.dataList" item="item" index="index" separator="" >
+                                <choose>
+                                    <when test="(colPickMode==0 and item.containsKey('createUserId')) or (colPickMode==1 and !item.containsKey('createUserId'))">
+                                        when a.id=#{item.id} then #{item.createUserId}
+                                    </when>
+                                    <when test="(colPickMode==0 and item.containsKey('createUserIdIncrement')) or (colPickMode==1 and !item.containsKey('createUserIdIncrement'))">
+                                        when a.id=#{item.id} then ifnull(a.createUserId,0) + #{item.createUserIdIncrement}
+                                    </when>
+                                </choose>
+                            </foreach>
+                        </trim>
+                <trim prefix="updateTime=(case" suffix="ELSE updateTime end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('updateTime')) or (colPickMode==1 and !item.containsKey('updateTime'))">
+                            when a.id=#{item.id} then #{item.updateTime}
+                        </if>
+                    </foreach>
+                </trim>
+                        <trim prefix="updateUserId=(case" suffix="ELSE updateUserId end),">
+                            <foreach collection="data.dataList" item="item" index="index" separator="" >
+                                <choose>
+                                    <when test="(colPickMode==0 and item.containsKey('updateUserId')) or (colPickMode==1 and !item.containsKey('updateUserId'))">
+                                        when a.id=#{item.id} then #{item.updateUserId}
+                                    </when>
+                                    <when test="(colPickMode==0 and item.containsKey('updateUserIdIncrement')) or (colPickMode==1 and !item.containsKey('updateUserIdIncrement'))">
+                                        when a.id=#{item.id} then ifnull(a.updateUserId,0) + #{item.updateUserIdIncrement}
+                                    </when>
+                                </choose>
+                            </foreach>
+                        </trim>
+        </trim>
+        where id in
+        <foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
+            #{item.id}
+        </foreach>
+    </update>
+    <!-- 根据主健查询 -->
+    <select id="getByKey" parameterType="paramDto" resultMap="UserFillHistoryEntity-Map">
+        select <include refid="_columns"/>
+        from mortals_xhx_user_fill_history as a
+        where a.id=#{condition.id}
+    </select>
+    <!-- 根据主健删除 -->
+    <delete id="deleteByKey" parameterType="paramDto">
+        delete  from mortals_xhx_user_fill_history  where id=#{condition.id}
+    </delete>
+    <!-- 根据主健删除一批，针对单一主健有效 -->
+    <delete id="deleteByKeys">
+        delete from mortals_xhx_user_fill_history where id in
+        <foreach collection="array" item="item" index="index" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </delete>
+    <!-- 根据主健列表删除一批，针对单一主健有效 -->
+    <delete id="deleteByKeyList">
+        delete from mortals_xhx_user_fill_history where id in
+        <foreach collection="list" item="item" index="index" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </delete>
+
+    <!-- 根据对象列表删除一批，针对单一主健有效 -->
+    <delete id="deleteByEntityList">
+        delete from mortals_xhx_user_fill_history where id in
+        <foreach collection="list" item="item" index="index" open="(" separator="," close=")">
+            #{item.id}
+        </foreach>
+    </delete>
+    <!-- 根据paramDto删除一批 -->
+    <delete id="deleteByMap" parameterType="paramDto">
+        delete a.* from mortals_xhx_user_fill_history as a
+        <trim suffixOverrides="where" suffix="">
+            where
+            <trim prefixOverrides="and" prefix="">
+                <include refid="_condition_"/>
+            </trim>
+        </trim>
+    </delete>
+    <!-- 获取列表 -->
+    <select id="getList" parameterType="paramDto" resultMap="UserFillHistoryEntity-Map">
+        select <include refid="_columns"/>
+        from mortals_xhx_user_fill_history as a
+        <trim suffixOverrides="where" suffix="">
+            where
+            <trim prefixOverrides="and" prefix="">
+                <include refid="_condition_"/>
+            </trim>
+        </trim>
+        <include refid="_orderCols_"/>
+    </select>
+
+
+
+    <!-- 获取 -->
+    <select id="getListCount" parameterType="paramDto" resultType="int">
+        select count(1)
+        from mortals_xhx_user_fill_history as a
+        <trim suffixOverrides="where" suffix="">
+            where
+            <trim prefixOverrides="and" prefix="">
+                <include refid="_condition_"/>
+            </trim>
+        </trim>
+    </select>
+    <!-- 条件映射 -->
+    <sql id="_condition_">
+        <if test="condition != null and !condition.isEmpty()">
+            <!-- 条件映射-普通条件 -->
+            <include refid="_condition_param_">
+                <property name="_conditionParam_" value="condition"/>
+                <property name="_conditionType_" value="and"/>
+            </include>
+            <!-- 条件映射-集合之间使用AND，集合中元素使用OR-(list[0].1 or list[0].2) and (list[1].3 or list[1].4) -->
+            <if test="condition.containsKey('andConditionList') and !condition.andConditionList.isEmpty()">
+                and
+                <foreach collection="condition.andConditionList" open="(" close=")" index="index" item="andCondition" separator=" and ">
+                    <trim prefixOverrides="or" prefix="(" suffix=")">
+                        <include refid="_condition_param_">
+                            <property name="_conditionParam_" value="andCondition"/>
+                            <property name="_conditionType_" value="or"/>
+                        </include>
+                    </trim>
+                </foreach>
+            </if>
+            <!-- 条件映射-集合之间使用OR，集合中元素使用AND-(list[0].1 and list[0].2) or (list[1].3 and list[1].4) -->
+            <if test="condition.containsKey('orConditionList') and !condition.orConditionList.isEmpty()">
+                or
+                <foreach collection="condition.orConditionList" open="(" close=")" index="index" item="orCondition" separator=" or ">
+                    <trim prefixOverrides="and" prefix="(" suffix=")">
+                        <include refid="_condition_param_">
+                            <property name="_conditionParam_" value="orCondition"/>
+                            <property name="_conditionType_" value="and"/>
+                        </include>
+                    </trim>
+                </foreach>
+            </if>
+        </if>
+    </sql>
+    <!-- 条件映射-代参数 -->
+    <sql id="_condition_param_">
+        <bind name="conditionParamRef" value="${_conditionParam_}"/>
+        <if test="permissionSql != null and permissionSql != ''">
+            ${permissionSql}
+        </if>
+
+        <if test="conditionParamRef.containsKey('id')">
+            <if test="conditionParamRef.id != null">
+                ${_conditionType_} a.id=#{${_conditionParam_}.id}
+            </if>
+        </if>
+            <if test="conditionParamRef.containsKey('id')">
+                <if test="conditionParamRef.id != null ">
+                    ${_conditionType_} a.id = #{${_conditionParam_}.id}
+                </if>
+                <if test="conditionParamRef.id == null">
+                    ${_conditionType_} a.id is null
+                </if>
+            </if>
+            <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') and conditionParamRef.idNotList.size() > 0">
+                ${_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>
+            <if test="conditionParamRef.containsKey('idEnd') and conditionParamRef.idEnd != null">
+                ${_conditionType_} a.id <![CDATA[ <= ]]> #{${_conditionParam_}.idEnd}
+            </if>
+
+
+            <if test="conditionParamRef.containsKey('openId')">
+                <if test="conditionParamRef.openId != null and conditionParamRef.openId != ''">
+                    ${_conditionType_} a.openId like #{${_conditionParam_}.openId}
+                </if>
+                <if test="conditionParamRef.openId == null">
+                    ${_conditionType_} a.openId is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('openIdList') and conditionParamRef.openIdList.size() > 0">
+                ${_conditionType_} a.openId in
+                <foreach collection="conditionParamRef.openIdList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('openIdNotList') and conditionParamRef.openIdNotList.size() > 0">
+                ${_conditionType_} a.openId not in
+                <foreach collection="conditionParamRef.openIdNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </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') 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('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('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('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>
+            </if>
+            <if test="conditionParamRef.containsKey('materialIdStart') and conditionParamRef.materialIdStart != null">
+                ${_conditionType_} a.materialId <![CDATA[ >= ]]> #{${_conditionParam_}.materialIdStart}
+            </if>
+            <if test="conditionParamRef.containsKey('materialIdEnd') and conditionParamRef.materialIdEnd != null">
+                ${_conditionType_} a.materialId <![CDATA[ <= ]]> #{${_conditionParam_}.materialIdEnd}
+            </if>
+
+
+            <if test="conditionParamRef.containsKey('materialName')">
+                <if test="conditionParamRef.materialName != null and conditionParamRef.materialName != ''">
+                    ${_conditionType_} a.materialName like #{${_conditionParam_}.materialName}
+                </if>
+                <if test="conditionParamRef.materialName == null">
+                    ${_conditionType_} a.materialName is null
+                </if>
+            </if>
+            <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') 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('preViewPath')">
+                <if test="conditionParamRef.preViewPath != null and conditionParamRef.preViewPath != ''">
+                    ${_conditionType_} a.preViewPath like #{${_conditionParam_}.preViewPath}
+                </if>
+                <if test="conditionParamRef.preViewPath == null">
+                    ${_conditionType_} a.preViewPath is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('preViewPathList') and conditionParamRef.preViewPathList.size() > 0">
+                ${_conditionType_} a.preViewPath in
+                <foreach collection="conditionParamRef.preViewPathList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('preViewPathNotList') and conditionParamRef.preViewPathNotList.size() > 0">
+                ${_conditionType_} a.preViewPath not in
+                <foreach collection="conditionParamRef.preViewPathNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('formContent')">
+                <if test="conditionParamRef.formContent != null and conditionParamRef.formContent != ''">
+                    ${_conditionType_} a.formContent like #{${_conditionParam_}.formContent}
+                </if>
+                <if test="conditionParamRef.formContent == null">
+                    ${_conditionType_} a.formContent is null
+                </if>
+            </if>
+            <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') and conditionParamRef.formContentNotList.size() > 0">
+                ${_conditionType_} a.formContent not in
+                <foreach collection="conditionParamRef.formContentNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('docPath')">
+                <if test="conditionParamRef.docPath != null and conditionParamRef.docPath != ''">
+                    ${_conditionType_} a.docPath like #{${_conditionParam_}.docPath}
+                </if>
+                <if test="conditionParamRef.docPath == null">
+                    ${_conditionType_} a.docPath is null
+                </if>
+            </if>
+            <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') and conditionParamRef.docPathNotList.size() > 0">
+                ${_conditionType_} a.docPath not in
+                <foreach collection="conditionParamRef.docPathNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('formValue')">
+                <if test="conditionParamRef.formValue != null and conditionParamRef.formValue != ''">
+                    ${_conditionType_} a.formValue like #{${_conditionParam_}.formValue}
+                </if>
+                <if test="conditionParamRef.formValue == null">
+                    ${_conditionType_} a.formValue is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('formValueList') and conditionParamRef.formValueList.size() > 0">
+                ${_conditionType_} a.formValue in
+                <foreach collection="conditionParamRef.formValueList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('formValueNotList') and conditionParamRef.formValueNotList.size() > 0">
+                ${_conditionType_} a.formValue not in
+                <foreach collection="conditionParamRef.formValueNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('createTime')">
+                <if test="conditionParamRef.createTime != null ">
+                    ${_conditionType_} a.createTime = #{${_conditionParam_}.createTime}
+                </if>
+                <if test="conditionParamRef.createTime == null">
+                    ${_conditionType_} a.createTime is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('createTimeStart') and conditionParamRef.createTimeStart != null and conditionParamRef.createTimeStart!=''">
+                ${_conditionType_} a.createTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
+            </if>
+            <if test="conditionParamRef.containsKey('createTimeEnd') and conditionParamRef.createTimeEnd != null and conditionParamRef.createTimeEnd!=''">
+                ${_conditionType_} a.createTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
+            </if>
+            <if test="conditionParamRef.containsKey('createUserId')">
+                <if test="conditionParamRef.createUserId != null ">
+                    ${_conditionType_} a.createUserId = #{${_conditionParam_}.createUserId}
+                </if>
+                <if test="conditionParamRef.createUserId == null">
+                    ${_conditionType_} a.createUserId is null
+                </if>
+            </if>
+            <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') and conditionParamRef.createUserIdNotList.size() > 0">
+                ${_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>
+            <if test="conditionParamRef.containsKey('createUserIdEnd') and conditionParamRef.createUserIdEnd != null">
+                ${_conditionType_} a.createUserId <![CDATA[ <= ]]> #{${_conditionParam_}.createUserIdEnd}
+            </if>
+
+
+            <if test="conditionParamRef.containsKey('updateTime')">
+                <if test="conditionParamRef.updateTime != null ">
+                    ${_conditionType_} a.updateTime = #{${_conditionParam_}.updateTime}
+                </if>
+                <if test="conditionParamRef.updateTime == null">
+                    ${_conditionType_} a.updateTime is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('updateTimeStart') and conditionParamRef.updateTimeStart != null and conditionParamRef.updateTimeStart!=''">
+                ${_conditionType_} a.updateTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
+            </if>
+            <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('updateUserId')">
+                <if test="conditionParamRef.updateUserId != null ">
+                    ${_conditionType_} a.updateUserId = #{${_conditionParam_}.updateUserId}
+                </if>
+                <if test="conditionParamRef.updateUserId == null">
+                    ${_conditionType_} a.updateUserId is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('updateUserIdList') and conditionParamRef.updateUserIdList.size() > 0">
+                ${_conditionType_} a.updateUserId in
+                <foreach collection="conditionParamRef.updateUserIdList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('updateUserIdNotList') and conditionParamRef.updateUserIdNotList.size() > 0">
+                ${_conditionType_} a.updateUserId not in
+                <foreach collection="conditionParamRef.updateUserIdNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('updateUserIdStart') and conditionParamRef.updateUserIdStart != null">
+                ${_conditionType_} a.updateUserId <![CDATA[ >= ]]> #{${_conditionParam_}.updateUserIdStart}
+            </if>
+            <if test="conditionParamRef.containsKey('updateUserIdEnd') and conditionParamRef.updateUserIdEnd != null">
+                ${_conditionType_} a.updateUserId <![CDATA[ <= ]]> #{${_conditionParam_}.updateUserIdEnd}
+            </if>
+
+    </sql>
+    <sql id="_orderCols_">
+        <if test="orderColList != null and !orderColList.isEmpty()">
+            order by
+                    <if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
+                        field(a.id,
+                        <foreach collection="conditionParamRef.idList" open="" close=")" index="index" item="item" separator=",">
+                            #{item}
+                        </foreach>
+                        ,
+                    </if>
+                    <if test="conditionParamRef.containsKey('matterIdList') and conditionParamRef.matterIdList.size() > 0">
+                        field(a.matterId,
+                        <foreach collection="conditionParamRef.matterIdList" open="" close=")" index="index" item="item" separator=",">
+                            #{item}
+                        </foreach>
+                        ,
+                    </if>
+                    <if test="conditionParamRef.containsKey('materialIdList') and conditionParamRef.materialIdList.size() > 0">
+                        field(a.materialId,
+                        <foreach collection="conditionParamRef.materialIdList" open="" close=")" index="index" item="item" separator=",">
+                            #{item}
+                        </foreach>
+                        ,
+                    </if>
+                    <if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
+                        field(a.createUserId,
+                        <foreach collection="conditionParamRef.createUserIdList" open="" close=")" index="index" item="item" separator=",">
+                            #{item}
+                        </foreach>
+                        ,
+                    </if>
+                    <if test="conditionParamRef.containsKey('updateUserIdList') and conditionParamRef.updateUserIdList.size() > 0">
+                        field(a.updateUserId,
+                        <foreach collection="conditionParamRef.updateUserIdList" open="" close=")" index="index" item="item" separator=",">
+                            #{item}
+                        </foreach>
+                        ,
+                    </if>
+            <trim suffixOverrides=","  suffix="">
+                <foreach collection="orderColList" open="" close="" index="index" item="item" separator=",">
+                     a.${item.colName} ${item.sortKind}
+                </foreach>
+            </trim>
+        </if>
+
+        <if test="(orderColList == null or orderColList.isEmpty()) and orderCol != null and !orderCol.isEmpty()">
+            order by
+                    <if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
+                        field(a.id,
+                        <foreach collection="conditionParamRef.idList" open="" close=")" index="index" item="item" separator=",">
+                            #{item}
+                        </foreach>
+                        ,
+                    </if>
+                    <if test="conditionParamRef.containsKey('matterIdList') and conditionParamRef.matterIdList.size() > 0">
+                        field(a.matterId,
+                        <foreach collection="conditionParamRef.matterIdList" open="" close=")" index="index" item="item" separator=",">
+                            #{item}
+                        </foreach>
+                        ,
+                    </if>
+                    <if test="conditionParamRef.containsKey('materialIdList') and conditionParamRef.materialIdList.size() > 0">
+                        field(a.materialId,
+                        <foreach collection="conditionParamRef.materialIdList" open="" close=")" index="index" item="item" separator=",">
+                            #{item}
+                        </foreach>
+                        ,
+                    </if>
+                    <if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
+                        field(a.createUserId,
+                        <foreach collection="conditionParamRef.createUserIdList" open="" close=")" index="index" item="item" separator=",">
+                            #{item}
+                        </foreach>
+                        ,
+                    </if>
+                    <if test="conditionParamRef.containsKey('updateUserIdList') and conditionParamRef.updateUserIdList.size() > 0">
+                        field(a.updateUserId,
+                        <foreach collection="conditionParamRef.updateUserIdList" open="" close=")" index="index" item="item" separator=",">
+                            #{item}
+                        </foreach>
+                        ,
+                    </if>
+            <trim suffixOverrides=","  suffix="">
+                    <if test="orderCol.containsKey('id')">
+                        a.id
+                        <if test='orderCol.id != null and "DESC".equalsIgnoreCase(orderCol.id)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('openId')">
+                        a.openId
+                        <if test='orderCol.openId != null and "DESC".equalsIgnoreCase(orderCol.openId)'>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('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('materialId')">
+                        a.materialId
+                        <if test='orderCol.materialId != null and "DESC".equalsIgnoreCase(orderCol.materialId)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('materialName')">
+                        a.materialName
+                        <if test='orderCol.materialName != null and "DESC".equalsIgnoreCase(orderCol.materialName)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('preViewPath')">
+                        a.preViewPath
+                        <if test='orderCol.preViewPath != null and "DESC".equalsIgnoreCase(orderCol.preViewPath)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('formContent')">
+                        a.formContent
+                        <if test='orderCol.formContent != null and "DESC".equalsIgnoreCase(orderCol.formContent)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('docPath')">
+                        a.docPath
+                        <if test='orderCol.docPath != null and "DESC".equalsIgnoreCase(orderCol.docPath)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('formValue')">
+                        a.formValue
+                        <if test='orderCol.formValue != null and "DESC".equalsIgnoreCase(orderCol.formValue)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('createTime')">
+                        a.createTime
+                        <if test='orderCol.createTime != null and "DESC".equalsIgnoreCase(orderCol.createTime)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('createUserId')">
+                        a.createUserId
+                        <if test='orderCol.createUserId != null and "DESC".equalsIgnoreCase(orderCol.createUserId)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('updateTime')">
+                        a.updateTime
+                        <if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('updateUserId')">
+                        a.updateUserId
+                        <if test='orderCol.updateUserId != null and "DESC".equalsIgnoreCase(orderCol.updateUserId)'>DESC</if>
+                        ,
+                    </if>
+            </trim>
+        </if>
+
+
+    </sql>
+    <sql id="_group_by_">
+        <if test="groupList != null and !groupList.isEmpty()">
+            GROUP BY
+            <trim suffixOverrides=","  suffix="">
+                <foreach collection="groupList" open="" close="" index="index" item="item" separator=",">
+                    ${item}
+                </foreach>
+            </trim>
+        </if>
+    </sql>
+</mapper>
\ No newline at end of file