sz-team/supervision-test-repo
17
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

yxk-20260525-审批意见表新增办理开始时间字段，并写入

Browse Source
This commit is contained in:
ye1023
2026-05-25 10:06:01 +08:00
parent fb08ab0f01
commit f5c980841b
2 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jeecg-boot-platform/jeecg-boot-module-bpm-flowable/src/main/java/org/jeecg/modules/extbpm/process/service/impl/ExtActBpmLogServiceImpl.java
+9 -4
View File
@@ -119,7 +119,8 @@ public class ExtActBpmLogServiceImpl extends ServiceImpl<ExtActBpmLogMapper, Ext
//写入新的审批意见表
saveTaskApprovalOpinion(bpmlog, processInstance, RECORD_TYPE_PROCESS,
resolveHandleActionType(map, rejectDescription), resolveActionResult(reason, "同意"));
resolveHandleActionType(map, rejectDescription), resolveActionResult(reason, "同意"),
task != null ? task.getCreateTime() : null);
}
@Override
@@ -153,7 +154,8 @@ public class ExtActBpmLogServiceImpl extends ServiceImpl<ExtActBpmLogMapper, Ext
this.baseMapper.insert(taskLog);
saveTaskApprovalOpinion(taskLog, processInstance, RECORD_TYPE_SYSTEM,
resolveSystemActionType(comment), resolveActionResult(comment, "系统记录"));
resolveSystemActionType(comment), resolveActionResult(comment, "系统记录"),
task != null ? task.getCreateTime() : null);
}
/**
@@ -186,7 +188,8 @@ public class ExtActBpmLogServiceImpl extends ServiceImpl<ExtActBpmLogMapper, Ext
bpmlog.setTaskName(task.getName());
this.baseMapper.insert(bpmlog);
saveTaskApprovalOpinion(bpmlog, processInstance, RECORD_TYPE_PROCESS, ACTION_ADD_SIGN, resolveActionResult(reason, "加签"));
saveTaskApprovalOpinion(bpmlog, processInstance, RECORD_TYPE_PROCESS, ACTION_ADD_SIGN, resolveActionResult(reason, "加签"),
task != null ? task.getCreateTime() : null);
}
@Override
@@ -200,7 +203,8 @@ public class ExtActBpmLogServiceImpl extends ServiceImpl<ExtActBpmLogMapper, Ext
* 以旧表写入结果为准，新审批意见表只做尽力双写，失败不能影响办理主流程。
*/
private void saveTaskApprovalOpinion(ExtActBpmLog bpmLog, ProcessInstance processInstance,
String recordType, String actionType, String actionResult) {
String recordType, String actionType, String actionResult,
Date startTime) {
try {
TaskApprovalOpinion opinion = new TaskApprovalOpinion();
opinion.setRecordType(recordType);
@@ -214,6 +218,7 @@ public class ExtActBpmLogServiceImpl extends ServiceImpl<ExtActBpmLogMapper, Ext
opinion.setOpUserId(bpmLog.getOpUserId());
opinion.setOpUserName(bpmLog.getOpUserName());
opinion.setOpTime(bpmLog.getOpTime());
opinion.setStartTime(startTime);
opinion.setDelFlag("0");
opinion.setCreateBy(bpmLog.getOpUserId());
opinion.setCreateTime(bpmLog.getOpTime());
jeecg-boot-platform/jeecg-boot-module-bpm-flowable/src/main/java/org/jeecg/modules/taskapprovalopinion/entity/TaskApprovalOpinion.java
+5
View File
@@ -77,6 +77,11 @@ public class TaskApprovalOpinion implements Serializable {
@Schema(description = "办理人部门编码")
private String opDeptCode;
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Schema(description = "开始时间")
private Date startTime;
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Schema(description = "办理时间")