修改任务问题，添加任务完成状态字段

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"/>-->

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(","));
             }

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>