计算两个日期之间的时间差(只包括工作日) 修改

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;

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
     </select>
 
 </mapper>