Merge remote-tracking branch 'origin/master'

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

@@ -1337,12 +1337,15 @@ public class ActTaskService extends BaseService {
 			vars.put("pass4", true);
         }else {
 			if (flagDesign){
+				vars.put("design","运行人员");
 				vars.put("pass1", flagDesign);
 			}
 			if (flagItemCLose){
+				vars.put("itemClose","专职");
 				vars.put("pass2",flagItemCLose);
 			}
 			if (flagDeal){
+				vars.put("design","单位人员");
 				vars.put("pass3",flagDeal);
 			}
 			if (!flagDesign&&!flagItemCLose&&!flagDeal){
@@ -1353,6 +1356,57 @@ public class ActTaskService extends BaseService {
 	}
 
 	/**
+	 * 保存项目关闭 专职审批意见
+	 * @param act
+	 */
+	@Transactional(readOnly = false)
+	public void specially(Act act) {
+		// 设置意见
+		act.setComment(("yes".equals(act.getFlag())?"[没有问题] ":"[存在问题] ")+act.getComment());
+		act.preUpdate();
+		// 对不同环节的业务逻辑进行操作
+		String taskDefKey = act.getTaskDefKey();
+		// 提交流程任务
+		Map<String, Object> vars = Maps.newHashMap();
+		vars.put("operators","运行人员");
+		vars.put("flagNo",false);
+		vars.put("flagYes",true);
+		complete(act.getTaskId(), act.getProcInsId(), act.getComment(), vars);
+	}
+	/**
+	 * 保存项目关闭 运行人员审批意见
+	 * @param act
+	 */
+	@Transactional(readOnly = false)
+	public void addMember(Act act) {
+		// 设置意见
+		act.setComment(("yes".equals(act.getFlag())?"[没有问题] ":"[存在问题] ")+act.getComment());
+		act.preUpdate();
+		// 对不同环节的业务逻辑进行操作
+		String taskDefKey = act.getTaskDefKey();
+		// 提交流程任务
+		Map<String, Object> vars = Maps.newHashMap();
+		vars.put("yes".equals(act.getFlag())?"systemfulltime":"itemClose","yes".equals(act.getFlag())?"系统专职":"专职");
+		vars.put("systemNo","yes".equals(act.getFlag())?false:true);
+		vars.put("systemYes","yes".equals(act.getFlag())?true:false);
+		complete(act.getTaskId(), act.getProcInsId(), act.getComment(), vars);
+	}
+	/**
+	 * 保存项目关闭 运行人员审批意见
+	 * @param act
+	 */
+	@Transactional(readOnly = false)
+	public void addDepartment(Act act) {
+		// 设置意见
+		act.setComment(("yes".equals(act.getFlag())?"[没有问题] ":"[存在问题] ")+act.getComment());
+		act.preUpdate();
+		// 对不同环节的业务逻辑进行操作
+		String taskDefKey = act.getTaskDefKey();
+		// 提交流程任务
+		Map<String, Object> vars = Maps.newHashMap();
+		complete(act.getTaskId(), act.getProcInsId(), act.getComment(), vars);
+	}
+	/**
 	 * 保存审核意见
 	 *
 	 * @param act

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

@@ -608,8 +608,57 @@ public class ActTaskController extends BaseController {
 		j.setMsg("审批成功");
 		return j;
 	}
-
-
+	/*
+		项目关闭：专职
+	 */
+	@ResponseBody
+	@RequestMapping(value = "speciallyTask")
+	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);
+		} catch (UnsupportedEncodingException e) {
+			e.printStackTrace();
+		}
+		j.setMsg("审批成功");
+		return j;
+	}
+	/*
+		项目关闭：运行人员
+	 */
+	@ResponseBody
+	@RequestMapping(value = "memberTask")
+	public AjaxJson memberTask(Act act,String tuser,Construction construction) {
+		AjaxJson j = new AjaxJson();
+		try {
+			String comment = URLDecoder.decode(act.getComment(), "UTF-8");
+			act.setComment(comment);
+			actTaskService.addMember(act);
+		} catch (UnsupportedEncodingException e) {
+			e.printStackTrace();
+		}
+		j.setMsg("审批成功");
+		return j;
+	}
+	/*
+		项目关闭：系统专职
+	 */
+	@ResponseBody
+	@RequestMapping(value = "departmentTask")
+	public AjaxJson departmentTask(Act act,String tuser,Construction construction) {
+		AjaxJson j = new AjaxJson();
+		try {
+			String comment = URLDecoder.decode(act.getComment(), "UTF-8");
+			act.setComment(comment);
+			actTaskService.addDepartment(act);
+		} catch (UnsupportedEncodingException e) {
+			e.printStackTrace();
+		}
+		j.setMsg("审批成功");
+		return j;
+	}
 	/**
 	 * 施工交底审批
 	 * @param act*/

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

@@ -177,8 +177,34 @@ public class ConstructionController extends BaseController {
         model.addAttribute("construction", construction);
         return "modules/sg/managementcenter/activiti/operatorDesignChange";
     }
+    /*
+        项目关闭，配网工程专职判定
+     */
+    @RequestMapping(value = "speciallyForm")
+    public String speciallyForm(Construction construction, Model model) {
+        //根据流程定义号获取所有的定义流程
+        model.addAttribute("construction", construction);
+        return "modules/sg/managementcenter/activiti/speciallyForm";
+    }
+    /*
+        项目关闭，配网运行人员
+     */
+    @RequestMapping(value = "memberForm")
+    public String memberForm(Construction construction, Model model) {
+        //根据流程定义号获取所有的定义流程
+        model.addAttribute("construction", construction);
+        return "modules/sg/managementcenter/activiti/memberForm";
+    }
 
-
+    /*
+       项目关闭，配网系统专职
+    */
+    @RequestMapping(value = "departmentForm")
+    public String departmentForm(Construction construction, Model model) {
+        //根据流程定义号获取所有的定义流程
+        model.addAttribute("construction", construction);
+        return "modules/sg/managementcenter/activiti/departmentForm";
+    }
     /**
      * 经研所审核页面
      * */

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

@@ -0,0 +1,313 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<%@ include file="/webpage/include/taglib.jsp"%>
+<html>
+<head>
+	<title>运行人员设计变更页面</title>
+	<meta name="decorator" content="ani"/>
+	<!-- SUMMERNOTE -->
+	<%@include file="/webpage/include/summernote.jsp" %>
+	<script type="text/javascript">
+		$(document).ready(function () {
+			$("#agree").click(function () {
+                jp.prompt("审核通过", function (message) {
+                    jp.post("${ctx}/act/task/departmentTask",
+                        {
+                            "taskId": "${construction.act.taskId}",
+                            "taskName": "${construction.act.taskName}",
+                            "taskDefKey": "${construction.act.taskDefKey}",
+                            "procInsId": "${construction.act.procInsId}",
+                            "procDefId": "${construction.act.procDefId}",
+                            "flag": "yes",
+                            "comment": window.encodeURI(message)
+                        },
+                        function (data) {
+                            if(data.success){
+                                jp.success(data.msg);
+                                jp.go("${ctx}/act/task/todo")
+                            }
+                        })
+                })
+			});
+		})
+	</script>
+</head>
+<body>
+<div class="wrapper wrapper-content">
+	<div class="row">
+		<div class="col-md-12">
+			<div class="panel panel-primary">
+				<div class="panel-heading">
+					<h3 class="panel-title">
+						<a class="panelButton"  href="#"  onclick="history.go(-1)"><i class="ti-angle-left"></i> 返回</a>
+					</h3>
+				</div>
+				<div class="panel-body">
+					<form:form id="inputForm" modelAttribute="construction" action="${ctx}/managementcenter/divide/save" method="post" class="form-horizontal">
+					<form:hidden path="id"/>
+<%--						<input id="procInsId" type="text" value="${fns:unescapeHtml(construction.procInsId)}">
+						<input id="projectName" type="text" value="${fns:unescapeHtml(construction.projectName)}">
+						<input type="text" value="${fns:unescapeHtml(construction.id)}">--%>
+						<table class="table table-bordered">
+							<tbody>
+<%--							<tr>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>申请人：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.userName)}
+								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>审核人：</label></td>
+								<td class="width-35">
+									<sys:userselect roleName="项目经理;施工单位" id="tuser" name="tuser.id" value="${construction.tuser.id}" labelName="tuser.name" labelValue="${construction.tuser.name}"
+													cssClass="form-control required"/>
+								</td>
+							</tr>--%>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">项目号：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.projectId)}
+								</td>
+								<td class="width-15 active"><label class="pull-right">项目名称：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.projectName)}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">接收图纸时间：</label></td>
+								<td class="width-35">
+									<fmt:formatDate value="${construction.acceptDate}" pattern="yyyy-MM-dd HH:mm:ss"/>
+								</td>
+								<td class="width-15 active"><label class="pull-right">选择用户：</label></td>
+								<td class="width-35">
+									<sys:userselect roleName="项目经理;施工单位" id="tuser" name="tuser.id" value="${construction.tuser.id}" labelName="tuser.name" labelValue="${construction.tuser.name}"
+													cssClass="form-control required"/>
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">停电线路：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.powerLine)}
+								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>停电范围（中间统一用中文分号）：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.blackoutArea)}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">项目类型：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.projectType)}
+								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>政处初步判断：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.preliminaryJudgment)}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">是否含土建（不含钢管杆）：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.civilEngineering)}
+								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>钢管杆基础类型：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.baseType)}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">是否需要规划报批（150米及以上土建）：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.planApproval)}
+								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>设备改造类型：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.transformationType)}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">改造设备尺寸及间隔数：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.transformationEquipment)}
+								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>是否含新设备命名：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.newNamed)}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">是否含变电站新间隔投运：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.putInto)}
+								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>是否含非涉电电气施工：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.electricalConstruction)}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">图纸标注的带电作业情况：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.theAssignment)}
+							</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>是否含自动化：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.automation)}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">二遥或三遥：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.remote)}
+								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>通信方式：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.communicationMode)}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">柱开集中或就地：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.inSitu)}
+								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>环网柜DTU户外或户内：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.networkCabinet)}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">站房DTU：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.station)}
+								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>是否为停电打包项目：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.powerFailure)}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">施工通道：</label></td>
+								<td class="width-35">
+										${construction.disclose.channel}
+								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>设备基础是否可以扩容：</label></td>
+								<td class="width-35">
+										${construction.disclose.capacity}
+										<%--<select id="capacity"  maxlength="100"  class=" form-control">
+										<option value="是">是</option>
+										<option value="否">否</option>
+									</select>--%>
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">现场设备尺寸：</label></td>
+								<td class="width-35">
+										${construction.disclose.sceneSize}
+								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>最多可扩容尺寸：</label></td>
+								<td class="width-35">
+										${construction.disclose.capacitySize}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">方案安全隐患：</label></td>
+								<td class="width-35">
+										${construction.disclose.hiddenDanger}
+								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>是否存在低压或通信线等影响施工：</label></td>
+								<td class="width-35">
+										${construction.disclose.influenceConstruction}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">立项重复：</label></td>
+								<td class="width-35">
+										${construction.disclose.projectRepetition}
+								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>是否已实施：</label></td>
+								<td class="width-35">
+										${construction.disclose.implemented}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">变压器无负荷：</label></td>
+								<td class="width-35">
+										${construction.disclose.transformer}
+								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>线路名称一致性：</label></td>
+								<td class="width-35">
+										${construction.disclose.lineName}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">工程量是否一致：</label></td>
+								<td class="width-35">
+										${construction.disclose.quantities}
+								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>设备、开关、杆号一致性：</label></td>
+								<td class="width-35">
+										${construction.disclose.rodNumber}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">政处类型：</label></td>
+								<td class="width-35">
+										${construction.disclose.administrationType}
+								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>是否存在严重政处问题（预判）：</label></td>
+								<td class="width-35">
+										${construction.disclose.politicalProblem}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">前置条件：</label></td>
+								<td class="width-35">
+										${construction.disclose.precondition}
+								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>DTU安放方式核查：</label></td>
+								<td class="width-35">
+										${construction.disclose.placementMode}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">核查环网柜生产日期：</label></td>
+								<td class="width-35">
+										${construction.disclose.productionDate}
+								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>二次是否是集成模块：</label></td>
+								<td class="width-35">
+										${construction.disclose.integrateModule}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">PT是否需要更换：</label></td>
+								<td class="width-35">
+										${construction.disclose.needReplace}
+								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>设备是否有整体改造的必要：</label></td>
+								<td class="width-35">
+										${construction.disclose.overallTransformation}
+								</td>
+							</tr>
+							</tbody>
+						</table>
+					</form:form>
+
+
+
+						<div class="row">
+							<div class="col-sm-3"></div>
+							<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;
+								</div>
+							</div>
+						</div>
+
+					<c:if test="${not empty construction.id}">
+						<act:flowChart procInsId="${construction.act.procInsId}"/>
+						<act:histoicFlow procInsId="${construction.act.procInsId}" />
+					</c:if>
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
+</body>
+</html>

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

@@ -0,0 +1,335 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<%@ include file="/webpage/include/taglib.jsp"%>
+<html>
+<head>
+	<title>运行人员设计变更页面</title>
+	<meta name="decorator" content="ani"/>
+	<!-- SUMMERNOTE -->
+	<%@include file="/webpage/include/summernote.jsp" %>
+	<script type="text/javascript">
+		$(document).ready(function () {
+			$("#agree").click(function () {
+                jp.prompt("审核通过", function (message) {
+                    jp.post("${ctx}/act/task/memberTask",
+                        {
+                            "taskId": "${construction.act.taskId}",
+                            "taskName": "${construction.act.taskName}",
+                            "taskDefKey": "${construction.act.taskDefKey}",
+                            "procInsId": "${construction.act.procInsId}",
+                            "procDefId": "${construction.act.procDefId}",
+                            "flag": "yes",
+                            "comment": window.encodeURI(message)
+                        },
+                        function (data) {
+                            if(data.success){
+                                jp.success(data.msg);
+                                jp.go("${ctx}/act/task/todo")
+                            }
+                        })
+                })
+			});
+			$("#no").click(function () {
+				jp.prompt("审核不通过", function (message) {
+					jp.post("${ctx}/act/task/memberTask",
+					{
+						"taskId":"${construction.act.taskId}",
+						"taskName":"${construction.act.taskName}",
+						"taskDefKey":"${construction.act.taskDefKey}",
+						"procInsId":"${construction.act.procInsId}",
+						"procDefId":"${construction.act.procDefId}",
+						"flag":"no",
+						"projectName":"${fns:unescapeHtml(construction.projectName)}",
+						"comment":window.encodeURI(message)
+					},
+					function (data) {
+						if(data.success){
+							jp.success(data.msg);
+							jp.go("${ctx}/act/task/todo")
+						}
+					})
+				})
+			});
+		})
+	</script>
+</head>
+<body>
+<div class="wrapper wrapper-content">
+	<div class="row">
+		<div class="col-md-12">
+			<div class="panel panel-primary">
+				<div class="panel-heading">
+					<h3 class="panel-title">
+						<a class="panelButton"  href="#"  onclick="history.go(-1)"><i class="ti-angle-left"></i> 返回</a>
+					</h3>
+				</div>
+				<div class="panel-body">
+					<form:form id="inputForm" modelAttribute="construction" action="${ctx}/managementcenter/divide/save" method="post" class="form-horizontal">
+					<form:hidden path="id"/>
+<%--						<input id="procInsId" type="text" value="${fns:unescapeHtml(construction.procInsId)}">
+						<input id="projectName" type="text" value="${fns:unescapeHtml(construction.projectName)}">
+						<input type="text" value="${fns:unescapeHtml(construction.id)}">--%>
+						<table class="table table-bordered">
+							<tbody>
+<%--							<tr>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>申请人：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.userName)}
+								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>审核人：</label></td>
+								<td class="width-35">
+									<sys:userselect roleName="项目经理;施工单位" id="tuser" name="tuser.id" value="${construction.tuser.id}" labelName="tuser.name" labelValue="${construction.tuser.name}"
+													cssClass="form-control required"/>
+								</td>
+							</tr>--%>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">项目号：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.projectId)}
+								</td>
+								<td class="width-15 active"><label class="pull-right">项目名称：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.projectName)}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">接收图纸时间：</label></td>
+								<td class="width-35">
+									<fmt:formatDate value="${construction.acceptDate}" pattern="yyyy-MM-dd HH:mm:ss"/>
+								</td>
+								<td class="width-15 active"><label class="pull-right">选择用户：</label></td>
+								<td class="width-35">
+									<sys:userselect roleName="项目经理;施工单位" id="tuser" name="tuser.id" value="${construction.tuser.id}" labelName="tuser.name" labelValue="${construction.tuser.name}"
+													cssClass="form-control required"/>
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">停电线路：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.powerLine)}
+								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>停电范围（中间统一用中文分号）：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.blackoutArea)}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">项目类型：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.projectType)}
+								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>政处初步判断：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.preliminaryJudgment)}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">是否含土建（不含钢管杆）：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.civilEngineering)}
+								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>钢管杆基础类型：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.baseType)}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">是否需要规划报批（150米及以上土建）：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.planApproval)}
+								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>设备改造类型：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.transformationType)}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">改造设备尺寸及间隔数：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.transformationEquipment)}
+								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>是否含新设备命名：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.newNamed)}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">是否含变电站新间隔投运：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.putInto)}
+								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>是否含非涉电电气施工：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.electricalConstruction)}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">图纸标注的带电作业情况：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.theAssignment)}
+							</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>是否含自动化：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.automation)}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">二遥或三遥：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.remote)}
+								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>通信方式：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.communicationMode)}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">柱开集中或就地：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.inSitu)}
+								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>环网柜DTU户外或户内：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.networkCabinet)}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">站房DTU：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.station)}
+								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>是否为停电打包项目：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.powerFailure)}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">施工通道：</label></td>
+								<td class="width-35">
+										${construction.disclose.channel}
+								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>设备基础是否可以扩容：</label></td>
+								<td class="width-35">
+										${construction.disclose.capacity}
+										<%--<select id="capacity"  maxlength="100"  class=" form-control">
+										<option value="是">是</option>
+										<option value="否">否</option>
+									</select>--%>
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">现场设备尺寸：</label></td>
+								<td class="width-35">
+										${construction.disclose.sceneSize}
+								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>最多可扩容尺寸：</label></td>
+								<td class="width-35">
+										${construction.disclose.capacitySize}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">方案安全隐患：</label></td>
+								<td class="width-35">
+										${construction.disclose.hiddenDanger}
+								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>是否存在低压或通信线等影响施工：</label></td>
+								<td class="width-35">
+										${construction.disclose.influenceConstruction}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">立项重复：</label></td>
+								<td class="width-35">
+										${construction.disclose.projectRepetition}
+								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>是否已实施：</label></td>
+								<td class="width-35">
+										${construction.disclose.implemented}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">变压器无负荷：</label></td>
+								<td class="width-35">
+										${construction.disclose.transformer}
+								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>线路名称一致性：</label></td>
+								<td class="width-35">
+										${construction.disclose.lineName}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">工程量是否一致：</label></td>
+								<td class="width-35">
+										${construction.disclose.quantities}
+								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>设备、开关、杆号一致性：</label></td>
+								<td class="width-35">
+										${construction.disclose.rodNumber}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">政处类型：</label></td>
+								<td class="width-35">
+										${construction.disclose.administrationType}
+								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>是否存在严重政处问题（预判）：</label></td>
+								<td class="width-35">
+										${construction.disclose.politicalProblem}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">前置条件：</label></td>
+								<td class="width-35">
+										${construction.disclose.precondition}
+								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>DTU安放方式核查：</label></td>
+								<td class="width-35">
+										${construction.disclose.placementMode}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">核查环网柜生产日期：</label></td>
+								<td class="width-35">
+										${construction.disclose.productionDate}
+								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>二次是否是集成模块：</label></td>
+								<td class="width-35">
+										${construction.disclose.integrateModule}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">PT是否需要更换：</label></td>
+								<td class="width-35">
+										${construction.disclose.needReplace}
+								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>设备是否有整体改造的必要：</label></td>
+								<td class="width-35">
+										${construction.disclose.overallTransformation}
+								</td>
+							</tr>
+							</tbody>
+						</table>
+					</form:form>
+
+
+
+						<div class="row">
+							<div class="col-sm-3"></div>
+							<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-primary btn-lg btn-parsley" type="submit" value="驳回" />
+								</div>
+							</div>
+						</div>
+
+					<c:if test="${not empty construction.id}">
+						<act:flowChart procInsId="${construction.act.procInsId}"/>
+						<act:histoicFlow procInsId="${construction.act.procInsId}" />
+					</c:if>
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
+</body>
+</html>

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

@@ -0,0 +1,335 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<%@ include file="/webpage/include/taglib.jsp"%>
+<html>
+<head>
+	<title>运行人员设计变更页面</title>
+	<meta name="decorator" content="ani"/>
+	<!-- SUMMERNOTE -->
+	<%@include file="/webpage/include/summernote.jsp" %>
+	<script type="text/javascript">
+		$(document).ready(function () {
+			$("#agree").click(function () {
+                jp.prompt("审核通过", function (message) {
+                    jp.post("${ctx}/act/task/speciallyTask",
+                        {
+                            "taskId": "${construction.act.taskId}",
+                            "taskName": "${construction.act.taskName}",
+                            "taskDefKey": "${construction.act.taskDefKey}",
+                            "procInsId": "${construction.act.procInsId}",
+                            "procDefId": "${construction.act.procDefId}",
+                            "flag": "yes",
+                            "comment": window.encodeURI(message)
+                        },
+                        function (data) {
+                            if(data.success){
+                                jp.success(data.msg);
+                                jp.go("${ctx}/act/task/todo")
+                            }
+                        })
+                })
+			});
+			$("#no").click(function () {
+				jp.prompt("审核不通过", function (message) {
+					jp.post("${ctx}/act/task/artificialTask",
+					{
+						"taskId":"${construction.act.taskId}",
+						"taskName":"${construction.act.taskName}",
+						"taskDefKey":"${construction.act.taskDefKey}",
+						"procInsId":"${construction.act.procInsId}",
+						"procDefId":"${construction.act.procDefId}",
+						"flag":"pass4",
+						"projectName":"${fns:unescapeHtml(construction.projectName)}",
+						"comment":window.encodeURI(message)
+					},
+					function (data) {
+						if(data.success){
+							jp.success(data.msg);
+							jp.go("${ctx}/act/task/todo")
+						}
+					})
+				})
+			});
+		})
+	</script>
+</head>
+<body>
+<div class="wrapper wrapper-content">
+	<div class="row">
+		<div class="col-md-12">
+			<div class="panel panel-primary">
+				<div class="panel-heading">
+					<h3 class="panel-title">
+						<a class="panelButton"  href="#"  onclick="history.go(-1)"><i class="ti-angle-left"></i> 返回</a>
+					</h3>
+				</div>
+				<div class="panel-body">
+					<form:form id="inputForm" modelAttribute="construction" action="${ctx}/managementcenter/divide/save" method="post" class="form-horizontal">
+					<form:hidden path="id"/>
+<%--						<input id="procInsId" type="text" value="${fns:unescapeHtml(construction.procInsId)}">
+						<input id="projectName" type="text" value="${fns:unescapeHtml(construction.projectName)}">
+						<input type="text" value="${fns:unescapeHtml(construction.id)}">--%>
+						<table class="table table-bordered">
+							<tbody>
+<%--							<tr>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>申请人：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.userName)}
+								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>审核人：</label></td>
+								<td class="width-35">
+									<sys:userselect roleName="项目经理;施工单位" id="tuser" name="tuser.id" value="${construction.tuser.id}" labelName="tuser.name" labelValue="${construction.tuser.name}"
+													cssClass="form-control required"/>
+								</td>
+							</tr>--%>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">项目号：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.projectId)}
+								</td>
+								<td class="width-15 active"><label class="pull-right">项目名称：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.projectName)}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">接收图纸时间：</label></td>
+								<td class="width-35">
+									<fmt:formatDate value="${construction.acceptDate}" pattern="yyyy-MM-dd HH:mm:ss"/>
+								</td>
+								<td class="width-15 active"><label class="pull-right">选择用户：</label></td>
+								<td class="width-35">
+									<sys:userselect roleName="项目经理;施工单位" id="tuser" name="tuser.id" value="${construction.tuser.id}" labelName="tuser.name" labelValue="${construction.tuser.name}"
+													cssClass="form-control required"/>
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">停电线路：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.powerLine)}
+								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>停电范围（中间统一用中文分号）：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.blackoutArea)}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">项目类型：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.projectType)}
+								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>政处初步判断：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.preliminaryJudgment)}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">是否含土建（不含钢管杆）：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.civilEngineering)}
+								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>钢管杆基础类型：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.baseType)}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">是否需要规划报批（150米及以上土建）：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.planApproval)}
+								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>设备改造类型：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.transformationType)}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">改造设备尺寸及间隔数：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.transformationEquipment)}
+								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>是否含新设备命名：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.newNamed)}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">是否含变电站新间隔投运：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.putInto)}
+								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>是否含非涉电电气施工：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.electricalConstruction)}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">图纸标注的带电作业情况：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.theAssignment)}
+							</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>是否含自动化：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.automation)}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">二遥或三遥：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.remote)}
+								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>通信方式：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.communicationMode)}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">柱开集中或就地：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.inSitu)}
+								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>环网柜DTU户外或户内：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.networkCabinet)}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">站房DTU：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.station)}
+								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>是否为停电打包项目：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.powerFailure)}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">施工通道：</label></td>
+								<td class="width-35">
+										${construction.disclose.channel}
+								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>设备基础是否可以扩容：</label></td>
+								<td class="width-35">
+										${construction.disclose.capacity}
+										<%--<select id="capacity"  maxlength="100"  class=" form-control">
+										<option value="是">是</option>
+										<option value="否">否</option>
+									</select>--%>
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">现场设备尺寸：</label></td>
+								<td class="width-35">
+										${construction.disclose.sceneSize}
+								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>最多可扩容尺寸：</label></td>
+								<td class="width-35">
+										${construction.disclose.capacitySize}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">方案安全隐患：</label></td>
+								<td class="width-35">
+										${construction.disclose.hiddenDanger}
+								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>是否存在低压或通信线等影响施工：</label></td>
+								<td class="width-35">
+										${construction.disclose.influenceConstruction}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">立项重复：</label></td>
+								<td class="width-35">
+										${construction.disclose.projectRepetition}
+								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>是否已实施：</label></td>
+								<td class="width-35">
+										${construction.disclose.implemented}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">变压器无负荷：</label></td>
+								<td class="width-35">
+										${construction.disclose.transformer}
+								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>线路名称一致性：</label></td>
+								<td class="width-35">
+										${construction.disclose.lineName}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">工程量是否一致：</label></td>
+								<td class="width-35">
+										${construction.disclose.quantities}
+								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>设备、开关、杆号一致性：</label></td>
+								<td class="width-35">
+										${construction.disclose.rodNumber}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">政处类型：</label></td>
+								<td class="width-35">
+										${construction.disclose.administrationType}
+								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>是否存在严重政处问题（预判）：</label></td>
+								<td class="width-35">
+										${construction.disclose.politicalProblem}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">前置条件：</label></td>
+								<td class="width-35">
+										${construction.disclose.precondition}
+								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>DTU安放方式核查：</label></td>
+								<td class="width-35">
+										${construction.disclose.placementMode}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">核查环网柜生产日期：</label></td>
+								<td class="width-35">
+										${construction.disclose.productionDate}
+								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>二次是否是集成模块：</label></td>
+								<td class="width-35">
+										${construction.disclose.integrateModule}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">PT是否需要更换：</label></td>
+								<td class="width-35">
+										${construction.disclose.needReplace}
+								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>设备是否有整体改造的必要：</label></td>
+								<td class="width-35">
+										${construction.disclose.overallTransformation}
+								</td>
+							</tr>
+							</tbody>
+						</table>
+					</form:form>
+
+
+
+						<div class="row">
+							<div class="col-sm-3"></div>
+							<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-primary btn-lg btn-parsley" type="submit" value="驳回" />
+								</div>
+							</div>
+						</div>
+
+					<c:if test="${not empty construction.id}">
+						<act:flowChart procInsId="${construction.act.procInsId}"/>
+						<act:histoicFlow procInsId="${construction.act.procInsId}" />
+					</c:if>
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
+</body>
+</html>