From 0fad17e9618e63ec1a3603b6bfe6c8bd61a1d75d Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Thu, 13 Jan 2022 10:49:54 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A1=E7=AE=97=E4=B8=A4=E4=B8=AA=E6=97=A5?= =?UTF-8?q?=E6=9C=9F=E4=B9=8B=E9=97=B4=E7=9A=84=E6=97=B6=E9=97=B4=E5=B7=AE?= =?UTF-8?q?(=E5=8F=AA=E5=8C=85=E6=8B=AC=E5=B7=A5=E4=BD=9C=E6=97=A5)=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/service/impl/WorkDayServiceImpl.java | 5 ++--- .../src/main/resources/mapper/CalenderDao.xml | 1 + 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/WorkDayServiceImpl.java b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/WorkDayServiceImpl.java index 98e2f839c8..2db11324a7 100644 --- a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/WorkDayServiceImpl.java +++ b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/WorkDayServiceImpl.java @@ -3,14 +3,13 @@ package com.epmet.service.impl; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.utils.DateUtils; -import com.epmet.commons.tools.utils.DateUtils; import com.epmet.constant.ProjectConstant; import com.epmet.dao.CalenderDao; import com.epmet.dto.form.CostDayFormDTO; import com.epmet.dto.form.TimestampIntervalFormDTO; import com.epmet.dto.form.WorkDayFormDTO; -import com.epmet.dto.result.CostDayResultDTO; import com.epmet.dto.form.WorkMinuteFormDTO; +import com.epmet.dto.result.CostDayResultDTO; import com.epmet.dto.result.WorkDayResultDTO; import com.epmet.entity.CalenderEntity; import com.epmet.service.WorkDayService; @@ -271,7 +270,7 @@ public class WorkDayServiceImpl implements WorkDayService { LocalDateTime initialTime = LocalDateTime.ofInstant(right.toInstant(), ZoneId.systemDefault()) .withHour(NumConstant.ZERO).withMinute(NumConstant.ZERO).withSecond(NumConstant.ZERO).withNano(NumConstant.ZERO); //ChronoUnit日期枚举类,between方法计算两个时间对象之间的时间量 - costMin += ChronoUnit.SECONDS.between(localDateTime, initialTime)/NumConstant.SIXTY; + costMin += ChronoUnit.SECONDS.between(initialTime, localDateTime)/NumConstant.SIXTY; } if(NumConstant.TWO == list.size()) { return costMin; diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/resources/mapper/CalenderDao.xml b/epmet-module/epmet-common-service/common-service-server/src/main/resources/mapper/CalenderDao.xml index 13a7758445..ca6eea46a8 100644 --- a/epmet-module/epmet-common-service/common-service-server/src/main/resources/mapper/CalenderDao.xml +++ b/epmet-module/epmet-common-service/common-service-server/src/main/resources/mapper/CalenderDao.xml @@ -60,6 +60,7 @@ DEL_FLAG = '0' AND QUERY_DATE BETWEEN #{begin} AND #{end} + order by query_date asc \ No newline at end of file