From f4a002d0f3392a865e81dc95c184f1f58da4461b Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Tue, 26 Apr 2022 15:52:26 +0800
Subject: [PATCH] groupByTables

---
 .../com/epmet/dto/result/SubTableJoinDTO.java |  4 +++
 .../feign/OperCustomizeOpenFeignClient.java   |  4 +--
 .../main/resources/mapper/IcFormItemDao.xml   |  6 ++--
 .../java/com/epmet/dao/IcResiUserDao.java     |  6 ++--
 .../service/impl/IcResiUserServiceImpl.java   | 35 +++++++++++++------
 .../main/resources/mapper/IcResiUserDao.xml   | 10 ++++++
 6 files changed, 49 insertions(+), 16 deletions(-)

diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/SubTableJoinDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/SubTableJoinDTO.java
index a7b950d891..e0ccb7c850 100644
--- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/SubTableJoinDTO.java
+++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/SubTableJoinDTO.java
@@ -10,4 +10,8 @@ public class SubTableJoinDTO implements Serializable {
     private static final long serialVersionUID = 8243764437194993736L;
     private String tableName;
     private String joinTableSql;
+    /**
+     * 是否支持添加一行，1支持，默认0不支持
+     */
+    private Boolean supportAdd;
 }
diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/feign/OperCustomizeOpenFeignClient.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/feign/OperCustomizeOpenFeignClient.java
index 9ad09ea7b0..d8aed532c0 100644
--- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/feign/OperCustomizeOpenFeignClient.java
+++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/feign/OperCustomizeOpenFeignClient.java
@@ -26,8 +26,8 @@ import java.util.Set;
  * @author yinzuomei@elink-cn.com
  * @date 2020/6/4 13:16
  */
- // @FeignClient(name = ServiceConstant.OPER_CUSTOMIZE_SERVER, fallbackFactory = OperCustomizeOpenFeignClientFallbackFactory.class,url = "http://localhost:8089")
-@FeignClient(name = ServiceConstant.OPER_CUSTOMIZE_SERVER, fallbackFactory = OperCustomizeOpenFeignClientFallbackFactory.class)
+ @FeignClient(name = ServiceConstant.OPER_CUSTOMIZE_SERVER, fallbackFactory = OperCustomizeOpenFeignClientFallbackFactory.class,url = "http://localhost:8089")
+// @FeignClient(name = ServiceConstant.OPER_CUSTOMIZE_SERVER, fallbackFactory = OperCustomizeOpenFeignClientFallbackFactory.class)
 public interface OperCustomizeOpenFeignClient {
 
     @PostMapping(value = "/oper/customize/customerfootbar/customerfootbars", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormItemDao.xml b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormItemDao.xml
index e98c46f61f..da32693cc7 100644
--- a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormItemDao.xml
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormItemDao.xml
@@ -154,10 +154,12 @@
     <select id="querySubTables" parameterType="map" resultType="com.epmet.dto.result.SubTableJoinDTO">
         select
              temp.TABLE_NAME as tableName,
-            CONCAT('left join ',temp.TABLE_NAME, ' on ( ic_resi_user.ID=',temp.TABLE_NAME,'.IC_RESI_USER  and ',temp.TABLE_NAME,'.del_flag="0" )') as joinTableSql
+            CONCAT('left join ',temp.TABLE_NAME, ' on ( ic_resi_user.ID=',temp.TABLE_NAME,'.IC_RESI_USER  and ',temp.TABLE_NAME,'.del_flag="0" )') as joinTableSql,
+            SUPPORT_ADD as supportAdd
         from (
                  SELECT DISTINCT
-                     m.TABLE_NAME
+                     m.TABLE_NAME,
+                     m.SUPPORT_ADD
                  FROM
                      ic_form_item_group m
                  WHERE
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java
index dd6b87081a..da49c5bd4b 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java
@@ -62,7 +62,8 @@ public interface IcResiUserDao extends BaseDao<IcResiUserEntity> {
                                                 @Param("currentStaffAgencyId") String currentStaffAgencyId,
                                                 @Param("staffOrgPath") String staffOrgPath,
                                                 @Param("resultTableName") String resultTableName,
-                                                @Param("keyword") String keyword);
+                                                @Param("keyword") String keyword,
+                                                @Param("groupByTables")Set<String> groupByTables);
 
     /**
      * 查询主表
@@ -108,7 +109,8 @@ public interface IcResiUserDao extends BaseDao<IcResiUserEntity> {
                                            @Param("conditions") List<ResiUserQueryValueDTO> conditions,
                                            @Param("subTables") List<String> subTables,
                                            @Param("showSqlColumns") List<IcCustomExportResultDTO.SqlColumn> showSqlColumns, @Param("currentStaffAgencyId") String currentStaffAgencyId,
-                                           @Param("staffOrgPath") String staffOrgPath);
+                                           @Param("staffOrgPath") String staffOrgPath,
+                                           @Param("groupByTables") List<String> groupByTables);
 
     /**
      * @param userId
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
index 871903650c..333c66ef7c 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
@@ -555,13 +555,17 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
         // log.info("2、查询条件+查询列对应的tables并集去重:"+ JSON.toJSONString(tables,true));
         //最终关联的子表对应的sql：
         List<String> finalSubTables =new ArrayList<>();
+        //groupBy用到的表
+        Set<String> groupByTables=new HashSet<>();
         subTables.forEach(subTable->{
             if(tables.contains(subTable.getTableName())){
                 finalSubTables.add(subTable.getJoinTableSql());
+                if(subTable.getSupportAdd()){
+                    groupByTables.add(subTable.getTableName());
+                }
             }
         });
 
-
         PageInfo<Map<String, Object>> pageInfo=new PageInfo<>();
         if (null == formDTO.getIsPage()||formDTO.getIsPage()) {
             //分页
@@ -572,7 +576,8 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
                     formDTO.getConditions(),
                     resultColumns,
                     finalSubTables,
-                    staffInfoCacheResult.getAgencyId(), finalStaffOrgPath,null, formDTO.getKeyword()));
+                    staffInfoCacheResult.getAgencyId(), finalStaffOrgPath,null, formDTO.getKeyword(),
+                    groupByTables));
         }else{
             List<Map<String,Object>> list=baseDao.selectListResiMap(formDTO.getCustomerId(),
                     formDTO.getFormCode(),
@@ -581,7 +586,8 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
                     finalSubTables,
                     staffInfoCacheResult.getAgencyId(),
                     staffOrgPath,null,
-                    formDTO.getKeyword());
+                    formDTO.getKeyword(),
+                    groupByTables);
             pageInfo.setTotal(CollectionUtils.isEmpty(list)?NumConstant.ZERO:list.size());
             pageInfo.setList(list);
         }
@@ -747,13 +753,14 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
                                                  List<ResiUserQueryValueDTO> conditions,
                                                  String currentStaffAgencyId,
                                                  String staffOrgPath){
-        List<String> finalSubTables = getFinalSubables(customerId, formCode, resultTableName, conditions);
-
-        return baseDao.dynamicQuery(customerId,resultTableName,conditions,finalSubTables, null, currentStaffAgencyId,staffOrgPath);
+        // List<String> finalSubTables = getFinalSubables(customerId, formCode, resultTableName, conditions);
+        Map<String,List<String>> map=getFinalSubables(customerId, formCode, resultTableName, conditions);
+        return baseDao.dynamicQuery(customerId,resultTableName,conditions,map.get("finalSubTables"), null, currentStaffAgencyId,staffOrgPath,map.get("groupByTables"));
     }
 
     @NotNull
-    public List<String> getFinalSubables(String customerId, String formCode, String resultTableName, List<ResiUserQueryValueDTO> conditions) {
+    public Map<String,List<String>> getFinalSubables(String customerId, String formCode, String resultTableName, List<ResiUserQueryValueDTO> conditions) {
+        Map<String,List<String>> map=new HashMap<>();
         CustomerFormQueryDTO queryDTO=new CustomerFormQueryDTO();
         queryDTO.setCustomerId(customerId);
         queryDTO.setFormCode(formCode);
@@ -769,12 +776,19 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
         // log.info("2、查询条件+查询列对应的tables并集去重:"+ JSON.toJSONString(tables,true));
         //最终关联的子表对应的sql：
         List<String> finalSubTables =new ArrayList<>();
+        //groupBy用到的表
+        Set<String> groupByTables=new HashSet<>();
         subTables.forEach(subTable->{
             if(tables.contains(subTable.getTableName())){
                 finalSubTables.add(subTable.getJoinTableSql());
+                if(subTable.getSupportAdd()){
+                    groupByTables.add(subTable.getTableName());
+                }
             }
         });
-        return finalSubTables;
+        map.put("finalSubTables",finalSubTables);
+        map.put("groupByTables",groupByTables.stream().collect(Collectors.toList()));
+        return map;
     }
 
     /**
@@ -1656,8 +1670,9 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
 
     @Override
     public List<Map<String, Object>> dynamicQuery(String customerId, String formCode, String resultTableName, List<IcCustomExportResultDTO.SqlColumn> showSqlColumns, List<ResiUserQueryValueDTO> conditions, String currentStaffAgencyId, String staffOrgPath) {
-        List<String> finalSubTables = getFinalSubables(customerId, formCode, resultTableName, conditions);
-        return baseDao.dynamicQuery(customerId,resultTableName,conditions,finalSubTables,showSqlColumns,currentStaffAgencyId,staffOrgPath);
+        // List<String> finalSubTables = getFinalSubables(customerId, formCode, resultTableName, conditions);
+        Map<String,List<String>> map=getFinalSubables(customerId, formCode, resultTableName, conditions);
+        return baseDao.dynamicQuery(customerId,resultTableName,conditions,map.get("finalSubTables"),showSqlColumns,currentStaffAgencyId,staffOrgPath,map.get("groupByTables"));
     }
 
 }
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml
index e1dd2c0899..2f7b823bb5 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml
@@ -160,6 +160,11 @@
             </if>
         </where>
         group by IC_RESI_USER.id
+        <if test="null != groupByTables and groupByTables.size() > 0">
+            <foreach item="groupTableName" collection="groupByTables" open="," separator="," close="">
+                ${groupTableName}.ID
+            </foreach>
+        </if>
         order by ic_resi_user.CREATED_TIME desc
     </select>
 
@@ -193,6 +198,11 @@
             <include refid="listWhereForPage"></include>
         </where>
         group by IC_RESI_USER.id
+        <if test="null != groupByTables and groupByTables.size() > 0">
+            <foreach item="groupTableName" collection="groupByTables" open="," separator="," close="">
+                ${groupTableName}.ID
+            </foreach>
+        </if>
         order by ic_resi_user.CREATED_TIME desc
     </select>