企业云产业供地的剩余工作日去除节假日 提交当天不算工作日

src/main/java/platform/common/util/DateUtil.java

@@ -487,7 +487,7 @@ public class DateUtil {
                 //得到两个日期相差的小时数
                 int hours = ((int) (overTime.getTime().getTime() / 1000) - (int) (dealTime.getTime().getTime() / 1000)) / 3600;
                 if (hours > 24) {
-                    int count = (int) Math.floor(hours / 24) - 1;
+                    int count = (int) Math.floor(hours / 24);
                     List<String> days = getDays(dealDate, deadline, "yyyy-MM-dd HH:mm:ss", "MMdd");
                     for (String day : days) {
                         if (holiday.contains(day)) {
@@ -496,7 +496,7 @@ public class DateUtil {
                     }
                     overTimeStr = "提前" + count + "个工作日完成";
                 } else {
-                    int count =(int) Math.abs(Math.ceil(hours / 24) - 1);
+                    int count = (int) Math.abs(Math.ceil(hours / 24));
                     List<String> days = getDays(deadline, dealDate, "yyyy-MM-dd HH:mm:ss", "MMdd");
                     for (String day : days) {
                         if (holiday.contains(day)) {
@@ -542,7 +542,7 @@ public class DateUtil {
                 //得到两个日期相差的小时数
                 int hours = ((int) (overTime.getTime().getTime() / 1000) - (int) (now.getTime().getTime() / 1000)) / 3600;
                 if (hours > 24) {
-                    int count = (int) Math.ceil(hours / 24) - 1;
+                    int count = (int) Math.ceil(hours / 24);
                     List<String> days = getDays(nowDate, deadline, "yyyy-MM-dd HH:mm:ss", "MMdd");
                     for (String day : days) {
                         if (holiday.contains(day)) {
@@ -551,7 +551,7 @@ public class DateUtil {
                     }
                     overTimeStr = "剩余" + count + "个工作日";
                 } else {
-                    int count = (int) Math.abs(Math.ceil(hours / 24) - 1);
+                    int count = (int) Math.abs(Math.ceil(hours / 24));
                     List<String> days = getDays(deadline, nowDate, "yyyy-MM-dd HH:mm:ss", "MMdd");
                     for (String day : days) {
                         if (holiday.contains(day)) {

src/main/resources/application.yml

@@ -15,9 +15,9 @@ spring:
   #激活哪一个环境的配置文件
   profiles:
 
-    active: dev
-  #    active: test
-  #    active: aliyun
+#    active: dev
+#      active: test
+      active: aliyun
   #    active: vpn
   #    active: prod_in
   #    active: prod_out
@@ -160,13 +160,13 @@ spring:
     #    url: jdbc:mysql://192.168.1.115:3306/service_platform?useUnicode=true&characterEncoding=utf-8&useSSL=true&autoReconnect=true&allowMultiQueries=true
     #    url: jdbc:mysql://222.92.16.3:33061/service_platform?useUnicode=true&characterEncoding=utf-8&useSSL=true&autoReconnect=true&allowMultiQueries=true
     #    url: jdbc:mysql://10.44.104.42:3306/service_platform?useUnicode=true&characterEncoding=utf-8&useSSL=true&autoReconnect=true&allowMultiQueries=true
-#    url: jdbc:mysql://47.105.241.108:33060/service_platform?useUnicode=true&characterEncoding=utf-8&useSSL=true&autoReconnect=true&allowMultiQueries=true
-    url: jdbc:mysql://47.105.241.108:33060/service_platform_42_backup?useUnicode=true&characterEncoding=utf-8&useSSL=true&autoReconnect=true&allowMultiQueries=true
+    url: jdbc:mysql://47.105.241.108:33060/service_platform?useUnicode=true&characterEncoding=utf-8&useSSL=true&autoReconnect=true&allowMultiQueries=true
+#    url: jdbc:mysql://47.105.241.108:33060/service_platform_42_backup?useUnicode=true&characterEncoding=utf-8&useSSL=true&autoReconnect=true&allowMultiQueries=true
     username: root
     password: ${password}
   #redis
   redis:
-    host: 172.31.192.183
+    host: 192.168.1.116
     password:
     port: 6379
     pool:
@@ -186,15 +186,14 @@ password: WD7ZuG4T27mDBFRXye2IfZZgrDsmPCtkMDfj8fGss8Iz/4aF27TLznaZ2mUbU273q5spfM
 
 #上传文件配置信息
 #文件仓库地址
-#repositoryPath:  /opt/xinqu_pic
-repositoryPath:  /Users/chenqing/codeCache/uploads
+repositoryPath:  E:\upload
 #新区接口地址
 api_url: http://snd.ideatob.com/mp/api/
 #apk文件存放地址
-apk_url: E:\UPLOAD\
+apk_url: E:\upload\
 
 #访问路径
-fileUrl: http://47.105.241.108/uploads
+fileUrl: E:\upload
 
 #域名
 service_name: 127.0.0.1
@@ -237,11 +236,11 @@ password: hTeoaFouO30aePF/U0NVf6bZCqh31q//05vP+uC7KnNDW2R3MOaQyEbzigzUVFEzVgZDtB
 
 #上传文件配置信息
 #文件仓库地址
-repositoryPath:  E:\UPLOAD\
+repositoryPath:  E:\upload
 #新区接口地址
 api_url: http://snd.ideatob.com/mp/api/
 #apk文件存放地址
-apk_url: E:\UPLOAD\
+apk_url: E:\upload\apk\
 
 #访问路径
 fileUrl: http://10.43.26.201
@@ -261,12 +260,13 @@ spring:
   profiles: aliyun
   #数据源
   datasource:
-    url: jdbc:mysql://47.105.241.108:33060/service_platform_42_backup?useUnicode=true&characterEncoding=utf-8&useSSL=true&autoReconnect=true&allowMultiQueries=true
+#    url: jdbc:mysql://47.105.241.108:33060/service_platform_42_backup?useUnicode=true&characterEncoding=utf-8&useSSL=true&autoReconnect=true&allowMultiQueries=true
+    url: jdbc:mysql://47.105.241.108:33060/service_platform?useUnicode=true&characterEncoding=utf-8&useSSL=true&autoReconnect=true&allowMultiQueries=true
     username: root
     password: ${password}
   #redis
   redis:
-    host: 192.168.1.115
+    host: 172.31.192.183
     password:
     port: 6379
     pool: