|
@@ -1,10 +1,7 @@
|
|
|
package com.gyee.frame.service.impl.ticket;
|
|
|
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
-import com.gyee.frame.model.ticket.Wfassignment;
|
|
|
-import com.gyee.frame.model.ticket.Wfinstance;
|
|
|
-import com.gyee.frame.model.ticket.Wfnode;
|
|
|
-import com.gyee.frame.model.ticket.Wftrans;
|
|
|
+import com.gyee.frame.model.ticket.*;
|
|
|
import com.gyee.frame.mapper.ticket.WftransMapper;
|
|
|
import com.gyee.frame.service.ticket.*;
|
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
@@ -27,6 +24,8 @@ import java.util.List;
|
|
|
public class WftransServiceImpl extends ServiceImpl<WftransMapper, Wftrans> implements WftransService {
|
|
|
|
|
|
@Autowired
|
|
|
+ IbsidgenService ibsidgenService;
|
|
|
+ @Autowired
|
|
|
WfactionService wfactionService;
|
|
|
@Autowired
|
|
|
WfinstanceService wfinstanceService;
|
|
@@ -37,10 +36,6 @@ public class WftransServiceImpl extends ServiceImpl<WftransMapper, Wftrans> impl
|
|
|
@Autowired
|
|
|
WfnodeService wfnodeService;
|
|
|
|
|
|
- @Override
|
|
|
- public int selectMaxId() {
|
|
|
- return baseMapper.selectMaxId();
|
|
|
- }
|
|
|
|
|
|
@Override
|
|
|
public List<Wftrans> listTrans(double instanceId) {
|
|
@@ -66,18 +61,24 @@ public class WftransServiceImpl extends ServiceImpl<WftransMapper, Wftrans> impl
|
|
|
if (node == null)
|
|
|
return false;
|
|
|
|
|
|
- int maxId = selectMaxId();
|
|
|
+ Ibsidgen gen = ibsidgenService.selectId("WFTRANS");
|
|
|
+ double id = gen.getIdvalue();
|
|
|
+
|
|
|
// 流程结束
|
|
|
if (node.getNodetype().equals("结束")){
|
|
|
wfinstanceService.updateInstance(instId, currNodeId, "否");
|
|
|
// 更新之前的待办任务
|
|
|
Wfassignment assignment = wfassignmentService.updateAssignment(instId, version, ownerId, wfName, processor);
|
|
|
// 插入事务
|
|
|
- saveTrans((double)maxId + 1, preNodeId, instId, assignment.getId(), actionId, "任务", "任务",
|
|
|
+ saveTrans(id += 1, preNodeId, instId, assignment.getId(), actionId, "任务", "任务",
|
|
|
wfName, version, instance.getOwnertable(), ownerId, assignment.getAssigncode());
|
|
|
// 插入结束事务
|
|
|
- saveTrans((double)maxId + 2, currNodeId, instId, 0, actionId, "结束", "结束",
|
|
|
+ saveTrans(id += 2, currNodeId, instId, 0, actionId, "结束", "结束",
|
|
|
wfName, version, instance.getOwnertable(), ownerId, assignment.getAssigncode());
|
|
|
+
|
|
|
+ //更新主键
|
|
|
+ ibsidgenService.updateGen(gen, id);
|
|
|
+
|
|
|
// 更新票据状态
|
|
|
workticketService.updateTicket(ownerId, preNodeId, currNodeId);
|
|
|
}else {
|
|
@@ -89,9 +90,12 @@ public class WftransServiceImpl extends ServiceImpl<WftransMapper, Wftrans> impl
|
|
|
instance.getStartor(), instance.getOwnertable(), role, labors);
|
|
|
|
|
|
// 插入事务
|
|
|
- saveTrans((double)maxId + 1, preNodeId, instId, assignment.getId(), actionId, "任务", "任务",
|
|
|
+ saveTrans(id += 1, preNodeId, instId, assignment.getId(), actionId, "任务", "任务",
|
|
|
wfName, version, instance.getOwnertable(), ownerId, assignment.getAssigncode());
|
|
|
|
|
|
+ //更新主键
|
|
|
+ ibsidgenService.updateGen(gen, id);
|
|
|
+
|
|
|
// 更新票据状态
|
|
|
workticketService.updateTicket(ownerId, preNodeId, currNodeId);
|
|
|
}
|