| @@ -11,6 +11,7 @@ public class MarkingCouponDataReportDto { | |||||
| private Date endTime; | private Date endTime; | ||||
| private Integer type; | private Integer type; | ||||
| private Integer couponType; | private Integer couponType; | ||||
| private String couponTitle; | |||||
| public Integer getType() { | public Integer getType() { | ||||
| return type; | return type; | ||||
| @@ -36,11 +37,17 @@ public class MarkingCouponDataReportDto { | |||||
| this.endTime = endTime; | this.endTime = endTime; | ||||
| } | } | ||||
| public Integer getCouponType() { | |||||
| return couponType; | |||||
| } | |||||
| public Integer getCouponType() { return couponType; } | |||||
| public void setCouponType(Integer couponType) { | public void setCouponType(Integer couponType) { | ||||
| this.couponType = couponType; | this.couponType = couponType; | ||||
| } | } | ||||
| public String getCouponTitle() { | |||||
| return couponTitle; | |||||
| } | |||||
| public void setCouponTitle(String couponTitle) { | |||||
| this.couponTitle = couponTitle; | |||||
| } | |||||
| } | } | ||||
| @@ -267,6 +267,9 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { | |||||
| if(markingCouponDataReportDto.getCouponType()!=null){ | if(markingCouponDataReportDto.getCouponType()!=null){ | ||||
| params.put("couponType", markingCouponDataReportDto.getCouponType()); | params.put("couponType", markingCouponDataReportDto.getCouponType()); | ||||
| } | } | ||||
| if(markingCouponDataReportDto.getCouponType()!=null){ | |||||
| params.put("couponTitle", markingCouponDataReportDto.getCouponTitle()); | |||||
| } | |||||
| PageHelper.startPage(pageIndex, pageSize); | PageHelper.startPage(pageIndex, pageSize); | ||||
| List<MarkingCouponDataReportVo> couponDatalist = wxCouponOrderMapper.couponDataList(params); | List<MarkingCouponDataReportVo> couponDatalist = wxCouponOrderMapper.couponDataList(params); | ||||
| @@ -408,6 +408,9 @@ | |||||
| <if test="couponType != null"> | <if test="couponType != null"> | ||||
| and wx_coupon.type = #{couponType} | and wx_coupon.type = #{couponType} | ||||
| </if> | </if> | ||||
| <if test="couponTitle != null"> | |||||
| and wx_coupon.title like concat('%', #{couponTitle},'%') | |||||
| </if> | |||||
| GROUP BY createTime,couponId | GROUP BY createTime,couponId | ||||
| order by createTime desc | order by createTime desc | ||||
| </select> | </select> | ||||