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 67cc38f..ea2dcb4 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 @@ -78,4 +78,6 @@ public interface CouponMapper { List> couponInfo(Map param); List findCouponTitleByTemp(Map param); + + List> findUserSendInfo(Map param); } 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 7b6ce96..a42dc2a 100644 --- a/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml +++ b/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml @@ -420,4 +420,12 @@ #{type} + + \ No newline at end of file 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 c291e54..6a4036c 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 @@ -672,30 +672,36 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService if(param.get("hospitalId") == null) { return RespBuilder.buildSuccess(new PageResult(0, (Integer) param.get("currentPage") ,(Integer) param.get("pageSize"), CollectionUtils.createMap("couponInfos", new ArrayList<>()))); } - List> couponInfos = couponMapper.couponInfo(param); - if(CollectionUtils.isNotEmpty(couponInfos)) { - for (Map couponInfo : couponInfos) { - String desc = (String) couponReportMap.get(couponInfo.get("type") + "_" + couponInfo.get("coupon_order")); - if(StringUtils.isNotBlank(desc)) { - /**
儿童保健券(五)
使用人次
*/ - String s = desc.replace("使用人次", "") - .replace("
", "") - .replace("
", "") - .replace("
", ""); - couponInfo.put("type_desc", s); + Integer type = (Integer) param.get("type"); + if(type == 4) { /** 使用详情统计 */ + List> couponInfos = couponMapper.couponInfo(param); + if(CollectionUtils.isNotEmpty(couponInfos)) { + for (Map couponInfo : couponInfos) { + String desc = (String) couponReportMap.get(couponInfo.get("type") + "_" + couponInfo.get("coupon_order")); + if(StringUtils.isNotBlank(desc)) { + /**
儿童保健券(五)
使用人次
*/ + String s = desc.replace("使用人次", "") + .replace("
", "") + .replace("
", "") + .replace("
", ""); + couponInfo.put("type_desc", s); + } + Date useDate = (Date) couponInfo.get("use_date"); + couponInfo.put("use_date", DateUtil.getyyyy_MM_dd(useDate)); + /** 设置产检日期、姓名、产检孕周、产检第次、产检机构、产检医生、联系电话 */ + setUsedInfo((Integer) couponInfo.get("type"), (String) couponInfo.get("used_id"), + (String) couponInfo.get("sequence_id"), useDate, couponInfo + ); } - Date useDate = (Date) couponInfo.get("use_date"); - couponInfo.put("use_date", DateUtil.getyyyy_MM_dd(useDate)); -// setUsedInfo(couponInfo); - /** 设置产检日期、姓名、产检孕周、产检第次、产检机构、产检医生、联系电话 */ - setUsedInfo((Integer) couponInfo.get("type"), (String) couponInfo.get("used_id"), - (String) couponInfo.get("sequence_id"), useDate, couponInfo - ); } + int count = couponMapper.findCouponInfoCount(param); + PageResult pageResult = new PageResult(count, (Integer) param.get("currentPage") ,(Integer) param.get("pageSize"), CollectionUtils.createMap("couponInfos", couponInfos)); + return RespBuilder.buildSuccess(pageResult); + } if(type == 1) { /** 发放人数统计 */ + List> userSendInfo = couponMapper.findUserSendInfo(param); + System.err.println(userSendInfo); } - int count = couponMapper.findCouponInfoCount(param); - PageResult pageResult = new PageResult(count, (Integer) param.get("currentPage") ,(Integer) param.get("pageSize"), CollectionUtils.createMap("couponInfos", couponInfos)); - return RespBuilder.buildSuccess(pageResult); + return RespBuilder.buildSuccess(); } /** @@ -713,7 +719,7 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService Date checkDate = null; /** 产检日期 */ String username = null; /** 姓名 */ String week = null; /** 产检孕周 = 产检时间 - 末次月经 */ - Integer number = 1; /** 产检第次 */ + Integer number = null; /** 产检第次 */ String operatorOrgName = null; /** 产检机构 */ String doctorName = null; /** 产检医生 */ String phone = null; /** 联系电话 */