jiangjiazhi / regional-platform

Authored by litao@lymsh.com over 7 years ago

Exists in master and in 6 other branches

Showing 3 changed files with 21 additions and 2 deletions

...	...	@@ -33,11 +33,18 @@
33	33	/**
34	34	* 未发放优惠券统计
35	35	*/
36		- @RequestMapping(value = "/coupon/unSend", method = RequestMethod.POST)
	36	+ @RequestMapping(value = "/coupon/unSend", method = RequestMethod.GET)
37	37	@ResponseBody
38	38	@TokenRequired
39	39	public BaseObjectResponse unSend(Date startDate, Date endDate, String provinceId, String cityId, String areaId, String hospitalId, HttpServletRequest request) {
40	40	return reportService.unSend(startDate, endDate, provinceId, cityId, areaId, hospitalId, getUserId(request));
	41	+ }
	42	+
	43	+ @RequestMapping(value = "/coupon/unSend/info", method = RequestMethod.POST)
	44	+ @ResponseBody
	45	+ @TokenRequired
	46	+ public BaseObjectResponse unSendInfo(Date startDate, Date endDate, String provinceId, String cityId, String areaId, String hospitalId, Integer page, Integer limit, HttpServletRequest request) {
	47	+ return reportService.unSendInfo(startDate, endDate, provinceId, cityId, areaId, hospitalId, page, limit, getUserId(request));
41	48	}
42	49
43	50

...	...	@@ -85,5 +85,7 @@
85	85	void checkNumberInfoExport(Integer childBirth, Date startDate, Date endDate, Integer startWeek, Integer endWeek, Integer number, Integer id, HttpServletResponse resp);
86	86
87	87	BaseObjectResponse unSend(Date startDate, Date endDate, String provinceId, String cityId, String areaId, String hospitalId, Integer userId);
	88	+
	89	+ BaseObjectResponse unSendInfo(Date startDate, Date endDate, String provinceId, String cityId, String areaId, String hospitalId, Integer page, Integer limit, Integer userId);
88	90	}

...	...	@@ -543,7 +543,6 @@
543	543	}
544	544
545	545	for (Map.Entry<String, Integer> entry : hospitalPatientCount.entrySet()) {
546		-// Map<String, Object> tempMap = couponMapper.findHospitalInfoById(entry.getKey());
547	546	Map<String, Object> tempMap = new HashMap<>();
548	547	tempMap.put("id", entry.getValue());
549	548	tempMap.put("areaId", getValByKey(datas, entry.getKey(), "area_id"));
550	549
...	...	@@ -553,10 +552,21 @@
553	552	tempMap.put("provinceId", getValByKey(datas, entry.getKey(), "province_id"));
554	553	tempMap.put("provinceName", findName(tempMap.get("provinceId")));
555	554	tempMap.put("count", entry.getValue());
	555	+ tempMap.put("hospitalId", entry.getKey());
	556	+ tempMap.put("hospitalName", couponMapper.findHospitalNameById(entry.getKey()));
556	557	restList.add(tempMap);
557	558	}
558	559	}
559	560	return RespBuilder.buildSuccess(restList);
	561	+ }
	562	+
	563	+ @Override
	564	+ public BaseObjectResponse unSendInfo(Date startDate, Date endDate, String provinceId, String cityId, String areaId, String hospitalId, Integer page, Integer limit, Integer userId) {
	565	+ return null;
	566	+ }
	567	+
	568	+ private List<Patients> getPatients(Date startDate, Date endDate, String provinceId, String cityId, String areaId, String hospitalId, Integer userId) {
	569	+ return null;
560	570	}
561	571
562	572	@Override