空数据导出优化

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<String, Object> params, HttpServletResponse response) throws Exception {
         List<ChangeDeathDTO> 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);
     }
 
 

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<String, Object> params, HttpServletResponse response) throws Exception {
         List<ChangeRelocationDTO> 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);
     }
 
     /**

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 = "加入时间")

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;
 

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

@@ -162,7 +162,11 @@ public class ChangeRelocationServiceImpl extends BaseServiceImpl<ChangeRelocatio
         entity.setAgencyId(dto.getGridId());
         entity.setAgencyName(dto.getGridName());
         entity.setAge(IdCardNoValidatorUtils.getAge(result.getIdCard()).toString());
-        entity.setAddress(dto.getVillageName() + dto.getBuildName() + dto.getUnitName() + dto.getHomeName());
+        if("out".equals(dto.getType()) && StringUtils.isNotBlank(dto.getVillageName())
+                && StringUtils.isNotBlank(dto.getBuildName()) && StringUtils.isNotBlank(dto.getUnitName())
+                && StringUtils.isNotBlank(dto.getHomeName())){
+            entity.setAddress(dto.getVillageName() + dto.getBuildName() + dto.getUnitName() + dto.getHomeName());
+        }
         insert(entity);
 
         //享受福利

epmet-user/epmet-user-server/src/main/resources/mapper/ChangeDeathDao.xml

@@ -71,5 +71,6 @@
                 AND w.DEL_FLAG IS NULL
             </if>
         </if>
+        order by d.CREATED_TIME desc
     </select>
 </mapper>

epmet-user/epmet-user-server/src/main/resources/mapper/ChangeRelocationDao.xml

@@ -82,5 +82,6 @@
                 AND w.DEL_FLAG IS NULL
             </if>
         </if>
+        order by r.CREATED_TIME desc
     </select>
 </mapper>