From 5c02263e1dee4960eb81757dc6b13f2e2d6cadb6 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期三, 11 十二月 2024 22:59:31 +0800
Subject: [PATCH] zjh202412011
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjAdviceController.java | 21 ++++++++++++++-------
1 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjAdviceController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjAdviceController.java
index 374b807..517cf9f 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjAdviceController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjAdviceController.java
@@ -10,6 +10,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ltkj.common.annotation.Excel;
+import com.ltkj.common.utils.StringUtils;
import com.ltkj.common.utils.poi.ExcelUtil;
import com.ltkj.framework.config.UserHoder;
import com.ltkj.hosp.domain.TjAdvice;
@@ -24,6 +25,7 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
+import jodd.util.StringUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
@@ -87,14 +89,14 @@
@ApiParam(value = "鏄剧ず鏉℃暟(榛樿10)") @RequestParam(defaultValue = "10") Integer pageSize) {
LambdaQueryWrapper<TjAdviceKjbq> wq = new LambdaQueryWrapper<>();
Page<TjAdviceKjbq> page1 = new Page<>(page, pageSize);
- if (null != userId && !userId.equals("")) {
+ if (null != userId && !StringUtils.isBlank(userId)) {
wq.eq(TjAdviceKjbq::getUserId, userId);
}
if (null != qyzt) {
wq.eq(TjAdviceKjbq::getQyzt, qyzt);
}
Page<TjAdviceKjbq> kjbqPage = kjbqService.page(page1, wq);
- if (null != kjbqPage.getRecords() && kjbqPage.getRecords().size() > 0) {
+ if (null != kjbqPage.getRecords() && !kjbqPage.getRecords().isEmpty()) {
for (TjAdviceKjbq record : kjbqPage.getRecords()) {
if (null != record.getUserId()) {
record.setUserName(userService.getById(record.getUserId()).getNickName());
@@ -193,6 +195,8 @@
@GetMapping("/list")
@ApiOperation(value = "浣撴寤鸿鍒楄〃鏌ヨ")
public AjaxResult list(@RequestParam(required = false) @ApiParam(value = "椤圭洰鍚�") String proName,
+ @ApiParam(value = "鏍囬") @RequestParam(required = false) String bt,
+ @ApiParam(value = "寤鸿") @RequestParam(required = false) String nr,
@ApiParam(value = "椤电爜鏁�(榛樿1)") @RequestParam(defaultValue = "1") Integer page,
@ApiParam(value = "鏄剧ず鏉℃暟(榛樿10)") @RequestParam(defaultValue = "10") Integer pageSize) {
Page<TjAdvice> page1 = new Page<>(page, pageSize);
@@ -204,16 +208,16 @@
list = new ArrayList<>();
wq.like(TjProject::getProName, proName);
List<TjProject> projectList = tjProjectService.list(wq);
- if (null != projectList && projectList.size() > 0) {
+ if (null != projectList && !projectList.isEmpty()) {
for (TjProject project : projectList) {
LambdaQueryWrapper<TjAdvice> wqq = new LambdaQueryWrapper<>();
wqq.eq(TjAdvice::getProId, project.getProId());
IPage<TjAdvice> adviceList = tjAdviceService.page(page1, wqq);
- if (null != adviceList.getRecords() && adviceList.getRecords().size() > 0) {
+ if (null != adviceList.getRecords() && !adviceList.getRecords().isEmpty()) {
for (TjAdvice record : adviceList.getRecords()) {
record.setProName(project.getProName());
String kjbq = record.getKjbq();
- if(null !=kjbq && !kjbq.equals("")){
+ if(null !=kjbq && !kjbq.isEmpty()){
String[] split = kjbq.split(",");
record.setKjbqz(Arrays.asList(split));
}
@@ -227,9 +231,12 @@
map.put("total", total);
return AjaxResult.success(map);
}
- Page<TjAdvice> page2 = tjAdviceService.page(page1);
+ LambdaQueryWrapper<TjAdvice> wq=new LambdaQueryWrapper<>();
+ if(!StringUtil.isBlank(bt)) wq.like(TjAdvice::getTitle,bt);
+ if(!StringUtil.isBlank(nr)) wq.like(TjAdvice::getAdvice,nr);
+ Page<TjAdvice> page2 = tjAdviceService.page(page1,wq);
list = page2.getRecords();
- if (null != list && list.size() > 0) {
+ if (null != list && !list.isEmpty()) {
for (TjAdvice advice : list) {
TjProject tjProject = tjProjectService.getById(advice.getProId());
if (null != tjProject) {
--
Gitblit v1.8.0