From e31d4d2d3cecab2fb56508c0f5b82d821719e7bb Mon Sep 17 00:00:00 2001
From: zhangzeli <123456>
Date: 星期二, 25 一月 2022 14:39:14 +0800
Subject: [PATCH] bug
---
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/serviceimpl/IOrderTaskServiceImpl.java | 7 +++++++
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/mapper/OrderTaskMapper.java | 4 ++++
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/OrderTaskController.java | 2 +-
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/service/IOrderTaskService.java | 5 +++++
4 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/OrderTaskController.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/OrderTaskController.java
index 13ff276..5ed99cf 100644
--- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/OrderTaskController.java
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/OrderTaskController.java
@@ -293,7 +293,7 @@
@ApiOperation(value = "鍒嗛〉鑾峰彇")
public Result<IPage<OrderTask>> getByPage(PageVo page) {
- IPage<OrderTask> data = iOrderTaskService.page(PageUtil.initMpPage(page));
+ IPage<OrderTask> data = iOrderTaskService.page2(PageUtil.initMpPage(page));
return new ResultUtil<IPage<OrderTask>>().setData(data);
}
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/mapper/OrderTaskMapper.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/mapper/OrderTaskMapper.java
index 32c9a5a..096edbb 100644
--- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/mapper/OrderTaskMapper.java
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/mapper/OrderTaskMapper.java
@@ -1,6 +1,7 @@
package cn.exrick.xboot.your.mapper;
import cn.exrick.xboot.your.entity.AddOil;
+import cn.exrick.xboot.your.entity.Suggest;
import cn.exrick.xboot.your.vo.Month;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -79,4 +80,7 @@
@Result(column="temp3", property="areaName", jdbcType = JdbcType.VARCHAR),
@Result(column="temp4", property="areaSectionName", jdbcType = JdbcType.VARCHAR)})
List<OrderTask> list4(@Param(Constants.WRAPPER) QueryWrapper<OrderTask> wrapper2);
+
+ @Select("SELECT o.*,c.name as customerName FROM t_order_task o LEFT JOIN t_customer c ON o.customer_id=c.id")
+ IPage<OrderTask> page2(Page initMpPage);
}
\ No newline at end of file
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/service/IOrderTaskService.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/service/IOrderTaskService.java
index 9aeac79..11701e6 100644
--- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/service/IOrderTaskService.java
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/service/IOrderTaskService.java
@@ -1,7 +1,10 @@
package cn.exrick.xboot.your.service;
+import cn.exrick.xboot.your.entity.Suggest;
import cn.exrick.xboot.your.vo.Month;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import cn.exrick.xboot.your.entity.OrderTask;
@@ -32,4 +35,6 @@
List<OrderTask> groupByTime(String areaId, String selectId);
List<OrderTask> list4(QueryWrapper<OrderTask> wrapper2);
+
+ IPage<OrderTask> page2(Page initMpPage);
}
\ No newline at end of file
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/serviceimpl/IOrderTaskServiceImpl.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/serviceimpl/IOrderTaskServiceImpl.java
index 486712c..80c3583 100644
--- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/serviceimpl/IOrderTaskServiceImpl.java
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/serviceimpl/IOrderTaskServiceImpl.java
@@ -1,10 +1,13 @@
package cn.exrick.xboot.your.serviceimpl;
+import cn.exrick.xboot.your.entity.Suggest;
import cn.exrick.xboot.your.mapper.OrderTaskMapper;
import cn.exrick.xboot.your.entity.OrderTask;
import cn.exrick.xboot.your.service.IOrderTaskService;
import cn.exrick.xboot.your.vo.Month;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -79,4 +82,8 @@
public Month getSendNum(int year){
return orderTaskMapper.getSendNum(year);
}
+
+ public IPage<OrderTask> page2(Page initMpPage){
+ return orderTaskMapper.page2(initMpPage);
+ }
}
\ No newline at end of file
--
Gitblit v1.9.1