Commit 0cca971f authored by xixinzhao's avatar xixinzhao

fix(jg):告知保存并提交流程执行一步

parent b54d00cd
...@@ -216,11 +216,26 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN ...@@ -216,11 +216,26 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
ActWorkflowStartDTO dto = new ActWorkflowStartDTO(); ActWorkflowStartDTO dto = new ActWorkflowStartDTO();
for (int i = 0 ; i< deviceList.size(); i++) { for (int i = 0 ; i< deviceList.size(); i++) {
dto.setProcessDefinitionKey(PROCESS_DEFINITION_KEY); dto.setProcessDefinitionKey(PROCESS_DEFINITION_KEY);
dto.setBusinessKey("1");
AjaxResult ajaxResult = null; AjaxResult ajaxResult = null;
try { try {
ajaxResult = Workflow.taskClient.startByVariable(dto); ajaxResult = Workflow.taskClient.startByVariable(dto);
String instanceId = ((Map) ajaxResult.get("data")).get("id").toString(); String instanceId = ((Map) ajaxResult.get("data")).get("id").toString();
instanceIdList.add(instanceId); instanceIdList.add(instanceId);
ajaxResult = Workflow.taskClient.getTask(instanceId);
// 执行一步
JSONObject dataObject = JSON.parseObject(JSON.toJSONString(ajaxResult.get("data")));
String taskId = dataObject.getString("id");
//组装信息
TaskResultDTO taskResultDTO = new TaskResultDTO();
taskResultDTO.setResultCode("approvalStatus");
taskResultDTO.setTaskId(taskId);
taskResultDTO.setComment("提交流程");
HashMap<String, Object> map = new HashMap<>();
map.put("approvalStatus", "0");
taskResultDTO.setVariable(map);
//执行流程
Workflow.taskClient.completeByTask(taskId, taskResultDTO);
} catch (Exception e) { } catch (Exception e) {
log.error("流程启动失败:{}", e); log.error("流程启动失败:{}", e);
} }
...@@ -239,7 +254,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN ...@@ -239,7 +254,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
dto.setEquList(String.valueOf(obj.get("SEQUENCE_NBR"))); dto.setEquList(String.valueOf(obj.get("SEQUENCE_NBR")));
jgRelationEquip.setEquipId(String.valueOf(obj.get("SEQUENCE_NBR"))); jgRelationEquip.setEquipId(String.valueOf(obj.get("SEQUENCE_NBR")));
jgRelationEquip.setApplyNo(applyNo); jgRelationEquip.setApplyNo(applyNo);
jgRelationEquip.setBusinessType("GZ"); jgRelationEquip.setBusinessType(ApplicationFormTypeEnum.GZ.getCode());
if (!CollectionUtils.isEmpty(instanceIdList)) { if (!CollectionUtils.isEmpty(instanceIdList)) {
dto.setInstanceId(instanceIdList.get(i)); dto.setInstanceId(instanceIdList.get(i));
dto.setStatus(String.valueOf(FlowStatusEnum.TO_BE_PROCESSED.getCode())); dto.setStatus(String.valueOf(FlowStatusEnum.TO_BE_PROCESSED.getCode()));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment