diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RemoteController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RemoteController.java index 988e0c7..7c7205a 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RemoteController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RemoteController.java @@ -457,6 +457,25 @@ public class RemoteController extends BaseController { } data.put("type",typeStr); data.put("created",DateUtil.getyyyy_MM_dd(womanArchive.getCreated())); + + + /*******************************************************************/ + /** + * 导出添加居住地 + */ + Map data1 = womanArchive.getData(); + String provinceId = String.valueOf(data1.get("provinceId")); + String cityId = String.valueOf(data1.get("cityId")); + String areaId = String.valueOf(data1.get("areaId")); + String streetId = String.valueOf(data1.get("streetId")); + String address = String.valueOf(data1.get("address")); + String liveAddress = ""; + if (StringUtils.isNotEmpty(provinceId) && StringUtils.isNotEmpty(streetId)) + { + liveAddress = CommonsHelper.getResidence(provinceId,cityId,areaId,streetId,address,basicConfigService); + } + data.put("liveAddress",liveAddress); + /*******************************************************************/ datas.add(data); } } @@ -471,6 +490,7 @@ public class RemoteController extends BaseController { cnames.put("phone", "手机号"); cnames.put("type", "检查类型"); cnames.put("created", "登记日期"); + cnames.put("liveAddress", "居住地"); response.setContentType("application/octet-stream"); response.setCharacterEncoding("UTF-8"); response.setHeader("Content-Disposition", "attachment;fileName=" + "预约建档管理.xls");