diff --git a/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml b/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml index 6ce2763..719e472 100644 --- a/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml +++ b/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml @@ -873,18 +873,18 @@ select DATE_FORMAT(a.create_date, '%Y-%m-%d') as ymd, a.user_id from coupon_info a, coupon_template b, coupon_type c where 1=1 - - and a.create_date >= #{startDate} - - - and a.create_date #{endDate} - and a.coupon_template_id = b.id and b.type_id = c.id and a.${hospitalFlag} = #{hid} and c.type in #{type} + + and a.create_date >= #{startDate} + + + and a.create_date #{endDate} + order by a.create_date desc ) a group by a.ymd, a.user_id ) a group by a.user_id diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java index eae8d54..d875f37 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java @@ -2463,7 +2463,7 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService if(CollectionUtils.isNotEmpty(hospitalId)) { if(CollectionUtils.isNotEmpty(hospitalNames)) { if (org.apache.commons.collections.CollectionUtils.isNotEmpty(hospitalId)) { - int batchSize = 5; + int batchSize = 4; int end = 0; List listFuture = new ArrayList<>(); for (int i = 0; i < hospitalId.size(); i += batchSize) { @@ -2587,7 +2587,7 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService List sendUserIds2 = new ArrayList<>(); param.put("hid", map.get("hospitalId")); if(CollectionUtils.isNotEmpty(sendUserIds)) { - param.put("userIds", sendUserIds); +// param.put("userIds", sendUserIds); param.put("hospitalFlag", "create_hospital_id"); /** 医院是用create_hospital_id 还是用 used_hospital_id限制*/ // List> mulitPatienInfo = couponMapper.findMulitPatienInfo(param); /** 查询需要添加人数的总数, 例如A发了两次优惠券 那么这里返回需要加的值为1 */ List> mulitPatienInfo = couponMapper.findMulitPatienInfoWithSend(param); /** 查询需要添加人数的总数, 例如A发了两次优惠券 那么这里返回需要加的值为1 */