From 2bd6a1bc60c18bf472387bd340deb9d6a279ce54 Mon Sep 17 00:00:00 2001 From: litao Date: Mon, 5 Jun 2017 09:25:35 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=BE=E5=BC=80=E6=9F=A5=E8=AF=A2=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operate/web/controller/ReportController.java | 25 +++++++-------- .../web/service/impl/ReportServiceImpl.java | 37 +--------------------- 2 files changed, 13 insertions(+), 49 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 6ff1c8a..2a64a6b 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 @@ -186,7 +186,6 @@ public class ReportController extends BaseController { HttpServletRequest request, HttpServletResponse resp) { LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); reportService.exportDoctor(startDate, endDate, childBirth, loginState.getId(), resp); -// reportService.exportDoctor(startDate, endDate, childBirth, 753, resp); } @@ -208,10 +207,10 @@ public class ReportController extends BaseController { @RequestMapping(value = "/coupon", method = RequestMethod.GET) public BaseObjectResponse coupon(HttpServletRequest request, Date startDate, Date endDate, String provinceId, String cityId, String areaId, String hospitalId, String tempId, String couponType) { - /*Map param = CollectionUtils.createMap("userId", getUserId(request), "startDate", startDate, + Map param = CollectionUtils.createMap("userId", getUserId(request), "startDate", startDate, "endDate", endDate, "hospitalId", hospitalId, "provinceId", provinceId, "cityId", cityId, "areaId", - areaId, "tempId", tempId, "couponType", couponType);*/ - Map param = CollectionUtils.createMap("userId", getUserId(request),"hospitalId", "1000000094","tempId", tempId, "couponType", "1,2,3,4,5,6,7,8"); + areaId, "tempId", tempId, "couponType", couponType); + /*Map param = CollectionUtils.createMap("userId", getUserId(request),"hospitalId", "1000000094","tempId", tempId, "couponType", "1,2,3,4,5,6,7,8");*/ return reportService.coupon(param); } @@ -235,11 +234,11 @@ public class ReportController extends BaseController { public BaseObjectResponse couponInfo(HttpServletRequest request, Date startDate, Date endDate, Integer type, String provinceId, String cityId, String areaId, String hospitalId, String tempId, String couponType, Integer page, Integer limit) { - /* Map param = CollectionUtils.createMap("userId", getUserId(request), "startDate", startDate, + Map param = CollectionUtils.createMap("userId", getUserId(request), "startDate", startDate, "endDate", endDate, "hospitalId", CollectionUtils.asList(hospitalId), "provinceId", provinceId, "cityId", cityId, "areaId", areaId, "type", type, - "tempId", tempId, "couponType", CollectionUtils.asList(couponType), "currentPage", page, "pageSize", limit);*/ - Map param = CollectionUtils.createMap("userId", getUserId(request), "hospitalId", CollectionUtils.asList("216"), "type", type, - "tempId", tempId, "couponType", CollectionUtils.asList("1,2,3,4,5,6,7,8"), "currentPage", page, "pageSize", limit); + "tempId", tempId, "couponType", CollectionUtils.asList(couponType), "currentPage", page, "pageSize", limit); + /* Map param = CollectionUtils.createMap("userId", getUserId(request), "hospitalId", CollectionUtils.asList("216"), "type", type, + "tempId", tempId, "couponType", CollectionUtils.asList("1,2,3,4,5,6,7,8"), "currentPage", page, "pageSize", limit);*/ return reportService.couponInfo(param); } @@ -247,7 +246,7 @@ public class ReportController extends BaseController { * @param request * @param startDate * @param endDate - * @param type 1 = 孕期优惠券使用统计， 2 = 产后优惠券使用统计， 3 = 儿童优惠券使用统计 + * @param type 1 = 孕期优惠券使用统计详情导出， 2 = 产后优惠券使用统计详情导出， 3 = 儿童优惠券使用统计详情导出 * @param response * @param provinceId * @param cityId @@ -264,11 +263,11 @@ public class ReportController extends BaseController { public void couponInfoExport(HttpServletRequest request, Date startDate, Date endDate, Integer type, HttpServletResponse response, String provinceId, String cityId, String areaId, String hospitalId, String tempId, String couponType, Integer page, Integer limit) { - /* Map param = CollectionUtils.createMap("userId", getUserId(request), "startDate", startDate, + Map param = CollectionUtils.createMap("userId", getUserId(request), "startDate", startDate, "endDate", endDate, "hospitalId", hospitalId, "provinceId", provinceId, "cityId", cityId, "areaId", areaId, "type", type, - "tempId", tempId, "couponType", CollectionUtils.asList(couponType), "currentPage", page, "pageSize", limit);*/ - Map param = CollectionUtils.createMap("userId", "1000000185", "hospitalId", CollectionUtils.asList("216"), "type", type, - "tempId", tempId, "couponType", CollectionUtils.asList("1,2,3,4,5,6,7,8"), "currentPage", page, "pageSize", limit); + "tempId", tempId, "couponType", CollectionUtils.asList(couponType), "currentPage", page, "pageSize", limit); + /*Map param = CollectionUtils.createMap("userId", "1000000185", "hospitalId", CollectionUtils.asList("216"), "type", type, + "tempId", tempId, "couponType", CollectionUtils.asList("1,2,3,4,5,6,7,8"), "currentPage", page, "pageSize", limit);*/ 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 4682516..eeed826 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 @@ -22,7 +22,6 @@ import org.springframework.data.mongodb.core.MongoTemplate; import org.springframework.data.mongodb.core.query.Criteria; import org.springframework.data.mongodb.core.query.Query; import org.springframework.stereotype.Service; -import scala.annotation.target.param; import javax.servlet.http.HttpServletResponse; import java.sql.PreparedStatement; @@ -537,42 +536,8 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService exportPregnancy(couponInfos, response); } else if(type == 2 || type == 3) { /** 产后和儿童类似 */ exportPostpartum(couponInfos, response); - } /*else if(type == 3) { *//** 儿童 *//* - exportChild(couponInfos, response); - }*/ - - } - - private void exportChild(List> couponInfos, HttpServletResponse response) { - Map cnames = new LinkedHashMap<>(); - cnames.put("id", "#"); - cnames.put("checkDate", "产检日期"); - cnames.put("username", "姓名"); - cnames.put("patient_week", "建档孕周"); - cnames.put("patient_org_name", "建档机构"); - cnames.put("patient_docker_name", "建档医生"); - cnames.put("address", "居住地"); - cnames.put("census_register", "户籍地"); - cnames.put("phone", "联系电话"); - - List> results = new ArrayList<>(); - int i = 0; - for (Map m : couponInfos) { - Map result = new LinkedHashMap<>(); - result.put("id", ++i); - result.put("checkDate", DateUtil.getyyyy_MM_dd((Date) m.get("checkDate"))); - result.put("username", m.get("username")); - result.put("use_day", m.get("use_day")); - result.put("type", couponDescMap.get(m.get("type"))); - result.put("coupon_desc", couponReportMap.get(m.get("type") + "_" + m.get("coupon_order"))); - 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("phone", m.get("phone")); - results.add(result); } - ResponseUtil.responseExcel(cnames, results, response); + } private void exportPostpartum(List> couponInfos, HttpServletResponse response) { -- 1.8.3.1