From 68a839583b67143aa9a07d8c00cf9796c7185b96 Mon Sep 17 00:00:00 2001 From: litao Date: Fri, 9 Jun 2017 15:39:55 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E6=95=B0=E6=8D=AE=E5=AE=8C?= =?UTF-8?q?=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operate/web/controller/ReportController.java | 3 +- .../web/service/impl/ReportServiceImpl.java | 47 ++++++++++++---------- .../lyms/platform/operate/web/utils/PageUtil.java | 8 ++-- 3 files changed, 32 insertions(+), 26 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ReportController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ReportController.java index 4715257..9ef7244 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ReportController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ReportController.java @@ -258,7 +258,8 @@ public class ReportController extends BaseController { @RequestMapping(value = "/coupon/info/export", method = RequestMethod.GET) public void couponInfoExport(HttpServletRequest request, HttpServletResponse response, Date startDate, Date endDate, Integer type, String provinceId, String cityId, String areaId, String hospitalId, String tempId, String couponType, Integer exportType) { - Map param = CollectionUtils.createMap("userId", getUserId(request), "startDate", startDate, + Map param = CollectionUtils.createMap("userId", "1000000185", "startDate", startDate, +// Map param = CollectionUtils.createMap("userId", getUserId(request), "startDate", startDate, "endDate", endDate != null ? DateUtil.addDay(endDate, 1) : endDate, "hospitalId", CollectionUtils.asList(hospitalId), "provinceId", provinceId, "cityId", cityId, "areaId", areaId, "type", type, "tempId", tempId, "couponType",couponType, "exportType", exportType); reportService.exportCouponInfo(param, response); 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 776109e..fa26c8b 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 @@ -754,7 +754,7 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService Patients patients = mongoTemplate.findById(babyModel.getParentId(), Patients.class); map.put("username", babyModel.getName()); if(patients != null) { - map.put("phone", patients.getPhone()); + map.put("phone", com.lyms.platform.common.utils.StringUtils.encryPhone(patients.getPhone())); String residenceAddress = findName(patients.getProvinceRegisterId()) + findName(patients.getCityRegisterId()) + findName(patients.getAreaRegisterId()) + findName(patients.getStreetRegisterId()) + findName(patients.getAddressRegister()); map.put("residenceAddress", residenceAddress.replace("null", "")); /** 居住地 */ @@ -768,7 +768,7 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService private void setUserSendInfo(String userId, Map map) { Patients patients = mongoTemplate.findOne(Query.query(Criteria.where("pid").is(userId)), Patients.class); if(patients != null) { - map.put("phone", patients.getPhone()); + map.put("phone", com.lyms.platform.common.utils.StringUtils.encryPhone(patients.getPhone())); map.put("username", patients.getUsername()); String residenceAddress = findName(patients.getProvinceRegisterId()) + findName(patients.getCityRegisterId()) + findName(patients.getAreaRegisterId()) + findName(patients.getStreetRegisterId()) + findName(patients.getAddressRegister()); @@ -925,7 +925,7 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService map.put("week", week); map.put("number", number); map.put("doctorName", doctorName); - map.put("phone", phone); + map.put("phone", com.lyms.platform.common.utils.StringUtils.encryPhone(phone)); } public static class SortTempModel { @@ -1022,11 +1022,21 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService PageResult pageResult = (PageResult) resp.getData(); Map map = (Map) pageResult.getGrid(); List> couponInfos = (List>) map.get("couponInfos"); + List> userSendInfos = (List>) map.get("userSendInfos"); + /** + * 1 = 孕期优惠券使用统计详情导出 + * 2 = 产后优惠券使用统计详情导出 + * 3 = 儿童优惠券使用统计详情导出 + */ Integer exportType = (Integer) param.get("exportType"); + + /** + * 1 = 发放人数 2 = 发放券数 3 = 使用人数 4 = 使用券数 + */ Integer type = (Integer) param.get("type"); - if(type == 1) { /** 孕期 */ - exportPregnancy(couponInfos, response); + if(exportType == 1 && type == 1) { /** 孕期发放人数 */ + exportPregnancy(userSendInfos, response); } else if(type == 2 || type == 3) { /** 产后和儿童类似 */ exportPostpartum(couponInfos, response); } @@ -1067,33 +1077,28 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService ResponseUtil.responseExcel(cnames, results, response); } - private void exportPregnancy(List> couponInfos, HttpServletResponse response) { + private void exportPregnancy(List> userSendInfos, HttpServletResponse response) { Map cnames = new LinkedHashMap<>(); cnames.put("id", "#"); - cnames.put("checkDate", "产检日期"); + cnames.put("create_date", "发放日期"); cnames.put("username", "姓名"); - cnames.put("week", "产检孕周"); - cnames.put("number", "产检第次"); - cnames.put("type", "产检券类型"); - cnames.put("sequence_id", "产检券号"); - cnames.put("operatorOrgName", "产检机构"); - cnames.put("doctorName", "产检医生"); - cnames.put("send_hospital", "产检券发放机构"); + cnames.put("send_hospital", "发放机构"); + cnames.put("doctoer_name", "发放医生"); + cnames.put("householdAddress", "居住地"); + cnames.put("residenceAddress", "户籍地"); cnames.put("phone", "联系电话"); List> results = new ArrayList<>(); int i = 0; - for (Map m : couponInfos) { + for (Map m : userSendInfos) { Map result = new LinkedHashMap<>(); result.put("id", ++i); - result.put("checkDate", DateUtil.getyyyy_MM_dd((Date) m.get("checkDate"))); + result.put("create_date", m.get("create_date")); result.put("username", m.get("username")); - result.put("week", m.get("week")); - result.put("number", m.get("number")); - result.put("sequence_id", m.get("sequence_id")); - result.put("operatorOrgName", m.get("operatorOrgName")); - result.put("doctorName", m.get("doctorName")); result.put("send_hospital", m.get("send_hospital")); + result.put("doctoer_name", m.get("doctoer_name")); + result.put("householdAddress", m.get("householdAddress")); + result.put("residenceAddress", m.get("residenceAddress")); result.put("phone", m.get("phone")); results.add(result); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/PageUtil.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/PageUtil.java index 6eda9b8..ffd49ba 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/PageUtil.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/PageUtil.java @@ -27,12 +27,12 @@ public class PageUtil { // Integer pageSize = map.get("pageSize") == null ? 15 : Integer.parseInt(map.get("pageSize").toString()); // Integer currentPage = map.get("currentPage") == null ? 1 : Integer.parseInt(map.get("currentPage").toString()); - if(map.get("currentPage") == null || map.get("pageSize") == null) { /** 为了详情导出 不做分页 */ + /* if(map.get("currentPage") == null || map.get("pageSize") == null) { *//** 为了详情导出 不做分页 *//* return; - } + }*/ - Integer pageSize = map.get("pageSize") == null ? 15 : Integer.parseInt(map.get("pageSize").toString()); - Integer currentPage = map.get("currentPage") == null ? 1 : Integer.parseInt(map.get("currentPage").toString()); + Integer pageSize = map.get("pageSize") == null ? 0 : Integer.parseInt(map.get("pageSize").toString()); + Integer currentPage = map.get("currentPage") == null ? 0 : Integer.parseInt(map.get("currentPage").toString()); if(pageSize < 1) { pageSize = 10; } -- 1.8.3.1