From 77904e206b108155193617fc381ef96e713074da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=95=B8=E9=9D=9E?= <13281114856@qq.com>
Date: Tue, 28 Mar 2023 17:11:01 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=BA=94=E7=94=A8=E5=A4=8D?=
=?UTF-8?q?=E9=80=89=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
base-manager/db/add.sql | 11 +
base-manager/doc/api.md | 12 +
.../xhx/busiz/web/MidSignApiController.java | 35 +-
.../module/app/model/AppInfoFieldEntity.java | 86 ++-
.../module/app/model/AppInfoFieldQuery.java | 666 +++++++++++++++---
.../app/model/AppInfoTempleteFieldEntity.java | 44 +-
.../app/model/AppInfoTempleteFieldQuery.java | 460 +++++++++++-
.../sqlmap/module/app/AppInfoFieldMapper.xml | 294 ++++++--
.../module/app/AppInfoTempleteFieldMapper.xml | 200 +++++-
9 files changed, 1564 insertions(+), 244 deletions(-)
diff --git a/base-manager/db/add.sql b/base-manager/db/add.sql
index 64ccf8ff..181ca96e 100644
--- a/base-manager/db/add.sql
+++ b/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 '涓€浣撳寲缁忓姙浜篿d' 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;
diff --git a/base-manager/doc/api.md b/base-manager/doc/api.md
index 792ce795..bde8edf1 100644
--- a/base-manager/doc/api.md
+++ b/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|鍚瀛楁榛樿鍊�
**璇锋眰鏍蜂緥:**
diff --git a/base-manager/src/main/java/com/mortals/xhx/busiz/web/MidSignApiController.java b/base-manager/src/main/java/com/mortals/xhx/busiz/web/MidSignApiController.java
index cec11faa..f0cc832b 100644
--- a/base-manager/src/main/java/com/mortals/xhx/busiz/web/MidSignApiController.java
+++ b/base-manager/src/main/java/com/mortals/xhx/busiz/web/MidSignApiController.java
@@ -1,13 +1,7 @@
package com.mortals.xhx.busiz.web;
-import cn.hutool.core.codec.Base64;
-import cn.hutool.core.date.DateUtil;
import cn.hutool.core.net.url.UrlBuilder;
-import cn.hutool.core.util.NumberUtil;
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;
@@ -17,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;
/**
* 寰腑鍙扮鍚嶆帴鍙�
diff --git a/base-manager/src/main/java/com/mortals/xhx/module/app/model/AppInfoFieldEntity.java b/base-manager/src/main/java/com/mortals/xhx/module/app/model/AppInfoFieldEntity.java
index 761dcb9e..1f696bcb 100644
--- a/base-manager/src/main/java/com/mortals/xhx/module/app/model/AppInfoFieldEntity.java
+++ b/base-manager/src/main/java/com/mortals/xhx/module/app/model/AppInfoFieldEntity.java
@@ -10,16 +10,12 @@ 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;
- /**
- * 搴旂敤鏁版嵁闆唅d
- */
- private Long datasetId;
/**
* 瀛楁缂栫爜
*/
@@ -60,24 +56,22 @@ public class AppInfoFieldEntity extends AppInfoFieldVo {
* 澶囨敞
*/
private String remark;
-
-
-
- public AppInfoFieldEntity(){}
/**
- * 鑾峰彇 搴旂敤鏁版嵁闆唅d
- * @return Long
+ * 搴旂敤id
*/
- public Long getDatasetId(){
- return datasetId;
- }
+ private Long appId;
/**
- * 璁剧疆 搴旂敤鏁版嵁闆唅d
- * @param datasetId
+ * 瀛楁绫诲瀷鍊硷紝褰撳瓧娈电被鍨嬩负澶氶€夛紝鍗曢€夋椂鍊欙紝棰勮澶嶉€夊€�
*/
- public void setDatasetId(Long datasetId){
- this.datasetId = datasetId;
- }
+ private String fieldTypeValue;
+ /**
+ * 瀛楁榛樿鍊�
+ */
+ private String defaultValue;
+
+
+
+ public AppInfoFieldEntity(){}
/**
* 鑾峰彇 瀛楁缂栫爜
* @return String
@@ -218,6 +212,48 @@ public class AppInfoFieldEntity extends AppInfoFieldVo {
public void setRemark(String remark){
this.remark = remark;
}
+ /**
+ * 鑾峰彇 搴旂敤id
+ * @return Long
+ */
+ public Long getAppId(){
+ return appId;
+ }
+ /**
+ * 璁剧疆 搴旂敤id
+ * @param appId
+ */
+ public void setAppId(Long appId){
+ this.appId = appId;
+ }
+ /**
+ * 鑾峰彇 瀛楁绫诲瀷鍊硷紝褰撳瓧娈电被鍨嬩负澶氶€夛紝鍗曢€夋椂鍊欙紝棰勮澶嶉€夊€�
+ * @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;
+ }
@@ -240,7 +276,6 @@ public class AppInfoFieldEntity extends AppInfoFieldVo {
public String toString(){
StringBuilder sb = new StringBuilder("");
- sb.append(",datasetId:").append(getDatasetId());
sb.append(",fieldCode:").append(getFieldCode());
sb.append(",fieldName:").append(getFieldName());
sb.append(",fieldType:").append(getFieldType());
@@ -251,13 +286,14 @@ public class AppInfoFieldEntity extends AppInfoFieldVo {
sb.append(",isList:").append(getIsList());
sb.append(",fieldOrderNo:").append(getFieldOrderNo());
sb.append(",remark:").append(getRemark());
+ sb.append(",appId:").append(getAppId());
+ sb.append(",fieldTypeValue:").append(getFieldTypeValue());
+ sb.append(",defaultValue:").append(getDefaultValue());
return sb.toString();
}
public void initAttrValue(){
- this.datasetId = null;
-
this.fieldCode = "";
this.fieldName = "";
@@ -277,5 +313,11 @@ public class AppInfoFieldEntity extends AppInfoFieldVo {
this.fieldOrderNo = 1;
this.remark = "";
+
+ this.appId = null;
+
+ this.fieldTypeValue = "";
+
+ this.defaultValue = "";
}
}
\ No newline at end of file
diff --git a/base-manager/src/main/java/com/mortals/xhx/module/app/model/AppInfoFieldQuery.java b/base-manager/src/main/java/com/mortals/xhx/module/app/model/AppInfoFieldQuery.java
index d1cf54fa..f3089035 100644
--- a/base-manager/src/main/java/com/mortals/xhx/module/app/model/AppInfoFieldQuery.java
+++ b/base-manager/src/main/java/com/mortals/xhx/module/app/model/AppInfoFieldQuery.java
@@ -6,7 +6,7 @@ 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,34 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity {
/** 搴忓彿锛屼富閿紝鑷闀垮垪琛� */
private List <Long> idList;
- /** 寮€濮� 搴旂敤鏁版嵁闆唅d */
- private Long datasetIdStart;
-
- /** 缁撴潫 搴旂敤鏁版嵁闆唅d */
- private Long datasetIdEnd;
-
- /** 澧炲姞 搴旂敤鏁版嵁闆唅d */
- private Long datasetIdIncrement;
-
- /** 搴旂敤鏁版嵁闆唅d鍒楄〃 */
- private List <Long> datasetIdList;
+ /** 搴忓彿锛屼富閿紝鑷闀挎帓闄ゅ垪琛� */
+ private List <Long> idNotList;
/** 瀛楁缂栫爜 */
private List<String> fieldCodeList;
+ /** 瀛楁缂栫爜鎺掗櫎鍒楄〃 */
+ private List <String> fieldCodeNotList;
/** 瀛楁鍚嶇О */
private List<String> fieldNameList;
+ /** 瀛楁鍚嶇О鎺掗櫎鍒楄〃 */
+ private List <String> fieldNameNotList;
/** 瀛楁绫诲瀷锛坕nput.鍗曡杈撳叆妗�,textarea.澶氳杈撳叆妗�,SELECT.涓嬫媺閫夐」妗�,date.鏃ユ湡閫夋嫨妗嗭級 */
private List<String> fieldTypeList;
+ /** 瀛楁绫诲瀷锛坕nput.鍗曡杈撳叆妗�,textarea.澶氳杈撳叆妗�,SELECT.涓嬫媺閫夐」妗�,date.鏃ユ湡閫夋嫨妗嗭級鎺掗櫎鍒楄〃 */
+ private List <String> fieldTypeNotList;
/** 鏁版嵁绫诲瀷锛坣umber.鏁板瓧,string.瀛楃涓诧級 */
private List<String> dataTypeList;
+ /** 鏁版嵁绫诲瀷锛坣umber.鏁板瓧,string.瀛楃涓诧級鎺掗櫎鍒楄〃 */
+ private List <String> dataTypeNotList;
/** 瀛楁鍊� */
private List<String> fieldValueList;
+ /** 瀛楁鍊兼帓闄ゅ垪琛� */
+ private List <String> fieldValueNotList;
/** 寮€濮� 鏁版嵁闀垮害锛岄粯璁�128 */
private Integer fieldLenStart;
@@ -60,6 +61,9 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity {
/** 鏁版嵁闀垮害锛岄粯璁�128鍒楄〃 */
private List <Integer> fieldLenList;
+ /** 鏁版嵁闀垮害锛岄粯璁�128鎺掗櫎鍒楄〃 */
+ private List <Integer> fieldLenNotList;
+
/** 寮€濮� 鏄惁鍏佽涓虹┖锛�(0.鍚�,1.鏄�) */
private Integer fieldNullStart;
@@ -72,6 +76,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 +91,9 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity {
/** 瀛楁鏄惁鍒楄〃鏄剧ず(0.鍚�,1.鏄�)鍒楄〃 */
private List <Integer> isListList;
+ /** 瀛楁鏄惁鍒楄〃鏄剧ず(0.鍚�,1.鏄�)鎺掗櫎鍒楄〃 */
+ private List <Integer> isListNotList;
+
/** 寮€濮� 鎺掑簭鍙� */
private Integer fieldOrderNoStart;
@@ -96,9 +106,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 +132,9 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity {
/** 鍒涘缓鐢ㄦ埛鍒楄〃 */
private List <Long> createUserIdList;
+ /** 鍒涘缓鐢ㄦ埛鎺掗櫎鍒楄〃 */
+ private List <Long> createUserIdNotList;
+
/** 寮€濮� 淇敼鏃堕棿 */
private String updateTimeStart;
@@ -135,6 +153,34 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity {
/** 淇敼鐢ㄦ埛鍒楄〃 */
private List <Long> updateUserIdList;
+ /** 淇敼鐢ㄦ埛鎺掗櫎鍒楄〃 */
+ private List <Long> updateUserIdNotList;
+
+ /** 寮€濮� 搴旂敤id */
+ private Long appIdStart;
+
+ /** 缁撴潫 搴旂敤id */
+ private Long appIdEnd;
+
+ /** 澧炲姞 搴旂敤id */
+ private Long appIdIncrement;
+
+ /** 搴旂敤id鍒楄〃 */
+ private List <Long> appIdList;
+
+ /** 搴旂敤id鎺掗櫎鍒楄〃 */
+ private List <Long> appIdNotList;
+
+ /** 瀛楁绫诲瀷鍊硷紝褰撳瓧娈电被鍨嬩负澶氶€夛紝鍗曢€夋椂鍊欙紝棰勮澶嶉€夊€� */
+ private List<String> fieldTypeValueList;
+
+ /** 瀛楁绫诲瀷鍊硷紝褰撳瓧娈电被鍨嬩负澶氶€夛紝鍗曢€夋椂鍊欙紝棰勮澶嶉€夊€兼帓闄ゅ垪琛� */
+ private List <String> fieldTypeValueNotList;
+ /** 瀛楁榛樿鍊� */
+ private List<String> defaultValueList;
+
+ /** 瀛楁榛樿鍊兼帓闄ゅ垪琛� */
+ private List <String> defaultValueNotList;
/** OR鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疧R锛岄」鍐呭涔嬮棿鏄疉ND锛屽锛�(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
private List<AppInfoFieldQuery> orConditionList;
@@ -208,99 +254,86 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity {
}
/**
- * 鑾峰彇 寮€濮� 搴旂敤鏁版嵁闆唅d
- * @return datasetIdStart
+ * 鑾峰彇 搴忓彿锛屼富閿紝鑷闀�
+ * @return idNotList
*/
- public Long getDatasetIdStart(){
- return this.datasetIdStart;
+ public List<Long> getIdNotList(){
+ return this.idNotList;
}
/**
- * 璁剧疆 寮€濮� 搴旂敤鏁版嵁闆唅d
- * @param datasetIdStart
+ * 璁剧疆 搴忓彿锛屼富閿紝鑷闀�
+ * @param idNotList
*/
- public void setDatasetIdStart(Long datasetIdStart){
- this.datasetIdStart = datasetIdStart;
+ public void setIdNotList(List<Long> idNotList){
+ this.idNotList = idNotList;
}
- /**
- * 鑾峰彇 缁撴潫 搴旂敤鏁版嵁闆唅d
- * @return $datasetIdEnd
- */
- public Long getDatasetIdEnd(){
- return this.datasetIdEnd;
- }
/**
- * 璁剧疆 缁撴潫 搴旂敤鏁版嵁闆唅d
- * @param datasetIdEnd
+ * 鑾峰彇 瀛楁缂栫爜
+ * @return fieldCodeList
*/
- public void setDatasetIdEnd(Long datasetIdEnd){
- this.datasetIdEnd = datasetIdEnd;
+ public List<String> getFieldCodeList(){
+ return this.fieldCodeList;
}
/**
- * 鑾峰彇 澧炲姞 搴旂敤鏁版嵁闆唅d
- * @return datasetIdIncrement
+ * 璁剧疆 瀛楁缂栫爜
+ * @param fieldCodeList
*/
- public Long getDatasetIdIncrement(){
- return this.datasetIdIncrement;
+ public void setFieldCodeList(List<String> fieldCodeList){
+ this.fieldCodeList = fieldCodeList;
}
/**
- * 璁剧疆 澧炲姞 搴旂敤鏁版嵁闆唅d
- * @param datasetIdIncrement
+ * 鑾峰彇 瀛楁缂栫爜
+ * @return fieldCodeNotList
*/
- public void setDatasetIdIncrement(Long datasetIdIncrement){
- this.datasetIdIncrement = datasetIdIncrement;
+ public List<String> getFieldCodeNotList(){
+ return this.fieldCodeNotList;
}
/**
- * 鑾峰彇 搴旂敤鏁版嵁闆唅d
- * @return datasetIdList
+ * 璁剧疆 瀛楁缂栫爜
+ * @param fieldCodeNotList
*/
- public List<Long> getDatasetIdList(){
- return this.datasetIdList;
+ public void setFieldCodeNotList(List<String> fieldCodeNotList){
+ this.fieldCodeNotList = fieldCodeNotList;
}
/**
- * 璁剧疆 搴旂敤鏁版嵁闆唅d
- * @param datasetIdList
+ * 鑾峰彇 瀛楁鍚嶇О
+ * @return fieldNameList
*/
- public void setDatasetIdList(List<Long> datasetIdList){
- this.datasetIdList = datasetIdList;
+ public List<String> getFieldNameList(){
+ return this.fieldNameList;
}
/**
- * 鑾峰彇 瀛楁缂栫爜
- * @return fieldCodeList
+ * 璁剧疆 瀛楁鍚嶇О
+ * @param fieldNameList
*/
- public List<String> getFieldCodeList(){
- return this.fieldCodeList;
+ public void setFieldNameList(List<String> fieldNameList){
+ this.fieldNameList = fieldNameList;
}
- /**
- * 璁剧疆 瀛楁缂栫爜
- * @param fieldCodeList
- */
- public void setFieldCodeList(List<String> fieldCodeList){
- this.fieldCodeList = fieldCodeList;
- }
/**
* 鑾峰彇 瀛楁鍚嶇О
- * @return fieldNameList
+ * @return fieldNameNotList
*/
- public List<String> getFieldNameList(){
- return this.fieldNameList;
+ public List<String> getFieldNameNotList(){
+ return this.fieldNameNotList;
}
/**
* 璁剧疆 瀛楁鍚嶇О
- * @param fieldNameList
+ * @param fieldNameNotList
*/
- public void setFieldNameList(List<String> fieldNameList){
- this.fieldNameList = fieldNameList;
+ public void setFieldNameNotList(List<String> fieldNameNotList){
+ this.fieldNameNotList = fieldNameNotList;
}
+
/**
* 鑾峰彇 瀛楁绫诲瀷锛坕nput.鍗曡杈撳叆妗�,textarea.澶氳杈撳叆妗�,SELECT.涓嬫媺閫夐」妗�,date.鏃ユ湡閫夋嫨妗嗭級
* @return fieldTypeList
@@ -316,6 +349,23 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity {
public void setFieldTypeList(List<String> fieldTypeList){
this.fieldTypeList = fieldTypeList;
}
+
+ /**
+ * 鑾峰彇 瀛楁绫诲瀷锛坕nput.鍗曡杈撳叆妗�,textarea.澶氳杈撳叆妗�,SELECT.涓嬫媺閫夐」妗�,date.鏃ユ湡閫夋嫨妗嗭級
+ * @return fieldTypeNotList
+ */
+ public List<String> getFieldTypeNotList(){
+ return this.fieldTypeNotList;
+ }
+
+ /**
+ * 璁剧疆 瀛楁绫诲瀷锛坕nput.鍗曡杈撳叆妗�,textarea.澶氳杈撳叆妗�,SELECT.涓嬫媺閫夐」妗�,date.鏃ユ湡閫夋嫨妗嗭級
+ * @param fieldTypeNotList
+ */
+ public void setFieldTypeNotList(List<String> fieldTypeNotList){
+ this.fieldTypeNotList = fieldTypeNotList;
+ }
+
/**
* 鑾峰彇 鏁版嵁绫诲瀷锛坣umber.鏁板瓧,string.瀛楃涓诧級
* @return dataTypeList
@@ -331,6 +381,23 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity {
public void setDataTypeList(List<String> dataTypeList){
this.dataTypeList = dataTypeList;
}
+
+ /**
+ * 鑾峰彇 鏁版嵁绫诲瀷锛坣umber.鏁板瓧,string.瀛楃涓诧級
+ * @return dataTypeNotList
+ */
+ public List<String> getDataTypeNotList(){
+ return this.dataTypeNotList;
+ }
+
+ /**
+ * 璁剧疆 鏁版嵁绫诲瀷锛坣umber.鏁板瓧,string.瀛楃涓诧級
+ * @param dataTypeNotList
+ */
+ public void setDataTypeNotList(List<String> dataTypeNotList){
+ this.dataTypeNotList = dataTypeNotList;
+ }
+
/**
* 鑾峰彇 瀛楁鍊�
* @return fieldValueList
@@ -346,6 +413,23 @@ 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;
+ }
+
/**
* 鑾峰彇 寮€濮� 鏁版嵁闀垮害锛岄粯璁�128
* @return fieldLenStart
@@ -410,6 +494,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 +575,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 +656,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 +737,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 +769,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 +882,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 +995,168 @@ 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;
+ }
+
+
+ /**
+ * 鑾峰彇 寮€濮� 搴旂敤id
+ * @return appIdStart
+ */
+ public Long getAppIdStart(){
+ return this.appIdStart;
+ }
+
+ /**
+ * 璁剧疆 寮€濮� 搴旂敤id
+ * @param appIdStart
+ */
+ public void setAppIdStart(Long appIdStart){
+ this.appIdStart = appIdStart;
+ }
+
+ /**
+ * 鑾峰彇 缁撴潫 搴旂敤id
+ * @return $appIdEnd
+ */
+ public Long getAppIdEnd(){
+ return this.appIdEnd;
+ }
+
+ /**
+ * 璁剧疆 缁撴潫 搴旂敤id
+ * @param appIdEnd
+ */
+ public void setAppIdEnd(Long appIdEnd){
+ this.appIdEnd = appIdEnd;
+ }
+
+ /**
+ * 鑾峰彇 澧炲姞 搴旂敤id
+ * @return appIdIncrement
+ */
+ public Long getAppIdIncrement(){
+ return this.appIdIncrement;
+ }
+
+ /**
+ * 璁剧疆 澧炲姞 搴旂敤id
+ * @param appIdIncrement
+ */
+ public void setAppIdIncrement(Long appIdIncrement){
+ this.appIdIncrement = appIdIncrement;
+ }
+
+ /**
+ * 鑾峰彇 搴旂敤id
+ * @return appIdList
+ */
+ public List<Long> getAppIdList(){
+ return this.appIdList;
+ }
+
+ /**
+ * 璁剧疆 搴旂敤id
+ * @param appIdList
+ */
+ public void setAppIdList(List<Long> appIdList){
+ 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 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
@@ -855,47 +1203,11 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity {
}
/**
- * 璁剧疆 搴旂敤鏁版嵁闆唅d
- * @param datasetId
- */
- public AppInfoFieldQuery datasetId(Long datasetId){
- setDatasetId(datasetId);
- return this;
- }
-
- /**
- * 璁剧疆 寮€濮� 搴旂敤鏁版嵁闆唅d
- * @param datasetIdStart
- */
- public AppInfoFieldQuery datasetIdStart(Long datasetIdStart){
- this.datasetIdStart = datasetIdStart;
- return this;
- }
-
- /**
- * 璁剧疆 缁撴潫 搴旂敤鏁版嵁闆唅d
- * @param datasetIdEnd
- */
- public AppInfoFieldQuery datasetIdEnd(Long datasetIdEnd){
- this.datasetIdEnd = datasetIdEnd;
- return this;
- }
-
- /**
- * 璁剧疆 澧炲姞 搴旂敤鏁版嵁闆唅d
- * @param datasetIdIncrement
- */
- public AppInfoFieldQuery datasetIdIncrement(Long datasetIdIncrement){
- this.datasetIdIncrement = datasetIdIncrement;
- return this;
- }
-
- /**
- * 璁剧疆 搴旂敤鏁版嵁闆唅d
- * @param datasetIdList
+ * 璁剧疆 搴忓彿锛屼富閿紝鑷闀�
+ * @param idNotList
*/
- public AppInfoFieldQuery datasetIdList(List<Long> datasetIdList){
- this.datasetIdList = datasetIdList;
+ public AppInfoFieldQuery idNotList(List<Long> idNotList){
+ this.idNotList = idNotList;
return this;
}
@@ -1039,6 +1351,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 +1405,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 +1459,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 +1513,15 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity {
return this;
}
+ /**
+ * 璁剧疆 鎺掑簭鍙�
+ * @param fieldOrderNoNotList
+ */
+ public AppInfoFieldQuery fieldOrderNoNotList(List<Integer> fieldOrderNoNotList){
+ this.fieldOrderNoNotList = fieldOrderNoNotList;
+ return this;
+ }
+
/**
* 璁剧疆 澶囨敞
@@ -1239,6 +1587,15 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity {
return this;
}
+ /**
+ * 璁剧疆 鍒涘缓鐢ㄦ埛
+ * @param createUserIdNotList
+ */
+ public AppInfoFieldQuery createUserIdNotList(List<Long> createUserIdNotList){
+ this.createUserIdNotList = createUserIdNotList;
+ return this;
+ }
+
/**
* 璁剧疆 淇敼鐢ㄦ埛
@@ -1285,6 +1642,107 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity {
return this;
}
+ /**
+ * 璁剧疆 淇敼鐢ㄦ埛
+ * @param updateUserIdNotList
+ */
+ public AppInfoFieldQuery updateUserIdNotList(List<Long> updateUserIdNotList){
+ this.updateUserIdNotList = updateUserIdNotList;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 搴旂敤id
+ * @param appId
+ */
+ public AppInfoFieldQuery appId(Long appId){
+ setAppId(appId);
+ return this;
+ }
+
+ /**
+ * 璁剧疆 寮€濮� 搴旂敤id
+ * @param appIdStart
+ */
+ public AppInfoFieldQuery appIdStart(Long appIdStart){
+ this.appIdStart = appIdStart;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 缁撴潫 搴旂敤id
+ * @param appIdEnd
+ */
+ public AppInfoFieldQuery appIdEnd(Long appIdEnd){
+ this.appIdEnd = appIdEnd;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 澧炲姞 搴旂敤id
+ * @param appIdIncrement
+ */
+ public AppInfoFieldQuery appIdIncrement(Long appIdIncrement){
+ this.appIdIncrement = appIdIncrement;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 搴旂敤id
+ * @param appIdList
+ */
+ public AppInfoFieldQuery appIdList(List<Long> appIdList){
+ this.appIdList = appIdList;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 搴旂敤id
+ * @param appIdNotList
+ */
+ public AppInfoFieldQuery appIdNotList(List<Long> appIdNotList){
+ this.appIdNotList = appIdNotList;
+ return this;
+ }
+
+
+ /**
+ * 璁剧疆 瀛楁绫诲瀷鍊硷紝褰撳瓧娈电被鍨嬩负澶氶€夛紝鍗曢€夋椂鍊欙紝棰勮澶嶉€夊€�
+ * @param fieldTypeValue
+ */
+ public AppInfoFieldQuery fieldTypeValue(String fieldTypeValue){
+ setFieldTypeValue(fieldTypeValue);
+ return this;
+ }
+
+ /**
+ * 璁剧疆 瀛楁绫诲瀷鍊硷紝褰撳瓧娈电被鍨嬩负澶氶€夛紝鍗曢€夋椂鍊欙紝棰勮澶嶉€夊€�
+ * @param fieldTypeValueList
+ */
+ public AppInfoFieldQuery fieldTypeValueList(List<String> fieldTypeValueList){
+ this.fieldTypeValueList = fieldTypeValueList;
+ 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;
+ }
+
/**
* 鑾峰彇 OR鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疧R锛岄」鍐呭涔嬮棿鏄疉ND锛屽锛�(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
* @return orConditionList
diff --git a/base-manager/src/main/java/com/mortals/xhx/module/app/model/AppInfoTempleteFieldEntity.java b/base-manager/src/main/java/com/mortals/xhx/module/app/model/AppInfoTempleteFieldEntity.java
index c323bd53..fba257c0 100644
--- a/base-manager/src/main/java/com/mortals/xhx/module/app/model/AppInfoTempleteFieldEntity.java
+++ b/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
diff --git a/base-manager/src/main/java/com/mortals/xhx/module/app/model/AppInfoTempleteFieldQuery.java b/base-manager/src/main/java/com/mortals/xhx/module/app/model/AppInfoTempleteFieldQuery.java
index 509abde8..ec2003e4 100644
--- a/base-manager/src/main/java/com/mortals/xhx/module/app/model/AppInfoTempleteFieldQuery.java
+++ b/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;
/** 瀛楁绫诲瀷锛坕nput.鍗曡杈撳叆妗�,textarea.澶氳杈撳叆妗�,SELECT.涓嬫媺閫夐」妗�,date.鏃ユ湡閫夋嫨妗�,editer.瀵屾枃鏈級 */
private List<String> fieldTypeList;
+ /** 瀛楁绫诲瀷锛坕nput.鍗曡杈撳叆妗�,textarea.澶氳杈撳叆妗�,SELECT.涓嬫媺閫夐」妗�,date.鏃ユ湡閫夋嫨妗�,editer.瀵屾枃鏈級鎺掗櫎鍒楄〃 */
+ private List <String> fieldTypeNotList;
/** 鏁版嵁绫诲瀷锛坣umber.鏁板瓧,string.瀛楃涓诧級 */
private List<String> dataTypeList;
+ /** 鏁版嵁绫诲瀷锛坣umber.鏁板瓧,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鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疧R锛岄」鍐呭涔嬮棿鏄疉ND锛屽锛�(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;
+ }
+
/**
* 鑾峰彇 瀛楁绫诲瀷锛坕nput.鍗曡杈撳叆妗�,textarea.澶氳杈撳叆妗�,SELECT.涓嬫媺閫夐」妗�,date.鏃ユ湡閫夋嫨妗�,editer.瀵屾枃鏈級
* @return fieldTypeList
@@ -316,6 +430,23 @@ public class AppInfoTempleteFieldQuery extends AppInfoTempleteFieldEntity {
public void setFieldTypeList(List<String> fieldTypeList){
this.fieldTypeList = fieldTypeList;
}
+
+ /**
+ * 鑾峰彇 瀛楁绫诲瀷锛坕nput.鍗曡杈撳叆妗�,textarea.澶氳杈撳叆妗�,SELECT.涓嬫媺閫夐」妗�,date.鏃ユ湡閫夋嫨妗�,editer.瀵屾枃鏈級
+ * @return fieldTypeNotList
+ */
+ public List<String> getFieldTypeNotList(){
+ return this.fieldTypeNotList;
+ }
+
+ /**
+ * 璁剧疆 瀛楁绫诲瀷锛坕nput.鍗曡杈撳叆妗�,textarea.澶氳杈撳叆妗�,SELECT.涓嬫媺閫夐」妗�,date.鏃ユ湡閫夋嫨妗�,editer.瀵屾枃鏈級
+ * @param fieldTypeNotList
+ */
+ public void setFieldTypeNotList(List<String> fieldTypeNotList){
+ this.fieldTypeNotList = fieldTypeNotList;
+ }
+
/**
* 鑾峰彇 鏁版嵁绫诲瀷锛坣umber.鏁板瓧,string.瀛楃涓诧級
* @return dataTypeList
@@ -331,6 +462,23 @@ public class AppInfoTempleteFieldQuery extends AppInfoTempleteFieldEntity {
public void setDataTypeList(List<String> dataTypeList){
this.dataTypeList = dataTypeList;
}
+
+ /**
+ * 鑾峰彇 鏁版嵁绫诲瀷锛坣umber.鏁板瓧,string.瀛楃涓诧級
+ * @return dataTypeNotList
+ */
+ public List<String> getDataTypeNotList(){
+ return this.dataTypeNotList;
+ }
+
+ /**
+ * 璁剧疆 鏁版嵁绫诲瀷锛坣umber.鏁板瓧,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鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疧R锛岄」鍐呭涔嬮棿鏄疉ND锛屽锛�(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
* @return orConditionList
diff --git a/base-manager/src/main/resources/sqlmap/module/app/AppInfoFieldMapper.xml b/base-manager/src/main/resources/sqlmap/module/app/AppInfoFieldMapper.xml
index 1da876d4..bb2284ec 100644
--- a/base-manager/src/main/resources/sqlmap/module/app/AppInfoFieldMapper.xml
+++ b/base-manager/src/main/resources/sqlmap/module/app/AppInfoFieldMapper.xml
@@ -6,7 +6,6 @@
<!-- 瀛楁鍜屽睘鎬ф槧灏� -->
<resultMap type="AppInfoFieldEntity" id="AppInfoFieldEntity-Map">
<id property="id" column="id" />
- <result property="datasetId" column="datasetId" />
<result property="fieldCode" column="fieldCode" />
<result property="fieldName" column="fieldName" />
<result property="fieldType" column="fieldType" />
@@ -21,6 +20,9 @@
<result property="createUserId" column="createUserId" />
<result property="updateTime" column="updateTime" />
<result property="updateUserId" column="updateUserId" />
+ <result property="appId" column="appId" />
+ <result property="fieldTypeValue" column="fieldTypeValue" />
+ <result property="defaultValue" column="defaultValue" />
</resultMap>
@@ -31,9 +33,6 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('id') or colPickMode == 1 and data.containsKey('id')))">
a.id,
</if>
- <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('datasetId') or colPickMode == 1 and data.containsKey('datasetId')))">
- a.datasetId,
- </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('fieldCode') or colPickMode == 1 and data.containsKey('fieldCode')))">
a.fieldCode,
</if>
@@ -76,23 +75,32 @@
<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('appId') or colPickMode == 1 and data.containsKey('appId')))">
+ a.appId,
+ </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="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)
+ (fieldCode,fieldName,fieldType,dataType,fieldValue,fieldLen,fieldNull,isList,fieldOrderNo,remark,createTime,createUserId,updateTime,updateUserId,appId,fieldTypeValue,defaultValue)
VALUES
- (#{datasetId},#{fieldCode},#{fieldName},#{fieldType},#{dataType},#{fieldValue},#{fieldLen},#{fieldNull},#{isList},#{fieldOrderNo},#{remark},#{createTime},#{createUserId},#{updateTime},#{updateUserId})
+ (#{fieldCode},#{fieldName},#{fieldType},#{dataType},#{fieldValue},#{fieldLen},#{fieldNull},#{isList},#{fieldOrderNo},#{remark},#{createTime},#{createUserId},#{updateTime},#{updateUserId},#{appId},#{fieldTypeValue},#{defaultValue})
</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)
+ (fieldCode,fieldName,fieldType,dataType,fieldValue,fieldLen,fieldNull,isList,fieldOrderNo,remark,createTime,createUserId,updateTime,updateUserId,appId,fieldTypeValue,defaultValue)
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.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.fieldTypeValue},#{item.defaultValue})
</foreach>
</insert>
@@ -102,12 +110,6 @@
update mortals_sys_app_info_field as a
set
<trim suffixOverrides="," suffix="">
- <if test="(colPickMode==0 and data.containsKey('datasetId')) or (colPickMode==1 and !data.containsKey('datasetId'))">
- a.datasetId=#{data.datasetId},
- </if>
- <if test="(colPickMode==0 and data.containsKey('datasetIdIncrement')) or (colPickMode==1 and !data.containsKey('datasetIdIncrement'))">
- a.datasetId=ifnull(a.datasetId,0) + #{data.datasetIdIncrement},
- </if>
<if test="(colPickMode==0 and data.containsKey('fieldCode')) or (colPickMode==1 and !data.containsKey('fieldCode'))">
a.fieldCode=#{data.fieldCode},
</if>
@@ -168,6 +170,18 @@
<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('appId')) or (colPickMode==1 and !data.containsKey('appId'))">
+ a.appId=#{data.appId},
+ </if>
+ <if test="(colPickMode==0 and data.containsKey('appIdIncrement')) or (colPickMode==1 and !data.containsKey('appIdIncrement'))">
+ a.appId=ifnull(a.appId,0) + #{data.appIdIncrement},
+ </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
@@ -180,18 +194,6 @@
<update id="updateBatch" parameterType="paramDto">
update mortals_sys_app_info_field as a
<trim prefix="set" suffixOverrides=",">
- <trim prefix="datasetId=(case" suffix="ELSE datasetId end),">
- <foreach collection="data.dataList" item="item" index="index" separator="" >
- <choose>
- <when test="(colPickMode==0 and item.containsKey('datasetId')) or (colPickMode==1 and !item.containsKey('datasetId'))">
- when a.id=#{item.id} then #{item.datasetId}
- </when>
- <when test="(colPickMode==0 and item.containsKey('datasetIdIncrement')) or (colPickMode==1 and !item.containsKey('datasetIdIncrement'))">
- when a.id=#{item.id} then ifnull(a.datasetId,0) + #{item.datasetIdIncrement}
- </when>
- </choose>
- </foreach>
- </trim>
<trim prefix="fieldCode=(case" suffix="ELSE fieldCode end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('fieldCode')) or (colPickMode==1 and !item.containsKey('fieldCode'))">
@@ -320,6 +322,32 @@
</choose>
</foreach>
</trim>
+ <trim prefix="appId=(case" suffix="ELSE appId end),">
+ <foreach collection="data.dataList" item="item" index="index" separator="" >
+ <choose>
+ <when test="(colPickMode==0 and item.containsKey('appId')) or (colPickMode==1 and !item.containsKey('appId'))">
+ when a.id=#{item.id} then #{item.appId}
+ </when>
+ <when test="(colPickMode==0 and item.containsKey('appIdIncrement')) or (colPickMode==1 and !item.containsKey('appIdIncrement'))">
+ when a.id=#{item.id} then ifnull(a.appId,0) + #{item.appIdIncrement}
+ </when>
+ </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>
@@ -457,27 +491,6 @@
${_conditionType_} a.id <![CDATA[ <= ]]> #{${_conditionParam_}.idEnd}
</if>
- <if test="conditionParamRef.containsKey('datasetId')">
- <if test="conditionParamRef.datasetId != null ">
- ${_conditionType_} a.datasetId = #{${_conditionParam_}.datasetId}
- </if>
- <if test="conditionParamRef.datasetId == null">
- ${_conditionType_} a.datasetId is null
- </if>
- </if>
- <if test="conditionParamRef.containsKey('datasetIdList')">
- ${_conditionType_} a.datasetId in
- <foreach collection="conditionParamRef.datasetIdList" 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>
- <if test="conditionParamRef.containsKey('datasetIdEnd') and conditionParamRef.datasetIdEnd != null">
- ${_conditionType_} a.datasetId <![CDATA[ <= ]]> #{${_conditionParam_}.datasetIdEnd}
- </if>
-
<if test="conditionParamRef.containsKey('fieldCode')">
<if test="conditionParamRef.fieldCode != null and conditionParamRef.fieldCode != ''">
@@ -487,12 +500,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 +521,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 +542,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 +563,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 +584,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 +604,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 +631,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 +658,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 +685,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 +713,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 +748,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 +790,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 +809,75 @@
${_conditionType_} a.updateUserId <![CDATA[ <= ]]> #{${_conditionParam_}.updateUserIdEnd}
</if>
+ <if test="conditionParamRef.containsKey('appId')">
+ <if test="conditionParamRef.appId != null ">
+ ${_conditionType_} a.appId = #{${_conditionParam_}.appId}
+ </if>
+ <if test="conditionParamRef.appId == null">
+ ${_conditionType_} a.appId is null
+ </if>
+ </if>
+ <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>
+ <if test="conditionParamRef.containsKey('appIdEnd') and conditionParamRef.appIdEnd != null">
+ ${_conditionType_} a.appId <![CDATA[ <= ]]> #{${_conditionParam_}.appIdEnd}
+ </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()">
@@ -742,11 +896,6 @@
<if test='orderCol.id != null and "DESC".equalsIgnoreCase(orderCol.id)'>DESC</if>
,
</if>
- <if test="orderCol.containsKey('datasetId')">
- a.datasetId
- <if test='orderCol.datasetId != null and "DESC".equalsIgnoreCase(orderCol.datasetId)'>DESC</if>
- ,
- </if>
<if test="orderCol.containsKey('fieldCode')">
a.fieldCode
<if test='orderCol.fieldCode != null and "DESC".equalsIgnoreCase(orderCol.fieldCode)'>DESC</if>
@@ -817,6 +966,21 @@
<if test='orderCol.updateUserId != null and "DESC".equalsIgnoreCase(orderCol.updateUserId)'>DESC</if>
,
</if>
+ <if test="orderCol.containsKey('appId')">
+ a.appId
+ <if test='orderCol.appId != null and "DESC".equalsIgnoreCase(orderCol.appId)'>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>
diff --git a/base-manager/src/main/resources/sqlmap/module/app/AppInfoTempleteFieldMapper.xml b/base-manager/src/main/resources/sqlmap/module/app/AppInfoTempleteFieldMapper.xml
index 949f5aa8..e721538e 100644
--- a/base-manager/src/main/resources/sqlmap/module/app/AppInfoTempleteFieldMapper.xml
+++ b/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>
--
2.24.3