jiangjiazhi / regional-platform | GitLab

Commit 60d8312d4052188d4b77c2af97963dd0fced50cb

Authored by litao about 8 years ago

1 parent 528a401c7a

Exists in master and in 6 other branches

bug修复

Showing 2 changed files with 2 additions and 2 deletions

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

...	...	@@ -425,7 +425,7 @@
425	425	</select>
426	426
427	427	<select id="findUserSendInfo" parameterType="map" resultType="map">
428		- select a.create_hospital_id, a.user_id, a.create_date ,d.name as send_hospital, e.name as doctoer_name
	428	+ select a.create_hospital_id, a.user_id, DATE_FORMAT(a.create_date, '%Y-%m-%d') as create_date, d.name as send_hospital, e.name as doctoer_name
429	429	from
430	430	coupon_info a, coupon_template b, coupon_type c, organization d, users e
431	431	where a.coupon_template_id = b.id and b.type_id = c.id and a.create_hospital_id = d.id and a.create_user_id = e.id
...	...	@@ -443,6 +443,7 @@
443	443	<if test="endDate != null">
444	444	and a.create_date <![CDATA[ < ]]> #{endDate}
445	445	</if>
	446	+ group by a.user_id, a.create_date
446	447	limit #{currentPage},#{pageSize}
447	448	</select>
448	449

...	...	@@ -733,7 +733,6 @@
733	733	if(StringUtils.isNotEmpty(userId)) {
734	734	setUserSendInfo(userId, map); /** 设置姓名、居住地、户籍地、电话 */
735	735	}
736		- map.put("create_date", DateUtil.getyyyy_MM_dd((Date) map.get("create_date")));
737	736	}
738	737	PageResult pageResult = new PageResult(count, (Integer) param.get("currentPage") ,(Integer) param.get("pageSize"), CollectionUtils.createMap("userSendInfos", userSendInfo));
739	738	return RespBuilder.buildSuccess(pageResult);