Skip to content

S
smart_gov_platform
Commit 77904e20 authored by 赵啸非's avatar 赵啸非
Browse files
Options

添加应用复选字段

parent 90c1a24c
Show whitespace changes
Inline Side-by-side
Showing with 1564 additions and 244 deletions
base-manager/db/add.sql
View file @ 77904e20
...@@ -15,3 +15,14 @@ INSERT INTO `mortals_xhx_task` VALUES (null, '统计站点部门事项数', 'Sta ...@@ -15,3 +15,14 @@ INSERT INTO `mortals_xhx_task` VALUES (null, '统计站点部门事项数', 'Sta
2023-3-11 2023-3-11
-- ---------------------------- -- ----------------------------
ALTER TABLE mortals_sys_workman ADD COLUMN `operatorId` varchar (128) default "" COMMENT '一体化经办人id' AFTER modelIds; ALTER TABLE mortals_sys_workman ADD COLUMN `operatorId` varchar (128) default "" COMMENT '一体化经办人id' AFTER modelIds;
-- ----------------------------
2023-3-28
-- ----------------------------
ALTER TABLE mortals_sys_app_info_field ADD COLUMN `fieldTypeValue` varchar (255) default "" COMMENT '字段类型值，当字段类型为多选，单选时候，预设复选值' AFTER fieldType;
ALTER TABLE mortals_sys_app_info_field ADD COLUMN `defaultValue` varchar (255) default "" COMMENT '字段默认值' AFTER fieldValue;
ALTER TABLE mortals_sys_app_info_templete_field ADD COLUMN `fieldTypeValue` varchar (255) default "" COMMENT '字段类型值，当字段类型为多选，单选时候，预设复选值' AFTER fieldType;
ALTER TABLE mortals_sys_app_info_templete_field ADD COLUMN `defaultValue` varchar (255) default "" COMMENT '字段默认值' AFTER fieldValue;
base-manager/doc/api.md
View file @ 77904e20
...@@ -10976,6 +10976,8 @@ data|object|数据对象 ...@@ -10976,6 +10976,8 @@ data|object|数据对象
  createUserId|Long|创建用户   createUserId|Long|创建用户
  updateTime|Date|修改时间   updateTime|Date|修改时间
  updateUserId|Long|修改用户   updateUserId|Long|修改用户
  fieldTypeValue|String|字段类型值，当字段类型为多选，单选时候，预设复选值
  defaultValue|String|字段默认值
dict|object|字典对象 dict|object|字典对象
 fieldType|object|字典属性对象，详见附录  fieldType|object|字典属性对象，详见附录
 dataType|object|字典属性对象，详见附录  dataType|object|字典属性对象，详见附录
...@@ -11037,6 +11039,8 @@ data|object|数据对象 ...@@ -11037,6 +11039,8 @@ data|object|数据对象
 createUserId|Long|创建用户  createUserId|Long|创建用户
 updateTime|Date|修改时间  updateTime|Date|修改时间
 updateUserId|Long|修改用户  updateUserId|Long|修改用户
 fieldTypeValue|String|字段类型值，当字段类型为多选，单选时候，预设复选值
 defaultValue|String|字段默认值
dict|object|字典对象 dict|object|字典对象
 fieldType|object|字典属性对象，详见附录  fieldType|object|字典属性对象，详见附录
 dataType|object|字典属性对象，详见附录  dataType|object|字典属性对象，详见附录
...@@ -11094,6 +11098,8 @@ fieldNull|Integer|否|是否允许为空，(0.否,1.是) ...@@ -11094,6 +11098,8 @@ fieldNull|Integer|否|是否允许为空，(0.否,1.是)
isList|Integer|否|字段是否列表显示(0.否,1.是) isList|Integer|否|字段是否列表显示(0.否,1.是)
fieldOrderNo|String|否|排序号 fieldOrderNo|String|否|排序号
remark|String|否|备注 remark|String|否|备注
fieldTypeValue|String|否|字段类型值，当字段类型为多选，单选时候，预设复选值
defaultValue|String|否|字段默认值
**请求样例:** **请求样例:**
...@@ -11250,6 +11256,8 @@ data|object|数据对象 ...@@ -11250,6 +11256,8 @@ data|object|数据对象
  createUserId|Long|创建用户   createUserId|Long|创建用户
  updateTime|Date|修改时间   updateTime|Date|修改时间
  updateUserId|Long|修改用户   updateUserId|Long|修改用户
  fieldTypeValue|String|字段类型值，当字段类型为多选，单选时候，预设复选值
  defaultValue|String|字段默认值
dict|object|字典对象 dict|object|字典对象
 fieldType|object|字典属性对象，详见附录  fieldType|object|字典属性对象，详见附录
 dataType|object|字典属性对象，详见附录  dataType|object|字典属性对象，详见附录
...@@ -11311,6 +11319,8 @@ data|object|数据对象 ...@@ -11311,6 +11319,8 @@ data|object|数据对象
 createUserId|Long|创建用户  createUserId|Long|创建用户
 updateTime|Date|修改时间  updateTime|Date|修改时间
 updateUserId|Long|修改用户  updateUserId|Long|修改用户
 fieldTypeValue|String|字段类型值，当字段类型为多选，单选时候，预设复选值
 defaultValue|String|字段默认值
dict|object|字典对象 dict|object|字典对象
 fieldType|object|字典属性对象，详见附录  fieldType|object|字典属性对象，详见附录
 dataType|object|字典属性对象，详见附录  dataType|object|字典属性对象，详见附录
...@@ -11368,6 +11378,8 @@ fieldNull|Integer|否|是否允许为空，(0.否,1.是) ...@@ -11368,6 +11378,8 @@ fieldNull|Integer|否|是否允许为空，(0.否,1.是)
isList|Integer|否|字段是否列表显示(0.否,1.是) isList|Integer|否|字段是否列表显示(0.否,1.是)
fieldOrderNo|String|否|排序号 fieldOrderNo|String|否|排序号
remark|String|否|备注 remark|String|否|备注
fieldTypeValue|String|否|字段类型值，当字段类型为多选，单选时候，预设复选值
defaultValue|String|否|字段默认值
**请求样例:** **请求样例:**
......
base-manager/src/main/java/com/mortals/xhx/busiz/web/MidSignApiController.java
View file @ 77904e20
package com.mortals.xhx.busiz.web; 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.net.url.UrlBuilder;
import cn.hutool.core.util.NumberUtil;
import cn.hutool.core.util.RandomUtil; 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.HttpUtil;
import cn.hutool.http.Method; import cn.hutool.http.Method;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
...@@ -17,40 +11,15 @@ import com.mortals.framework.common.Rest; ...@@ -17,40 +11,15 @@ import com.mortals.framework.common.Rest;
import com.mortals.xhx.busiz.req.MidReq; import com.mortals.xhx.busiz.req.MidReq;
import com.mortals.xhx.busiz.rsp.SignResp; import com.mortals.xhx.busiz.rsp.SignResp;
import com.mortals.xhx.common.utils.EncryptionUtils; 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 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.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.PostMapping;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import java.util.*; import java.util.HashMap;
import java.util.stream.Collectors; import java.util.Map;
/** /**
* 微中台签名接口 * 微中台签名接口
......
base-manager/src/main/java/com/mortals/xhx/module/app/model/AppInfoFieldEntity.java
View file @ 77904e20
...@@ -10,16 +10,12 @@ import com.mortals.xhx.module.app.model.vo.AppInfoFieldVo; ...@@ -10,16 +10,12 @@ import com.mortals.xhx.module.app.model.vo.AppInfoFieldVo;
* 自助终端应用信息字段实体对象 * 自助终端应用信息字段实体对象
* *
* @author zxfei * @author zxfei
* @date 2022-12-02 * @date 2023-03-28
*/ */
public class AppInfoFieldEntity extends AppInfoFieldVo { public class AppInfoFieldEntity extends AppInfoFieldVo {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/**
* 应用数据集id
*/
private Long datasetId;
/** /**
* 字段编码 * 字段编码
*/ */
...@@ -60,24 +56,22 @@ public class AppInfoFieldEntity extends AppInfoFieldVo { ...@@ -60,24 +56,22 @@ public class AppInfoFieldEntity extends AppInfoFieldVo {
* 备注 * 备注
*/ */
private String remark; private String remark;
public AppInfoFieldEntity(){}
/** /**
* 获取 应用数据集id * 应用id
* @return Long
*/ */
public Long getDatasetId(){ private Long appId;
return datasetId;
}
/** /**
* 设置 应用数据集id * 字段类型值，当字段类型为多选，单选时候，预设复选值
* @param datasetId
*/ */
public void setDatasetId(Long datasetId){ private String fieldTypeValue;
this.datasetId = datasetId; /**
} * 字段默认值
*/
private String defaultValue;
public AppInfoFieldEntity(){}
/** /**
* 获取 字段编码 * 获取 字段编码
* @return String * @return String
...@@ -218,6 +212,48 @@ public class AppInfoFieldEntity extends AppInfoFieldVo { ...@@ -218,6 +212,48 @@ public class AppInfoFieldEntity extends AppInfoFieldVo {
public void setRemark(String remark){ public void setRemark(String remark){
this.remark = 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 { ...@@ -240,7 +276,6 @@ public class AppInfoFieldEntity extends AppInfoFieldVo {
public String toString(){ public String toString(){
StringBuilder sb = new StringBuilder(""); StringBuilder sb = new StringBuilder("");
sb.append(",datasetId:").append(getDatasetId());
sb.append(",fieldCode:").append(getFieldCode()); sb.append(",fieldCode:").append(getFieldCode());
sb.append(",fieldName:").append(getFieldName()); sb.append(",fieldName:").append(getFieldName());
sb.append(",fieldType:").append(getFieldType()); sb.append(",fieldType:").append(getFieldType());
...@@ -251,13 +286,14 @@ public class AppInfoFieldEntity extends AppInfoFieldVo { ...@@ -251,13 +286,14 @@ public class AppInfoFieldEntity extends AppInfoFieldVo {
sb.append(",isList:").append(getIsList()); sb.append(",isList:").append(getIsList());
sb.append(",fieldOrderNo:").append(getFieldOrderNo()); sb.append(",fieldOrderNo:").append(getFieldOrderNo());
sb.append(",remark:").append(getRemark()); sb.append(",remark:").append(getRemark());
sb.append(",appId:").append(getAppId());
sb.append(",fieldTypeValue:").append(getFieldTypeValue());
sb.append(",defaultValue:").append(getDefaultValue());
return sb.toString(); return sb.toString();
} }
public void initAttrValue(){ public void initAttrValue(){
this.datasetId = null;
this.fieldCode = ""; this.fieldCode = "";
this.fieldName = ""; this.fieldName = "";
...@@ -277,5 +313,11 @@ public class AppInfoFieldEntity extends AppInfoFieldVo { ...@@ -277,5 +313,11 @@ public class AppInfoFieldEntity extends AppInfoFieldVo {
this.fieldOrderNo = 1; this.fieldOrderNo = 1;
this.remark = ""; this.remark = "";
this.appId = null;
this.fieldTypeValue = "";
this.defaultValue = "";
} }
} }
\ No newline at end of file
base-manager/src/main/java/com/mortals/xhx/module/app/model/AppInfoFieldQuery.java
View file @ 77904e20
...@@ -6,7 +6,7 @@ import com.mortals.xhx.module.app.model.AppInfoFieldEntity; ...@@ -6,7 +6,7 @@ import com.mortals.xhx.module.app.model.AppInfoFieldEntity;
* 自助终端应用信息字段查询对象 * 自助终端应用信息字段查询对象
* *
* @author zxfei * @author zxfei
* @date 2022-12-02 * @date 2023-03-28
*/ */
public class AppInfoFieldQuery extends AppInfoFieldEntity { public class AppInfoFieldQuery extends AppInfoFieldEntity {
/** 开始 序号，主键，自增长 */ /** 开始 序号，主键，自增长 */
...@@ -21,33 +21,34 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity { ...@@ -21,33 +21,34 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity {
/** 序号，主键，自增长列表 */ /** 序号，主键，自增长列表 */
private List <Long> idList; private List <Long> idList;
/** 开始 应用数据集id */ /** 序号，主键，自增长排除列表 */
private Long datasetIdStart; private List <Long> idNotList;
/** 结束 应用数据集id */
private Long datasetIdEnd;
/** 增加 应用数据集id */
private Long datasetIdIncrement;
/** 应用数据集id列表 */
private List <Long> datasetIdList;
/** 字段编码 */ /** 字段编码 */
private List<String> fieldCodeList; private List<String> fieldCodeList;
/** 字段编码排除列表 */
private List <String> fieldCodeNotList;
/** 字段名称 */ /** 字段名称 */
private List<String> fieldNameList; private List<String> fieldNameList;
/** 字段名称排除列表 */
private List <String> fieldNameNotList;
/** 字段类型（input.单行输入框,textarea.多行输入框,SELECT.下拉选项框,date.日期选择框） */ /** 字段类型（input.单行输入框,textarea.多行输入框,SELECT.下拉选项框,date.日期选择框） */
private List<String> fieldTypeList; private List<String> fieldTypeList;
/** 字段类型（input.单行输入框,textarea.多行输入框,SELECT.下拉选项框,date.日期选择框）排除列表 */
private List <String> fieldTypeNotList;
/** 数据类型（number.数字,string.字符串） */ /** 数据类型（number.数字,string.字符串） */
private List<String> dataTypeList; private List<String> dataTypeList;
/** 数据类型（number.数字,string.字符串）排除列表 */
private List <String> dataTypeNotList;
/** 字段值 */ /** 字段值 */
private List<String> fieldValueList; private List<String> fieldValueList;
/** 字段值排除列表 */
private List <String> fieldValueNotList;
/** 开始 数据长度，默认128 */ /** 开始 数据长度，默认128 */
private Integer fieldLenStart; private Integer fieldLenStart;
...@@ -60,6 +61,9 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity { ...@@ -60,6 +61,9 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity {
/** 数据长度，默认128列表 */ /** 数据长度，默认128列表 */
private List <Integer> fieldLenList; private List <Integer> fieldLenList;
/** 数据长度，默认128排除列表 */
private List <Integer> fieldLenNotList;
/** 开始 是否允许为空，(0.否,1.是) */ /** 开始 是否允许为空，(0.否,1.是) */
private Integer fieldNullStart; private Integer fieldNullStart;
...@@ -72,6 +76,9 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity { ...@@ -72,6 +76,9 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity {
/** 是否允许为空，(0.否,1.是)列表 */ /** 是否允许为空，(0.否,1.是)列表 */
private List <Integer> fieldNullList; private List <Integer> fieldNullList;
/** 是否允许为空，(0.否,1.是)排除列表 */
private List <Integer> fieldNullNotList;
/** 开始 字段是否列表显示(0.否,1.是) */ /** 开始 字段是否列表显示(0.否,1.是) */
private Integer isListStart; private Integer isListStart;
...@@ -84,6 +91,9 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity { ...@@ -84,6 +91,9 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity {
/** 字段是否列表显示(0.否,1.是)列表 */ /** 字段是否列表显示(0.否,1.是)列表 */
private List <Integer> isListList; private List <Integer> isListList;
/** 字段是否列表显示(0.否,1.是)排除列表 */
private List <Integer> isListNotList;
/** 开始 排序号 */ /** 开始 排序号 */
private Integer fieldOrderNoStart; private Integer fieldOrderNoStart;
...@@ -96,9 +106,14 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity { ...@@ -96,9 +106,14 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity {
/** 排序号列表 */ /** 排序号列表 */
private List <Integer> fieldOrderNoList; private List <Integer> fieldOrderNoList;
/** 排序号排除列表 */
private List <Integer> fieldOrderNoNotList;
/** 备注 */ /** 备注 */
private List<String> remarkList; private List<String> remarkList;
/** 备注排除列表 */
private List <String> remarkNotList;
/** 开始 创建时间 */ /** 开始 创建时间 */
private String createTimeStart; private String createTimeStart;
...@@ -117,6 +132,9 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity { ...@@ -117,6 +132,9 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity {
/** 创建用户列表 */ /** 创建用户列表 */
private List <Long> createUserIdList; private List <Long> createUserIdList;
/** 创建用户排除列表 */
private List <Long> createUserIdNotList;
/** 开始 修改时间 */ /** 开始 修改时间 */
private String updateTimeStart; private String updateTimeStart;
...@@ -135,6 +153,34 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity { ...@@ -135,6 +153,34 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity {
/** 修改用户列表 */ /** 修改用户列表 */
private List <Long> updateUserIdList; 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条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */ /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
private List<AppInfoFieldQuery> orConditionList; private List<AppInfoFieldQuery> orConditionList;
...@@ -208,99 +254,86 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity { ...@@ -208,99 +254,86 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity {
} }
/** /**
* 获取 开始 应用数据集id * 获取 序号，主键，自增长
* @return datasetIdStart * @return idNotList
*/ */
public Long getDatasetIdStart(){ public List<Long> getIdNotList(){
return this.datasetIdStart; return this.idNotList;
} }
/** /**
* 设置 开始 应用数据集id * 设置 序号，主键，自增长
* @param datasetIdStart * @param idNotList
*/ */
public void setDatasetIdStart(Long datasetIdStart){ public void setIdNotList(List<Long> idNotList){
this.datasetIdStart = datasetIdStart; this.idNotList = idNotList;
} }
/**
* 获取 结束 应用数据集id
* @return $datasetIdEnd
*/
public Long getDatasetIdEnd(){
return this.datasetIdEnd;
}
/** /**
* 设置 结束 应用数据集id * 获取 字段编码
* @param datasetIdEnd * @return fieldCodeList
*/ */
public void setDatasetIdEnd(Long datasetIdEnd){ public List<String> getFieldCodeList(){
this.datasetIdEnd = datasetIdEnd; return this.fieldCodeList;
} }
/** /**
* 获取 增加 应用数据集id * 设置 字段编码
* @return datasetIdIncrement * @param fieldCodeList
*/ */
public Long getDatasetIdIncrement(){ public void setFieldCodeList(List<String> fieldCodeList){
return this.datasetIdIncrement; this.fieldCodeList = fieldCodeList;
} }
/** /**
* 设置 增加 应用数据集id * 获取 字段编码
* @param datasetIdIncrement * @return fieldCodeNotList
*/ */
public void setDatasetIdIncrement(Long datasetIdIncrement){ public List<String> getFieldCodeNotList(){
this.datasetIdIncrement = datasetIdIncrement; return this.fieldCodeNotList;
} }
/** /**
* 获取 应用数据集id * 设置 字段编码
* @return datasetIdList * @param fieldCodeNotList
*/ */
public List<Long> getDatasetIdList(){ public void setFieldCodeNotList(List<String> fieldCodeNotList){
return this.datasetIdList; this.fieldCodeNotList = fieldCodeNotList;
} }
/** /**
* 设置 应用数据集id * 获取 字段名称
* @param datasetIdList * @return fieldNameList
*/ */
public void setDatasetIdList(List<Long> datasetIdList){ public List<String> getFieldNameList(){
this.datasetIdList = datasetIdList; return this.fieldNameList;
} }
/** /**
* 获取 字段编码 * 设置 字段名称
* @return fieldCodeList * @param fieldNameList
*/ */
public List<String> getFieldCodeList(){ public void setFieldNameList(List<String> fieldNameList){
return this.fieldCodeList; this.fieldNameList = fieldNameList;
} }
/**
* 设置 字段编码
* @param fieldCodeList
*/
public void setFieldCodeList(List<String> fieldCodeList){
this.fieldCodeList = fieldCodeList;
}
/** /**
* 获取 字段名称 * 获取 字段名称
* @return fieldNameList * @return fieldNameNotList
*/ */
public List<String> getFieldNameList(){ public List<String> getFieldNameNotList(){
return this.fieldNameList; return this.fieldNameNotList;
} }
/** /**
* 设置 字段名称 * 设置 字段名称
* @param fieldNameList * @param fieldNameNotList
*/ */
public void setFieldNameList(List<String> fieldNameList){ public void setFieldNameNotList(List<String> fieldNameNotList){
this.fieldNameList = fieldNameList; this.fieldNameNotList = fieldNameNotList;
} }
/** /**
* 获取 字段类型（input.单行输入框,textarea.多行输入框,SELECT.下拉选项框,date.日期选择框） * 获取 字段类型（input.单行输入框,textarea.多行输入框,SELECT.下拉选项框,date.日期选择框）
* @return fieldTypeList * @return fieldTypeList
...@@ -316,6 +349,23 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity { ...@@ -316,6 +349,23 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity {
public void setFieldTypeList(List<String> fieldTypeList){ public void setFieldTypeList(List<String> fieldTypeList){
this.fieldTypeList = fieldTypeList; this.fieldTypeList = fieldTypeList;
} }
/**
* 获取 字段类型（input.单行输入框,textarea.多行输入框,SELECT.下拉选项框,date.日期选择框）
* @return fieldTypeNotList
*/
public List<String> getFieldTypeNotList(){
return this.fieldTypeNotList;
}
/**
* 设置 字段类型（input.单行输入框,textarea.多行输入框,SELECT.下拉选项框,date.日期选择框）
* @param fieldTypeNotList
*/
public void setFieldTypeNotList(List<String> fieldTypeNotList){
this.fieldTypeNotList = fieldTypeNotList;
}
/** /**
* 获取 数据类型（number.数字,string.字符串） * 获取 数据类型（number.数字,string.字符串）
* @return dataTypeList * @return dataTypeList
...@@ -331,6 +381,23 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity { ...@@ -331,6 +381,23 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity {
public void setDataTypeList(List<String> dataTypeList){ public void setDataTypeList(List<String> dataTypeList){
this.dataTypeList = dataTypeList; this.dataTypeList = dataTypeList;
} }
/**
* 获取 数据类型（number.数字,string.字符串）
* @return dataTypeNotList
*/
public List<String> getDataTypeNotList(){
return this.dataTypeNotList;
}
/**
* 设置 数据类型（number.数字,string.字符串）
* @param dataTypeNotList
*/
public void setDataTypeNotList(List<String> dataTypeNotList){
this.dataTypeNotList = dataTypeNotList;
}
/** /**
* 获取 字段值 * 获取 字段值
* @return fieldValueList * @return fieldValueList
...@@ -346,6 +413,23 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity { ...@@ -346,6 +413,23 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity {
public void setFieldValueList(List<String> fieldValueList){ public void setFieldValueList(List<String> fieldValueList){
this.fieldValueList = 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 * 获取 开始 数据长度，默认128
* @return fieldLenStart * @return fieldLenStart
...@@ -410,6 +494,23 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity { ...@@ -410,6 +494,23 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity {
this.fieldLenList = fieldLenList; 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.是) * 获取 开始 是否允许为空，(0.否,1.是)
* @return fieldNullStart * @return fieldNullStart
...@@ -474,6 +575,23 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity { ...@@ -474,6 +575,23 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity {
this.fieldNullList = fieldNullList; 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.是) * 获取 开始 字段是否列表显示(0.否,1.是)
* @return isListStart * @return isListStart
...@@ -538,6 +656,23 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity { ...@@ -538,6 +656,23 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity {
this.isListList = isListList; 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 * @return fieldOrderNoStart
...@@ -602,6 +737,23 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity { ...@@ -602,6 +737,23 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity {
this.fieldOrderNoList = fieldOrderNoList; 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 * @return remarkList
...@@ -617,6 +769,23 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity { ...@@ -617,6 +769,23 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity {
public void setRemarkList(List<String> remarkList){ public void setRemarkList(List<String> remarkList){
this.remarkList = 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 * @return createTimeStart
...@@ -713,6 +882,23 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity { ...@@ -713,6 +882,23 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity {
this.createUserIdList = createUserIdList; 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 * @return updateTimeStart
...@@ -809,6 +995,168 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity { ...@@ -809,6 +995,168 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity {
this.updateUserIdList = updateUserIdList; 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 * @param id
...@@ -855,47 +1203,11 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity { ...@@ -855,47 +1203,11 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity {
} }
/** /**
* 设置 应用数据集id * 设置 序号，主键，自增长
* @param datasetId * @param idNotList
*/
public AppInfoFieldQuery datasetId(Long datasetId){
setDatasetId(datasetId);
return this;
}
/**
* 设置 开始 应用数据集id
* @param datasetIdStart
*/
public AppInfoFieldQuery datasetIdStart(Long datasetIdStart){
this.datasetIdStart = datasetIdStart;
return this;
}
/**
* 设置 结束 应用数据集id
* @param datasetIdEnd
*/
public AppInfoFieldQuery datasetIdEnd(Long datasetIdEnd){
this.datasetIdEnd = datasetIdEnd;
return this;
}
/**
* 设置 增加 应用数据集id
* @param datasetIdIncrement
*/
public AppInfoFieldQuery datasetIdIncrement(Long datasetIdIncrement){
this.datasetIdIncrement = datasetIdIncrement;
return this;
}
/**
* 设置 应用数据集id
* @param datasetIdList
*/ */
public AppInfoFieldQuery datasetIdList(List<Long> datasetIdList){ public AppInfoFieldQuery idNotList(List<Long> idNotList){
this.datasetIdList = datasetIdList; this.idNotList = idNotList;
return this; return this;
} }
...@@ -1039,6 +1351,15 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity { ...@@ -1039,6 +1351,15 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity {
return this; return this;
} }
/**
* 设置 数据长度，默认128
* @param fieldLenNotList
*/
public AppInfoFieldQuery fieldLenNotList(List<Integer> fieldLenNotList){
this.fieldLenNotList = fieldLenNotList;
return this;
}
/** /**
* 设置 是否允许为空，(0.否,1.是) * 设置 是否允许为空，(0.否,1.是)
* @param fieldNull * @param fieldNull
...@@ -1084,6 +1405,15 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity { ...@@ -1084,6 +1405,15 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity {
return this; return this;
} }
/**
* 设置 是否允许为空，(0.否,1.是)
* @param fieldNullNotList
*/
public AppInfoFieldQuery fieldNullNotList(List<Integer> fieldNullNotList){
this.fieldNullNotList = fieldNullNotList;
return this;
}
/** /**
* 设置 字段是否列表显示(0.否,1.是) * 设置 字段是否列表显示(0.否,1.是)
* @param isList * @param isList
...@@ -1129,6 +1459,15 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity { ...@@ -1129,6 +1459,15 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity {
return this; return this;
} }
/**
* 设置 字段是否列表显示(0.否,1.是)
* @param isListNotList
*/
public AppInfoFieldQuery isListNotList(List<Integer> isListNotList){
this.isListNotList = isListNotList;
return this;
}
/** /**
* 设置 排序号 * 设置 排序号
* @param fieldOrderNo * @param fieldOrderNo
...@@ -1174,6 +1513,15 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity { ...@@ -1174,6 +1513,15 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity {
return this; return this;
} }
/**
* 设置 排序号
* @param fieldOrderNoNotList
*/
public AppInfoFieldQuery fieldOrderNoNotList(List<Integer> fieldOrderNoNotList){
this.fieldOrderNoNotList = fieldOrderNoNotList;
return this;
}
/** /**
* 设置 备注 * 设置 备注
...@@ -1239,6 +1587,15 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity { ...@@ -1239,6 +1587,15 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity {
return this; return this;
} }
/**
* 设置 创建用户
* @param createUserIdNotList
*/
public AppInfoFieldQuery createUserIdNotList(List<Long> createUserIdNotList){
this.createUserIdNotList = createUserIdNotList;
return this;
}
/** /**
* 设置 修改用户 * 设置 修改用户
...@@ -1285,6 +1642,107 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity { ...@@ -1285,6 +1642,107 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity {
return this; 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条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
* @return orConditionList * @return orConditionList
......
base-manager/src/main/java/com/mortals/xhx/module/app/model/AppInfoTempleteFieldEntity.java
View file @ 77904e20
...@@ -10,7 +10,7 @@ import com.mortals.xhx.module.app.model.vo.AppInfoTempleteFieldVo; ...@@ -10,7 +10,7 @@ import com.mortals.xhx.module.app.model.vo.AppInfoTempleteFieldVo;
* 自助终端应用模板信息字段实体对象 * 自助终端应用模板信息字段实体对象
* *
* @author zxfei * @author zxfei
* @date 2022-12-02 * @date 2023-03-28
*/ */
public class AppInfoTempleteFieldEntity extends AppInfoTempleteFieldVo { public class AppInfoTempleteFieldEntity extends AppInfoTempleteFieldVo {
...@@ -60,6 +60,14 @@ public class AppInfoTempleteFieldEntity extends AppInfoTempleteFieldVo { ...@@ -60,6 +60,14 @@ public class AppInfoTempleteFieldEntity extends AppInfoTempleteFieldVo {
* 备注 * 备注
*/ */
private String remark; private String remark;
/**
* 字段类型值，当字段类型为多选，单选时候，预设复选值
*/
private String fieldTypeValue;
/**
* 字段默认值
*/
private String defaultValue;
...@@ -218,6 +226,34 @@ public class AppInfoTempleteFieldEntity extends AppInfoTempleteFieldVo { ...@@ -218,6 +226,34 @@ public class AppInfoTempleteFieldEntity extends AppInfoTempleteFieldVo {
public void setRemark(String remark){ public void setRemark(String remark){
this.remark = 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 { ...@@ -251,6 +287,8 @@ public class AppInfoTempleteFieldEntity extends AppInfoTempleteFieldVo {
sb.append(",isList:").append(getIsList()); sb.append(",isList:").append(getIsList());
sb.append(",fieldOrderNo:").append(getFieldOrderNo()); sb.append(",fieldOrderNo:").append(getFieldOrderNo());
sb.append(",remark:").append(getRemark()); sb.append(",remark:").append(getRemark());
sb.append(",fieldTypeValue:").append(getFieldTypeValue());
sb.append(",defaultValue:").append(getDefaultValue());
return sb.toString(); return sb.toString();
} }
...@@ -277,5 +315,9 @@ public class AppInfoTempleteFieldEntity extends AppInfoTempleteFieldVo { ...@@ -277,5 +315,9 @@ public class AppInfoTempleteFieldEntity extends AppInfoTempleteFieldVo {
this.fieldOrderNo = 1; this.fieldOrderNo = 1;
this.remark = ""; this.remark = "";
this.fieldTypeValue = "";
this.defaultValue = "";
} }
} }
\ No newline at end of file
base-manager/src/main/java/com/mortals/xhx/module/app/model/AppInfoTempleteFieldQuery.java
View file @ 77904e20
...@@ -6,7 +6,7 @@ import com.mortals.xhx.module.app.model.AppInfoTempleteFieldEntity; ...@@ -6,7 +6,7 @@ import com.mortals.xhx.module.app.model.AppInfoTempleteFieldEntity;
* 自助终端应用模板信息字段查询对象 * 自助终端应用模板信息字段查询对象
* *
* @author zxfei * @author zxfei
* @date 2022-12-02 * @date 2023-03-28
*/ */
public class AppInfoTempleteFieldQuery extends AppInfoTempleteFieldEntity { public class AppInfoTempleteFieldQuery extends AppInfoTempleteFieldEntity {
/** 开始 序号，主键，自增长 */ /** 开始 序号，主键，自增长 */
...@@ -21,6 +21,9 @@ public class AppInfoTempleteFieldQuery extends AppInfoTempleteFieldEntity { ...@@ -21,6 +21,9 @@ public class AppInfoTempleteFieldQuery extends AppInfoTempleteFieldEntity {
/** 序号，主键，自增长列表 */ /** 序号，主键，自增长列表 */
private List <Long> idList; private List <Long> idList;
/** 序号，主键，自增长排除列表 */
private List <Long> idNotList;
/** 开始 应用id */ /** 开始 应用id */
private Long appIdStart; private Long appIdStart;
...@@ -33,21 +36,34 @@ public class AppInfoTempleteFieldQuery extends AppInfoTempleteFieldEntity { ...@@ -33,21 +36,34 @@ public class AppInfoTempleteFieldQuery extends AppInfoTempleteFieldEntity {
/** 应用id列表 */ /** 应用id列表 */
private List <Long> appIdList; private List <Long> appIdList;
/** 应用id排除列表 */
private List <Long> appIdNotList;
/** 字段编码 */ /** 字段编码 */
private List<String> fieldCodeList; private List<String> fieldCodeList;
/** 字段编码排除列表 */
private List <String> fieldCodeNotList;
/** 字段名称 */ /** 字段名称 */
private List<String> fieldNameList; private List<String> fieldNameList;
/** 字段名称排除列表 */
private List <String> fieldNameNotList;
/** 字段类型（input.单行输入框,textarea.多行输入框,SELECT.下拉选项框,date.日期选择框,editer.富文本） */ /** 字段类型（input.单行输入框,textarea.多行输入框,SELECT.下拉选项框,date.日期选择框,editer.富文本） */
private List<String> fieldTypeList; private List<String> fieldTypeList;
/** 字段类型（input.单行输入框,textarea.多行输入框,SELECT.下拉选项框,date.日期选择框,editer.富文本）排除列表 */
private List <String> fieldTypeNotList;
/** 数据类型（number.数字,string.字符串） */ /** 数据类型（number.数字,string.字符串） */
private List<String> dataTypeList; private List<String> dataTypeList;
/** 数据类型（number.数字,string.字符串）排除列表 */
private List <String> dataTypeNotList;
/** 字段值 */ /** 字段值 */
private List<String> fieldValueList; private List<String> fieldValueList;
/** 字段值排除列表 */
private List <String> fieldValueNotList;
/** 开始 数据长度，默认128 */ /** 开始 数据长度，默认128 */
private Integer fieldLenStart; private Integer fieldLenStart;
...@@ -60,6 +76,9 @@ public class AppInfoTempleteFieldQuery extends AppInfoTempleteFieldEntity { ...@@ -60,6 +76,9 @@ public class AppInfoTempleteFieldQuery extends AppInfoTempleteFieldEntity {
/** 数据长度，默认128列表 */ /** 数据长度，默认128列表 */
private List <Integer> fieldLenList; private List <Integer> fieldLenList;
/** 数据长度，默认128排除列表 */
private List <Integer> fieldLenNotList;
/** 开始 是否允许为空，(0.否,1.是) */ /** 开始 是否允许为空，(0.否,1.是) */
private Integer fieldNullStart; private Integer fieldNullStart;
...@@ -72,6 +91,9 @@ public class AppInfoTempleteFieldQuery extends AppInfoTempleteFieldEntity { ...@@ -72,6 +91,9 @@ public class AppInfoTempleteFieldQuery extends AppInfoTempleteFieldEntity {
/** 是否允许为空，(0.否,1.是)列表 */ /** 是否允许为空，(0.否,1.是)列表 */
private List <Integer> fieldNullList; private List <Integer> fieldNullList;
/** 是否允许为空，(0.否,1.是)排除列表 */
private List <Integer> fieldNullNotList;
/** 开始 字段是否列表显示(0.否,1.是) */ /** 开始 字段是否列表显示(0.否,1.是) */
private Integer isListStart; private Integer isListStart;
...@@ -84,6 +106,9 @@ public class AppInfoTempleteFieldQuery extends AppInfoTempleteFieldEntity { ...@@ -84,6 +106,9 @@ public class AppInfoTempleteFieldQuery extends AppInfoTempleteFieldEntity {
/** 字段是否列表显示(0.否,1.是)列表 */ /** 字段是否列表显示(0.否,1.是)列表 */
private List <Integer> isListList; private List <Integer> isListList;
/** 字段是否列表显示(0.否,1.是)排除列表 */
private List <Integer> isListNotList;
/** 开始 排序号 */ /** 开始 排序号 */
private Integer fieldOrderNoStart; private Integer fieldOrderNoStart;
...@@ -96,9 +121,14 @@ public class AppInfoTempleteFieldQuery extends AppInfoTempleteFieldEntity { ...@@ -96,9 +121,14 @@ public class AppInfoTempleteFieldQuery extends AppInfoTempleteFieldEntity {
/** 排序号列表 */ /** 排序号列表 */
private List <Integer> fieldOrderNoList; private List <Integer> fieldOrderNoList;
/** 排序号排除列表 */
private List <Integer> fieldOrderNoNotList;
/** 备注 */ /** 备注 */
private List<String> remarkList; private List<String> remarkList;
/** 备注排除列表 */
private List <String> remarkNotList;
/** 开始 创建时间 */ /** 开始 创建时间 */
private String createTimeStart; private String createTimeStart;
...@@ -117,6 +147,9 @@ public class AppInfoTempleteFieldQuery extends AppInfoTempleteFieldEntity { ...@@ -117,6 +147,9 @@ public class AppInfoTempleteFieldQuery extends AppInfoTempleteFieldEntity {
/** 创建用户列表 */ /** 创建用户列表 */
private List <Long> createUserIdList; private List <Long> createUserIdList;
/** 创建用户排除列表 */
private List <Long> createUserIdNotList;
/** 开始 修改时间 */ /** 开始 修改时间 */
private String updateTimeStart; private String updateTimeStart;
...@@ -135,6 +168,19 @@ public class AppInfoTempleteFieldQuery extends AppInfoTempleteFieldEntity { ...@@ -135,6 +168,19 @@ public class AppInfoTempleteFieldQuery extends AppInfoTempleteFieldEntity {
/** 修改用户列表 */ /** 修改用户列表 */
private List <Long> updateUserIdList; private List <Long> updateUserIdList;
/** 修改用户排除列表 */
private List <Long> updateUserIdNotList;
/** 字段类型值，当字段类型为多选，单选时候，预设复选值 */
private List<String> fieldTypeValueList;
/** 字段类型值，当字段类型为多选，单选时候，预设复选值排除列表 */
private List <String> fieldTypeValueNotList;
/** 字段默认值 */
private List<String> defaultValueList;
/** 字段默认值排除列表 */
private List <String> defaultValueNotList;
/** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */ /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
private List<AppInfoTempleteFieldQuery> orConditionList; private List<AppInfoTempleteFieldQuery> orConditionList;
...@@ -207,6 +253,23 @@ public class AppInfoTempleteFieldQuery extends AppInfoTempleteFieldEntity { ...@@ -207,6 +253,23 @@ public class AppInfoTempleteFieldQuery extends AppInfoTempleteFieldEntity {
this.idList = idList; this.idList = idList;
} }
/**
* 获取 序号，主键，自增长
* @return idNotList
*/
public List<Long> getIdNotList(){
return this.idNotList;
}
/**
* 设置 序号，主键，自增长
* @param idNotList
*/
public void setIdNotList(List<Long> idNotList){
this.idNotList = idNotList;
}
/** /**
* 获取 开始 应用id * 获取 开始 应用id
* @return appIdStart * @return appIdStart
...@@ -271,6 +334,23 @@ public class AppInfoTempleteFieldQuery extends AppInfoTempleteFieldEntity { ...@@ -271,6 +334,23 @@ public class AppInfoTempleteFieldQuery extends AppInfoTempleteFieldEntity {
this.appIdList = 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 fieldCodeList * @return fieldCodeList
...@@ -286,6 +366,23 @@ public class AppInfoTempleteFieldQuery extends AppInfoTempleteFieldEntity { ...@@ -286,6 +366,23 @@ public class AppInfoTempleteFieldQuery extends AppInfoTempleteFieldEntity {
public void setFieldCodeList(List<String> fieldCodeList){ public void setFieldCodeList(List<String> fieldCodeList){
this.fieldCodeList = 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 * @return fieldNameList
...@@ -301,6 +398,23 @@ public class AppInfoTempleteFieldQuery extends AppInfoTempleteFieldEntity { ...@@ -301,6 +398,23 @@ public class AppInfoTempleteFieldQuery extends AppInfoTempleteFieldEntity {
public void setFieldNameList(List<String> fieldNameList){ public void setFieldNameList(List<String> fieldNameList){
this.fieldNameList = fieldNameList; this.fieldNameList = fieldNameList;
} }
/**
* 获取 字段名称
* @return fieldNameNotList
*/
public List<String> getFieldNameNotList(){
return this.fieldNameNotList;
}
/**
* 设置 字段名称
* @param fieldNameNotList
*/
public void setFieldNameNotList(List<String> fieldNameNotList){
this.fieldNameNotList = fieldNameNotList;
}
/** /**
* 获取 字段类型（input.单行输入框,textarea.多行输入框,SELECT.下拉选项框,date.日期选择框,editer.富文本） * 获取 字段类型（input.单行输入框,textarea.多行输入框,SELECT.下拉选项框,date.日期选择框,editer.富文本）
* @return fieldTypeList * @return fieldTypeList
...@@ -316,6 +430,23 @@ public class AppInfoTempleteFieldQuery extends AppInfoTempleteFieldEntity { ...@@ -316,6 +430,23 @@ public class AppInfoTempleteFieldQuery extends AppInfoTempleteFieldEntity {
public void setFieldTypeList(List<String> fieldTypeList){ public void setFieldTypeList(List<String> fieldTypeList){
this.fieldTypeList = fieldTypeList; this.fieldTypeList = fieldTypeList;
} }
/**
* 获取 字段类型（input.单行输入框,textarea.多行输入框,SELECT.下拉选项框,date.日期选择框,editer.富文本）
* @return fieldTypeNotList
*/
public List<String> getFieldTypeNotList(){
return this.fieldTypeNotList;
}
/**
* 设置 字段类型（input.单行输入框,textarea.多行输入框,SELECT.下拉选项框,date.日期选择框,editer.富文本）
* @param fieldTypeNotList
*/
public void setFieldTypeNotList(List<String> fieldTypeNotList){
this.fieldTypeNotList = fieldTypeNotList;
}
/** /**
* 获取 数据类型（number.数字,string.字符串） * 获取 数据类型（number.数字,string.字符串）
* @return dataTypeList * @return dataTypeList
...@@ -331,6 +462,23 @@ public class AppInfoTempleteFieldQuery extends AppInfoTempleteFieldEntity { ...@@ -331,6 +462,23 @@ public class AppInfoTempleteFieldQuery extends AppInfoTempleteFieldEntity {
public void setDataTypeList(List<String> dataTypeList){ public void setDataTypeList(List<String> dataTypeList){
this.dataTypeList = dataTypeList; this.dataTypeList = dataTypeList;
} }
/**
* 获取 数据类型（number.数字,string.字符串）
* @return dataTypeNotList
*/
public List<String> getDataTypeNotList(){
return this.dataTypeNotList;
}
/**
* 设置 数据类型（number.数字,string.字符串）
* @param dataTypeNotList
*/
public void setDataTypeNotList(List<String> dataTypeNotList){
this.dataTypeNotList = dataTypeNotList;
}
/** /**
* 获取 字段值 * 获取 字段值
* @return fieldValueList * @return fieldValueList
...@@ -346,6 +494,23 @@ public class AppInfoTempleteFieldQuery extends AppInfoTempleteFieldEntity { ...@@ -346,6 +494,23 @@ public class AppInfoTempleteFieldQuery extends AppInfoTempleteFieldEntity {
public void setFieldValueList(List<String> fieldValueList){ public void setFieldValueList(List<String> fieldValueList){
this.fieldValueList = 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 * 获取 开始 数据长度，默认128
* @return fieldLenStart * @return fieldLenStart
...@@ -410,6 +575,23 @@ public class AppInfoTempleteFieldQuery extends AppInfoTempleteFieldEntity { ...@@ -410,6 +575,23 @@ public class AppInfoTempleteFieldQuery extends AppInfoTempleteFieldEntity {
this.fieldLenList = fieldLenList; 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.是) * 获取 开始 是否允许为空，(0.否,1.是)
* @return fieldNullStart * @return fieldNullStart
...@@ -474,6 +656,23 @@ public class AppInfoTempleteFieldQuery extends AppInfoTempleteFieldEntity { ...@@ -474,6 +656,23 @@ public class AppInfoTempleteFieldQuery extends AppInfoTempleteFieldEntity {
this.fieldNullList = fieldNullList; 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.是) * 获取 开始 字段是否列表显示(0.否,1.是)
* @return isListStart * @return isListStart
...@@ -538,6 +737,23 @@ public class AppInfoTempleteFieldQuery extends AppInfoTempleteFieldEntity { ...@@ -538,6 +737,23 @@ public class AppInfoTempleteFieldQuery extends AppInfoTempleteFieldEntity {
this.isListList = isListList; 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 * @return fieldOrderNoStart
...@@ -602,6 +818,23 @@ public class AppInfoTempleteFieldQuery extends AppInfoTempleteFieldEntity { ...@@ -602,6 +818,23 @@ public class AppInfoTempleteFieldQuery extends AppInfoTempleteFieldEntity {
this.fieldOrderNoList = fieldOrderNoList; 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 * @return remarkList
...@@ -617,6 +850,23 @@ public class AppInfoTempleteFieldQuery extends AppInfoTempleteFieldEntity { ...@@ -617,6 +850,23 @@ public class AppInfoTempleteFieldQuery extends AppInfoTempleteFieldEntity {
public void setRemarkList(List<String> remarkList){ public void setRemarkList(List<String> remarkList){
this.remarkList = 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 * @return createTimeStart
...@@ -713,6 +963,23 @@ public class AppInfoTempleteFieldQuery extends AppInfoTempleteFieldEntity { ...@@ -713,6 +963,23 @@ public class AppInfoTempleteFieldQuery extends AppInfoTempleteFieldEntity {
this.createUserIdList = createUserIdList; 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 * @return updateTimeStart
...@@ -809,6 +1076,87 @@ public class AppInfoTempleteFieldQuery extends AppInfoTempleteFieldEntity { ...@@ -809,6 +1076,87 @@ public class AppInfoTempleteFieldQuery extends AppInfoTempleteFieldEntity {
this.updateUserIdList = updateUserIdList; 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 * @param id
...@@ -854,6 +1202,15 @@ public class AppInfoTempleteFieldQuery extends AppInfoTempleteFieldEntity { ...@@ -854,6 +1202,15 @@ public class AppInfoTempleteFieldQuery extends AppInfoTempleteFieldEntity {
return this; return this;
} }
/**
* 设置 序号，主键，自增长
* @param idNotList
*/
public AppInfoTempleteFieldQuery idNotList(List<Long> idNotList){
this.idNotList = idNotList;
return this;
}
/** /**
* 设置 应用id * 设置 应用id
* @param appId * @param appId
...@@ -899,6 +1256,15 @@ public class AppInfoTempleteFieldQuery extends AppInfoTempleteFieldEntity { ...@@ -899,6 +1256,15 @@ public class AppInfoTempleteFieldQuery extends AppInfoTempleteFieldEntity {
return this; 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 { ...@@ -1039,6 +1405,15 @@ public class AppInfoTempleteFieldQuery extends AppInfoTempleteFieldEntity {
return this; return this;
} }
/**
* 设置 数据长度，默认128
* @param fieldLenNotList
*/
public AppInfoTempleteFieldQuery fieldLenNotList(List<Integer> fieldLenNotList){
this.fieldLenNotList = fieldLenNotList;
return this;
}
/** /**
* 设置 是否允许为空，(0.否,1.是) * 设置 是否允许为空，(0.否,1.是)
* @param fieldNull * @param fieldNull
...@@ -1084,6 +1459,15 @@ public class AppInfoTempleteFieldQuery extends AppInfoTempleteFieldEntity { ...@@ -1084,6 +1459,15 @@ public class AppInfoTempleteFieldQuery extends AppInfoTempleteFieldEntity {
return this; return this;
} }
/**
* 设置 是否允许为空，(0.否,1.是)
* @param fieldNullNotList
*/
public AppInfoTempleteFieldQuery fieldNullNotList(List<Integer> fieldNullNotList){
this.fieldNullNotList = fieldNullNotList;
return this;
}
/** /**
* 设置 字段是否列表显示(0.否,1.是) * 设置 字段是否列表显示(0.否,1.是)
* @param isList * @param isList
...@@ -1129,6 +1513,15 @@ public class AppInfoTempleteFieldQuery extends AppInfoTempleteFieldEntity { ...@@ -1129,6 +1513,15 @@ public class AppInfoTempleteFieldQuery extends AppInfoTempleteFieldEntity {
return this; return this;
} }
/**
* 设置 字段是否列表显示(0.否,1.是)
* @param isListNotList
*/
public AppInfoTempleteFieldQuery isListNotList(List<Integer> isListNotList){
this.isListNotList = isListNotList;
return this;
}
/** /**
* 设置 排序号 * 设置 排序号
* @param fieldOrderNo * @param fieldOrderNo
...@@ -1174,6 +1567,15 @@ public class AppInfoTempleteFieldQuery extends AppInfoTempleteFieldEntity { ...@@ -1174,6 +1567,15 @@ public class AppInfoTempleteFieldQuery extends AppInfoTempleteFieldEntity {
return this; return this;
} }
/**
* 设置 排序号
* @param fieldOrderNoNotList
*/
public AppInfoTempleteFieldQuery fieldOrderNoNotList(List<Integer> fieldOrderNoNotList){
this.fieldOrderNoNotList = fieldOrderNoNotList;
return this;
}
/** /**
* 设置 备注 * 设置 备注
...@@ -1239,6 +1641,15 @@ public class AppInfoTempleteFieldQuery extends AppInfoTempleteFieldEntity { ...@@ -1239,6 +1641,15 @@ public class AppInfoTempleteFieldQuery extends AppInfoTempleteFieldEntity {
return this; return this;
} }
/**
* 设置 创建用户
* @param createUserIdNotList
*/
public AppInfoTempleteFieldQuery createUserIdNotList(List<Long> createUserIdNotList){
this.createUserIdNotList = createUserIdNotList;
return this;
}
/** /**
* 设置 修改用户 * 设置 修改用户
...@@ -1285,6 +1696,53 @@ public class AppInfoTempleteFieldQuery extends AppInfoTempleteFieldEntity { ...@@ -1285,6 +1696,53 @@ public class AppInfoTempleteFieldQuery extends AppInfoTempleteFieldEntity {
return this; return this;
} }
/**
* 设置 修改用户
* @param updateUserIdNotList
*/
public AppInfoTempleteFieldQuery updateUserIdNotList(List<Long> updateUserIdNotList){
this.updateUserIdNotList = updateUserIdNotList;
return this;
}
/**
* 设置 字段类型值，当字段类型为多选，单选时候，预设复选值
* @param fieldTypeValue
*/
public AppInfoTempleteFieldQuery fieldTypeValue(String fieldTypeValue){
setFieldTypeValue(fieldTypeValue);
return this;
}
/**
* 设置 字段类型值，当字段类型为多选，单选时候，预设复选值
* @param fieldTypeValueList
*/
public AppInfoTempleteFieldQuery fieldTypeValueList(List<String> fieldTypeValueList){
this.fieldTypeValueList = fieldTypeValueList;
return this;
}
/**
* 设置 字段默认值
* @param defaultValue
*/
public AppInfoTempleteFieldQuery defaultValue(String defaultValue){
setDefaultValue(defaultValue);
return this;
}
/**
* 设置 字段默认值
* @param defaultValueList
*/
public AppInfoTempleteFieldQuery defaultValueList(List<String> defaultValueList){
this.defaultValueList = defaultValueList;
return this;
}
/** /**
* 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
* @return orConditionList * @return orConditionList
......
base-manager/src/main/resources/sqlmap/module/app/AppInfoFieldMapper.xml
View file @ 77904e20
...@@ -6,7 +6,6 @@ ...@@ -6,7 +6,6 @@
<!-- 字段和属性映射 --> <!-- 字段和属性映射 -->
<resultMap type="AppInfoFieldEntity" id="AppInfoFieldEntity-Map"> <resultMap type="AppInfoFieldEntity" id="AppInfoFieldEntity-Map">
<id property="id" column="id" /> <id property="id" column="id" />
<result property="datasetId" column="datasetId" />
<result property="fieldCode" column="fieldCode" /> <result property="fieldCode" column="fieldCode" />
<result property="fieldName" column="fieldName" /> <result property="fieldName" column="fieldName" />
<result property="fieldType" column="fieldType" /> <result property="fieldType" column="fieldType" />
...@@ -21,6 +20,9 @@ ...@@ -21,6 +20,9 @@
<result property="createUserId" column="createUserId" /> <result property="createUserId" column="createUserId" />
<result property="updateTime" column="updateTime" /> <result property="updateTime" column="updateTime" />
<result property="updateUserId" column="updateUserId" /> <result property="updateUserId" column="updateUserId" />
<result property="appId" column="appId" />
<result property="fieldTypeValue" column="fieldTypeValue" />
<result property="defaultValue" column="defaultValue" />
</resultMap> </resultMap>
...@@ -31,9 +33,6 @@ ...@@ -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')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('id') or colPickMode == 1 and data.containsKey('id')))">
a.id, a.id,
</if> </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')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('fieldCode') or colPickMode == 1 and data.containsKey('fieldCode')))">
a.fieldCode, a.fieldCode,
</if> </if>
...@@ -76,23 +75,32 @@ ...@@ -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')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateUserId') or colPickMode == 1 and data.containsKey('updateUserId')))">
a.updateUserId, a.updateUserId,
</if> </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> </trim>
</sql> </sql>
<!-- 新增 区分主键自增加还是业务插入 --> <!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="AppInfoFieldEntity" useGeneratedKeys="true" keyProperty="id"> <insert id="insert" parameterType="AppInfoFieldEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_sys_app_info_field 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 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>
<!-- 批量新增 --> <!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto"> <insert id="insertBatch" parameterType="paramDto">
insert into mortals_sys_app_info_field 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 VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," > <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> </foreach>
</insert> </insert>
...@@ -102,12 +110,6 @@ ...@@ -102,12 +110,6 @@
update mortals_sys_app_info_field as a update mortals_sys_app_info_field as a
set set
<trim suffixOverrides="," suffix=""> <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'))"> <if test="(colPickMode==0 and data.containsKey('fieldCode')) or (colPickMode==1 and !data.containsKey('fieldCode'))">
a.fieldCode=#{data.fieldCode}, a.fieldCode=#{data.fieldCode},
</if> </if>
...@@ -168,6 +170,18 @@ ...@@ -168,6 +170,18 @@
<if test="(colPickMode==0 and data.containsKey('updateUserIdIncrement')) or (colPickMode==1 and !data.containsKey('updateUserIdIncrement'))"> <if test="(colPickMode==0 and data.containsKey('updateUserIdIncrement')) or (colPickMode==1 and !data.containsKey('updateUserIdIncrement'))">
a.updateUserId=ifnull(a.updateUserId,0) + #{data.updateUserIdIncrement}, a.updateUserId=ifnull(a.updateUserId,0) + #{data.updateUserIdIncrement},
</if> </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>
<trim suffixOverrides="where" suffix=""> <trim suffixOverrides="where" suffix="">
where where
...@@ -180,18 +194,6 @@ ...@@ -180,18 +194,6 @@
<update id="updateBatch" parameterType="paramDto"> <update id="updateBatch" parameterType="paramDto">
update mortals_sys_app_info_field as a update mortals_sys_app_info_field as a
<trim prefix="set" suffixOverrides=","> <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),"> <trim prefix="fieldCode=(case" suffix="ELSE fieldCode end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('fieldCode')) or (colPickMode==1 and !item.containsKey('fieldCode'))"> <if test="(colPickMode==0 and item.containsKey('fieldCode')) or (colPickMode==1 and !item.containsKey('fieldCode'))">
...@@ -320,6 +322,32 @@ ...@@ -320,6 +322,32 @@
</choose> </choose>
</foreach> </foreach>
</trim> </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> </trim>
where id in where id in
<foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")"> <foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
...@@ -444,12 +472,18 @@ ...@@ -444,12 +472,18 @@
${_conditionType_} a.id is null ${_conditionType_} a.id is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('idList')"> <if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
${_conditionType_} a.id in ${_conditionType_} a.id in
<foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </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"> <if test="conditionParamRef.containsKey('idStart') and conditionParamRef.idStart != null">
${_conditionType_} a.id <![CDATA[ >= ]]> #{${_conditionParam_}.idStart} ${_conditionType_} a.id <![CDATA[ >= ]]> #{${_conditionParam_}.idStart}
</if> </if>
...@@ -457,27 +491,6 @@ ...@@ -457,27 +491,6 @@
${_conditionType_} a.id <![CDATA[ <= ]]> #{${_conditionParam_}.idEnd} ${_conditionType_} a.id <![CDATA[ <= ]]> #{${_conditionParam_}.idEnd}
</if> </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.containsKey('fieldCode')">
<if test="conditionParamRef.fieldCode != null and conditionParamRef.fieldCode != ''"> <if test="conditionParamRef.fieldCode != null and conditionParamRef.fieldCode != ''">
...@@ -487,12 +500,18 @@ ...@@ -487,12 +500,18 @@
${_conditionType_} a.fieldCode is null ${_conditionType_} a.fieldCode is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('fieldCodeList')"> <if test="conditionParamRef.containsKey('fieldCodeList') and conditionParamRef.fieldCodeList.size() > 0">
${_conditionType_} a.fieldCode in ${_conditionType_} a.fieldCode in
<foreach collection="conditionParamRef.fieldCodeList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.fieldCodeList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </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.containsKey('fieldName')">
<if test="conditionParamRef.fieldName != null and conditionParamRef.fieldName != ''"> <if test="conditionParamRef.fieldName != null and conditionParamRef.fieldName != ''">
...@@ -502,12 +521,18 @@ ...@@ -502,12 +521,18 @@
${_conditionType_} a.fieldName is null ${_conditionType_} a.fieldName is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('fieldNameList')"> <if test="conditionParamRef.containsKey('fieldNameList') and conditionParamRef.fieldNameList.size() > 0">
${_conditionType_} a.fieldName in ${_conditionType_} a.fieldName in
<foreach collection="conditionParamRef.fieldNameList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.fieldNameList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </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.containsKey('fieldType')">
<if test="conditionParamRef.fieldType != null and conditionParamRef.fieldType != ''"> <if test="conditionParamRef.fieldType != null and conditionParamRef.fieldType != ''">
...@@ -517,12 +542,18 @@ ...@@ -517,12 +542,18 @@
${_conditionType_} a.fieldType is null ${_conditionType_} a.fieldType is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('fieldTypeList')"> <if test="conditionParamRef.containsKey('fieldTypeList') and conditionParamRef.fieldTypeList.size() > 0">
${_conditionType_} a.fieldType in ${_conditionType_} a.fieldType in
<foreach collection="conditionParamRef.fieldTypeList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.fieldTypeList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </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.containsKey('dataType')">
<if test="conditionParamRef.dataType != null and conditionParamRef.dataType != ''"> <if test="conditionParamRef.dataType != null and conditionParamRef.dataType != ''">
...@@ -532,12 +563,18 @@ ...@@ -532,12 +563,18 @@
${_conditionType_} a.dataType is null ${_conditionType_} a.dataType is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('dataTypeList')"> <if test="conditionParamRef.containsKey('dataTypeList') and conditionParamRef.dataTypeList.size() > 0">
${_conditionType_} a.dataType in ${_conditionType_} a.dataType in
<foreach collection="conditionParamRef.dataTypeList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.dataTypeList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </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.containsKey('fieldValue')">
<if test="conditionParamRef.fieldValue != null and conditionParamRef.fieldValue != ''"> <if test="conditionParamRef.fieldValue != null and conditionParamRef.fieldValue != ''">
...@@ -547,12 +584,18 @@ ...@@ -547,12 +584,18 @@
${_conditionType_} a.fieldValue is null ${_conditionType_} a.fieldValue is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('fieldValueList')"> <if test="conditionParamRef.containsKey('fieldValueList') and conditionParamRef.fieldValueList.size() > 0">
${_conditionType_} a.fieldValue in ${_conditionType_} a.fieldValue in
<foreach collection="conditionParamRef.fieldValueList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.fieldValueList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </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.containsKey('fieldLen')">
<if test="conditionParamRef.fieldLen != null "> <if test="conditionParamRef.fieldLen != null ">
${_conditionType_} a.fieldLen = #{${_conditionParam_}.fieldLen} ${_conditionType_} a.fieldLen = #{${_conditionParam_}.fieldLen}
...@@ -561,12 +604,18 @@ ...@@ -561,12 +604,18 @@
${_conditionType_} a.fieldLen is null ${_conditionType_} a.fieldLen is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('fieldLenList')"> <if test="conditionParamRef.containsKey('fieldLenList') and conditionParamRef.fieldLenList.size() > 0">
${_conditionType_} a.fieldLen in ${_conditionType_} a.fieldLen in
<foreach collection="conditionParamRef.fieldLenList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.fieldLenList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </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"> <if test="conditionParamRef.containsKey('fieldLenStart') and conditionParamRef.fieldLenStart != null">
${_conditionType_} a.fieldLen <![CDATA[ >= ]]> #{${_conditionParam_}.fieldLenStart} ${_conditionType_} a.fieldLen <![CDATA[ >= ]]> #{${_conditionParam_}.fieldLenStart}
</if> </if>
...@@ -582,12 +631,18 @@ ...@@ -582,12 +631,18 @@
${_conditionType_} a.fieldNull is null ${_conditionType_} a.fieldNull is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('fieldNullList')"> <if test="conditionParamRef.containsKey('fieldNullList') and conditionParamRef.fieldNullList.size() > 0">
${_conditionType_} a.fieldNull in ${_conditionType_} a.fieldNull in
<foreach collection="conditionParamRef.fieldNullList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.fieldNullList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </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"> <if test="conditionParamRef.containsKey('fieldNullStart') and conditionParamRef.fieldNullStart != null">
${_conditionType_} a.fieldNull <![CDATA[ >= ]]> #{${_conditionParam_}.fieldNullStart} ${_conditionType_} a.fieldNull <![CDATA[ >= ]]> #{${_conditionParam_}.fieldNullStart}
</if> </if>
...@@ -603,12 +658,18 @@ ...@@ -603,12 +658,18 @@
${_conditionType_} a.isList is null ${_conditionType_} a.isList is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('isListList')"> <if test="conditionParamRef.containsKey('isListList') and conditionParamRef.isListList.size() > 0">
${_conditionType_} a.isList in ${_conditionType_} a.isList in
<foreach collection="conditionParamRef.isListList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.isListList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </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"> <if test="conditionParamRef.containsKey('isListStart') and conditionParamRef.isListStart != null">
${_conditionType_} a.isList <![CDATA[ >= ]]> #{${_conditionParam_}.isListStart} ${_conditionType_} a.isList <![CDATA[ >= ]]> #{${_conditionParam_}.isListStart}
</if> </if>
...@@ -624,12 +685,18 @@ ...@@ -624,12 +685,18 @@
${_conditionType_} a.fieldOrderNo is null ${_conditionType_} a.fieldOrderNo is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('fieldOrderNoList')"> <if test="conditionParamRef.containsKey('fieldOrderNoList') and conditionParamRef.fieldOrderNoList.size() > 0">
${_conditionType_} a.fieldOrderNo in ${_conditionType_} a.fieldOrderNo in
<foreach collection="conditionParamRef.fieldOrderNoList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.fieldOrderNoList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </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"> <if test="conditionParamRef.containsKey('fieldOrderNoStart') and conditionParamRef.fieldOrderNoStart != null">
${_conditionType_} a.fieldOrderNo <![CDATA[ >= ]]> #{${_conditionParam_}.fieldOrderNoStart} ${_conditionType_} a.fieldOrderNo <![CDATA[ >= ]]> #{${_conditionParam_}.fieldOrderNoStart}
</if> </if>
...@@ -646,12 +713,18 @@ ...@@ -646,12 +713,18 @@
${_conditionType_} a.remark is null ${_conditionType_} a.remark is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('remarkList')"> <if test="conditionParamRef.containsKey('remarkList') and conditionParamRef.remarkList.size() > 0">
${_conditionType_} a.remark in ${_conditionType_} a.remark in
<foreach collection="conditionParamRef.remarkList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.remarkList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </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.containsKey('createTime')">
<if test="conditionParamRef.createTime != null "> <if test="conditionParamRef.createTime != null ">
...@@ -675,12 +748,18 @@ ...@@ -675,12 +748,18 @@
${_conditionType_} a.createUserId is null ${_conditionType_} a.createUserId is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('createUserIdList')"> <if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
${_conditionType_} a.createUserId in ${_conditionType_} a.createUserId in
<foreach collection="conditionParamRef.createUserIdList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.createUserIdList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </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"> <if test="conditionParamRef.containsKey('createUserIdStart') and conditionParamRef.createUserIdStart != null">
${_conditionType_} a.createUserId <![CDATA[ >= ]]> #{${_conditionParam_}.createUserIdStart} ${_conditionType_} a.createUserId <![CDATA[ >= ]]> #{${_conditionParam_}.createUserIdStart}
</if> </if>
...@@ -711,12 +790,18 @@ ...@@ -711,12 +790,18 @@
${_conditionType_} a.updateUserId is null ${_conditionType_} a.updateUserId is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('updateUserIdList')"> <if test="conditionParamRef.containsKey('updateUserIdList') and conditionParamRef.updateUserIdList.size() > 0">
${_conditionType_} a.updateUserId in ${_conditionType_} a.updateUserId in
<foreach collection="conditionParamRef.updateUserIdList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.updateUserIdList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </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"> <if test="conditionParamRef.containsKey('updateUserIdStart') and conditionParamRef.updateUserIdStart != null">
${_conditionType_} a.updateUserId <![CDATA[ >= ]]> #{${_conditionParam_}.updateUserIdStart} ${_conditionType_} a.updateUserId <![CDATA[ >= ]]> #{${_conditionParam_}.updateUserIdStart}
</if> </if>
...@@ -724,6 +809,75 @@ ...@@ -724,6 +809,75 @@
${_conditionType_} a.updateUserId <![CDATA[ <= ]]> #{${_conditionParam_}.updateUserIdEnd} ${_conditionType_} a.updateUserId <![CDATA[ <= ]]> #{${_conditionParam_}.updateUserIdEnd}
</if> </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>
<sql id="_orderCols_"> <sql id="_orderCols_">
<if test="orderColList != null and !orderColList.isEmpty()"> <if test="orderColList != null and !orderColList.isEmpty()">
...@@ -742,11 +896,6 @@ ...@@ -742,11 +896,6 @@
<if test='orderCol.id != null and "DESC".equalsIgnoreCase(orderCol.id)'>DESC</if> <if test='orderCol.id != null and "DESC".equalsIgnoreCase(orderCol.id)'>DESC</if>
, ,
</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')"> <if test="orderCol.containsKey('fieldCode')">
a.fieldCode a.fieldCode
<if test='orderCol.fieldCode != null and "DESC".equalsIgnoreCase(orderCol.fieldCode)'>DESC</if> <if test='orderCol.fieldCode != null and "DESC".equalsIgnoreCase(orderCol.fieldCode)'>DESC</if>
...@@ -817,6 +966,21 @@ ...@@ -817,6 +966,21 @@
<if test='orderCol.updateUserId != null and "DESC".equalsIgnoreCase(orderCol.updateUserId)'>DESC</if> <if test='orderCol.updateUserId != null and "DESC".equalsIgnoreCase(orderCol.updateUserId)'>DESC</if>
, ,
</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> </trim>
</if> </if>
</sql> </sql>
......
base-manager/src/main/resources/sqlmap/module/app/AppInfoTempleteFieldMapper.xml
View file @ 77904e20
...@@ -21,6 +21,8 @@ ...@@ -21,6 +21,8 @@
<result property="createUserId" column="createUserId" /> <result property="createUserId" column="createUserId" />
<result property="updateTime" column="updateTime" /> <result property="updateTime" column="updateTime" />
<result property="updateUserId" column="updateUserId" /> <result property="updateUserId" column="updateUserId" />
<result property="fieldTypeValue" column="fieldTypeValue" />
<result property="defaultValue" column="defaultValue" />
</resultMap> </resultMap>
...@@ -76,23 +78,29 @@ ...@@ -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')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateUserId') or colPickMode == 1 and data.containsKey('updateUserId')))">
a.updateUserId, a.updateUserId,
</if> </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> </trim>
</sql> </sql>
<!-- 新增 区分主键自增加还是业务插入 --> <!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="AppInfoTempleteFieldEntity" useGeneratedKeys="true" keyProperty="id"> <insert id="insert" parameterType="AppInfoTempleteFieldEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_sys_app_info_templete_field 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 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>
<!-- 批量新增 --> <!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto"> <insert id="insertBatch" parameterType="paramDto">
insert into mortals_sys_app_info_templete_field 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 VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," > <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> </foreach>
</insert> </insert>
...@@ -168,6 +176,12 @@ ...@@ -168,6 +176,12 @@
<if test="(colPickMode==0 and data.containsKey('updateUserIdIncrement')) or (colPickMode==1 and !data.containsKey('updateUserIdIncrement'))"> <if test="(colPickMode==0 and data.containsKey('updateUserIdIncrement')) or (colPickMode==1 and !data.containsKey('updateUserIdIncrement'))">
a.updateUserId=ifnull(a.updateUserId,0) + #{data.updateUserIdIncrement}, a.updateUserId=ifnull(a.updateUserId,0) + #{data.updateUserIdIncrement},
</if> </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>
<trim suffixOverrides="where" suffix=""> <trim suffixOverrides="where" suffix="">
where where
...@@ -320,6 +334,20 @@ ...@@ -320,6 +334,20 @@
</choose> </choose>
</foreach> </foreach>
</trim> </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> </trim>
where id in where id in
<foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")"> <foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
...@@ -444,12 +472,18 @@ ...@@ -444,12 +472,18 @@
${_conditionType_} a.id is null ${_conditionType_} a.id is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('idList')"> <if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
${_conditionType_} a.id in ${_conditionType_} a.id in
<foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </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"> <if test="conditionParamRef.containsKey('idStart') and conditionParamRef.idStart != null">
${_conditionType_} a.id <![CDATA[ >= ]]> #{${_conditionParam_}.idStart} ${_conditionType_} a.id <![CDATA[ >= ]]> #{${_conditionParam_}.idStart}
</if> </if>
...@@ -465,12 +499,18 @@ ...@@ -465,12 +499,18 @@
${_conditionType_} a.appId is null ${_conditionType_} a.appId is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('appIdList')"> <if test="conditionParamRef.containsKey('appIdList') and conditionParamRef.appIdList.size() > 0">
${_conditionType_} a.appId in ${_conditionType_} a.appId in
<foreach collection="conditionParamRef.appIdList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.appIdList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </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"> <if test="conditionParamRef.containsKey('appIdStart') and conditionParamRef.appIdStart != null">
${_conditionType_} a.appId <![CDATA[ >= ]]> #{${_conditionParam_}.appIdStart} ${_conditionType_} a.appId <![CDATA[ >= ]]> #{${_conditionParam_}.appIdStart}
</if> </if>
...@@ -487,12 +527,18 @@ ...@@ -487,12 +527,18 @@
${_conditionType_} a.fieldCode is null ${_conditionType_} a.fieldCode is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('fieldCodeList')"> <if test="conditionParamRef.containsKey('fieldCodeList') and conditionParamRef.fieldCodeList.size() > 0">
${_conditionType_} a.fieldCode in ${_conditionType_} a.fieldCode in
<foreach collection="conditionParamRef.fieldCodeList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.fieldCodeList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </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.containsKey('fieldName')">
<if test="conditionParamRef.fieldName != null and conditionParamRef.fieldName != ''"> <if test="conditionParamRef.fieldName != null and conditionParamRef.fieldName != ''">
...@@ -502,12 +548,18 @@ ...@@ -502,12 +548,18 @@
${_conditionType_} a.fieldName is null ${_conditionType_} a.fieldName is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('fieldNameList')"> <if test="conditionParamRef.containsKey('fieldNameList') and conditionParamRef.fieldNameList.size() > 0">
${_conditionType_} a.fieldName in ${_conditionType_} a.fieldName in
<foreach collection="conditionParamRef.fieldNameList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.fieldNameList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </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.containsKey('fieldType')">
<if test="conditionParamRef.fieldType != null and conditionParamRef.fieldType != ''"> <if test="conditionParamRef.fieldType != null and conditionParamRef.fieldType != ''">
...@@ -517,12 +569,18 @@ ...@@ -517,12 +569,18 @@
${_conditionType_} a.fieldType is null ${_conditionType_} a.fieldType is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('fieldTypeList')"> <if test="conditionParamRef.containsKey('fieldTypeList') and conditionParamRef.fieldTypeList.size() > 0">
${_conditionType_} a.fieldType in ${_conditionType_} a.fieldType in
<foreach collection="conditionParamRef.fieldTypeList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.fieldTypeList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </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.containsKey('dataType')">
<if test="conditionParamRef.dataType != null and conditionParamRef.dataType != ''"> <if test="conditionParamRef.dataType != null and conditionParamRef.dataType != ''">
...@@ -532,12 +590,18 @@ ...@@ -532,12 +590,18 @@
${_conditionType_} a.dataType is null ${_conditionType_} a.dataType is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('dataTypeList')"> <if test="conditionParamRef.containsKey('dataTypeList') and conditionParamRef.dataTypeList.size() > 0">
${_conditionType_} a.dataType in ${_conditionType_} a.dataType in
<foreach collection="conditionParamRef.dataTypeList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.dataTypeList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </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.containsKey('fieldValue')">
<if test="conditionParamRef.fieldValue != null and conditionParamRef.fieldValue != ''"> <if test="conditionParamRef.fieldValue != null and conditionParamRef.fieldValue != ''">
...@@ -547,12 +611,18 @@ ...@@ -547,12 +611,18 @@
${_conditionType_} a.fieldValue is null ${_conditionType_} a.fieldValue is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('fieldValueList')"> <if test="conditionParamRef.containsKey('fieldValueList') and conditionParamRef.fieldValueList.size() > 0">
${_conditionType_} a.fieldValue in ${_conditionType_} a.fieldValue in
<foreach collection="conditionParamRef.fieldValueList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.fieldValueList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </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.containsKey('fieldLen')">
<if test="conditionParamRef.fieldLen != null "> <if test="conditionParamRef.fieldLen != null ">
${_conditionType_} a.fieldLen = #{${_conditionParam_}.fieldLen} ${_conditionType_} a.fieldLen = #{${_conditionParam_}.fieldLen}
...@@ -561,12 +631,18 @@ ...@@ -561,12 +631,18 @@
${_conditionType_} a.fieldLen is null ${_conditionType_} a.fieldLen is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('fieldLenList')"> <if test="conditionParamRef.containsKey('fieldLenList') and conditionParamRef.fieldLenList.size() > 0">
${_conditionType_} a.fieldLen in ${_conditionType_} a.fieldLen in
<foreach collection="conditionParamRef.fieldLenList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.fieldLenList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </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"> <if test="conditionParamRef.containsKey('fieldLenStart') and conditionParamRef.fieldLenStart != null">
${_conditionType_} a.fieldLen <![CDATA[ >= ]]> #{${_conditionParam_}.fieldLenStart} ${_conditionType_} a.fieldLen <![CDATA[ >= ]]> #{${_conditionParam_}.fieldLenStart}
</if> </if>
...@@ -582,12 +658,18 @@ ...@@ -582,12 +658,18 @@
${_conditionType_} a.fieldNull is null ${_conditionType_} a.fieldNull is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('fieldNullList')"> <if test="conditionParamRef.containsKey('fieldNullList') and conditionParamRef.fieldNullList.size() > 0">
${_conditionType_} a.fieldNull in ${_conditionType_} a.fieldNull in
<foreach collection="conditionParamRef.fieldNullList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.fieldNullList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </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"> <if test="conditionParamRef.containsKey('fieldNullStart') and conditionParamRef.fieldNullStart != null">
${_conditionType_} a.fieldNull <![CDATA[ >= ]]> #{${_conditionParam_}.fieldNullStart} ${_conditionType_} a.fieldNull <![CDATA[ >= ]]> #{${_conditionParam_}.fieldNullStart}
</if> </if>
...@@ -603,12 +685,18 @@ ...@@ -603,12 +685,18 @@
${_conditionType_} a.isList is null ${_conditionType_} a.isList is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('isListList')"> <if test="conditionParamRef.containsKey('isListList') and conditionParamRef.isListList.size() > 0">
${_conditionType_} a.isList in ${_conditionType_} a.isList in
<foreach collection="conditionParamRef.isListList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.isListList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </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"> <if test="conditionParamRef.containsKey('isListStart') and conditionParamRef.isListStart != null">
${_conditionType_} a.isList <![CDATA[ >= ]]> #{${_conditionParam_}.isListStart} ${_conditionType_} a.isList <![CDATA[ >= ]]> #{${_conditionParam_}.isListStart}
</if> </if>
...@@ -624,12 +712,18 @@ ...@@ -624,12 +712,18 @@
${_conditionType_} a.fieldOrderNo is null ${_conditionType_} a.fieldOrderNo is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('fieldOrderNoList')"> <if test="conditionParamRef.containsKey('fieldOrderNoList') and conditionParamRef.fieldOrderNoList.size() > 0">
${_conditionType_} a.fieldOrderNo in ${_conditionType_} a.fieldOrderNo in
<foreach collection="conditionParamRef.fieldOrderNoList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.fieldOrderNoList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </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"> <if test="conditionParamRef.containsKey('fieldOrderNoStart') and conditionParamRef.fieldOrderNoStart != null">
${_conditionType_} a.fieldOrderNo <![CDATA[ >= ]]> #{${_conditionParam_}.fieldOrderNoStart} ${_conditionType_} a.fieldOrderNo <![CDATA[ >= ]]> #{${_conditionParam_}.fieldOrderNoStart}
</if> </if>
...@@ -646,12 +740,18 @@ ...@@ -646,12 +740,18 @@
${_conditionType_} a.remark is null ${_conditionType_} a.remark is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('remarkList')"> <if test="conditionParamRef.containsKey('remarkList') and conditionParamRef.remarkList.size() > 0">
${_conditionType_} a.remark in ${_conditionType_} a.remark in
<foreach collection="conditionParamRef.remarkList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.remarkList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </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.containsKey('createTime')">
<if test="conditionParamRef.createTime != null "> <if test="conditionParamRef.createTime != null ">
...@@ -675,12 +775,18 @@ ...@@ -675,12 +775,18 @@
${_conditionType_} a.createUserId is null ${_conditionType_} a.createUserId is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('createUserIdList')"> <if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
${_conditionType_} a.createUserId in ${_conditionType_} a.createUserId in
<foreach collection="conditionParamRef.createUserIdList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.createUserIdList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </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"> <if test="conditionParamRef.containsKey('createUserIdStart') and conditionParamRef.createUserIdStart != null">
${_conditionType_} a.createUserId <![CDATA[ >= ]]> #{${_conditionParam_}.createUserIdStart} ${_conditionType_} a.createUserId <![CDATA[ >= ]]> #{${_conditionParam_}.createUserIdStart}
</if> </if>
...@@ -711,12 +817,18 @@ ...@@ -711,12 +817,18 @@
${_conditionType_} a.updateUserId is null ${_conditionType_} a.updateUserId is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('updateUserIdList')"> <if test="conditionParamRef.containsKey('updateUserIdList') and conditionParamRef.updateUserIdList.size() > 0">
${_conditionType_} a.updateUserId in ${_conditionType_} a.updateUserId in
<foreach collection="conditionParamRef.updateUserIdList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.updateUserIdList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </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"> <if test="conditionParamRef.containsKey('updateUserIdStart') and conditionParamRef.updateUserIdStart != null">
${_conditionType_} a.updateUserId <![CDATA[ >= ]]> #{${_conditionParam_}.updateUserIdStart} ${_conditionType_} a.updateUserId <![CDATA[ >= ]]> #{${_conditionParam_}.updateUserIdStart}
</if> </if>
...@@ -724,6 +836,48 @@ ...@@ -724,6 +836,48 @@
${_conditionType_} a.updateUserId <![CDATA[ <= ]]> #{${_conditionParam_}.updateUserIdEnd} ${_conditionType_} a.updateUserId <![CDATA[ <= ]]> #{${_conditionParam_}.updateUserIdEnd}
</if> </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>
<sql id="_orderCols_"> <sql id="_orderCols_">
<if test="orderColList != null and !orderColList.isEmpty()"> <if test="orderColList != null and !orderColList.isEmpty()">
...@@ -817,6 +971,16 @@ ...@@ -817,6 +971,16 @@
<if test='orderCol.updateUserId != null and "DESC".equalsIgnoreCase(orderCol.updateUserId)'>DESC</if> <if test='orderCol.updateUserId != null and "DESC".equalsIgnoreCase(orderCol.updateUserId)'>DESC</if>
, ,
</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> </trim>
</if> </if>
</sql> </sql>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment