|
@@ -318,19 +318,19 @@ public class ActivitiServiceImpl implements ActivitiService {
|
|
tfFlowApproveService.save(new TFFlowApprove(sysUser.getSchoolId(), sysUser.getOrgId(), SystemConstant.convertIdToLong(flowId), sysUser.getId(), flowStatusEnum, sysUser.getId()));
|
|
tfFlowApproveService.save(new TFFlowApprove(sysUser.getSchoolId(), sysUser.getOrgId(), SystemConstant.convertIdToLong(flowId), sysUser.getId(), flowStatusEnum, sysUser.getId()));
|
|
|
|
|
|
Long objectId = (Long) map.get(SystemConstant.OBJECT_ID);
|
|
Long objectId = (Long) map.get(SystemConstant.OBJECT_ID);
|
|
- //TODO 测试用
|
|
|
|
- if (flowType == TFCustomTypeEnum.ELECTRON_FLOW) {//如果是电子交卷审核,就查询命题任务
|
|
|
|
- ExamTask examTask = examTaskService.getById(objectId);
|
|
|
|
- examTask.setFlowId(SystemConstant.convertIdToLong(flowId));
|
|
|
|
- examTaskService.updateById(examTask);
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- String id = (String) map.get(SystemConstant.FLOW_ENTITY_ID);
|
|
|
|
- TFFlowJoin tfFlowJoin = tfFlowJoinService.findByFlowLevel(objectId);
|
|
|
|
- tfFlowJoin.setFlowEntityId(SystemConstant.convertIdToLong(id));
|
|
|
|
- tfFlowJoin.setFlowId(SystemConstant.convertIdToLong(flowId));
|
|
|
|
- tfFlowJoin.setObjectTable(flowType.getTable());
|
|
|
|
- tfFlowJoinService.updateById(tfFlowJoin);
|
|
|
|
|
|
+// //TODO 测试用
|
|
|
|
+// if (flowType == TFCustomTypeEnum.ELECTRON_FLOW) {//如果是电子交卷审核,就查询命题任务
|
|
|
|
+// ExamTask examTask = examTaskService.getById(objectId);
|
|
|
|
+// examTask.setFlowId(SystemConstant.convertIdToLong(flowId));
|
|
|
|
+// examTaskService.updateById(examTask);
|
|
|
|
+// }
|
|
|
|
+//
|
|
|
|
+// String id = (String) map.get(SystemConstant.FLOW_ENTITY_ID);
|
|
|
|
+// TFFlowJoin tfFlowJoin = tfFlowJoinService.findByFlowLevel(objectId);
|
|
|
|
+// tfFlowJoin.setFlowEntityId(SystemConstant.convertIdToLong(id));
|
|
|
|
+// tfFlowJoin.setFlowId(SystemConstant.convertIdToLong(flowId));
|
|
|
|
+// tfFlowJoin.setObjectTable(flowType.getTable());
|
|
|
|
+// tfFlowJoinService.updateById(tfFlowJoin);
|
|
|
|
|
|
tfFlowLogService.save(new TFFlowLog(sysUser.getSchoolId(), sysUser.getOrgId(), SystemConstant.convertIdToLong(flowId), objectId, sysUser.getId(), sysUser.getId(), "提交流程", approveId, FlowApproveOperationEnum.SUBMIT, flowType.getTable()));
|
|
tfFlowLogService.save(new TFFlowLog(sysUser.getSchoolId(), sysUser.getOrgId(), SystemConstant.convertIdToLong(flowId), objectId, sysUser.getId(), sysUser.getId(), "提交流程", approveId, FlowApproveOperationEnum.SUBMIT, flowType.getTable()));
|
|
}
|
|
}
|