From e4b5fef59ea127c76f46ba785c19e9da46c9514d Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期一, 16 十二月 2024 18:12:13 +0800
Subject: [PATCH] zjh202412016
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjAdviceController.java | 4 ++--
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 4 ++--
ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjAdviceService.java | 4 ++--
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjAdviceServiceImpl.java | 8 ++++----
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java | 2 +-
ltkj-hosp/src/main/resources/mapper/hosp/TjAdviceMapper.xml | 12 ++++++++++++
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjAdviceMapper.java | 6 ++++--
7 files changed, 27 insertions(+), 13 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 1a1269d..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
@@ -270,8 +270,8 @@
// }
// map.put("list", list);
// map.put("total", page2.getTotal());
- List<TjAdvice> tjAdvices = tjAdviceService.selectList(proName, deptId, (page - 1) * pageSize, pageSize);
- Integer count = tjAdviceService.selectListCount(proName, deptId);
+ 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);
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
index 3e6a5a5..358ed9c 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
@@ -3346,10 +3346,10 @@
}
- @GetMapping("/zongjanyemianshjianzhou")
+ @PostMapping("/zongjanyemianshjianzhou")
@ApiOperation(value = "鎬绘鑾峰彇鏃堕棿杞存帴鍙�")
@Transactional
- public AjaxResult zongjanyemianshjianzhou(@RequestParam List<String> tjNUms) {
+ public AjaxResult zongjanyemianshjianzhou(@RequestBody List<String> tjNUms) {
if(null !=tjNUms && !tjNUms.isEmpty()){
List<Map<String,Object>> list=new ArrayList<>();
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java
index 1cb65eb..a9c46f2 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java
@@ -913,7 +913,7 @@
return AjaxResult.error("姝よ韩浠借瘉鍙�: "+reservation.getIdCard()+" 閲嶅,璇锋牳瀵瑰悗涓婁紶!");
}
-
+ reservation.setName(reservation.getName().replaceAll("銆�","").replaceAll(" ",""));
ids.add(reservation.getIdCard());
TjDwGrouping dwGrouping = dwGroupingService.getById(reservation.getGroupingId());
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjAdviceMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjAdviceMapper.java
index b998966..2be2b4d 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjAdviceMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjAdviceMapper.java
@@ -83,6 +83,8 @@
"</script>" })
List<TjAdvice> getAdviceStringByIds(@Param("aList") String[] aList);
- List<TjAdvice> selectList(@Param("proName") String proName,@Param("deptId") String deptId,@Param("page") int i,@Param("pageSize") Integer pageSize);
- Integer selectListCount(@Param("proName") String proName,@Param("deptId") String deptId);
+ List<TjAdvice> selectList(@Param("proName") String proName,@Param("deptId") String deptId,@Param("page") int i,@Param("pageSize") Integer pageSize
+ ,@Param("bt")String bt,@Param("nr")String nr);
+ Integer selectListCount(@Param("proName") String proName,@Param("deptId") String deptId
+ ,@Param("bt")String bt,@Param("nr")String nr);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjAdviceService.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjAdviceService.java
index 252bab5..299f8a5 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjAdviceService.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjAdviceService.java
@@ -68,6 +68,6 @@
List<TjAdvice> getAdviceStringByIds(String[] aList);
- List<TjAdvice> selectList(String proName, String deptId, int i, Integer pageSize);
- Integer selectListCount(String proName, String deptId);
+ List<TjAdvice> selectList(String proName, String deptId, int i, Integer pageSize,String bt,String nr);
+ Integer selectListCount(String proName, String deptId,String bt,String nr);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjAdviceServiceImpl.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjAdviceServiceImpl.java
index 9f3cabf..0303760 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjAdviceServiceImpl.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjAdviceServiceImpl.java
@@ -102,12 +102,12 @@
}
@Override
- public Integer selectListCount(String proName, String deptId) {
- return tjAdviceMapper.selectListCount(proName,deptId);
+ public Integer selectListCount(String proName, String deptId,String bt,String nr) {
+ return tjAdviceMapper.selectListCount(proName,deptId, bt, nr);
}
@Override
- public List<TjAdvice> selectList(String proName, String deptId, int i, Integer pageSize) {
- return tjAdviceMapper.selectList(proName,deptId,i,pageSize);
+ public List<TjAdvice> selectList(String proName, String deptId, int i, Integer pageSize,String bt,String nr) {
+ return tjAdviceMapper.selectList(proName,deptId,i,pageSize, bt, nr);
}
}
diff --git a/ltkj-hosp/src/main/resources/mapper/hosp/TjAdviceMapper.xml b/ltkj-hosp/src/main/resources/mapper/hosp/TjAdviceMapper.xml
index edf22c3..919cee0 100644
--- a/ltkj-hosp/src/main/resources/mapper/hosp/TjAdviceMapper.xml
+++ b/ltkj-hosp/src/main/resources/mapper/hosp/TjAdviceMapper.xml
@@ -51,6 +51,12 @@
<if test="proName != null and proName != ''">
and p.pro_name like concat('%',#{proName},'%')
</if>
+ <if test="bt != null and bt != ''">
+ and a.title like concat('%',#{bt},'%')
+ </if>
+ <if test="nr != null and nr != ''">
+ and a.advice like concat('%',#{nr},'%')
+ </if>
</where>
LIMIT #{page},#{pageSize}
</select>
@@ -65,6 +71,12 @@
<if test="proName != null">
and p.pro_name like concat('%',#{proName},'%')
</if>
+ <if test="bt != null and bt != ''">
+ and a.title like concat('%',#{bt},'%')
+ </if>
+ <if test="nr != null and nr != ''">
+ and a.advice like concat('%',#{nr},'%')
+ </if>
</where>
</select>
--
Gitblit v1.8.0