任务完成时间

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;
+
 
 }

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;
 }

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);
         }
     }

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();
     }