课题组列表添加研究内容

research-system/src/main/java/com/research/system/domain/vo/GroupVO.java

@@ -85,7 +85,8 @@ public class GroupVO {
         private long cgIng;
 
         private Byte type;
-
+        @ApiModelProperty("研究内容")
+        private List<Detail.Nr> nrList;
     }
 
     @Data

research-system/src/main/java/com/research/system/domain/vo/TaskVo.java

@@ -79,10 +79,10 @@ public class TaskVo {
         @ApiModelProperty("任务类型名称")
         private String taskTypeName;
         @ApiModelProperty("开始时间")
-        @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+        @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
         private Date startTime;
         @ApiModelProperty("截止时间")
-        @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+        @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
         private Date endTime;
         @ApiModelProperty("任务状态")
         private Integer taskStatus;
@@ -93,7 +93,7 @@ public class TaskVo {
         @ApiModelProperty("审核状态名称")
         private String auditStatusName;
         @ApiModelProperty("审核时间")
-        @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+        @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
         private Date auditTime;
         @ApiModelProperty("驳回原因")
         private String rejectReason;

research-system/src/main/java/com/research/system/service/impl/KtsGroupServiceImpl.java

@@ -74,6 +74,7 @@ public class KtsGroupServiceImpl implements KtsGroupService {
 //                    if(CollUtil.isNotEmpty(result.getChildrenList())){
                         result.setPlanIng(ktResearchContents.stream().filter(ktResearchContent -> ktResearchContent.getStatus() == 1).count());
 //                    }
+                    result.setNrList(BeanUtil.copyToList(ktResearchContents, GroupVO.Detail.Nr.class));
                 }
                 //查询成果
                 KtExpectedOutcomesExample ktExpectedOutcomesExample = new KtExpectedOutcomesExample();