Quellcode durchsuchen

设计师页面接口修改

hcst_sunzhen vor 5 Jahren
Ursprung
Commit
9b63934c8f

+ 18 - 18
jeecg-boot-base-common/src/main/java/org/jeecg/common/util/DateUtils.java

@@ -1114,22 +1114,22 @@ public class DateUtils extends PropertyEditorSupport {
         Map<String,Integer> resultMap = new HashMap<>();
        //获取当天所在
        Map<String,Integer> yearQuarter = getYearQuarter(date);
-       Integer lastyear = yearQuarter.get("year");
-       Integer lastquarter = yearQuarter.get("quarter");
+       Integer year = yearQuarter.get("year");
+       Integer quarter = yearQuarter.get("quarter");
 
-        Integer year = 0;
-        Integer quarter = 0;
+       Integer lastyear = 0;
+       Integer lastQuarter = 0;
 
-       if(lastquarter == 4 || lastquarter == 3 || lastquarter == 2){
-           year = lastyear;
-           quarter = lastyear - 1;
+       if(quarter == 4 || quarter == 3 || quarter == 2){
+           lastyear = year;
+           lastQuarter = quarter - 1;
        }else{
-           year = lastyear -1;
-           quarter = 1;
+           lastyear = year -1;
+           lastQuarter = 4;
        }
 
-       resultMap.put("year",year);
-       resultMap.put("quarter",quarter);
+       resultMap.put("year",lastyear);
+       resultMap.put("quarter",lastQuarter);
 
        return resultMap;
     }
@@ -1147,15 +1147,15 @@ public class DateUtils extends PropertyEditorSupport {
         //Date effiStart = DateUtils.addDay(friDay,  -15);
         //System.out.println(sdf.format(effiStart));
 
-        Map<String,Integer> map1 = DateUtils.getYearQuarter(DateUtils.parseDate("2020-04-01","yyyy-MM-dd"));
-
-        Map<String,String> map2 = DateUtils.quarterStartEndDate(2019,1);
-
-        for(String key:map2.keySet()){
-            System.out.println(key + ":" + map2.get(key));
-        }
+        //Map<String,Integer> map1 = DateUtils.getYearQuarter(DateUtils.parseDate("2020-04-01","yyyy-MM-dd"));
 
+        //Map<String,String> map2 = DateUtils.quarterStartEndDate(2019,1);
+        //
+        //for(String key:map2.keySet()){
+        //    System.out.println(key + ":" + map2.get(key));
+        //}
 
+        //DateUtils.lastQuarter(new Date());
 
     }