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 @@ - +
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 executorList; - private List deliverableList; + private List deliverableShouldList; private String deliverables; - public List getDeliverables() { + private Byte complateStatus; + + public Byte getComplateStatus() { + if (CollectionUtil.isNotEmpty(deliverableShouldList) && getDeliverableList().size() > deliverableShouldList.size()) { + return 1; + } + return 0; + } + + public List 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 @@ - @@ -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 @@ -57,8 +59,10 @@ - and t.create_by = #{dto.userName} + and (t.create_by = #{dto.userName} + or e.id is not null ) + group by t.id order by t.id desc