xuhy
2023-02-24 01e64fe75bb1914c00ac2da749511296c6588f96
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCouponController.java
@@ -70,7 +70,7 @@
     */
    @RequestMapping(value = "/list")
    @ResponseBody
    public Object list(Integer couponType,Integer couponServiceType,String createtime) {
    public Object list(Integer couponType,Integer couponServiceType,String createTime) {
        EntityWrapper<TCoupon> wrapper = new EntityWrapper<>();
        if(Objects.nonNull(couponType)){
            wrapper.eq("coupon_type",couponType);
@@ -79,13 +79,13 @@
            wrapper.eq("coupon_service_type",couponServiceType);
        }
        // 开始,结束时间
        if(StringUtils.hasLength(createtime)){
            String[] split = createtime.split(" - ");
        if(StringUtils.hasLength(createTime)){
            String[] split = createTime.split(" - ");
            Date startTime = DateUtil.getDate_str4(split[0]);
            Date endTime = DateUtil.getDate_str4(split[1]);
            wrapper.between("createtime",startTime,endTime);
            wrapper.between("create_time",startTime,endTime);
        }
        wrapper.orderBy(true,"createtime",false);
        wrapper.orderBy(true,"create_time",false);
        wrapper.groupBy(true,"coupon_name");
        wrapper.groupBy(true,"coupon_type");
        return tCouponService.selectList(wrapper);