|
@@ -49,6 +49,8 @@ import java.util.List;
|
|
|
@Controller
|
|
|
@RequestMapping(value = "${adminPath}/workadministrativeatamp/workAdministrativeAtamp")
|
|
|
public class WorkAdministrativeAtampController extends BaseController {
|
|
|
+ @Autowired
|
|
|
+ private HttpServletRequest request;
|
|
|
|
|
|
@Autowired
|
|
|
private WorkAdministrativeAtampService workAdministrativeAtampService;
|
|
@@ -102,8 +104,26 @@ public class WorkAdministrativeAtampController extends BaseController {
|
|
|
if(workAdministrativeAtamp.getOffice()==null||StringUtils.isBlank(workAdministrativeAtamp.getOffice().getId())){
|
|
|
workAdministrativeAtamp.setOffice(UserUtils.getSelectOffice());
|
|
|
}
|
|
|
+ String view = "workAdministrativeAtampForm";
|
|
|
+ String tabId = request.getParameter("tabId");
|
|
|
model.addAttribute("workAdministrativeAtamp", workAdministrativeAtamp);
|
|
|
- return "modules/workadministrativeatamp/workAdministrativeAtampForm";
|
|
|
+ if("3".equals(tabId)){
|
|
|
+ ProcessInstance processInstance = actTaskService.getProcIns(workAdministrativeAtamp.getProcessInstanceId());
|
|
|
+ if (processInstance!=null) {
|
|
|
+ Task taskInfok = actTaskService.getCurrentTaskInfo(processInstance);
|
|
|
+ Act act = new Act();
|
|
|
+ act.setTaskId(taskInfok.getId());
|
|
|
+ act.setTaskName(taskInfok.getName());
|
|
|
+ act.setTaskDefKey(taskInfok.getTaskDefinitionKey());
|
|
|
+ act.setProcDefId(taskInfok.getProcessDefinitionId());
|
|
|
+ act.setProcInsId(taskInfok.getProcessInstanceId());
|
|
|
+ act.setTask(taskInfok);
|
|
|
+ workAdministrativeAtamp.setAct(act);
|
|
|
+ view = "workAdministrativeAtampModifyApply";
|
|
|
+ }
|
|
|
+ }
|
|
|
+ return "modules/workadministrativeatamp/"+view;
|
|
|
+ //return "modules/workadministrativeatamp/workAdministrativeAtampForm";
|
|
|
}
|
|
|
|
|
|
/**
|