From d251236f861452678eab9de0657ec46ba53930e6 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期二, 19 三月 2024 14:08:58 +0800
Subject: [PATCH] zjh 2024/03/19--1
---
ltkj-admin/src/test/java/zjhTest.java | 3 +++
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjProjectMapper.java | 3 +++
ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjProjectService.java | 2 ++
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProjectController.java | 6 ++++--
ltkj-admin/src/main/resources/application.yml | 8 ++++----
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjProjectServiceImpl.java | 5 +++++
6 files changed, 21 insertions(+), 6 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProjectController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProjectController.java
index a1ca1bb..cbcdb7a 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProjectController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProjectController.java
@@ -85,9 +85,11 @@
public AjaxResult getDxList() {
// LambdaQueryWrapper<TjProject> wq0 = new LambdaQueryWrapper<>();
// wq0.eq(TjProject::getProParentId, 0);
-
List<TjProject> tjProjects = tjProjectService.getDxTjProjectList();
-
+ String config = configService.selectConfigByKey("tj_dxsxtj");
+ if(null !=config && config.equals("N")){
+ tjProjects = tjProjectService.getOpenDxTjProjectList();
+ }
//涓婇潰鐨勬崲sql
// final List<TjProject> tjProjects = tjProjectService.getProBySqlAndName(proName, checkType, deptId);
diff --git a/ltkj-admin/src/main/resources/application.yml b/ltkj-admin/src/main/resources/application.yml
index de9ae8f..c8bd9de 100644
--- a/ltkj-admin/src/main/resources/application.yml
+++ b/ltkj-admin/src/main/resources/application.yml
@@ -210,13 +210,13 @@
#key-path: E:\mycode\apppwd\1643225121_20230427_cert\apiclient_cert.p12 #鏈湴璇佷功璺緞锛屽湪寰俊鍟嗘埛鍚庡彴涓嬭浇
key-path: D:\WXCertUtil\tjcert\apiclient_cert.p12 #鏈嶅姟鍣ㄨ瘉涔﹁矾寰勶紝鍦ㄥ井淇″晢鎴峰悗鍙颁笅杞�
# pay-score-notify-url: http://192.168.0.101:5011/cus/order/pay-notify #寰俊鏀粯鍥炶皟鍦板潃
- pay-score-notify-url: https://ltpeis.xaltjdkj.cn:5011/ltkj-admin/cus/order/pay-notify #寰俊鏀粯鍥炶皟鍦板潃
-# pay-score-notify-url: https://ltpeis.xaltjdkj.cn:5021/ltkj-admin/cus/order/pay-notify #寰俊鏀粯鍥炶皟鍦板潃
+# pay-score-notify-url: https://ltpeis.xaltjdkj.cn:5011/ltkj-admin/cus/order/pay-notify #寰俊鏀粯鍥炶皟鍦板潃
+ pay-score-notify-url: https://ltpeis.xaltjdkj.cn:5021/ltkj-admin/cus/order/pay-notify #寰俊鏀粯鍥炶皟鍦板潃
#绉湪鎶ヨ〃璁块棶鍦板潃
jimu:
- path: https://ltpeis.xaltjdkj.cn:5011/ltkj-admin
-# path: https://ltpeis.xaltjdkj.cn:5021/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://10.168.0.9:5011
# path: http://192.168.0.105:5011
diff --git a/ltkj-admin/src/test/java/zjhTest.java b/ltkj-admin/src/test/java/zjhTest.java
index f9ba367..3d86cef 100644
--- a/ltkj-admin/src/test/java/zjhTest.java
+++ b/ltkj-admin/src/test/java/zjhTest.java
@@ -89,6 +89,9 @@
// System.out.println(betweenDay);
// System.out.println(DateUtil.between(new Date(),date1, DateUnit.MS));
// System.out.println(DateUtil.between(new Date(),date1, DateUnit.SECOND));
+
+ System.out.println(DateUtil.date().toDateStr());
+ System.out.println(DateUtil.date().toString());
}
//
// public static String getAdd(String log, String lat ){
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjProjectMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjProjectMapper.java
index e6fd5cd..78ea79f 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjProjectMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjProjectMapper.java
@@ -142,6 +142,9 @@
@Select("SELECT * FROM `tj_project` where pro_parent_id=0 and pro_status=0 and LOCATE( '浣撴',pro_name) ")
List<TjProject> getDxTjProjectList();
+ @Select("SELECT * FROM `tj_project` where pro_parent_id=0 and pro_status=0 and pro_price>0")
+ List<TjProject> getOpenDxTjProjectList();
+
@Select("SELECT a.*,GROUP_CONCAT(b.pro_name ORDER BY b.pro_name) AS all_son_pro_name FROM\n" +
"tj_project a LEFT JOIN tj_project b ON b.pro_parent_id=a.pro_id WHERE\n" +
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjProjectService.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjProjectService.java
index 651fb75..87cdc44 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjProjectService.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjProjectService.java
@@ -110,6 +110,8 @@
List<TjProject> getTjProjectList();
List<TjProject> getDxTjProjectList();
+ List<TjProject> getOpenDxTjProjectList();
+
List<TjProject> getPacTjProjectList();
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjProjectServiceImpl.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjProjectServiceImpl.java
index 3f26e7a..6741e32 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjProjectServiceImpl.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjProjectServiceImpl.java
@@ -212,6 +212,11 @@
}
@Override
+ public List<TjProject> getOpenDxTjProjectList() {
+ return tjProjectMapper.getOpenDxTjProjectList();
+ }
+
+ @Override
public List<TjProject> getPacTjProjectList() {
return tjProjectMapper.getPacTjProjectList();
}
--
Gitblit v1.8.0