From 8597cde32f9d7ad35028781cedff4ce79490c81f Mon Sep 17 00:00:00 2001
From: zjh <zjh@888>
Date: 星期二, 12 十二月 2023 17:44:58 +0800
Subject: [PATCH] zjh 本地 2023/12/12 -1
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java | 20 ++++++----
ltkj-hosp/src/main/resources/mapper/TjCustomerMapper.xml | 7 +++
ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java | 1
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java | 1
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java | 10 +----
ltkj-admin/src/main/resources/application.yml | 23 ++++++-----
ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjCustomer.java | 1
7 files changed, 33 insertions(+), 30 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java
index f712ad5..108a5db 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java
@@ -1548,7 +1548,6 @@
// longList.add(Long.valueOf(str));
// }
// }
-// parent.put("parentAdvice", tjAdviceService.getAdviceStringByIds(split));
parent.put("parentAdvice", tjAdviceService.getAdviceStringByIds(split));
} else {
parent.put("parentAdvice", null);
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
index 21504c6..342ba4b 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
@@ -496,7 +496,6 @@
// }
// }
parent.put("parentAdvice", tjAdviceService.getAdviceStringByIds(split));
-// parent.put("parentAdvice", tjAdviceService.getAdviceStringByIds(split));
} else {
parent.put("parentAdvice", null);
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java
index 42cb619..f605a18 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java
@@ -78,16 +78,10 @@
//鏍规嵁閰嶇疆璋冨彇瀛樺偍杩囩▼ 灏嗕复鏃惰〃鏁版嵁瀛樺叆棰勭害琛�2023.12.12
final String getInfoFromSqlData = sysConfigService.selectConfigByKey("getInfoFromSqlData");
if ("Y".equals(getInfoFromSqlData)){
- final LtkjTjPat tjPatByIdCard = testMapper.getTjPatByIdCard(cusIdcard);
- if (tjPatByIdCard!=null){
- testMapper.getTjPatByCusId(cusIdcard);
- }else {
- return error("韬唤璇佸彿涓嶅瓨鍦�");
- }
+// LtkjTjPat tjPatByIdCard = testMapper.getTjPatByIdCard(cusIdcard);
+ testMapper.getTjPatByCusId(cusIdcard);
}
//end2023.12.12
-
-
LambdaQueryWrapper<TjReservation> wq = new LambdaQueryWrapper<>();
wq.eq(TjReservation::getIdCard, cusIdcard);
wq.eq(TjReservation::getIsExpire, 2);
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java
index a65cfb6..fc62ae9 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java
@@ -581,24 +581,28 @@
rtwq1.eq(TjReport::getType, "鍖诲鍚嶈瘝");
// rtwq1.eq(TjReport::getTjNumber, tjNumber);
TjReport one11111 = tjReportService.getOne(rtwq1);
- String report1 = one11111.getReport();
- PDFBinaryUtil.base64StringToPDF(report1, FileUtil.mkdir(value).getPath() + "\\" + userId + "鍖诲鍚嶈瘝.pdf");
+ if(null !=one11111){
+ String report1 = one11111.getReport();
+ PDFBinaryUtil.base64StringToPDF(report1, FileUtil.mkdir(value).getPath() + "\\" + userId + "鍖诲鍚嶈瘝.pdf");
+ }
LambdaQueryWrapper<TjReport> rtwq = new LambdaQueryWrapper<>();
rtwq.eq(TjReport::getType, "蹇冪數鍥�");
// rtwq.eq(TjReport::getTjNumber, tjNumber);
TjReport one1111 = tjReportService.getOne(rtwq);
- String report = one1111.getReport();
- PDFBinaryUtil.base64StringToPDF(report, FileUtil.mkdir(value).getPath() + "\\" + userId + "蹇冪數鍥�.pdf");
+ if(null !=one1111){
+ String report = one1111.getReport();
+ PDFBinaryUtil.base64StringToPDF(report, FileUtil.mkdir(value).getPath() + "\\" + userId + "蹇冪數鍥�.pdf");
+ }
LambdaQueryWrapper<TjReport> rtwq12 = new LambdaQueryWrapper<>();
rtwq12.eq(TjReport::getType, "闄勪欢");
// rtwq12.eq(TjReport::getTjNumber, tjNumber);
TjReport one111112 = tjReportService.getOne(rtwq12);
- String report12 = one111112.getReport();
- PDFBinaryUtil.base64StringToPDF(report12, FileUtil.mkdir(value).getPath() + "\\" + userId + "闄勪欢.pdf");
-
-
+ if(null !=one111112){
+ String report12 = one111112.getReport();
+ PDFBinaryUtil.base64StringToPDF(report12, FileUtil.mkdir(value).getPath() + "\\" + userId + "闄勪欢.pdf");
+ }
//鍚堝苟
String[] files1 = {value + "\\" + userId + "浣撴鎶ュ憡灏侀潰椤�.pdf", value + "\\" + userId + "浣撴鎶ュ憡椤圭洰璇︽儏椤�.pdf", value + "\\" + userId + "鍖诲鍚嶈瘝.pdf", value + "\\" + userId + "闄勪欢.pdf", value + "\\" + userId + "蹇冪數鍥�.pdf"};
String outputPath1 = value + "\\";
diff --git a/ltkj-admin/src/main/resources/application.yml b/ltkj-admin/src/main/resources/application.yml
index 863dbee..7010ef4 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.5:5502/uploadPath
+# profile: https://ltpeis.xaltjdkj.cn:5502/uploadPath
+ profile: http://192.168.0.5:5502/uploadPath
# 鑾峰彇ip鍦板潃寮�鍏�
addressEnabled: true
@@ -73,15 +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: 123456
+# password: 654321
+ password: 123456
# 杩炴帴瓒呮椂鏃堕棿
timeout: 120s
lettuce:
@@ -180,8 +180,8 @@
# 浣撴濂楅鍜岃疆鎾浘瀛樺偍璺緞
photoPath: D:\AppPhoto\uploadPath\
# nginx鍥剧墖鏈嶅姟鍣�
-photoServer: https://ltpeis.xaltjdkj.cn:5502/uploadPath/
-#photoServer: http://192.168.0.5:5502/uploadPath/
+#photoServer: https://ltpeis.xaltjdkj.cn:5502/uploadPath/
+photoServer: http://192.168.0.5:5502/uploadPath/
# 寰俊灏忕▼搴廰ppid secret
xcx:
@@ -210,11 +210,12 @@
#绉湪鎶ヨ〃璁块棶鍦板潃
jimu:
- path: https://ltpeis.xaltjdkj.cn:5011/ltkj-admin
+# path: https://ltpeis.xaltjdkj.cn:5011/ltkj-admin
# path: https://ltpeis.xaltjdkj.cn:5021/ltkj-admin
-# path: http://192.168.0.5:5000/ltkj-admin
+ path: http://192.168.0.5:5000/ltkj-admin
+# path: http://10.168.0.9:5011
# path: http://192.168.0.99:8081/ltkj-admin
-# path: http://192.168.0.101:5011
+
jeecg :
jmreport:
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjCustomer.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjCustomer.java
index a81d401..708a0f4 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjCustomer.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjCustomer.java
@@ -335,6 +335,7 @@
.append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime())
.append("deleted", getDeleted())
+ .append("dwPhone", getDwPhone())
.toString();
}
}
diff --git a/ltkj-hosp/src/main/resources/mapper/TjCustomerMapper.xml b/ltkj-hosp/src/main/resources/mapper/TjCustomerMapper.xml
index 7cd5ac3..2e78844 100644
--- a/ltkj-hosp/src/main/resources/mapper/TjCustomerMapper.xml
+++ b/ltkj-hosp/src/main/resources/mapper/TjCustomerMapper.xml
@@ -31,6 +31,7 @@
<result property="idType" column="id_type"/>
<result property="ageUnit" column="age_unit"/>
<result property="career" column="career"/>
+ <result property="dwPhone" column="dw_phone"/>
</resultMap>
<sql id="selectTjCustomerVo">
@@ -59,7 +60,8 @@
age,
id_type,
age_unit,
- career
+ career,
+ dw_phone
from tj_customer
</sql>
@@ -117,6 +119,7 @@
<if test="idType != null">id_type,</if>
<if test="ageUnit != null">age_unit,</if>
<if test="career != null">career,</if>
+ <if test="dwPhone != null">dw_phone,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="cusName != null and cusName != ''">#{cusName},</if>
@@ -144,6 +147,7 @@
<if test="idType != null">#{idType},</if>
<if test="ageUnit != null">#{ageUnit},</if>
<if test="career != null">#{career},</if>
+ <if test="dw_phone != null">#{dwPhone},</if>
</trim>
</insert>
@@ -175,6 +179,7 @@
<if test="idType != null">id_type = #{idType},</if>
<if test="ageUnit != null">age_unit = #{ageUnit},</if>
<if test="career != null">career = #{career},</if>
+ <if test="dwPhone != null">dw_phone = #{dwPhone},</if>
</trim>
where cus_id = #{cusId}
</update>
--
Gitblit v1.8.0