From dfbe6e748b7cff24bcef5da765e23e29c857f268 Mon Sep 17 00:00:00 2001 From: litao Date: Mon, 12 Jun 2017 10:08:27 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lyms/platform/operate/web/service/impl/ReportServiceImpl.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java index c4d3282..bfa47a9 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java @@ -1039,7 +1039,7 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService * 1 = 发放人数 2 = 发放券数 3 = 使用人数 4 = 使用券数 */ Integer type = (Integer) param.get("type"); - if(type == null) type = 1; + if(type == null) type = 4; if(exportType == 1 && type == 1) { /** 孕期发放人数 */ exportPregnancy(couponInfos == null ? userSendInfos : couponInfos, response); } else if(exportType == 1) { /** 孕期使用券数 */ @@ -1137,6 +1137,7 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService Map result = new LinkedHashMap<>(); result.put("id", ++i); result.put("phone", m.get("phone")); + result.put("use_date", m.get("use_date")); result.put("username", m.get("username")); result.put("week", m.get("week")); result.put("type_desc", m.get("type_desc")); @@ -1220,8 +1221,8 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService cnames.put("username", "姓名"); cnames.put("send_hospital", "发放机构"); cnames.put("doctoer_name", "发放医生"); - cnames.put("householdAddress", "居住地"); - cnames.put("residenceAddress", "户籍地"); + cnames.put("residenceAddress", "居住地"); + cnames.put("householdAddress", "户籍地"); cnames.put("phone", "联系电话"); List> results = new ArrayList<>(); -- 1.8.3.1