diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/CouponMapper.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/CouponMapper.java index edceccf..5f95ac8 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/CouponMapper.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/CouponMapper.java @@ -116,4 +116,6 @@ public interface CouponMapper { Integer findUnUsedPeopleInfoCount(Map param); List> findMulitPatienInfo(List sendUserIds); + + List> findUserSendInfoByUids(Map uids); } 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 e6af939..150c4ba 100644 --- a/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml +++ b/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml @@ -661,4 +661,19 @@ ) a group by a.ymd, a.user_id ) a group by a.user_id + + + \ No newline at end of file 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 9c4ae60..4336720 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 @@ -369,7 +369,7 @@ public class ReportController extends BaseController { Integer page, Integer limit) { Map param = CollectionUtils.createMap("userId", getUserId(request), "startDate", startDate, "endDate", endDate != null ? DateUtil.addDay(endDate, 1) : endDate, "hospitalId", CollectionUtils.asList(hospitalId), "provinceId", provinceId, "cityId", cityId, "areaId", areaId, "type", type, - "tempId", tempId, "couponType",couponType, "currentPage", page, "pageSize", limit); + "tempId", tempId, "couponType",couponType, "currentPage", page, "pageSize", limit, "currentPage2", page, "pageSize2", limit); 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 1e428f0..e32c8e6 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 @@ -831,11 +831,27 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService @Override public BaseObjectResponse coupon(Map param) { + if(param.get("hospitalId") instanceof ArrayList) { + List hids = (List) param.get("hospitalId"); + if(CollectionUtils.isEmpty(hids)) { + param.put("hospitalId", accessPermissionFacade.getCurrentUserHospPermissions(Integer.parseInt(param.get("userId") + ""))); /** 模拟根据登陆人id 查询出来的医院 */ + } + param.put("hospitalId", hids); /** 模拟根据登陆人id 查询出来的医院 */ + } else { + if(StringUtils.isBlank((String) param.get("hospitalId"))) { + param.put("hospitalId", accessPermissionFacade.getCurrentUserHospPermissions(Integer.parseInt(param.get("userId") + ""))); /** 模拟根据登陆人id 查询出来的医院 */ + } else { + param.put("hospitalId", CollectionUtils.asList((String) param.get("hospitalId"))); + } + } + + +/* if(StringUtils.isBlank((String) param.get("hospitalId"))) { - param.put("hospitalId", accessPermissionFacade.getCurrentUserHospPermissions(Integer.parseInt(param.get("userId") + ""))); /** 模拟根据登陆人id 查询出来的医院 */ + param.put("hospitalId", accessPermissionFacade.getCurrentUserHospPermissions(Integer.parseInt(param.get("userId") + ""))); *//** 模拟根据登陆人id 查询出来的医院 *//* } else { param.put("hospitalId", CollectionUtils.asList((String) param.get("hospitalId"))); - } + }*/ doHospitalFilter(param); List> couponReport = new ArrayList<>(); @@ -920,6 +936,7 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService } } map.put("sendUserIds", sendUserIds2); + map.put("people_send_count", sendUserIds2.size()); List usedUserIds = (List) map.get("usedUserIds"); List usedUserIds2 = new ArrayList<>(); @@ -936,6 +953,7 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService } } map.put("usedUserIds", usedUserIds2); + map.put("user_used_count", usedUserIds2.size()); } return RespBuilder.buildSuccess("couponReport", couponReport, "couponReportMap", couponReportMap, "reportModel", reportModal); @@ -1287,8 +1305,25 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService PageResult pageResult = new PageResult(count, currentPage,(Integer) param.get("pageSize"), CollectionUtils.createMap("couponInfos", couponInfos, "subTitle", subTitle)); return RespBuilder.buildSuccess(pageResult); } if(type == 1) { /** 发放人数统计 */ - List> userSendInfo = couponMapper.findUserSendInfo(param); - Integer count = couponMapper.findUserSendInfoCount(param); + +// List> userSendInfo = couponMapper.findUserSendInfo(param); + BaseObjectResponse tempResp = coupon(param); + List> couponReport = (List>) ((Map) tempResp.getData()).get("couponReport"); + List userIds = new ArrayList<>(); + for (Map map : couponReport) { + List list = (List) map.get("sendUserIds"); + for (String s : list) { + userIds.add(s.split("_")[0]); + } + } + Integer count = userIds.size(); + List ids = CollectionUtils.getPageIds(userIds, (Integer) param.get("currentPage2"), (Integer) param.get("pageSize2")); + Map param2 = new HashMap<>(); + param2.put("hid", param.get("hospitalId")); + param2.put("uids", ids); + List> userSendInfo = couponMapper.findUserSendInfoByUids(param2); + +// Integer count = couponMapper.findUserSendInfoCount(param); for (Map map : userSendInfo) { String userId = (String) map.get("user_id"); if(StringUtils.isNotEmpty(userId)) {