jiangjiazhi / regional-platform | GitLab

Commit 472a7ccd8044230064c5f698e740a9c35e5236af

Authored by litao@lymsh.com over 7 years ago

1 parent 6ef18c5e0d

Exists in master and in 6 other branches

统计

Showing 2 changed files with 3 additions and 3 deletions

platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ReportController.java

...	...	@@ -635,7 +635,7 @@
635	635	</select>
636	636
637	637	<select id="findUnUsedPeopleInfo" parameterType="map" resultType="string">
638		- select user_id from coupon_info a, organization b
	638	+ select distinct(user_id) from coupon_info a, organization b
639	639	where a.create_hospital_id = b.id and a.status = 1 and a.create_hospital_id = #{hospitalId}
640	640	and user_id in
641	641	<foreach collection="userIds" open="(" close=")" separator="," item="uid">
...	...	@@ -657,7 +657,7 @@
657	657
658	658	<select id="findUnUsedPeopleInfoCount" resultType="integer">
659	659	select count(1) from (
660		- select user_id from coupon_info a, organization b
	660	+ select distinct(user_id) from coupon_info a, organization b
661	661	where a.create_hospital_id = b.id and a.status = 1 and a.create_hospital_id = #{hospitalId}
662	662	and user_id in
663	663	<foreach collection="userIds" open="(" close=")" separator="," item="uid">

...	...	@@ -77,7 +77,7 @@
77	77	@ResponseBody
78	78	@TokenRequired
79	79	public void unUsedExport(Date startDate, Date endDate, String provinceId, String cityId, String areaId, String hospitalId, HttpServletRequest request, HttpServletResponse response) {
80		- reportService.unSendExport(startDate, endDate, provinceId, cityId, areaId, hospitalId, getUserId(request), response);
	80	+ reportService.unUsedExport(startDate, endDate, provinceId, cityId, areaId, hospitalId, getUserId(request), response);
81	81	}
82	82
83	83	/**