mengxu/pusong-crm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

任务完成时间

Browse Source
This commit is contained in:
1073413548 2024-09-11 13:07:25 +08:00
parent b70c0d5667
commit f85b6750de
4 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/PsTaskAppoint.java
View File

@ -6,6 +6,7 @@ import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import java.io.Serial; import java.io.Serial;
import java.util.Date;
/** /**
* 任务委派对象 ps_task_appoint * 任务委派对象 ps_task_appoint
@ -61,5 +62,10 @@ public class PsTaskAppoint extends TenantEntity {
@TableLogic @TableLogic
private Long delFlag; private Long delFlag;
/**
* 任务完成时间
*/
private Date finishDate;
} }

4
pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/PsTaskMain.java
View File

@ -79,4 +79,8 @@ public class PsTaskMain extends TenantEntity {
* 派单操作人 * 派单操作人
*/ */
private Long operateUser; private Long operateUser;
/**
* 任务完成时间
*/
private Date finishDate;
} }

3
pusong-modules/pusong-business/src/main/java/com/pusong/business/service/approver/impl/TaskFinishApproverServiceImpl.java
View File

@ -16,6 +16,8 @@ import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.Date;
/** /**
* 任务完成审批 * 任务完成审批
*/ */
@ -39,6 +41,7 @@ public class TaskFinishApproverServiceImpl extends ApproverAbstractServiceImpl {
PsTaskAppoint info = taskAppointMapper.selectById(psApproverRecord.getBusinessId()); PsTaskAppoint info = taskAppointMapper.selectById(psApproverRecord.getBusinessId());
if(!StringUtils.equals(info.getAppointStatus(),TaskStatusEnum.AppointStatusEnum.CANCEL.getCode())){ if(!StringUtils.equals(info.getAppointStatus(),TaskStatusEnum.AppointStatusEnum.CANCEL.getCode())){
info.setAppointStatus(TaskStatusEnum.AppointStatusEnum.FINISH.getCode()); info.setAppointStatus(TaskStatusEnum.AppointStatusEnum.FINISH.getCode());
info.setFinishDate(new Date());
taskAppointMapper.updateById(info); taskAppointMapper.updateById(info);
} }
} }

1
pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsTaskServiceImpl.java
View File

@ -326,6 +326,7 @@ public class PsTaskServiceImpl implements IPsTaskService {
throw new ServiceException("操作失败，子任务未完成"); throw new ServiceException("操作失败，子任务未完成");
} }
main.setTaskStatus(TaskStatusEnum.FINISH.getCode()); main.setTaskStatus(TaskStatusEnum.FINISH.getCode());
main.setFinishDate(new Date());
baseMapper.updateById(main); baseMapper.updateById(main);
return main.getContractCode(); return main.getContractCode();
} }