Prechádzať zdrojové kódy

修改一三象限okr任务修改异常

songyh 3 rokov pred
rodič
commit
98c357f955

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

@@ -261,13 +261,10 @@ public class OkrServiceImpl implements OkrService {
             if(getTask.getType() == 2){
                 //月份信息数据
                 getTask.setStatus(1);
-                int month = getTask.getMonth();
-                if(month == 12){
-                    getTask.setMonth(1);
-                    getTask.setYear(getTask.getYear()+1);
-                }else{
-                    getTask.setMonth(getTask.getMonth()+1);
-                }
+                int month = getTask.getMonth()+1;
+                int quarter = DateUtils.getQuarterByMonthNum(month);
+                getTask.setMonth(month%12);
+                getTask.setQuarter(quarter);
                 getTask.setId(null);
                 okrTaskInfoService.insertTaskInfo(getTask);
             }else{

+ 11 - 0
src/main/java/cn/com/ctop/okr/utils/DateUtils.java

@@ -641,6 +641,17 @@ public class DateUtils extends PropertyEditorSupport {
         return dateFormat.format(getDate);
     }
 
+    public static int getQuarterByMonthNum(int month) {
+        if(month==13){
+            return 1;
+        }else if(month%3==0){
+            return month/3;
+        }else{
+            return month/3+1;
+        }
+
+    }
+
     /**
      * String类型 转换为Date, 如果参数长度为10 转换格式”yyyy-MM-dd“ 如果参数长度为19 转换格式”yyyy-MM-dd
      * HH:mm:ss“ * @param text String类型的时间值

+ 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.165.84:3306/okr?characterEncoding=UTF-8&useUnicode=true&useSSL=false
+          url: jdbc:mysql://139.186.27.96:3390/okr?characterEncoding=UTF-8&useUnicode=true&useSSL=false
+#          url: jdbc:mysql://139.186.165.84:3306/okr?characterEncoding=UTF-8&useUnicode=true&useSSL=false
           username: hcst
           password: hcst@2020
           driver-class-name: com.mysql.jdbc.Driver