public/RuoYi-Cloud-Plus
1
0
Fork 0
mirror of https://gitee.com/dromara/RuoYi-Cloud-Plus.git synced 2026-04-23 02:48:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix 修复 流程重新提交报错问题

Browse Source
This commit is contained in:
疯狂的狮子Li
2025-08-19 18:02:03 +08:00
parent 29af0a1423
commit 50fd75bfdd
4 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwInstanceBizExtServiceImpl.java
View File

@@ -39,7 +39,7 @@ public class FlwInstanceBizExtServiceImpl implements IFlwInstanceBizExtService {
.eq(FlowInstanceBizExt::getInstanceId, bo.getInstanceId())); .eq(FlowInstanceBizExt::getInstanceId, bo.getInstanceId()));
if (flowInstanceBizExt != null) { if (flowInstanceBizExt != null) {
flowInstanceBizExt.setBusinessTitle(convert.getBusinessTitle()); flowInstanceBizExt.setBusinessTitle(convert.getBusinessTitle());
return baseMapper.insertOrUpdate(convert); return baseMapper.insertOrUpdate(flowInstanceBizExt);
} }
return baseMapper.insertOrUpdate(convert); return baseMapper.insertOrUpdate(convert);
} }

10
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskServiceImpl.java
View File

@@ -110,6 +110,11 @@ public class FlwTaskServiceImpl implements IFlwTaskService {
variables.put(BUSINESS_ID, businessId); variables.put(BUSINESS_ID, businessId);
FlowInstance flowInstance = flowInstanceMapper.selectOne(new LambdaQueryWrapper<>(FlowInstance.class) FlowInstance flowInstance = flowInstanceMapper.selectOne(new LambdaQueryWrapper<>(FlowInstance.class)
.eq(FlowInstance::getBusinessId, businessId)); .eq(FlowInstance::getBusinessId, businessId));
FlowInstanceBizExtBo extBo = startProcessBo.getFlowInstanceBizExtBo();
if (ObjectUtil.isEmpty(extBo)) {
extBo = new FlowInstanceBizExtBo();
startProcessBo.setFlowInstanceBizExtBo(extBo);
}
if (ObjectUtil.isNotNull(flowInstance)) { if (ObjectUtil.isNotNull(flowInstance)) {
BusinessStatusEnum.checkStartStatus(flowInstance.getFlowStatus()); BusinessStatusEnum.checkStartStatus(flowInstance.getFlowStatus());
List<Task> taskList = taskService.list(new FlowTask().setInstanceId(flowInstance.getId())); List<Task> taskList = taskService.list(new FlowTask().setInstanceId(flowInstance.getId()));
@@ -122,12 +127,7 @@ public class FlwTaskServiceImpl implements IFlwTaskService {
buildFlowInstanceBizExt(flowInstance, startProcessBo.getFlowInstanceBizExtBo()); buildFlowInstanceBizExt(flowInstance, startProcessBo.getFlowInstanceBizExtBo());
return dto; return dto;
} }
FlowInstanceBizExtBo extBo = startProcessBo.getFlowInstanceBizExtBo();
String businessCode; String businessCode;
if (ObjectUtil.isEmpty(extBo)) {
extBo = new FlowInstanceBizExtBo();
startProcessBo.setFlowInstanceBizExtBo(extBo);
}
// 生成业务编号 // 生成业务编号
if (StringUtils.isBlank(extBo.getBusinessCode())) { if (StringUtils.isBlank(extBo.getBusinessCode())) {
//todo 按照自己业务自行修改 //todo 按照自己业务自行修改

5
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/TestLeaveServiceImpl.java
View File

@@ -108,10 +108,10 @@ public class TestLeaveServiceImpl implements ITestLeaveService {
long day = DateUtil.betweenDay(bo.getStartDate(), bo.getEndDate(), true); long day = DateUtil.betweenDay(bo.getStartDate(), bo.getEndDate(), true);
// 截止日期也算一天 // 截止日期也算一天
bo.setLeaveDays((int) day + 1); bo.setLeaveDays((int) day + 1);
bo.setApplyCode(System.currentTimeMillis() + StrUtil.EMPTY);
TestLeave add = MapstructUtils.convert(bo, TestLeave.class); TestLeave add = MapstructUtils.convert(bo, TestLeave.class);
if (StringUtils.isBlank(add.getStatus())) { if (StringUtils.isBlank(add.getStatus())) {
add.setStatus(BusinessStatusEnum.DRAFT.getStatus()); add.setStatus(BusinessStatusEnum.DRAFT.getStatus());
add.setApplyCode(System.currentTimeMillis() + StrUtil.EMPTY);
} }
boolean flag = baseMapper.insert(add) > 0; boolean flag = baseMapper.insert(add) > 0;
if (flag) { if (flag) {
@@ -126,6 +126,9 @@ public class TestLeaveServiceImpl implements ITestLeaveService {
long day = DateUtil.betweenDay(bo.getStartDate(), bo.getEndDate(), true); long day = DateUtil.betweenDay(bo.getStartDate(), bo.getEndDate(), true);
// 截止日期也算一天 // 截止日期也算一天
bo.setLeaveDays((int) day + 1); bo.setLeaveDays((int) day + 1);
if (ObjectUtil.isNull(bo.getId())) {
bo.setApplyCode(System.currentTimeMillis() + StrUtil.EMPTY);
}
TestLeave leave = MapstructUtils.convert(bo, TestLeave.class); TestLeave leave = MapstructUtils.convert(bo, TestLeave.class);
boolean flag = baseMapper.insertOrUpdate(leave); boolean flag = baseMapper.insertOrUpdate(leave);
if (flag) { if (flag) {

2
script/sql/update/update_2.4.1-2.5.0.sql
View File

@@ -56,4 +56,4 @@ create table flow_instance_biz_ext (
) ENGINE = InnoDB COMMENT '流程实例业务扩展表'; ) ENGINE = InnoDB COMMENT '流程实例业务扩展表';
ALTER TABLE `test_leave` ALTER TABLE `test_leave`
ADD COLUMN `apply_code` varchar(50) NULL DEFAULT NULL COMMENT '申请编号' AFTER `tenant_id`; ADD COLUMN `apply_code` varchar(50) NOT NULL COMMENT '申请编号' AFTER `tenant_id`;