Browse Source

修改任务

master
ccsens_zhengzhichuan 4 weeks ago
parent
commit
81c916200f
  1. 4
      research-system/src/main/java/com/research/system/domain/dto/TaskDto.java
  2. 6
      research-system/src/main/java/com/research/system/service/impl/TaskServiceImpl.java

4
research-system/src/main/java/com/research/system/domain/dto/TaskDto.java

@ -52,7 +52,7 @@ public class TaskDto {
private List<Long> memberIds;
@ApiModelProperty("截止时间")
private Date endTime;
private String endTime;
@ApiModelProperty("应交付物")
private List<String> requiredDeliverable;
@ -76,7 +76,7 @@ public class TaskDto {
@JsonFormat(pattern = "yyyy-MM-dd HH:mm")
@ApiModelProperty("截止时间")
private Date endTime;
private String endTime;
@ApiModelProperty("应交付物描述")
private String description;

6
research-system/src/main/java/com/research/system/service/impl/TaskServiceImpl.java

@ -1,6 +1,7 @@
package com.research.system.service.impl;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
@ -137,7 +138,7 @@ public class TaskServiceImpl implements ITaskService {
param.setProjOrgId(ktGroup.getProjOrgId());
// 3. 校验截止时间是否大于当前时间
if (param.getEndTime() != null && param.getEndTime().before(new Date())) {
if (param.getEndTime() != null && DateUtil.parse(param.getEndTime()).before(new Date())) {
throw new ServiceException("截止时间必须大于当前时间");
}
@ -148,6 +149,7 @@ public class TaskServiceImpl implements ITaskService {
task.setId(taskId);
task.setTaskCreatorId(userId);
task.setStartTime(new Date());
task.setEndTime(DateUtil.parse(param.getEndTime()));
task.setCreateBy(SecurityUtils.getUsername());
taskMapper.insertSelective(task);
@ -227,7 +229,7 @@ public class TaskServiceImpl implements ITaskService {
updateTask.setPriority(param.getPriority().byteValue());
}
if (param.getEndTime() != null) {
updateTask.setEndTime(param.getEndTime());
updateTask.setEndTime(DateUtil.parse(param.getEndTime()));
}
if (StrUtil.isNotBlank(param.getDescription())) {
updateTask.setDescription(param.getDescription());

Loading…
Cancel
Save