|
|
@@ -67,49 +67,12 @@ public class ConstructionController extends BaseController {
|
|
|
*/
|
|
|
@RequestMapping(value = "form/{mode}")
|
|
|
public String form(@PathVariable String mode, Construction construction, Model model) {
|
|
|
-// String proId = construction.getAct().getProcDefId();
|
|
|
-// String pInId = construction.getProcInsId();
|
|
|
-// ProcessEngine processEngine = ProcessEngines.getDefaultProcessEngine();
|
|
|
-// RepositoryService rs = processEngine.getRepositoryService();
|
|
|
//根据流程定义号获取所有的定义流程
|
|
|
model.addAttribute("construction", construction);
|
|
|
// model.addAttribute("roleCodes");
|
|
|
if ("add".equals(mode) || "edit".equals(mode)) {
|
|
|
return "modules/sg/managementcenter/activiti/constructionForm";
|
|
|
} else {//audit(施工单位，项目经理组织交底)
|
|
|
- /* List<Task> tasks = taskService.createTaskQuery().processInstanceId(pInId).list();
|
|
|
- //对流程循环
|
|
|
- for (Task task : tasks) {
|
|
|
- //根据流程的定义号获取信息
|
|
|
- ProcessDefinitionEntity def = (ProcessDefinitionEntity) ((RepositoryServiceImpl) rs).getDeployedProcessDefinition(task.getProcessDefinitionId());
|
|
|
- //获取流程中所有的节点信息
|
|
|
- List<ActivityImpl> activitiList = def.getActivities(); //rs是指RepositoryService的实例
|
|
|
- String excId = task.getExecutionId();
|
|
|
- ExecutionEntity execution = (ExecutionEntity) runtimeService.createExecutionQuery().executionId(excId).singleResult();
|
|
|
- //获取当前节点id
|
|
|
- String activitiId = execution.getActivityId();
|
|
|
- for (ActivityImpl activityImpl : activitiList) {
|
|
|
- String id = activityImpl.getId();
|
|
|
- if (activitiId.equals(id)) {
|
|
|
- System.out.println("当前任务：" + activityImpl.getProperty("name")); //输出某个节点的某种属性
|
|
|
- List<PvmTransition> outTransitions = activityImpl.getOutgoingTransitions();//获取从某个节点出来的所有线路
|
|
|
- for (PvmTransition tr : outTransitions) {
|
|
|
- PvmActivity ac = tr.getDestination();//获取线路的终点节点
|
|
|
- List<PvmTransition> outgoingTransitions = ac.getOutgoingTransitions();
|
|
|
- for (PvmTransition tr2 : outgoingTransitions) {
|
|
|
- PvmActivity ac2 = tr2.getDestination();//获取线路的终点节点
|
|
|
- ActivityImpl activityImpl2 = def.findActivity(ac2.getId());
|
|
|
- TaskDefinition taskDef = (TaskDefinition) activityImpl2.getProperties().get("taskDefinition");
|
|
|
- if (taskDef != null) {
|
|
|
- Set<Expression> roleCodes = taskDef.getCandidateGroupIdExpressions();//候选组
|
|
|
- System.out.println("候选组是" + roleCodes.toString());
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
- break;
|
|
|
- }
|
|
|
- }
|
|
|
- }*/
|
|
|
return "modules/sg/managementcenter/activiti/constructionAudit";
|
|
|
}
|
|
|
|
|
|
@@ -133,11 +96,8 @@ public class ConstructionController extends BaseController {
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
- * 配网运行人员
|
|
|
+ * 配网运行人员判定设计变更
|
|
|
* */
|
|
|
- /**
|
|
|
- * 查看，增加，编辑请假申请表单页面
|
|
|
- */
|
|
|
@RequestMapping(value = "operatorDesignChange")
|
|
|
public String form3(Construction construction, Model model) {
|
|
|
//根据流程定义号获取所有的定义流程
|
|
|
@@ -297,9 +257,7 @@ public class ConstructionController extends BaseController {
|
|
|
return "modules/sg/managementcenter/activiti/documentsForm";
|
|
|
}
|
|
|
|
|
|
- public void updateStatus(String status, String id) {
|
|
|
|
|
|
- }
|
|
|
|
|
|
/**
|
|
|
* 保存请假申请
|
|
|
@@ -343,7 +301,7 @@ public class ConstructionController extends BaseController {
|
|
|
List<Project> listById = projectService.findListById(proListId);
|
|
|
//循环项目信息
|
|
|
for (Project each : listById) {
|
|
|
- //从项目信息种获取施工单位字段
|
|
|
+ //从项目信息种获取交底类型
|
|
|
constructionUnit = each.getClarificaitonType();
|
|
|
//如果施工单位不为空，系统判读施工单位交底
|
|
|
if ("施工单位自行交底".equals(constructionUnit)) {
|
xs