From a74b5ffd9c25edd8096220920934e3e42f62cc23 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期四, 25 四月 2024 17:06:08 +0800
Subject: [PATCH] zjh 2024/04/25-1
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjAdviceController.java | 155 ++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 132 insertions(+), 23 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 746c397..8ee6169 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
@@ -1,5 +1,6 @@
package com.ltkj.web.controller.system;
+import java.nio.channels.NonReadableChannelException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -11,14 +12,21 @@
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.utils.poi.ExcelUtil;
import com.ltkj.hosp.domain.TjAdvice;
+import com.ltkj.hosp.domain.TjAdviceKjbq;
import com.ltkj.hosp.domain.TjProject;
+import com.ltkj.hosp.domain.TjUserAdvice;
import com.ltkj.hosp.service.ITjAdviceService;
import com.ltkj.hosp.service.ITjProjectService;
+import com.ltkj.hosp.service.TjAdviceKjbqService;
+import com.ltkj.hosp.service.TjUserAdviceService;
+import com.ltkj.system.service.ISysUserService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import com.ltkj.common.annotation.Log;
@@ -34,11 +42,112 @@
@RestController
@RequestMapping("/advice/advice")
@Api(tags = "浣撴寤鸿绠＄悊鎺ュ彛")
-public class TjAdviceController{
+public class TjAdviceController {
@Resource
private ITjAdviceService tjAdviceService;
@Resource
private ITjProjectService tjProjectService;
+ @Resource
+ private TjAdviceKjbqService kjbqService;
+ @Resource
+ private TjUserAdviceService userAdviceService;
+ @Autowired
+ private ISysUserService userService;
+
+ @PostMapping("/addTjAdviceKjbq")
+ @ApiOperation(value = "鏂板浣撴寤鸿蹇嵎鏍囩鎺ュ彛")
+ public AjaxResult addTjAdviceKjbq(@RequestBody TjAdviceKjbq adviceKjbq) {
+ return AjaxResult.success(kjbqService.save(adviceKjbq));
+ }
+
+ @DeleteMapping("/deletedTjAdviceKjbq")
+ @ApiOperation(value = "鏍规嵁id鍒犻櫎浣撴寤鸿蹇嵎鏍囩鎺ュ彛")
+ public AjaxResult deletedTjAdviceKjbq(@RequestParam Long adviceKjbqId) {
+ return AjaxResult.success(kjbqService.removeById(adviceKjbqId));
+ }
+
+ @PutMapping("/updateTjAdviceKjbq")
+ @ApiOperation(value = "淇敼浣撴寤鸿蹇嵎鏍囩鎺ュ彛")
+ public AjaxResult updateTjAdviceKjbq(@RequestBody TjAdviceKjbq adviceKjbq) {
+ return AjaxResult.success(kjbqService.updateById(adviceKjbq));
+ }
+
+ @PostMapping("/updateQybzTjAdviceKjbqById")
+ @ApiOperation(value = "淇敼浣撴寤鸿蹇嵎鏍囩鍚敤鐘舵�佹帴鍙�")
+ public AjaxResult updateQybzTjAdviceKjbqById(@RequestParam int qybz,@RequestParam Long id) {
+ TjAdviceKjbq kjbq = kjbqService.getById(id);
+ kjbq.setQyzt(String.valueOf(qybz));
+ return AjaxResult.success(kjbqService.updateById(kjbq));
+ }
+
+ @GetMapping("/getTjAdviceKjbqByFl")
+ @ApiOperation(value = "鏍规嵁鏍囩鍒嗙被鏌ヨ浣撴寤鸿蹇嵎鏍囩鎺ュ彛")
+ public AjaxResult getTjAdviceKjbqByFl(@RequestParam(required = false)@ApiParam(value = "鐢ㄦ埛id 浼犲綋鍓嶇櫥褰曚汉 瓒呯鐧诲綍鏃朵笉浼� 涓簄ull") String userId,
+ @RequestParam(required = false)@ApiParam(value = "鍚敤鐘舵�� 0鍚敤 1鍋滅敤") Integer qyzt,
+ @ApiParam(value = "椤电爜鏁�(榛樿1)") @RequestParam(defaultValue = "1") Integer page,
+ @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("")) {
+ 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){
+ for (TjAdviceKjbq record : kjbqPage.getRecords()) {
+ if(null !=record.getUserId()){
+ record.setUserName(userService.getById(record.getUserId()).getNickName());
+ }
+
+ }
+ }
+ return AjaxResult.success(kjbqPage);
+ }
+
+
+ @GetMapping("/getKjTjAdviceKjbqBySex")
+ @ApiOperation(value = "鏍规嵁浣撴浜烘�у埆鍜屾槸鍚︿负鎬绘鏌ヨ浣撴寤鸿鎺ュ彛")
+ public AjaxResult getKjTjAdviceKjbqBySex(@RequestParam String sex, @RequestParam @ApiParam(value = "0甯歌鍖荤敓 1鎬绘") String isZj,
+ @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);
+ wq.eq(TjAdvice::getIsZj, isZj);
+ Page<TjAdvice> kjbqPage = tjAdviceService.page(page1, wq);
+ return AjaxResult.success(kjbqPage);
+ }
+
+
+
+
+ @GetMapping("/getCyTjAdviceKjbqBySex")
+ @ApiOperation(value = "鏍规嵁褰撳墠鐧诲綍浜篿d鑾峰彇甯哥敤寤鸿")
+ public AjaxResult getCyTjAdviceKjbqBySex(@RequestParam String sex,@RequestParam @ApiParam(value = "鐢ㄦ埛id 浼犲綋鍓嶇櫥褰曚汉") Long userId,
+ @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);
+ if (null != userId) {
+ LambdaQueryWrapper<TjUserAdvice> wq0=new LambdaQueryWrapper<>();
+ wq0.eq(TjUserAdvice::getUserId,userId);
+ List<TjUserAdvice> list = userAdviceService.list(wq0);
+ if(null !=list && list.size()>0){
+ List<Long> longs = list.stream().map(TjUserAdvice::getAdviceId).collect(Collectors.toList());
+ wq.in(TjAdvice::getId, longs);
+ Page<TjAdvice> kjbqPage = tjAdviceService.page(page1, wq);
+ return AjaxResult.success(kjbqPage);
+ }
+
+ }
+ return AjaxResult.success("璇ョ敤鎴锋殏鏃舵病鏈夊父鐢ㄥ缓璁�!");
+ }
+
+
+
/**
* 鏌ヨadvice鍒楄〃
@@ -47,38 +156,38 @@
@GetMapping("/list")
@ApiOperation(value = "浣撴寤鸿鍒楄〃鏌ヨ")
public AjaxResult list(@RequestParam(required = false) @ApiParam(value = "椤圭洰鍚�") String proName,
- @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);
+ @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){
+ 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){
+ 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());
}
list.addAll(adviceList.getRecords());
}
- total = adviceList.getTotal();
+ total = adviceList.getTotal();
}
}
- map.put("list",list);
- map.put("total",total);
+ 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) {
+ list = page2.getRecords();
+ if (null != list && list.size() > 0) {
for (TjAdvice advice : list) {
TjProject tjProject = tjProjectService.getById(advice.getProId());
if (null != tjProject) {
@@ -86,8 +195,8 @@
}
}
}
- map.put("list",list);
- map.put("total",page2.getTotal());
+ map.put("list", list);
+ map.put("total", page2.getTotal());
return AjaxResult.success(map);
}
--
Gitblit v1.8.0