From 0892d843cd394f383ff50f480f7f22f2ec3829bc Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期五, 27 六月 2025 20:24:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ltkj-admin/src/main/java/com/ltkj/web/config/timer/DefaultScheduled.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/config/timer/DefaultScheduled.java b/ltkj-admin/src/main/java/com/ltkj/web/config/timer/DefaultScheduled.java
index b3130af..f3fdf6d 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/config/timer/DefaultScheduled.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/config/timer/DefaultScheduled.java
@@ -38,7 +38,7 @@
*/
@Slf4j
@Component
-@Profile("!dev & !prod & !test")
+@Profile("!dev & !prod & !test & !win-xamjyytest & !win-chkwyytest")
public class DefaultScheduled {
@@ -95,7 +95,7 @@
private void exec() {
String dsqkssj = configService.selectConfigByKey("dsqkssj");
String dsqjssj = configService.selectConfigByKey("dsqjssj");
- String yqbm = configService.selectConfigByKey("common_api_service_hospbm");
+// String yqbm = configService.selectConfigByKey("common_api_service_hospbm");
String dqyyyqbm = configService.selectConfigByKey("dqyyyqbm");
boolean panduandangqianshijian = panduandangqianshijian(dsqkssj, dsqjssj);
log.info("瀹氭椂鍣ㄨ嚜鍔ㄥ悓姝ユ楠屾鏌ョ粨鏋�");
@@ -155,7 +155,7 @@
&& !jg.contains("鏈鏄庢樉")&& !jg.contains("姝ｅ父")&& !jg.contains("鍙屼晶妞庨棿瀛旀棤鐙獎")){
TjJcycxm jcycxm=new TjJcycxm();
jcycxm.setTjh(s);
- jcycxm.setYqid(yqbm);
+ jcycxm.setYqid(dqyyyqbm);
String[] split1 = jcsqd.getJcxmid().split(";");
jcycxm.setProId(split1[0]);
jcycxm.setProName(jcsqd.getJcxmmc());
--
Gitblit v1.8.0