Merge remote-tracking branch 'origin/dev_ic_platform' into develop

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/form/IcResiDetailFormDTO.java

@@ -16,5 +16,11 @@ public class IcResiDetailFormDTO implements Serializable {
     }
     @NotBlank(message = "icResiUserId不能为空",groups = AddUserInternalGroup.class)
     private String icResiUserId;
+
+    @NotBlank(message = "formCode不能为空", groups = AddUserInternalGroup.class)
+    private String formCode;
+
+    @NotBlank(message = "customerId不能为空", groups = AddUserInternalGroup.class)
+    private String customerId;
 }
 

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/IcResiUserController.java

@@ -28,14 +28,32 @@ public class IcResiUserController {
     private IcResiUserService icResiUserService;
 
 
+    /**
+     * 分页查询居民信息列表
+     *
+     * @param tokenDto
+     * @param pageFormDTO
+     * @return  com.epmet.commons.tools.utils.Result<com.epmet.commons.tools.page.PageData<com.epmet.dataaggre.dto.epmetuser.result.IcResiUserPageResultDTO>>
+     * @author yinzuomei
+     * @date 2021/10/28 10:29 上午
+     */
     @PostMapping("listresi")
     public Result<PageData<IcResiUserPageResultDTO>> queryListResi(@LoginUser TokenDto tokenDto, @RequestBody IcResiUserPageFormDTO pageFormDTO){
         //pageFormDTO.setCustomerId("45687aa479955f9d06204d415238f7cc");
+        pageFormDTO.setCustomerId(tokenDto.getCustomerId());
         ValidatorUtils.validateEntity(pageFormDTO,IcResiUserPageFormDTO.AddUserInternalGroup.class);
         return new Result<PageData<IcResiUserPageResultDTO>>().ok(icResiUserService.pageResi(pageFormDTO));
     }
 
 
+    /**
+     * 编辑页面，显示居民信息详情
+     *
+     * @param pageFormDTO
+     * @return  com.epmet.commons.tools.utils.Result
+     * @author yinzuomei
+     * @date 2021/10/28 10:29 上午
+     */
     @PostMapping("detail")
     public Result queryIcResiDetail(@RequestBody IcResiDetailFormDTO pageFormDTO){
         ValidatorUtils.validateEntity(pageFormDTO,IcResiDetailFormDTO.AddUserInternalGroup.class);

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/IcResiUserDao.java

@@ -7,6 +7,7 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 @Mapper
 public interface IcResiUserDao {
@@ -15,4 +16,9 @@ public interface IcResiUserDao {
                                                  @Param("conditions") List<ResiUserQueryValueDTO> conditions,
                                                  @Param("resultColumns") List<IcFormResColumnDTO> resultColumns,
                                                  @Param("subTables") List<String> subTables);
+
+    List<Map<String, Object>> selectById(String icResiUserId);
+
+    List<Map<String, Object>> selectSubTableRecords(@Param("icResiUserId") String icResiUserId,@Param("tableName") String tableName);
+
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/opercustomize/CustomerFootBarDao.java

@@ -25,6 +25,7 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Set;
 
 /**
  * APP底部菜单栏信息
@@ -61,4 +62,6 @@ public interface CustomerFootBarDao extends BaseDao<CustomerFootBarEntity> {
     List<IcFormResColumnDTO> queryConditions(@Param("customerId") String customerId, @Param("formCode")String formCode);
 
     List<String> querySubTables(@Param("customerId") String customerId, @Param("formCode")String formCode);
+
+    Set<String> queryIcResiSubTables(@Param("customerId") String customerId, @Param("formCode")String formCode);
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/IcResiUserService.java

@@ -8,7 +8,23 @@ import com.epmet.dataaggre.dto.epmetuser.result.IcResiUserPageResultDTO;
 import java.util.Map;
 
 public interface IcResiUserService {
+    /**
+     * 分页查询居民信息列表
+     *
+     * @param pageFormDTO
+     * @return  com.epmet.commons.tools.page.PageData<com.epmet.dataaggre.dto.epmetuser.result.IcResiUserPageResultDTO>
+     * @author yinzuomei
+     * @date 2021/10/28 10:30 上午
+     */
     PageData<IcResiUserPageResultDTO> pageResi(IcResiUserPageFormDTO pageFormDTO);
 
+    /**
+     * 编辑页面，显示居民信息详情
+     *
+     * @param pageFormDTO
+     * @return  java.util.Map
+     * @author yinzuomei
+     * @date 2021/10/28 10:29 上午
+     */
      Map queryIcResiDetail(IcResiDetailFormDTO pageFormDTO);
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/IcResiUserServiceImpl.java

@@ -18,9 +18,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
-import java.util.ArrayList;
+import java.util.*;
-import java.util.List;
-import java.util.Map;
 
 /**
  * @Description TODO
@@ -38,6 +36,14 @@ public class IcResiUserServiceImpl implements IcResiUserService {
 
 
 
+    /**
+     * 分页查询居民信息列表
+     *
+     * @param formDTO
+     * @return  com.epmet.commons.tools.page.PageData<com.epmet.dataaggre.dto.epmetuser.result.IcResiUserPageResultDTO>
+     * @author yinzuomei
+     * @date 2021/10/28 10:30 上午
+     */
     @Override
     public PageData<IcResiUserPageResultDTO> pageResi(IcResiUserPageFormDTO formDTO) {
         // 查询列表展示项，如果没有，直接返回
@@ -74,10 +80,34 @@ public class IcResiUserServiceImpl implements IcResiUserService {
         return new PageData<>(pageInfo.getList(),pageInfo.getTotal());
     }
 
+
+
+
+    /**
+     * 编辑页面，显示居民信息详情
+     *
+     * @param pageFormDTO
+     * @return  java.util.Map
+     * @author yinzuomei
+     * @date 2021/10/28 10:29 上午
+     */
     @Override
     public Map queryIcResiDetail(IcResiDetailFormDTO pageFormDTO) {
+        Map resultMap=new HashMap();
+        List<Map<String,Object>> icResiUserMapList=icResiUserDao.selectById(pageFormDTO.getIcResiUserId());
+        if(CollectionUtils.isEmpty(icResiUserMapList)){
+            return new HashMap();
+        }
+        resultMap.put("ic_resi_user",icResiUserMapList);
+
+        //循环查询每个子表的记录
+        Set<String> subTableList=customerFootBarService.queryIcResiSubTables(pageFormDTO.getCustomerId(),pageFormDTO.getFormCode());
+        for(String subTalbeName:subTableList){
+            List<Map<String,Object>> list=icResiUserDao.selectSubTableRecords(pageFormDTO.getIcResiUserId(),subTalbeName);
 
-        return null;
+            resultMap.put(subTalbeName,list);
+        }
+        return resultMap;
     }
 
 

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/opercustomize/CustomerFootBarService.java

@@ -24,6 +24,7 @@ import com.epmet.dataaggre.dto.epmetuser.IcFormResColumnDTO;
 import com.epmet.dataaggre.entity.opercustomize.CustomerFootBarEntity;
 
 import java.util.List;
+import java.util.Set;
 
 /**
  * APP底部菜单栏信息
@@ -46,4 +47,6 @@ public interface CustomerFootBarService extends BaseService<CustomerFootBarEntit
     List<IcFormResColumnDTO> queryConditions(String customerId, String formCode);
 
     List<String> querySubTables(String customerId, String formCode);
+
+    Set<String> queryIcResiSubTables(String customerId, String formCode);
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/opercustomize/impl/CustomerFootBarServiceImpl.java

@@ -39,6 +39,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
 import java.util.List;
+import java.util.Set;
 
 
 /**
@@ -123,4 +124,9 @@ public class CustomerFootBarServiceImpl extends BaseServiceImpl<CustomerFootBarD
         return baseDao.querySubTables(customerId,formCode);
     }
 
+    @Override
+    public Set<String> queryIcResiSubTables(String customerId, String formCode) {
+        return baseDao.queryIcResiSubTables(customerId,formCode);
+    }
+
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/IcResiUserDao.xml

@@ -62,4 +62,13 @@
         </if>
          order by ic_resi_user.CREATED_TIME desc
     </select>
+
+
+    <select id="selectById" parameterType="java.lang.String" resultType="map">
+        select * from ic_resi_user where del_flag='0' and id=#{icResiUserId}
+    </select>
+
+    <select id="selectSubTableRecords" parameterType="map" resultType="map">
+        select * from ${tableName} where del_flag='0' and IC_RESI_USER=#{icResiUserId}
+    </select>
 </mapper>

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/opercustomize/CustomerFootBarDao.xml

@@ -78,4 +78,17 @@
                     AND m.FORM_CODE = #{formCode}
              )temp
     </select>
+
+    <select id="queryIcResiSubTables" parameterType="map" resultType="java.lang.String">
+        SELECT DISTINCT
+            m.TABLE_NAME
+        FROM
+            ic_form_item_group m
+        WHERE
+            m.DEL_FLAG = '0'
+          AND m.TABLE_NAME IS NOT NULL
+          AND m.TABLE_NAME != ''
+            AND m.CUSTOMER_ID = #{customerId}
+          AND m.FORM_CODE = #{formCode}
+    </select>
 </mapper>

epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/FormItem.java

@@ -115,5 +115,10 @@ public class FormItem implements Serializable {
      * 当前组件，要追加分组
      */
     private FormGroupDTO childGroup;
+
+    /**
+     * 1可以多选，0单选，默认0
+     */
+    private Boolean multiSelect;
 }
 

epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/FormItem2.java

@@ -108,5 +108,10 @@ public class FormItem2 implements Serializable {
     private Integer columnNum;
 
     private List<OptionDTO> options;
+
+    /**
+     * 1可以多选，0单选，默认0
+     */
+    private Boolean multiSelect;
 }
 

epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormDao.xml

@@ -36,6 +36,7 @@
         <result property="dataAnalyse" column="DATA_ANALYSE"/>
         <result property="columnName" column="COLUMN_NAME"/>
         <result property="columnNum" column="COLUMN_NUM"/>
+        <result property="multiSelect" column="MULTI_SELECT"/>
         <collection property="options" ofType="com.epmet.dto.result.OptionDTO"
              column="item_id"  select="com.epmet.dao.IcFormDao.selectListOption">
             <result property="label" column=""/>
@@ -100,7 +101,8 @@
             fi.LIST_DISPLAY,
             fi.DATA_ANALYSE,
             fi.COLUMN_NAME,
-            fi.COLUMN_NUM
+            fi.COLUMN_NUM,
+            fi.MULTI_SELECT
         FROM
             ic_form_item fi
         WHERE
@@ -146,6 +148,7 @@
         <result property="dataAnalyse" column="DATA_ANALYSE"/>
         <result property="columnName" column="COLUMN_NAME"/>
         <result property="columnNum" column="COLUMN_NUM"/>
+        <result property="multiSelect" column="MULTI_SELECT"/>
         <collection property="options" ofType="com.epmet.dto.result.OptionDTO"
                     column="item_id"  select="com.epmet.dao.IcFormDao.selectListOption">
             <result property="label" column=""/>
@@ -172,12 +175,14 @@
             fi.LIST_DISPLAY,
             fi.DATA_ANALYSE,
             fi.COLUMN_NAME,
-            fi.COLUMN_NUM
+            fi.COLUMN_NUM,
+            fi.MULTI_SELECT
         FROM
             ic_form_item fi
         WHERE
             fi.DEL_FLAG = '0'
           AND fi.ITEM_GROUP_ID = #{groupId}
+          AND fi.DYNAMIC = '1'
         ORDER BY
             fi.SORT ASC
     </select>

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcResiUserFormDTO.java

@@ -3,8 +3,8 @@ package com.epmet.dto.form;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.LinkedHashMap;
 import java.util.List;
-import java.util.Map;
 
 /**
  * @Description 党建互联平台--保存/修改居民信息
@@ -21,5 +21,5 @@ public class IcResiUserFormDTO implements Serializable {
 	/**
 	 * 表对应的字段及值
 	 */
-	private List<Map<String,String>> list;
+	private List<LinkedHashMap<String,String>> list;
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java

@@ -116,6 +116,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
      * @Description 党建互联平台--保存居民信息
      **/
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void add(TokenDto tokenDto, List<IcResiUserFormDTO> formDTO) {
         //循环自动拼接sql语句，往多个表新增数据
         //1.先往主表新增数据
@@ -123,7 +124,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
         String resiUserId = UUID.randomUUID().toString().replaceAll("-", "");
         formDTO.forEach(d -> {
             if ("ic_resi_user".equals(d.getTableName())) {
-                Map<String, String> map = d.getList().get(0);
+                LinkedHashMap<String, String> map = d.getList().get(0);
                 map.put("id", resiUserId);
                 map.put("customer_id", tokenDto.getCustomerId());
                 map.put("created_by", tokenDto.getUserId());
@@ -143,7 +144,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
         //2.循环字表新增数据
         formDTO.forEach(d -> {
             if (!"ic_resi_user".equals(d.getTableName())) {
-                d.getList().forEach(map -> {
+                for (LinkedHashMap<String, String> map : d.getList()) {
                     map.put("id", UUID.randomUUID().toString().replaceAll("-", ""));
                     map.put("ic_resi_user", resiUserId);
                     map.put("customer_id", tokenDto.getCustomerId());
@@ -151,7 +152,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
                     map.put("updated_by", tokenDto.getUserId());
                     //字表新增数据
                     baseDao.add(d.getTableName(), map);
-                });
+                }
             }
         });
 
@@ -162,10 +163,11 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
      * @Description 党建互联平台--修改居民信息
      **/
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void edit(TokenDto tokenDto, List<IcResiUserFormDTO> formDTO) {
         //1.校验主表数据是否存在
         String resiUserId = "";
-        Map<String, String> map = new HashMap<>();
+        LinkedHashMap<String, String> map = new LinkedHashMap<>();
         for (IcResiUserFormDTO d : formDTO) {
             if ("ic_resi_user".equals(d.getTableName())) {
                 map = d.getList().get(0);
@@ -192,7 +194,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
         String finalResiUserId = resiUserId;
         formDTO.forEach(d -> {
             if (!"ic_resi_user".equals(d.getTableName())) {
-                d.getList().forEach(hash -> {
+                for (LinkedHashMap<String, String> hash : d.getList()) {
                     hash.put("updated_by", tokenDto.getUserId());
                     if (!hash.containsKey("ID")) {
                         hash.put("id", UUID.randomUUID().toString().replaceAll("-", ""));
@@ -205,7 +207,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
                         //字表更新数据
                         baseDao.upTable(d.getTableName(), hash.get("ID"), hash);
                     }
-                });
+                }
             }
         });