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 a5736e3..3363406 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 @@ -5431,30 +5431,23 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService if(CollectionUtils.isNotEmpty(personIds)){ query.setPersonIds(personIds); } + //分页数据 + query.mysqlBuild(couponMapper.bookbuildingCouponCount(query)); //查询mysql 优惠券记录 List bookbuildingCouponList=couponMapper.bookbuildingCoupon(query); - //分页总数 - int count = couponMapper.bookbuildingCouponCount(query); + List result=new ArrayList<>(); for (Map bookbuildingCoupon : bookbuildingCouponList) { Map map=new HashedMap(); PersonModel personModel = mongoTemplate.findById(bookbuildingCoupon.get("userid").toString(), PersonModel.class); - if(null!=personModel){ - map.put("name", personModel.getName()); - map.put("phone", personModel.getPhone()); - map.put("cardNo", personModel.getCardNo()); - map.put("hospitalName", bookbuildingCoupon.get("hospitalname")); - map.put("created", bookbuildingCoupon.get("created")); - }else { - //处理分页计数 - if(0!=count){ - count--; - } - } + map.put("name", StringUtils.isNotEmpty(personModel.getName())?personModel.getName():""); + map.put("phone", StringUtils.isNotEmpty(personModel.getPhone())?personModel.getPhone():""); + map.put("cardNo", StringUtils.isNotEmpty(personModel.getCardNo())?personModel.getCardNo():""); + map.put("hospitalName", bookbuildingCoupon.get("hospitalname")); + map.put("created", bookbuildingCoupon.get("created")); + result.add(map); } - //分页数据 - query.mysqlBuild(count); objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS); objectResponse.setErrormsg("成功");