From 24e2ebeaec9ab300cfac9851b8d2c5c7c1d39f9c Mon Sep 17 00:00:00 2001 From: Jackwang Date: Fri, 13 May 2022 15:55:34 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A9=BA=E6=95=B0=E6=8D=AE=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/controller/ChangeDeathController.java | 8 +++++++- .../com/epmet/controller/ChangeRelocationController.java | 8 +++++++- .../src/main/java/com/epmet/excel/ChangeDeathExcel.java | 4 ++-- .../main/java/com/epmet/excel/ChangeRelocationExcel.java | 8 +++----- .../epmet/service/impl/ChangeRelocationServiceImpl.java | 6 +++++- .../src/main/resources/mapper/ChangeDeathDao.xml | 1 + .../src/main/resources/mapper/ChangeRelocationDao.xml | 1 + 7 files changed, 26 insertions(+), 10 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/ChangeDeathController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/ChangeDeathController.java index 5ace677f91..c3a1e0ec6f 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/ChangeDeathController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/ChangeDeathController.java @@ -15,6 +15,7 @@ import com.epmet.commons.tools.validator.group.UpdateGroup; import com.epmet.dto.ChangeDeathDTO; import com.epmet.excel.ChangeDeathExcel; import com.epmet.service.ChangeDeathService; +import org.apache.commons.collections4.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -79,7 +80,12 @@ public class ChangeDeathController { @GetMapping("export") public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { List list = changeDeathService.list(params); - ExcelUtils.exportExcelToTarget(response, null, list, ChangeDeathExcel.class); + if(CollectionUtils.isEmpty(list)){ + ChangeDeathDTO dto = new ChangeDeathDTO(); + dto.setId(""); + list.add(dto); + } + ExcelUtils.exportEpmetExcel(response, null, list, ChangeDeathExcel.class); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/ChangeRelocationController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/ChangeRelocationController.java index 402cdaa061..5199e19b53 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/ChangeRelocationController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/ChangeRelocationController.java @@ -15,6 +15,7 @@ import com.epmet.commons.tools.validator.group.UpdateGroup; import com.epmet.dto.ChangeRelocationDTO; import com.epmet.excel.ChangeRelocationExcel; import com.epmet.service.ChangeRelocationService; +import org.apache.commons.collections4.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -79,7 +80,12 @@ public class ChangeRelocationController { @GetMapping("export") public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { List list = changeRelocationService.list(params); - ExcelUtils.exportExcelToTarget(response, null, list, ChangeRelocationExcel.class); + if(CollectionUtils.isEmpty(list)){ + ChangeRelocationDTO dto = new ChangeRelocationDTO(); + dto.setId(""); + list.add(dto); + } + ExcelUtils.exportEpmetExcel(response, null, list, ChangeRelocationExcel.class); } /** diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/ChangeDeathExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/ChangeDeathExcel.java index bb250db6b8..a198ceee2d 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/ChangeDeathExcel.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/ChangeDeathExcel.java @@ -29,10 +29,10 @@ public class ChangeDeathExcel { @Excel(name = "手机号") private String mobile; - @Excel(name = "性别",replace = { "男_1", "女_0"} ) + @Excel(name = "性别",replace = { "男_1", "女_0", " _null"} ) private String gender; - @Excel(name = "类型",replace = { "房东_1", "租客_0"} ) + @Excel(name = "类型",replace = { "房东_1", "租客_0", " _null"} ) private String type; @Excel(name = "加入时间") diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/ChangeRelocationExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/ChangeRelocationExcel.java index 2ce20d1f49..1823d569e2 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/ChangeRelocationExcel.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/ChangeRelocationExcel.java @@ -26,6 +26,9 @@ public class ChangeRelocationExcel { @Excel(name = "所属房屋") private String oldAddress; + @Excel(name = "户主姓名") + private String ownerName; + @Excel(name = "手机号") private String mobile; @@ -47,11 +50,6 @@ public class ChangeRelocationExcel { @Excel(name = "迁往何地") private String address; - @Excel(name = "户主姓名") - private String ownerName; - - - // @Excel(name = "组织PID") // private String pid; diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/ChangeRelocationServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/ChangeRelocationServiceImpl.java index 82dc02487e..dc4a71b7f1 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/ChangeRelocationServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/ChangeRelocationServiceImpl.java @@ -162,7 +162,11 @@ public class ChangeRelocationServiceImpl extends BaseServiceImpl + order by d.CREATED_TIME desc diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/ChangeRelocationDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/ChangeRelocationDao.xml index fa7458bdf8..09ac7a2a76 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/ChangeRelocationDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/ChangeRelocationDao.xml @@ -82,5 +82,6 @@ AND w.DEL_FLAG IS NULL + order by r.CREATED_TIME desc