社会组织导出程序优化

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/SocietyOrgListResultDTO.java

@@ -31,6 +31,8 @@ public class SocietyOrgListResultDTO implements Serializable {
 
     //所属组织Id
     private String  agencyId;
+    //所属组织名称
+    private String  agencyName;
     //社会组织Id
     private String societyId;
     //社会组织名称

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcSocietyOrgController.java

@@ -131,6 +131,7 @@ public class IcSocietyOrgController {
     public void export(@LoginUser TokenDto tokenDto, @RequestBody GetListSocietyOrgFormDTO formDTO, HttpServletResponse response) throws Exception {
         formDTO.setCustomerId(tokenDto.getCustomerId());
         formDTO.setStaffId(tokenDto.getUserId());
+        formDTO.setIsPage(false);
         GetListSocietyOrgResultDTO list = societyOrgService.getList(formDTO);
         ExcelUtils.exportExcelToTarget(response, null, list.getList(), IcSocietyOrgExcel.class);
     }

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/IcSocietyOrgExcel.java

@@ -19,6 +19,7 @@ package com.epmet.excel;
 
 import cn.afterturn.easypoi.excel.annotation.Excel;
 import com.epmet.commons.tools.utils.ExcelVerifyInfo;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import org.hibernate.validator.constraints.Length;
 
@@ -35,17 +36,9 @@ import java.util.Date;
 @Data
 public class IcSocietyOrgExcel extends ExcelVerifyInfo implements Serializable {
 
-    @Excel(name = "唯一标识")
+    @Excel(name = "组织名称")
-    private String id;
+    @NotBlank(message = "不能为空")
-
+    private String agencyName;
-    @Excel(name = "客户Id")
-    private String customerId;
-
-    @Excel(name = "组织Id")
-    private String agencyId;
-
-    @Excel(name = "agency_id的所有上级")
-    private String pids;
 
     @Excel(name = "社会组织名称")
     @NotBlank(message = "不能为空")
@@ -69,14 +62,14 @@ public class IcSocietyOrgExcel extends ExcelVerifyInfo implements Serializable {
 
     @Excel(name = "起始服务时间")
     @NotBlank(message = "不能为空")
-    private Date serviceStartTime;
+    private String serviceStartTime;
 
     @Excel(name = "终止服务时间")
     @NotBlank(message = "不能为空")
-    private Date serviceEndTime;
+    private String serviceEndTime;
 
-    @Excel(name = "绑定管理员[组织下录入的工作人员]")
+    @Excel(name = "管理员姓名")
-    private String adminStaffId;
+    private String adminStaffName;
 
     @Excel(name = "地址")
     private String address;
@@ -87,8 +80,4 @@ public class IcSocietyOrgExcel extends ExcelVerifyInfo implements Serializable {
     @Excel(name = "维度")
     private String latitude;
 
-    @Excel(name = "备注")
-    private String remarks;
-
-
 }

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcSocietyOrgServiceImpl.java

@@ -26,18 +26,14 @@ import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dao.IcSocietyOrgDao;
-import com.epmet.dto.form.AddSocietyOrgFormDTO;
+import com.epmet.dto.form.*;
-import com.epmet.dto.form.EditSocietyOrgFormDTO;
-import com.epmet.dto.form.GetListSocietyOrgFormDTO;
-import com.epmet.dto.form.UserIdsFormDTO;
 import com.epmet.dto.form.demand.ServiceQueryFormDTO;
-import com.epmet.dto.result.GetListSocietyOrgResultDTO;
+import com.epmet.dto.result.*;
-import com.epmet.dto.result.SocietyOrgListResultDTO;
-import com.epmet.dto.result.StaffSinGridResultDTO;
 import com.epmet.dto.result.demand.OptionDTO;
 import com.epmet.entity.IcSocietyOrgEntity;
 import com.epmet.excel.IcSocietyOrgExcel;
 import com.epmet.feign.EpmetUserOpenFeignClient;
+import com.epmet.feign.GovOrgOpenFeignClient;
 import com.epmet.service.IcSocietyOrgService;
 import com.epmet.service.IcUserDemandRecService;
 import com.github.pagehelper.PageHelper;
@@ -68,6 +64,8 @@ public class IcSocietyOrgServiceImpl extends BaseServiceImpl<IcSocietyOrgDao, Ic
     private EpmetUserOpenFeignClient epmetUserOpenFeignClient;
     @Autowired
     private IcUserDemandRecService icUserDemandRecService;
+    @Autowired
+    private GovOrgOpenFeignClient govOrgOpenFeignClient;
 
     /**
      * @Author sun
@@ -120,11 +118,12 @@ public class IcSocietyOrgServiceImpl extends BaseServiceImpl<IcSocietyOrgDao, Ic
         formDTO.setPids(staffInfoCache.getAgencyPIds());
         //1.根据查询条件分页查询社会组织数据
         PageInfo<SocietyOrgListResultDTO> result =
-                PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.getList(formDTO));
+                PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getIsPage()).doSelectPageInfo(() -> baseDao.getList(formDTO));
         if (CollectionUtils.isEmpty(result.getList())) {
             return resultDTO;
         }
         resultDTO.setTotal((int) result.getTotal());
+
         //2.查询被绑定管理员信息
         UserIdsFormDTO dto = new UserIdsFormDTO();
         List<String> staffIdList = result.getList().stream().map(SocietyOrgListResultDTO::getAdminStaffId).collect(Collectors.toList());
@@ -135,8 +134,20 @@ public class IcSocietyOrgServiceImpl extends BaseServiceImpl<IcSocietyOrgDao, Ic
             throw new RenException("获取工作人员基本信息失败......");
         }
         result.getList().forEach(r -> listResult.getData().stream().filter(u -> r.getAdminStaffId().equals(u.getStaffId())).forEach(u -> r.setAdminStaffName(u.getStaffName())));
-        resultDTO.setList(result.getList());
 
+        //3.查询被绑定管理员信息
+        OrgInfoFormDTO org = new OrgInfoFormDTO();
+        List<String> orgIds = result.getList().stream().map(SocietyOrgListResultDTO::getAgencyId).collect(Collectors.toList());
+        orgIds = orgIds.stream().distinct().collect(Collectors.toList());
+        org.setOrgIds(orgIds);
+        org.setOrgType("agency");
+        Result<List<OrgInfoResultDTO>> orgResult = govOrgOpenFeignClient.selectOrgInfo(org);
+        if (!orgResult.success()) {
+            throw new RenException("获取组织基础信息失败......");
+        }
+        result.getList().forEach(r -> orgResult.getData().stream().filter(u -> r.getAgencyId().equals(u.getOrgId())).forEach(u -> r.setAgencyName(u.getOrgName())));
+
+        resultDTO.setList(result.getList());
         return resultDTO;
     }