From e6eb8c14f98921ba73a7efdfc1415c6483dc4112 Mon Sep 17 00:00:00 2001 From: zhaowenxuan <chacca165@163.com> Date: 星期五, 18 七月 2025 14:34:46 +0800 Subject: [PATCH] 查询时间范围条件 --- ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjAdviceController.java | 309 +++++++++++++++++++++++++++++++++++++++------------ 1 files changed, 236 insertions(+), 73 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 8ee6169..7ca2360 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,19 +1,21 @@ package com.ltkj.web.controller.system; import java.nio.channels.NonReadableChannelException; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.stream.Collectors; 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.SecurityUtils; +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; import com.ltkj.hosp.domain.TjAdviceKjbq; import com.ltkj.hosp.domain.TjProject; @@ -22,10 +24,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.*; @@ -53,10 +57,13 @@ private TjUserAdviceService userAdviceService; @Autowired private ISysUserService userService; + @Autowired + private ISysDeptService sysDeptService; @PostMapping("/addTjAdviceKjbq") @ApiOperation(value = "鏂板浣撴寤鸿蹇嵎鏍囩鎺ュ彛") public AjaxResult addTjAdviceKjbq(@RequestBody TjAdviceKjbq adviceKjbq) { + return AjaxResult.success(kjbqService.save(adviceKjbq)); } @@ -74,7 +81,7 @@ @PostMapping("/updateQybzTjAdviceKjbqById") @ApiOperation(value = "淇敼浣撴寤鸿蹇嵎鏍囩鍚敤鐘舵�佹帴鍙�") - public AjaxResult updateQybzTjAdviceKjbqById(@RequestParam int qybz,@RequestParam Long id) { + 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)); @@ -82,22 +89,22 @@ @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, + 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("")) { + Page<TjAdviceKjbq> page1 = new Page<>(page, pageSize); + if (null != userId && !StringUtils.isBlank(userId)) { wq.eq(TjAdviceKjbq::getUserId, userId); } if (null != qyzt) { - wq.eq(TjAdviceKjbq::getQyzt,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()){ + if (null != record.getUserId()) { record.setUserName(userService.getById(record.getUserId()).getNickName()); } @@ -109,46 +116,146 @@ @GetMapping("/getKjTjAdviceKjbqBySex") @ApiOperation(value = "鏍规嵁浣撴浜烘�у埆鍜屾槸鍚︿负鎬绘鏌ヨ浣撴寤鸿鎺ュ彛") - public AjaxResult getKjTjAdviceKjbqBySex(@RequestParam String sex, @RequestParam @ApiParam(value = "0甯歌鍖荤敓 1鎬绘") String isZj, + public AjaxResult getKjTjAdviceKjbqBySex(@RequestParam @ApiParam(value = "1甯歌鍖荤敓 0鎬绘") String isZj, + @RequestParam(required = false) @ApiParam(value ="寤鸿鍐呭") String jynr, + @RequestParam(required = false) @ApiParam(value ="寤鸿鏍囬") String jybt, @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); + Page<TjAdvice> page1 = new Page<>(page, pageSize); +// wq.eq(TjAdvice::getAdSex, sex).or().isNull(TjAdvice::getAdSex); wq.eq(TjAdvice::getIsZj, isZj); + if(StringUtil.isNotBlank(jynr)) wq.like(TjAdvice::getAdvice,jynr); + if(StringUtil.isNotBlank(jybt)) wq.like(TjAdvice::getTitle,jybt); +// wq.and(i -> i.eq(TjAdvice::getAdSex, sex).or().isNull(TjAdvice::getAdSex)); Page<TjAdvice> kjbqPage = tjAdviceService.page(page1, wq); return AjaxResult.success(kjbqPage); } +/* @GetMapping("/getCyTjAdviceKjbqBySex") + @ApiOperation(value = "鏍规嵁褰撳墠鐧诲綍浜篿d鑾峰彇甯哥敤寤鸿") + public AjaxResult getCyTjAdviceKjbqBySex(@RequestParam(required = false) 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); + if (null != userId) { + LambdaQueryWrapper<TjUserAdvice> wq0 = new LambdaQueryWrapper<>(); + wq0.eq(TjUserAdvice::getUserId, userId); + List<TjUserAdvice> list = userAdviceService.list(wq0); + if (null != list && !list.isEmpty()) { + 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("璇ョ敤鎴锋殏鏃舵病鏈夊父鐢ㄥ缓璁�!"); + }*/ @GetMapping("/getCyTjAdviceKjbqBySex") @ApiOperation(value = "鏍规嵁褰撳墠鐧诲綍浜篿d鑾峰彇甯哥敤寤鸿") - public AjaxResult getCyTjAdviceKjbqBySex(@RequestParam String sex,@RequestParam @ApiParam(value = "鐢ㄦ埛id 浼犲綋鍓嶇櫥褰曚汉") Long userId, + public AjaxResult getCyTjAdviceKjbqBySex( @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); + @ApiParam(value = "鏄剧ず鏉℃暟(榛樿10)") @RequestParam(defaultValue = "10") Integer pageSize, + @RequestParam(required = false) String nr) { + LambdaQueryWrapper<TjUserAdvice> wq0 = new LambdaQueryWrapper<>(); + if(!SecurityUtils.isAdmin(userId)) + wq0.eq(TjUserAdvice::getUserId, userId); + List<TjUserAdvice> list = userAdviceService.list(wq0); + List<TjAdvice> kjbqPage = new ArrayList<>(); + Map<String,Object> map = new HashMap<>(); + if (null != list && !list.isEmpty()) { + for (TjUserAdvice advice : list) { + TjAdvice advice1 = tjAdviceService.getById(advice.getAdviceId()); + if(null != advice1){ + advice1.setUserName(userService.getById(advice.getUserId()).getNickName()); + kjbqPage.add(advice1); + } } - + List<TjAdvice> adviceList =null; + if(StringUtil.isNotBlank( nr)){ + adviceList = kjbqPage.stream().filter(kjbq -> StringUtil.isNotBlank(kjbq.getTitle()) && kjbq.getTitle().contains(nr)) + .skip((long) (page - 1) * pageSize).limit(pageSize).collect(Collectors.toList()); + }else { + adviceList = kjbqPage.stream().skip((long) (page - 1) * pageSize).limit(pageSize).collect(Collectors.toList()); + } + map.put("total", kjbqPage.size()); + map.put("records", adviceList); + return AjaxResult.success(map); } return AjaxResult.success("璇ョ敤鎴锋殏鏃舵病鏈夊父鐢ㄥ缓璁�!"); } + @GetMapping("/addCyTjAdviceByUserId") + @ApiOperation(value = "娣诲姞褰撳墠鐧诲綍浜哄父鐢ㄥ缓璁帴鍙�") + public AjaxResult addCyTjAdviceByUserId(@RequestParam @ApiParam(value = "鎵�閫夊缓璁富閿甶d鏁扮粍") List<Long> adviceIds) { + String userId = UserHoder.getLoginUser().getUserId(); + if (null != adviceIds && !adviceIds.isEmpty()) { + for (Long id : adviceIds) { + TjUserAdvice tjUserAdvice = userAdviceService.getTjUserAdviceByUserId(Long.valueOf(userId), id); + if (null == tjUserAdvice) { + TjUserAdvice userAdvice = new TjUserAdvice(); + userAdvice.setAdviceId(id); + userAdvice.setUserId(Long.valueOf(userId)); + userAdviceService.save(userAdvice); + } + } + return AjaxResult.success("娣诲姞鎴愬姛!"); + } + return AjaxResult.success("璇烽�夋嫨鎮ㄨ娣诲姞鐨勫缓璁�!"); + } + @GetMapping("/edaitCyTjAdviceByUserId") + @ApiOperation(value = "淇敼褰撳墠鐧诲綍浜哄父鐢ㄥ缓璁帴鍙�") + public AjaxResult edaitCyTjAdviceByUserId(@RequestParam @ApiParam(value = "鎵�閫夊缓璁富閿甶d鏁扮粍") List<Long> adviceIds) { + String userId = UserHoder.getLoginUser().getUserId(); + if (null != adviceIds && !adviceIds.isEmpty()) { + LambdaQueryWrapper<TjUserAdvice> wq=new LambdaQueryWrapper<>(); + wq.eq(TjUserAdvice::getUserId,userId); + userAdviceService.remove(wq); + for (Long id : adviceIds) { + TjUserAdvice tjUserAdvice = userAdviceService.getTjUserAdviceByUserId(Long.valueOf(userId), id); + if (null == tjUserAdvice) { + TjUserAdvice userAdvice = new TjUserAdvice(); + userAdvice.setAdviceId(id); + userAdvice.setUserId(Long.valueOf(userId)); + userAdviceService.save(userAdvice); + } + } + return AjaxResult.success("娣诲姞鎴愬姛!"); + } + return AjaxResult.success("璇烽�夋嫨鎮ㄨ娣诲姞鐨勫缓璁�!"); + } + + + + @PostMapping("/addCyTjAdvice") + @ApiOperation(value = "娣诲姞甯哥敤寤鸿鎺ュ彛") + public AjaxResult addCyTjAdvice(@RequestBody TjAdvice adviceId) { + String userId = UserHoder.getLoginUser().getUserId(); + if (null != adviceId) { + if (tjAdviceService.save(adviceId)) { + TjUserAdvice tjUserAdvice = userAdviceService.getTjUserAdviceByUserId(Long.valueOf(userId),adviceId.getId()); + if (null == tjUserAdvice) { + TjUserAdvice userAdvice = new TjUserAdvice(); + userAdvice.setAdviceId(adviceId.getId()); + userAdvice.setUserId(Long.valueOf(userId)); + userAdviceService.save(userAdvice); + } + } + return AjaxResult.success("鎿嶄綔鎴愬姛!"); + } + return AjaxResult.success("璇烽�夋嫨鎮ㄨ娣诲姞鐨勫缓璁�!"); + } + + + +// ================/**/================================================================================================================================== /** * 鏌ヨadvice鍒楄〃 */ @@ -156,48 +263,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()); - } - 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()); - } - } - } - 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); } /** @@ -217,8 +355,17 @@ */ // @PreAuthorize("@ss.hasPermi('advice:advice:query')") @GetMapping(value = "/{id}") + @ApiOperation(value = "鏍规嵁涓婚敭id鑾峰彇advice璇︾粏淇℃伅") public AjaxResult getInfo(@PathVariable("id") Long id) { - return AjaxResult.success(tjAdviceService.selectTjAdviceById(id)); + TjAdvice advice = tjAdviceService.getById(id); + if(null !=advice){ + String kjbq = advice.getKjbq(); + if(null !=kjbq && !kjbq.equals("")){ + String[] split = kjbq.split(","); + advice.setKjbqz(Arrays.asList(split)); + } + } + return AjaxResult.success(advice); } /** @@ -227,8 +374,9 @@ // @PreAuthorize("@ss.hasPermi('advice:advice:add')") @Log(title = "advice", businessType = BusinessType.INSERT) @PostMapping + @ApiOperation(value = "鏂板浣撴寤鸿鎺ュ彛") public AjaxResult add(@RequestBody TjAdvice tjAdvice) { - return AjaxResult.success(tjAdviceService.insertTjAdvice(tjAdvice)); + return AjaxResult.success(tjAdviceService.save(tjAdvice)); } /** @@ -237,6 +385,7 @@ // @PreAuthorize("@ss.hasPermi('advice:advice:edit')") @Log(title = "advice", businessType = BusinessType.UPDATE) @PutMapping + @ApiOperation(value = "淇敼浣撴寤鸿鎺ュ彛") public AjaxResult edit(@RequestBody TjAdvice tjAdvice) { return AjaxResult.success(tjAdviceService.updateById(tjAdvice)); } @@ -250,4 +399,18 @@ public AjaxResult remove(@PathVariable Long[] ids) { return AjaxResult.success(tjAdviceService.deleteTjAdviceByIds(ids)); } + + + @DeleteMapping("/delCyremove") + @ApiOperation(value = "鍒犻櫎鐢ㄦ埛甯哥敤寤鸿鎺ュ彛") + public AjaxResult delCyremove(@RequestParam List<String> ids) { + String userId = UserHoder.getLoginUser().getUserId(); + LambdaQueryWrapper<TjUserAdvice> wq=new LambdaQueryWrapper<>(); + wq.in(TjUserAdvice::getAdviceId,ids); + wq.eq(TjUserAdvice::getUserId,userId); + if (userAdviceService.remove(wq)) { + return AjaxResult.success(); + } + return AjaxResult.error(); + } } -- Gitblit v1.8.0