From dbc11598957806965ec0e6b15c91f3d017d5759f Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期五, 03 一月 2025 20:16:53 +0800
Subject: [PATCH] 20250103
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjAdviceController.java | 139 ++++++++++++++++++++++++++++------------------
1 files changed, 85 insertions(+), 54 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..f733795 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
@@ -6,10 +6,13 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
+import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
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.core.domain.entity.SysDept;
+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;
@@ -20,10 +23,12 @@
import com.ltkj.hosp.service.ITjProjectService;
import com.ltkj.hosp.service.TjAdviceKjbqService;
import com.ltkj.hosp.service.TjUserAdviceService;
+import com.ltkj.system.service.ISysDeptService;
import com.ltkj.system.service.ISysUserService;
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.*;
@@ -51,6 +56,8 @@
private TjUserAdviceService userAdviceService;
@Autowired
private ISysUserService userService;
+ @Autowired
+ private ISysDeptService sysDeptService;
@PostMapping("/addTjAdviceKjbq")
@ApiOperation(value = "鏂板浣撴寤鸿蹇嵎鏍囩鎺ュ彛")
@@ -87,14 +94,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());
@@ -109,12 +116,15 @@
@GetMapping("/getKjTjAdviceKjbqBySex")
@ApiOperation(value = "鏍规嵁浣撴浜烘�у埆鍜屾槸鍚︿负鎬绘鏌ヨ浣撴寤鸿鎺ュ彛")
public AjaxResult getKjTjAdviceKjbqBySex(@RequestParam String sex, @RequestParam @ApiParam(value = "1甯歌鍖荤敓 0鎬绘") String isZj,
+ @RequestParam(required = false) @ApiParam(value ="寤鸿鍐呭") String jynr,
@ApiParam(value = "椤电爜鏁�(榛樿1)") @RequestParam(defaultValue = "1") Integer page,
@ApiParam(value = "鏄剧ず鏉℃暟(榛樿10)") @RequestParam(defaultValue = "10") Integer pageSize) {
LambdaQueryWrapper<TjAdvice> wq = new LambdaQueryWrapper<>();
Page<TjAdvice> page1 = new Page<>(page, pageSize);
- wq.eq(TjAdvice::getAdSex, sex).or().isNull(TjAdvice::getAdSex);
+// wq.eq(TjAdvice::getAdSex, sex).or().isNull(TjAdvice::getAdSex);
wq.eq(TjAdvice::getIsZj, isZj);
+ if(StringUtil.isNotBlank(jynr)) wq.like(TjAdvice::getAdvice,jynr);
+ wq.and(i -> i.eq(TjAdvice::getAdSex, sex).or().isNull(TjAdvice::getAdSex));
Page<TjAdvice> kjbqPage = tjAdviceService.page(page1, wq);
return AjaxResult.success(kjbqPage);
}
@@ -193,58 +203,79 @@
@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);
- Map<String, Object> map = new HashMap<>();
- List<TjAdvice> list = null;
- long total = 0;
- if (null != proName) {
- LambdaQueryWrapper<TjProject> wq = new LambdaQueryWrapper<>();
- list = new ArrayList<>();
- wq.like(TjProject::getProName, proName);
- List<TjProject> projectList = tjProjectService.list(wq);
- if (null != projectList && projectList.size() > 0) {
- 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) {
- for (TjAdvice record : adviceList.getRecords()) {
- record.setProName(project.getProName());
- String kjbq = record.getKjbq();
- if(null !=kjbq && !kjbq.equals("")){
- String[] split = kjbq.split(",");
- record.setKjbqz(Arrays.asList(split));
- }
- }
- list.addAll(adviceList.getRecords());
- }
- total = adviceList.getTotal();
- }
- }
- map.put("list", list);
- map.put("total", total);
- return AjaxResult.success(map);
- }
- Page<TjAdvice> page2 = tjAdviceService.page(page1);
- list = page2.getRecords();
- if (null != list && list.size() > 0) {
- for (TjAdvice advice : list) {
- TjProject tjProject = tjProjectService.getById(advice.getProId());
- if (null != tjProject) {
- advice.setProName(tjProject.getProName());
- }
- String kjbq = advice.getKjbq();
- if(null !=kjbq && !kjbq.equals("")){
- String[] split = kjbq.split(",");
- advice.setKjbqz(Arrays.asList(split));
- }
- }
- }
- map.put("list", list);
- map.put("total", page2.getTotal());
- return AjaxResult.success(map);
+ @ApiParam(value = "鏄剧ず鏉℃暟(榛樿10)") @RequestParam(defaultValue = "10") Integer pageSize,
+ @RequestParam(required = false)String deptId) {
+// LambdaQueryWrapper<SysDept> wrapper = new LambdaQueryWrapper<>();
+// wrapper.eq(SysDept::getParentId, 0);
+// SysDept sysDept = sysDeptService.getOne(wrapper);
+// Page<TjAdvice> page1 = new Page<>(page, pageSize);
+// Map<String, Object> map = new HashMap<>();
+// List<TjAdvice> list = null;
+// long total = 0;
+// if (null != proName) {
+// LambdaQueryWrapper<TjProject> wq = new LambdaQueryWrapper<>();
+// list = new ArrayList<>();
+// wq.like(TjProject::getProName, proName);
+// List<TjProject> projectList = tjProjectService.list(wq);
+// if (null != projectList && !projectList.isEmpty()) {
+// for (TjProject project : projectList) {
+// LambdaQueryWrapper<TjAdvice> wqq = new LambdaQueryWrapper<>();
+// wqq.eq(TjAdvice::getProId, project.getProId());
+// if (!deptId.equals(String.valueOf(sysDept.getDeptId()))) {
+// wqq.eq(TjAdvice::getDept_id, deptId);
+// }
+// IPage<TjAdvice> adviceList = tjAdviceService.page(page1, wqq);
+// if (null != adviceList.getRecords() && !adviceList.getRecords().isEmpty()) {
+// for (TjAdvice record : adviceList.getRecords()) {
+// record.setProName(project.getProName());
+// String kjbq = record.getKjbq();
+// if(null !=kjbq && !kjbq.isEmpty()){
+// String[] split = kjbq.split(",");
+// record.setKjbqz(Arrays.asList(split));
+// }
+// }
+// list.addAll(adviceList.getRecords());
+// }
+// total = adviceList.getTotal();
+// }
+// }
+// map.put("list", list);
+// map.put("total", total);
+// List<TjAdvice> list1 = tjAdviceService.selectList(proName,deptId,(page -1) * pageSize,pageSize);
+// return AjaxResult.success(map);
+// }
+// LambdaQueryWrapper<TjAdvice> wq=new LambdaQueryWrapper<>();
+// if(!StringUtil.isBlank(bt)) wq.like(TjAdvice::getTitle,bt);
+// if(!StringUtil.isBlank(nr)) wq.like(TjAdvice::getAdvice,nr);
+// if (!deptId.equals(String.valueOf(sysDept.getDeptId()))) {
+// wq.eq(TjAdvice::getDept_id, deptId);
+// }
+// Page<TjAdvice> page2 = tjAdviceService.page(page1,wq);
+// list = page2.getRecords();
+// if (null != list && !list.isEmpty()) {
+// for (TjAdvice advice : list) {
+// TjProject tjProject = tjProjectService.getById(advice.getProId());
+// if (null != tjProject) {
+// advice.setProName(tjProject.getProName());
+// }
+// String kjbq = advice.getKjbq();
+// if(null !=kjbq && !kjbq.equals("")){
+// String[] split = kjbq.split(",");
+// advice.setKjbqz(Arrays.asList(split));
+// }
+// }
+// }
+// map.put("list", list);
+// map.put("total", page2.getTotal());
+ List<TjAdvice> tjAdvices = tjAdviceService.selectList(proName, deptId, (page - 1) * pageSize, pageSize,bt,nr);
+ Integer count = tjAdviceService.selectListCount(proName, deptId,bt,nr);
+ HashMap<String, Object> hashMap = new HashMap<>();
+ hashMap.put("list",tjAdvices);
+ hashMap.put("total",count);
+ return AjaxResult.success(hashMap);
}
/**
--
Gitblit v1.8.0