From bd6c1c1c6642d57c85816a62d77c25c4e1a66a76 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期二, 02 一月 2024 09:38:46 +0800
Subject: [PATCH] zjh 2024/01/02--1
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/DictSfxmController.java | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 56 insertions(+), 3 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/DictSfxmController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/DictSfxmController.java
index 7f40fd8..2855b89 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/DictSfxmController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/DictSfxmController.java
@@ -6,11 +6,13 @@
import javax.servlet.http.HttpServletResponse;
import cn.hutool.extra.pinyin.PinyinUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ltkj.common.core.redis.RedisCache;
import com.ltkj.framework.config.MatchUtils;
import com.ltkj.hosp.domain.DictHosp;
import com.ltkj.hosp.domain.DictSfxm;
import com.ltkj.hosp.domain.TjCustomer;
+import com.ltkj.hosp.domain.TjOrder;
import com.ltkj.hosp.service.IDictHospService;
import com.ltkj.hosp.service.IDictSfxmService;
import com.ltkj.hosp.service.TjAsyncService;
@@ -51,9 +53,9 @@
* 鏌ヨ鏀惰垂椤圭洰鍒楄〃
*/
// @PreAuthorize("@ss.hasPermi('system:sfxm:list')")
- @GetMapping("/list")
+ @PostMapping("/list")
@ApiOperation(value = "鏌ヨ")
- public TableDataInfo list(DictSfxm dictSfxm) {
+ public TableDataInfo list(@RequestBody DictSfxm dictSfxm) {
startPage();
String pym = dictSfxm.getPym();
if(null !=pym && !"".equals(pym)) {
@@ -138,7 +140,7 @@
@ApiOperation(value = "鎸夌収椤圭洰缂栫爜鏍戝舰鏌ヨ")
public AjaxResult getList() {
if(redisCache.hasKey("getDictSfxms")){
- List<DictSfxm> getDictSfxms = redisCache.getCacheList("getDictSfxms");
+ List<DictSfxm> getDictSfxms = redisCache.getCacheObject("getDictSfxms");
return AjaxResult.success(getDictSfxms);
}
List<DictSfxm> dictSfxms = getDictSfxms();
@@ -195,6 +197,14 @@
List<DictSfxm> sfx = dictSfxmService.getSjDictSfxmList(service.getId());
if (null != sfx && sfx.size() > 0) {
List<DictSfxm> sfxmList = sfx.stream().skip((long) (page - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
+ if (null != sfxmList && sfxmList.size() > 0) {
+ for (DictSfxm sfxm : sfxmList) {
+ DictHosp hosp = dictHospService.getById(sfxm.getYqid());
+ if (null != hosp) {
+ sfxm.setYqName(hosp.getHospAreaName());
+ }
+ }
+ }
Collections.reverse(sfxmList);
map.put("date", sfxmList);
map.put("total", sfx.size());
@@ -206,4 +216,47 @@
}
return AjaxResult.success(map);
}
+
+
+// /**
+// * 鏌ヨ鏀惰垂椤圭洰鍒楄〃
+// */
+// @PostMapping("/getSfxmList")
+// @ApiOperation(value = "鏌ヨ")
+// public AjaxResult getSfxmList(@ApiParam(value = "椤电爜鏁�(榛樿1)") @RequestParam(defaultValue = "1") Integer page,
+// @ApiParam(value = "鏄剧ず鏉℃暟(榛樿10)") @RequestParam(defaultValue = "10") Integer pageSize,
+// @ApiParam(value = "鎷奸煶鐮�") @RequestParam(required = false) String pym,
+// @ApiParam(value = "鍚嶇О") @RequestParam(required = false) String xmmc,
+// @ApiParam(value = "id") @RequestParam(required = false) String id) {
+// Map<String, Object> map = new HashMap<>();
+// List<DictSfxm> collect = null;
+// LambdaQueryWrapper<DictSfxm> wq=new LambdaQueryWrapper<>();
+// if(null !=pym && !"".equals(pym)) {
+// pym=pym.toUpperCase(Locale.ROOT);
+// wq.like(DictSfxm::getPym,pym);
+// }
+// if(null !=xmmc && !"".equals(xmmc)) {
+// wq.like(DictSfxm::getXmmc,xmmc);
+// }
+// if(null !=id && !"".equals(id)) {
+// wq.like(DictSfxm::getId,id);
+// }
+// List<DictSfxm> list = dictSfxmService.list(wq);
+// if (null != list && list.size() > 0) {
+// for (DictSfxm sfxm : list) {
+// DictHosp hosp = dictHospService.getById(sfxm.getYqid());
+// if (null != hosp) {
+// sfxm.setYqName(hosp.getHospAreaName());
+// }
+// }
+// }
+// collect = list.stream().skip((long) (page - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
+// if (null != collect) {
+// map.put("total", collect.size());
+// } else {
+// map.put("total", 0);
+// }
+// map.put("list", collect);
+// return AjaxResult.success(map);
+// }
}
--
Gitblit v1.8.0