liquanyu / regional-platform

Download as
Browse Code ยป

Commit dd6f7fc3ece5a7a5cc7fef4f62c9b849b0e1b7cf

Authored by yangfei
2 parents fbb2b476ae 3a541de1d1
Exists in master and in 1 other branch dev

Merge remote-tracking branch 'origin/master'

Showing 3 changed files

platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml View file @ dd6f7fc
... ... @@ -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">
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ReportController.java View file @ dd6f7fc
... ... @@ -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 /**
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java View file @ dd6f7fc
... ... @@ -601,8 +601,8 @@
601 601 Map<String, Object> param = CollectionUtils.createMap("hospitalIds", hospitalIds, "userIds", userIds, "provinceId", provinceId, "cityId", cityId, "areaId", areaId, "page", (page - 1) * limit, "limit", limit);
602 602 List<Map<String, Object>> restList = couponMapper.findUnUsed(param);
603 603 for (Map<String, Object> map : restList) {
604   - map.put("cityName", map.get("city_id"));
605   - map.put("areaName", map.get("area_id"));
  604 + map.put("cityName", findName(map.get("city_id")));
  605 + map.put("areaName", findName(map.get("area_id")));
606 606 }
607 607 Integer count = couponMapper.findUnUsedCount(param);
608 608 return RespBuilder.buildSuccess(new PageResult(count, page, limit, restList));