diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/PsTaskAppoint.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/PsTaskAppoint.java index 6e5e829..c831f11 100644 --- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/PsTaskAppoint.java +++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/PsTaskAppoint.java @@ -6,6 +6,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import java.io.Serial; +import java.util.Date; /** * 任务委派对象 ps_task_appoint @@ -61,5 +62,10 @@ public class PsTaskAppoint extends TenantEntity { @TableLogic private Long delFlag; + /** + * 任务完成时间 + */ + private Date finishDate; + } diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/PsTaskMain.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/PsTaskMain.java index bef8425..93d8888 100644 --- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/PsTaskMain.java +++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/PsTaskMain.java @@ -79,4 +79,8 @@ public class PsTaskMain extends TenantEntity { * 派单操作人 */ private Long operateUser; + /** + * 任务完成时间 + */ + private Date finishDate; } diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/approver/impl/TaskFinishApproverServiceImpl.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/approver/impl/TaskFinishApproverServiceImpl.java index e5d323d..a971b82 100644 --- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/approver/impl/TaskFinishApproverServiceImpl.java +++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/approver/impl/TaskFinishApproverServiceImpl.java @@ -16,6 +16,8 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; +import java.util.Date; + /** * 任务完成审批 */ @@ -39,6 +41,7 @@ public class TaskFinishApproverServiceImpl extends ApproverAbstractServiceImpl { PsTaskAppoint info = taskAppointMapper.selectById(psApproverRecord.getBusinessId()); if(!StringUtils.equals(info.getAppointStatus(),TaskStatusEnum.AppointStatusEnum.CANCEL.getCode())){ info.setAppointStatus(TaskStatusEnum.AppointStatusEnum.FINISH.getCode()); + info.setFinishDate(new Date()); taskAppointMapper.updateById(info); } } diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsTaskServiceImpl.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsTaskServiceImpl.java index c7bbf87..3809ab7 100644 --- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsTaskServiceImpl.java +++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsTaskServiceImpl.java @@ -326,6 +326,7 @@ public class PsTaskServiceImpl implements IPsTaskService { throw new ServiceException("操作失败,子任务未完成"); } main.setTaskStatus(TaskStatusEnum.FINISH.getCode()); + main.setFinishDate(new Date()); baseMapper.updateById(main); return main.getContractCode(); }