소스 검색

修改代码逻辑

syh 4 년 전
부모
커밋
d06548fefc
2개의 변경된 파일8개의 추가작업 그리고 8개의 파일을 삭제
  1. 6 6
      src/main/java/cn/com/ctop/okr/service/impl/OkrServiceImpl.java
  2. 2 2
      src/main/resources/application.yml

+ 6 - 6
src/main/java/cn/com/ctop/okr/service/impl/OkrServiceImpl.java

@@ -420,8 +420,8 @@ public class OkrServiceImpl implements OkrService {
 
         map.put("isCurrentQuarter",isCurrentQuarter);
         map.put("list",mapList);
-        map.put("year",todayYear);
-        map.put("quarter",todayQuarter);
+        map.put("year",year);
+        map.put("quarter",quarter);
         return map;
     }
 
@@ -483,8 +483,8 @@ public class OkrServiceImpl implements OkrService {
 
         map.put("isCurrentQuarter",isCurrentQuarter);
         map.put("list",mapList);
-        map.put("year",todayYear);
-        map.put("quarter",todayQuarter);
+        map.put("year",year);
+        map.put("quarter",quarter);
         return map;
     }
 
@@ -552,8 +552,8 @@ public class OkrServiceImpl implements OkrService {
 
         map.put("isCurrentQuarter",isCurrentQuarter);
         map.put("list",mapList);
-        map.put("year",todayYear);
-        map.put("quarter",todayQuarter);
+        map.put("year",year);
+        map.put("quarter",quarter);
         return map;
     }
 

+ 2 - 2
src/main/resources/application.yml

@@ -75,8 +75,8 @@ spring:
       datasource:
         master:
           #prod
-          url: jdbc:mysql://172.30.0.4:4000/okr?characterEncoding=UTF-8&useUnicode=true&useSSL=false
-#          url: jdbc:mysql://139.186.27.96:4000/okr?characterEncoding=UTF-8&useUnicode=true&useSSL=false
+#          url: jdbc:mysql://172.30.0.4:4000/okr?characterEncoding=UTF-8&useUnicode=true&useSSL=false
+          url: jdbc:mysql://139.186.27.96:4000/okr?characterEncoding=UTF-8&useUnicode=true&useSSL=false
           username: hcst
           password: hcst@2020
           driver-class-name: com.mysql.jdbc.Driver