Skip to content

S
smart_gov_platform
Commit 42b1b3f9 authored by 赵啸非's avatar 赵啸非
Browse files
Options

添加应用复选字段

parent 77904e20
Show whitespace changes
Inline Side-by-side
Showing with 476 additions and 477 deletions
base-manager/src/main/java/com/mortals/xhx/module/app/model/AppInfoFieldEntity.java
View file @ 42b1b3f9
...@@ -7,7 +7,7 @@ import com.mortals.framework.annotation.Excel; ...@@ -7,7 +7,7 @@ import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong; import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.app.model.vo.AppInfoFieldVo; import com.mortals.xhx.module.app.model.vo.AppInfoFieldVo;
/** /**
* 自助终端应用信息字段实体对象 * 自助终端应用模板信息字段实体对象
* *
* @author zxfei * @author zxfei
* @date 2023-03-28 * @date 2023-03-28
...@@ -16,6 +16,10 @@ import com.mortals.xhx.module.app.model.vo.AppInfoFieldVo; ...@@ -16,6 +16,10 @@ import com.mortals.xhx.module.app.model.vo.AppInfoFieldVo;
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;
/** /**
* 字段编码 * 字段编码
*/ */
...@@ -25,9 +29,13 @@ public class AppInfoFieldEntity extends AppInfoFieldVo { ...@@ -25,9 +29,13 @@ public class AppInfoFieldEntity extends AppInfoFieldVo {
*/ */
private String fieldName; private String fieldName;
/** /**
* 字段类型（input.单行输入框,textarea.多行输入框,SELECT.下拉选项框,date.日期选择框） * 字段类型（input.单行输入框,textarea.多行输入框,SELECT.下拉选项框,date.日期选择框,editer.富文本）
*/ */
private String fieldType; private String fieldType;
/**
* 字段类型值，当字段类型为多选，单选时候，预设复选值
*/
private String fieldTypeValue;
/** /**
* 数据类型（number.数字,string.字符串） * 数据类型（number.数字,string.字符串）
*/ */
...@@ -36,6 +44,10 @@ public class AppInfoFieldEntity extends AppInfoFieldVo { ...@@ -36,6 +44,10 @@ public class AppInfoFieldEntity extends AppInfoFieldVo {
* 字段值 * 字段值
*/ */
private String fieldValue; private String fieldValue;
/**
* 字段默认值
*/
private String defaultValue;
/** /**
* 数据长度，默认128 * 数据长度，默认128
*/ */
...@@ -56,22 +68,24 @@ public class AppInfoFieldEntity extends AppInfoFieldVo { ...@@ -56,22 +68,24 @@ public class AppInfoFieldEntity extends AppInfoFieldVo {
* 备注 * 备注
*/ */
private String remark; private String remark;
/**
* 应用id
*/
private Long appId;
/**
* 字段类型值，当字段类型为多选，单选时候，预设复选值
*/
private String fieldTypeValue;
/**
* 字段默认值
*/
private String defaultValue;
public AppInfoFieldEntity(){} public AppInfoFieldEntity(){}
/**
* 获取 数据集id
* @return Long
*/
public Long getDatasetId(){
return datasetId;
}
/**
* 设置 数据集id
* @param datasetId
*/
public void setDatasetId(Long datasetId){
this.datasetId = datasetId;
}
/** /**
* 获取 字段编码 * 获取 字段编码
* @return String * @return String
...@@ -101,19 +115,33 @@ public class AppInfoFieldEntity extends AppInfoFieldVo { ...@@ -101,19 +115,33 @@ public class AppInfoFieldEntity extends AppInfoFieldVo {
this.fieldName = fieldName; this.fieldName = fieldName;
} }
/** /**
* 获取 字段类型（input.单行输入框,textarea.多行输入框,SELECT.下拉选项框,date.日期选择框） * 获取 字段类型（input.单行输入框,textarea.多行输入框,SELECT.下拉选项框,date.日期选择框,editer.富文本）
* @return String * @return String
*/ */
public String getFieldType(){ public String getFieldType(){
return fieldType; return fieldType;
} }
/** /**
* 设置 字段类型（input.单行输入框,textarea.多行输入框,SELECT.下拉选项框,date.日期选择框） * 设置 字段类型（input.单行输入框,textarea.多行输入框,SELECT.下拉选项框,date.日期选择框,editer.富文本）
* @param fieldType * @param fieldType
*/ */
public void setFieldType(String fieldType){ public void setFieldType(String fieldType){
this.fieldType = fieldType; this.fieldType = fieldType;
} }
/**
* 获取 字段类型值，当字段类型为多选，单选时候，预设复选值
* @return String
*/
public String getFieldTypeValue(){
return fieldTypeValue;
}
/**
* 设置 字段类型值，当字段类型为多选，单选时候，预设复选值
* @param fieldTypeValue
*/
public void setFieldTypeValue(String fieldTypeValue){
this.fieldTypeValue = fieldTypeValue;
}
/** /**
* 获取 数据类型（number.数字,string.字符串） * 获取 数据类型（number.数字,string.字符串）
* @return String * @return String
...@@ -142,6 +170,20 @@ public class AppInfoFieldEntity extends AppInfoFieldVo { ...@@ -142,6 +170,20 @@ public class AppInfoFieldEntity extends AppInfoFieldVo {
public void setFieldValue(String fieldValue){ public void setFieldValue(String fieldValue){
this.fieldValue = fieldValue; this.fieldValue = fieldValue;
} }
/**
* 获取 字段默认值
* @return String
*/
public String getDefaultValue(){
return defaultValue;
}
/**
* 设置 字段默认值
* @param defaultValue
*/
public void setDefaultValue(String defaultValue){
this.defaultValue = defaultValue;
}
/** /**
* 获取 数据长度，默认128 * 获取 数据长度，默认128
* @return Integer * @return Integer
...@@ -212,48 +254,6 @@ public class AppInfoFieldEntity extends AppInfoFieldVo { ...@@ -212,48 +254,6 @@ 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;
}
...@@ -276,34 +276,40 @@ public class AppInfoFieldEntity extends AppInfoFieldVo { ...@@ -276,34 +276,40 @@ 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());
sb.append(",fieldTypeValue:").append(getFieldTypeValue());
sb.append(",dataType:").append(getDataType()); sb.append(",dataType:").append(getDataType());
sb.append(",fieldValue:").append(getFieldValue()); sb.append(",fieldValue:").append(getFieldValue());
sb.append(",defaultValue:").append(getDefaultValue());
sb.append(",fieldLen:").append(getFieldLen()); sb.append(",fieldLen:").append(getFieldLen());
sb.append(",fieldNull:").append(getFieldNull()); sb.append(",fieldNull:").append(getFieldNull());
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 = "";
this.fieldType = ""; this.fieldType = "";
this.fieldTypeValue = "";
this.dataType = ""; this.dataType = "";
this.fieldValue = ""; this.fieldValue = "";
this.defaultValue = "";
this.fieldLen = 0; this.fieldLen = 0;
this.fieldNull = 1; this.fieldNull = 1;
...@@ -313,11 +319,5 @@ public class AppInfoFieldEntity extends AppInfoFieldVo { ...@@ -313,11 +319,5 @@ 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 @ 42b1b3f9
...@@ -3,7 +3,7 @@ package com.mortals.xhx.module.app.model; ...@@ -3,7 +3,7 @@ package com.mortals.xhx.module.app.model;
import java.util.List; import java.util.List;
import com.mortals.xhx.module.app.model.AppInfoFieldEntity; import com.mortals.xhx.module.app.model.AppInfoFieldEntity;
/** /**
* 自助终端应用信息字段查询对象 * 自助终端应用模板信息字段查询对象
* *
* @author zxfei * @author zxfei
* @date 2023-03-28 * @date 2023-03-28
...@@ -24,6 +24,21 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity { ...@@ -24,6 +24,21 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity {
/** 序号，主键，自增长排除列表 */ /** 序号，主键，自增长排除列表 */
private List <Long> idNotList; private List <Long> idNotList;
/** 开始 数据集id */
private Long datasetIdStart;
/** 结束 数据集id */
private Long datasetIdEnd;
/** 增加 数据集id */
private Long datasetIdIncrement;
/** 数据集id列表 */
private List <Long> datasetIdList;
/** 数据集id排除列表 */
private List <Long> datasetIdNotList;
/** 字段编码 */ /** 字段编码 */
private List<String> fieldCodeList; private List<String> fieldCodeList;
...@@ -34,11 +49,16 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity { ...@@ -34,11 +49,16 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity {
/** 字段名称排除列表 */ /** 字段名称排除列表 */
private List <String> fieldNameNotList; private List <String> fieldNameNotList;
/** 字段类型（input.单行输入框,textarea.多行输入框,SELECT.下拉选项框,date.日期选择框） */ /** 字段类型（input.单行输入框,textarea.多行输入框,SELECT.下拉选项框,date.日期选择框,editer.富文本） */
private List<String> fieldTypeList; private List<String> fieldTypeList;
/** 字段类型（input.单行输入框,textarea.多行输入框,SELECT.下拉选项框,date.日期选择框）排除列表 */ /** 字段类型（input.单行输入框,textarea.多行输入框,SELECT.下拉选项框,date.日期选择框,editer.富文本）排除列表 */
private List <String> fieldTypeNotList; private List <String> fieldTypeNotList;
/** 字段类型值，当字段类型为多选，单选时候，预设复选值 */
private List<String> fieldTypeValueList;
/** 字段类型值，当字段类型为多选，单选时候，预设复选值排除列表 */
private List <String> fieldTypeValueNotList;
/** 数据类型（number.数字,string.字符串） */ /** 数据类型（number.数字,string.字符串） */
private List<String> dataTypeList; private List<String> dataTypeList;
...@@ -49,6 +69,11 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity { ...@@ -49,6 +69,11 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity {
/** 字段值排除列表 */ /** 字段值排除列表 */
private List <String> fieldValueNotList; private List <String> fieldValueNotList;
/** 字段默认值 */
private List<String> defaultValueList;
/** 字段默认值排除列表 */
private List <String> defaultValueNotList;
/** 开始 数据长度，默认128 */ /** 开始 数据长度，默认128 */
private Integer fieldLenStart; private Integer fieldLenStart;
...@@ -156,31 +181,6 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity { ...@@ -156,31 +181,6 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity {
/** 修改用户排除列表 */ /** 修改用户排除列表 */
private List <Long> updateUserIdNotList; 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;
...@@ -270,6 +270,87 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity { ...@@ -270,6 +270,87 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity {
} }
/**
* 获取 开始 数据集id
* @return datasetIdStart
*/
public Long getDatasetIdStart(){
return this.datasetIdStart;
}
/**
* 设置 开始 数据集id
* @param datasetIdStart
*/
public void setDatasetIdStart(Long datasetIdStart){
this.datasetIdStart = datasetIdStart;
}
/**
* 获取 结束 数据集id
* @return $datasetIdEnd
*/
public Long getDatasetIdEnd(){
return this.datasetIdEnd;
}
/**
* 设置 结束 数据集id
* @param datasetIdEnd
*/
public void setDatasetIdEnd(Long datasetIdEnd){
this.datasetIdEnd = datasetIdEnd;
}
/**
* 获取 增加 数据集id
* @return datasetIdIncrement
*/
public Long getDatasetIdIncrement(){
return this.datasetIdIncrement;
}
/**
* 设置 增加 数据集id
* @param datasetIdIncrement
*/
public void setDatasetIdIncrement(Long datasetIdIncrement){
this.datasetIdIncrement = datasetIdIncrement;
}
/**
* 获取 数据集id
* @return datasetIdList
*/
public List<Long> getDatasetIdList(){
return this.datasetIdList;
}
/**
* 设置 数据集id
* @param datasetIdList
*/
public void setDatasetIdList(List<Long> datasetIdList){
this.datasetIdList = datasetIdList;
}
/**
* 获取 数据集id
* @return datasetIdNotList
*/
public List<Long> getDatasetIdNotList(){
return this.datasetIdNotList;
}
/**
* 设置 数据集id
* @param datasetIdNotList
*/
public void setDatasetIdNotList(List<Long> datasetIdNotList){
this.datasetIdNotList = datasetIdNotList;
}
/** /**
* 获取 字段编码 * 获取 字段编码
* @return fieldCodeList * @return fieldCodeList
...@@ -335,7 +416,7 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity { ...@@ -335,7 +416,7 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity {
} }
/** /**
* 获取 字段类型（input.单行输入框,textarea.多行输入框,SELECT.下拉选项框,date.日期选择框） * 获取 字段类型（input.单行输入框,textarea.多行输入框,SELECT.下拉选项框,date.日期选择框,editer.富文本）
* @return fieldTypeList * @return fieldTypeList
*/ */
public List<String> getFieldTypeList(){ public List<String> getFieldTypeList(){
...@@ -343,7 +424,7 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity { ...@@ -343,7 +424,7 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity {
} }
/** /**
* 设置 字段类型（input.单行输入框,textarea.多行输入框,SELECT.下拉选项框,date.日期选择框） * 设置 字段类型（input.单行输入框,textarea.多行输入框,SELECT.下拉选项框,date.日期选择框,editer.富文本）
* @param fieldTypeList * @param fieldTypeList
*/ */
public void setFieldTypeList(List<String> fieldTypeList){ public void setFieldTypeList(List<String> fieldTypeList){
...@@ -351,7 +432,7 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity { ...@@ -351,7 +432,7 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity {
} }
/** /**
* 获取 字段类型（input.单行输入框,textarea.多行输入框,SELECT.下拉选项框,date.日期选择框） * 获取 字段类型（input.单行输入框,textarea.多行输入框,SELECT.下拉选项框,date.日期选择框,editer.富文本）
* @return fieldTypeNotList * @return fieldTypeNotList
*/ */
public List<String> getFieldTypeNotList(){ public List<String> getFieldTypeNotList(){
...@@ -359,13 +440,45 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity { ...@@ -359,13 +440,45 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity {
} }
/** /**
* 设置 字段类型（input.单行输入框,textarea.多行输入框,SELECT.下拉选项框,date.日期选择框） * 设置 字段类型（input.单行输入框,textarea.多行输入框,SELECT.下拉选项框,date.日期选择框,editer.富文本）
* @param fieldTypeNotList * @param fieldTypeNotList
*/ */
public void setFieldTypeNotList(List<String> fieldTypeNotList){ public void setFieldTypeNotList(List<String> fieldTypeNotList){
this.fieldTypeNotList = fieldTypeNotList; this.fieldTypeNotList = fieldTypeNotList;
} }
/**
* 获取 字段类型值，当字段类型为多选，单选时候，预设复选值
* @return fieldTypeValueList
*/
public List<String> getFieldTypeValueList(){
return this.fieldTypeValueList;
}
/**
* 设置 字段类型值，当字段类型为多选，单选时候，预设复选值
* @param fieldTypeValueList
*/
public void setFieldTypeValueList(List<String> fieldTypeValueList){
this.fieldTypeValueList = fieldTypeValueList;
}
/**
* 获取 字段类型值，当字段类型为多选，单选时候，预设复选值
* @return fieldTypeValueNotList
*/
public List<String> getFieldTypeValueNotList(){
return this.fieldTypeValueNotList;
}
/**
* 设置 字段类型值，当字段类型为多选，单选时候，预设复选值
* @param fieldTypeValueNotList
*/
public void setFieldTypeValueNotList(List<String> fieldTypeValueNotList){
this.fieldTypeValueNotList = fieldTypeValueNotList;
}
/** /**
* 获取 数据类型（number.数字,string.字符串） * 获取 数据类型（number.数字,string.字符串）
* @return dataTypeList * @return dataTypeList
...@@ -430,6 +543,38 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity { ...@@ -430,6 +543,38 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity {
this.fieldValueNotList = fieldValueNotList; this.fieldValueNotList = fieldValueNotList;
} }
/**
* 获取 字段默认值
* @return defaultValueList
*/
public List<String> getDefaultValueList(){
return this.defaultValueList;
}
/**
* 设置 字段默认值
* @param defaultValueList
*/
public void setDefaultValueList(List<String> defaultValueList){
this.defaultValueList = defaultValueList;
}
/**
* 获取 字段默认值
* @return defaultValueNotList
*/
public List<String> getDefaultValueNotList(){
return this.defaultValueNotList;
}
/**
* 设置 字段默认值
* @param defaultValueNotList
*/
public void setDefaultValueNotList(List<String> defaultValueNotList){
this.defaultValueNotList = defaultValueNotList;
}
/** /**
* 获取 开始 数据长度，默认128 * 获取 开始 数据长度，默认128
* @return fieldLenStart * @return fieldLenStart
...@@ -1012,151 +1157,6 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity { ...@@ -1012,151 +1157,6 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity {
} }
/**
* 获取 开始 应用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
...@@ -1211,6 +1211,60 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity { ...@@ -1211,6 +1211,60 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity {
return this; return this;
} }
/**
* 设置 数据集id
* @param datasetId
*/
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){
this.datasetIdList = datasetIdList;
return this;
}
/**
* 设置 数据集id
* @param datasetIdNotList
*/
public AppInfoFieldQuery datasetIdNotList(List<Long> datasetIdNotList){
this.datasetIdNotList = datasetIdNotList;
return this;
}
/** /**
* 设置 字段编码 * 设置 字段编码
...@@ -1251,7 +1305,7 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity { ...@@ -1251,7 +1305,7 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity {
/** /**
* 设置 字段类型（input.单行输入框,textarea.多行输入框,SELECT.下拉选项框,date.日期选择框） * 设置 字段类型（input.单行输入框,textarea.多行输入框,SELECT.下拉选项框,date.日期选择框,editer.富文本）
* @param fieldType * @param fieldType
*/ */
public AppInfoFieldQuery fieldType(String fieldType){ public AppInfoFieldQuery fieldType(String fieldType){
...@@ -1260,7 +1314,7 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity { ...@@ -1260,7 +1314,7 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity {
} }
/** /**
* 设置 字段类型（input.单行输入框,textarea.多行输入框,SELECT.下拉选项框,date.日期选择框） * 设置 字段类型（input.单行输入框,textarea.多行输入框,SELECT.下拉选项框,date.日期选择框,editer.富文本）
* @param fieldTypeList * @param fieldTypeList
*/ */
public AppInfoFieldQuery fieldTypeList(List<String> fieldTypeList){ public AppInfoFieldQuery fieldTypeList(List<String> fieldTypeList){
...@@ -1269,6 +1323,25 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity { ...@@ -1269,6 +1323,25 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity {
} }
/**
* 设置 字段类型值，当字段类型为多选，单选时候，预设复选值
* @param fieldTypeValue
*/
public AppInfoFieldQuery fieldTypeValue(String fieldTypeValue){
setFieldTypeValue(fieldTypeValue);
return this;
}
/**
* 设置 字段类型值，当字段类型为多选，单选时候，预设复选值
* @param fieldTypeValueList
*/
public AppInfoFieldQuery fieldTypeValueList(List<String> fieldTypeValueList){
this.fieldTypeValueList = fieldTypeValueList;
return this;
}
/** /**
* 设置 数据类型（number.数字,string.字符串） * 设置 数据类型（number.数字,string.字符串）
* @param dataType * @param dataType
...@@ -1306,6 +1379,25 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity { ...@@ -1306,6 +1379,25 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity {
return this; return this;
} }
/**
* 设置 字段默认值
* @param defaultValue
*/
public AppInfoFieldQuery defaultValue(String defaultValue){
setDefaultValue(defaultValue);
return this;
}
/**
* 设置 字段默认值
* @param defaultValueList
*/
public AppInfoFieldQuery defaultValueList(List<String> defaultValueList){
this.defaultValueList = defaultValueList;
return this;
}
/** /**
* 设置 数据长度，默认128 * 设置 数据长度，默认128
* @param fieldLen * @param fieldLen
...@@ -1651,98 +1743,6 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity { ...@@ -1651,98 +1743,6 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity {
return this; 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/resources/sqlmap/module/app/AppInfoFieldMapper.xml
View file @ 42b1b3f9
...@@ -6,11 +6,14 @@ ...@@ -6,11 +6,14 @@
<!-- 字段和属性映射 --> <!-- 字段和属性映射 -->
<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" />
<result property="fieldTypeValue" column="fieldTypeValue" />
<result property="dataType" column="dataType" /> <result property="dataType" column="dataType" />
<result property="fieldValue" column="fieldValue" /> <result property="fieldValue" column="fieldValue" />
<result property="defaultValue" column="defaultValue" />
<result property="fieldLen" column="fieldLen" /> <result property="fieldLen" column="fieldLen" />
<result property="fieldNull" column="fieldNull" /> <result property="fieldNull" column="fieldNull" />
<result property="isList" column="isList" /> <result property="isList" column="isList" />
...@@ -20,9 +23,6 @@ ...@@ -20,9 +23,6 @@
<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>
...@@ -33,6 +33,9 @@ ...@@ -33,6 +33,9 @@
<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>
...@@ -42,12 +45,18 @@ ...@@ -42,12 +45,18 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('fieldType') or colPickMode == 1 and data.containsKey('fieldType')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('fieldType') or colPickMode == 1 and data.containsKey('fieldType')))">
a.fieldType, a.fieldType,
</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('dataType') or colPickMode == 1 and data.containsKey('dataType')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('dataType') or colPickMode == 1 and data.containsKey('dataType')))">
a.dataType, a.dataType,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('fieldValue') or colPickMode == 1 and data.containsKey('fieldValue')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('fieldValue') or colPickMode == 1 and data.containsKey('fieldValue')))">
a.fieldValue, a.fieldValue,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('defaultValue') or colPickMode == 1 and data.containsKey('defaultValue')))">
a.defaultValue,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('fieldLen') or colPickMode == 1 and data.containsKey('fieldLen')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('fieldLen') or colPickMode == 1 and data.containsKey('fieldLen')))">
a.fieldLen, a.fieldLen,
</if> </if>
...@@ -75,32 +84,23 @@ ...@@ -75,32 +84,23 @@
<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
(fieldCode,fieldName,fieldType,dataType,fieldValue,fieldLen,fieldNull,isList,fieldOrderNo,remark,createTime,createUserId,updateTime,updateUserId,appId,fieldTypeValue,defaultValue) (datasetId,fieldCode,fieldName,fieldType,fieldTypeValue,dataType,fieldValue,defaultValue,fieldLen,fieldNull,isList,fieldOrderNo,remark,createTime,createUserId,updateTime,updateUserId)
VALUES VALUES
(#{fieldCode},#{fieldName},#{fieldType},#{dataType},#{fieldValue},#{fieldLen},#{fieldNull},#{isList},#{fieldOrderNo},#{remark},#{createTime},#{createUserId},#{updateTime},#{updateUserId},#{appId},#{fieldTypeValue},#{defaultValue}) (#{datasetId},#{fieldCode},#{fieldName},#{fieldType},#{fieldTypeValue},#{dataType},#{fieldValue},#{defaultValue},#{fieldLen},#{fieldNull},#{isList},#{fieldOrderNo},#{remark},#{createTime},#{createUserId},#{updateTime},#{updateUserId})
</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
(fieldCode,fieldName,fieldType,dataType,fieldValue,fieldLen,fieldNull,isList,fieldOrderNo,remark,createTime,createUserId,updateTime,updateUserId,appId,fieldTypeValue,defaultValue) (datasetId,fieldCode,fieldName,fieldType,fieldTypeValue,dataType,fieldValue,defaultValue,fieldLen,fieldNull,isList,fieldOrderNo,remark,createTime,createUserId,updateTime,updateUserId)
VALUES VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," > <foreach collection="data.dataList" item="item" index="index" separator="," >
(#{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}) (#{item.datasetId},#{item.fieldCode},#{item.fieldName},#{item.fieldType},#{item.fieldTypeValue},#{item.dataType},#{item.fieldValue},#{item.defaultValue},#{item.fieldLen},#{item.fieldNull},#{item.isList},#{item.fieldOrderNo},#{item.remark},#{item.createTime},#{item.createUserId},#{item.updateTime},#{item.updateUserId})
</foreach> </foreach>
</insert> </insert>
...@@ -110,6 +110,12 @@ ...@@ -110,6 +110,12 @@
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>
...@@ -119,12 +125,18 @@ ...@@ -119,12 +125,18 @@
<if test="(colPickMode==0 and data.containsKey('fieldType')) or (colPickMode==1 and !data.containsKey('fieldType'))"> <if test="(colPickMode==0 and data.containsKey('fieldType')) or (colPickMode==1 and !data.containsKey('fieldType'))">
a.fieldType=#{data.fieldType}, a.fieldType=#{data.fieldType},
</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('dataType')) or (colPickMode==1 and !data.containsKey('dataType'))"> <if test="(colPickMode==0 and data.containsKey('dataType')) or (colPickMode==1 and !data.containsKey('dataType'))">
a.dataType=#{data.dataType}, a.dataType=#{data.dataType},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('fieldValue')) or (colPickMode==1 and !data.containsKey('fieldValue'))"> <if test="(colPickMode==0 and data.containsKey('fieldValue')) or (colPickMode==1 and !data.containsKey('fieldValue'))">
a.fieldValue=#{data.fieldValue}, a.fieldValue=#{data.fieldValue},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('defaultValue')) or (colPickMode==1 and !data.containsKey('defaultValue'))">
a.defaultValue=#{data.defaultValue},
</if>
<if test="(colPickMode==0 and data.containsKey('fieldLen')) or (colPickMode==1 and !data.containsKey('fieldLen'))"> <if test="(colPickMode==0 and data.containsKey('fieldLen')) or (colPickMode==1 and !data.containsKey('fieldLen'))">
a.fieldLen=#{data.fieldLen}, a.fieldLen=#{data.fieldLen},
</if> </if>
...@@ -170,18 +182,6 @@ ...@@ -170,18 +182,6 @@
<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
...@@ -194,6 +194,18 @@ ...@@ -194,6 +194,18 @@
<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'))">
...@@ -215,6 +227,13 @@ ...@@ -215,6 +227,13 @@
</if> </if>
</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="dataType=(case" suffix="ELSE dataType end),"> <trim prefix="dataType=(case" suffix="ELSE dataType 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('dataType')) or (colPickMode==1 and !item.containsKey('dataType'))"> <if test="(colPickMode==0 and item.containsKey('dataType')) or (colPickMode==1 and !item.containsKey('dataType'))">
...@@ -229,6 +248,13 @@ ...@@ -229,6 +248,13 @@
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="defaultValue=(case" suffix="ELSE defaultValue end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('defaultValue')) or (colPickMode==1 and !item.containsKey('defaultValue'))">
when a.id=#{item.id} then #{item.defaultValue}
</if>
</foreach>
</trim>
<trim prefix="fieldLen=(case" suffix="ELSE fieldLen end),"> <trim prefix="fieldLen=(case" suffix="ELSE fieldLen end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<choose> <choose>
...@@ -322,32 +348,6 @@ ...@@ -322,32 +348,6 @@
</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=")">
...@@ -491,6 +491,33 @@ ...@@ -491,6 +491,33 @@
${_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') and conditionParamRef.datasetIdList.size() > 0">
${_conditionType_} a.datasetId in
<foreach collection="conditionParamRef.datasetIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('datasetIdNotList') and conditionParamRef.datasetIdNotList.size() > 0">
${_conditionType_} a.datasetId not in
<foreach collection="conditionParamRef.datasetIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('datasetIdStart') and conditionParamRef.datasetIdStart != null">
${_conditionType_} a.datasetId <![CDATA[ >= ]]> #{${_conditionParam_}.datasetIdStart}
</if>
<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 != ''">
...@@ -555,6 +582,27 @@ ...@@ -555,6 +582,27 @@
</foreach> </foreach>
</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('dataType')"> <if test="conditionParamRef.containsKey('dataType')">
<if test="conditionParamRef.dataType != null and conditionParamRef.dataType != ''"> <if test="conditionParamRef.dataType != null and conditionParamRef.dataType != ''">
${_conditionType_} a.dataType like #{${_conditionParam_}.dataType} ${_conditionType_} a.dataType like #{${_conditionParam_}.dataType}
...@@ -596,6 +644,27 @@ ...@@ -596,6 +644,27 @@
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('defaultValue')">
<if test="conditionParamRef.defaultValue != null and conditionParamRef.defaultValue != ''">
${_conditionType_} a.defaultValue like #{${_conditionParam_}.defaultValue}
</if>
<if test="conditionParamRef.defaultValue == null">
${_conditionType_} a.defaultValue is null
</if>
</if>
<if test="conditionParamRef.containsKey('defaultValueList') and conditionParamRef.defaultValueList.size() > 0">
${_conditionType_} a.defaultValue in
<foreach collection="conditionParamRef.defaultValueList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('defaultValueNotList') and conditionParamRef.defaultValueNotList.size() > 0">
${_conditionType_} a.defaultValue not in
<foreach collection="conditionParamRef.defaultValueNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('fieldLen')"> <if test="conditionParamRef.containsKey('fieldLen')">
<if test="conditionParamRef.fieldLen != null "> <if test="conditionParamRef.fieldLen != null ">
${_conditionType_} a.fieldLen = #{${_conditionParam_}.fieldLen} ${_conditionType_} a.fieldLen = #{${_conditionParam_}.fieldLen}
...@@ -809,75 +878,6 @@ ...@@ -809,75 +878,6 @@
${_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()">
...@@ -896,6 +896,11 @@ ...@@ -896,6 +896,11 @@
<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>
...@@ -911,6 +916,11 @@ ...@@ -911,6 +916,11 @@
<if test='orderCol.fieldType != null and "DESC".equalsIgnoreCase(orderCol.fieldType)'>DESC</if> <if test='orderCol.fieldType != null and "DESC".equalsIgnoreCase(orderCol.fieldType)'>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('dataType')"> <if test="orderCol.containsKey('dataType')">
a.dataType a.dataType
<if test='orderCol.dataType != null and "DESC".equalsIgnoreCase(orderCol.dataType)'>DESC</if> <if test='orderCol.dataType != null and "DESC".equalsIgnoreCase(orderCol.dataType)'>DESC</if>
...@@ -921,6 +931,11 @@ ...@@ -921,6 +931,11 @@
<if test='orderCol.fieldValue != null and "DESC".equalsIgnoreCase(orderCol.fieldValue)'>DESC</if> <if test='orderCol.fieldValue != null and "DESC".equalsIgnoreCase(orderCol.fieldValue)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('defaultValue')">
a.defaultValue
<if test='orderCol.defaultValue != null and "DESC".equalsIgnoreCase(orderCol.defaultValue)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('fieldLen')"> <if test="orderCol.containsKey('fieldLen')">
a.fieldLen a.fieldLen
<if test='orderCol.fieldLen != null and "DESC".equalsIgnoreCase(orderCol.fieldLen)'>DESC</if> <if test='orderCol.fieldLen != null and "DESC".equalsIgnoreCase(orderCol.fieldLen)'>DESC</if>
...@@ -966,21 +981,6 @@ ...@@ -966,21 +981,6 @@
<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/test/java/com/mortals/httpclient/app/AppInfoFieldController.http
View file @ 42b1b3f9
...@@ -19,7 +19,6 @@ Authorization: {{authToken}} ...@@ -19,7 +19,6 @@ Authorization: {{authToken}}
Content-Type: application/json Content-Type: application/json
{ {
"datasetId": 1,
"page": 1, "page": 1,
"size": 10 "size": 10
} }
......
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