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 9ef7244..b5f19c1 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 @@ -255,11 +255,12 @@ public class ReportController extends BaseController { * @param couponType */ @ResponseBody + @TokenRequired @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", "1000000185", "startDate", startDate, -// 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 536a683..ace7ed6 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 @@ -1040,21 +1040,88 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService Integer type = (Integer) param.get("type"); if(exportType == 1 && type == 1) { /** 孕期发放人数 */ exportPregnancy(userSendInfos, response); - } else if(exportType == 1 && type == 1) { /** 孕期使用券数 */ + } else if(exportType == 1 && type == 3) { /** 孕期使用券数 */ exportPregnancyUsedInfo(couponInfos, response); - }else if(exportType == 2 && type == 1) { /** 产后和儿童类似 */ + } else if(exportType == 2 && type == 1) { /** 产后发放统计 */ + exportPostpartumSendInfo(userSendInfos, response); + } else if(exportType == 2 && type == 3) { /** 产后使用 */ + exportPostpartumUsedInfo(userSendInfos, response); + } else if(exportType == 3 && type == 1) {/** 儿童发放 */ + exportChildSendInfo(userSendInfos, response); + } else if(exportType == 3 && type == 3) {/** 儿童使用 */ + exportChildUsedInfo(userSendInfos, response); + } + + } + private void exportChildUsedInfo(List> data, HttpServletResponse response) { + Map cnames = new LinkedHashMap<>(); + cnames.put("id", "#"); + cnames.put("use_date", "使用日期"); + cnames.put("username", "姓名"); + cnames.put("week", "使用时间"); + cnames.put("type_desc", "优惠券"); + cnames.put("sequence_id", "优惠券号"); + cnames.put("operatorOrgName", "使用机构"); + cnames.put("doctorName", "使用医生"); + cnames.put("send_hospital", "优惠券发放机构"); + cnames.put("phone", "联系电话"); + + List> results = new ArrayList<>(); + int i = 0; + for (Map m : data) { + Map result = new LinkedHashMap<>(); + result.put("id", ++i); + result.put("phone", m.get("phone")); + result.put("username", m.get("username")); + result.put("week", m.get("week")); + result.put("type_desc", m.get("type_desc")); + 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 exportChildSendInfo(List> data, HttpServletResponse response) { + Map cnames = new LinkedHashMap<>(); + cnames.put("id", "#"); + cnames.put("create_date", "发放日期"); + cnames.put("username", "姓名"); + cnames.put("send_hospital", "发放机构"); + cnames.put("doctoer_name", "发放医生"); + cnames.put("residenceAddress", "居住地"); + cnames.put("householdAddress", "户籍地"); + cnames.put("phone", "联系电话"); + List> results = new ArrayList<>(); + int i = 0; + for (Map m : data) { + Map result = new LinkedHashMap<>(); + result.put("id", ++i); + result.put("create_date", m.get("create_date")); + result.put("username", m.get("username")); + result.put("send_hospital", m.get("send_hospital")); + result.put("doctoer_name", m.get("doctoer_name")); + result.put("residenceAddress", m.get("residenceAddress")); + result.put("householdAddress", m.get("householdAddress")); + result.put("phone", m.get("phone")); + results.add(result); + } + ResponseUtil.responseExcel(cnames, results, response); } - private void exportPregnancyUsedInfo(List> data, HttpServletResponse response) { + + + private void exportPostpartumUsedInfo(List> data, HttpServletResponse response) { Map cnames = new LinkedHashMap<>(); cnames.put("id", "#"); cnames.put("use_date", "使用日期"); cnames.put("username", "姓名"); - cnames.put("week", "使用孕周"); - cnames.put("number", "产检第次"); + cnames.put("week", "使用时间"); cnames.put("type_desc", "优惠券"); cnames.put("sequence_id", "优惠券号"); cnames.put("operatorOrgName", "使用机构"); @@ -1067,10 +1134,9 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService for (Map m : data) { Map result = new LinkedHashMap<>(); result.put("id", ++i); - result.put("use_date", m.get("use_date")); + result.put("phone", m.get("phone")); result.put("username", m.get("username")); result.put("week", m.get("week")); - result.put("number", m.get("number")); result.put("type_desc", m.get("type_desc")); result.put("sequence_id", m.get("sequence_id")); result.put("operatorOrgName", m.get("operatorOrgName")); @@ -1082,14 +1148,42 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService ResponseUtil.responseExcel(cnames, results, response); } - private void exportPostpartum(List> couponInfos, HttpServletResponse response) { + private void exportPostpartumSendInfo(List> data, HttpServletResponse response) { Map cnames = new LinkedHashMap<>(); cnames.put("id", "#"); - cnames.put("checkDate", "产检日期"); + cnames.put("create_date", "发放日期"); cnames.put("username", "姓名"); - cnames.put("use_day", "使用时间"); - cnames.put("type", "产检券类型"); - cnames.put("coupon_desc", "优惠券"); + cnames.put("send_hospital", "发放机构"); + cnames.put("doctoer_name", "发放医生"); + cnames.put("residenceAddress", "居住地"); + cnames.put("householdAddress", "户籍地"); + cnames.put("phone", "联系电话"); + + List> results = new ArrayList<>(); + int i = 0; + for (Map m : data) { + Map result = new LinkedHashMap<>(); + result.put("id", ++i); + result.put("create_date", m.get("create_date")); + result.put("username", m.get("username")); + result.put("send_hospital", m.get("send_hospital")); + result.put("doctoer_name", m.get("doctoer_name")); + result.put("residenceAddress", m.get("residenceAddress")); + result.put("householdAddress", m.get("householdAddress")); + result.put("phone", m.get("phone")); + results.add(result); + } + ResponseUtil.responseExcel(cnames, results, response); + } + + private void exportPregnancyUsedInfo(List> data, HttpServletResponse response) { + Map cnames = new LinkedHashMap<>(); + cnames.put("id", "#"); + cnames.put("use_date", "使用日期"); + cnames.put("username", "姓名"); + cnames.put("week", "使用孕周"); + cnames.put("number", "产检第次"); + cnames.put("type_desc", "优惠券"); cnames.put("sequence_id", "优惠券号"); cnames.put("operatorOrgName", "使用机构"); cnames.put("doctorName", "使用医生"); @@ -1098,14 +1192,14 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService List> results = new ArrayList<>(); int i = 0; - for (Map m : couponInfos) { + for (Map m : data) { Map result = new LinkedHashMap<>(); result.put("id", ++i); - result.put("checkDate", DateUtil.getyyyy_MM_dd((Date) m.get("checkDate"))); + result.put("use_date", m.get("use_date")); 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("week", m.get("week")); + result.put("number", m.get("number")); + result.put("type_desc", m.get("type_desc")); result.put("sequence_id", m.get("sequence_id")); result.put("operatorOrgName", m.get("operatorOrgName")); result.put("doctorName", m.get("doctorName")); @@ -1116,6 +1210,7 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService ResponseUtil.responseExcel(cnames, results, response); } + private void exportPregnancy(List> userSendInfos, HttpServletResponse response) { Map cnames = new LinkedHashMap<>(); cnames.put("id", "#");