Skip to content

S
smart_gov_platform
Commit e697da2d authored by “yiyousong”'s avatar “yiyousong”
Browse files
Options

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

parents f1574186 6a14a35d
Show whitespace changes
Inline Side-by-side
Showing with 660 additions and 655 deletions
base-manager/db/add.sql
View file @ e697da2d
...@@ -18,6 +18,9 @@ ALTER TABLE mortals_sys_workman ADD COLUMN `operatorId` varchar (128) default " ...@@ -18,6 +18,9 @@ ALTER TABLE mortals_sys_workman ADD COLUMN `operatorId` varchar (128) default "
-- ---------------------------- -- ----------------------------
2023-3-28 2023-3-28
-- ---------------------------- -- ----------------------------
...@@ -197,3 +200,14 @@ ALTER TABLE mortals_sys_app_category ADD COLUMN `remark` varchar(256) DEFAULT ...@@ -197,3 +200,14 @@ ALTER TABLE mortals_sys_app_category ADD COLUMN `remark` varchar(256) DEFAULT
2023-08-29 2023-08-29
-- ---------------------------- -- ----------------------------
ALTER TABLE `mortals_sys_model` ADD COLUMN `type` tinyint(2) DEFAULT '1' COMMENT '模块分类' AFTER `sort`; ALTER TABLE `mortals_sys_model` ADD COLUMN `type` tinyint(2) DEFAULT '1' COMMENT '模块分类' AFTER `sort`;
-- ----------------------------
2023-9-11
-- ----------------------------
ALTER TABLE mortals_sys_app_info_field ADD COLUMN `serviceApi` varchar(255) default '' COMMENT '事件服务接口请求地址';
ALTER TABLE mortals_sys_app_info_field ADD COLUMN `serviceAprParams` varchar(1024) default '' COMMENT '事件服务接口请求参数';
ALTER TABLE mortals_sys_app_info_templete_field ADD COLUMN `serviceApi` varchar(255) default '' COMMENT '事件服务接口请求地址';
ALTER TABLE mortals_sys_app_info_templete_field ADD COLUMN `serviceAprParams` varchar(1024) default '' COMMENT '事件服务接口请求参数';
base-manager/src/main/java/com/mortals/xhx/module/app/model/AppInfoFieldEntity.java
View file @ e697da2d
package com.mortals.xhx.module.app.model; package com.mortals.xhx.module.app.model;
import java.util.List; import java.util.List;
import java.util.ArrayList; import java.util.ArrayList;
import java.math.BigDecimal;
import cn.hutool.core.date.DateUtil;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.mortals.framework.annotation.Excel; 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;
import lombok.Data;
/** /**
* 自助终端应用模板信息字段实体对象 * 自助终端应用模板信息字段实体对象
* *
* @author zxfei * @author zxfei
* @date 2023-03-28 * @date 2023-09-12
*/ */
@Data
public class AppInfoFieldEntity extends AppInfoFieldVo { public class AppInfoFieldEntity extends AppInfoFieldVo {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -68,196 +71,14 @@ public class AppInfoFieldEntity extends AppInfoFieldVo { ...@@ -68,196 +71,14 @@ public class AppInfoFieldEntity extends AppInfoFieldVo {
* 备注 * 备注
*/ */
private String remark; private String remark;
public AppInfoFieldEntity(){}
/**
* 获取 数据集id
* @return Long
*/
public Long getDatasetId(){
return datasetId;
}
/**
* 设置 数据集id
* @param datasetId
*/
public void setDatasetId(Long datasetId){
this.datasetId = datasetId;
}
/**
* 获取 字段编码
* @return String
*/
public String getFieldCode(){
return fieldCode;
}
/**
* 设置 字段编码
* @param fieldCode
*/
public void setFieldCode(String fieldCode){
this.fieldCode = fieldCode;
}
/**
* 获取 字段名称
* @return String
*/
public String getFieldName(){
return fieldName;
}
/**
* 设置 字段名称
* @param fieldName
*/
public void setFieldName(String fieldName){
this.fieldName = fieldName;
}
/**
* 获取 字段类型（input.单行输入框,textarea.多行输入框,SELECT.下拉选项框,date.日期选择框,editer.富文本）
* @return String
*/
public String getFieldType(){
return fieldType;
}
/**
* 设置 字段类型（input.单行输入框,textarea.多行输入框,SELECT.下拉选项框,date.日期选择框,editer.富文本）
* @param fieldType
*/
public void setFieldType(String fieldType){
this.fieldType = fieldType;
}
/**
* 获取 字段类型值，当字段类型为多选，单选时候，预设复选值
* @return String
*/
public String getFieldTypeValue(){
return fieldTypeValue;
}
/**
* 设置 字段类型值，当字段类型为多选，单选时候，预设复选值
* @param fieldTypeValue
*/
public void setFieldTypeValue(String fieldTypeValue){
this.fieldTypeValue = fieldTypeValue;
}
/**
* 获取 数据类型（number.数字,string.字符串）
* @return String
*/
public String getDataType(){
return dataType;
}
/**
* 设置 数据类型（number.数字,string.字符串）
* @param dataType
*/
public void setDataType(String dataType){
this.dataType = dataType;
}
/**
* 获取 字段值
* @return String
*/
public String getFieldValue(){
return fieldValue;
}
/**
* 设置 字段值
* @param fieldValue
*/
public void setFieldValue(String fieldValue){
this.fieldValue = fieldValue;
}
/**
* 获取 字段默认值
* @return String
*/
public String getDefaultValue(){
return defaultValue;
}
/** /**
* 设置 字段默认值 * 事件服务接口请求地址
* @param defaultValue
*/ */
public void setDefaultValue(String defaultValue){ private String serviceApi;
this.defaultValue = defaultValue;
}
/** /**
* 获取 数据长度，默认128 * 事件服务接口请求参数
* @return Integer
*/ */
public Integer getFieldLen(){ private String serviceAprParams;
return fieldLen;
}
/**
* 设置 数据长度，默认128
* @param fieldLen
*/
public void setFieldLen(Integer fieldLen){
this.fieldLen = fieldLen;
}
/**
* 获取 是否允许为空，(0.否,1.是)
* @return Integer
*/
public Integer getFieldNull(){
return fieldNull;
}
/**
* 设置 是否允许为空，(0.否,1.是)
* @param fieldNull
*/
public void setFieldNull(Integer fieldNull){
this.fieldNull = fieldNull;
}
/**
* 获取 字段是否列表显示(0.否,1.是)
* @return Integer
*/
public Integer getIsList(){
return isList;
}
/**
* 设置 字段是否列表显示(0.否,1.是)
* @param isList
*/
public void setIsList(Integer isList){
this.isList = isList;
}
/**
* 获取 排序号
* @return Integer
*/
public Integer getFieldOrderNo(){
return fieldOrderNo;
}
/**
* 设置 排序号
* @param fieldOrderNo
*/
public void setFieldOrderNo(Integer fieldOrderNo){
this.fieldOrderNo = fieldOrderNo;
}
/**
* 获取 备注
* @return String
*/
public String getRemark(){
return remark;
}
/**
* 设置 备注
* @param remark
*/
public void setRemark(String remark){
this.remark = remark;
}
@Override @Override
public int hashCode() { public int hashCode() {
return this.getId().hashCode(); return this.getId().hashCode();
...@@ -274,50 +95,21 @@ public class AppInfoFieldEntity extends AppInfoFieldVo { ...@@ -274,50 +95,21 @@ public class AppInfoFieldEntity extends AppInfoFieldVo {
return false; return false;
} }
public String toString(){
StringBuilder sb = new StringBuilder("");
sb.append(",datasetId:").append(getDatasetId());
sb.append(",fieldCode:").append(getFieldCode());
sb.append(",fieldName:").append(getFieldName());
sb.append(",fieldType:").append(getFieldType());
sb.append(",fieldTypeValue:").append(getFieldTypeValue());
sb.append(",dataType:").append(getDataType());
sb.append(",fieldValue:").append(getFieldValue());
sb.append(",defaultValue:").append(getDefaultValue());
sb.append(",fieldLen:").append(getFieldLen());
sb.append(",fieldNull:").append(getFieldNull());
sb.append(",isList:").append(getIsList());
sb.append(",fieldOrderNo:").append(getFieldOrderNo());
sb.append(",remark:").append(getRemark());
return sb.toString();
}
public void initAttrValue(){ public void initAttrValue(){
this.datasetId = null; this.datasetId = null;
this.fieldCode = ""; this.fieldCode = "";
this.fieldName = ""; this.fieldName = "";
this.fieldType = ""; this.fieldType = "";
this.fieldTypeValue = ""; this.fieldTypeValue = "";
this.dataType = ""; this.dataType = "";
this.fieldValue = ""; this.fieldValue = "";
this.defaultValue = ""; this.defaultValue = "";
this.fieldLen = 0; this.fieldLen = 0;
this.fieldNull = 1; this.fieldNull = 1;
this.isList = 0; this.isList = 0;
this.fieldOrderNo = 1; this.fieldOrderNo = 1;
this.remark = ""; this.remark = "";
this.serviceApi = "";
this.serviceAprParams = "";
} }
} }
\ No newline at end of file
base-manager/src/main/java/com/mortals/xhx/module/app/model/AppInfoFieldQuery.java
View file @ e697da2d
...@@ -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 2023-03-28 * @date 2023-09-12
*/ */
public class AppInfoFieldQuery extends AppInfoFieldEntity { public class AppInfoFieldQuery extends AppInfoFieldEntity {
/** 开始 序号，主键，自增长 */ /** 开始 序号，主键，自增长 */
...@@ -139,6 +139,16 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity { ...@@ -139,6 +139,16 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity {
/** 备注排除列表 */ /** 备注排除列表 */
private List <String> remarkNotList; private List <String> remarkNotList;
/** 事件服务接口请求地址 */
private List<String> serviceApiList;
/** 事件服务接口请求地址排除列表 */
private List <String> serviceApiNotList;
/** 事件服务接口请求参数 */
private List<String> serviceAprParamsList;
/** 事件服务接口请求参数排除列表 */
private List <String> serviceAprParamsNotList;
/** 开始 创建时间 */ /** 开始 创建时间 */
private String createTimeStart; private String createTimeStart;
...@@ -931,6 +941,70 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity { ...@@ -931,6 +941,70 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity {
this.remarkNotList = remarkNotList; this.remarkNotList = remarkNotList;
} }
/**
* 获取 事件服务接口请求地址
* @return serviceApiList
*/
public List<String> getServiceApiList(){
return this.serviceApiList;
}
/**
* 设置 事件服务接口请求地址
* @param serviceApiList
*/
public void setServiceApiList(List<String> serviceApiList){
this.serviceApiList = serviceApiList;
}
/**
* 获取 事件服务接口请求地址
* @return serviceApiNotList
*/
public List<String> getServiceApiNotList(){
return this.serviceApiNotList;
}
/**
* 设置 事件服务接口请求地址
* @param serviceApiNotList
*/
public void setServiceApiNotList(List<String> serviceApiNotList){
this.serviceApiNotList = serviceApiNotList;
}
/**
* 获取 事件服务接口请求参数
* @return serviceAprParamsList
*/
public List<String> getServiceAprParamsList(){
return this.serviceAprParamsList;
}
/**
* 设置 事件服务接口请求参数
* @param serviceAprParamsList
*/
public void setServiceAprParamsList(List<String> serviceAprParamsList){
this.serviceAprParamsList = serviceAprParamsList;
}
/**
* 获取 事件服务接口请求参数
* @return serviceAprParamsNotList
*/
public List<String> getServiceAprParamsNotList(){
return this.serviceAprParamsNotList;
}
/**
* 设置 事件服务接口请求参数
* @param serviceAprParamsNotList
*/
public void setServiceAprParamsNotList(List<String> serviceAprParamsNotList){
this.serviceAprParamsNotList = serviceAprParamsNotList;
}
/** /**
* 获取 开始 创建时间 * 获取 开始 创建时间
* @return createTimeStart * @return createTimeStart
...@@ -1634,6 +1708,44 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity { ...@@ -1634,6 +1708,44 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity {
} }
/**
* 设置 事件服务接口请求地址
* @param serviceApi
*/
public AppInfoFieldQuery serviceApi(String serviceApi){
setServiceApi(serviceApi);
return this;
}
/**
* 设置 事件服务接口请求地址
* @param serviceApiList
*/
public AppInfoFieldQuery serviceApiList(List<String> serviceApiList){
this.serviceApiList = serviceApiList;
return this;
}
/**
* 设置 事件服务接口请求参数
* @param serviceAprParams
*/
public AppInfoFieldQuery serviceAprParams(String serviceAprParams){
setServiceAprParams(serviceAprParams);
return this;
}
/**
* 设置 事件服务接口请求参数
* @param serviceAprParamsList
*/
public AppInfoFieldQuery serviceAprParamsList(List<String> serviceAprParamsList){
this.serviceAprParamsList = serviceAprParamsList;
return this;
}
/** /**
* 设置 创建用户 * 设置 创建用户
* @param createUserId * @param createUserId
......
base-manager/src/main/java/com/mortals/xhx/module/app/model/AppInfoTempleteFieldEntity.java
View file @ e697da2d
...@@ -2,17 +2,25 @@ package com.mortals.xhx.module.app.model; ...@@ -2,17 +2,25 @@ package com.mortals.xhx.module.app.model;
import java.util.List; import java.util.List;
import java.util.ArrayList; import java.util.ArrayList;
import java.math.BigDecimal;
import cn.hutool.core.date.DateUtil;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.mortals.framework.annotation.Excel; 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.AppInfoTempleteFieldVo; import com.mortals.xhx.module.app.model.vo.AppInfoTempleteFieldVo;
import lombok.Data;
/** /**
* 自助终端应用模板信息字段实体对象 * 自助终端应用模板信息字段实体对象
* *
* @author zxfei * @author zxfei
* @date 2023-03-28 * @date 2023-09-12
*/ */
@Data
public class AppInfoTempleteFieldEntity extends AppInfoTempleteFieldVo { public class AppInfoTempleteFieldEntity extends AppInfoTempleteFieldVo {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -32,6 +40,10 @@ public class AppInfoTempleteFieldEntity extends AppInfoTempleteFieldVo { ...@@ -32,6 +40,10 @@ public class AppInfoTempleteFieldEntity extends AppInfoTempleteFieldVo {
* 字段类型（input.单行输入框,textarea.多行输入框,SELECT.下拉选项框,date.日期选择框,editer.富文本） * 字段类型（input.单行输入框,textarea.多行输入框,SELECT.下拉选项框,date.日期选择框,editer.富文本）
*/ */
private String fieldType; private String fieldType;
/**
* 字段类型值，当字段类型为多选，单选时候，预设复选值
*/
private String fieldTypeValue;
/** /**
* 数据类型（number.数字,string.字符串） * 数据类型（number.数字,string.字符串）
*/ */
...@@ -40,6 +52,10 @@ public class AppInfoTempleteFieldEntity extends AppInfoTempleteFieldVo { ...@@ -40,6 +52,10 @@ public class AppInfoTempleteFieldEntity extends AppInfoTempleteFieldVo {
* 字段值 * 字段值
*/ */
private String fieldValue; private String fieldValue;
/**
* 字段默认值
*/
private String defaultValue;
/** /**
* 数据长度，默认128 * 数据长度，默认128
*/ */
...@@ -61,207 +77,19 @@ public class AppInfoTempleteFieldEntity extends AppInfoTempleteFieldVo { ...@@ -61,207 +77,19 @@ public class AppInfoTempleteFieldEntity extends AppInfoTempleteFieldVo {
*/ */
private String remark; private String remark;
/** /**
* 字段类型值，当字段类型为多选，单选时候，预设复选值 * 事件服务接口请求地址
*/ */
private String fieldTypeValue; private String serviceApi;
/** /**
* 字段默认值 * 事件服务接口请求参数，json格式
*/ */
private String defaultValue; private String serviceAprParams;
public AppInfoTempleteFieldEntity(){}
/**
* 获取 应用id
* @return Long
*/
public Long getAppId(){
return appId;
}
/**
* 设置 应用id
* @param appId
*/
public void setAppId(Long appId){
this.appId = appId;
}
/**
* 获取 字段编码
* @return String
*/
public String getFieldCode(){
return fieldCode;
}
/**
* 设置 字段编码
* @param fieldCode
*/
public void setFieldCode(String fieldCode){
this.fieldCode = fieldCode;
}
/**
* 获取 字段名称
* @return String
*/
public String getFieldName(){
return fieldName;
}
/**
* 设置 字段名称
* @param fieldName
*/
public void setFieldName(String fieldName){
this.fieldName = fieldName;
}
/**
* 获取 字段类型（input.单行输入框,textarea.多行输入框,SELECT.下拉选项框,date.日期选择框,editer.富文本）
* @return String
*/
public String getFieldType(){
return fieldType;
}
/**
* 设置 字段类型（input.单行输入框,textarea.多行输入框,SELECT.下拉选项框,date.日期选择框,editer.富文本）
* @param fieldType
*/
public void setFieldType(String fieldType){
this.fieldType = fieldType;
}
/**
* 获取 数据类型（number.数字,string.字符串）
* @return String
*/
public String getDataType(){
return dataType;
}
/**
* 设置 数据类型（number.数字,string.字符串）
* @param dataType
*/
public void setDataType(String dataType){
this.dataType = dataType;
}
/**
* 获取 字段值
* @return String
*/
public String getFieldValue(){
return fieldValue;
}
/**
* 设置 字段值
* @param fieldValue
*/
public void setFieldValue(String fieldValue){
this.fieldValue = fieldValue;
}
/**
* 获取 数据长度，默认128
* @return Integer
*/
public Integer getFieldLen(){
return fieldLen;
}
/**
* 设置 数据长度，默认128
* @param fieldLen
*/
public void setFieldLen(Integer fieldLen){
this.fieldLen = fieldLen;
}
/**
* 获取 是否允许为空，(0.否,1.是)
* @return Integer
*/
public Integer getFieldNull(){
return fieldNull;
}
/**
* 设置 是否允许为空，(0.否,1.是)
* @param fieldNull
*/
public void setFieldNull(Integer fieldNull){
this.fieldNull = fieldNull;
}
/**
* 获取 字段是否列表显示(0.否,1.是)
* @return Integer
*/
public Integer getIsList(){
return isList;
}
/**
* 设置 字段是否列表显示(0.否,1.是)
* @param isList
*/
public void setIsList(Integer isList){
this.isList = isList;
}
/**
* 获取 排序号
* @return Integer
*/
public Integer getFieldOrderNo(){
return fieldOrderNo;
}
/**
* 设置 排序号
* @param fieldOrderNo
*/
public void setFieldOrderNo(Integer fieldOrderNo){
this.fieldOrderNo = fieldOrderNo;
}
/**
* 获取 备注
* @return String
*/
public String getRemark(){
return remark;
}
/**
* 设置 备注
* @param remark
*/
public void setRemark(String remark){
this.remark = remark;
}
/**
* 获取 字段类型值，当字段类型为多选，单选时候，预设复选值
* @return String
*/
public String getFieldTypeValue(){
return fieldTypeValue;
}
/**
* 设置 字段类型值，当字段类型为多选，单选时候，预设复选值
* @param fieldTypeValue
*/
public void setFieldTypeValue(String fieldTypeValue){
this.fieldTypeValue = fieldTypeValue;
}
/**
* 获取 字段默认值
* @return String
*/
public String getDefaultValue(){
return defaultValue;
}
/**
* 设置 字段默认值
* @param defaultValue
*/
public void setDefaultValue(String defaultValue){
this.defaultValue = defaultValue;
}
@Override @Override
public int hashCode() { public int hashCode() {
return this.getId().hashCode(); return this.getId().hashCode();
} }
@Override @Override
public boolean equals(Object obj) { public boolean equals(Object obj) {
if (obj == null) return false; if (obj == null) return false;
...@@ -274,50 +102,21 @@ public class AppInfoTempleteFieldEntity extends AppInfoTempleteFieldVo { ...@@ -274,50 +102,21 @@ public class AppInfoTempleteFieldEntity extends AppInfoTempleteFieldVo {
return false; return false;
} }
public String toString(){ public void initAttrValue() {
StringBuilder sb = new StringBuilder("");
sb.append(",appId:").append(getAppId());
sb.append(",fieldCode:").append(getFieldCode());
sb.append(",fieldName:").append(getFieldName());
sb.append(",fieldType:").append(getFieldType());
sb.append(",dataType:").append(getDataType());
sb.append(",fieldValue:").append(getFieldValue());
sb.append(",fieldLen:").append(getFieldLen());
sb.append(",fieldNull:").append(getFieldNull());
sb.append(",isList:").append(getIsList());
sb.append(",fieldOrderNo:").append(getFieldOrderNo());
sb.append(",remark:").append(getRemark());
sb.append(",fieldTypeValue:").append(getFieldTypeValue());
sb.append(",defaultValue:").append(getDefaultValue());
return sb.toString();
}
public void initAttrValue(){
this.appId = null; this.appId = 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;
this.isList = 0; this.isList = 0;
this.fieldOrderNo = 1; this.fieldOrderNo = 1;
this.remark = ""; this.remark = "";
this.serviceApi = "";
this.fieldTypeValue = ""; this.serviceAprParams = "";
this.defaultValue = "";
} }
} }
\ No newline at end of file
base-manager/src/main/java/com/mortals/xhx/module/app/model/AppInfoTempleteFieldQuery.java
View file @ e697da2d
...@@ -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 2023-03-28 * @date 2023-09-12
*/ */
public class AppInfoTempleteFieldQuery extends AppInfoTempleteFieldEntity { public class AppInfoTempleteFieldQuery extends AppInfoTempleteFieldEntity {
/** 开始 序号，主键，自增长 */ /** 开始 序号，主键，自增长 */
...@@ -54,6 +54,11 @@ public class AppInfoTempleteFieldQuery extends AppInfoTempleteFieldEntity { ...@@ -54,6 +54,11 @@ public class AppInfoTempleteFieldQuery extends AppInfoTempleteFieldEntity {
/** 字段类型（input.单行输入框,textarea.多行输入框,SELECT.下拉选项框,date.日期选择框,editer.富文本）排除列表 */ /** 字段类型（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;
...@@ -64,6 +69,11 @@ public class AppInfoTempleteFieldQuery extends AppInfoTempleteFieldEntity { ...@@ -64,6 +69,11 @@ public class AppInfoTempleteFieldQuery extends AppInfoTempleteFieldEntity {
/** 字段值排除列表 */ /** 字段值排除列表 */
private List <String> fieldValueNotList; private List <String> fieldValueNotList;
/** 字段默认值 */
private List<String> defaultValueList;
/** 字段默认值排除列表 */
private List <String> defaultValueNotList;
/** 开始 数据长度，默认128 */ /** 开始 数据长度，默认128 */
private Integer fieldLenStart; private Integer fieldLenStart;
...@@ -129,6 +139,16 @@ public class AppInfoTempleteFieldQuery extends AppInfoTempleteFieldEntity { ...@@ -129,6 +139,16 @@ public class AppInfoTempleteFieldQuery extends AppInfoTempleteFieldEntity {
/** 备注排除列表 */ /** 备注排除列表 */
private List <String> remarkNotList; private List <String> remarkNotList;
/** 事件服务接口请求地址 */
private List<String> serviceApiList;
/** 事件服务接口请求地址排除列表 */
private List <String> serviceApiNotList;
/** 事件服务接口请求参数，json格式 */
private List<String> serviceAprParamsList;
/** 事件服务接口请求参数，json格式排除列表 */
private List <String> serviceAprParamsNotList;
/** 开始 创建时间 */ /** 开始 创建时间 */
private String createTimeStart; private String createTimeStart;
...@@ -171,16 +191,6 @@ public class AppInfoTempleteFieldQuery extends AppInfoTempleteFieldEntity { ...@@ -171,16 +191,6 @@ public class AppInfoTempleteFieldQuery extends AppInfoTempleteFieldEntity {
/** 修改用户排除列表 */ /** 修改用户排除列表 */
private List <Long> updateUserIdNotList; 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;
...@@ -447,6 +457,38 @@ public class AppInfoTempleteFieldQuery extends AppInfoTempleteFieldEntity { ...@@ -447,6 +457,38 @@ public class AppInfoTempleteFieldQuery extends AppInfoTempleteFieldEntity {
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
...@@ -511,6 +553,38 @@ public class AppInfoTempleteFieldQuery extends AppInfoTempleteFieldEntity { ...@@ -511,6 +553,38 @@ public class AppInfoTempleteFieldQuery extends AppInfoTempleteFieldEntity {
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
...@@ -867,6 +941,70 @@ public class AppInfoTempleteFieldQuery extends AppInfoTempleteFieldEntity { ...@@ -867,6 +941,70 @@ public class AppInfoTempleteFieldQuery extends AppInfoTempleteFieldEntity {
this.remarkNotList = remarkNotList; this.remarkNotList = remarkNotList;
} }
/**
* 获取 事件服务接口请求地址
* @return serviceApiList
*/
public List<String> getServiceApiList(){
return this.serviceApiList;
}
/**
* 设置 事件服务接口请求地址
* @param serviceApiList
*/
public void setServiceApiList(List<String> serviceApiList){
this.serviceApiList = serviceApiList;
}
/**
* 获取 事件服务接口请求地址
* @return serviceApiNotList
*/
public List<String> getServiceApiNotList(){
return this.serviceApiNotList;
}
/**
* 设置 事件服务接口请求地址
* @param serviceApiNotList
*/
public void setServiceApiNotList(List<String> serviceApiNotList){
this.serviceApiNotList = serviceApiNotList;
}
/**
* 获取 事件服务接口请求参数，json格式
* @return serviceAprParamsList
*/
public List<String> getServiceAprParamsList(){
return this.serviceAprParamsList;
}
/**
* 设置 事件服务接口请求参数，json格式
* @param serviceAprParamsList
*/
public void setServiceAprParamsList(List<String> serviceAprParamsList){
this.serviceAprParamsList = serviceAprParamsList;
}
/**
* 获取 事件服务接口请求参数，json格式
* @return serviceAprParamsNotList
*/
public List<String> getServiceAprParamsNotList(){
return this.serviceAprParamsNotList;
}
/**
* 设置 事件服务接口请求参数，json格式
* @param serviceAprParamsNotList
*/
public void setServiceAprParamsNotList(List<String> serviceAprParamsNotList){
this.serviceAprParamsNotList = serviceAprParamsNotList;
}
/** /**
* 获取 开始 创建时间 * 获取 开始 创建时间
* @return createTimeStart * @return createTimeStart
...@@ -1093,70 +1231,6 @@ public class AppInfoTempleteFieldQuery extends AppInfoTempleteFieldEntity { ...@@ -1093,70 +1231,6 @@ public class AppInfoTempleteFieldQuery extends AppInfoTempleteFieldEntity {
} }
/**
* 获取 字段类型值，当字段类型为多选，单选时候，预设复选值
* @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
...@@ -1323,6 +1397,25 @@ public class AppInfoTempleteFieldQuery extends AppInfoTempleteFieldEntity { ...@@ -1323,6 +1397,25 @@ public class AppInfoTempleteFieldQuery extends AppInfoTempleteFieldEntity {
} }
/**
* 设置 字段类型值，当字段类型为多选，单选时候，预设复选值
* @param fieldTypeValue
*/
public AppInfoTempleteFieldQuery fieldTypeValue(String fieldTypeValue){
setFieldTypeValue(fieldTypeValue);
return this;
}
/**
* 设置 字段类型值，当字段类型为多选，单选时候，预设复选值
* @param fieldTypeValueList
*/
public AppInfoTempleteFieldQuery fieldTypeValueList(List<String> fieldTypeValueList){
this.fieldTypeValueList = fieldTypeValueList;
return this;
}
/** /**
* 设置 数据类型（number.数字,string.字符串） * 设置 数据类型（number.数字,string.字符串）
* @param dataType * @param dataType
...@@ -1360,6 +1453,25 @@ public class AppInfoTempleteFieldQuery extends AppInfoTempleteFieldEntity { ...@@ -1360,6 +1453,25 @@ public class AppInfoTempleteFieldQuery extends AppInfoTempleteFieldEntity {
return this; 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;
}
/** /**
* 设置 数据长度，默认128 * 设置 数据长度，默认128
* @param fieldLen * @param fieldLen
...@@ -1596,6 +1708,44 @@ public class AppInfoTempleteFieldQuery extends AppInfoTempleteFieldEntity { ...@@ -1596,6 +1708,44 @@ public class AppInfoTempleteFieldQuery extends AppInfoTempleteFieldEntity {
} }
/**
* 设置 事件服务接口请求地址
* @param serviceApi
*/
public AppInfoTempleteFieldQuery serviceApi(String serviceApi){
setServiceApi(serviceApi);
return this;
}
/**
* 设置 事件服务接口请求地址
* @param serviceApiList
*/
public AppInfoTempleteFieldQuery serviceApiList(List<String> serviceApiList){
this.serviceApiList = serviceApiList;
return this;
}
/**
* 设置 事件服务接口请求参数，json格式
* @param serviceAprParams
*/
public AppInfoTempleteFieldQuery serviceAprParams(String serviceAprParams){
setServiceAprParams(serviceAprParams);
return this;
}
/**
* 设置 事件服务接口请求参数，json格式
* @param serviceAprParamsList
*/
public AppInfoTempleteFieldQuery serviceAprParamsList(List<String> serviceAprParamsList){
this.serviceAprParamsList = serviceAprParamsList;
return this;
}
/** /**
* 设置 创建用户 * 设置 创建用户
* @param createUserId * @param createUserId
...@@ -1705,44 +1855,6 @@ public class AppInfoTempleteFieldQuery extends AppInfoTempleteFieldEntity { ...@@ -1705,44 +1855,6 @@ public class AppInfoTempleteFieldQuery extends AppInfoTempleteFieldEntity {
return this; 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/java/com/mortals/xhx/module/app/web/AppDatasetController.java
View file @ e697da2d
...@@ -62,9 +62,17 @@ public class AppDatasetController extends BaseCRUDJsonBodyMappingController<AppD ...@@ -62,9 +62,17 @@ public class AppDatasetController extends BaseCRUDJsonBodyMappingController<AppD
@Override @Override
protected void doListBefore(AppDatasetEntity query, Map<String, Object> model, Context context) throws AppException { protected void doListBefore(AppDatasetEntity query, Map<String, Object> model, Context context) throws AppException {
if (!ObjectUtils.isEmpty(query.getOrConditionList())) { if (!ObjectUtils.isEmpty(query.getOrConditionList())||!ObjectUtils.isEmpty(query.getAndConditionList())) {
AppDatasetQuery appDatasetQuery = new AppDatasetQuery(); AppDatasetQuery appDatasetQuery = new AppDatasetQuery();
if (!ObjectUtils.isEmpty(query.getOrConditionList())){
appDatasetQuery.setOrConditionList(query.getOrConditionList()); appDatasetQuery.setOrConditionList(query.getOrConditionList());
}
if(!ObjectUtils.isEmpty(query.getAndConditionList())){
appDatasetQuery.setOrConditionList(query.getAndConditionList());
}
appDatasetQuery.setAppId(query.getAppId()); appDatasetQuery.setAppId(query.getAppId());
PageInfo pageInfo = this.buildPageInfo(query); PageInfo pageInfo = this.buildPageInfo(query);
......
base-manager/src/main/resources/sqlmap/module/app/AppInfoFieldMapper.xml
View file @ e697da2d
...@@ -19,10 +19,13 @@ ...@@ -19,10 +19,13 @@
<result property="isList" column="isList" /> <result property="isList" column="isList" />
<result property="fieldOrderNo" column="fieldOrderNo" /> <result property="fieldOrderNo" column="fieldOrderNo" />
<result property="remark" column="remark" /> <result property="remark" column="remark" />
<result property="serviceApi" column="serviceApi" />
<result property="serviceAprParams" column="serviceAprParams" />
<result property="createTime" column="createTime" /> <result property="createTime" column="createTime" />
<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" />
</resultMap> </resultMap>
...@@ -71,6 +74,12 @@ ...@@ -71,6 +74,12 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('remark') or colPickMode == 1 and data.containsKey('remark')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('remark') or colPickMode == 1 and data.containsKey('remark')))">
a.remark, a.remark,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('serviceApi') or colPickMode == 1 and data.containsKey('serviceApi')))">
a.serviceApi,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('serviceAprParams') or colPickMode == 1 and data.containsKey('serviceAprParams')))">
a.serviceAprParams,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createTime') or colPickMode == 1 and data.containsKey('createTime')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createTime') or colPickMode == 1 and data.containsKey('createTime')))">
a.createTime, a.createTime,
</if> </if>
...@@ -88,18 +97,18 @@ ...@@ -88,18 +97,18 @@
<!-- 新增 区分主键自增加还是业务插入 --> <!-- 新增 区分主键自增加还是业务插入 -->
<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,fieldTypeValue,dataType,fieldValue,defaultValue,fieldLen,fieldNull,isList,fieldOrderNo,remark,createTime,createUserId,updateTime,updateUserId) (datasetId,fieldCode,fieldName,fieldType,fieldTypeValue,dataType,fieldValue,defaultValue,fieldLen,fieldNull,isList,fieldOrderNo,remark,serviceApi,serviceAprParams,createTime,createUserId,updateTime,updateUserId)
VALUES VALUES
(#{datasetId},#{fieldCode},#{fieldName},#{fieldType},#{fieldTypeValue},#{dataType},#{fieldValue},#{defaultValue},#{fieldLen},#{fieldNull},#{isList},#{fieldOrderNo},#{remark},#{createTime},#{createUserId},#{updateTime},#{updateUserId}) (#{datasetId},#{fieldCode},#{fieldName},#{fieldType},#{fieldTypeValue},#{dataType},#{fieldValue},#{defaultValue},#{fieldLen},#{fieldNull},#{isList},#{fieldOrderNo},#{remark},#{serviceApi},#{serviceAprParams},#{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
(datasetId,fieldCode,fieldName,fieldType,fieldTypeValue,dataType,fieldValue,defaultValue,fieldLen,fieldNull,isList,fieldOrderNo,remark,createTime,createUserId,updateTime,updateUserId) (datasetId,fieldCode,fieldName,fieldType,fieldTypeValue,dataType,fieldValue,defaultValue,fieldLen,fieldNull,isList,fieldOrderNo,remark,serviceApi,serviceAprParams,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.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}) (#{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.serviceApi},#{item.serviceAprParams},#{item.createTime},#{item.createUserId},#{item.updateTime},#{item.updateUserId})
</foreach> </foreach>
</insert> </insert>
...@@ -163,6 +172,12 @@ ...@@ -163,6 +172,12 @@
<if test="(colPickMode==0 and data.containsKey('remark')) or (colPickMode==1 and !data.containsKey('remark'))"> <if test="(colPickMode==0 and data.containsKey('remark')) or (colPickMode==1 and !data.containsKey('remark'))">
a.remark=#{data.remark}, a.remark=#{data.remark},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('serviceApi')) or (colPickMode==1 and !data.containsKey('serviceApi'))">
a.serviceApi=#{data.serviceApi},
</if>
<if test="(colPickMode==0 and data.containsKey('serviceAprParams')) or (colPickMode==1 and !data.containsKey('serviceAprParams'))">
a.serviceAprParams=#{data.serviceAprParams},
</if>
<if test="(colPickMode==0 and data.containsKey('createTime')) or (colPickMode==1 and !data.containsKey('createTime'))"> <if test="(colPickMode==0 and data.containsKey('createTime')) or (colPickMode==1 and !data.containsKey('createTime'))">
a.createTime=#{data.createTime}, a.createTime=#{data.createTime},
</if> </if>
...@@ -309,6 +324,20 @@ ...@@ -309,6 +324,20 @@
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="serviceApi=(case" suffix="ELSE serviceApi end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('serviceApi')) or (colPickMode==1 and !item.containsKey('serviceApi'))">
when a.id=#{item.id} then #{item.serviceApi}
</if>
</foreach>
</trim>
<trim prefix="serviceAprParams=(case" suffix="ELSE serviceAprParams end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('serviceAprParams')) or (colPickMode==1 and !item.containsKey('serviceAprParams'))">
when a.id=#{item.id} then #{item.serviceAprParams}
</if>
</foreach>
</trim>
<trim prefix="createTime=(case" suffix="ELSE createTime end),"> <trim prefix="createTime=(case" suffix="ELSE createTime 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('createTime')) or (colPickMode==1 and !item.containsKey('createTime'))"> <if test="(colPickMode==0 and item.containsKey('createTime')) or (colPickMode==1 and !item.containsKey('createTime'))">
...@@ -794,6 +823,48 @@ ...@@ -794,6 +823,48 @@
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('serviceApi')">
<if test="conditionParamRef.serviceApi != null and conditionParamRef.serviceApi != ''">
${_conditionType_} a.serviceApi like #{${_conditionParam_}.serviceApi}
</if>
<if test="conditionParamRef.serviceApi == null">
${_conditionType_} a.serviceApi is null
</if>
</if>
<if test="conditionParamRef.containsKey('serviceApiList') and conditionParamRef.serviceApiList.size() > 0">
${_conditionType_} a.serviceApi in
<foreach collection="conditionParamRef.serviceApiList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('serviceApiNotList') and conditionParamRef.serviceApiNotList.size() > 0">
${_conditionType_} a.serviceApi not in
<foreach collection="conditionParamRef.serviceApiNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('serviceAprParams')">
<if test="conditionParamRef.serviceAprParams != null and conditionParamRef.serviceAprParams != ''">
${_conditionType_} a.serviceAprParams like #{${_conditionParam_}.serviceAprParams}
</if>
<if test="conditionParamRef.serviceAprParams == null">
${_conditionType_} a.serviceAprParams is null
</if>
</if>
<if test="conditionParamRef.containsKey('serviceAprParamsList') and conditionParamRef.serviceAprParamsList.size() > 0">
${_conditionType_} a.serviceAprParams in
<foreach collection="conditionParamRef.serviceAprParamsList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('serviceAprParamsNotList') and conditionParamRef.serviceAprParamsNotList.size() > 0">
${_conditionType_} a.serviceAprParams not in
<foreach collection="conditionParamRef.serviceAprParamsNotList" 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 ">
${_conditionType_} a.createTime = #{${_conditionParam_}.createTime} ${_conditionType_} a.createTime = #{${_conditionParam_}.createTime}
...@@ -960,6 +1031,16 @@ ...@@ -960,6 +1031,16 @@
<if test='orderCol.remark != null and "DESC".equalsIgnoreCase(orderCol.remark)'>DESC</if> <if test='orderCol.remark != null and "DESC".equalsIgnoreCase(orderCol.remark)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('serviceApi')">
a.serviceApi
<if test='orderCol.serviceApi != null and "DESC".equalsIgnoreCase(orderCol.serviceApi)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('serviceAprParams')">
a.serviceAprParams
<if test='orderCol.serviceAprParams != null and "DESC".equalsIgnoreCase(orderCol.serviceAprParams)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('createTime')"> <if test="orderCol.containsKey('createTime')">
a.createTime a.createTime
<if test='orderCol.createTime != null and "DESC".equalsIgnoreCase(orderCol.createTime)'>DESC</if> <if test='orderCol.createTime != null and "DESC".equalsIgnoreCase(orderCol.createTime)'>DESC</if>
......
base-manager/src/main/resources/sqlmap/module/app/AppInfoTempleteFieldMapper.xml
View file @ e697da2d
...@@ -10,19 +10,21 @@ ...@@ -10,19 +10,21 @@
<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" />
<result property="fieldOrderNo" column="fieldOrderNo" /> <result property="fieldOrderNo" column="fieldOrderNo" />
<result property="remark" column="remark" /> <result property="remark" column="remark" />
<result property="serviceApi" column="serviceApi" />
<result property="serviceAprParams" column="serviceAprParams" />
<result property="createTime" column="createTime" /> <result property="createTime" column="createTime" />
<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>
...@@ -45,12 +47,18 @@ ...@@ -45,12 +47,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>
...@@ -66,6 +74,12 @@ ...@@ -66,6 +74,12 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('remark') or colPickMode == 1 and data.containsKey('remark')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('remark') or colPickMode == 1 and data.containsKey('remark')))">
a.remark, a.remark,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('serviceApi') or colPickMode == 1 and data.containsKey('serviceApi')))">
a.serviceApi,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('serviceAprParams') or colPickMode == 1 and data.containsKey('serviceAprParams')))">
a.serviceAprParams,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createTime') or colPickMode == 1 and data.containsKey('createTime')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createTime') or colPickMode == 1 and data.containsKey('createTime')))">
a.createTime, a.createTime,
</if> </if>
...@@ -78,29 +92,23 @@ ...@@ -78,29 +92,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('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,fieldTypeValue,defaultValue) (appId,fieldCode,fieldName,fieldType,fieldTypeValue,dataType,fieldValue,defaultValue,fieldLen,fieldNull,isList,fieldOrderNo,remark,serviceApi,serviceAprParams,createTime,createUserId,updateTime,updateUserId)
VALUES VALUES
(#{appId},#{fieldCode},#{fieldName},#{fieldType},#{dataType},#{fieldValue},#{fieldLen},#{fieldNull},#{isList},#{fieldOrderNo},#{remark},#{createTime},#{createUserId},#{updateTime},#{updateUserId},#{fieldTypeValue},#{defaultValue}) (#{appId},#{fieldCode},#{fieldName},#{fieldType},#{fieldTypeValue},#{dataType},#{fieldValue},#{defaultValue},#{fieldLen},#{fieldNull},#{isList},#{fieldOrderNo},#{remark},#{serviceApi},#{serviceAprParams},#{createTime},#{createUserId},#{updateTime},#{updateUserId})
</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,fieldTypeValue,defaultValue) (appId,fieldCode,fieldName,fieldType,fieldTypeValue,dataType,fieldValue,defaultValue,fieldLen,fieldNull,isList,fieldOrderNo,remark,serviceApi,serviceAprParams,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.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}) (#{item.appId},#{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.serviceApi},#{item.serviceAprParams},#{item.createTime},#{item.createUserId},#{item.updateTime},#{item.updateUserId})
</foreach> </foreach>
</insert> </insert>
...@@ -125,12 +133,18 @@ ...@@ -125,12 +133,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>
...@@ -158,6 +172,12 @@ ...@@ -158,6 +172,12 @@
<if test="(colPickMode==0 and data.containsKey('remark')) or (colPickMode==1 and !data.containsKey('remark'))"> <if test="(colPickMode==0 and data.containsKey('remark')) or (colPickMode==1 and !data.containsKey('remark'))">
a.remark=#{data.remark}, a.remark=#{data.remark},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('serviceApi')) or (colPickMode==1 and !data.containsKey('serviceApi'))">
a.serviceApi=#{data.serviceApi},
</if>
<if test="(colPickMode==0 and data.containsKey('serviceAprParams')) or (colPickMode==1 and !data.containsKey('serviceAprParams'))">
a.serviceAprParams=#{data.serviceAprParams},
</if>
<if test="(colPickMode==0 and data.containsKey('createTime')) or (colPickMode==1 and !data.containsKey('createTime'))"> <if test="(colPickMode==0 and data.containsKey('createTime')) or (colPickMode==1 and !data.containsKey('createTime'))">
a.createTime=#{data.createTime}, a.createTime=#{data.createTime},
</if> </if>
...@@ -176,12 +196,6 @@ ...@@ -176,12 +196,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('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
...@@ -227,6 +241,13 @@ ...@@ -227,6 +241,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'))">
...@@ -241,6 +262,13 @@ ...@@ -241,6 +262,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>
...@@ -296,6 +324,20 @@ ...@@ -296,6 +324,20 @@
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="serviceApi=(case" suffix="ELSE serviceApi end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('serviceApi')) or (colPickMode==1 and !item.containsKey('serviceApi'))">
when a.id=#{item.id} then #{item.serviceApi}
</if>
</foreach>
</trim>
<trim prefix="serviceAprParams=(case" suffix="ELSE serviceAprParams end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('serviceAprParams')) or (colPickMode==1 and !item.containsKey('serviceAprParams'))">
when a.id=#{item.id} then #{item.serviceAprParams}
</if>
</foreach>
</trim>
<trim prefix="createTime=(case" suffix="ELSE createTime end),"> <trim prefix="createTime=(case" suffix="ELSE createTime 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('createTime')) or (colPickMode==1 and !item.containsKey('createTime'))"> <if test="(colPickMode==0 and item.containsKey('createTime')) or (colPickMode==1 and !item.containsKey('createTime'))">
...@@ -334,20 +376,6 @@ ...@@ -334,20 +376,6 @@
</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=")">
...@@ -582,6 +610,27 @@ ...@@ -582,6 +610,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}
...@@ -623,6 +672,27 @@ ...@@ -623,6 +672,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}
...@@ -753,6 +823,48 @@ ...@@ -753,6 +823,48 @@
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('serviceApi')">
<if test="conditionParamRef.serviceApi != null and conditionParamRef.serviceApi != ''">
${_conditionType_} a.serviceApi like #{${_conditionParam_}.serviceApi}
</if>
<if test="conditionParamRef.serviceApi == null">
${_conditionType_} a.serviceApi is null
</if>
</if>
<if test="conditionParamRef.containsKey('serviceApiList') and conditionParamRef.serviceApiList.size() > 0">
${_conditionType_} a.serviceApi in
<foreach collection="conditionParamRef.serviceApiList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('serviceApiNotList') and conditionParamRef.serviceApiNotList.size() > 0">
${_conditionType_} a.serviceApi not in
<foreach collection="conditionParamRef.serviceApiNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('serviceAprParams')">
<if test="conditionParamRef.serviceAprParams != null and conditionParamRef.serviceAprParams != ''">
${_conditionType_} a.serviceAprParams like #{${_conditionParam_}.serviceAprParams}
</if>
<if test="conditionParamRef.serviceAprParams == null">
${_conditionType_} a.serviceAprParams is null
</if>
</if>
<if test="conditionParamRef.containsKey('serviceAprParamsList') and conditionParamRef.serviceAprParamsList.size() > 0">
${_conditionType_} a.serviceAprParams in
<foreach collection="conditionParamRef.serviceAprParamsList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('serviceAprParamsNotList') and conditionParamRef.serviceAprParamsNotList.size() > 0">
${_conditionType_} a.serviceAprParams not in
<foreach collection="conditionParamRef.serviceAprParamsNotList" 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 ">
${_conditionType_} a.createTime = #{${_conditionParam_}.createTime} ${_conditionType_} a.createTime = #{${_conditionParam_}.createTime}
...@@ -836,48 +948,6 @@ ...@@ -836,48 +948,6 @@
${_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()">
...@@ -916,6 +986,11 @@ ...@@ -916,6 +986,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>
...@@ -926,6 +1001,11 @@ ...@@ -926,6 +1001,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>
...@@ -951,6 +1031,16 @@ ...@@ -951,6 +1031,16 @@
<if test='orderCol.remark != null and "DESC".equalsIgnoreCase(orderCol.remark)'>DESC</if> <if test='orderCol.remark != null and "DESC".equalsIgnoreCase(orderCol.remark)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('serviceApi')">
a.serviceApi
<if test='orderCol.serviceApi != null and "DESC".equalsIgnoreCase(orderCol.serviceApi)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('serviceAprParams')">
a.serviceAprParams
<if test='orderCol.serviceAprParams != null and "DESC".equalsIgnoreCase(orderCol.serviceAprParams)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('createTime')"> <if test="orderCol.containsKey('createTime')">
a.createTime a.createTime
<if test='orderCol.createTime != null and "DESC".equalsIgnoreCase(orderCol.createTime)'>DESC</if> <if test='orderCol.createTime != null and "DESC".equalsIgnoreCase(orderCol.createTime)'>DESC</if>
...@@ -971,16 +1061,6 @@ ...@@ -971,16 +1061,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('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/AppDatasetController.http
View file @ e697da2d
...@@ -19,7 +19,14 @@ Content-Type: application/json ...@@ -19,7 +19,14 @@ Content-Type: application/json
{ {
"siteId": 1, "siteId": 1,
"appId": 2, "appId": 79,
"orConditionList": [ {
"fieldCode":"year",
"fieldValue":"2022"
},{
"fieldCode":"yOrm",
"fieldValue":"0"
}],
"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