From 17fe60cacd5c6f944cb0a5f3da3ae0a90832e3b4 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 28 六月 2024 17:05:14 +0800
Subject: [PATCH] 代码初始化
---
server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java | 12 +++-
server/meeting/meeting_service/src/main/java/com/doumee/dao/business/BookingsMapper.java | 6 +-
server/db/business.platform_show_param.permissions.sql | 6 ++
server/db/business.platform_queue.permissions.sql | 6 ++
server/db/business.platform_job.permissions.sql | 6 ++
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarUseBookServiceImpl.java | 33 ++++++-----
server/db/business.platform_books.permissions.sql | 6 ++
server/db/business.platform_broadcast_log.permissions.sql | 6 ++
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java | 24 ++++----
server/db/business.platform.permissions.sql | 6 ++
server/db/business.platform_log.permissions.sql | 6 ++
server/db/business.platform_device.permissions.sql | 6 ++
server/db/business.platform_interface_log.permissions.sql | 6 ++
server/db/business.platform_group.permissions.sql | 6 ++
server/db/business.platform_wms_detail.permissions.sql | 6 ++
server/db/business.platform_wms_job.permissions.sql | 6 ++
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java | 6 +
17 files changed, 119 insertions(+), 34 deletions(-)
diff --git a/server/db/business.platform.permissions.sql b/server/db/business.platform.permissions.sql
new file mode 100644
index 0000000..f01cac6
--- /dev/null
+++ b/server/db/business.platform.permissions.sql
@@ -0,0 +1,6 @@
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `MODULE`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:platform:create', '鏂板缓鏈堝彴淇℃伅琛�', '鏈堝彴淇℃伅琛�', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `MODULE`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:platform:delete', '鍒犻櫎鏈堝彴淇℃伅琛�', '鏈堝彴淇℃伅琛�', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `MODULE`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:platform:update', '淇敼鏈堝彴淇℃伅琛�', '鏈堝彴淇℃伅琛�', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `MODULE`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:platform:query', '鏌ヨ鏈堝彴淇℃伅琛�', '鏈堝彴淇℃伅琛�', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `MODULE`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:platform:exportExcel', '瀵煎嚭鏈堝彴淇℃伅琛�(Excel)', '鏈堝彴淇℃伅琛�', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+
diff --git a/server/db/business.platform_books.permissions.sql b/server/db/business.platform_books.permissions.sql
new file mode 100644
index 0000000..a18bd53
--- /dev/null
+++ b/server/db/business.platform_books.permissions.sql
@@ -0,0 +1,6 @@
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `MODULE`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:platformbooks:create', '鏂板缓鏈堝彴鍏ュ洯棰勭害淇℃伅琛�', '鏈堝彴鍏ュ洯棰勭害淇℃伅琛�', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `MODULE`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:platformbooks:delete', '鍒犻櫎鏈堝彴鍏ュ洯棰勭害淇℃伅琛�', '鏈堝彴鍏ュ洯棰勭害淇℃伅琛�', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `MODULE`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:platformbooks:update', '淇敼鏈堝彴鍏ュ洯棰勭害淇℃伅琛�', '鏈堝彴鍏ュ洯棰勭害淇℃伅琛�', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `MODULE`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:platformbooks:query', '鏌ヨ鏈堝彴鍏ュ洯棰勭害淇℃伅琛�', '鏈堝彴鍏ュ洯棰勭害淇℃伅琛�', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `MODULE`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:platformbooks:exportExcel', '瀵煎嚭鏈堝彴鍏ュ洯棰勭害淇℃伅琛�(Excel)', '鏈堝彴鍏ュ洯棰勭害淇℃伅琛�', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+
diff --git a/server/db/business.platform_broadcast_log.permissions.sql b/server/db/business.platform_broadcast_log.permissions.sql
new file mode 100644
index 0000000..77cf723
--- /dev/null
+++ b/server/db/business.platform_broadcast_log.permissions.sql
@@ -0,0 +1,6 @@
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `MODULE`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:platformbroadcastlog:create', '鏂板缓鏈堝彴_LED鍜屽箍鎾彁閱掍笅鍙戣褰�', '鏈堝彴_LED鍜屽箍鎾彁閱掍笅鍙戣褰�', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `MODULE`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:platformbroadcastlog:delete', '鍒犻櫎鏈堝彴_LED鍜屽箍鎾彁閱掍笅鍙戣褰�', '鏈堝彴_LED鍜屽箍鎾彁閱掍笅鍙戣褰�', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `MODULE`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:platformbroadcastlog:update', '淇敼鏈堝彴_LED鍜屽箍鎾彁閱掍笅鍙戣褰�', '鏈堝彴_LED鍜屽箍鎾彁閱掍笅鍙戣褰�', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `MODULE`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:platformbroadcastlog:query', '鏌ヨ鏈堝彴_LED鍜屽箍鎾彁閱掍笅鍙戣褰�', '鏈堝彴_LED鍜屽箍鎾彁閱掍笅鍙戣褰�', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `MODULE`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:platformbroadcastlog:exportExcel', '瀵煎嚭鏈堝彴_LED鍜屽箍鎾彁閱掍笅鍙戣褰�(Excel)', '鏈堝彴_LED鍜屽箍鎾彁閱掍笅鍙戣褰�', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+
diff --git a/server/db/business.platform_device.permissions.sql b/server/db/business.platform_device.permissions.sql
new file mode 100644
index 0000000..f02d771
--- /dev/null
+++ b/server/db/business.platform_device.permissions.sql
@@ -0,0 +1,6 @@
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `MODULE`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:platformdevice:create', '鏂板缓鏈堝彴_鍏宠仈鐩戞帶鐐筁ED鍜屽箍鎾俊鎭〃', '鏈堝彴_鍏宠仈鐩戞帶鐐筁ED鍜屽箍鎾俊鎭〃', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `MODULE`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:platformdevice:delete', '鍒犻櫎鏈堝彴_鍏宠仈鐩戞帶鐐筁ED鍜屽箍鎾俊鎭〃', '鏈堝彴_鍏宠仈鐩戞帶鐐筁ED鍜屽箍鎾俊鎭〃', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `MODULE`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:platformdevice:update', '淇敼鏈堝彴_鍏宠仈鐩戞帶鐐筁ED鍜屽箍鎾俊鎭〃', '鏈堝彴_鍏宠仈鐩戞帶鐐筁ED鍜屽箍鎾俊鎭〃', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `MODULE`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:platformdevice:query', '鏌ヨ鏈堝彴_鍏宠仈鐩戞帶鐐筁ED鍜屽箍鎾俊鎭〃', '鏈堝彴_鍏宠仈鐩戞帶鐐筁ED鍜屽箍鎾俊鎭〃', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `MODULE`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:platformdevice:exportExcel', '瀵煎嚭鏈堝彴_鍏宠仈鐩戞帶鐐筁ED鍜屽箍鎾俊鎭〃(Excel)', '鏈堝彴_鍏宠仈鐩戞帶鐐筁ED鍜屽箍鎾俊鎭〃', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+
diff --git a/server/db/business.platform_group.permissions.sql b/server/db/business.platform_group.permissions.sql
new file mode 100644
index 0000000..74ea480
--- /dev/null
+++ b/server/db/business.platform_group.permissions.sql
@@ -0,0 +1,6 @@
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `MODULE`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:platformgroup:create', '鏂板缓鏈堝彴_鍒嗙粍淇℃伅琛�', '鏈堝彴_鍒嗙粍淇℃伅琛�', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `MODULE`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:platformgroup:delete', '鍒犻櫎鏈堝彴_鍒嗙粍淇℃伅琛�', '鏈堝彴_鍒嗙粍淇℃伅琛�', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `MODULE`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:platformgroup:update', '淇敼鏈堝彴_鍒嗙粍淇℃伅琛�', '鏈堝彴_鍒嗙粍淇℃伅琛�', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `MODULE`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:platformgroup:query', '鏌ヨ鏈堝彴_鍒嗙粍淇℃伅琛�', '鏈堝彴_鍒嗙粍淇℃伅琛�', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `MODULE`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:platformgroup:exportExcel', '瀵煎嚭鏈堝彴_鍒嗙粍淇℃伅琛�(Excel)', '鏈堝彴_鍒嗙粍淇℃伅琛�', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+
diff --git a/server/db/business.platform_interface_log.permissions.sql b/server/db/business.platform_interface_log.permissions.sql
new file mode 100644
index 0000000..5d26bac
--- /dev/null
+++ b/server/db/business.platform_interface_log.permissions.sql
@@ -0,0 +1,6 @@
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `MODULE`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:platforminterfacelog:create', '鏂板缓浣滀笟璋冨害骞冲彴鎺ュ彛浜や簰璁板綍', '浣滀笟璋冨害骞冲彴鎺ュ彛浜や簰璁板綍', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `MODULE`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:platforminterfacelog:delete', '鍒犻櫎浣滀笟璋冨害骞冲彴鎺ュ彛浜や簰璁板綍', '浣滀笟璋冨害骞冲彴鎺ュ彛浜や簰璁板綍', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `MODULE`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:platforminterfacelog:update', '淇敼浣滀笟璋冨害骞冲彴鎺ュ彛浜や簰璁板綍', '浣滀笟璋冨害骞冲彴鎺ュ彛浜や簰璁板綍', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `MODULE`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:platforminterfacelog:query', '鏌ヨ浣滀笟璋冨害骞冲彴鎺ュ彛浜や簰璁板綍', '浣滀笟璋冨害骞冲彴鎺ュ彛浜や簰璁板綍', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `MODULE`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:platforminterfacelog:exportExcel', '瀵煎嚭浣滀笟璋冨害骞冲彴鎺ュ彛浜や簰璁板綍(Excel)', '浣滀笟璋冨害骞冲彴鎺ュ彛浜や簰璁板綍', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+
diff --git a/server/db/business.platform_job.permissions.sql b/server/db/business.platform_job.permissions.sql
new file mode 100644
index 0000000..28c4bc1
--- /dev/null
+++ b/server/db/business.platform_job.permissions.sql
@@ -0,0 +1,6 @@
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `MODULE`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:platformjob:create', '鏂板缓鏈堝彴璋冨害浣滀笟淇℃伅琛�', '鏈堝彴璋冨害浣滀笟淇℃伅琛�', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `MODULE`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:platformjob:delete', '鍒犻櫎鏈堝彴璋冨害浣滀笟淇℃伅琛�', '鏈堝彴璋冨害浣滀笟淇℃伅琛�', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `MODULE`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:platformjob:update', '淇敼鏈堝彴璋冨害浣滀笟淇℃伅琛�', '鏈堝彴璋冨害浣滀笟淇℃伅琛�', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `MODULE`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:platformjob:query', '鏌ヨ鏈堝彴璋冨害浣滀笟淇℃伅琛�', '鏈堝彴璋冨害浣滀笟淇℃伅琛�', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `MODULE`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:platformjob:exportExcel', '瀵煎嚭鏈堝彴璋冨害浣滀笟淇℃伅琛�(Excel)', '鏈堝彴璋冨害浣滀笟淇℃伅琛�', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+
diff --git a/server/db/business.platform_log.permissions.sql b/server/db/business.platform_log.permissions.sql
new file mode 100644
index 0000000..fff9343
--- /dev/null
+++ b/server/db/business.platform_log.permissions.sql
@@ -0,0 +1,6 @@
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `MODULE`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:platformlog:create', '鏂板缓鏈堝彴_浣滀笟鎿嶄綔鍘嗗彶琛�', '鏈堝彴_浣滀笟鎿嶄綔鍘嗗彶琛�', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `MODULE`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:platformlog:delete', '鍒犻櫎鏈堝彴_浣滀笟鎿嶄綔鍘嗗彶琛�', '鏈堝彴_浣滀笟鎿嶄綔鍘嗗彶琛�', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `MODULE`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:platformlog:update', '淇敼鏈堝彴_浣滀笟鎿嶄綔鍘嗗彶琛�', '鏈堝彴_浣滀笟鎿嶄綔鍘嗗彶琛�', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `MODULE`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:platformlog:query', '鏌ヨ鏈堝彴_浣滀笟鎿嶄綔鍘嗗彶琛�', '鏈堝彴_浣滀笟鎿嶄綔鍘嗗彶琛�', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `MODULE`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:platformlog:exportExcel', '瀵煎嚭鏈堝彴_浣滀笟鎿嶄綔鍘嗗彶琛�(Excel)', '鏈堝彴_浣滀笟鎿嶄綔鍘嗗彶琛�', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+
diff --git a/server/db/business.platform_queue.permissions.sql b/server/db/business.platform_queue.permissions.sql
new file mode 100644
index 0000000..4f34009
--- /dev/null
+++ b/server/db/business.platform_queue.permissions.sql
@@ -0,0 +1,6 @@
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `MODULE`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:platformqueue:create', '鏂板缓鏈堝彴_鍙彿鎺掗槦淇℃伅琛�', '鏈堝彴_鍙彿鎺掗槦淇℃伅琛�', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `MODULE`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:platformqueue:delete', '鍒犻櫎鏈堝彴_鍙彿鎺掗槦淇℃伅琛�', '鏈堝彴_鍙彿鎺掗槦淇℃伅琛�', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `MODULE`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:platformqueue:update', '淇敼鏈堝彴_鍙彿鎺掗槦淇℃伅琛�', '鏈堝彴_鍙彿鎺掗槦淇℃伅琛�', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `MODULE`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:platformqueue:query', '鏌ヨ鏈堝彴_鍙彿鎺掗槦淇℃伅琛�', '鏈堝彴_鍙彿鎺掗槦淇℃伅琛�', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `MODULE`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:platformqueue:exportExcel', '瀵煎嚭鏈堝彴_鍙彿鎺掗槦淇℃伅琛�(Excel)', '鏈堝彴_鍙彿鎺掗槦淇℃伅琛�', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+
diff --git a/server/db/business.platform_show_param.permissions.sql b/server/db/business.platform_show_param.permissions.sql
new file mode 100644
index 0000000..f782681
--- /dev/null
+++ b/server/db/business.platform_show_param.permissions.sql
@@ -0,0 +1,6 @@
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `MODULE`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:platformshowparam:create', '鏂板缓鏈堝彴_鏄剧ず閰嶇疆淇℃伅琛�', '鏈堝彴_鏄剧ず閰嶇疆淇℃伅琛�', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `MODULE`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:platformshowparam:delete', '鍒犻櫎鏈堝彴_鏄剧ず閰嶇疆淇℃伅琛�', '鏈堝彴_鏄剧ず閰嶇疆淇℃伅琛�', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `MODULE`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:platformshowparam:update', '淇敼鏈堝彴_鏄剧ず閰嶇疆淇℃伅琛�', '鏈堝彴_鏄剧ず閰嶇疆淇℃伅琛�', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `MODULE`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:platformshowparam:query', '鏌ヨ鏈堝彴_鏄剧ず閰嶇疆淇℃伅琛�', '鏈堝彴_鏄剧ず閰嶇疆淇℃伅琛�', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `MODULE`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:platformshowparam:exportExcel', '瀵煎嚭鏈堝彴_鏄剧ず閰嶇疆淇℃伅琛�(Excel)', '鏈堝彴_鏄剧ず閰嶇疆淇℃伅琛�', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+
diff --git a/server/db/business.platform_wms_detail.permissions.sql b/server/db/business.platform_wms_detail.permissions.sql
new file mode 100644
index 0000000..5e7aa24
--- /dev/null
+++ b/server/db/business.platform_wms_detail.permissions.sql
@@ -0,0 +1,6 @@
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `MODULE`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:platformwmsdetail:create', '鏂板缓鏈堝彴_WMS浣滀笟閫氱煡鍗曟槑缁�', '鏈堝彴_WMS浣滀笟閫氱煡鍗曟槑缁�', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `MODULE`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:platformwmsdetail:delete', '鍒犻櫎鏈堝彴_WMS浣滀笟閫氱煡鍗曟槑缁�', '鏈堝彴_WMS浣滀笟閫氱煡鍗曟槑缁�', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `MODULE`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:platformwmsdetail:update', '淇敼鏈堝彴_WMS浣滀笟閫氱煡鍗曟槑缁�', '鏈堝彴_WMS浣滀笟閫氱煡鍗曟槑缁�', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `MODULE`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:platformwmsdetail:query', '鏌ヨ鏈堝彴_WMS浣滀笟閫氱煡鍗曟槑缁�', '鏈堝彴_WMS浣滀笟閫氱煡鍗曟槑缁�', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `MODULE`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:platformwmsdetail:exportExcel', '瀵煎嚭鏈堝彴_WMS浣滀笟閫氱煡鍗曟槑缁�(Excel)', '鏈堝彴_WMS浣滀笟閫氱煡鍗曟槑缁�', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+
diff --git a/server/db/business.platform_wms_job.permissions.sql b/server/db/business.platform_wms_job.permissions.sql
new file mode 100644
index 0000000..0c08dc3
--- /dev/null
+++ b/server/db/business.platform_wms_job.permissions.sql
@@ -0,0 +1,6 @@
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `MODULE`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:platformwmsjob:create', '鏂板缓鏈堝彴_WMS浣滀笟閫氱煡鍗曡鏁版嵁', '鏈堝彴_WMS浣滀笟閫氱煡鍗曡鏁版嵁', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `MODULE`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:platformwmsjob:delete', '鍒犻櫎鏈堝彴_WMS浣滀笟閫氱煡鍗曡鏁版嵁', '鏈堝彴_WMS浣滀笟閫氱煡鍗曡鏁版嵁', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `MODULE`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:platformwmsjob:update', '淇敼鏈堝彴_WMS浣滀笟閫氱煡鍗曡鏁版嵁', '鏈堝彴_WMS浣滀笟閫氱煡鍗曡鏁版嵁', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `MODULE`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:platformwmsjob:query', '鏌ヨ鏈堝彴_WMS浣滀笟閫氱煡鍗曡鏁版嵁', '鏈堝彴_WMS浣滀笟閫氱煡鍗曡鏁版嵁', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `MODULE`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:platformwmsjob:exportExcel', '瀵煎嚭鏈堝彴_WMS浣滀笟閫氱煡鍗曡鏁版嵁(Excel)', '鏈堝彴_WMS浣滀笟閫氱煡鍗曡鏁版嵁', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+
diff --git a/server/meeting/meeting_service/src/main/java/com/doumee/dao/business/BookingsMapper.java b/server/meeting/meeting_service/src/main/java/com/doumee/dao/business/BookingsMapper.java
index c5f169e..e58228b 100644
--- a/server/meeting/meeting_service/src/main/java/com/doumee/dao/business/BookingsMapper.java
+++ b/server/meeting/meeting_service/src/main/java/com/doumee/dao/business/BookingsMapper.java
@@ -38,9 +38,9 @@
" CASE WHEN a.START_TIME > now() and a.`STATUS` = 0 THEN 1 WHEN a.END_TIME < now() or a.`STATUS` = 1 THEN 3 ELSE 2 END meetingStatus ," +
" a.CONTENT as meetingContent, c.MOBILE as bookingUserMobile , e.`NAME` as bookingUserDepartment , a.CREATOR as bookingUserId , a.remark " +
" from meeting_book a inner join meeting_rooms b on a.ROOM_ID = b.ID " +
- " inner join system_user c on a.CREATOR = c.id " +
- " inner join system_department_user d on c.id = d.USER_ID " +
- " INNER JOIN system_department e on d.DEPARTMENT_ID = e.ID " +
+ " left join system_user c on a.CREATOR = c.id " +
+ " left join system_department_user d on c.id = d.USER_ID " +
+ " left JOIN system_department e on d.DEPARTMENT_ID = e.ID " +
" where a.id = #{id} ")
MeetingDetailResponse meetingDetail(@Param("id") Integer id);
diff --git a/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java b/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java
index 021421e..d9f45e3 100644
--- a/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java
+++ b/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java
@@ -199,6 +199,14 @@
List<Bookings> bookList = bookingsJoinMapper.selectJoinList(Bookings.class, bookquery);
for (int i = 0; i < bookings.getBookingTimeList().size(); i++) {
BookingTime s = bookings.getBookingTimeList().get(i);
+ RoomTime roomTime = roomTimeJoinMapper.selectById(s.getTimeId());
+ if(Objects.isNull(roomTime)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"瀛樺湪鏈煡璇㈠埌鐨勯厤缃棩鏈燂紝璇峰埛鏂伴噸璇�");
+ }
+ String endRoomTime = gsDate + " " + roomTime.getEndTime()+":00";
+ if(DateUtil.StringToDate(endRoomTime, "yyyy-MM-dd HH:mm:ss").getTime()<=System.currentTimeMillis()){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),endRoomTime + "宸茶秴杩囧綋鍓嶆椂闂达紝鏃犳硶杩涜棰勭害");
+ }
if (!Objects.isNull(bookList) && bookList.size() > MeetConstants.ZERO) {
List<Bookings> detailDataDtoStream =
bookList.stream().filter(a -> MeetConstants.equalsInteger(s.getTimeId(), a.getRoomTimeId())
@@ -213,7 +221,6 @@
.filter(a -> MeetConstants.equalsInteger(a.getRoomTimeId(), s.getTimeId()))
.collect(Collectors.toList());
if (chriList.size() > 0) {
- RoomTime roomTime = roomTimeJoinMapper.selectById(s.getTimeId());
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "璇ヤ細璁細" + roomTime.getStartTime() + "-" + roomTime.getEndTime() + "鏃堕棿娈靛唴宸茶浣跨敤");
}
} else {
@@ -223,7 +230,6 @@
.filter(a -> MeetConstants.equalsInteger(a.getRoomTimeId(), s.getTimeId()))
.collect(Collectors.toList());
if (chriList.size() > 0) {
- RoomTime roomTime = roomTimeJoinMapper.selectById(s.getTimeId());
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "璇ヤ細璁細" + roomTime.getStartTime() + "-" + roomTime.getEndTime() + "鏃堕棿娈靛唴宸茶浣跨敤");
}
}
@@ -1131,7 +1137,7 @@
public IPage<UserResponse> getUserPage(PageWrap<UserPageRequest> pageWrap) {
IPage<UserResponse> page = systemUserMapper.getUserPage(pageWrap.toPage(),new QueryWrapper<UserResponse>()
.and(StringUtils.isNotBlank(pageWrap.getModel().getKeyword()), i -> i.like("c.realName", pageWrap.getModel().getKeyword())
- .or().like("e.name", pageWrap.getModel().getKeyword())
+ .or().like("d.COMPANY_NAME_PATH", pageWrap.getModel().getKeyword())
)
.eq("c.DELETED",0)
.eq("c.status",0)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java
index 87ad1ae..daffdbf 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java
@@ -549,18 +549,18 @@
if(CollectionUtils.isNotEmpty(memberList)){
userIds.addAll(memberList.stream().map(m->m.getId()).collect(Collectors.toList()));
}
- //鍏姟鐢ㄨ溅 榛樿鍔犲叆 鍙告満鎶勯��
- if(approveTempl.getType()==Constants.THREE||approveTempl.getType()==Constants.FOUR){
- CarUseBook carUseBook = carUseBookMapper.selectById(businessId);
- if(Objects.isNull(carUseBook)){
- throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"涓烘煡璇㈠埌鐢ㄨ溅鐢宠淇℃伅");
- }
- CarDriver carDriver = carDriverMapper.selectById(carUseBook.getDriverId());
- if(Objects.isNull(carDriver)){
- throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"涓烘煡璇㈠埌鍙告満淇℃伅");
- }
- userIds.add(carDriver.getMemberId());
- }
+ //鍏姟鐢ㄨ溅 榛樿鍔犲叆 鍙告満鎶勯�� 2024骞�6鏈�28鏃�16:49:08 鍙告満鎶勯�佷慨鏀瑰埌 瀹℃壒涓氬姟鏃惰繘琛屽彂閫�
+// if(approveTempl.getType()==Constants.THREE||approveTempl.getType()==Constants.FOUR){
+// CarUseBook carUseBook = carUseBookMapper.selectById(businessId);
+// if(Objects.isNull(carUseBook)){
+// throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"涓烘煡璇㈠埌鐢ㄨ溅鐢宠淇℃伅");
+// }
+// CarDriver carDriver = carDriverMapper.selectById(carUseBook.getDriverId());
+// if(Objects.isNull(carDriver)){
+// throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"涓烘煡璇㈠埌鍙告満淇℃伅");
+// }
+// userIds.add(carDriver.getMemberId());
+// }
if(CollectionUtils.isNotEmpty(userIds)){
for (Integer memberId:userIds) {
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarUseBookServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarUseBookServiceImpl.java
index 25eeca6..ef865c4 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarUseBookServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarUseBookServiceImpl.java
@@ -29,6 +29,7 @@
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import java.time.LocalDateTime;
@@ -75,6 +76,7 @@
@Override
+ @Transactional(rollbackFor = {Exception.class,BusinessException.class})
public Integer create(CarUseBook carUseBook) throws Exception {
if(Objects.isNull(carUseBook)
|| Objects.isNull(carUseBook.getCarId())
@@ -122,6 +124,7 @@
}
carUseBookMapper.insert(carUseBook);
//鐢ㄨ溅鐢宠 瀹℃壒璁板綍鍒涘缓
+
approveService.createApproveFlow(carUseBook.getType()==0?3:4,carUseBook.getId(),carUseBook.getMemberId());
return carUseBook.getId();
}
@@ -368,23 +371,23 @@
.or().like(CarUseBook::getEndTime,dateDay)
.or().apply(" START_TIME < '"+dateDay+" 00:00:00' and END_TIME > '"+dateDay+" 23:59:59' "))
);
- if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(carUseBookList)){
- for (DateIntervalVO dateIntervalVO:dateIntervalVOList) {
- //鍒ゆ柇鏃堕棿鏄惁澶т簬褰撳墠
- if(DateUtil.getDateFromString(dateIntervalVO.getEndTime()).getTime()<=System.currentTimeMillis()){
- dateIntervalVO.setIsUse(Constants.ONE);
- continue;
- }
+ for (DateIntervalVO dateIntervalVO:dateIntervalVOList) {
+ //鍒ゆ柇鏃堕棿鏄惁澶т簬褰撳墠
+ if(DateUtil.getDateFromString(dateIntervalVO.getEndTime()).getTime()<=System.currentTimeMillis()){
+ dateIntervalVO.setIsUse(Constants.ONE);
+ continue;
+ }
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(carUseBookList)){
for (CarUseBook i:carUseBookList ) {
if(
- (DateUtil.getDateFromString(dateIntervalVO.getStartTime()).getTime() <= i.getStartTime().getTime() &&
- i.getStartTime().getTime() < DateUtil.getDateFromString(dateIntervalVO.getEndTime()).getTime())
- ||
- (DateUtil.getDateFromString(dateIntervalVO.getStartTime()).getTime() < i.getEndTime().getTime() &&
- i.getEndTime().getTime() <= DateUtil.getDateFromString(dateIntervalVO.getEndTime()).getTime())
- ||
- (DateUtil.getDateFromString(dateIntervalVO.getStartTime()).getTime() >= i.getStartTime().getTime() &&
- DateUtil.getDateFromString(dateIntervalVO.getEndTime()).getTime() <= i.getEndTime().getTime())
+ (DateUtil.getDateFromString(dateIntervalVO.getStartTime()).getTime() <= i.getStartTime().getTime() &&
+ i.getStartTime().getTime() < DateUtil.getDateFromString(dateIntervalVO.getEndTime()).getTime())
+ ||
+ (DateUtil.getDateFromString(dateIntervalVO.getStartTime()).getTime() < i.getEndTime().getTime() &&
+ i.getEndTime().getTime() <= DateUtil.getDateFromString(dateIntervalVO.getEndTime()).getTime())
+ ||
+ (DateUtil.getDateFromString(dateIntervalVO.getStartTime()).getTime() >= i.getStartTime().getTime() &&
+ DateUtil.getDateFromString(dateIntervalVO.getEndTime()).getTime() <= i.getEndTime().getTime())
){
dateIntervalVO.setIsUse(Constants.ONE);
break;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java
index a6e1338..77730ce 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java
@@ -640,6 +640,10 @@
if(visits.getEndtime().getTime() <= visits.getStarttime().getTime()){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "瀵逛笉璧凤紝绂诲巶鏃堕棿蹇呴』澶т簬鍏ュ巶鏃堕棿锛�");//
}
+ if(!DateUtil.getDateLong(visits.getEndtime()).equals(DateUtil.getDateLong(visits.getStarttime()))){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "瀵逛笉璧凤紝棰勭害鏃ユ湡涓嶅彲浠ヨ法澶╋紒");
+ };
+
if(visits.getSourceType().equals(Constants.ZERO)){
String code = systemDictDataBiz.queryByCode(Constants.VISIT_CONFIG,Constants.VALIDATE_VISIT).getCode();
int codenum =0;
@@ -883,7 +887,7 @@
}else{
if(!Constants.equalsInteger(Constants.ZERO,member.getStatus() )){
//濡傛灉鐢ㄦ埛鐘舵�佸紓甯革紝鍒欐彁绀�
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "瀵逛笉璧凤紝韬唤璇佸彿銆�"+cardno+"銆戣绂佹璁块棶鐢宠锛屽鏈夌枒闂紝璇疯仈绯绘偍鐨勬嫓璁夸汉杩涜鏍稿疄");
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "瀵逛笉璧凤紝銆�"+member.getName()+"銆戣韩浠借瘉鍙枫��"+cardno+"銆戝湪榛戝悕鍗曞唴锛屾棤娉曠敵璇疯繘鍏ュ洯鍖�");
}
//鏍告煡棰勭害鐢ㄦ埛鏄惁瀛樺湪鏈绂荤殑棰勭害璁板綍
// isExsitNoOutVisisRecord(member);
--
Gitblit v1.9.3