lihui007 3 лет назад
Родитель
Сommit
2b0bbad24e

+ 5 - 3
common/src/main/java/com/huaxu/util/DatesUtil.java

@@ -183,8 +183,9 @@ public class DatesUtil {
 	// 获取某个日期的开始时间
 	public static Timestamp getDayStartTime(Date d) {
 		Calendar calendar = Calendar.getInstance();
-		if (null != d)
+		if (null != d) {
 			calendar.setTime(d);
+		}
 		calendar.set(calendar.get(Calendar.YEAR), calendar.get(Calendar.MONTH),
 				calendar.get(Calendar.DAY_OF_MONTH), 0, 0, 0);
 		calendar.set(Calendar.MILLISECOND, 0);
@@ -194,8 +195,9 @@ public class DatesUtil {
 	// 获取某个日期的结束时间
 	public static Timestamp getDayEndTime(Date d) {
 		Calendar calendar = Calendar.getInstance();
-		if (null != d)
+		if (null != d) {
 			calendar.setTime(d);
+		}
 		calendar.set(calendar.get(Calendar.YEAR), calendar.get(Calendar.MONTH),
 				calendar.get(Calendar.DAY_OF_MONTH), 23, 59, 59);
 		calendar.set(Calendar.MILLISECOND, 999);
@@ -607,7 +609,7 @@ public class DatesUtil {
 		return  instant.atZone(zoneId).toLocalDate();
 	}
 
-	public static LocalDate parseLocalDate(String date){
+	public static LocalDate formatLocalDate(String date){
 		DateTimeFormatter fmt = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
 		return LocalDate.parse(date, fmt);
 	}

+ 1 - 0
operation_manager/src/main/java/com/huaxu/evaluation/job/EvaluationResultJob.java

@@ -92,6 +92,7 @@ public class EvaluationResultJob {
      * @Date 18:26 2021/5/17
      * @return void
      **/
+
     @Async
     public void run(){
         if (lock){

+ 1 - 1
operation_manager/src/main/java/com/huaxu/utils/EvaluationUtil.java

@@ -247,7 +247,7 @@ public class EvaluationUtil {
         String quarterString = "4,7,10,1";
         boolean isQuarter = cycle == EvaluationCycleEnums.QUARTER.getType();
         String time = isQuarter ? endTime : startTime;
-        LocalDate localDate = DatesUtil.parseLocalDate(time);
+        LocalDate localDate = DatesUtil.formatLocalDate(time);
         if (isQuarter && quarterString.indexOf(localDate.getMonthValue() + "") != -1) {
             localDate = localDate.plusMonths(-1);
         }