jiangjiazhi / regional-platform

Authored by litao almost 8 years ago

Exists in master and in 6 other branches

Showing 2 changed files with 7 additions and 8 deletions

...	...	@@ -239,7 +239,7 @@
239	239	group by b.coupon_order, b.type, a.used_hospital_id
240	240	</select>
241	241
242		- <select id="findUsedUserIds" parameterType="map" resultType="lists">
	242	+ <select id="findUsedUserIds" parameterType="map" resultType="string">
243	243	select distinct(b.user_id)
244	244	from organization a, coupon_info b, coupon_template c, coupon_type d
245	245	where a.id = b.used_hospital_id and b.coupon_template_id = c.id and c.type_id = d.id
...	...	@@ -273,7 +273,7 @@
273	273	</if>
274	274	</select>
275	275
276		- <select id="findSendUserIds" parameterType="map" resultType="list">
	276	+ <select id="findSendUserIds" parameterType="map" resultType="string">
277	277	select distinct(b.user_id)
278	278	from organization a, coupon_info b, coupon_template c, coupon_type d
279	279	where a.id = b.create_hospital_id and b.coupon_template_id = c.id and c.type_id = d.id

...	...	@@ -468,14 +468,13 @@
468	468	Map<String, Object> sendInfo = couponMapper.findHospitalSendInfo(param);
469	469
470	470	Map<String, Object> tempMap = packCouponMap(sendInfo, usedInfo, hNameMap, hid, xAxis, param);
471		- /** 方法/使用人数id */
472		- List<String> sendUserIds = couponMapper.findSendUserIds(param);
473		- List<String> usedUserIds = couponMapper.findUsedUserIds(param);
474		- tempMap.put("sendUserIds", sendUserIds);
475		- tempMap.put("usedUserIds", usedUserIds);
476	471
477		-
478	472	if(MapUtils.isNotEmpty(tempMap)) {
	473	+ /** 方法/使用人数id */
	474	+ List<String> sendUserIds = couponMapper.findSendUserIds(param);
	475	+ List<String> usedUserIds = couponMapper.findUsedUserIds(param);
	476	+ tempMap.put("sendUserIds", sendUserIds);
	477	+ tempMap.put("usedUserIds", usedUserIds);
479	478	couponReport.add(tempMap);
480	479	}
481	480	}