diff --git a/jeecg-boot-platform/jeecg-boot-module-bpm-flowable/src/main/java/org/jeecg/modules/extbpm/listener/task/TaskCreatedAutoSubmitListener.java b/jeecg-boot-platform/jeecg-boot-module-bpm-flowable/src/main/java/org/jeecg/modules/extbpm/listener/task/TaskCreatedAutoSubmitListener.java index c961cba..667bfc3 100644 --- a/jeecg-boot-platform/jeecg-boot-module-bpm-flowable/src/main/java/org/jeecg/modules/extbpm/listener/task/TaskCreatedAutoSubmitListener.java +++ b/jeecg-boot-platform/jeecg-boot-module-bpm-flowable/src/main/java/org/jeecg/modules/extbpm/listener/task/TaskCreatedAutoSubmitListener.java @@ -99,6 +99,8 @@ public class TaskCreatedAutoSubmitListener implements TaskListener { bpmlog.setTaskId(delegateTask.getId()); bpmlog.setTaskName(delegateTask.getName()); extActBpmLogService.save(bpmlog); + // 首节点自动完成原本只写旧日志,这里同步补写新审批历史表用于页面展示。 + extActBpmLogService.saveSystemApprovalOpinion(bpmlog, delegateTask.getCreateTime()); //---------------------------------------------------------------------------- } diff --git a/jeecg-boot-platform/jeecg-boot-module-bpm-flowable/src/main/java/org/jeecg/modules/extbpm/process/service/IExtActBpmLogService.java b/jeecg-boot-platform/jeecg-boot-module-bpm-flowable/src/main/java/org/jeecg/modules/extbpm/process/service/IExtActBpmLogService.java index 430b50f..00f7425 100644 --- a/jeecg-boot-platform/jeecg-boot-module-bpm-flowable/src/main/java/org/jeecg/modules/extbpm/process/service/IExtActBpmLogService.java +++ b/jeecg-boot-platform/jeecg-boot-module-bpm-flowable/src/main/java/org/jeecg/modules/extbpm/process/service/IExtActBpmLogService.java @@ -5,6 +5,7 @@ import org.jeecg.modules.bpm.dto.CommentVo; import org.jeecg.modules.extbpm.process.entity.ExtActBpmLog; import com.baomidou.mybatisplus.extension.service.IService; +import java.util.Date; import java.util.List; import java.util.Map; @@ -48,6 +49,14 @@ public interface IExtActBpmLogService extends IService { * @param rejectDescription 驳回理由 */ void saveBpmLog(String username, String reason, Task task, String processInstanceId, String rejectDescription); + + /** + * 将已写入旧审批日志的系统记录同步写入新审批历史表。 + * + * @param bpmLog 旧审批日志 + * @param startTime 任务创建时间 + */ + void saveSystemApprovalOpinion(ExtActBpmLog bpmLog, Date startTime); /** diff --git a/jeecg-boot-platform/jeecg-boot-module-bpm-flowable/src/main/java/org/jeecg/modules/extbpm/process/service/impl/ExtActBpmLogServiceImpl.java b/jeecg-boot-platform/jeecg-boot-module-bpm-flowable/src/main/java/org/jeecg/modules/extbpm/process/service/impl/ExtActBpmLogServiceImpl.java index 45f82eb..b3b0c79 100644 --- a/jeecg-boot-platform/jeecg-boot-module-bpm-flowable/src/main/java/org/jeecg/modules/extbpm/process/service/impl/ExtActBpmLogServiceImpl.java +++ b/jeecg-boot-platform/jeecg-boot-module-bpm-flowable/src/main/java/org/jeecg/modules/extbpm/process/service/impl/ExtActBpmLogServiceImpl.java @@ -208,6 +208,35 @@ public class ExtActBpmLogServiceImpl extends ServiceImpl