From 10b2bd7aa222642f452baf9c54eb824d323294f5 Mon Sep 17 00:00:00 2001
From: PoffyZhang <99775271@qq.com>
Date: Mon, 3 Apr 2023 02:55:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=20=E6=92=A4=E5=9B=9E?=
 =?UTF-8?q?=E5=A4=84=E7=90=86=E7=9A=84=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ningdatech/pmapi/todocenter/mapper/StatisticsMapper.java |  2 ++
 .../ningdatech/pmapi/todocenter/mapper/StatisticsMapper.xml  | 10 ++++++++--
 .../pmapi/todocenter/service/impl/StatisticsServiceImpl.java | 12 +++++++-----
 3 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/mapper/StatisticsMapper.java b/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/mapper/StatisticsMapper.java
index 73343f2..b4aac30 100644
--- a/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/mapper/StatisticsMapper.java
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/mapper/StatisticsMapper.java
@@ -14,4 +14,6 @@ public interface StatisticsMapper extends BaseMapper {
     TodoCenterStatisticsPO mysubmitNum(@Param("employeeCode") String employeeCode);
 
     TodoCenterStatisticsPO ccNums(@Param("employeeCode") String employeeCode);
+
+    TodoCenterStatisticsPO getIdo(String employeeCode);
 }
diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/mapper/StatisticsMapper.xml b/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/mapper/StatisticsMapper.xml
index b56cef1..b7ab639 100644
--- a/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/mapper/StatisticsMapper.xml
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/mapper/StatisticsMapper.xml
@@ -27,12 +27,18 @@
     <select id="getTodoOrIdo" parameterType="java.lang.String"
             resultType="com.ningdatech.pmapi.todocenter.model.po.TodoCenterStatisticsPO">
                  SELECT
-                     sum(CASE WHEN ht.assignee_ = #{employeeCode} AND ht.end_time_ is NULL THEN 1 end) todoNum,
-                     sum(CASE WHEN ht.assignee_ = #{employeeCode} AND ht.end_time_ IS not NULL THEN 1 end) idoNum
+                     sum(CASE WHEN ht.assignee_ = #{employeeCode} AND ht.end_time_ is NULL THEN 1 end) todoNum
                  FROM
                      act_hi_taskinst ht
     </select>
 
+    <select id="getIdo" parameterType="java.lang.String"
+            resultType="com.ningdatech.pmapi.todocenter.model.po.TodoCenterStatisticsPO">
+        SELECT count(0) idoNum
+        FROM act_hi_taskinst ht WHERE ht.assignee_ = #{employeeCode}
+        AND ht.end_time_ IN (SELECT max(end_time_)  FROM act_hi_taskinst WHERE  ht.end_time_ is not NULL GROUP BY PROC_INST_ID_)
+    </select>
+
     <select id="mysubmitNum" parameterType="java.lang.String"
             resultType="com.ningdatech.pmapi.todocenter.model.po.TodoCenterStatisticsPO">
         SELECT
diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/service/impl/StatisticsServiceImpl.java b/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/service/impl/StatisticsServiceImpl.java
index ffdbc7a..2bfb695 100644
--- a/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/service/impl/StatisticsServiceImpl.java
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/service/impl/StatisticsServiceImpl.java
@@ -24,12 +24,14 @@ public class StatisticsServiceImpl implements StatisticsService {
     public TodoCenterStatisticsPO getStatistics(String employeeCode) {
         TodoCenterStatisticsPO res = new TodoCenterStatisticsPO();
 
-        TodoCenterStatisticsPO todoOrIdo = mapper.getTodoOrIdo(employeeCode);
-        if(Objects.nonNull(todoOrIdo)){
-            res.setTodoNum(todoOrIdo.getTodoNum());
-            res.setIdoNum(todoOrIdo.getIdoNum());
+        TodoCenterStatisticsPO todo = mapper.getTodoOrIdo(employeeCode);
+        if(Objects.nonNull(todo)){
+            res.setTodoNum(todo.getTodoNum());
+        }
+        TodoCenterStatisticsPO ido = mapper.getIdo(employeeCode);
+        if(Objects.nonNull(ido)){
+            res.setIdoNum(ido.getIdoNum());
         }
-
         TodoCenterStatisticsPO submit = mapper.mysubmitNum(employeeCode);
         if(Objects.nonNull(submit)){
             res.setMysubmitNum(submit.getMysubmitNum());