From 654b2abc0c714b3bb97e5b8bd8706497fc5a129e Mon Sep 17 00:00:00 2001
From: ccsens_zhengzhichuan <ccsens_zhengzhichuan>
Date: Thu, 16 Oct 2025 08:48:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=BB=E5=8A=A1=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=EF=BC=8C=E6=B7=BB=E5=8A=A0=E4=BB=BB=E5=8A=A1=E5=AE=8C?=
 =?UTF-8?q?=E6=88=90=E7=8A=B6=E6=80=81=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 research-generator/src/main/resources/mbg.xml       |  2 +-
 .../java/com/research/system/domain/vo/TaskVo.java  | 13 +++++++++++--
 .../src/main/resources/mapper/dao/TaskDao.xml       |  8 ++++++--
 3 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/research-generator/src/main/resources/mbg.xml b/research-generator/src/main/resources/mbg.xml
index 9cfdfb21..3ed65a94 100644
--- a/research-generator/src/main/resources/mbg.xml
+++ b/research-generator/src/main/resources/mbg.xml
@@ -84,7 +84,7 @@
 <!--        <table tableName="shs_res_device" domainObjectName="ShsResDevice" enableDeleteByExample="false"/>-->
 <!--        <table tableName="res_research_integrity_template" domainObjectName="ResResearchIntegrityTemplate" enableDeleteByExample="false"/>-->
 <!--        <table tableName="res_research_integrity" domainObjectName="ResResearchIntegrity" enableDeleteByExample="false"/>-->
-<!--        <table tableName="task_list" domainObjectName="TaskList" enableDeleteByExample="false"/>-->
+        <table tableName="task_list" domainObjectName="TaskList" enableDeleteByExample="false"/>
 <!--        <table tableName="task_executor" domainObjectName="TaskExecutor" enableDeleteByExample="false"/>-->
         <table tableName="task_deliverable" domainObjectName="TaskDeliverable" enableDeleteByExample="false"/>
 <!--        <table tableName="shs_syff_info" domainObjectName="ShsSyffInfo" enableDeleteByExample="false"/>-->
diff --git a/research-system/src/main/java/com/research/system/domain/vo/TaskVo.java b/research-system/src/main/java/com/research/system/domain/vo/TaskVo.java
index 576ce50b..3a91336d 100644
--- a/research-system/src/main/java/com/research/system/domain/vo/TaskVo.java
+++ b/research-system/src/main/java/com/research/system/domain/vo/TaskVo.java
@@ -58,11 +58,20 @@ public class TaskVo {
 
         private List<ExecutorResult> executorList;
 
-        private List<DeliverableResult> deliverableList;
+        private List<DeliverableResult> deliverableShouldList;
 
         private String deliverables;
 
-        public List<String> getDeliverables() {
+        private Byte complateStatus;
+
+        public Byte getComplateStatus() {
+            if (CollectionUtil.isNotEmpty(deliverableShouldList) && getDeliverableList().size() > deliverableShouldList.size()) {
+                return 1;
+            }
+            return 0;
+        }
+
+        public List<String> getDeliverableList() {
             if (StrUtil.isNotEmpty(deliverables)) {
                 return ListUtil.toList(deliverables.split(","));
             }
diff --git a/research-system/src/main/resources/mapper/dao/TaskDao.xml b/research-system/src/main/resources/mapper/dao/TaskDao.xml
index fc412aeb..16dc7668 100644
--- a/research-system/src/main/resources/mapper/dao/TaskDao.xml
+++ b/research-system/src/main/resources/mapper/dao/TaskDao.xml
@@ -19,7 +19,7 @@
         <result column="ktGroupName" jdbcType="BIGINT" property="ktGroupName" />
         <result column="description" jdbcType="LONGVARCHAR" property="description" />
         <result column="deliverables" jdbcType="LONGVARCHAR" property="deliverables" />
-        <collection property="deliverableList" select="queryDeliverableList"
+        <collection property="deliverableShouldList" select="queryDeliverableList"
                     ofType="com.research.system.domain.vo.TaskVo$DeliverableResult"
                     column="id">
         </collection>
@@ -37,6 +37,8 @@
             task_list t
         left join
         kts_kt_group g on g.id = t.kt_group_id
+        left join
+        task_executor e on e.task_id = t.id
         where
         t.del_flag = 0
             <if test="dto.taskName != null and dto.taskName != ''">
@@ -57,8 +59,10 @@
         </if>
         </if>
         <if test="dto.isMine != null and dto.isMine == 1">
-            and t.create_by = #{dto.userName}
+            and (t.create_by = #{dto.userName}
+                or e.id is not null )
         </if>
+        group by t.id
         order by
         t.id desc
     </select>