Merge remote-tracking branch 'origin/master'

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

@@ -1360,7 +1360,7 @@ public class ActTaskService extends BaseService {
 	 * @param act
 	 */
 	@Transactional(readOnly = false)
-	public void specially(Act act) {
+	public void specially(Act act,String fullName) {
 		// 设置意见
 		act.setComment(("yes".equals(act.getFlag())?"[没有问题] ":"[存在问题] ")+act.getComment());
 		act.preUpdate();
@@ -1368,9 +1368,32 @@ public class ActTaskService extends BaseService {
 		String taskDefKey = act.getTaskDefKey();
 		// 提交流程任务
 		Map<String, Object> vars = Maps.newHashMap();
-		vars.put("operators","运行人员");
-		vars.put("flagNo",false);
-		vars.put("flagYes",true);
+		vars.put("yes".equals(act.getFlag())?"operators":"distribution","yes".equals(act.getFlag())?fullName:fullName);
+		vars.put("flagNo","yes".equals(act.getFlag())?false:true);
+		vars.put("flagYes","yes".equals(act.getFlag())?true:false);
+		complete(act.getTaskId(), act.getProcInsId(), act.getComment(), vars);
+	}
+	/**
+	 * 保存项目关闭 项目经理选择
+	 * @param act
+	 */
+	@Transactional(readOnly = false)
+	public void managerFormTask(Act act,String fullName) {
+		// 设置意见
+		act.setComment(("yes".equals(act.getFlag())?"[没有问题] ":"[存在问题] ")+act.getComment());
+		act.preUpdate();
+		// 对不同环节的业务逻辑进行操作
+		String taskDefKey = act.getTaskDefKey();
+		// 提交流程任务
+		Map<String, Object> vars = Maps.newHashMap();
+		if ("yes".equals(act.getFlag())){
+			vars.put("itemClose",fullName);
+			vars.put("managerYes",true);
+			vars.put("managerNo",false);
+		}else {
+			vars.put("managerYes",false);
+			vars.put("managerNo",true);
+		}
 		complete(act.getTaskId(), act.getProcInsId(), act.getComment(), vars);
 	}
 	/**
@@ -1378,7 +1401,7 @@ public class ActTaskService extends BaseService {
 	 * @param act
 	 */
 	@Transactional(readOnly = false)
-	public void addMember(Act act) {
+	public void addMember(Act act,String fullTime) {
 		// 设置意见
 		act.setComment(("yes".equals(act.getFlag())?"[没有问题] ":"[存在问题] ")+act.getComment());
 		act.preUpdate();
@@ -1386,7 +1409,7 @@ public class ActTaskService extends BaseService {
 		String taskDefKey = act.getTaskDefKey();
 		// 提交流程任务
 		Map<String, Object> vars = Maps.newHashMap();
-		vars.put("yes".equals(act.getFlag())?"systemfulltime":"itemClose","yes".equals(act.getFlag())?"系统专职":"专职");
+		vars.put("yes".equals(act.getFlag())?"systemfulltime":"itemClose","yes".equals(act.getFlag())?fullTime:fullTime);
 		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);

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

@@ -11,10 +11,16 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import javax.servlet.ServletContext;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import com.jeeplus.common.json.AjaxJson;
+import com.jeeplus.common.utils.SpringContextHolder;
+import com.jeeplus.common.websocket.service.system.SystemInfoSocketHandler;
+import com.jeeplus.modules.oa.entity.OaNotify;
+import com.jeeplus.modules.oa.entity.OaNotifyRecord;
+import com.jeeplus.modules.oa.service.OaNotifyService;
 import com.jeeplus.modules.sg.managementcenter.activiti.entity.Construction;
 import com.jeeplus.modules.sg.managementcenter.activiti.entity.Disclose;
 import com.jeeplus.modules.sg.managementcenter.activiti.entity.UploadImages;
@@ -88,6 +94,9 @@ public class ActTaskController extends BaseController {
 
 	@Autowired
 	private UploadImagesService uploadImagesService;
+
+	@Autowired
+	private OaNotifyService oaNotifyService;
 	/**
 	 * 获取待办列表
 	 * @return
@@ -613,12 +622,28 @@ public class ActTaskController extends BaseController {
 	 */
 	@ResponseBody
 	@RequestMapping(value = "speciallyTask")
-	public AjaxJson speciallyTask(Act act,String tuser,Construction construction) {
+	public AjaxJson speciallyTask(Act act,String fullName,String tuser,Construction construction) {
+		AjaxJson j = new AjaxJson();
+		try {
+			String comment = URLDecoder.decode(act.getComment(), "UTF-8");
+			act.setComment(comment);
+			actTaskService.specially(act,fullName);
+		} catch (UnsupportedEncodingException e) {
+			e.printStackTrace();
+		}
+		j.setMsg("审批成功");
+		return j;
+	}/*
+		项目关闭：项目经理
+	 */
+	@ResponseBody
+	@RequestMapping(value = "managerFormTask")
+	public AjaxJson managerFormTask(Act act,String fullName,String tuser,Construction construction) {
 		AjaxJson j = new AjaxJson();
 		try {
 			String comment = URLDecoder.decode(act.getComment(), "UTF-8");
 			act.setComment(comment);
-			actTaskService.specially(act);
+			actTaskService.managerFormTask(act,fullName);
 		} catch (UnsupportedEncodingException e) {
 			e.printStackTrace();
 		}
@@ -630,16 +655,21 @@ public class ActTaskController extends BaseController {
 	 */
 	@ResponseBody
 	@RequestMapping(value = "memberTask")
-	public AjaxJson memberTask(Act act,String tuser,Construction construction) {
+	public AjaxJson memberTask(Act act,String fullTime,String tuser,Construction construction) {
 		AjaxJson j = new AjaxJson();
 		try {
 			String comment = URLDecoder.decode(act.getComment(), "UTF-8");
 			act.setComment(comment);
-			actTaskService.addMember(act);
+			actTaskService.addMember(act,fullTime);
 		} catch (UnsupportedEncodingException e) {
 			e.printStackTrace();
 		}
-		j.setMsg("审批成功");
+		if ("yes".equals(act.getFlag())){
+			j.setMsg("审批成功");
+		}else {
+			j.setMsg("驳回成功");
+		}
+
 		return j;
 	}
 	/*
@@ -656,7 +686,21 @@ public class ActTaskController extends BaseController {
 		} catch (UnsupportedEncodingException e) {
 			e.printStackTrace();
 		}
-		j.setMsg("审批成功");
+		OaNotify  oaNotify = new OaNotify();
+		oaNotify.setType("1");
+		oaNotify.setTitle("施工交底结束");
+		oaNotify.setContent("施工交底结束");
+		oaNotify.setStatus("1");
+		oaNotify.setOaNotifyRecordIds("9fcadb62979e4ceab459867b37bf04bc");
+		oaNotifyService.save(oaNotify);
+		List<OaNotifyRecord> list = oaNotify.getOaNotifyRecordList();
+		for(OaNotifyRecord o : list){
+			//发送通知到客户端
+			ServletContext context = SpringContextHolder
+					.getBean(ServletContext.class);
+			new SystemInfoSocketHandler().sendMessageToUser(UserUtils.get(o.getUser().getId()).getLoginName(), "收到一条新通知，请到我的通知查看！");
+		}
+		j.setMsg("审批成功;已经通知项目经理，施工单位");
 		return j;
 	}
 	/**

src/main/java/com/jeeplus/modules/oa/web/OaNotifyController.java

@@ -98,7 +98,8 @@ public class OaNotifyController extends BaseController {
 	@ResponseBody
 	@RequiresPermissions(value={"oa:oaNotify:add","oa:oaNotify:edit"},logical=Logical.OR)
 	@RequestMapping(value = "save")
-	public AjaxJson save(OaNotify oaNotify, Model model, RedirectAttributes redirectAttributes) {
+	public AjaxJson save(OaNotify oaNotify,String userId,Model model, RedirectAttributes redirectAttributes) {
+		oaNotify.setOaNotifyRecordIds(userId);
 		AjaxJson j = new AjaxJson();
 		/**
 		 * 后台hibernate-validation插件校验

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

@@ -187,6 +187,15 @@ public class ConstructionController extends BaseController {
         return "modules/sg/managementcenter/activiti/speciallyForm";
     }
     /*
+      项目关闭，配网工程专职判定
+   */
+    @RequestMapping(value = "managerForm")
+    public String managerForm(Construction construction, Model model) {
+        //根据流程定义号获取所有的定义流程
+        model.addAttribute("construction", construction);
+        return "modules/sg/managementcenter/activiti/managerCloseForm";
+    }
+    /*
         项目关闭，配网运行人员
      */
     @RequestMapping(value = "memberForm")

src/main/webapp/webpage/modules/oa/notify/oaNotifyForm.jsp

@@ -77,8 +77,9 @@
 				<div class="form-group">
 					<label class="col-sm-2 control-label"><font color="red">*</font>接受人：</label>
 					<div class="col-sm-10">
-					<sys:userselect id="oaNotifyRecord" name="oaNotifyRecordIds" value="${oaNotify.oaNotifyRecordIds}" labelName="oaNotifyRecordNames" labelValue="${oaNotify.oaNotifyRecordNames}"
-							cssClass="form-control required"  isMultiSelected="true"/>
+						<sys:userselect roleName="配网工程专职;配网系统专职" id="user" name="userId" value="${construction.tuser.id}" loginName="loginName" loginValue="系统专职"
+										labelName="user.name" labelValue="${construction.tuser.name}"
+										cssClass="form-control required"/>
 					</div>
 				</div>
 				</c:if>

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

@@ -75,11 +75,11 @@
 								<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>
+								<%--<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>

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

@@ -0,0 +1,444 @@
+<%@ 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 () {
+			    var systemfulltime = $("#loginName").val();
+                jp.prompt("重新发起配网工程专职判定", function (message) {
+                    jp.post("${ctx}/act/task/managerFormTask",
+                        {
+                            "taskId": "${construction.act.taskId}",
+                            "taskName": "${construction.act.taskName}",
+                            "taskDefKey": "${construction.act.taskDefKey}",
+                            "procInsId": "${construction.act.procInsId}",
+                            "procDefId": "${construction.act.procDefId}",
+							"fullName":systemfulltime,
+                            "flag": "yes",
+                            "comment": window.encodeURI(message)
+                        },
+                        function (data) {
+                            if(data.success){
+                                jp.success(data.msg);
+                                jp.go("${ctx}/act/task/todo")
+                            }
+                        })
+                })
+			});
+			$("#no").click(function () {
+                var systemfulltime = $("#loginName").val();
+				jp.prompt("不再发起", function (message) {
+					jp.post("${ctx}/act/task/managerFormTask",
+					{
+						"taskId":"${construction.act.taskId}",
+						"taskName":"${construction.act.taskName}",
+						"taskDefKey":"${construction.act.taskDefKey}",
+						"procInsId":"${construction.act.procInsId}",
+						"procDefId":"${construction.act.procDefId}",
+                        "fullName":systemfulltime,
+						"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}" loginName="loginName" loginValue="专职"
+													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>
+							<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-danger 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/memberForm.jsp

@@ -9,6 +9,7 @@
 	<script type="text/javascript">
 		$(document).ready(function () {
 			$("#agree").click(function () {
+			    var systemfulltime = $("#loginName").val();
                 jp.prompt("审核通过", function (message) {
                     jp.post("${ctx}/act/task/memberTask",
                         {
@@ -17,6 +18,7 @@
                             "taskDefKey": "${construction.act.taskDefKey}",
                             "procInsId": "${construction.act.procInsId}",
                             "procDefId": "${construction.act.procDefId}",
+							"fullTime":systemfulltime,
                             "flag": "yes",
                             "comment": window.encodeURI(message)
                         },
@@ -29,6 +31,7 @@
                 })
 			});
 			$("#no").click(function () {
+                var systemfulltime = $("#loginName").val();
 				jp.prompt("审核不通过", function (message) {
 					jp.post("${ctx}/act/task/memberTask",
 					{
@@ -37,6 +40,7 @@
 						"taskDefKey":"${construction.act.taskDefKey}",
 						"procInsId":"${construction.act.procInsId}",
 						"procDefId":"${construction.act.procDefId}",
+                        "fullTime":"专职",
 						"flag":"no",
 						"projectName":"${fns:unescapeHtml(construction.projectName)}",
 						"comment":window.encodeURI(message)
@@ -98,7 +102,8 @@
 								</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}"
+									<sys:userselect roleName="配网工程专职;配网系统专职" id="tuser" name="tuser.id" value="${construction.tuser.id}" loginName="loginName" loginValue="系统专职"
+													labelName="tuser.name" labelValue="${construction.tuser.name}"
 													cssClass="form-control required"/>
 								</td>
 							</tr>
@@ -317,7 +322,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-primary 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/speciallyForm.jsp

@@ -9,6 +9,7 @@
 	<script type="text/javascript">
 		$(document).ready(function () {
 			$("#agree").click(function () {
+                var systemfulltime = $("#loginName").val();
                 jp.prompt("审核通过", function (message) {
                     jp.post("${ctx}/act/task/speciallyTask",
                         {
@@ -17,6 +18,7 @@
                             "taskDefKey": "${construction.act.taskDefKey}",
                             "procInsId": "${construction.act.procInsId}",
                             "procDefId": "${construction.act.procDefId}",
+                            "fullName":systemfulltime,
                             "flag": "yes",
                             "comment": window.encodeURI(message)
                         },
@@ -30,14 +32,15 @@
 			});
 			$("#no").click(function () {
 				jp.prompt("审核不通过", function (message) {
-					jp.post("${ctx}/act/task/artificialTask",
+					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":"pass4",
+                        "fullName":"项目经理",
+						"flag":"no",
 						"projectName":"${fns:unescapeHtml(construction.projectName)}",
 						"comment":window.encodeURI(message)
 					},
@@ -98,8 +101,9 @@
 								</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"/>
+									<%--<input id="loginName" value="${construction.tuser.loginName}">--%>
+									<sys:userselect roleName="配网运行人员" id="tuser" name="tuser.id" value="${construction.tuser.id}" labelName="tuser.name" labelValue="${construction.tuser.name}"
+													loginName="loginName" loginValue="运行人员" cssClass="form-control required"/>
 								</td>
 							</tr>
 							<tr>
@@ -317,7 +321,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-primary btn-lg btn-parsley" type="submit" value="驳回" />
+									<input id="no" class="btn  btn-danger btn-lg btn-parsley" type="submit" value="驳回" />
 								</div>
 							</div>
 						</div>