转码修改

src/main/java/com/jeeplus/modules/act/service/ActTaskService.java

@@ -6,6 +6,7 @@ package com.jeeplus.modules.act.service;
 import java.io.InputStream;
 import java.util.*;
 
+import com.jeeplus.modules.sg.managementcenter.activiti.entity.Construction;
 import org.activiti.bpmn.model.BpmnModel;
 import org.activiti.engine.FormService;
 import org.activiti.engine.HistoryService;
@@ -1105,10 +1106,12 @@ public class ActTaskService extends BaseService {
 
 	/**
 	 * 保存审核意见
+	 *
 	 * @param act
 	 */
 	@Transactional(readOnly = false)
-	public void newAuditSave(Act act) {
+	public void newAuditSave(Act act, Construction construction) {
+
 		// 设置意见
 		if ("manager".equals(act.getFlag())) {
 			act.setComment("[项目经理]");
@@ -1117,7 +1120,7 @@ public class ActTaskService extends BaseService {
 		} else {
 			act.setComment("[驳回]");
 		}
-/*		act.setComment(("yes".equals(act.getFlag())?"[同意] ":"[驳回] ")+act.getComment());*/
+		/*		act.setComment(("yes".equals(act.getFlag())?"[同意] ":"[驳回] ")+act.getComment());*/
 		act.preUpdate();
 		// 对不同环节的业务逻辑进行操作
 		String taskDefKey = act.getTaskDefKey();
@@ -1128,14 +1131,15 @@ public class ActTaskService extends BaseService {
 			vars.put("company", false);
 			vars.put("reject", false);
 		} else if ("company".equals(act.getFlag())) {
-            vars.put("manager", false);
-            vars.put("company", true);
-            vars.put("reject", false);
+			vars.put("manager", false);
+			vars.put("company", true);
+			vars.put("reject", false);
 		} else {
-            vars.put("manager", false);
-            vars.put("company", false);
-            vars.put("reject", true);
+			vars.put("manager", false);
+			vars.put("company", false);
+			vars.put("reject", true);
 		}
+		vars.put("processer", UserUtils.get(construction.getTuser().getId()).getLoginName());
 		/*vars.put("pass", "yes".equals(act.getFlag())? true : false);*/
 		complete(act.getTaskId(), act.getProcInsId(), act.getComment(), vars);
 	}

src/main/java/com/jeeplus/modules/act/web/ActTaskController.java

@@ -13,6 +13,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import com.jeeplus.common.json.AjaxJson;
+import com.jeeplus.modules.sg.managementcenter.activiti.entity.Construction;
 import org.activiti.engine.HistoryService;
 import org.activiti.engine.RepositoryService;
 import org.activiti.engine.RuntimeService;
@@ -388,9 +389,9 @@ public class ActTaskController extends BaseController {
 
 	@ResponseBody
 	@RequestMapping(value = "newAudit")
-	public AjaxJson newAuditTask(Act act) {
+	public AjaxJson newAuditTask(Act act, Construction construction) {
 		AjaxJson j = new AjaxJson();
-		actTaskService.newAuditSave(act);
+		actTaskService.newAuditSave(act,construction);
 		j.setMsg("审批成功");
 		return j;
 	}

src/main/java/com/jeeplus/modules/sg/managementcenter/activiti/web/ConstructionController.java

@@ -107,7 +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());
+			vars.put("processer", UserUtils.get(construction.getTuser().getId()).getLoginName());
 			actTaskService.complete(construction.getAct().getTaskId(), construction.getAct().getProcInsId(), construction.getAct().getComment(), construction.getContent(), vars);
 			j.setMsg("提交成功！");
 			j.getBody().put("targetUrl",  "/act/task/todo/");