所属支部固定处理 代调整

epmet-user/epmet-user-server/src/main/java/com/epmet/constant/UserConstant.java

@@ -99,6 +99,7 @@ public interface UserConstant {
 	String MAN_WOMAN = "先生/女士";
 
 	String GRID_ID="GRID_ID";
+	String GRID_NAME="GRID_NAME";
 	String GENDER="GENDER";
 	String HOUSE_TYPE_KEY="HOUSE_TYPE";
     String HOME_ID = "HOME_ID";

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java

@@ -72,14 +72,14 @@ public class IcResiUserController {
     private static final String BASE_TABLE_NAME = "ic_resi_user";
 
     private Path IC_RESI_UPLOAD_DIR;
-    
+
     @Autowired
     private OperCustomizeOpenFeignClient operCustomizeOpenFeignClient;
     @Autowired
     private IcResiUserService icResiUserService;
     @Autowired
     private IcResiUserImportService icResiUserImportService;
-    
+
     {
         // 初始化上传目录
         String home = System.getProperty("user.home");
@@ -212,7 +212,7 @@ public class IcResiUserController {
             }
         }
 
-        Map<String, Map<String, Object>> resiMainList = icResiUserService.getDataForExport(otherSheetItems.get(BASE_TABLE_NAME), pageFormDTO.getCustomerId(), pageFormDTO.getFormCode(), BASE_TABLE_NAME, pageFormDTO.getConditions());
+        Map<String, Map<String, Object>> resiMainList = icResiUserService.getDataForExport(otherSheetItems.get(BASE_TABLE_NAME),new HashMap<>(), pageFormDTO.getCustomerId(), pageFormDTO.getFormCode(), BASE_TABLE_NAME, pageFormDTO.getConditions());
         //resiMainList = (List<Map<String, Object>>)JSON.parse("[{\"IS_BDHJ\":\"1\",\"IS_SPECIAL\":\"1\",\"IS_XFRY\":\"0\",\"REMARKS\":\"beizhu\",\"IS_PARTY\":\"1\",\"icResiUserId\":\"yzmtest2\",\"HOME_ID\":\"中海国际社区一里城1号楼1单元101\",\"HOUSE_TYPE\":\"平房\",\"UNIT_NAME\":\"1单元\",\"GRID_ID\":\"市北区-市北区第三网格3\",\"IS_DB\":\"0\",\"GENDER\":\"男\",\"BIRTHDAY\":\"2021-10-04\",\"IS_VETERANS\":\"0\",\"IS_MB\":\"0\",\"IS_UNEMPLOYED\":\"0\",\"DEMAND_NAME\":null,\"IS_KC\":\"0\",\"IS_ENSURE_HOUSE\":\"0\",\"IS_SD\":\"0\",\"NAME\":\"尹作梅\",\"RDSJ\":null,\"IS_VOLUNTEER\":\"1\",\"GRID_ID_VALUE\":\"e74829ffc43d5470eba6b5e060c11e63\",\"IS_SZ\":\"0\",\"IS_CJ\":\"0\",\"HOME_ID_VALUE\":\"200\",\"DEMAND_CATEGORY_IDS\":null,\"VILLAGE_NAME\":\"中海国际社区一里城\",\"IS_DBH\":\"0\",\"IS_SN\":\"0\",\"BUILD_NAME\":\"1号楼\",\"IS_YLFN\":\"0\",\"IS_UNITED_FRONT\":\"0\",\"ID_CARD\":\"371325199310260529\",\"MOBILE\":\"15764229697\",\"IS_OLD_PEOPLE\":\"0\",\"DOOR_NAME\":\"101\"},{\"IS_SPECIAL\":\"1\",\"IS_XFRY\":\"0\",\"REMARKS\":\"beizhu\",\"IS_PARTY\":\"1\",\"icResiUserId\":\"yzmtest\",\"HOME_ID\":\"中海国际社区一里城1号楼1单元101\",\"HOUSE_TYPE\":\"平房\",\"UNIT_NAME\":\"1单元\",\"GRID_ID\":\"市北区-市北区第三网格3\",\"IS_DB\":\"0\",\"GENDER\":\"男\",\"BIRTHDAY\":\"2021-10-04\",\"IS_VETERANS\":\"0\",\"IS_MB\":\"0\",\"IS_UNEMPLOYED\":\"0\",\"DEMAND_NAME\":\"心理咨询\",\"IS_KC\":\"0\",\"IS_ENSURE_HOUSE\":\"0\",\"IS_SD\":\"0\",\"NAME\":\"尹作梅\",\"RDSJ\":\"2021-10-28 00:00:00\",\"IS_VOLUNTEER\":\"1\",\"GRID_ID_VALUE\":\"e74829ffc43d5470eba6b5e060c11e63\",\"IS_SZ\":\"0\",\"IS_CJ\":\"0\",\"HOME_ID_VALUE\":\"200\",\"DEMAND_CATEGORY_IDS\":\"10180002\",\"VILLAGE_NAME\":\"中海国际社区一里城\",\"IS_DBH\":\"0\",\"IS_SN\":\"0\",\"BUILD_NAME\":\"1号楼\",\"IS_YLFN\":\"0\",\"IS_UNITED_FRONT\":\"0\",\"ID_CARD\":\"371325199310260529\",\"MOBILE\":\"15764229697\",\"IS_OLD_PEOPLE\":\"0\",\"DOOR_NAME\":\"101\"}]");
         log.info("resiMainList:{}", JSON.toJSONString(resiMainList));
         String templatePath = "excel/ic_resi_info_cid.xls";
@@ -228,7 +228,7 @@ public class IcResiUserController {
             if (item.getChildGroup() != null) {
                 if (!item.getChildGroup().getTableName().equals(BASE_TABLE_NAME)) {
                     Map<String, FormItem> itemMap1 = otherSheetItems.get(item.getChildGroup().getTableName());
-                    Map<String, Map<String, Object>> resiChildMap = icResiUserService.getDataForExport(itemMap1, pageFormDTO.getCustomerId(), pageFormDTO.getFormCode(), item.getChildGroup().getTableName(), pageFormDTO.getConditions());
+                    Map<String, Map<String, Object>> resiChildMap = icResiUserService.getDataForExport(itemMap1,resiMainList, pageFormDTO.getCustomerId(), pageFormDTO.getFormCode(), item.getChildGroup().getTableName(), pageFormDTO.getConditions());
                     resiChildMap.forEach((key, value) -> value.putAll(resiMainList.get(key)));
 
                     Map<String, Object> mapData2 = new HashMap<>();

epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java

@@ -75,7 +75,7 @@ public interface IcResiUserService extends BaseService<IcResiUserEntity> {
      */
     Map queryIcResiDetail(IcResiDetailFormDTO pageFormDTO);
 
-    
+
 
     List<Map<String,Object>> dynamicQuery(String customerId,
                                           String formCode,
@@ -104,13 +104,14 @@ public interface IcResiUserService extends BaseService<IcResiUserEntity> {
      * desc:条件导出
      *
      * @param itemList
+     * @param resiMainList
      * @param customerId
      * @param formCode
      * @param baseTableName
      * @param conditions
      * @return
      */
-    Map<String, Map<String, Object>> getDataForExport(Map<String, FormItem> itemList, String customerId, String formCode, String baseTableName, List<ResiUserQueryValueDTO> conditions);
+    Map<String, Map<String, Object>> getDataForExport(Map<String, FormItem> itemList, Map<String, Map<String, Object>> resiMainList, String customerId, String formCode, String baseTableName, List<ResiUserQueryValueDTO> conditions);
 
     /**
      * @Description 家庭关系

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

@@ -534,7 +534,8 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
      * desc:条件导出
      *
      *
-     * @param formItemMap
+     * @param formItemMap key 表名 value formItem
+     * @param resiMainList
      * @param customerId
      * @param formCode
      * @param baseTableName
@@ -542,11 +543,21 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
      * @return
      */
     @Override
-    public Map<String, Map<String, Object>> getDataForExport(Map<String, FormItem> formItemMap, String customerId, String formCode, String baseTableName, List<ResiUserQueryValueDTO> conditions) {
+    public Map<String, Map<String, Object>> getDataForExport(Map<String, FormItem> formItemMap, Map<String, Map<String, Object>> resiMainList, String customerId, String formCode, String baseTableName, List<ResiUserQueryValueDTO> conditions) {
         List<Map<String, Object>> mapList = this.dynamicQuery(customerId, formCode, baseTableName, conditions);
         Map<String, Map<String, Object>> result = new LinkedHashMap<>();
         mapList.stream().filter(Objects::nonNull).forEach(map -> {
             String resiId = (String) map.getOrDefault(UserConstant.IC_RESI_USER, "");
+
+            if ("ic_resi_user".equals(baseTableName)) {
+                resiId = (String) map.get("ID");
+            }
+
+            if (StringUtils.isBlank(resiId)){
+                log.error("getDataForExport error,resiId:{}",resiId);
+                return;
+            }
+            result.put(resiId, map);
             for (Map.Entry<String, FormItem> e : formItemMap.entrySet()) {
                 String k = e.getKey();
                 FormItem v = e.getValue();
@@ -554,8 +565,16 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
                 if (temp != null) {
                     if (v.getOptionSourceType().equals("remote")) {
                         try {
+                            Map<String, IcResiUserImportServiceImpl.ColumnWrapper> columnWrappers = new HashMap<>();
+                            if(v.getItemId().equals("1078")){
+                                Map<String, Object> userMap = resiMainList.get(map.get(UserConstant.IC_RESI_USER));
+                                Object gridId = userMap.get(UserConstant.GRID_ID);
+                                IcResiUserImportServiceImpl.ColumnWrapper value = new IcResiUserImportServiceImpl.ColumnWrapper();
+                                value.setColValue(gridId.toString());
+                                columnWrappers.put("1001", value);
+                            }
                             //todo 获取 options
-                            Map<String, String> stringMap = icResiUserImportService.listRemoteOptions(new HashMap<>(), v.getOptionSourceValue(), null);
+                            Map<String, String> stringMap = icResiUserImportService.listRemoteOptions(columnWrappers, v.getOptionSourceValue(), null);
                             if ("checkbox".equals(v.getItemType())) {
                                 stringMap.forEach((label, value) -> map.put(value, temp.toString().contains(value) ? "是" : "否"));
                             } else if ("select".equals(v.getItemType())) {
@@ -590,15 +609,8 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
                     }
                 }
             }
-            if ("ic_resi_user".equals(baseTableName)) {
-                resiId = (String) map.get("ID");
-            }
-            if (StringUtils.isBlank(resiId)){
-                log.error("getDataForExport error,resiId:{}",resiId);
-                return;
-            }
-            result.put(resiId, map);
             if (!"ic_resi_user".equals(baseTableName)) {
+                map.putAll(resiMainList.get(resiId));
                 return;
             }
             Object gridId = map.get(UserConstant.GRID_ID);
@@ -607,7 +619,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
                 formDTO.setGridId(gridId.toString());
                 Result<CustomerGridDTO> gridInfoRes = govOrgOpenFeignClient.getGridBaseInfoByGridId(formDTO);
                 if (gridInfoRes != null && gridInfoRes.success() && gridInfoRes.getData() != null) {
-                    map.put(UserConstant.GRID_ID, gridInfoRes.getData().getGridName());
+                    map.put(UserConstant.GRID_NAME, gridInfoRes.getData().getGridName());
                 }
             }
             Object homeId = map.get(UserConstant.HOME_ID);