代码优化

ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/domain/ProcessApprove.java

@@ -56,6 +56,11 @@ public class ProcessApprove  {
      */
     private String approveName;
 
+    /**
+     * 流程开始时间
+     */
+    private Date taskTime;
+
     /**
      * 审批时间
      */

ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/domain/ProcessProgress.java

@@ -6,6 +6,7 @@ import lombok.Data;
 import lombok.experimental.Accessors;
 
 import java.io.Serial;
+import java.util.Date;
 
 /**
  * 流程进度对象 process_progress
@@ -67,4 +68,9 @@ public class ProcessProgress {
      */
     private String approveUserName;
 
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
 }

ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/domain/bo/ProcessApproveBo.java

@@ -67,6 +67,12 @@ public class ProcessApproveBo extends BaseEntity {
     @NotBlank(message = "审批人不能为空", groups = { AddGroup.class, EditGroup.class })
     private String approveName;
 
+    /**
+     * 流程开始时间
+     */
+    @NotNull(message = "流程开始时间不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Date taskTime;
+
     /**
      * 审批时间
      */

ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/domain/bo/ProcessProgressBo.java

 package org.dromara.server.domain.bo;
 
-import lombok.experimental.Accessors;
-import org.dromara.server.domain.ProcessProgress;
-import org.dromara.common.mybatis.core.domain.BaseEntity;
-import org.dromara.common.core.validate.AddGroup;
-import org.dromara.common.core.validate.EditGroup;
 import io.github.linpeilie.annotations.AutoMapper;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import jakarta.validation.constraints.*;
+import lombok.experimental.Accessors;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.server.domain.ProcessProgress;
+
+import java.util.Date;
 
 /**
  * 流程进度业务对象 process_progress
@@ -76,5 +79,10 @@ public class ProcessProgressBo extends BaseEntity {
     @NotBlank(message = "用户不能为空", groups = { AddGroup.class, EditGroup.class })
     private String approveUserName;
 
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
 
 }

ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/domain/vo/ProcessProgressVo.java

 package org.dromara.server.domain.vo;
 
-import org.dromara.server.domain.ProcessProgress;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
-import org.dromara.common.excel.annotation.ExcelDictFormat;
-import org.dromara.common.excel.convert.ExcelDictConvert;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
+import org.dromara.server.domain.ProcessProgress;
 
 import java.io.Serial;
 import java.io.Serializable;
@@ -82,5 +80,11 @@ public class ProcessProgressVo implements Serializable {
     @ExcelProperty(value = "用户")
     private String approveUserName;
 
+    /**
+     * 创建时间
+     */
+    @ExcelProperty(value = "创建时间")
+    private Date createTime;
+
 
 }

ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/service/impl/ProcessProgressServiceImpl.java

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
 import org.apache.dubbo.common.utils.CollectionUtils;
+import org.apache.dubbo.config.annotation.DubboReference;
 import org.dromara.common.core.utils.StreamUtils;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
@@ -28,6 +29,7 @@ import org.dromara.server.mapper.ProcessApproveMapper;
 import org.dromara.server.mapper.ProcessConfigMapper;
 import org.dromara.server.mapper.ProcessProgressMapper;
 import org.dromara.server.service.IProcessProgressService;
+import org.dromara.system.api.RemoteUserService;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -50,6 +52,8 @@ public class ProcessProgressServiceImpl extends AbstractBaseService<ProcessProgr
     private final ProcessProgressMapper baseMapper;
     private final ProcessConfigMapper processConfigMapper;
     private final ProcessApproveMapper processApproveMapper;
+    @DubboReference
+    private final RemoteUserService userService;
 
     @Override
     public BaseMapperPlus<ProcessProgress, ProcessProgressVo> mapper() {
@@ -127,6 +131,8 @@ public class ProcessProgressServiceImpl extends AbstractBaseService<ProcessProgr
                             .setProcessStepName(finalNextProcess.getStepName())
                             .setRelatedId(relatedId)
                             .setApproveUserId(userId)
+                            .setApproveUserName(userService.selectUserNameById(userId))
+                            .setCreateTime(new Date())
                             .setApproveType(finalNextProcess.getApproveType());
                     }).collect(Collectors.toList());
                 baseMapper.insertBatch(ppList);
@@ -153,6 +159,7 @@ public class ProcessProgressServiceImpl extends AbstractBaseService<ProcessProgr
         bo.setApproveUserId(userId);
         bo.setApproveName(LoginHelper.getUsername());
         bo.setApproveTime(new Date());
+        bo.setTaskTime(progress.getCreateTime());
         processApproveMapper.insert(BeanUtil.copyProperties(bo, ProcessApprove.class));
         if (bo.getPass()) {
             //判断是否是或签