报工工时BUG修复（日历查询问题）

mes/src/main/java/com/ximai/mes/pro/service/impl/ProFeedbackServiceImpl.java

@@ -608,7 +608,7 @@ public class ProFeedbackServiceImpl implements IProFeedbackService {
 
         } else {
             breakTimeSum = proStartWorks.stream().collect(Collectors.summarizingLong(ProStartWork::getBreakTimeSec)).getSum();
-            workTimeSum = proStartWorks.stream().collect(Collectors.summarizingLong(ProStartWork::getWorkTimeSec)).getSum() - breakTimeSum;
+            workTimeSum = proStartWorks.stream().collect(Collectors.summarizingLong(ProStartWork::getWorkTimeSec)).getSum();
         }
 
         Map<String, Object> map = new HashMap<>();

mes/src/main/java/com/ximai/mes/pro/service/impl/ProStartWorkServiceImpl.java

@@ -237,7 +237,7 @@ public class ProStartWorkServiceImpl implements IProStartWorkService {
         }
 
         startWork.setEndDate(new Date());
-        Map<String, Long> map = computeWorkTime(startWork, proTaskWorkunitMapper.selectListByQw(new QueryWrapper<ProTaskWorkunit>().eq("task_id", proTask.getTaskId())).get(0).getWorkunitId());
+        Map<String, Long> map = this.computeWorkTime(startWork, proTaskWorkunitMapper.selectListByQw(new QueryWrapper<ProTaskWorkunit>().eq("task_id", proTask.getTaskId())).get(0).getWorkunitId());
         startWork.setWorkTimeSec(DataUtil.getNormalData(map.get("workTimeSec"), Long.class));
         startWork.setBreakTimeSec(DataUtil.getNormalData(map.get("breakTimeSec"), Long.class));
 
@@ -252,9 +252,9 @@ public class ProStartWorkServiceImpl implements IProStartWorkService {
         QueryWrapper<CalPlanWorkunit> calPlanWorkunitQueryWrapper = new QueryWrapper<>();
         Date startDate = startWork.getStartDate();
         Date endDate = startWork.getEndDate();
-        calPlanWorkunitQueryWrapper.between("start_date", startDate, endDate).eq("rest_flag", 0).eq("workunit_id", workunitId)
+        calPlanWorkunitQueryWrapper.lt("start_date", startDate).gt("end_date", startDate).eq("rest_flag", 0).eq("workunit_id", workunitId)
                 .or()
-                .between("end_date", startDate, endDate).eq("rest_flag", 0).eq("workunit_id", workunitId);
+                .lt("start_date", endDate).gt("end_date", endDate).eq("rest_flag", 0).eq("workunit_id", workunitId);
         List<CalPlanWorkunit> calPlanWorkunits = calPlanWorkunitService.selectListByQw(calPlanWorkunitQueryWrapper);
         return this.computeWorkTime(startWork, calPlanWorkunits, workunitId);
     }

mes/src/test/java/com/bs/mes/pro/ProStartWorkServiceImplTest.java

 package com.bs.mes.pro;
 
 import cn.hutool.core.date.DateUtil;
+import com.ximai.common.utils.data.DataUtil;
 import com.ximai.mes.cal.domain.CalPlanWorkunit;
 import com.ximai.mes.pro.domain.ProStartWork;
 import com.ximai.mes.pro.schedule.Equipment;
@@ -61,6 +62,21 @@ public class ProStartWorkServiceImplTest {
         Assert.assertEquals((228+240)*60, rst.get("workTimeSec").longValue());
         Assert.assertEquals((proStartWork.getEndDate().getTime()-proStartWork.getStartDate().getTime())/1000-rst.get("workTimeSec").longValue(),
                 rst.get("breakTimeSec").longValue());
+
+        calPlanWorkunits.add(new CalPlanWorkunit(){
+            {
+                setStartDate(DateUtil.parse("2024-12-03 08:00","yyyy-MM-dd HH:mm"));
+                setEndDate(DateUtil.parse("2024-12-03 12:00","yyyy-MM-dd HH:mm"));
+            };
+        });
+
+        //测试3 时间精确到秒
+        proStartWork.setStartDate(DateUtil.parse("2024-12-03 10:19:36","yyyy-MM-dd HH:mm:ss"));
+        proStartWork.setEndDate(DateUtil.parse("2024-12-03 10:20:42","yyyy-MM-dd HH:mm:ss"));
+        rst = (Map) methods.invoke(proStartWorkService, proStartWork, calPlanWorkunits, 0l);
+        Assert.assertEquals(60+6, rst.get("workTimeSec").longValue());
+        Assert.assertEquals(0l,
+                rst.get("breakTimeSec").longValue());
     }
 
 }