From d431fae57e142fc6891c8f2eb0737e28e4554d9b Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期四, 31 十月 2024 09:52:55 +0800
Subject: [PATCH] 代码初始化
---
server/meeting/meeting_admin/src/main/resources/bootstrap-pro.yml | 4 ++--
server/system_timer/src/main/resources/bootstrap-pro.yml | 4 ++--
server/visits/dmvisit_admin/src/main/resources/bootstrap-pro.yml | 4 ++--
server/visits/admin_timer/src/main/resources/bootstrap-pro.yml | 4 ++--
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformGroupServiceImpl.java | 1 +
server/system_gateway/src/main/resources/bootstrap-pro.yml | 4 ++--
6 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/server/meeting/meeting_admin/src/main/resources/bootstrap-pro.yml b/server/meeting/meeting_admin/src/main/resources/bootstrap-pro.yml
index fe9ee9f..b0f16fd 100644
--- a/server/meeting/meeting_admin/src/main/resources/bootstrap-pro.yml
+++ b/server/meeting/meeting_admin/src/main/resources/bootstrap-pro.yml
@@ -12,7 +12,7 @@
nacos:
server-addr: http://localhost:8848 #閰嶇疆Nacos鍦板潃
username: nacos
- password: nacos
+ password: Atwl@2024
# config:
# server-addr: http://175.27.187.84:8848 #閰嶇疆Nacos鍦板潃
# namespace: dmvisit
@@ -25,4 +25,4 @@
server-addr: http://localhost:8848 #閰嶇疆Nacos鍦板潃
namespace: dmvisit
username: nacos
- password: nacos
\ No newline at end of file
+ password: Atwl@2024
\ No newline at end of file
diff --git a/server/system_gateway/src/main/resources/bootstrap-pro.yml b/server/system_gateway/src/main/resources/bootstrap-pro.yml
index 3768d91..34383f4 100644
--- a/server/system_gateway/src/main/resources/bootstrap-pro.yml
+++ b/server/system_gateway/src/main/resources/bootstrap-pro.yml
@@ -3,13 +3,13 @@
nacos:
server-addr: http://localhost:8848 #閰嶇疆Nacos鍦板潃
username: nacos
- password: nacos
+ password: Atwl@2024
discovery:
server-addr: http://localhost:8848 #閰嶇疆Nacos鍦板潃
namespace: dmvisit
# namespace: dev_renkang
username: nacos
- password: nacos
+ password: Atwl@2024
gateway:
discovery:
locator:
diff --git a/server/system_timer/src/main/resources/bootstrap-pro.yml b/server/system_timer/src/main/resources/bootstrap-pro.yml
index fe9ee9f..b0f16fd 100644
--- a/server/system_timer/src/main/resources/bootstrap-pro.yml
+++ b/server/system_timer/src/main/resources/bootstrap-pro.yml
@@ -12,7 +12,7 @@
nacos:
server-addr: http://localhost:8848 #閰嶇疆Nacos鍦板潃
username: nacos
- password: nacos
+ password: Atwl@2024
# config:
# server-addr: http://175.27.187.84:8848 #閰嶇疆Nacos鍦板潃
# namespace: dmvisit
@@ -25,4 +25,4 @@
server-addr: http://localhost:8848 #閰嶇疆Nacos鍦板潃
namespace: dmvisit
username: nacos
- password: nacos
\ No newline at end of file
+ password: Atwl@2024
\ No newline at end of file
diff --git a/server/visits/admin_timer/src/main/resources/bootstrap-pro.yml b/server/visits/admin_timer/src/main/resources/bootstrap-pro.yml
index fe9ee9f..b0f16fd 100644
--- a/server/visits/admin_timer/src/main/resources/bootstrap-pro.yml
+++ b/server/visits/admin_timer/src/main/resources/bootstrap-pro.yml
@@ -12,7 +12,7 @@
nacos:
server-addr: http://localhost:8848 #閰嶇疆Nacos鍦板潃
username: nacos
- password: nacos
+ password: Atwl@2024
# config:
# server-addr: http://175.27.187.84:8848 #閰嶇疆Nacos鍦板潃
# namespace: dmvisit
@@ -25,4 +25,4 @@
server-addr: http://localhost:8848 #閰嶇疆Nacos鍦板潃
namespace: dmvisit
username: nacos
- password: nacos
\ No newline at end of file
+ password: Atwl@2024
\ No newline at end of file
diff --git a/server/visits/dmvisit_admin/src/main/resources/bootstrap-pro.yml b/server/visits/dmvisit_admin/src/main/resources/bootstrap-pro.yml
index 7a8e489..64d4ec8 100644
--- a/server/visits/dmvisit_admin/src/main/resources/bootstrap-pro.yml
+++ b/server/visits/dmvisit_admin/src/main/resources/bootstrap-pro.yml
@@ -12,7 +12,7 @@
nacos:
server-addr: http://localhost:8848 #閰嶇疆Nacos鍦板潃
username: nacos
- password: nacos
+ password: Atwl@2024
# config:
# server-addr: http://175.27.187.84:8848 #閰嶇疆Nacos鍦板潃
# namespace: dmvisit
@@ -25,4 +25,4 @@
server-addr: http://localhost:8848 #閰嶇疆Nacos鍦板潃
namespace: dmvisit
username: nacos
- password: nacos
\ No newline at end of file
+ password: Atwl@2024
\ No newline at end of file
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformGroupServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformGroupServiceImpl.java
index e817a2a..dc00e6e 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformGroupServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformGroupServiceImpl.java
@@ -254,6 +254,7 @@
.selectAll(PlatformJob.class)
.select(" ( select pl.CREATE_DATE from platform_log pl where t.id = pl.obj_id and pl.OBJ_TYPE = 5 order by pl.CREATE_DATE desc limit 1 ) as newStartDate ")
.select(" ( select pl.CREATE_DATE from platform_log pl where t.id = pl.obj_id and pl.OBJ_TYPE = 4 order by pl.CREATE_DATE desc limit 1 ) as newCallDate ")
+ .select(" case when t.total_num is null then ( select sum(pwd.IO_QTY) from platform_wms_detail pwd where pwd.JOB_ID = t.id ) else t.total_num end workNum ")
.selectAs(PlatformWmsJob::getCarrierName,PlatformJob::getCarrierName)
.selectAs(PlatformBooks::getId,PlatformJob::getBookId)
.leftJoin(Platform.class,Platform::getId,PlatformJob::getPlatformId)
--
Gitblit v1.9.3