Commit 96d98b50 authored by yangyang's avatar yangyang

fix(检验业务开通):更新按钮权限 & 数据权限

parent a5e5619b
......@@ -163,4 +163,10 @@ public class JyjcInspectionApplication extends BaseEntity {
*/
@TableField("result_type")
private String resultType;
/**
* 工作流下一个可执行节点
*/
@TableField("next_execute_ids")
private String nextExecuteIds;
}
......@@ -141,5 +141,7 @@ public class JyjcInspectionApplicationModel extends BaseModel {
@ApiModelProperty("检验结果方式")
private String resultType;
@ApiModelProperty("工作流下一个可执行节点")
private String nextExecuteIds;
}
......@@ -128,6 +128,16 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
model.setApplicationNo(UUID.randomUUID().toString());
model.setApplicationDate(new Date());
// region 获取下一个流程节点的数据
Map<String, Object> nextNodeInfo = workflowHelper.getNextWorkflowNode(model.getProcessInstanceId());
String role = (String) nextNodeInfo.get("role");
model.setNextExecuteIds(role);
if (!org.springframework.util.ObjectUtils.isEmpty(model.getWorkflowRole())) {
model.setWorkflowRole(model.getWorkflowRole() + "," + role);
} else {
model.setWorkflowRole(role);
}
// endregion
model = this.createWithModel(model);
//保存报检装备监管码
if (null != model.getEquip() && model.getEquip().size() > 0) {
......@@ -197,6 +207,15 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
}
}
model.setStatus("已提交");
execueFlow(MapBuilder.<String, Object>create().put("op", "0").put("instanceId", model.getProcessInstanceId()).put("comments", "").build());
Map<String, Object> nextNodeInfo = workflowHelper.getNextWorkflowNode(model.getProcessInstanceId());
String role = (String) nextNodeInfo.get("role");
model.setNextExecuteIds(role);
if (!org.springframework.util.ObjectUtils.isEmpty(model.getWorkflowRole())) {
model.setWorkflowRole(model.getWorkflowRole() + "," + role);
} else {
model.setWorkflowRole(role);
}
this.updateWithModel(model);
}
return model;
......@@ -406,17 +425,15 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
if (StringUtils.isNotBlank(processDescription)) {
entity.setProcessDescription(processDescription);
}
JSONObject taskJson = workflowHelper.getTask(instanceId);
if (taskJson == null) {
log.warn("流程=>{}查询不到或已结束", instanceId);
return;
Map<String, Object> nextNodeInfo = workflowHelper.getNextWorkflowNode(instanceId);
String role = (String) nextNodeInfo.get("role");
entity.setNextExecuteIds(role);
if (!org.springframework.util.ObjectUtils.isEmpty(entity.getWorkflowRole())) {
entity.setWorkflowRole(entity.getWorkflowRole() + "," + role);
} else {
entity.setWorkflowRole(role);
}
Map<String, Object> nextWorkflow = workflowHelper.getNextWorkflowNode(instanceId);
entity.setWorkflowRole((String) nextWorkflow.get("role"));
entity.setWorkflowNode(taskJson.getString("taskDefinitionKey"));
// entity.setWorkflowActiveKey();
entity.setStatus(status);
// entity.setStatusName(FlowStatusEnum.getNameByType(Long.parseLong(status)));
this.updateById(entity);
}
}
\ No newline at end of file
......@@ -127,8 +127,6 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
model.setApplyTime(new Date());
// model.setWorkflowActiveKey(dataObject.getString("taskDefinitionKey"));
model.setWorkflowProstanceId(instanceId);
// 默认自动执行第一步
execueFlow(MapBuilder.<String, Object>create().put("op", "0").put("instanceId", instanceId).put("comments", "").build());
} else {
model.setStatus(FlowStatusEnum.TO_BE_SUBMITTED.getCode() + "");
model.setStatusName(FlowStatusEnum.TO_BE_SUBMITTED.getName());
......@@ -139,7 +137,10 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
model.setUnitCodeName(companyBo.getCompanyName());
List<String> codes = createCodeService.createApplicationFormCode(ApplicationFormTypeEnum.JY.getCode(), 1);
model.setApplicationSeq(codes.get(0));
return this.createWithModel(model);
model = this.createWithModel(model);
// 默认自动执行第一步
execueFlow(MapBuilder.<String, Object>create().put("op", "0").put("instanceId", instanceId).put("comments", "").build());
return model;
} else {
return this.updateWithModel(model);
}
......@@ -356,7 +357,7 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
Workflow.taskClient.completeByTask(taskId, dto);
// 查询下节点任务
Map<String, Object> nextNodeInfo = workflowHelper.getNextWorkflowNode(instanceId);
if (op.equals("0")) {
if ("0".equals(op) && ObjectUtils.isNotEmpty(params.get("originalDataId"))) {
String originalDataId = params.get("originalDataId").toString();
JyjcOpeningApplication jyjcOpeningApplication = jyjcOpeningApplicationMapper.selectById(originalDataId);
List<String> detectionRegion = (List<String>) params.get("detectionRegion");
......
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