[模型模块]分类复杂查询改动

src/main/java/com/tykj/model_layer/controller/ModelController.java

@@ -47,8 +47,6 @@ public class ModelController {
     private VersionService versionService;
 
 
-
-
     /**
      * @param
      * @return java.util.List<com.tykj.workflowcore.model_layer.model.TableInfo>
@@ -78,7 +76,7 @@ public class ModelController {
         List<ColumnInfo> columnInfos = modelService.showModelFields(searchColumnInfoVo);
         for (ColumnInfo columnInfo : columnInfos) {
             List<Quote> allByColumnId = quoteDao.findAllByColumnId(columnInfo.getId());
-           columnInfo.setQuoteList(allByColumnId);
+            columnInfo.setQuoteList(allByColumnId);
         }
         return ResultUtil.success(columnInfos, "数据查询成功！");
     }
@@ -183,7 +181,7 @@ public class ModelController {
     @ApiOperation("复杂查询(分类)")
     @PostMapping("/complexQuery/group")
     public ResponseEntity complexQueryWithGroup(@RequestBody complexQueryVo complexQueryVo) {
-        Map<Object, List<Map<String, Object>>> list = modelService.complexQueryWithGroup(complexQueryVo.getTableName(), complexQueryVo.getColumnNames(), complexQueryVo.getQueryConditions(), complexQueryVo.getGroupByColumn());
+        Map<Object, List<Map<String, Object>>> list = modelService.complexQueryWithGroup(complexQueryVo.getTableName(), complexQueryVo.getGroupConditions(), complexQueryVo.getColumnNames(), complexQueryVo.getQueryConditions(), complexQueryVo.getGroupByColumn());
         if (list != null) {
             return ResultUtil.success(list, "查询成功!");
         }

src/main/java/com/tykj/model_layer/entity/vo/GroupCondition.java

+package com.tykj.model_layer.entity.vo;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@AllArgsConstructor
+@NoArgsConstructor
+@Data
+public class GroupCondition {
+
+    private String name;
+
+    private String value;
+
+}

src/main/java/com/tykj/model_layer/entity/vo/complexQueryVo.java

@@ -27,6 +27,9 @@ public class complexQueryVo {
     @ApiModelProperty("筛选字段")
     List<String> columnNames;
 
+    @ApiModelProperty("分类条件信息")
+    List<GroupCondition> groupConditions;
+
     @ApiModelProperty("查询条件")
     List<QueryCondition> queryConditions;
 

src/main/java/com/tykj/model_layer/service/ModelService.java

@@ -22,32 +22,33 @@ public interface ModelService {
 
     /**
      * 分页查询
+     *
      * @param searchTableInfoVo
      * @return
-
      */
     Page<TableInfo> pageAllEntities(SearchTableInfoVo searchTableInfoVo);
 
 
     /**
      * 方法重载不分页查询
+     *
      * @return
      */
-    List<TableInfo> listAllEntities(SearchTableInfoVo searchTableInfoVo) ;
-
+    List<TableInfo> listAllEntities(SearchTableInfoVo searchTableInfoVo);
 
 
     /**
      * 根据表名查询所有字段信息
+     *
      * @param searchColumnInfoVo
      * @return
      */
     List<ColumnInfo> showModelFields(SearchColumnInfoVo searchColumnInfoVo);
 
 
-
     /**
      * 新建模型
+     *
      * @param tableVO
      * @return
      */
@@ -56,6 +57,7 @@ public interface ModelService {
 
     /**
      * 根据表名插入数据
+     *
      * @param map
      * @return
      */
@@ -63,6 +65,7 @@ public interface ModelService {
 
     /**
      * 插入一组数据
+     *
      * @param mapList
      * @return
      */
@@ -70,33 +73,37 @@ public interface ModelService {
 
     /**
      * 根据表名查询所有
+     *
      * @param name
      * @return
      * @throws SQLException
      */
-    List<Map<String, Object>>  findAllByName(String name) throws SQLException;
+    List<Map<String, Object>> findAllByName(String name) throws SQLException;
 
 
     /**
      * 复杂查询
+     *
      * @param tableName
      * @param queryConditions
      * @return
      */
-    List<Map<String, Object>> complexQuery(String tableName,List<String> columnNames, List<QueryCondition> queryConditions);
+    List<Map<String, Object>> complexQuery(String tableName, List<String> columnNames, List<QueryCondition> queryConditions);
 
     /**
      * 复杂查询（带分类）
+     *
      * @param tableName
      * @param queryConditions
      * @return
      */
-    Map<Object,List<Map<String, Object>>> complexQueryWithGroup(String tableName,List<String> columnNames, List<QueryCondition> queryConditions,String groupByColumn);
+    Map<Object, List<Map<String, Object>>> complexQueryWithGroup(String tableName, List<GroupCondition> groupConditions, List<String>columnNames, List<QueryCondition> queryConditions, String groupByColumn);
 
 
     /**
      * 修改表
-      * @param updateTableInfoVO
+     *
+     * @param updateTableInfoVO
      * @return
      */
     int updateTable(UpdateTableInfoVO updateTableInfoVO);
@@ -104,6 +111,7 @@ public interface ModelService {
 
     /**
      * 删除表
+     *
      * @param delTableVO
      * @return
      */
@@ -112,6 +120,7 @@ public interface ModelService {
 
     /**
      * 根据id批量查询所有tableInfo和ColumnInfo
+     *
      * @param ids
      * @return
      */