|
@@ -12,6 +12,7 @@ import com.jeeplus.modules.act.service.ActProcessService;
|
|
|
import com.jeeplus.modules.act.service.ActTaskService;
|
|
|
import com.jeeplus.modules.sg.managementcenter.activiti.entity.Construction;
|
|
|
import com.jeeplus.modules.sg.managementcenter.activiti.service.ConstructionService;
|
|
|
+import com.jeeplus.modules.sys.utils.UserUtils;
|
|
|
import com.jeeplus.modules.test.activiti.entity.OALeave;
|
|
|
import com.jeeplus.modules.test.activiti.service.OALeaveService;
|
|
|
import org.activiti.engine.repository.ProcessDefinition;
|
|
@@ -93,8 +94,10 @@ public class ConstructionController extends BaseController {
|
|
|
constructionService.save(construction);//保存
|
|
|
// 启动流程
|
|
|
ProcessDefinition p = actProcessService.getProcessDefinition(construction.getAct().getProcDefId());
|
|
|
+ Map<String, Object> vars = Maps.newHashMap();
|
|
|
+ vars.put("processer", UserUtils.get(construction.getTuser().getId()).getLoginName());
|
|
|
String title = construction.getCurrentUser().getName()+"在"+ DateUtils.getDateTime()+"发起"+p.getName();
|
|
|
- actTaskService.startProcess(p.getKey(), "xm_construction_clarificaiton", construction.getId(), title);
|
|
|
+ actTaskService.startProcessNew(p.getKey(), "xm_construction_clarificaiton", construction.getId(), title,vars);
|
|
|
j.setMsg("发起流程审批成功!");
|
|
|
j.getBody().put("targetUrl", "/act/task/process/");
|
|
|
}else{
|
|
@@ -104,6 +107,7 @@ public class ConstructionController extends BaseController {
|
|
|
// 完成流程任务
|
|
|
Map<String, Object> vars = Maps.newHashMap();
|
|
|
vars.put("reapply", "yes".equals(construction.getAct().getFlag())? true : false);
|
|
|
+ vars.put("processer", construction.getUser().getId());
|
|
|
actTaskService.complete(construction.getAct().getTaskId(), construction.getAct().getProcInsId(), construction.getAct().getComment(), construction.getContent(), vars);
|
|
|
j.setMsg("提交成功!");
|
|
|
j.getBody().put("targetUrl", "/act/task/todo/");
|