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 7df1e19..2e60501 100644 --- a/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml +++ b/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml @@ -138,8 +138,8 @@ select a.people_send_count, a.coupon_send_count, a.used_hospital_id, b.user_used_count, b.coupon_used_count, c.province_id, c.city_id, c.area_id, c.name from ( select count(distinct(a.user_id)) as people_send_count, count(1) as coupon_send_count, a.used_hospital_id - from coupon_info a, coupon_template b, coupon_type c - where a.status = #{status} and a.used_hospital_id in + from coupon_info a, coupon_template b, coupon_type c, organization d, hospital_coupon_template_group e + where a.status = #{status} and a.used_hospital_id = d.id and a.used_hospital_id in #{hid} @@ -147,6 +147,25 @@ #{type} + + and a.use_date >= #{startDate} + + + #and a.use_date = #{endDate} + + + and d.province_id = #{provinceId} + + + and d.city_id = #{cityId} + + + and d.area_id = #{areaId} + + + and e.coupon_template_group_id = #{tempId} + + and a.used_hospital_id = e.hospital_id group by a.used_hospital_id ) a, ( select count(distinct(a.user_id)) as user_used_count, count(1) as coupon_used_count, a.used_hospital_id diff --git a/platform-common/src/main/java/com/lyms/platform/common/result/RespBuilder.java b/platform-common/src/main/java/com/lyms/platform/common/result/RespBuilder.java index 070a0b3..17b3234 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/result/RespBuilder.java +++ b/platform-common/src/main/java/com/lyms/platform/common/result/RespBuilder.java @@ -1,7 +1,6 @@ package com.lyms.platform.common.result; import org.apache.commons.lang3.StringUtils; -import org.springframework.util.Assert; import java.util.HashMap; import java.util.Map; @@ -16,8 +15,11 @@ public class RespBuilder { return buildSuccess(null); } - public static BaseObjectResponse buildSuccess(Object ... data) { + public static BaseObjectResponse buildSuccess(Object data) { BaseObjectResponse resp = new BaseObjectResponse(); + resp.setData(data); + return resp; + /* BaseObjectResponse resp = new BaseObjectResponse(); if(data != null) { Assert.isTrue(data.length == 1 || data.length % 2 == 0, "length必须为偶数"); @@ -27,7 +29,7 @@ public class RespBuilder { resp.setData(createMap(data)); } } - return resp; + return resp;*/ } public static BaseObjectResponse buildErro(ResponseCode code) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ReportController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ReportController.java index 9dc9614..c9f0a69 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ReportController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ReportController.java @@ -206,10 +206,10 @@ public class ReportController extends BaseController { @ResponseBody @TokenRequired @RequestMapping(value = "/coupon", method = RequestMethod.GET) - public BaseObjectResponse coupon(HttpServletRequest request, Integer type, Date startDate, Date endDate, + public BaseObjectResponse coupon(HttpServletRequest request, Date startDate, Date endDate, String provinceId, String cityId, String areaId, String hospitalId, String tempId, String couponType) { - Map param = CollectionUtils.createMap("type", type, "userId", getUserId(request), "startDate", startDate, - "endDate", endDate, "hospitalType", hospitalId, "provinceId", provinceId, "cityId", cityId, "areaId", + Map param = CollectionUtils.createMap("userId", getUserId(request), "startDate", startDate, + "endDate", endDate, "hospitalIds", hospitalId, "provinceId", provinceId, "cityId", cityId, "areaId", areaId, "tempId", tempId, "couponType", couponType); return reportService.couponInfo(param); } 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 81b77f0..df36dca 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 @@ -409,7 +409,7 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService public BaseObjectResponse couponInfo(Map param) { List hospitalIds = Arrays.asList("216", "245"); /** 模拟根据登陆人id 查询出来的医院 */ - param.put("hospitalIds", hospitalIds); + param.put("hospitalIds", CollectionUtils.asList((String) param.get("hospitalIds"))); param.put("status", 2); param.put("couponTypes", CollectionUtils.asList((String) param.get("couponTypes"))); @@ -419,12 +419,13 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService if(org.apache.commons.collections.CollectionUtils.isNotEmpty(couponReport) && org.apache.commons.collections.CollectionUtils.isNotEmpty(usedInfo)) { if(CollectionUtils.putAll(couponReport, usedInfo, "used_hospital_id", "used_hospital_id")) { + for (Map map : couponReport) { map.put("province_name", findName(map.get("province_id"))); map.put("city_name", findName(map.get("city_id"))); map.put("area_name", findName(map.get("area_id"))); } - return RespBuilder.buildSuccess("couponReport", couponReport, "couponReportMap", couponReportMap); +// return RespBuilder.buildSuccess("couponReport", couponReport, "couponReportMap", couponReportMap); } else{ return RespBuilder.buildErro(ResponseCode.DATA_ERROR); } @@ -436,8 +437,9 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService public BaseObjectResponse couponInit(Map param) { List hospitalIds = Arrays.asList("216", "245"); /** 模拟根据登陆人id 查询出来的医院 */ param.put("hospitalIds", hospitalIds); - return RespBuilder.buildSuccess("coupons", EnumUtil.toJson(CouponEnums.class, "code", "name"), - "hTemp", couponMapper.findHospitals(param)); + /* return RespBuilder.buildSuccess("coupons", EnumUtil.toJson(CouponEnums.class, "code", "name"), + "hTemp", couponMapper.findHospitals(param));*/ + return RespBuilder.buildSuccess(); } public static void main(String[] args) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/SystemDataSource.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/SystemDataSource.java index 971cf9d..793ae18 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/SystemDataSource.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/SystemDataSource.java @@ -60,7 +60,7 @@ public class SystemDataSource { dataSource.setTestOnReturn(false); dataSource.setFilters("stat"); - dataSource.init(); +// dataSource.init(); logger.info("init datasource success"); }