jiangjiazhi / regional-platform

Download as
Browse Code ยป

Commit c739156764d6c998a75f66235dfb198101032d0c

Authored by jiangjiazhi
2 parents f4927c3d83 dbf63de510
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

Merge remote-tracking branch 'origin/master'

Showing 2 changed files

platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml View file @ c739156
... ... @@ -533,7 +533,7 @@
533 533 </select>
534 534  
535 535 <select id="findUnUsed" parameterType="map" resultType="map">
536   - select count(distinct(user_id)) as un_used_people, count(1) as un_used_coupon_count, b.province_id, b.city_id, b.area_id, b.name as hospitalName, a.create_hospital_id
  536 + select count(distinct(user_id)) as un_used_people, count(1) as un_used_coupon_count, b.province_id, b.city_id, b.area_id, b.name as hospitalName, a.create_hospital_id as hospitalId
537 537 from coupon_info a, organization b
538 538 where a.create_hospital_id = b.id and a.status = 1 and a.create_hospital_id in
539 539 <foreach collection="hospitalIds" open="(" close=")" separator="," item="hid">
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java View file @ c739156
... ... @@ -736,7 +736,7 @@
736 736 }
737 737 }
738 738 Criteria c = new Criteria();
739   - c.and("hospitalId").in(hospitalIds).and("isSendCoupon").ne(!isSendCoupon).and("yn").ne(0);
  739 + c.and("hospitalId").in(hospitalIds).and("isSendCoupon").ne(!isSendCoupon).and("yn").ne(0).and("enable").ne("2");
740 740 if(startDate != null && endDate != null) {
741 741 c.and("bookbuildingDate").gte(startDate).lt(DateUtil.addDay(endDate, 1));
742 742 }