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

base-manager/db/add.sql

@@ -18,6 +18,9 @@ ALTER TABLE mortals_sys_workman ADD COLUMN  `operatorId` varchar (128) default "
 
 
 
+
+
+
 -- ----------------------------
 2023-3-28
 -- ----------------------------
@@ -197,3 +200,14 @@ ALTER TABLE mortals_sys_app_category ADD COLUMN `remark`  varchar(256)  DEFAULT
 2023-08-29
 -- ----------------------------
 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

 package com.mortals.xhx.module.app.model;
-
 import java.util.List;
 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.mortals.framework.annotation.Excel;
 import com.mortals.framework.model.BaseEntityLong;
 import com.mortals.xhx.module.app.model.vo.AppInfoFieldVo;
+import lombok.Data;
 /**
  * 自助终端应用模板信息字段实体对象
  *
  * @author zxfei
- * @date 2023-03-28
+ * @date 2023-09-12
  */
-
+@Data
 public class AppInfoFieldEntity extends AppInfoFieldVo {
     private static final long serialVersionUID = 1L;
 
@@ -68,196 +71,14 @@ public class AppInfoFieldEntity extends AppInfoFieldVo {
      * 备注
      */
     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){
-        this.defaultValue = defaultValue;
-    }
+    private String serviceApi;
     /**
-     * 获取 数据长度，默认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;
-    }
-
-
-
-
+    private String serviceAprParams;
     @Override
     public int hashCode() {
         return this.getId().hashCode();
@@ -274,50 +95,21 @@ public class AppInfoFieldEntity extends AppInfoFieldVo {
         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(){
-
         this.datasetId = null;
-
         this.fieldCode = "";
-
         this.fieldName = "";
-
         this.fieldType = "";
-
         this.fieldTypeValue = "";
-
         this.dataType = "";
-
         this.fieldValue = "";
-
         this.defaultValue = "";
-
         this.fieldLen = 0;
-
         this.fieldNull = 1;
-
         this.isList = 0;
-
         this.fieldOrderNo = 1;
-
         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

@@ -6,7 +6,7 @@ import com.mortals.xhx.module.app.model.AppInfoFieldEntity;
  * 自助终端应用模板信息字段查询对象
  *
  * @author zxfei
- * @date 2023-03-28
+ * @date 2023-09-12
  */
 public class AppInfoFieldQuery extends AppInfoFieldEntity {
     /** 开始 序号，主键，自增长 */
@@ -139,6 +139,16 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity {
 
     /** 备注排除列表 */
     private List <String> remarkNotList;
+    /** 事件服务接口请求地址 */
+    private List<String> serviceApiList;
+
+    /** 事件服务接口请求地址排除列表 */
+    private List <String> serviceApiNotList;
+    /** 事件服务接口请求参数 */
+    private List<String> serviceAprParamsList;
+
+    /** 事件服务接口请求参数排除列表 */
+    private List <String> serviceAprParamsNotList;
     /** 开始 创建时间 */
     private String createTimeStart;
 
@@ -931,6 +941,70 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity {
         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
@@ -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

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

@@ -2,17 +2,25 @@ package com.mortals.xhx.module.app.model;
 
 import java.util.List;
 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.mortals.framework.annotation.Excel;
 import com.mortals.framework.model.BaseEntityLong;
 import com.mortals.xhx.module.app.model.vo.AppInfoTempleteFieldVo;
+import lombok.Data;
+
 /**
  * 自助终端应用模板信息字段实体对象
  *
  * @author zxfei
- * @date 2023-03-28
+ * @date 2023-09-12
  */
-
+@Data
 public class AppInfoTempleteFieldEntity extends AppInfoTempleteFieldVo {
     private static final long serialVersionUID = 1L;
 
@@ -32,6 +40,10 @@ public class AppInfoTempleteFieldEntity extends AppInfoTempleteFieldVo {
      * 字段类型（input.单行输入框,textarea.多行输入框,SELECT.下拉选项框,date.日期选择框,editer.富文本）
      */
     private String fieldType;
+    /**
+     * 字段类型值，当字段类型为多选，单选时候，预设复选值
+     */
+    private String fieldTypeValue;
     /**
      * 数据类型（number.数字,string.字符串）
      */
@@ -40,6 +52,10 @@ public class AppInfoTempleteFieldEntity extends AppInfoTempleteFieldVo {
      * 字段值
      */
     private String fieldValue;
+    /**
+     * 字段默认值
+     */
+    private String defaultValue;
     /**
      * 数据长度，默认128
      */
@@ -61,207 +77,19 @@ public class AppInfoTempleteFieldEntity extends AppInfoTempleteFieldVo {
      */
     private String remark;
     /**
-     * 字段类型值，当字段类型为多选，单选时候，预设复选值
+     * 事件服务接口请求地址
      */
-    private String fieldTypeValue;
+    private String serviceApi;
     /**
-     * 字段默认值
+     * 事件服务接口请求参数，json格式
      */
-    private String defaultValue;
-
-
-
-    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;
-    }
-
-
-
+    private String serviceAprParams;
 
     @Override
     public int hashCode() {
         return this.getId().hashCode();
     }
+
     @Override
     public boolean equals(Object obj) {
         if (obj == null) return false;
@@ -274,50 +102,21 @@ public class AppInfoTempleteFieldEntity extends AppInfoTempleteFieldVo {
         return false;
     }
 
-    public String toString(){
-        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(){
-
+    public void initAttrValue() {
         this.appId = null;
-
         this.fieldCode = "";
-
         this.fieldName = "";
-
         this.fieldType = "";
-
+        this.fieldTypeValue = "";
         this.dataType = "";
-
         this.fieldValue = "";
-
+        this.defaultValue = "";
         this.fieldLen = 0;
-
         this.fieldNull = 1;
-
         this.isList = 0;
-
         this.fieldOrderNo = 1;
-
         this.remark = "";
-
-        this.fieldTypeValue = "";
-
-        this.defaultValue = "";
+        this.serviceApi = "";
+        this.serviceAprParams = "";
     }
 }
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/app/web/AppDatasetController.java

@@ -62,9 +62,17 @@ public class AppDatasetController extends BaseCRUDJsonBodyMappingController<AppD
 
     @Override
     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();
+
+            if (!ObjectUtils.isEmpty(query.getOrConditionList())){
                 appDatasetQuery.setOrConditionList(query.getOrConditionList());
+            }
+
+            if(!ObjectUtils.isEmpty(query.getAndConditionList())){
+                appDatasetQuery.setOrConditionList(query.getAndConditionList());
+            }
+
             appDatasetQuery.setAppId(query.getAppId());
 
             PageInfo pageInfo = this.buildPageInfo(query);

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

@@ -19,10 +19,13 @@
         <result property="isList" column="isList" />
         <result property="fieldOrderNo" column="fieldOrderNo" />
         <result property="remark" column="remark" />
+        <result property="serviceApi" column="serviceApi" />
+        <result property="serviceAprParams" column="serviceAprParams" />
         <result property="createTime" column="createTime" />
         <result property="createUserId" column="createUserId" />
         <result property="updateTime" column="updateTime" />
         <result property="updateUserId" column="updateUserId" />
+
     </resultMap>
 
 
@@ -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')))">
                 a.remark,
             </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')))">
                 a.createTime,
             </if>
@@ -88,18 +97,18 @@
     <!-- 新增 区分主键自增加还是业务插入 -->
     <insert id="insert" parameterType="AppInfoFieldEntity"  useGeneratedKeys="true" keyProperty="id">
         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
-        (#{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 id="insertBatch" parameterType="paramDto">
         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
         <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>
     </insert>
 
@@ -163,6 +172,12 @@
             <if test="(colPickMode==0 and data.containsKey('remark')) or (colPickMode==1 and !data.containsKey('remark'))">
                 a.remark=#{data.remark},
             </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'))">
                 a.createTime=#{data.createTime},
             </if>
@@ -309,6 +324,20 @@
                     </if>
                 </foreach>
             </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),">
                 <foreach collection="data.dataList" item="item" index="index" separator="" >
                     <if test="(colPickMode==0 and item.containsKey('createTime')) or (colPickMode==1 and !item.containsKey('createTime'))">
@@ -794,6 +823,48 @@
             </foreach>
         </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.createTime != null ">
                 ${_conditionType_} a.createTime = #{${_conditionParam_}.createTime}
@@ -960,6 +1031,16 @@
                     <if test='orderCol.remark != null and "DESC".equalsIgnoreCase(orderCol.remark)'>DESC</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')">
                     a.createTime
                     <if test='orderCol.createTime != null and "DESC".equalsIgnoreCase(orderCol.createTime)'>DESC</if>

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

@@ -19,7 +19,14 @@ Content-Type: application/json
 
 {
   "siteId": 1,
-  "appId": 2,
+  "appId": 79,
+  "orConditionList": [ {
+    "fieldCode":"year",
+    "fieldValue":"2022"
+  },{
+    "fieldCode":"yOrm",
+    "fieldValue":"0"
+  }],
   "page": 1,
   "size": 10
 }