修改

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

@@ -1547,7 +1547,7 @@ public class ActTaskService extends BaseService {
 	 * @param act
 	 */
 	@Transactional(readOnly = false)
-	public void specially(Act act,String fullName) {
+	public void specially(Act act) {
 		// 设置意见
 		act.setComment(("yes".equals(act.getFlag())?"[没有问题] ":"[驳回] ")+act.getComment());
 		act.preUpdate();
@@ -1561,8 +1561,8 @@ public class ActTaskService extends BaseService {
 			vars.put("operators", user.getRunUnitRole());
 		} else {
 			//驳回到项目经理人工判断问题
-			String manager2 = MyActiviUtils.findHistoryActivity(act.getProcInsId(), "交底:项目经理人工判断问题");
-				vars.put("processer",manager2);
+			Project user = MyActiviUtils.findUser(act.getProcInsId());
+				vars.put("processer",user.getProjectManageRole());
 		}
 //		vars.put("yes".equals(act.getFlag())?"operators":"processer",fullName);
 		vars.put("flagNo","yes".equals(act.getFlag())?false:true);
@@ -1607,12 +1607,11 @@ public class ActTaskService extends BaseService {
 		String taskDefKey = act.getTaskDefKey();
 		// 提交流程任务
 		Map<String, Object> vars = Maps.newHashMap();
+		Project user = MyActiviUtils.findUser(act.getProcInsId());
 		if ("yes".equals(flag)) {
-			Project user = MyActiviUtils.findUser(act.getProcInsId());
 			vars.put("systemfulltime", user.getDistributionSystem());
 		} else {
-			String itemClose = MyActiviUtils.findHistoryActivity(act.getProcInsId(), "交底:判断项目是否需要关闭");
-			vars.put("itemClose",itemClose );
+			vars.put("itemClose",user.getDistributionEngineering());
 		}
 //		vars.put("yes".equals(act.getFlag())?"systemfulltime":"itemClose","yes".equals(act.getFlag())?fullTime:fullTime);
 		vars.put("systemNo","yes".equals(act.getFlag())?false:true);
@@ -1830,19 +1829,13 @@ public class ActTaskService extends BaseService {
 		String flag = act.getFlag();
 		vars.put("sealYes", false);
 		vars.put("sealNo", false);
+		Project user = MyActiviUtils.findUser(act.getProcInsId());
 		if ("yes".equals(flag)) {
-			Project user = MyActiviUtils.findUser(act.getProcInsId());
 			vars.put("sealPerson",user.getDistributionPolicy());
 			act.setComment("[没有问题]"+act.getComment());
 			vars.put("sealYes", true);
 		} else {
-			String manager2 = MyActiviUtils.findHistoryActivity(act.getProcInsId(), "交底:项目经理人工判断问题");
-			String manager = MyActiviUtils.findHistoryActivity(act.getProcInsId(), "交底:项目经理组织交底");
-			if (manager2!=null&&manager2!="") {
-				vars.put("phasePerson",manager2);
-			}else if (manager!=null&&manager!="") {
-				vars.put("phasePerson",manager);
-			}
+			vars.put("phasePerson",user.getProjectManageRole());
 			act.setComment("[驳回]" + act.getComment());
 			vars.put("sealNo", true);
 		}
@@ -1867,8 +1860,8 @@ public class ActTaskService extends BaseService {
 			act.setComment("[没有问题]"+act.getComment());
 			vars.put("receiptYes", true);
 		} else {
-			String coveredPerson = MyActiviUtils.findHistoryActivity(act.getProcInsId(), "交底:上传未盖章施工方案(行政政处(城区道路))");
-			vars.put("coveredPerson",coveredPerson);
+			Project user = MyActiviUtils.findUser(act.getProcInsId());
+			vars.put("coveredPerson",user.getConstructionUnitRole());
 			act.setComment("[驳回]" + act.getComment());
 			vars.put("receiptNo", true);
 		}
@@ -1920,8 +1913,8 @@ public class ActTaskService extends BaseService {
 			act.setComment("[没有问题]"+act.getComment());
 			vars.put("singleYes", true);
 		} else {
-			String coveredPerson = MyActiviUtils.findHistoryActivity(act.getProcInsId(), "交底:上传未盖章施工方案(行政政处(城区道路))");
-			vars.put("coveredPerson",coveredPerson);
+			Project user = MyActiviUtils.findUser(act.getProcInsId());
+			vars.put("coveredPerson",user.getConstructionUnitRole());
 			act.setComment("[驳回]" + act.getComment());
 			vars.put("singleNo", true);
 		}
@@ -1947,8 +1940,8 @@ public class ActTaskService extends BaseService {
 			act.setComment("[没有问题]"+act.getComment());
 			vars.put("policyYes", true);
 		} else {
-			String coveredPerson = MyActiviUtils.findHistoryActivity(act.getProcInsId(), "交底:上传未盖章施工方案(行政政处(城区道路))");
-			vars.put("coveredPerson",coveredPerson);
+			Project user = MyActiviUtils.findUser(act.getProcInsId());
+			vars.put("coveredPerson",user.getConstructionUnitRole());
 			act.setComment("[驳回]" + act.getComment());
 			vars.put("singleNo", true);
 		}
@@ -1970,12 +1963,12 @@ public class ActTaskService extends BaseService {
         vars.put("finishYes", false);
         vars.put("finishNo", false);
         if ("yes".equals(flag)) {
-            act.setComment("[没有问题]"+act.getComment());
+            act.setComment(act.getComment());
             vars.put("finishYes", true);
         } else {
-			String coveredPerson = MyActiviUtils.findHistoryActivity(act.getProcInsId(), "交底:上传未盖章施工方案(行政政处(城区道路))");
-			vars.put("coveredPerson",coveredPerson);
-            act.setComment("[驳回]" + act.getComment());
+			Project user = MyActiviUtils.findUser(act.getProcInsId());
+			vars.put("coveredPerson",user.getConstructionUnitRole());
+            act.setComment(act.getComment());
             vars.put("finishNo", true);
         }
         // 设置意见

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

@@ -826,13 +826,13 @@ public class ActTaskController extends BaseController {
 	 */
 	@ResponseBody
 	@RequestMapping(value = "speciallyTask")
-	public AjaxJson speciallyTask(Act act,String fullName,String tuser,Construction construction) {
+	public AjaxJson speciallyTask(Act act,String tuser,Construction construction) {
 		AjaxJson j = new AjaxJson();
 
 		try {
 			String comment = URLDecoder.decode(act.getComment(), "UTF-8");
 			act.setComment(comment);
-			actTaskService.specially(act,fullName);
+			actTaskService.specially(act);
 		} catch (UnsupportedEncodingException e) {
 			e.printStackTrace();
 		}

src/main/webapp/webpage/modules/sg/managementcenter/activiti/departmentForm.jsp

@@ -2,7 +2,7 @@
 <%@ include file="/webpage/include/taglib.jsp"%>
 <html>
 <head>
-	<title>配网系统专职</title>
+	<title>项目关闭</title>
 	<meta name="decorator" content="ani"/>
 	<!-- SUMMERNOTE -->
 	<%@include file="/webpage/include/summernote.jsp" %>

src/main/webapp/webpage/modules/sg/managementcenter/activiti/documentsForm.jsp

@@ -37,33 +37,24 @@
                 })
             });
             $("#no").click(function () {
-                $("#agree").click(function () {
-                    var pic = $("#pic").val();
-                    if (pic == "" || pic == null) {
-                        jp.error("请上传收据");
-                        return;
-                    }
-                    var currentFileValues = $("input[name='pic']").val();
-                    jp.prompt("结束", function (message) {
-                        jp.post("${ctx}/act/task/policyPay1Task",
-                            {
-                                "taskId": "${construction.act.taskId}",
-                                "taskName": "${construction.act.taskName}",
-                                "taskDefKey": "${construction.act.taskDefKey}",
-                                "procInsId": "${construction.act.procInsId}",
-                                "procDefId": "${construction.act.procDefId}",
-                                "pic": currentFileValues,
-                                "flag": "no",
-                                "comment": window.encodeURI(message)
-                            },
-                            function (data) {
-                                if (data.success) {
-                                    jp.success(data.msg);
-                                    jp.go("${ctx}/act/task/todo")
-                                }
-                            })
-                    })
-                });
+                jp.prompt("驳回", function (message) {
+                    jp.post("${ctx}/act/task/policyPay1Task",
+                        {
+                            "taskId": "${construction.act.taskId}",
+                            "taskName": "${construction.act.taskName}",
+                            "taskDefKey": "${construction.act.taskDefKey}",
+                            "procInsId": "${construction.act.procInsId}",
+                            "procDefId": "${construction.act.procDefId}",
+                            "flag": "no",
+                            "comment": window.encodeURI(message)
+                        },
+                        function (data) {
+                            if (data.success) {
+                                jp.success(data.msg);
+                                jp.go("${ctx}/act/task/todo")
+                            }
+                        })
+                })
             })
         })
 	</script>
@@ -423,7 +414,7 @@
 							<div class="col-sm-6">
 								<div class="form-group text-center">
 									<input id="agree" class="btn  btn-primary btn-lg btn-parsley" type="submit" value="审核" />&nbsp;
-									<input id="no" class="btn  btn-danger btn-lg btn-parsley" type="submit" value="结束" />
+									<input id="no" class="btn  btn-danger btn-lg btn-parsley" type="submit" value="驳回" />
 								</div>
 							</div>
 						</div>

src/main/webapp/webpage/modules/sg/managementcenter/activiti/memberForm.jsp

@@ -9,7 +9,6 @@
 	<script type="text/javascript">
 		$(document).ready(function () {
 			$("#agree").click(function () {
-			    var systemfulltime = $("#loginName").val();
                 jp.prompt("审核通过", function (message) {
                     jp.post("${ctx}/act/task/memberTask",
                         {
@@ -18,7 +17,6 @@
                             "taskDefKey": "${construction.act.taskDefKey}",
                             "procInsId": "${construction.act.procInsId}",
                             "procDefId": "${construction.act.procDefId}",
-							"fullTime":"专职",
                             "flag": "yes",
                             "comment": window.encodeURI(message)
                         },
@@ -31,7 +29,6 @@
                 })
 			});
 			$("#no").click(function () {
-                var systemfulltime = $("#loginName").val();
 				jp.prompt("审核不通过", function (message) {
 					jp.post("${ctx}/act/task/memberTask",
 					{
@@ -40,7 +37,6 @@
 						"taskDefKey":"${construction.act.taskDefKey}",
 						"procInsId":"${construction.act.procInsId}",
 						"procDefId":"${construction.act.procDefId}",
-                        "fullTime":"专职",
 						"flag":"no",
 						"projectName":"${fns:unescapeHtml(construction.projectName)}",
 						"comment":window.encodeURI(message)

src/main/webapp/webpage/modules/sg/managementcenter/activiti/speciallyForm.jsp

@@ -9,7 +9,6 @@
 	<script type="text/javascript">
 		$(document).ready(function () {
 			$("#agree").click(function () {
-                var systemfulltime = $("#loginName").val();
                 jp.prompt("审核通过", function (message) {
                     jp.post("${ctx}/act/task/speciallyTask",
                         {
@@ -18,7 +17,6 @@
                             "taskDefKey": "${construction.act.taskDefKey}",
                             "procInsId": "${construction.act.procInsId}",
                             "procDefId": "${construction.act.procDefId}",
-                            "fullName":"运行人员",
                             "flag": "yes",
                             "comment": window.encodeURI(message)
                         },
@@ -39,7 +37,6 @@
 						"taskDefKey":"${construction.act.taskDefKey}",
 						"procInsId":"${construction.act.procInsId}",
 						"procDefId":"${construction.act.procDefId}",
-                        "fullName":"项目经理",
 						"flag":"no",
 						"projectName":"${fns:unescapeHtml(construction.projectName)}",
 						"comment":window.encodeURI(message)