修改：【居民信息导入】所属支部的查询调整

epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/ResiPartyMemberOpenFeignClient.java

@@ -1,7 +1,11 @@
 package com.epmet.resi.partymember.feign;
 
+import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.commons.tools.dto.result.OptionResultDTO;
+import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.resi.partymember.dto.partyOrg.result.BranchlistTreeDTO;
 import com.epmet.resi.partymember.dto.partymember.IcPartyMemberDTO;
 import com.epmet.resi.partymember.dto.partymember.PartymemberBaseInfoDTO;
 import com.epmet.resi.partymember.dto.partymember.PartymemberInfoDTO;
@@ -124,4 +128,7 @@ public interface ResiPartyMemberOpenFeignClient {
      */
     @PostMapping("/resi/partymember/icPartyMember/icPartyMemberSync")
     Result icPartyMemberSync(@RequestBody IcPartyMemberDTO dto);
+
+    @PostMapping("/resi/partymember/icPartyOrg/branchlist")
+    public Result<List<OptionResultDTO>> branchlist();
 }

epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/fallback/ResiPartyMemberOpenFeignClientFallback.java

@@ -1,8 +1,11 @@
 package com.epmet.resi.partymember.feign.fallback;
 
 import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.commons.tools.dto.result.OptionResultDTO;
+import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ModuleUtils;
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.resi.partymember.dto.partyOrg.result.BranchlistTreeDTO;
 import com.epmet.resi.partymember.dto.partymember.IcPartyMemberDTO;
 import com.epmet.resi.partymember.dto.partymember.PartymemberBaseInfoDTO;
 import com.epmet.resi.partymember.dto.partymember.PartymemberInfoDTO;
@@ -88,4 +91,9 @@ public class ResiPartyMemberOpenFeignClientFallback implements ResiPartyMemberOp
     public Result icPartyMemberSync(IcPartyMemberDTO dto) {
         return ModuleUtils.feignConError(ServiceConstant.RESI_PARTYMEMBER_SERVER, "icPartyMemberSync", dto);
     }
+
+    @Override
+    public Result<List<OptionResultDTO>> branchlist() {
+        return ModuleUtils.feignConError(ServiceConstant.RESI_PARTYMEMBER_SERVER, "branchlist", null);
+    }
 }

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

@@ -50,6 +50,7 @@ import com.epmet.enums.IcResiUserTableEnum;
 import com.epmet.excel.handler.IcResiImportDynamicExcelListener;
 import com.epmet.excel.handler.IcResiVirtualSheetImportListener;
 import com.epmet.feign.*;
+import com.epmet.resi.partymember.feign.ResiPartyMemberOpenFeignClient;
 import com.epmet.service.IcResiUserImportService;
 import com.epmet.service.UserService;
 import com.google.common.cache.Cache;
@@ -90,7 +91,7 @@ import java.util.stream.Collectors;
 public class IcResiUserImportServiceImpl implements IcResiUserImportService, ResultDataResolver {
 
     public static final List<String> controlGroup1 = Arrays.asList("input", "textarea", "datepicker", "daterange");
-    public static final List<String> controlGroup2 = Arrays.asList("select", "radio");
+    public static final List<String> controlGroup2 = Arrays.asList("select", "radio", "cascader");
 
     /**
      * 15位身份证号的正则表达式
@@ -168,6 +169,8 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
     private EpmetCommonServiceOpenFeignClient commonServiceOpenFeignClient;
     @Autowired
     private OssFeignClient ossFeignClient;
+    @Autowired
+    private ResiPartyMemberOpenFeignClient partyMemberOpenFeignClient;
 
     /**
      * 子表中不需要的列。因为主表中需要身份证号，网格等信息，但子表中不需要这些列必填，只要有身份证号即可，因此字表判断的时候需要排除这些列
@@ -1341,6 +1344,9 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
             case "/sys/dict/data/relationship":
                 options = getResultDataOrThrowsException(adminOpenFeignClient.getRelationshipOption(), ServiceConstant.GOV_ORG_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), null, null);
                 break;
+            case "/resi/partymember/icPartyOrg/branchlist":
+                options = this.listBranchOptions();
+                break;
             default:
                 log.warn("listRemoteOptions url is not supported");
 
@@ -1383,6 +1389,20 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
 
     }
 
+    /**
+     * 支部列表选项
+     * @return
+     */
+    private List<OptionResultDTO> listBranchOptions() {
+        String msg = "查询支部列表失败";
+        List<OptionResultDTO> branchList = getResultDataOrThrowsException(partyMemberOpenFeignClient.branchlist(),
+                ServiceConstant.RESI_PARTYMEMBER_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), msg, msg);
+        //结果平铺展开
+        Map<String, OptionResultDTO> resultMap = new HashMap<>();
+        branchList.forEach(option-> option.getCurrenNodeAllChild(option,resultMap));
+        return branchList;
+    }
+
     @Override
     public Map<String, OptionResultDTO> listRemoteCascadeOptions(String pureUri, String cascadeItemId, Map<String, ColumnWrapper> columnWrappers, String currentStaffAgencyId, String query) {
         ColumnWrapper cascadeItemColumnWrapper = null;