From c7e8b28a453bf85fb78c1f09a6d613ecef9ea240 Mon Sep 17 00:00:00 2001
From: lige <bestlige@outlook.com>
Date: 星期一, 11 十二月 2023 08:27:12 +0800
Subject: [PATCH] 23
---
ltkj-hosp/src/main/resources/mapper/hosp/TjOrderMapper.xml | 8 ++++----
ltkj-admin/src/main/java/com/ltkj/web/controller/system/DictSfxmController.java | 4 ++--
ltkj-hosp/src/main/resources/mapper/hosp/DictSfxmMapper.xml | 5 ++---
ltkj-admin/src/main/resources/application.yml | 19 ++++++++++---------
ltkj-hosp/src/main/resources/mapper/hosp/TjReservationMapper.xml | 4 ++--
5 files changed, 20 insertions(+), 20 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 745eab7..7a9403b 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
@@ -51,9 +51,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)) {
diff --git a/ltkj-admin/src/main/resources/application.yml b/ltkj-admin/src/main/resources/application.yml
index b7f3608..fc0bc3d 100644
--- a/ltkj-admin/src/main/resources/application.yml
+++ b/ltkj-admin/src/main/resources/application.yml
@@ -11,8 +11,8 @@
# 鏂囦欢璺緞 绀轰緥锛� Windows閰嶇疆D:/ltkj/uploadPath锛孡inux閰嶇疆 /home/ltkj/uploadPath锛�
# 鐢ㄦ埛鎹㈠ご鍍忓悗鐨勫浘鐗囧瓨鍌ㄥ湴鍧� 娴嬭瘯锛欴:\ltkj\uploadPath\avatar\2022\12\14
#profile: D:/ltkj/uploadPath
- profile: https://ltpeis.xaltjdkj.cn:5502/uploadPath
-# profile: http://192.168.0.99:5502/uploadPath
+# profile: https://ltpeis.xaltjdkj.cn:5502/uploadPath
+ profile: http://192.168.0.5:5502/uploadPath
# 鑾峰彇ip鍦板潃寮�鍏�
addressEnabled: true
@@ -73,14 +73,15 @@
# redis 閰嶇疆
redis:
# 鍦板潃
- host: 101.42.27.146
-# host: localhost
+# host: 101.42.27.146
+ host: localhost
# 绔彛锛岄粯璁や负6379
port: 6379
# 鏁版嵁搴撶储寮�
database: 0
# 瀵嗙爜
- password: 654321
+# password: 654321
+ password: 123456
# 杩炴帴瓒呮椂鏃堕棿
timeout: 120s
lettuce:
@@ -179,8 +180,8 @@
# 浣撴濂楅鍜岃疆鎾浘瀛樺偍璺緞
photoPath: D:\AppPhoto\uploadPath\
# nginx鍥剧墖鏈嶅姟鍣�
-photoServer: https://ltpeis.xaltjdkj.cn:5502/uploadPath/
-#photoServer: http://192.168.0.99:5502/uploadPath/
+#photoServer: https://ltpeis.xaltjdkj.cn:5502/uploadPath/
+photoServer: http://192.168.0.5:5502/uploadPath/
# 寰俊灏忕▼搴廰ppid secret
xcx:
@@ -210,8 +211,8 @@
#绉湪鎶ヨ〃璁块棶鍦板潃
jimu:
# path: https://ltpeis.xaltjdkj.cn:5011/ltkj-admin
- path: https://ltpeis.xaltjdkj.cn:5021/ltkj-admin
-# path: http://192.168.0.99:8080/ltkj-admin
+# path: https://ltpeis.xaltjdkj.cn:5021/ltkj-admin
+ path: http://192.168.0.5:5000/ltkj-admin
# path: http://192.168.0.99:8081/ltkj-admin
# path: http://192.168.0.101:5011
diff --git a/ltkj-hosp/src/main/resources/mapper/hosp/DictSfxmMapper.xml b/ltkj-hosp/src/main/resources/mapper/hosp/DictSfxmMapper.xml
index 7754f2e..3be2152 100644
--- a/ltkj-hosp/src/main/resources/mapper/hosp/DictSfxmMapper.xml
+++ b/ltkj-hosp/src/main/resources/mapper/hosp/DictSfxmMapper.xml
@@ -62,14 +62,13 @@
and xmbm = #{xmbm}
</if>
<if test="xmmc != null and xmmc != ''">
--- and xmmc like "%"#{xmmc}"%"
and xmmc like CONCAT("%",#{xmmc},"%")
</if>
<if test="pym != null and pym != ''">
- and pym like "%"#{pym}"%"
+ and pym like CONCAT("%",#{pym},"%")
</if>
<if test="wbm != null and wbm != ''">
- and wbm like "%"#{wbm}"%"
+ and wbm like CONCAT("%",#{wbm},"%")
</if>
<if test="zjm != null and zjm != ''">
and zjm = #{zjm}
diff --git a/ltkj-hosp/src/main/resources/mapper/hosp/TjOrderMapper.xml b/ltkj-hosp/src/main/resources/mapper/hosp/TjOrderMapper.xml
index b199c18..4254b29 100644
--- a/ltkj-hosp/src/main/resources/mapper/hosp/TjOrderMapper.xml
+++ b/ltkj-hosp/src/main/resources/mapper/hosp/TjOrderMapper.xml
@@ -85,7 +85,7 @@
<select id="getTjOrderList" parameterType="java.util.Map" resultMap="TjOrderResult">
<include refid="selectTjOrderVo"/>
<where>
- <if test="tjNum != null">and tj_number LIKE '%${tjNum}'</if>
+ <if test="tjNum != null">and tj_number LIKE concat('%', #{tjNum}, '%')</if>
<if test="checkStatus != null and checkStatus==0 ">and status =288</if>
<if test="checkStatus != null and checkStatus==1 ">and status =401 or status= 402 </if>
<if test="compId != null ">and comp_id = #{compId}</if>
@@ -99,7 +99,7 @@
<select id="getWCsTjOrderList" parameterType="java.util.Map" resultMap="TjOrderResult">
<include refid="selectTjOrderVo"/>
<where>
- <if test="tjNum != null">and tj_number LIKE '%${tjNum}'</if>
+ <if test="tjNum != null">and tj_number LIKE concat('%', #{tjNum}, '%')</if>
<if test="compId != null ">and comp_id = #{compId}</if>
<if test="beginTime != null and endTime != null ">and create_time BETWEEN #{beginTime} and #{endTime}</if>
and deleted =0
@@ -112,7 +112,7 @@
<select id="getYCsTjOrderList" parameterType="java.util.Map" resultMap="TjOrderResult">
<include refid="selectTjOrderVo"/>
<where>
- <if test="tjNum != null">and tj_number LIKE '%${tjNum}'</if>
+ <if test="tjNum != null">and tj_number LIKE concat('%', #{tjNum}, '%')</if>
<if test="compId != null ">and comp_id = #{compId}</if>
<if test="beginTime != null and endTime != null ">and create_time BETWEEN #{beginTime} and #{endTime}</if>
and deleted =0
@@ -125,7 +125,7 @@
<select id="getCsTjOrderList1" parameterType="java.util.Map" resultMap="TjOrderResult">
<include refid="selectTjOrderVo"/>
<where>
- <if test="tjNum != null">and tj_number LIKE '%${tjNum}'</if>
+ <if test="tjNum != null">and tj_number LIKE concat('%', #{tjNum}, '%')</if>
<if test="checkStatus != null and checkStatus==0 ">and status =301</if>
<if test="checkStatus != null and checkStatus== 1 ">and status =401 or status= 402 </if>
<if test="compId != null ">and comp_id = #{compId}</if>
diff --git a/ltkj-hosp/src/main/resources/mapper/hosp/TjReservationMapper.xml b/ltkj-hosp/src/main/resources/mapper/hosp/TjReservationMapper.xml
index cef40c0..ad35a8f 100644
--- a/ltkj-hosp/src/main/resources/mapper/hosp/TjReservationMapper.xml
+++ b/ltkj-hosp/src/main/resources/mapper/hosp/TjReservationMapper.xml
@@ -83,7 +83,7 @@
<if test="name != null and name != ''">and name =#{name}</if>
<if test="idCard != null and idCard != ''">and id_card = #{idCard}</if>
<if test="phoe != null and phoe != ''">and phoe = #{phoe}</if>
- <if test="company != null and company != ''">and company like "%"#{company}"%"</if>
+ <if test="company != null and company != ''">and company like concat('%', #{company}, '%')</if>
<if test="reservationTime != null ">and reservation_time BETWEEN #{reservationTime} and now()</if>
<if test="isExpire != null ">and is_expire = #{isExpire}</if>
and deleted = '0'
@@ -96,7 +96,7 @@
<where>
<if test="name != null and name != ''">and name = #{name}</if>
<if test="phoe != null and phoe != ''">and phoe = #{phoe}</if>
- <if test="company != null and company != ''">and company like "%"#{company}"%"</if>
+ <if test="company != null and company != ''">and company like concat('%', #{company}, '%')</if>
<if test="reservationTime != null ">and reservation_time = #{reservationTime}</if>
and deleted = '1'
</where>
--
Gitblit v1.8.0