Merge branch 'master' of http://gitlab.scsmile.cn/zxf/smart_gov_platform

base-manager/db/add.sql

@@ -15,3 +15,14 @@ INSERT INTO `mortals_xhx_task` VALUES (null, '统计站点部门事项数', 'Sta
 2023-3-11
 -- ----------------------------
 ALTER TABLE mortals_sys_workman ADD COLUMN  `operatorId` varchar (128) default ""  COMMENT '一体化经办人id' AFTER modelIds;
+
+
+
+-- ----------------------------
+2023-3-28
+-- ----------------------------
+ALTER TABLE mortals_sys_app_info_field ADD COLUMN  `fieldTypeValue` varchar (255) default ""  COMMENT '字段类型值，当字段类型为多选，单选时候，预设复选值' AFTER fieldType;
+ALTER TABLE mortals_sys_app_info_field ADD COLUMN  `defaultValue` varchar (255) default ""  COMMENT '字段默认值' AFTER fieldValue;
+
+ALTER TABLE mortals_sys_app_info_templete_field ADD COLUMN  `fieldTypeValue` varchar (255) default ""  COMMENT '字段类型值，当字段类型为多选，单选时候，预设复选值' AFTER fieldType;
+ALTER TABLE mortals_sys_app_info_templete_field ADD COLUMN  `defaultValue` varchar (255) default ""  COMMENT '字段默认值' AFTER fieldValue;

base-manager/doc/api.md

@@ -10976,6 +10976,8 @@ data|object|数据对象
   createUserId|Long|创建用户
   updateTime|Date|修改时间
   updateUserId|Long|修改用户
+  fieldTypeValue|String|字段类型值，当字段类型为多选，单选时候，预设复选值
+  defaultValue|String|字段默认值
 dict|object|字典对象
  fieldType|object|字典属性对象，详见附录
  dataType|object|字典属性对象，详见附录
@@ -11037,6 +11039,8 @@ data|object|数据对象
  createUserId|Long|创建用户
  updateTime|Date|修改时间
  updateUserId|Long|修改用户
+ fieldTypeValue|String|字段类型值，当字段类型为多选，单选时候，预设复选值
+ defaultValue|String|字段默认值
 dict|object|字典对象
  fieldType|object|字典属性对象，详见附录
  dataType|object|字典属性对象，详见附录
@@ -11094,6 +11098,8 @@ fieldNull|Integer|否|是否允许为空，(0.否,1.是)
 isList|Integer|否|字段是否列表显示(0.否,1.是)
 fieldOrderNo|String|否|排序号
 remark|String|否|备注
+fieldTypeValue|String|否|字段类型值，当字段类型为多选，单选时候，预设复选值
+defaultValue|String|否|字段默认值
 
 **请求样例:**
 
@@ -11250,6 +11256,8 @@ data|object|数据对象
   createUserId|Long|创建用户
   updateTime|Date|修改时间
   updateUserId|Long|修改用户
+  fieldTypeValue|String|字段类型值，当字段类型为多选，单选时候，预设复选值
+  defaultValue|String|字段默认值
 dict|object|字典对象
  fieldType|object|字典属性对象，详见附录
  dataType|object|字典属性对象，详见附录
@@ -11311,6 +11319,8 @@ data|object|数据对象
  createUserId|Long|创建用户
  updateTime|Date|修改时间
  updateUserId|Long|修改用户
+ fieldTypeValue|String|字段类型值，当字段类型为多选，单选时候，预设复选值
+ defaultValue|String|字段默认值
 dict|object|字典对象
  fieldType|object|字典属性对象，详见附录
  dataType|object|字典属性对象，详见附录
@@ -11368,6 +11378,8 @@ fieldNull|Integer|否|是否允许为空，(0.否,1.是)
 isList|Integer|否|字段是否列表显示(0.否,1.是)
 fieldOrderNo|String|否|排序号
 remark|String|否|备注
+fieldTypeValue|String|否|字段类型值，当字段类型为多选，单选时候，预设复选值
+defaultValue|String|否|字段默认值
 
 **请求样例:**
 

base-manager/src/main/java/com/mortals/xhx/busiz/web/MidSignApiController.java

 package com.mortals.xhx.busiz.web;
 
-import cn.hutool.core.codec.Base64;
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.NumberUtil;
+import cn.hutool.core.net.url.UrlBuilder;
 import cn.hutool.core.util.RandomUtil;
-import cn.hutool.core.util.URLUtil;
-import cn.hutool.crypto.digest.DigestAlgorithm;
-import cn.hutool.crypto.digest.Digester;
 import cn.hutool.http.HttpUtil;
 import cn.hutool.http.Method;
 import com.alibaba.fastjson.JSON;
@@ -16,40 +11,15 @@ import com.mortals.framework.common.Rest;
 import com.mortals.xhx.busiz.req.MidReq;
 import com.mortals.xhx.busiz.rsp.SignResp;
 import com.mortals.xhx.common.utils.EncryptionUtils;
-import com.mortals.xhx.module.dept.model.DeptEntity;
-import com.mortals.xhx.module.dept.model.DeptQuery;
-import com.mortals.xhx.module.dept.service.DeptService;
-import com.mortals.xhx.module.matter.model.MatterEntity;
-import com.mortals.xhx.module.matter.model.MatterQuery;
-import com.mortals.xhx.module.matter.service.MatterService;
-import com.mortals.xhx.module.site.model.SiteMatterEntity;
-import com.mortals.xhx.module.site.model.SiteMatterQuery;
-import com.mortals.xhx.module.site.service.SiteMatterService;
-import com.mortals.xhx.module.window.model.WindowEntity;
-import com.mortals.xhx.module.window.model.WindowMatterEntity;
-import com.mortals.xhx.module.window.model.WindowMatterQuery;
-import com.mortals.xhx.module.window.model.WindowQuery;
-import com.mortals.xhx.module.window.service.WindowMatterService;
-import com.mortals.xhx.module.window.service.WindowService;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.http.HttpResponse;
-import org.apache.http.client.CookieStore;
-import org.apache.http.client.HttpClient;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.impl.client.BasicCookieStore;
-import org.apache.http.impl.client.HttpClientBuilder;
-import org.apache.http.util.EntityUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.http.HttpMethod;
-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.*;
-import java.util.stream.Collectors;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * 微中台签名接口
@@ -104,6 +74,8 @@ public class MidSignApiController {
                         headerMap.put(entry.getKey(), entry.getValue());
                     }
                 }
+            }else {
+
             }
 
             StringBuilder signSb = new StringBuilder();
@@ -157,6 +129,9 @@ public class MidSignApiController {
                         headerMap.put(entry.getKey(), entry.getValue());
                     }
                 }*/
+            }else{
+                JSONObject object1 = JSONObject.parseObject(midReq.getBody());
+                headerMap.put("body", object1.toJSONString());
             }
 
             signSb.append("appId").append("=").append(headerMap.get("appId")).append("&");
@@ -172,9 +147,14 @@ public class MidSignApiController {
 
             headerMap.put("sign", sign);
             //请求转发
-            String fullUrl = URLUtil.completeUrl(midUrl, midReq.getPath());
+            String fullUrl =UrlBuilder.ofHttp(midUrl).addPath(midReq.getPath()).build();
+            //String fullUrl = URLUtil.completeUrl(midUrl, midReq.getPath());
+            log.info("mid url:{},body:{}",fullUrl,headerMap.get("body"));
             String body = HttpUtil.createRequest(Method.POST, fullUrl).headerMap(headerMap, true).body(headerMap.get("body")).execute().body();
-            return Rest.ok(body);
+            JSONObject bodyJson = JSONObject.parseObject(body);
+            log.info("mid resp:"+bodyJson.toJSONString());
+
+            return Rest.ok(bodyJson.toJSONString());
         } catch (Exception e) {
             log.error("透传请求异常",e);
             return Rest.fail("透传请求异常！");

base-manager/src/main/java/com/mortals/xhx/module/app/model/AppInfoFieldEntity.java

@@ -7,17 +7,17 @@ import com.mortals.framework.annotation.Excel;
 import com.mortals.framework.model.BaseEntityLong;
 import com.mortals.xhx.module.app.model.vo.AppInfoFieldVo;
 /**
- * 自助终端应用信息字段实体对象
+ * 自助终端应用模板信息字段实体对象
  *
  * @author zxfei
- * @date 2022-12-02
+ * @date 2023-03-28
  */
 
 public class AppInfoFieldEntity extends AppInfoFieldVo {
     private static final long serialVersionUID = 1L;
 
     /**
-     * 应用数据集id
+     * 数据集id
      */
     private Long datasetId;
     /**
@@ -29,9 +29,13 @@ public class AppInfoFieldEntity extends AppInfoFieldVo {
      */
     private String fieldName;
     /**
-     * 字段类型（input.单行输入框,textarea.多行输入框,SELECT.下拉选项框,date.日期选择框）
+     * 字段类型（input.单行输入框,textarea.多行输入框,SELECT.下拉选项框,date.日期选择框,editer.富文本）
      */
     private String fieldType;
+    /**
+     * 字段类型值，当字段类型为多选，单选时候，预设复选值
+     */
+    private String fieldTypeValue;
     /**
      * 数据类型（number.数字,string.字符串）
      */
@@ -40,6 +44,10 @@ public class AppInfoFieldEntity extends AppInfoFieldVo {
      * 字段值
      */
     private String fieldValue;
+    /**
+     * 字段默认值
+     */
+    private String defaultValue;
     /**
      * 数据长度，默认128
      */
@@ -65,14 +73,14 @@ public class AppInfoFieldEntity extends AppInfoFieldVo {
 
     public AppInfoFieldEntity(){}
     /**
-     * 获取 应用数据集id
+     * 获取 数据集id
      * @return Long
      */
     public Long getDatasetId(){
         return datasetId;
     }
     /**
-     * 设置 应用数据集id
+     * 设置 数据集id
      * @param datasetId
      */
     public void setDatasetId(Long datasetId){
@@ -107,19 +115,33 @@ public class AppInfoFieldEntity extends AppInfoFieldVo {
         this.fieldName = fieldName;
     }
     /**
-     * 获取 字段类型（input.单行输入框,textarea.多行输入框,SELECT.下拉选项框,date.日期选择框）
+     * 获取 字段类型（input.单行输入框,textarea.多行输入框,SELECT.下拉选项框,date.日期选择框,editer.富文本）
      * @return String
      */
     public String getFieldType(){
         return fieldType;
     }
     /**
-     * 设置 字段类型（input.单行输入框,textarea.多行输入框,SELECT.下拉选项框,date.日期选择框）
+     * 设置 字段类型（input.单行输入框,textarea.多行输入框,SELECT.下拉选项框,date.日期选择框,editer.富文本）
      * @param fieldType
      */
     public void setFieldType(String fieldType){
         this.fieldType = fieldType;
     }
+    /**
+     * 获取 字段类型值，当字段类型为多选，单选时候，预设复选值
+     * @return String
+     */
+    public String getFieldTypeValue(){
+        return fieldTypeValue;
+    }
+    /**
+     * 设置 字段类型值，当字段类型为多选，单选时候，预设复选值
+     * @param fieldTypeValue
+     */
+    public void setFieldTypeValue(String fieldTypeValue){
+        this.fieldTypeValue = fieldTypeValue;
+    }
     /**
      * 获取 数据类型（number.数字,string.字符串）
      * @return String
@@ -148,6 +170,20 @@ public class AppInfoFieldEntity extends AppInfoFieldVo {
     public void setFieldValue(String fieldValue){
         this.fieldValue = fieldValue;
     }
+    /**
+     * 获取 字段默认值
+     * @return String
+     */
+    public String getDefaultValue(){
+        return defaultValue;
+    }
+    /**
+     * 设置 字段默认值
+     * @param defaultValue
+     */
+    public void setDefaultValue(String defaultValue){
+        this.defaultValue = defaultValue;
+    }
     /**
      * 获取 数据长度，默认128
      * @return Integer
@@ -244,8 +280,10 @@ public class AppInfoFieldEntity extends AppInfoFieldVo {
         sb.append(",fieldCode:").append(getFieldCode());
         sb.append(",fieldName:").append(getFieldName());
         sb.append(",fieldType:").append(getFieldType());
+        sb.append(",fieldTypeValue:").append(getFieldTypeValue());
         sb.append(",dataType:").append(getDataType());
         sb.append(",fieldValue:").append(getFieldValue());
+        sb.append(",defaultValue:").append(getDefaultValue());
         sb.append(",fieldLen:").append(getFieldLen());
         sb.append(",fieldNull:").append(getFieldNull());
         sb.append(",isList:").append(getIsList());
@@ -264,10 +302,14 @@ public class AppInfoFieldEntity extends AppInfoFieldVo {
 
         this.fieldType = "";
 
+        this.fieldTypeValue = "";
+
         this.dataType = "";
 
         this.fieldValue = "";
 
+        this.defaultValue = "";
+
         this.fieldLen = 0;
 
         this.fieldNull = 1;

base-manager/src/main/java/com/mortals/xhx/module/app/model/AppInfoFieldQuery.java

@@ -3,10 +3,10 @@ package com.mortals.xhx.module.app.model;
 import java.util.List;
 import com.mortals.xhx.module.app.model.AppInfoFieldEntity;
 /**
- * 自助终端应用信息字段查询对象
+ * 自助终端应用模板信息字段查询对象
  *
  * @author zxfei
- * @date 2022-12-02
+ * @date 2023-03-28
  */
 public class AppInfoFieldQuery extends AppInfoFieldEntity {
     /** 开始 序号，主键，自增长 */
@@ -21,33 +21,59 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity {
     /** 序号，主键，自增长列表 */
     private List <Long> idList;
 
-    /** 开始 应用数据集id */
+    /** 序号，主键，自增长排除列表 */
+    private List <Long> idNotList;
+
+    /** 开始 数据集id */
     private Long datasetIdStart;
 
-    /** 结束 应用数据集id */
+    /** 结束 数据集id */
     private Long datasetIdEnd;
 
-    /** 增加 应用数据集id */
+    /** 增加 数据集id */
     private Long datasetIdIncrement;
 
-    /** 应用数据集id列表 */
+    /** 数据集id列表 */
     private List <Long> datasetIdList;
 
+    /** 数据集id排除列表 */
+    private List <Long> datasetIdNotList;
+
     /** 字段编码 */
     private List<String> fieldCodeList;
 
+    /** 字段编码排除列表 */
+    private List <String> fieldCodeNotList;
     /** 字段名称 */
     private List<String> fieldNameList;
 
-    /** 字段类型（input.单行输入框,textarea.多行输入框,SELECT.下拉选项框,date.日期选择框） */
+    /** 字段名称排除列表 */
+    private List <String> fieldNameNotList;
+    /** 字段类型（input.单行输入框,textarea.多行输入框,SELECT.下拉选项框,date.日期选择框,editer.富文本） */
     private List<String> fieldTypeList;
 
+    /** 字段类型（input.单行输入框,textarea.多行输入框,SELECT.下拉选项框,date.日期选择框,editer.富文本）排除列表 */
+    private List <String> fieldTypeNotList;
+    /** 字段类型值，当字段类型为多选，单选时候，预设复选值 */
+    private List<String> fieldTypeValueList;
+
+    /** 字段类型值，当字段类型为多选，单选时候，预设复选值排除列表 */
+    private List <String> fieldTypeValueNotList;
     /** 数据类型（number.数字,string.字符串） */
     private List<String> dataTypeList;
 
+    /** 数据类型（number.数字,string.字符串）排除列表 */
+    private List <String> dataTypeNotList;
     /** 字段值 */
     private List<String> fieldValueList;
 
+    /** 字段值排除列表 */
+    private List <String> fieldValueNotList;
+    /** 字段默认值 */
+    private List<String> defaultValueList;
+
+    /** 字段默认值排除列表 */
+    private List <String> defaultValueNotList;
     /** 开始 数据长度，默认128 */
     private Integer fieldLenStart;
 
@@ -60,6 +86,9 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity {
     /** 数据长度，默认128列表 */
     private List <Integer> fieldLenList;
 
+    /** 数据长度，默认128排除列表 */
+    private List <Integer> fieldLenNotList;
+
     /** 开始 是否允许为空，(0.否,1.是) */
     private Integer fieldNullStart;
 
@@ -72,6 +101,9 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity {
     /** 是否允许为空，(0.否,1.是)列表 */
     private List <Integer> fieldNullList;
 
+    /** 是否允许为空，(0.否,1.是)排除列表 */
+    private List <Integer> fieldNullNotList;
+
     /** 开始 字段是否列表显示(0.否,1.是) */
     private Integer isListStart;
 
@@ -84,6 +116,9 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity {
     /** 字段是否列表显示(0.否,1.是)列表 */
     private List <Integer> isListList;
 
+    /** 字段是否列表显示(0.否,1.是)排除列表 */
+    private List <Integer> isListNotList;
+
     /** 开始 排序号 */
     private Integer fieldOrderNoStart;
 
@@ -96,9 +131,14 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity {
     /** 排序号列表 */
     private List <Integer> fieldOrderNoList;
 
+    /** 排序号排除列表 */
+    private List <Integer> fieldOrderNoNotList;
+
     /** 备注 */
     private List<String> remarkList;
 
+    /** 备注排除列表 */
+    private List <String> remarkNotList;
     /** 开始 创建时间 */
     private String createTimeStart;
 
@@ -117,6 +157,9 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity {
     /** 创建用户列表 */
     private List <Long> createUserIdList;
 
+    /** 创建用户排除列表 */
+    private List <Long> createUserIdNotList;
+
     /** 开始 修改时间 */
     private String updateTimeStart;
 
@@ -135,6 +178,9 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity {
     /** 修改用户列表 */
     private List <Long> updateUserIdList;
 
+    /** 修改用户排除列表 */
+    private List <Long> updateUserIdNotList;
+
     /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
     private List<AppInfoFieldQuery> orConditionList;
 
@@ -208,7 +254,24 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity {
     }
 
     /**
-     * 获取 开始 应用数据集id
+     * 获取 序号，主键，自增长
+     * @return idNotList
+     */
+    public List<Long> getIdNotList(){
+        return this.idNotList;
+    }
+
+    /**
+     * 设置 序号，主键，自增长
+     * @param idNotList
+     */
+    public void setIdNotList(List<Long> idNotList){
+        this.idNotList = idNotList;
+    }
+
+
+    /**
+     * 获取 开始 数据集id
      * @return datasetIdStart
      */
     public Long getDatasetIdStart(){
@@ -216,7 +279,7 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity {
     }
 
     /**
-     * 设置 开始 应用数据集id
+     * 设置 开始 数据集id
      * @param datasetIdStart
      */
     public void setDatasetIdStart(Long datasetIdStart){
@@ -224,7 +287,7 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity {
     }
 
     /**
-     * 获取 结束 应用数据集id
+     * 获取 结束 数据集id
      * @return $datasetIdEnd
      */
     public Long getDatasetIdEnd(){
@@ -232,7 +295,7 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity {
     }
 
     /**
-     * 设置 结束 应用数据集id
+     * 设置 结束 数据集id
      * @param datasetIdEnd
      */
     public void setDatasetIdEnd(Long datasetIdEnd){
@@ -240,7 +303,7 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity {
     }
 
     /**
-     * 获取 增加 应用数据集id
+     * 获取 增加 数据集id
      * @return datasetIdIncrement
      */
     public Long getDatasetIdIncrement(){
@@ -248,7 +311,7 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity {
     }
 
     /**
-     * 设置 增加 应用数据集id
+     * 设置 增加 数据集id
      * @param datasetIdIncrement
      */
     public void setDatasetIdIncrement(Long datasetIdIncrement){
@@ -256,7 +319,7 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity {
     }
 
     /**
-     * 获取 应用数据集id
+     * 获取 数据集id
      * @return datasetIdList
      */
     public List<Long> getDatasetIdList(){
@@ -264,13 +327,30 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity {
     }
 
     /**
-     * 设置 应用数据集id
+     * 设置 数据集id
      * @param datasetIdList
      */
     public void setDatasetIdList(List<Long> datasetIdList){
         this.datasetIdList = datasetIdList;
     }
 
+    /**
+     * 获取 数据集id
+     * @return datasetIdNotList
+     */
+    public List<Long> getDatasetIdNotList(){
+        return this.datasetIdNotList;
+    }
+
+    /**
+     * 设置 数据集id
+     * @param datasetIdNotList
+     */
+    public void setDatasetIdNotList(List<Long> datasetIdNotList){
+        this.datasetIdNotList = datasetIdNotList;
+    }
+
+
     /**
      * 获取 字段编码
      * @return fieldCodeList
@@ -286,6 +366,23 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity {
     public void setFieldCodeList(List<String> fieldCodeList){
         this.fieldCodeList = fieldCodeList;
     }
+
+    /**
+     * 获取 字段编码
+     * @return fieldCodeNotList
+     */
+    public List<String> getFieldCodeNotList(){
+        return this.fieldCodeNotList;
+    }
+
+    /**
+     * 设置 字段编码
+     * @param fieldCodeNotList
+     */
+    public void setFieldCodeNotList(List<String> fieldCodeNotList){
+        this.fieldCodeNotList = fieldCodeNotList;
+    }
+
     /**
      * 获取 字段名称
      * @return fieldNameList
@@ -301,8 +398,25 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity {
     public void setFieldNameList(List<String> fieldNameList){
         this.fieldNameList = fieldNameList;
     }
+
     /**
-     * 获取 字段类型（input.单行输入框,textarea.多行输入框,SELECT.下拉选项框,date.日期选择框）
+     * 获取 字段名称
+     * @return fieldNameNotList
+     */
+    public List<String> getFieldNameNotList(){
+        return this.fieldNameNotList;
+    }
+
+    /**
+     * 设置 字段名称
+     * @param fieldNameNotList
+     */
+    public void setFieldNameNotList(List<String> fieldNameNotList){
+        this.fieldNameNotList = fieldNameNotList;
+    }
+
+    /**
+     * 获取 字段类型（input.单行输入框,textarea.多行输入框,SELECT.下拉选项框,date.日期选择框,editer.富文本）
      * @return fieldTypeList
      */
     public List<String> getFieldTypeList(){
@@ -310,12 +424,61 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity {
     }
 
     /**
-     * 设置 字段类型（input.单行输入框,textarea.多行输入框,SELECT.下拉选项框,date.日期选择框）
+     * 设置 字段类型（input.单行输入框,textarea.多行输入框,SELECT.下拉选项框,date.日期选择框,editer.富文本）
      * @param fieldTypeList
      */
     public void setFieldTypeList(List<String> fieldTypeList){
         this.fieldTypeList = fieldTypeList;
     }
+
+    /**
+     * 获取 字段类型（input.单行输入框,textarea.多行输入框,SELECT.下拉选项框,date.日期选择框,editer.富文本）
+     * @return fieldTypeNotList
+     */
+    public List<String> getFieldTypeNotList(){
+        return this.fieldTypeNotList;
+    }
+
+    /**
+     * 设置 字段类型（input.单行输入框,textarea.多行输入框,SELECT.下拉选项框,date.日期选择框,editer.富文本）
+     * @param fieldTypeNotList
+     */
+    public void setFieldTypeNotList(List<String> fieldTypeNotList){
+        this.fieldTypeNotList = fieldTypeNotList;
+    }
+
+    /**
+     * 获取 字段类型值，当字段类型为多选，单选时候，预设复选值
+     * @return fieldTypeValueList
+     */
+    public List<String> getFieldTypeValueList(){
+        return this.fieldTypeValueList;
+    }
+
+    /**
+     * 设置 字段类型值，当字段类型为多选，单选时候，预设复选值
+     * @param fieldTypeValueList
+     */
+    public void setFieldTypeValueList(List<String> fieldTypeValueList){
+        this.fieldTypeValueList = fieldTypeValueList;
+    }
+
+    /**
+     * 获取 字段类型值，当字段类型为多选，单选时候，预设复选值
+     * @return fieldTypeValueNotList
+     */
+    public List<String> getFieldTypeValueNotList(){
+        return this.fieldTypeValueNotList;
+    }
+
+    /**
+     * 设置 字段类型值，当字段类型为多选，单选时候，预设复选值
+     * @param fieldTypeValueNotList
+     */
+    public void setFieldTypeValueNotList(List<String> fieldTypeValueNotList){
+        this.fieldTypeValueNotList = fieldTypeValueNotList;
+    }
+
     /**
      * 获取 数据类型（number.数字,string.字符串）
      * @return dataTypeList
@@ -331,6 +494,23 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity {
     public void setDataTypeList(List<String> dataTypeList){
         this.dataTypeList = dataTypeList;
     }
+
+    /**
+     * 获取 数据类型（number.数字,string.字符串）
+     * @return dataTypeNotList
+     */
+    public List<String> getDataTypeNotList(){
+        return this.dataTypeNotList;
+    }
+
+    /**
+     * 设置 数据类型（number.数字,string.字符串）
+     * @param dataTypeNotList
+     */
+    public void setDataTypeNotList(List<String> dataTypeNotList){
+        this.dataTypeNotList = dataTypeNotList;
+    }
+
     /**
      * 获取 字段值
      * @return fieldValueList
@@ -346,6 +526,55 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity {
     public void setFieldValueList(List<String> fieldValueList){
         this.fieldValueList = fieldValueList;
     }
+
+    /**
+     * 获取 字段值
+     * @return fieldValueNotList
+     */
+    public List<String> getFieldValueNotList(){
+        return this.fieldValueNotList;
+    }
+
+    /**
+     * 设置 字段值
+     * @param fieldValueNotList
+     */
+    public void setFieldValueNotList(List<String> fieldValueNotList){
+        this.fieldValueNotList = fieldValueNotList;
+    }
+
+    /**
+     * 获取 字段默认值
+     * @return defaultValueList
+     */
+    public List<String> getDefaultValueList(){
+        return this.defaultValueList;
+    }
+
+    /**
+     * 设置 字段默认值
+     * @param defaultValueList
+     */
+    public void setDefaultValueList(List<String> defaultValueList){
+        this.defaultValueList = defaultValueList;
+    }
+
+    /**
+     * 获取 字段默认值
+     * @return defaultValueNotList
+     */
+    public List<String> getDefaultValueNotList(){
+        return this.defaultValueNotList;
+    }
+
+    /**
+     * 设置 字段默认值
+     * @param defaultValueNotList
+     */
+    public void setDefaultValueNotList(List<String> defaultValueNotList){
+        this.defaultValueNotList = defaultValueNotList;
+    }
+
     /**
      * 获取 开始 数据长度，默认128
      * @return fieldLenStart
@@ -410,6 +639,23 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity {
         this.fieldLenList = fieldLenList;
     }
 
+    /**
+     * 获取 数据长度，默认128
+     * @return fieldLenNotList
+     */
+    public List<Integer> getFieldLenNotList(){
+        return this.fieldLenNotList;
+    }
+
+    /**
+     * 设置 数据长度，默认128
+     * @param fieldLenNotList
+     */
+    public void setFieldLenNotList(List<Integer> fieldLenNotList){
+        this.fieldLenNotList = fieldLenNotList;
+    }
+
+
     /**
      * 获取 开始 是否允许为空，(0.否,1.是)
      * @return fieldNullStart
@@ -474,6 +720,23 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity {
         this.fieldNullList = fieldNullList;
     }
 
+    /**
+     * 获取 是否允许为空，(0.否,1.是)
+     * @return fieldNullNotList
+     */
+    public List<Integer> getFieldNullNotList(){
+        return this.fieldNullNotList;
+    }
+
+    /**
+     * 设置 是否允许为空，(0.否,1.是)
+     * @param fieldNullNotList
+     */
+    public void setFieldNullNotList(List<Integer> fieldNullNotList){
+        this.fieldNullNotList = fieldNullNotList;
+    }
+
+
     /**
      * 获取 开始 字段是否列表显示(0.否,1.是)
      * @return isListStart
@@ -538,6 +801,23 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity {
         this.isListList = isListList;
     }
 
+    /**
+     * 获取 字段是否列表显示(0.否,1.是)
+     * @return isListNotList
+     */
+    public List<Integer> getIsListNotList(){
+        return this.isListNotList;
+    }
+
+    /**
+     * 设置 字段是否列表显示(0.否,1.是)
+     * @param isListNotList
+     */
+    public void setIsListNotList(List<Integer> isListNotList){
+        this.isListNotList = isListNotList;
+    }
+
+
     /**
      * 获取 开始 排序号
      * @return fieldOrderNoStart
@@ -602,6 +882,23 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity {
         this.fieldOrderNoList = fieldOrderNoList;
     }
 
+    /**
+     * 获取 排序号
+     * @return fieldOrderNoNotList
+     */
+    public List<Integer> getFieldOrderNoNotList(){
+        return this.fieldOrderNoNotList;
+    }
+
+    /**
+     * 设置 排序号
+     * @param fieldOrderNoNotList
+     */
+    public void setFieldOrderNoNotList(List<Integer> fieldOrderNoNotList){
+        this.fieldOrderNoNotList = fieldOrderNoNotList;
+    }
+
+
     /**
      * 获取 备注
      * @return remarkList
@@ -617,6 +914,23 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity {
     public void setRemarkList(List<String> remarkList){
         this.remarkList = remarkList;
     }
+
+    /**
+     * 获取 备注
+     * @return remarkNotList
+     */
+    public List<String> getRemarkNotList(){
+        return this.remarkNotList;
+    }
+
+    /**
+     * 设置 备注
+     * @param remarkNotList
+     */
+    public void setRemarkNotList(List<String> remarkNotList){
+        this.remarkNotList = remarkNotList;
+    }
+
     /**
      * 获取 开始 创建时间
      * @return createTimeStart
@@ -713,6 +1027,23 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity {
         this.createUserIdList = createUserIdList;
     }
 
+    /**
+     * 获取 创建用户
+     * @return createUserIdNotList
+     */
+    public List<Long> getCreateUserIdNotList(){
+        return this.createUserIdNotList;
+    }
+
+    /**
+     * 设置 创建用户
+     * @param createUserIdNotList
+     */
+    public void setCreateUserIdNotList(List<Long> createUserIdNotList){
+        this.createUserIdNotList = createUserIdNotList;
+    }
+
+
     /**
      * 获取 开始 修改时间
      * @return updateTimeStart
@@ -809,6 +1140,23 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity {
         this.updateUserIdList = updateUserIdList;
     }
 
+    /**
+     * 获取 修改用户
+     * @return updateUserIdNotList
+     */
+    public List<Long> getUpdateUserIdNotList(){
+        return this.updateUserIdNotList;
+    }
+
+    /**
+     * 设置 修改用户
+     * @param updateUserIdNotList
+     */
+    public void setUpdateUserIdNotList(List<Long> updateUserIdNotList){
+        this.updateUserIdNotList = updateUserIdNotList;
+    }
+
+
     /**
      * 设置  序号，主键，自增长
      * @param id
@@ -855,7 +1203,16 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity {
     }
 
     /**
-     * 设置  应用数据集id
+     * 设置 序号，主键，自增长
+     * @param idNotList
+     */
+    public AppInfoFieldQuery idNotList(List<Long> idNotList){
+        this.idNotList = idNotList;
+        return this;
+    }
+
+    /**
+     * 设置  数据集id
      * @param datasetId
      */
     public AppInfoFieldQuery datasetId(Long datasetId){
@@ -864,7 +1221,7 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity {
     }
 
     /**
-     * 设置 开始 应用数据集id
+     * 设置 开始 数据集id
      * @param datasetIdStart
      */
     public AppInfoFieldQuery datasetIdStart(Long datasetIdStart){
@@ -873,7 +1230,7 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity {
     }
 
     /**
-     * 设置 结束 应用数据集id
+     * 设置 结束 数据集id
      * @param datasetIdEnd
      */
     public AppInfoFieldQuery datasetIdEnd(Long datasetIdEnd){
@@ -882,7 +1239,7 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity {
     }
 
     /**
-     * 设置 增加 应用数据集id
+     * 设置 增加 数据集id
      * @param datasetIdIncrement
      */
     public AppInfoFieldQuery datasetIdIncrement(Long datasetIdIncrement){
@@ -891,7 +1248,7 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity {
     }
 
     /**
-     * 设置 应用数据集id
+     * 设置 数据集id
      * @param datasetIdList
      */
     public AppInfoFieldQuery datasetIdList(List<Long> datasetIdList){
@@ -899,6 +1256,15 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity {
         return this;
     }
 
+    /**
+     * 设置 数据集id
+     * @param datasetIdNotList
+     */
+    public AppInfoFieldQuery datasetIdNotList(List<Long> datasetIdNotList){
+        this.datasetIdNotList = datasetIdNotList;
+        return this;
+    }
+
 
     /**
      * 设置 字段编码
@@ -939,7 +1305,7 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity {
 
 
     /**
-     * 设置 字段类型（input.单行输入框,textarea.多行输入框,SELECT.下拉选项框,date.日期选择框）
+     * 设置 字段类型（input.单行输入框,textarea.多行输入框,SELECT.下拉选项框,date.日期选择框,editer.富文本）
      * @param fieldType
      */
     public AppInfoFieldQuery fieldType(String fieldType){
@@ -948,7 +1314,7 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity {
     }
 
     /**
-     * 设置 字段类型（input.单行输入框,textarea.多行输入框,SELECT.下拉选项框,date.日期选择框）
+     * 设置 字段类型（input.单行输入框,textarea.多行输入框,SELECT.下拉选项框,date.日期选择框,editer.富文本）
      * @param fieldTypeList
      */
     public AppInfoFieldQuery fieldTypeList(List<String> fieldTypeList){
@@ -957,6 +1323,25 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity {
     }
 
 
+    /**
+     * 设置 字段类型值，当字段类型为多选，单选时候，预设复选值
+     * @param fieldTypeValue
+     */
+    public AppInfoFieldQuery fieldTypeValue(String fieldTypeValue){
+        setFieldTypeValue(fieldTypeValue);
+        return this;
+    }
+
+    /**
+     * 设置 字段类型值，当字段类型为多选，单选时候，预设复选值
+     * @param fieldTypeValueList
+     */
+    public AppInfoFieldQuery fieldTypeValueList(List<String> fieldTypeValueList){
+        this.fieldTypeValueList = fieldTypeValueList;
+        return this;
+    }
+
+
     /**
      * 设置 数据类型（number.数字,string.字符串）
      * @param dataType
@@ -994,6 +1379,25 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity {
         return this;
     }
 
+
+    /**
+     * 设置 字段默认值
+     * @param defaultValue
+     */
+    public AppInfoFieldQuery defaultValue(String defaultValue){
+        setDefaultValue(defaultValue);
+        return this;
+    }
+
+    /**
+     * 设置 字段默认值
+     * @param defaultValueList
+     */
+    public AppInfoFieldQuery defaultValueList(List<String> defaultValueList){
+        this.defaultValueList = defaultValueList;
+        return this;
+    }
+
     /**
      * 设置  数据长度，默认128
      * @param fieldLen
@@ -1039,6 +1443,15 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity {
         return this;
     }
 
+    /**
+     * 设置 数据长度，默认128
+     * @param fieldLenNotList
+     */
+    public AppInfoFieldQuery fieldLenNotList(List<Integer> fieldLenNotList){
+        this.fieldLenNotList = fieldLenNotList;
+        return this;
+    }
+
     /**
      * 设置  是否允许为空，(0.否,1.是)
      * @param fieldNull
@@ -1084,6 +1497,15 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity {
         return this;
     }
 
+    /**
+     * 设置 是否允许为空，(0.否,1.是)
+     * @param fieldNullNotList
+     */
+    public AppInfoFieldQuery fieldNullNotList(List<Integer> fieldNullNotList){
+        this.fieldNullNotList = fieldNullNotList;
+        return this;
+    }
+
     /**
      * 设置  字段是否列表显示(0.否,1.是)
      * @param isList
@@ -1129,6 +1551,15 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity {
         return this;
     }
 
+    /**
+     * 设置 字段是否列表显示(0.否,1.是)
+     * @param isListNotList
+     */
+    public AppInfoFieldQuery isListNotList(List<Integer> isListNotList){
+        this.isListNotList = isListNotList;
+        return this;
+    }
+
     /**
      * 设置  排序号
      * @param fieldOrderNo
@@ -1174,6 +1605,15 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity {
         return this;
     }
 
+    /**
+     * 设置 排序号
+     * @param fieldOrderNoNotList
+     */
+    public AppInfoFieldQuery fieldOrderNoNotList(List<Integer> fieldOrderNoNotList){
+        this.fieldOrderNoNotList = fieldOrderNoNotList;
+        return this;
+    }
+
 
     /**
      * 设置 备注
@@ -1239,6 +1679,15 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity {
         return this;
     }
 
+    /**
+     * 设置 创建用户
+     * @param createUserIdNotList
+     */
+    public AppInfoFieldQuery createUserIdNotList(List<Long> createUserIdNotList){
+        this.createUserIdNotList = createUserIdNotList;
+        return this;
+    }
+
 
     /**
      * 设置  修改用户
@@ -1285,6 +1734,15 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity {
         return this;
     }
 
+    /**
+     * 设置 修改用户
+     * @param updateUserIdNotList
+     */
+    public AppInfoFieldQuery 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

base-manager/src/main/java/com/mortals/xhx/module/app/model/AppInfoTempleteFieldEntity.java

@@ -10,7 +10,7 @@ import com.mortals.xhx.module.app.model.vo.AppInfoTempleteFieldVo;
  * 自助终端应用模板信息字段实体对象
  *
  * @author zxfei
- * @date 2022-12-02
+ * @date 2023-03-28
  */
 
 public class AppInfoTempleteFieldEntity extends AppInfoTempleteFieldVo {
@@ -60,6 +60,14 @@ public class AppInfoTempleteFieldEntity extends AppInfoTempleteFieldVo {
      * 备注
      */
     private String remark;
+    /**
+     * 字段类型值，当字段类型为多选，单选时候，预设复选值
+     */
+    private String fieldTypeValue;
+    /**
+     * 字段默认值
+     */
+    private String defaultValue;
 
 
 
@@ -218,6 +226,34 @@ public class AppInfoTempleteFieldEntity extends AppInfoTempleteFieldVo {
     public void setRemark(String remark){
         this.remark = remark;
     }
+    /**
+     * 获取 字段类型值，当字段类型为多选，单选时候，预设复选值
+     * @return String
+     */
+    public String getFieldTypeValue(){
+        return fieldTypeValue;
+    }
+    /**
+     * 设置 字段类型值，当字段类型为多选，单选时候，预设复选值
+     * @param fieldTypeValue
+     */
+    public void setFieldTypeValue(String fieldTypeValue){
+        this.fieldTypeValue = fieldTypeValue;
+    }
+    /**
+     * 获取 字段默认值
+     * @return String
+     */
+    public String getDefaultValue(){
+        return defaultValue;
+    }
+    /**
+     * 设置 字段默认值
+     * @param defaultValue
+     */
+    public void setDefaultValue(String defaultValue){
+        this.defaultValue = defaultValue;
+    }
 
 
 
@@ -251,6 +287,8 @@ public class AppInfoTempleteFieldEntity extends AppInfoTempleteFieldVo {
         sb.append(",isList:").append(getIsList());
         sb.append(",fieldOrderNo:").append(getFieldOrderNo());
         sb.append(",remark:").append(getRemark());
+        sb.append(",fieldTypeValue:").append(getFieldTypeValue());
+        sb.append(",defaultValue:").append(getDefaultValue());
         return sb.toString();
     }
 
@@ -277,5 +315,9 @@ public class AppInfoTempleteFieldEntity extends AppInfoTempleteFieldVo {
         this.fieldOrderNo = 1;
 
         this.remark = "";
+
+        this.fieldTypeValue = "";
+
+        this.defaultValue = "";
     }
 }
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/app/model/AppInfoTempleteFieldQuery.java

@@ -6,7 +6,7 @@ import com.mortals.xhx.module.app.model.AppInfoTempleteFieldEntity;
  * 自助终端应用模板信息字段查询对象
  *
  * @author zxfei
- * @date 2022-12-02
+ * @date 2023-03-28
  */
 public class AppInfoTempleteFieldQuery extends AppInfoTempleteFieldEntity {
     /** 开始 序号，主键，自增长 */
@@ -21,6 +21,9 @@ public class AppInfoTempleteFieldQuery extends AppInfoTempleteFieldEntity {
     /** 序号，主键，自增长列表 */
     private List <Long> idList;
 
+    /** 序号，主键，自增长排除列表 */
+    private List <Long> idNotList;
+
     /** 开始 应用id */
     private Long appIdStart;
 
@@ -33,21 +36,34 @@ public class AppInfoTempleteFieldQuery extends AppInfoTempleteFieldEntity {
     /** 应用id列表 */
     private List <Long> appIdList;
 
+    /** 应用id排除列表 */
+    private List <Long> appIdNotList;
+
     /** 字段编码 */
     private List<String> fieldCodeList;
 
+    /** 字段编码排除列表 */
+    private List <String> fieldCodeNotList;
     /** 字段名称 */
     private List<String> fieldNameList;
 
+    /** 字段名称排除列表 */
+    private List <String> fieldNameNotList;
     /** 字段类型（input.单行输入框,textarea.多行输入框,SELECT.下拉选项框,date.日期选择框,editer.富文本） */
     private List<String> fieldTypeList;
 
+    /** 字段类型（input.单行输入框,textarea.多行输入框,SELECT.下拉选项框,date.日期选择框,editer.富文本）排除列表 */
+    private List <String> fieldTypeNotList;
     /** 数据类型（number.数字,string.字符串） */
     private List<String> dataTypeList;
 
+    /** 数据类型（number.数字,string.字符串）排除列表 */
+    private List <String> dataTypeNotList;
     /** 字段值 */
     private List<String> fieldValueList;
 
+    /** 字段值排除列表 */
+    private List <String> fieldValueNotList;
     /** 开始 数据长度，默认128 */
     private Integer fieldLenStart;
 
@@ -60,6 +76,9 @@ public class AppInfoTempleteFieldQuery extends AppInfoTempleteFieldEntity {
     /** 数据长度，默认128列表 */
     private List <Integer> fieldLenList;
 
+    /** 数据长度，默认128排除列表 */
+    private List <Integer> fieldLenNotList;
+
     /** 开始 是否允许为空，(0.否,1.是) */
     private Integer fieldNullStart;
 
@@ -72,6 +91,9 @@ public class AppInfoTempleteFieldQuery extends AppInfoTempleteFieldEntity {
     /** 是否允许为空，(0.否,1.是)列表 */
     private List <Integer> fieldNullList;
 
+    /** 是否允许为空，(0.否,1.是)排除列表 */
+    private List <Integer> fieldNullNotList;
+
     /** 开始 字段是否列表显示(0.否,1.是) */
     private Integer isListStart;
 
@@ -84,6 +106,9 @@ public class AppInfoTempleteFieldQuery extends AppInfoTempleteFieldEntity {
     /** 字段是否列表显示(0.否,1.是)列表 */
     private List <Integer> isListList;
 
+    /** 字段是否列表显示(0.否,1.是)排除列表 */
+    private List <Integer> isListNotList;
+
     /** 开始 排序号 */
     private Integer fieldOrderNoStart;
 
@@ -96,9 +121,14 @@ public class AppInfoTempleteFieldQuery extends AppInfoTempleteFieldEntity {
     /** 排序号列表 */
     private List <Integer> fieldOrderNoList;
 
+    /** 排序号排除列表 */
+    private List <Integer> fieldOrderNoNotList;
+
     /** 备注 */
     private List<String> remarkList;
 
+    /** 备注排除列表 */
+    private List <String> remarkNotList;
     /** 开始 创建时间 */
     private String createTimeStart;
 
@@ -117,6 +147,9 @@ public class AppInfoTempleteFieldQuery extends AppInfoTempleteFieldEntity {
     /** 创建用户列表 */
     private List <Long> createUserIdList;
 
+    /** 创建用户排除列表 */
+    private List <Long> createUserIdNotList;
+
     /** 开始 修改时间 */
     private String updateTimeStart;
 
@@ -135,6 +168,19 @@ public class AppInfoTempleteFieldQuery extends AppInfoTempleteFieldEntity {
     /** 修改用户列表 */
     private List <Long> updateUserIdList;
 
+    /** 修改用户排除列表 */
+    private List <Long> updateUserIdNotList;
+
+    /** 字段类型值，当字段类型为多选，单选时候，预设复选值 */
+    private List<String> fieldTypeValueList;
+
+    /** 字段类型值，当字段类型为多选，单选时候，预设复选值排除列表 */
+    private List <String> fieldTypeValueNotList;
+    /** 字段默认值 */
+    private List<String> defaultValueList;
+
+    /** 字段默认值排除列表 */
+    private List <String> defaultValueNotList;
     /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
     private List<AppInfoTempleteFieldQuery> orConditionList;
 
@@ -207,6 +253,23 @@ public class AppInfoTempleteFieldQuery extends AppInfoTempleteFieldEntity {
         this.idList = idList;
     }
 
+    /**
+     * 获取 序号，主键，自增长
+     * @return idNotList
+     */
+    public List<Long> getIdNotList(){
+        return this.idNotList;
+    }
+
+    /**
+     * 设置 序号，主键，自增长
+     * @param idNotList
+     */
+    public void setIdNotList(List<Long> idNotList){
+        this.idNotList = idNotList;
+    }
+
+
     /**
      * 获取 开始 应用id
      * @return appIdStart
@@ -271,6 +334,23 @@ public class AppInfoTempleteFieldQuery extends AppInfoTempleteFieldEntity {
         this.appIdList = appIdList;
     }
 
+    /**
+     * 获取 应用id
+     * @return appIdNotList
+     */
+    public List<Long> getAppIdNotList(){
+        return this.appIdNotList;
+    }
+
+    /**
+     * 设置 应用id
+     * @param appIdNotList
+     */
+    public void setAppIdNotList(List<Long> appIdNotList){
+        this.appIdNotList = appIdNotList;
+    }
+
+
     /**
      * 获取 字段编码
      * @return fieldCodeList
@@ -286,6 +366,23 @@ public class AppInfoTempleteFieldQuery extends AppInfoTempleteFieldEntity {
     public void setFieldCodeList(List<String> fieldCodeList){
         this.fieldCodeList = fieldCodeList;
     }
+
+    /**
+     * 获取 字段编码
+     * @return fieldCodeNotList
+     */
+    public List<String> getFieldCodeNotList(){
+        return this.fieldCodeNotList;
+    }
+
+    /**
+     * 设置 字段编码
+     * @param fieldCodeNotList
+     */
+    public void setFieldCodeNotList(List<String> fieldCodeNotList){
+        this.fieldCodeNotList = fieldCodeNotList;
+    }
+
     /**
      * 获取 字段名称
      * @return fieldNameList
@@ -301,6 +398,23 @@ public class AppInfoTempleteFieldQuery extends AppInfoTempleteFieldEntity {
     public void setFieldNameList(List<String> fieldNameList){
         this.fieldNameList = fieldNameList;
     }
+
+    /**
+     * 获取 字段名称
+     * @return fieldNameNotList
+     */
+    public List<String> getFieldNameNotList(){
+        return this.fieldNameNotList;
+    }
+
+    /**
+     * 设置 字段名称
+     * @param fieldNameNotList
+     */
+    public void setFieldNameNotList(List<String> fieldNameNotList){
+        this.fieldNameNotList = fieldNameNotList;
+    }
+
     /**
      * 获取 字段类型（input.单行输入框,textarea.多行输入框,SELECT.下拉选项框,date.日期选择框,editer.富文本）
      * @return fieldTypeList
@@ -316,6 +430,23 @@ public class AppInfoTempleteFieldQuery extends AppInfoTempleteFieldEntity {
     public void setFieldTypeList(List<String> fieldTypeList){
         this.fieldTypeList = fieldTypeList;
     }
+
+    /**
+     * 获取 字段类型（input.单行输入框,textarea.多行输入框,SELECT.下拉选项框,date.日期选择框,editer.富文本）
+     * @return fieldTypeNotList
+     */
+    public List<String> getFieldTypeNotList(){
+        return this.fieldTypeNotList;
+    }
+
+    /**
+     * 设置 字段类型（input.单行输入框,textarea.多行输入框,SELECT.下拉选项框,date.日期选择框,editer.富文本）
+     * @param fieldTypeNotList
+     */
+    public void setFieldTypeNotList(List<String> fieldTypeNotList){
+        this.fieldTypeNotList = fieldTypeNotList;
+    }
+
     /**
      * 获取 数据类型（number.数字,string.字符串）
      * @return dataTypeList
@@ -331,6 +462,23 @@ public class AppInfoTempleteFieldQuery extends AppInfoTempleteFieldEntity {
     public void setDataTypeList(List<String> dataTypeList){
         this.dataTypeList = dataTypeList;
     }
+
+    /**
+     * 获取 数据类型（number.数字,string.字符串）
+     * @return dataTypeNotList
+     */
+    public List<String> getDataTypeNotList(){
+        return this.dataTypeNotList;
+    }
+
+    /**
+     * 设置 数据类型（number.数字,string.字符串）
+     * @param dataTypeNotList
+     */
+    public void setDataTypeNotList(List<String> dataTypeNotList){
+        this.dataTypeNotList = dataTypeNotList;
+    }
+
     /**
      * 获取 字段值
      * @return fieldValueList
@@ -346,6 +494,23 @@ public class AppInfoTempleteFieldQuery extends AppInfoTempleteFieldEntity {
     public void setFieldValueList(List<String> fieldValueList){
         this.fieldValueList = fieldValueList;
     }
+
+    /**
+     * 获取 字段值
+     * @return fieldValueNotList
+     */
+    public List<String> getFieldValueNotList(){
+        return this.fieldValueNotList;
+    }
+
+    /**
+     * 设置 字段值
+     * @param fieldValueNotList
+     */
+    public void setFieldValueNotList(List<String> fieldValueNotList){
+        this.fieldValueNotList = fieldValueNotList;
+    }
+
     /**
      * 获取 开始 数据长度，默认128
      * @return fieldLenStart
@@ -410,6 +575,23 @@ public class AppInfoTempleteFieldQuery extends AppInfoTempleteFieldEntity {
         this.fieldLenList = fieldLenList;
     }
 
+    /**
+     * 获取 数据长度，默认128
+     * @return fieldLenNotList
+     */
+    public List<Integer> getFieldLenNotList(){
+        return this.fieldLenNotList;
+    }
+
+    /**
+     * 设置 数据长度，默认128
+     * @param fieldLenNotList
+     */
+    public void setFieldLenNotList(List<Integer> fieldLenNotList){
+        this.fieldLenNotList = fieldLenNotList;
+    }
+
+
     /**
      * 获取 开始 是否允许为空，(0.否,1.是)
      * @return fieldNullStart
@@ -474,6 +656,23 @@ public class AppInfoTempleteFieldQuery extends AppInfoTempleteFieldEntity {
         this.fieldNullList = fieldNullList;
     }
 
+    /**
+     * 获取 是否允许为空，(0.否,1.是)
+     * @return fieldNullNotList
+     */
+    public List<Integer> getFieldNullNotList(){
+        return this.fieldNullNotList;
+    }
+
+    /**
+     * 设置 是否允许为空，(0.否,1.是)
+     * @param fieldNullNotList
+     */
+    public void setFieldNullNotList(List<Integer> fieldNullNotList){
+        this.fieldNullNotList = fieldNullNotList;
+    }
+
+
     /**
      * 获取 开始 字段是否列表显示(0.否,1.是)
      * @return isListStart
@@ -538,6 +737,23 @@ public class AppInfoTempleteFieldQuery extends AppInfoTempleteFieldEntity {
         this.isListList = isListList;
     }
 
+    /**
+     * 获取 字段是否列表显示(0.否,1.是)
+     * @return isListNotList
+     */
+    public List<Integer> getIsListNotList(){
+        return this.isListNotList;
+    }
+
+    /**
+     * 设置 字段是否列表显示(0.否,1.是)
+     * @param isListNotList
+     */
+    public void setIsListNotList(List<Integer> isListNotList){
+        this.isListNotList = isListNotList;
+    }
+
+
     /**
      * 获取 开始 排序号
      * @return fieldOrderNoStart
@@ -602,6 +818,23 @@ public class AppInfoTempleteFieldQuery extends AppInfoTempleteFieldEntity {
         this.fieldOrderNoList = fieldOrderNoList;
     }
 
+    /**
+     * 获取 排序号
+     * @return fieldOrderNoNotList
+     */
+    public List<Integer> getFieldOrderNoNotList(){
+        return this.fieldOrderNoNotList;
+    }
+
+    /**
+     * 设置 排序号
+     * @param fieldOrderNoNotList
+     */
+    public void setFieldOrderNoNotList(List<Integer> fieldOrderNoNotList){
+        this.fieldOrderNoNotList = fieldOrderNoNotList;
+    }
+
+
     /**
      * 获取 备注
      * @return remarkList
@@ -617,6 +850,23 @@ public class AppInfoTempleteFieldQuery extends AppInfoTempleteFieldEntity {
     public void setRemarkList(List<String> remarkList){
         this.remarkList = remarkList;
     }
+
+    /**
+     * 获取 备注
+     * @return remarkNotList
+     */
+    public List<String> getRemarkNotList(){
+        return this.remarkNotList;
+    }
+
+    /**
+     * 设置 备注
+     * @param remarkNotList
+     */
+    public void setRemarkNotList(List<String> remarkNotList){
+        this.remarkNotList = remarkNotList;
+    }
+
     /**
      * 获取 开始 创建时间
      * @return createTimeStart
@@ -713,6 +963,23 @@ public class AppInfoTempleteFieldQuery extends AppInfoTempleteFieldEntity {
         this.createUserIdList = createUserIdList;
     }
 
+    /**
+     * 获取 创建用户
+     * @return createUserIdNotList
+     */
+    public List<Long> getCreateUserIdNotList(){
+        return this.createUserIdNotList;
+    }
+
+    /**
+     * 设置 创建用户
+     * @param createUserIdNotList
+     */
+    public void setCreateUserIdNotList(List<Long> createUserIdNotList){
+        this.createUserIdNotList = createUserIdNotList;
+    }
+
+
     /**
      * 获取 开始 修改时间
      * @return updateTimeStart
@@ -809,6 +1076,87 @@ public class AppInfoTempleteFieldQuery extends AppInfoTempleteFieldEntity {
         this.updateUserIdList = updateUserIdList;
     }
 
+    /**
+     * 获取 修改用户
+     * @return updateUserIdNotList
+     */
+    public List<Long> getUpdateUserIdNotList(){
+        return this.updateUserIdNotList;
+    }
+
+    /**
+     * 设置 修改用户
+     * @param updateUserIdNotList
+     */
+    public void setUpdateUserIdNotList(List<Long> updateUserIdNotList){
+        this.updateUserIdNotList = updateUserIdNotList;
+    }
+
+
+    /**
+     * 获取 字段类型值，当字段类型为多选，单选时候，预设复选值
+     * @return fieldTypeValueList
+     */
+    public List<String> getFieldTypeValueList(){
+        return this.fieldTypeValueList;
+    }
+
+    /**
+     * 设置 字段类型值，当字段类型为多选，单选时候，预设复选值
+     * @param fieldTypeValueList
+     */
+    public void setFieldTypeValueList(List<String> fieldTypeValueList){
+        this.fieldTypeValueList = fieldTypeValueList;
+    }
+
+    /**
+     * 获取 字段类型值，当字段类型为多选，单选时候，预设复选值
+     * @return fieldTypeValueNotList
+     */
+    public List<String> getFieldTypeValueNotList(){
+        return this.fieldTypeValueNotList;
+    }
+
+    /**
+     * 设置 字段类型值，当字段类型为多选，单选时候，预设复选值
+     * @param fieldTypeValueNotList
+     */
+    public void setFieldTypeValueNotList(List<String> fieldTypeValueNotList){
+        this.fieldTypeValueNotList = fieldTypeValueNotList;
+    }
+
+    /**
+     * 获取 字段默认值
+     * @return defaultValueList
+     */
+    public List<String> getDefaultValueList(){
+        return this.defaultValueList;
+    }
+
+    /**
+     * 设置 字段默认值
+     * @param defaultValueList
+     */
+    public void setDefaultValueList(List<String> defaultValueList){
+        this.defaultValueList = defaultValueList;
+    }
+
+    /**
+     * 获取 字段默认值
+     * @return defaultValueNotList
+     */
+    public List<String> getDefaultValueNotList(){
+        return this.defaultValueNotList;
+    }
+
+    /**
+     * 设置 字段默认值
+     * @param defaultValueNotList
+     */
+    public void setDefaultValueNotList(List<String> defaultValueNotList){
+        this.defaultValueNotList = defaultValueNotList;
+    }
+
     /**
      * 设置  序号，主键，自增长
      * @param id
@@ -854,6 +1202,15 @@ public class AppInfoTempleteFieldQuery extends AppInfoTempleteFieldEntity {
         return this;
     }
 
+    /**
+     * 设置 序号，主键，自增长
+     * @param idNotList
+     */
+    public AppInfoTempleteFieldQuery idNotList(List<Long> idNotList){
+        this.idNotList = idNotList;
+        return this;
+    }
+
     /**
      * 设置  应用id
      * @param appId
@@ -899,6 +1256,15 @@ public class AppInfoTempleteFieldQuery extends AppInfoTempleteFieldEntity {
         return this;
     }
 
+    /**
+     * 设置 应用id
+     * @param appIdNotList
+     */
+    public AppInfoTempleteFieldQuery appIdNotList(List<Long> appIdNotList){
+        this.appIdNotList = appIdNotList;
+        return this;
+    }
+
 
     /**
      * 设置 字段编码
@@ -1039,6 +1405,15 @@ public class AppInfoTempleteFieldQuery extends AppInfoTempleteFieldEntity {
         return this;
     }
 
+    /**
+     * 设置 数据长度，默认128
+     * @param fieldLenNotList
+     */
+    public AppInfoTempleteFieldQuery fieldLenNotList(List<Integer> fieldLenNotList){
+        this.fieldLenNotList = fieldLenNotList;
+        return this;
+    }
+
     /**
      * 设置  是否允许为空，(0.否,1.是)
      * @param fieldNull
@@ -1084,6 +1459,15 @@ public class AppInfoTempleteFieldQuery extends AppInfoTempleteFieldEntity {
         return this;
     }
 
+    /**
+     * 设置 是否允许为空，(0.否,1.是)
+     * @param fieldNullNotList
+     */
+    public AppInfoTempleteFieldQuery fieldNullNotList(List<Integer> fieldNullNotList){
+        this.fieldNullNotList = fieldNullNotList;
+        return this;
+    }
+
     /**
      * 设置  字段是否列表显示(0.否,1.是)
      * @param isList
@@ -1129,6 +1513,15 @@ public class AppInfoTempleteFieldQuery extends AppInfoTempleteFieldEntity {
         return this;
     }
 
+    /**
+     * 设置 字段是否列表显示(0.否,1.是)
+     * @param isListNotList
+     */
+    public AppInfoTempleteFieldQuery isListNotList(List<Integer> isListNotList){
+        this.isListNotList = isListNotList;
+        return this;
+    }
+
     /**
      * 设置  排序号
      * @param fieldOrderNo
@@ -1174,6 +1567,15 @@ public class AppInfoTempleteFieldQuery extends AppInfoTempleteFieldEntity {
         return this;
     }
 
+    /**
+     * 设置 排序号
+     * @param fieldOrderNoNotList
+     */
+    public AppInfoTempleteFieldQuery fieldOrderNoNotList(List<Integer> fieldOrderNoNotList){
+        this.fieldOrderNoNotList = fieldOrderNoNotList;
+        return this;
+    }
+
 
     /**
      * 设置 备注
@@ -1239,6 +1641,15 @@ public class AppInfoTempleteFieldQuery extends AppInfoTempleteFieldEntity {
         return this;
     }
 
+    /**
+     * 设置 创建用户
+     * @param createUserIdNotList
+     */
+    public AppInfoTempleteFieldQuery createUserIdNotList(List<Long> createUserIdNotList){
+        this.createUserIdNotList = createUserIdNotList;
+        return this;
+    }
+
 
     /**
      * 设置  修改用户
@@ -1285,6 +1696,53 @@ public class AppInfoTempleteFieldQuery extends AppInfoTempleteFieldEntity {
         return this;
     }
 
+    /**
+     * 设置 修改用户
+     * @param updateUserIdNotList
+     */
+    public AppInfoTempleteFieldQuery updateUserIdNotList(List<Long> updateUserIdNotList){
+        this.updateUserIdNotList = updateUserIdNotList;
+        return this;
+    }
+
+
+    /**
+     * 设置 字段类型值，当字段类型为多选，单选时候，预设复选值
+     * @param fieldTypeValue
+     */
+    public AppInfoTempleteFieldQuery fieldTypeValue(String fieldTypeValue){
+        setFieldTypeValue(fieldTypeValue);
+        return this;
+    }
+
+    /**
+     * 设置 字段类型值，当字段类型为多选，单选时候，预设复选值
+     * @param fieldTypeValueList
+     */
+    public AppInfoTempleteFieldQuery fieldTypeValueList(List<String> fieldTypeValueList){
+        this.fieldTypeValueList = fieldTypeValueList;
+        return this;
+    }
+
+
+    /**
+     * 设置 字段默认值
+     * @param defaultValue
+     */
+    public AppInfoTempleteFieldQuery defaultValue(String defaultValue){
+        setDefaultValue(defaultValue);
+        return this;
+    }
+
+    /**
+     * 设置 字段默认值
+     * @param defaultValueList
+     */
+    public AppInfoTempleteFieldQuery defaultValueList(List<String> defaultValueList){
+        this.defaultValueList = defaultValueList;
+        return this;
+    }
+
     /**
      * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
      * @return orConditionList

base-manager/src/main/java/com/mortals/xhx/module/app/service/impl/AppVersionServiceImpl.java

@@ -110,4 +110,8 @@ public class AppVersionServiceImpl extends AbstractCRUDServiceImpl<AppVersionDao
         appService.getAppDao().update(appEntity);
         return Rest.ok("使用应用成功！");
     }
+
+    public static void main(String[] args) {
+        //写一个循环1到10
+    }
 }
\ No newline at end of file

base-manager/src/main/resources/sqlmap/module/app/AppDatasetMapper.xml

@@ -18,8 +18,10 @@
         <result property="fieldCode" column="fieldCode" />
         <result property="fieldName" column="fieldName" />
         <result property="fieldType" column="fieldType" />
+        <result property="fieldTypeValue" column="fieldTypeValue" />
         <result property="dataType" column="dataType" />
         <result property="fieldValue" column="fieldValue" />
+        <result property="defaultValue" column="defaultValue" />
         <result property="fieldLen" column="fieldLen" />
         <result property="fieldNull" column="fieldNull" />
         <result property="isList" column="isList" />
@@ -55,7 +57,7 @@
     <!-- 子表所有列 -->
     <sql id="_columns_sub">
         <trim suffixOverrides="," suffix="">
-            b.id,b.datasetId,b.fieldCode,b.fieldName,b.fieldType,b.dataType,b.fieldValue,b.fieldLen,b.fieldNull,b.isList,b.fieldOrderNo,b.remark,b.createTime,b.createUserId,b.updateTime,b.updateUserId,
+            b.id,b.datasetId,b.fieldCode,b.fieldName,b.fieldType,b.fieldTypeValue,b.dataType,b.fieldValue,b.defaultValue,b.fieldLen,b.fieldNull,b.isList,b.fieldOrderNo,b.remark,b.createTime,b.createUserId,b.updateTime,b.updateUserId,
         </trim>
     </sql>
     <!-- 新增 区分主键自增加还是业务插入 -->

base-manager/src/main/resources/sqlmap/module/app/AppInfoFieldMapper.xml

@@ -10,8 +10,10 @@
         <result property="fieldCode" column="fieldCode" />
         <result property="fieldName" column="fieldName" />
         <result property="fieldType" column="fieldType" />
+        <result property="fieldTypeValue" column="fieldTypeValue" />
         <result property="dataType" column="dataType" />
         <result property="fieldValue" column="fieldValue" />
+        <result property="defaultValue" column="defaultValue" />
         <result property="fieldLen" column="fieldLen" />
         <result property="fieldNull" column="fieldNull" />
         <result property="isList" column="isList" />
@@ -21,7 +23,6 @@
         <result property="createUserId" column="createUserId" />
         <result property="updateTime" column="updateTime" />
         <result property="updateUserId" column="updateUserId" />
-
     </resultMap>
 
 
@@ -43,12 +44,18 @@
             <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('fieldType') or colPickMode == 1 and data.containsKey('fieldType')))">
                 a.fieldType,
             </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('fieldTypeValue') or colPickMode == 1 and data.containsKey('fieldTypeValue')))">
+                a.fieldTypeValue,
+            </if>
             <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('dataType') or colPickMode == 1 and data.containsKey('dataType')))">
                 a.dataType,
             </if>
             <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('fieldValue') or colPickMode == 1 and data.containsKey('fieldValue')))">
                 a.fieldValue,
             </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('defaultValue') or colPickMode == 1 and data.containsKey('defaultValue')))">
+                a.defaultValue,
+            </if>
             <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('fieldLen') or colPickMode == 1 and data.containsKey('fieldLen')))">
                 a.fieldLen,
             </if>
@@ -81,18 +88,18 @@
     <!-- 新增 区分主键自增加还是业务插入 -->
     <insert id="insert" parameterType="AppInfoFieldEntity"  useGeneratedKeys="true" keyProperty="id">
         insert into mortals_sys_app_info_field
-        (datasetId,fieldCode,fieldName,fieldType,dataType,fieldValue,fieldLen,fieldNull,isList,fieldOrderNo,remark,createTime,createUserId,updateTime,updateUserId)
+        (datasetId,fieldCode,fieldName,fieldType,fieldTypeValue,dataType,fieldValue,defaultValue,fieldLen,fieldNull,isList,fieldOrderNo,remark,createTime,createUserId,updateTime,updateUserId)
         VALUES
-        (#{datasetId},#{fieldCode},#{fieldName},#{fieldType},#{dataType},#{fieldValue},#{fieldLen},#{fieldNull},#{isList},#{fieldOrderNo},#{remark},#{createTime},#{createUserId},#{updateTime},#{updateUserId})
+        (#{datasetId},#{fieldCode},#{fieldName},#{fieldType},#{fieldTypeValue},#{dataType},#{fieldValue},#{defaultValue},#{fieldLen},#{fieldNull},#{isList},#{fieldOrderNo},#{remark},#{createTime},#{createUserId},#{updateTime},#{updateUserId})
     </insert>
 
     <!-- 批量新增 -->
     <insert id="insertBatch" parameterType="paramDto">
         insert into mortals_sys_app_info_field
-        (datasetId,fieldCode,fieldName,fieldType,dataType,fieldValue,fieldLen,fieldNull,isList,fieldOrderNo,remark,createTime,createUserId,updateTime,updateUserId)
+        (datasetId,fieldCode,fieldName,fieldType,fieldTypeValue,dataType,fieldValue,defaultValue,fieldLen,fieldNull,isList,fieldOrderNo,remark,createTime,createUserId,updateTime,updateUserId)
         VALUES
         <foreach collection="data.dataList" item="item" index="index" separator="," >
-            (#{item.datasetId},#{item.fieldCode},#{item.fieldName},#{item.fieldType},#{item.dataType},#{item.fieldValue},#{item.fieldLen},#{item.fieldNull},#{item.isList},#{item.fieldOrderNo},#{item.remark},#{item.createTime},#{item.createUserId},#{item.updateTime},#{item.updateUserId})
+            (#{item.datasetId},#{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})
         </foreach>
     </insert>
 
@@ -117,12 +124,18 @@
             <if test="(colPickMode==0 and data.containsKey('fieldType')) or (colPickMode==1 and !data.containsKey('fieldType'))">
                 a.fieldType=#{data.fieldType},
             </if>
+            <if test="(colPickMode==0 and data.containsKey('fieldTypeValue')) or (colPickMode==1 and !data.containsKey('fieldTypeValue'))">
+                a.fieldTypeValue=#{data.fieldTypeValue},
+            </if>
             <if test="(colPickMode==0 and data.containsKey('dataType')) or (colPickMode==1 and !data.containsKey('dataType'))">
                 a.dataType=#{data.dataType},
             </if>
             <if test="(colPickMode==0 and data.containsKey('fieldValue')) or (colPickMode==1 and !data.containsKey('fieldValue'))">
                 a.fieldValue=#{data.fieldValue},
             </if>
+            <if test="(colPickMode==0 and data.containsKey('defaultValue')) or (colPickMode==1 and !data.containsKey('defaultValue'))">
+                a.defaultValue=#{data.defaultValue},
+            </if>
             <if test="(colPickMode==0 and data.containsKey('fieldLen')) or (colPickMode==1 and !data.containsKey('fieldLen'))">
                 a.fieldLen=#{data.fieldLen},
             </if>
@@ -213,6 +226,13 @@
                     </if>
                 </foreach>
             </trim>
+            <trim prefix="fieldTypeValue=(case" suffix="ELSE fieldTypeValue end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('fieldTypeValue')) or (colPickMode==1 and !item.containsKey('fieldTypeValue'))">
+                        when a.id=#{item.id} then #{item.fieldTypeValue}
+                    </if>
+                </foreach>
+            </trim>
             <trim prefix="dataType=(case" suffix="ELSE dataType end),">
                 <foreach collection="data.dataList" item="item" index="index" separator="" >
                     <if test="(colPickMode==0 and item.containsKey('dataType')) or (colPickMode==1 and !item.containsKey('dataType'))">
@@ -227,6 +247,13 @@
                     </if>
                 </foreach>
             </trim>
+            <trim prefix="defaultValue=(case" suffix="ELSE defaultValue end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('defaultValue')) or (colPickMode==1 and !item.containsKey('defaultValue'))">
+                        when a.id=#{item.id} then #{item.defaultValue}
+                    </if>
+                </foreach>
+            </trim>
             <trim prefix="fieldLen=(case" suffix="ELSE fieldLen end),">
                 <foreach collection="data.dataList" item="item" index="index" separator="" >
                     <choose>
@@ -444,12 +471,18 @@
                 ${_conditionType_} a.id is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('idList')">
+        <if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
             ${_conditionType_} a.id in
             <foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
+        <if test="conditionParamRef.containsKey('idNotList') 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>
@@ -465,12 +498,18 @@
                 ${_conditionType_} a.datasetId is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('datasetIdList')">
+        <if test="conditionParamRef.containsKey('datasetIdList') and conditionParamRef.datasetIdList.size() > 0">
             ${_conditionType_} a.datasetId in
             <foreach collection="conditionParamRef.datasetIdList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
+        <if test="conditionParamRef.containsKey('datasetIdNotList') and conditionParamRef.datasetIdNotList.size() > 0">
+            ${_conditionType_} a.datasetId not in
+            <foreach collection="conditionParamRef.datasetIdNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
         <if test="conditionParamRef.containsKey('datasetIdStart') and conditionParamRef.datasetIdStart != null">
             ${_conditionType_} a.datasetId <![CDATA[ >= ]]> #{${_conditionParam_}.datasetIdStart}
         </if>
@@ -487,12 +526,18 @@
                 ${_conditionType_} a.fieldCode is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('fieldCodeList')">
+        <if test="conditionParamRef.containsKey('fieldCodeList') and conditionParamRef.fieldCodeList.size() > 0">
             ${_conditionType_} a.fieldCode in
             <foreach collection="conditionParamRef.fieldCodeList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
+        <if test="conditionParamRef.containsKey('fieldCodeNotList') and conditionParamRef.fieldCodeNotList.size() > 0">
+            ${_conditionType_} a.fieldCode not in
+            <foreach collection="conditionParamRef.fieldCodeNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
 
         <if test="conditionParamRef.containsKey('fieldName')">
             <if test="conditionParamRef.fieldName != null and conditionParamRef.fieldName != ''">
@@ -502,12 +547,18 @@
                 ${_conditionType_} a.fieldName is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('fieldNameList')">
+        <if test="conditionParamRef.containsKey('fieldNameList') and conditionParamRef.fieldNameList.size() > 0">
             ${_conditionType_} a.fieldName in
             <foreach collection="conditionParamRef.fieldNameList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
+        <if test="conditionParamRef.containsKey('fieldNameNotList') and conditionParamRef.fieldNameNotList.size() > 0">
+            ${_conditionType_} a.fieldName not in
+            <foreach collection="conditionParamRef.fieldNameNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
 
         <if test="conditionParamRef.containsKey('fieldType')">
             <if test="conditionParamRef.fieldType != null and conditionParamRef.fieldType != ''">
@@ -517,12 +568,39 @@
                 ${_conditionType_} a.fieldType is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('fieldTypeList')">
+        <if test="conditionParamRef.containsKey('fieldTypeList') and conditionParamRef.fieldTypeList.size() > 0">
             ${_conditionType_} a.fieldType in
             <foreach collection="conditionParamRef.fieldTypeList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
+        <if test="conditionParamRef.containsKey('fieldTypeNotList') and conditionParamRef.fieldTypeNotList.size() > 0">
+            ${_conditionType_} a.fieldType not in
+            <foreach collection="conditionParamRef.fieldTypeNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+
+        <if test="conditionParamRef.containsKey('fieldTypeValue')">
+            <if test="conditionParamRef.fieldTypeValue != null and conditionParamRef.fieldTypeValue != ''">
+                ${_conditionType_} a.fieldTypeValue like #{${_conditionParam_}.fieldTypeValue}
+            </if>
+            <if test="conditionParamRef.fieldTypeValue == null">
+                ${_conditionType_} a.fieldTypeValue is null
+            </if>
+        </if>
+        <if test="conditionParamRef.containsKey('fieldTypeValueList') and conditionParamRef.fieldTypeValueList.size() > 0">
+            ${_conditionType_} a.fieldTypeValue in
+            <foreach collection="conditionParamRef.fieldTypeValueList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('fieldTypeValueNotList') and conditionParamRef.fieldTypeValueNotList.size() > 0">
+            ${_conditionType_} a.fieldTypeValue not in
+            <foreach collection="conditionParamRef.fieldTypeValueNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
 
         <if test="conditionParamRef.containsKey('dataType')">
             <if test="conditionParamRef.dataType != null and conditionParamRef.dataType != ''">
@@ -532,12 +610,18 @@
                 ${_conditionType_} a.dataType is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('dataTypeList')">
+        <if test="conditionParamRef.containsKey('dataTypeList') and conditionParamRef.dataTypeList.size() > 0">
             ${_conditionType_} a.dataType in
             <foreach collection="conditionParamRef.dataTypeList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
+        <if test="conditionParamRef.containsKey('dataTypeNotList') and conditionParamRef.dataTypeNotList.size() > 0">
+            ${_conditionType_} a.dataType not in
+            <foreach collection="conditionParamRef.dataTypeNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
 
         <if test="conditionParamRef.containsKey('fieldValue')">
             <if test="conditionParamRef.fieldValue != null and conditionParamRef.fieldValue != ''">
@@ -547,12 +631,39 @@
                 ${_conditionType_} a.fieldValue is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('fieldValueList')">
+        <if test="conditionParamRef.containsKey('fieldValueList') and conditionParamRef.fieldValueList.size() > 0">
             ${_conditionType_} a.fieldValue in
             <foreach collection="conditionParamRef.fieldValueList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
+        <if test="conditionParamRef.containsKey('fieldValueNotList') and conditionParamRef.fieldValueNotList.size() > 0">
+            ${_conditionType_} a.fieldValue not in
+            <foreach collection="conditionParamRef.fieldValueNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+
+        <if test="conditionParamRef.containsKey('defaultValue')">
+            <if test="conditionParamRef.defaultValue != null and conditionParamRef.defaultValue != ''">
+                ${_conditionType_} a.defaultValue like #{${_conditionParam_}.defaultValue}
+            </if>
+            <if test="conditionParamRef.defaultValue == null">
+                ${_conditionType_} a.defaultValue is null
+            </if>
+        </if>
+        <if test="conditionParamRef.containsKey('defaultValueList') and conditionParamRef.defaultValueList.size() > 0">
+            ${_conditionType_} a.defaultValue in
+            <foreach collection="conditionParamRef.defaultValueList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('defaultValueNotList') and conditionParamRef.defaultValueNotList.size() > 0">
+            ${_conditionType_} a.defaultValue not in
+            <foreach collection="conditionParamRef.defaultValueNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
         <if test="conditionParamRef.containsKey('fieldLen')">
             <if test="conditionParamRef.fieldLen != null ">
                 ${_conditionType_} a.fieldLen = #{${_conditionParam_}.fieldLen}
@@ -561,12 +672,18 @@
                 ${_conditionType_} a.fieldLen is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('fieldLenList')">
+        <if test="conditionParamRef.containsKey('fieldLenList') and conditionParamRef.fieldLenList.size() > 0">
             ${_conditionType_} a.fieldLen in
             <foreach collection="conditionParamRef.fieldLenList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
+        <if test="conditionParamRef.containsKey('fieldLenNotList') and conditionParamRef.fieldLenNotList.size() > 0">
+            ${_conditionType_} a.fieldLen not in
+            <foreach collection="conditionParamRef.fieldLenNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
         <if test="conditionParamRef.containsKey('fieldLenStart') and conditionParamRef.fieldLenStart != null">
             ${_conditionType_} a.fieldLen <![CDATA[ >= ]]> #{${_conditionParam_}.fieldLenStart}
         </if>
@@ -582,12 +699,18 @@
                 ${_conditionType_} a.fieldNull is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('fieldNullList')">
+        <if test="conditionParamRef.containsKey('fieldNullList') and conditionParamRef.fieldNullList.size() > 0">
             ${_conditionType_} a.fieldNull in
             <foreach collection="conditionParamRef.fieldNullList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
+        <if test="conditionParamRef.containsKey('fieldNullNotList') and conditionParamRef.fieldNullNotList.size() > 0">
+            ${_conditionType_} a.fieldNull not in
+            <foreach collection="conditionParamRef.fieldNullNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
         <if test="conditionParamRef.containsKey('fieldNullStart') and conditionParamRef.fieldNullStart != null">
             ${_conditionType_} a.fieldNull <![CDATA[ >= ]]> #{${_conditionParam_}.fieldNullStart}
         </if>
@@ -603,12 +726,18 @@
                 ${_conditionType_} a.isList is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('isListList')">
+        <if test="conditionParamRef.containsKey('isListList') and conditionParamRef.isListList.size() > 0">
             ${_conditionType_} a.isList in
             <foreach collection="conditionParamRef.isListList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
+        <if test="conditionParamRef.containsKey('isListNotList') and conditionParamRef.isListNotList.size() > 0">
+            ${_conditionType_} a.isList not in
+            <foreach collection="conditionParamRef.isListNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
         <if test="conditionParamRef.containsKey('isListStart') and conditionParamRef.isListStart != null">
             ${_conditionType_} a.isList <![CDATA[ >= ]]> #{${_conditionParam_}.isListStart}
         </if>
@@ -624,12 +753,18 @@
                 ${_conditionType_} a.fieldOrderNo is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('fieldOrderNoList')">
+        <if test="conditionParamRef.containsKey('fieldOrderNoList') and conditionParamRef.fieldOrderNoList.size() > 0">
             ${_conditionType_} a.fieldOrderNo in
             <foreach collection="conditionParamRef.fieldOrderNoList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
+        <if test="conditionParamRef.containsKey('fieldOrderNoNotList') and conditionParamRef.fieldOrderNoNotList.size() > 0">
+            ${_conditionType_} a.fieldOrderNo not in
+            <foreach collection="conditionParamRef.fieldOrderNoNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
         <if test="conditionParamRef.containsKey('fieldOrderNoStart') and conditionParamRef.fieldOrderNoStart != null">
             ${_conditionType_} a.fieldOrderNo <![CDATA[ >= ]]> #{${_conditionParam_}.fieldOrderNoStart}
         </if>
@@ -646,12 +781,18 @@
                 ${_conditionType_} a.remark is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('remarkList')">
+        <if test="conditionParamRef.containsKey('remarkList') and conditionParamRef.remarkList.size() > 0">
             ${_conditionType_} a.remark in
             <foreach collection="conditionParamRef.remarkList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
+        <if test="conditionParamRef.containsKey('remarkNotList') and conditionParamRef.remarkNotList.size() > 0">
+            ${_conditionType_} a.remark not in
+            <foreach collection="conditionParamRef.remarkNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
 
         <if test="conditionParamRef.containsKey('createTime')">
             <if test="conditionParamRef.createTime != null ">
@@ -675,12 +816,18 @@
                 ${_conditionType_} a.createUserId is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('createUserIdList')">
+        <if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
             ${_conditionType_} a.createUserId in
             <foreach collection="conditionParamRef.createUserIdList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
+        <if test="conditionParamRef.containsKey('createUserIdNotList') 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>
@@ -711,12 +858,18 @@
                 ${_conditionType_} a.updateUserId is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('updateUserIdList')">
+        <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>
@@ -762,6 +915,11 @@
                     <if test='orderCol.fieldType != null and "DESC".equalsIgnoreCase(orderCol.fieldType)'>DESC</if>
                     ,
                 </if>
+                <if test="orderCol.containsKey('fieldTypeValue')">
+                    a.fieldTypeValue
+                    <if test='orderCol.fieldTypeValue != null and "DESC".equalsIgnoreCase(orderCol.fieldTypeValue)'>DESC</if>
+                    ,
+                </if>
                 <if test="orderCol.containsKey('dataType')">
                     a.dataType
                     <if test='orderCol.dataType != null and "DESC".equalsIgnoreCase(orderCol.dataType)'>DESC</if>
@@ -772,6 +930,11 @@
                     <if test='orderCol.fieldValue != null and "DESC".equalsIgnoreCase(orderCol.fieldValue)'>DESC</if>
                     ,
                 </if>
+                <if test="orderCol.containsKey('defaultValue')">
+                    a.defaultValue
+                    <if test='orderCol.defaultValue != null and "DESC".equalsIgnoreCase(orderCol.defaultValue)'>DESC</if>
+                    ,
+                </if>
                 <if test="orderCol.containsKey('fieldLen')">
                     a.fieldLen
                     <if test='orderCol.fieldLen != null and "DESC".equalsIgnoreCase(orderCol.fieldLen)'>DESC</if>

base-manager/src/main/resources/sqlmap/module/app/AppInfoTempleteFieldMapper.xml

@@ -21,6 +21,8 @@
         <result property="createUserId" column="createUserId" />
         <result property="updateTime" column="updateTime" />
         <result property="updateUserId" column="updateUserId" />
+        <result property="fieldTypeValue" column="fieldTypeValue" />
+        <result property="defaultValue" column="defaultValue" />
 
     </resultMap>
 
@@ -76,23 +78,29 @@
             <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('fieldTypeValue') or colPickMode == 1 and data.containsKey('fieldTypeValue')))">
+                a.fieldTypeValue,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('defaultValue') or colPickMode == 1 and data.containsKey('defaultValue')))">
+                a.defaultValue,
+            </if>
         </trim>
     </sql>
     <!-- 新增 区分主键自增加还是业务插入 -->
     <insert id="insert" parameterType="AppInfoTempleteFieldEntity"  useGeneratedKeys="true" keyProperty="id">
         insert into mortals_sys_app_info_templete_field
-        (appId,fieldCode,fieldName,fieldType,dataType,fieldValue,fieldLen,fieldNull,isList,fieldOrderNo,remark,createTime,createUserId,updateTime,updateUserId)
+        (appId,fieldCode,fieldName,fieldType,dataType,fieldValue,fieldLen,fieldNull,isList,fieldOrderNo,remark,createTime,createUserId,updateTime,updateUserId,fieldTypeValue,defaultValue)
         VALUES
-        (#{appId},#{fieldCode},#{fieldName},#{fieldType},#{dataType},#{fieldValue},#{fieldLen},#{fieldNull},#{isList},#{fieldOrderNo},#{remark},#{createTime},#{createUserId},#{updateTime},#{updateUserId})
+        (#{appId},#{fieldCode},#{fieldName},#{fieldType},#{dataType},#{fieldValue},#{fieldLen},#{fieldNull},#{isList},#{fieldOrderNo},#{remark},#{createTime},#{createUserId},#{updateTime},#{updateUserId},#{fieldTypeValue},#{defaultValue})
     </insert>
 
     <!-- 批量新增 -->
     <insert id="insertBatch" parameterType="paramDto">
         insert into mortals_sys_app_info_templete_field
-        (appId,fieldCode,fieldName,fieldType,dataType,fieldValue,fieldLen,fieldNull,isList,fieldOrderNo,remark,createTime,createUserId,updateTime,updateUserId)
+        (appId,fieldCode,fieldName,fieldType,dataType,fieldValue,fieldLen,fieldNull,isList,fieldOrderNo,remark,createTime,createUserId,updateTime,updateUserId,fieldTypeValue,defaultValue)
         VALUES
         <foreach collection="data.dataList" item="item" index="index" separator="," >
-            (#{item.appId},#{item.fieldCode},#{item.fieldName},#{item.fieldType},#{item.dataType},#{item.fieldValue},#{item.fieldLen},#{item.fieldNull},#{item.isList},#{item.fieldOrderNo},#{item.remark},#{item.createTime},#{item.createUserId},#{item.updateTime},#{item.updateUserId})
+            (#{item.appId},#{item.fieldCode},#{item.fieldName},#{item.fieldType},#{item.dataType},#{item.fieldValue},#{item.fieldLen},#{item.fieldNull},#{item.isList},#{item.fieldOrderNo},#{item.remark},#{item.createTime},#{item.createUserId},#{item.updateTime},#{item.updateUserId},#{item.fieldTypeValue},#{item.defaultValue})
         </foreach>
     </insert>
 
@@ -168,6 +176,12 @@
             <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('fieldTypeValue')) or (colPickMode==1 and !data.containsKey('fieldTypeValue'))">
+                a.fieldTypeValue=#{data.fieldTypeValue},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('defaultValue')) or (colPickMode==1 and !data.containsKey('defaultValue'))">
+                a.defaultValue=#{data.defaultValue},
+            </if>
         </trim>
         <trim suffixOverrides="where" suffix="">
             where
@@ -320,6 +334,20 @@
                     </choose>
                 </foreach>
             </trim>
+            <trim prefix="fieldTypeValue=(case" suffix="ELSE fieldTypeValue end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('fieldTypeValue')) or (colPickMode==1 and !item.containsKey('fieldTypeValue'))">
+                        when a.id=#{item.id} then #{item.fieldTypeValue}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="defaultValue=(case" suffix="ELSE defaultValue end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('defaultValue')) or (colPickMode==1 and !item.containsKey('defaultValue'))">
+                        when a.id=#{item.id} then #{item.defaultValue}
+                    </if>
+                </foreach>
+            </trim>
         </trim>
         where id in
         <foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
@@ -444,12 +472,18 @@
                 ${_conditionType_} a.id is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('idList')">
+        <if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
             ${_conditionType_} a.id in
             <foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
+        <if test="conditionParamRef.containsKey('idNotList') 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>
@@ -465,12 +499,18 @@
                 ${_conditionType_} a.appId is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('appIdList')">
+        <if test="conditionParamRef.containsKey('appIdList') and conditionParamRef.appIdList.size() > 0">
             ${_conditionType_} a.appId in
             <foreach collection="conditionParamRef.appIdList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
+        <if test="conditionParamRef.containsKey('appIdNotList') and conditionParamRef.appIdNotList.size() > 0">
+            ${_conditionType_} a.appId not in
+            <foreach collection="conditionParamRef.appIdNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
         <if test="conditionParamRef.containsKey('appIdStart') and conditionParamRef.appIdStart != null">
             ${_conditionType_} a.appId <![CDATA[ >= ]]> #{${_conditionParam_}.appIdStart}
         </if>
@@ -487,12 +527,18 @@
                 ${_conditionType_} a.fieldCode is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('fieldCodeList')">
+        <if test="conditionParamRef.containsKey('fieldCodeList') and conditionParamRef.fieldCodeList.size() > 0">
             ${_conditionType_} a.fieldCode in
             <foreach collection="conditionParamRef.fieldCodeList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
+        <if test="conditionParamRef.containsKey('fieldCodeNotList') and conditionParamRef.fieldCodeNotList.size() > 0">
+            ${_conditionType_} a.fieldCode not in
+            <foreach collection="conditionParamRef.fieldCodeNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
 
         <if test="conditionParamRef.containsKey('fieldName')">
             <if test="conditionParamRef.fieldName != null and conditionParamRef.fieldName != ''">
@@ -502,12 +548,18 @@
                 ${_conditionType_} a.fieldName is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('fieldNameList')">
+        <if test="conditionParamRef.containsKey('fieldNameList') and conditionParamRef.fieldNameList.size() > 0">
             ${_conditionType_} a.fieldName in
             <foreach collection="conditionParamRef.fieldNameList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
+        <if test="conditionParamRef.containsKey('fieldNameNotList') and conditionParamRef.fieldNameNotList.size() > 0">
+            ${_conditionType_} a.fieldName not in
+            <foreach collection="conditionParamRef.fieldNameNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
 
         <if test="conditionParamRef.containsKey('fieldType')">
             <if test="conditionParamRef.fieldType != null and conditionParamRef.fieldType != ''">
@@ -517,12 +569,18 @@
                 ${_conditionType_} a.fieldType is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('fieldTypeList')">
+        <if test="conditionParamRef.containsKey('fieldTypeList') and conditionParamRef.fieldTypeList.size() > 0">
             ${_conditionType_} a.fieldType in
             <foreach collection="conditionParamRef.fieldTypeList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
+        <if test="conditionParamRef.containsKey('fieldTypeNotList') and conditionParamRef.fieldTypeNotList.size() > 0">
+            ${_conditionType_} a.fieldType not in
+            <foreach collection="conditionParamRef.fieldTypeNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
 
         <if test="conditionParamRef.containsKey('dataType')">
             <if test="conditionParamRef.dataType != null and conditionParamRef.dataType != ''">
@@ -532,12 +590,18 @@
                 ${_conditionType_} a.dataType is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('dataTypeList')">
+        <if test="conditionParamRef.containsKey('dataTypeList') and conditionParamRef.dataTypeList.size() > 0">
             ${_conditionType_} a.dataType in
             <foreach collection="conditionParamRef.dataTypeList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
+        <if test="conditionParamRef.containsKey('dataTypeNotList') and conditionParamRef.dataTypeNotList.size() > 0">
+            ${_conditionType_} a.dataType not in
+            <foreach collection="conditionParamRef.dataTypeNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
 
         <if test="conditionParamRef.containsKey('fieldValue')">
             <if test="conditionParamRef.fieldValue != null and conditionParamRef.fieldValue != ''">
@@ -547,12 +611,18 @@
                 ${_conditionType_} a.fieldValue is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('fieldValueList')">
+        <if test="conditionParamRef.containsKey('fieldValueList') and conditionParamRef.fieldValueList.size() > 0">
             ${_conditionType_} a.fieldValue in
             <foreach collection="conditionParamRef.fieldValueList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
+        <if test="conditionParamRef.containsKey('fieldValueNotList') and conditionParamRef.fieldValueNotList.size() > 0">
+            ${_conditionType_} a.fieldValue not in
+            <foreach collection="conditionParamRef.fieldValueNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
         <if test="conditionParamRef.containsKey('fieldLen')">
             <if test="conditionParamRef.fieldLen != null ">
                 ${_conditionType_} a.fieldLen = #{${_conditionParam_}.fieldLen}
@@ -561,12 +631,18 @@
                 ${_conditionType_} a.fieldLen is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('fieldLenList')">
+        <if test="conditionParamRef.containsKey('fieldLenList') and conditionParamRef.fieldLenList.size() > 0">
             ${_conditionType_} a.fieldLen in
             <foreach collection="conditionParamRef.fieldLenList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
+        <if test="conditionParamRef.containsKey('fieldLenNotList') and conditionParamRef.fieldLenNotList.size() > 0">
+            ${_conditionType_} a.fieldLen not in
+            <foreach collection="conditionParamRef.fieldLenNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
         <if test="conditionParamRef.containsKey('fieldLenStart') and conditionParamRef.fieldLenStart != null">
             ${_conditionType_} a.fieldLen <![CDATA[ >= ]]> #{${_conditionParam_}.fieldLenStart}
         </if>
@@ -582,12 +658,18 @@
                 ${_conditionType_} a.fieldNull is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('fieldNullList')">
+        <if test="conditionParamRef.containsKey('fieldNullList') and conditionParamRef.fieldNullList.size() > 0">
             ${_conditionType_} a.fieldNull in
             <foreach collection="conditionParamRef.fieldNullList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
+        <if test="conditionParamRef.containsKey('fieldNullNotList') and conditionParamRef.fieldNullNotList.size() > 0">
+            ${_conditionType_} a.fieldNull not in
+            <foreach collection="conditionParamRef.fieldNullNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
         <if test="conditionParamRef.containsKey('fieldNullStart') and conditionParamRef.fieldNullStart != null">
             ${_conditionType_} a.fieldNull <![CDATA[ >= ]]> #{${_conditionParam_}.fieldNullStart}
         </if>
@@ -603,12 +685,18 @@
                 ${_conditionType_} a.isList is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('isListList')">
+        <if test="conditionParamRef.containsKey('isListList') and conditionParamRef.isListList.size() > 0">
             ${_conditionType_} a.isList in
             <foreach collection="conditionParamRef.isListList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
+        <if test="conditionParamRef.containsKey('isListNotList') and conditionParamRef.isListNotList.size() > 0">
+            ${_conditionType_} a.isList not in
+            <foreach collection="conditionParamRef.isListNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
         <if test="conditionParamRef.containsKey('isListStart') and conditionParamRef.isListStart != null">
             ${_conditionType_} a.isList <![CDATA[ >= ]]> #{${_conditionParam_}.isListStart}
         </if>
@@ -624,12 +712,18 @@
                 ${_conditionType_} a.fieldOrderNo is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('fieldOrderNoList')">
+        <if test="conditionParamRef.containsKey('fieldOrderNoList') and conditionParamRef.fieldOrderNoList.size() > 0">
             ${_conditionType_} a.fieldOrderNo in
             <foreach collection="conditionParamRef.fieldOrderNoList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
+        <if test="conditionParamRef.containsKey('fieldOrderNoNotList') and conditionParamRef.fieldOrderNoNotList.size() > 0">
+            ${_conditionType_} a.fieldOrderNo not in
+            <foreach collection="conditionParamRef.fieldOrderNoNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
         <if test="conditionParamRef.containsKey('fieldOrderNoStart') and conditionParamRef.fieldOrderNoStart != null">
             ${_conditionType_} a.fieldOrderNo <![CDATA[ >= ]]> #{${_conditionParam_}.fieldOrderNoStart}
         </if>
@@ -646,12 +740,18 @@
                 ${_conditionType_} a.remark is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('remarkList')">
+        <if test="conditionParamRef.containsKey('remarkList') and conditionParamRef.remarkList.size() > 0">
             ${_conditionType_} a.remark in
             <foreach collection="conditionParamRef.remarkList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
+        <if test="conditionParamRef.containsKey('remarkNotList') and conditionParamRef.remarkNotList.size() > 0">
+            ${_conditionType_} a.remark not in
+            <foreach collection="conditionParamRef.remarkNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
 
         <if test="conditionParamRef.containsKey('createTime')">
             <if test="conditionParamRef.createTime != null ">
@@ -675,12 +775,18 @@
                 ${_conditionType_} a.createUserId is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('createUserIdList')">
+        <if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
             ${_conditionType_} a.createUserId in
             <foreach collection="conditionParamRef.createUserIdList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
+        <if test="conditionParamRef.containsKey('createUserIdNotList') 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>
@@ -711,12 +817,18 @@
                 ${_conditionType_} a.updateUserId is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('updateUserIdList')">
+        <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>
@@ -724,6 +836,48 @@
             ${_conditionType_} a.updateUserId <![CDATA[ <= ]]> #{${_conditionParam_}.updateUserIdEnd}
         </if>
 
+
+        <if test="conditionParamRef.containsKey('fieldTypeValue')">
+            <if test="conditionParamRef.fieldTypeValue != null and conditionParamRef.fieldTypeValue != ''">
+                ${_conditionType_} a.fieldTypeValue like #{${_conditionParam_}.fieldTypeValue}
+            </if>
+            <if test="conditionParamRef.fieldTypeValue == null">
+                ${_conditionType_} a.fieldTypeValue is null
+            </if>
+        </if>
+        <if test="conditionParamRef.containsKey('fieldTypeValueList') and conditionParamRef.fieldTypeValueList.size() > 0">
+            ${_conditionType_} a.fieldTypeValue in
+            <foreach collection="conditionParamRef.fieldTypeValueList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('fieldTypeValueNotList') and conditionParamRef.fieldTypeValueNotList.size() > 0">
+            ${_conditionType_} a.fieldTypeValue not in
+            <foreach collection="conditionParamRef.fieldTypeValueNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+
+        <if test="conditionParamRef.containsKey('defaultValue')">
+            <if test="conditionParamRef.defaultValue != null and conditionParamRef.defaultValue != ''">
+                ${_conditionType_} a.defaultValue like #{${_conditionParam_}.defaultValue}
+            </if>
+            <if test="conditionParamRef.defaultValue == null">
+                ${_conditionType_} a.defaultValue is null
+            </if>
+        </if>
+        <if test="conditionParamRef.containsKey('defaultValueList') and conditionParamRef.defaultValueList.size() > 0">
+            ${_conditionType_} a.defaultValue in
+            <foreach collection="conditionParamRef.defaultValueList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('defaultValueNotList') and conditionParamRef.defaultValueNotList.size() > 0">
+            ${_conditionType_} a.defaultValue not in
+            <foreach collection="conditionParamRef.defaultValueNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
     </sql>
     <sql id="_orderCols_">
         <if test="orderColList != null and !orderColList.isEmpty()">
@@ -817,6 +971,16 @@
                     <if test='orderCol.updateUserId != null and "DESC".equalsIgnoreCase(orderCol.updateUserId)'>DESC</if>
                     ,
                 </if>
+                <if test="orderCol.containsKey('fieldTypeValue')">
+                    a.fieldTypeValue
+                    <if test='orderCol.fieldTypeValue != null and "DESC".equalsIgnoreCase(orderCol.fieldTypeValue)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('defaultValue')">
+                    a.defaultValue
+                    <if test='orderCol.defaultValue != null and "DESC".equalsIgnoreCase(orderCol.defaultValue)'>DESC</if>
+                    ,
+                </if>
             </trim>
         </if>
     </sql>

base-manager/src/test/java/com/mortals/httpclient/app/AppInfoFieldController.http

@@ -19,7 +19,6 @@ Authorization: {{authToken}}
 Content-Type: application/json
 
 {
-  "datasetId": 1,
   "page": 1,
   "size": 10
 }

base-manager/src/test/java/com/mortals/httpclient/dept/DeptController.http

@@ -43,7 +43,7 @@ POST {{baseUrl}}/dept/getBusinessByDept
 Content-Type: application/json
 
 {
-  "idList":[450,451]
+  "idList":[426]
 }
 
 ###部门查看

base-manager/src/test/java/com/mortals/httpclient/system/system.http

@@ -115,6 +115,17 @@ Content-Type: application/json
   "body":"{\"test\":\"哈哈哈\"}"
 }
 
+
+### trans
+POST {{baseUrl}}/mid/trans
+Content-Type: application/json
+
+{
+  "method":"post",
+  "path":"/api/edge-service-agent/V2.10/59522c3302b699fd/jbxx",
+  "body":"{\"areaCode\":\"510727000000\"}"
+}
+
 ###短信设置编辑
 GET {{baseUrl}}/sms/set/edit?id={{SmsSet_id}}
 Accept: application/json