优惠券管理添加基础筛选

src/main/java/thyyxxk/webserver/controller/outpatient/coupon/CouponManageController.java

@@ -6,6 +6,7 @@ import thyyxxk.webserver.config.exception.ExceptionEnum;
 import thyyxxk.webserver.entity.ResultVo;
 import thyyxxk.webserver.entity.login.UserInfo;
 import thyyxxk.webserver.entity.outpatient.coupon.CouponGainWay;
+import thyyxxk.webserver.entity.outpatient.coupon.CouponInquiry;
 import thyyxxk.webserver.entity.outpatient.coupon.CouponType;
 import thyyxxk.webserver.entity.outpatient.coupon.ZdCoupon;
 import thyyxxk.webserver.service.outpatient.coupon.CouponManageService;
@@ -24,9 +25,9 @@ public class CouponManageController {
         this.service = service;
     }
 
-    @GetMapping("/getAllCoupons")
-    public ResultVo<List<ZdCoupon>> getAllCoupons() {
-        List<ZdCoupon> list = service.getAllCoupons();
+    @PostMapping("/getAllCoupons")
+    public ResultVo<List<ZdCoupon>> getAllCoupons(@RequestBody CouponInquiry inquiry) {
+        List<ZdCoupon> list = service.getAllCoupons(inquiry);
         if (list.isEmpty()) {
             return ResultVoUtil.fail(ExceptionEnum.NO_DATA_EXIST);
         }

src/main/java/thyyxxk/webserver/dao/his/outpatient/CouponManageDao.java

@@ -11,8 +11,8 @@ import java.util.List;
 @Mapper
 public interface CouponManageDao extends BaseMapper<ZdCoupon> {
 
-    @Select("select * from t_zd_coupons order by create_time")
-    List<ZdCoupon> selectAllCoupons();
+    @Select("select * from t_zd_coupons ${statement} order by create_time")
+    List<ZdCoupon> selectAllCoupons(String statement);
 
     @Select("select code,rtrim(name) as name, " +
             "deptName=(select rtrim(d.name) from zd_unit_code d where d.code=a.dept_code) " +

src/main/java/thyyxxk/webserver/entity/outpatient/coupon/CouponInquiry.java

@@ -0,0 +1,10 @@
+package thyyxxk.webserver.entity.outpatient.coupon;
+
+import lombok.Data;
+
+@Data
+public class CouponInquiry {
+    private CouponState state;
+    private String start;
+    private String end;
+}

src/main/java/thyyxxk/webserver/entity/outpatient/coupon/CouponState.java

@@ -1,6 +1,7 @@
 package thyyxxk.webserver.entity.outpatient.coupon;
 
 public enum CouponState {
+    ALL,
     ACTIVATED,
     DEACTIVATED,
 }

src/main/java/thyyxxk/webserver/service/outpatient/coupon/CouponManageService.java

@@ -1,9 +1,13 @@
 package thyyxxk.webserver.service.outpatient.coupon;
 
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import thyyxxk.webserver.dao.his.outpatient.CouponManageDao;
 import thyyxxk.webserver.entity.login.UserInfo;
+import thyyxxk.webserver.entity.outpatient.coupon.CouponInquiry;
+import thyyxxk.webserver.entity.outpatient.coupon.CouponState;
 import thyyxxk.webserver.entity.outpatient.coupon.ZdCoupon;
 import thyyxxk.webserver.service.redislike.RedisLikeService;
 import thyyxxk.webserver.utils.StringUtil;
@@ -24,8 +28,14 @@ public class CouponManageService {
         this.redis = redis;
     }
 
-    public List<ZdCoupon> getAllCoupons() {
-        List<ZdCoupon> list = dao.selectAllCoupons();
+    public List<ZdCoupon> getAllCoupons(CouponInquiry inquiry) {
+        QueryWrapper<ZdCoupon> wrapper = new QueryWrapper<>();
+        wrapper.ge("create_time", inquiry.getStart());
+        wrapper.le("create_time", inquiry.getEnd());
+        if (inquiry.getState() != CouponState.ALL) {
+            wrapper.eq("state", inquiry.getState());
+        }
+        List<ZdCoupon> list = dao.selectList(wrapper);
         for (ZdCoupon item : list) {
             item.setStaffName(redis.getEmployeeName(item.getCreateStaff()));
         }