From 87ba41eebdf94722c51cce4470fbcc4b1ce18a2d Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 25 三月 2025 22:44:01 +0800
Subject: [PATCH] 按时完成不统计跳过的和容缺的

---
 business/src/main/java/com/ycl/service/impl/ProcessLogServiceImpl.java |   31 +++++++++++++++++++++++++++++--
 1 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/business/src/main/java/com/ycl/service/impl/ProcessLogServiceImpl.java b/business/src/main/java/com/ycl/service/impl/ProcessLogServiceImpl.java
index e3f8512..5b075c8 100644
--- a/business/src/main/java/com/ycl/service/impl/ProcessLogServiceImpl.java
+++ b/business/src/main/java/com/ycl/service/impl/ProcessLogServiceImpl.java
@@ -145,6 +145,26 @@
     }
 
     @Override
+    public Boolean taskIsWait(String taskId, String processInsId) {
+        List<ProcessLog> list = new LambdaQueryChainWrapper<>(baseMapper)
+                .eq(ProcessLog::getProcessInsId, processInsId)
+                .eq(ProcessLog::getTaskId, taskId)
+                .list();
+        return list.stream().anyMatch(log -> ProcessLogEventTypeEnum.WAIT.equals(log.getEventType()))
+                && list.stream().filter(log -> ProcessLogEventTypeEnum.FINISHED.equals(log.getEventType())).count() < 1;
+    }
+
+    @Override
+    public Boolean taskIsJump(String taskId, String processInsId) {
+        List<ProcessLog> list = new LambdaQueryChainWrapper<>(baseMapper)
+                .eq(ProcessLog::getProcessInsId, processInsId)
+                .eq(ProcessLog::getTaskId, taskId)
+                .eq(ProcessLog::getEventType, ProcessLogEventTypeEnum.JUMP)
+                .list();
+        return list.size() > 0;
+    }
+
+    @Override
     public Boolean taskIsTeamwork(String taskId, String processInsId) {
         ProcessLog log = new LambdaQueryChainWrapper<>(baseMapper)
                 .eq(ProcessLog::getProcessInsId, processInsId)
@@ -160,8 +180,8 @@
     }
 
     @Override
-    public Result projectProcessLogPage(ProcessLogQuery query) {
-        List<ProcessLogVO> list = baseMapper.projectProcessLogPage(query);
+    public Result projectProcessLogList(ProcessLogQuery query) {
+        List<ProcessLogVO> list = baseMapper.projectProcessLogList(query);
         // json鍙嶅簭鍒楀寲
         list.stream().forEach(log -> {
             if (StringUtils.isNotBlank(log.getEventDataJson())) {
@@ -197,6 +217,13 @@
         return Result.ok().data(list);
     }
 
+    @Override
+    public Result projectProcessLogPage(ProcessLogQuery query) {
+        IPage<ProcessLogVO> page = PageUtil.getPage(query, ProcessLogVO.class);
+        baseMapper.projectProcessLogPage(page, query);
+        return Result.ok().data(page.getRecords()).total(page.getTotal());
+    }
+
     /**
      * 瑙f瀽娴佺▼鏃ュ織涓殑鏁版嵁-鍚嶇О
      *

--
Gitblit v1.8.0