diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerMicroGridController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerMicroGridController.java index 30c428a34a..f87482ca86 100755 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerMicroGridController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerMicroGridController.java @@ -74,9 +74,9 @@ public class CustomerMicroGridController { return new Result(); } - @GetMapping("export") - public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { - List list = customerMicroGridService.list(params); + @PostMapping("export") + public void export(@RequestBody CustomerMicroGridPageFormDTO dto, HttpServletResponse response) throws Exception { + List list = customerMicroGridService.exportList(dto); ExcelUtils.exportExcelToTarget(response, null, list, CustomerMicroGridExcel.class); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/CustomerMicroGridExcel.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/CustomerMicroGridExcel.java index e977a9d503..7e4047d3ce 100755 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/CustomerMicroGridExcel.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/CustomerMicroGridExcel.java @@ -14,11 +14,11 @@ import java.util.Date; @Data public class CustomerMicroGridExcel { - @Excel(name = "ID 唯一标识") - private String id; + @Excel(name = "所属社区") + private String communityName; - @Excel(name = "客户ID") - private String customerId; + @Excel(name = "所属网格") + private String gridName; @Excel(name = "微网格名称") private String microgridName; @@ -26,59 +26,5 @@ public class CustomerMicroGridExcel { @Excel(name = "微网格长") private String contacts; - @Excel(name = "性别(女性-0,男性-1)") - private String sex; - - @Excel(name = "联系电话") - private String mobile; - - @Excel(name = "地址") - private String address; - - @Excel(name = "网格id") - private Integer gridId; - - @Excel(name = "所属组织机构ID") - private String agencyId; - - @Excel(name = "所有上级组织ID") - private String agencyPids; - - @Excel(name = "当前网格总人数") - private Integer totalUser; - - @Excel(name = "网格排序") - private Integer sort; - - @Excel(name = "中心位置纬度") - private String latitude; - - @Excel(name = "中心点位地址") - private String centerAddress; - - @Excel(name = "坐标区域") - private String coordinates; - - @Excel(name = "编码") - private String code; - - @Excel(name = "删除标识:0.未删除 1.已删除") - private Integer delFlag; - - @Excel(name = "乐观锁") - private Integer revision; - - @Excel(name = "创建人") - private String createdBy; - - @Excel(name = "更新人") - private String updatedBy; - - @Excel(name = "创建时间") - private Date createdTime; - - @Excel(name = "更新时间") - private Date updatedTime; - } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerMicroGridService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerMicroGridService.java index d10aab595b..fc20b13b9d 100755 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerMicroGridService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerMicroGridService.java @@ -78,4 +78,6 @@ public interface CustomerMicroGridService extends BaseService exportList(CustomerMicroGridPageFormDTO dto); } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerMicroGridServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerMicroGridServiceImpl.java index eb2516514b..03b3143448 100755 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerMicroGridServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerMicroGridServiceImpl.java @@ -102,4 +102,16 @@ public class CustomerMicroGridServiceImpl extends BaseServiceImpl exportList(CustomerMicroGridPageFormDTO dto) { + // 获取所有的pids + if (StringUtils.isNotBlank(dto.getAgencyId())){ + CustomerAgencyEntity customerAgencyEntity = customerAgencyDao.selectById(dto.getAgencyId()); + dto.setAgencyPids(customerAgencyEntity.getPids().concat(":").concat(dto.getAgencyId())); + } + + List entityList = baseDao.selectPageList(dto); + return entityList; + } + } \ No newline at end of file