From fc96e4d7fc20dbec5d2d96c6e8c557c1cc3212d3 Mon Sep 17 00:00:00 2001
From: wjli <591616088@qq.com>
Date: 星期一, 08 四月 2024 18:53:10 +0800
Subject: [PATCH] 修改密码错误登录bug
---
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/OrderTask2Controller.java | 35 ++++++++++++++++++++++++++++++++---
1 files changed, 32 insertions(+), 3 deletions(-)
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/OrderTask2Controller.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/OrderTask2Controller.java
index 5be2972..7cdeb9a 100644
--- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/OrderTask2Controller.java
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/OrderTask2Controller.java
@@ -4,19 +4,27 @@
import cn.exrick.xboot.core.common.utils.ResultUtil;
import cn.exrick.xboot.core.common.vo.PageVo;
import cn.exrick.xboot.core.common.vo.Result;
+import cn.exrick.xboot.your.entity.OrderStatusCount;
import cn.exrick.xboot.your.entity.OrderTask2;
+import cn.exrick.xboot.your.entity.OrderTask2Imgs;
+import cn.exrick.xboot.your.entity.QueryRequest;
import cn.exrick.xboot.your.service.IOrderTask2Service;
+import cn.exrick.xboot.your.vo.ImgSearchVo;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
+import org.apache.ibatis.annotations.Param;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.transaction.annotation.Transactional;
+import javax.annotation.security.PermitAll;
import java.util.List;
+
+import static cn.hutool.poi.excel.sax.ElementName.v;
/**
* @author whj
@@ -26,6 +34,7 @@
@Api(tags = "璁㈠崟浠诲姟鍘嗗彶琛ㄧ鐞嗘帴鍙�")
@RequestMapping("/xboot/orderTask2")
@Transactional
+@PermitAll
public class OrderTask2Controller {
@Autowired
@@ -49,12 +58,32 @@
@RequestMapping(value = "/getByPage", method = RequestMethod.GET)
@ApiOperation(value = "鍒嗛〉鑾峰彇")
- public Result<IPage<OrderTask2>> getByPage(PageVo page) {
-
- IPage<OrderTask2> data = iOrderTask2Service.page(PageUtil.initMpPage(page));
+ public Result<IPage<OrderTask2>> getByPage(PageVo page,String sendDate,String userName,String customerName,Integer status) {
+ QueryWrapper<OrderTask2> wrapper = new QueryWrapper<>();
+ if(StrUtil.isNotEmpty(sendDate)){
+ wrapper.eq("send_date",sendDate);
+ }
+ if(StrUtil.isNotEmpty(userName)){
+ wrapper.like("user_name","%"+userName+"%");
+ }
+ if(StrUtil.isNotEmpty(customerName)){
+ wrapper.like("customer_name","%"+customerName+"%");
+ }
+ if(status!=null){
+ wrapper.eq("status",status);
+ }
+ IPage<OrderTask2> data = iOrderTask2Service.page(PageUtil.initMpPage(page),wrapper);
return new ResultUtil<IPage<OrderTask2>>().setData(data);
}
+ @RequestMapping(value = "/getByPageImgs", method = RequestMethod.GET)
+ @ApiOperation(value = "鍒嗛〉鑾峰彇")
+ @PermitAll
+ public Result<IPage<OrderTask2Imgs>> getByPageImgs(QueryRequest queryRequest, ImgSearchVo imgSearchVo) {
+ IPage<OrderTask2Imgs> data = iOrderTask2Service.getTask2Imgs(imgSearchVo,queryRequest);
+ return new ResultUtil<IPage<OrderTask2Imgs>>().setData(data);
+ }
+
@RequestMapping(value = "/insertOrUpdate", method = RequestMethod.POST)
@ApiOperation(value = "缂栬緫鎴栨洿鏂版暟鎹�")
public Result<OrderTask2> saveOrUpdate(OrderTask2 orderTask2) {
--
Gitblit v1.9.1