人工选择模块对接

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

@@ -1107,6 +1107,7 @@ public class ActTaskService extends BaseService {
 		// 提交流程任务
 		Map<String, Object> vars = Maps.newHashMap();
 		vars.put("pass", "yes".equals(act.getFlag())? true : false);
+		vars.put("processer","项目经理");
 		complete(act.getTaskId(), act.getProcInsId(), act.getComment(), vars);
 	}
 

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

@@ -17,6 +17,7 @@ import javax.servlet.http.HttpServletResponse;
 import com.jeeplus.common.json.AjaxJson;
 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.service.ConstructionService;
 import org.activiti.engine.HistoryService;
 import org.activiti.engine.RepositoryService;
 import org.activiti.engine.RuntimeService;
@@ -75,6 +76,9 @@ public class ActTaskController extends BaseController {
 
 	@Autowired
 	private TaskService taskService;
+
+	@Autowired
+	private ConstructionService constructionService;
 	/**
 	 * 获取待办列表
 	 * @return
@@ -380,11 +384,15 @@ public class ActTaskController extends BaseController {
 	 */
 	@ResponseBody
 	@RequestMapping(value = "audit2")
-	public AjaxJson auditTask2(Act act) {
+	public AjaxJson auditTask2(Act act,String cId) {
 		AjaxJson j = new AjaxJson();
 		try {
 			String comment = URLDecoder.decode(act.getComment(), "UTF-8");
 			act.setComment(comment);
+			Construction construction = new Construction();
+			construction.setId(cId);
+			construction.setExamineDate(comment);
+			constructionService.updateExamine(construction);
 			actTaskService.auditSave2(act);
 		} catch (UnsupportedEncodingException e) {
 			e.printStackTrace();

src/main/java/com/jeeplus/modules/sg/managementcenter/activiti/entity/Construction.java

@@ -81,6 +81,15 @@ public class Construction extends ActEntity<Construction> {
     //设备是否有整体改造的必要
     private String overallTransformation;
     //
+    private Disclose disclose;
+
+    public Disclose getDisclose() {
+        return disclose;
+    }
+
+    public void setDisclose(Disclose disclose) {
+        this.disclose = disclose;
+    }
 
     public User getTuser() {
         return tuser;

src/main/java/com/jeeplus/modules/sg/managementcenter/activiti/mapper/ConstructionMapper.java

@@ -23,4 +23,6 @@ public interface ConstructionMapper extends BaseMapper<Construction> {
     User queryPerson(String loginName);
 
     void newSave(Construction construction);
+
+    void updateExamine(Construction construction);
 }

src/main/java/com/jeeplus/modules/sg/managementcenter/activiti/mapper/xml/ConstructionMapper.xml

@@ -20,29 +20,31 @@
 	</sql>
 
     <sql id="disclose">
-		b.conId,
-		b.channel,
-		b.capacity,
-		b.sceneSize,
-		b.capacitySize,
-		b.hiddenDanger,
-		b.influenceConstruction,
-		b.projectRepetition,
-		b.implemented,
-		b.transformer,
-		b.lineName,
-		b.quantities,
-		b.rodNumber,
-		b.administrationType,
-		b.politicalProblem,
-		b.precondition,
-		b.placementMode,
-		b.productionDate,
-		b.IntegrateModule,
-		b.needReplace,
-		b.overallTransformation
+		d.conId AS "disclose.conId",
+		d.channel AS "disclose.channel",
+		d.capacity AS "disclose.capacity",
+		d.sceneSize AS "disclose.sceneSize",
+		d.capacitySize AS "disclose.capacitySize",
+		d.hiddenDanger AS "disclose.hiddenDanger",
+		d.influenceConstruction AS "disclose.influenceConstruction",
+		d.projectRepetition AS "disclose.projectRepetition",
+		d.implemented AS "disclose.implemented",
+		d.transformer AS "disclose.transformer",
+		d.lineName AS "disclose.lineName",
+		d.quantities AS "disclose.quantities",
+		d.rodNumber AS "disclose.rodNumber",
+		d.administrationType AS "disclose.administrationType",
+		d.politicalProblem AS "disclose.politicalProblem",
+		d.precondition AS "disclose.precondition",
+		d.placementMode AS "disclose.placementMode",
+		d.productionDate AS "disclose.productionDate",
+		d.IntegrateModule AS "disclose.IntegrateModule",
+		d.needReplace AS "disclose.needReplace",
+		d.overallTransformation AS "disclose.overallTransformation"
 	</sql>
 
+
+
     <sql id="constructionJoins">
 		LEFT JOIN sys_user updateBy ON updateBy.id = a.update_by
 	</sql>
@@ -74,9 +76,11 @@
 		b.stay_open_area AS "inSitu",
 		b.ring_network_cabinet AS "networkCabinet",
 		b.station_dtu AS "station",
-		b.status As "status"
+		b.status As "status",
+		<include refid="disclose"/>
 		FROM xm_construction_clarificaiton a
 		LEFT JOIN xm_project_details b on a.project_id=b.id
+		LEFT JOIN xm_disclose_conclusion d on a.proc_ins_id = d.proc_ins_id
 		WHERE a.id = #{id}
     </select>
 
@@ -84,7 +88,7 @@
         SELECT
         <include refid="constructionColumns"/>,
         <include refid="disclose"/>
-        FROM xm_construction_clarificaiton a,xm_disclose_conclusion b
+        FROM xm_construction_clarificaiton a,xm_disclose_conclusion d
         <include refid="constructionJoins"/>
         <where>
 			a.proc_ins_id=b.proc_ins_id and
@@ -251,4 +255,9 @@
 			#{delFlag}
 		)
 	</insert>
+	<update id="updateExamine">
+		UPDATE xm_construction_clarificaiton SET
+			examine_date = #{examineDate}
+		WHERE id = #{id}
+	</update>
 </mapper>

src/main/java/com/jeeplus/modules/sg/managementcenter/activiti/service/ConstructionService.java

@@ -65,4 +65,9 @@ public class ConstructionService extends CrudService<ConstructionMapper, Constru
 		constructionMapper.newSave(construction);
 	}
 
+	@Transactional(readOnly = false)
+	public void updateExamine(Construction construction) {
+		constructionMapper.updateExamine(construction);
+	}
+
 }

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

@@ -148,6 +148,23 @@ public class ConstructionController extends BaseController {
 
     }
 
+    /**
+     * 人工审核页面
+     * */
+    /**
+     * 查看，增加，编辑请假申请表单页面
+     */
+    @RequestMapping(value = "artificial")
+    public String form2(Construction construction, Model model) {
+//        String proId = construction.getAct().getProcDefId();
+//        String pInId = construction.getProcInsId();
+//        ProcessEngine processEngine = ProcessEngines.getDefaultProcessEngine();
+//        RepositoryService rs = processEngine.getRepositoryService();
+        //根据流程定义号获取所有的定义流程
+        model.addAttribute("construction", construction);
+        return "modules/sg/managementcenter/activiti/artificialJudgment";
+    }
+
 
     /**
      * 保存请假申请

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

@@ -0,0 +1,310 @@
+<%@ 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 cValue =[];//定义一个数组
+				$('input[name="favorite"]:checked').each(function(){//遍历每一个名字为interest的复选框，其中选中的执行函数
+					console.log($(this).val());
+					cValue.push($(this).val());//将选中的值添加到数组chk_value中
+				});
+				console.log(cValue);
+				// console.log($('input[name="favorite"]:checked').val());
+			});
+		})
+	</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">
+									<input type="checkbox" name="favorite" value="nba"> 设计变更 &nbsp;
+									<input type="checkbox" name="favorite" value="music"> 项目关闭 &nbsp;
+									<input type="checkbox" name="favorite" value="movie"> 政策处理 &nbsp;
+								</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">
+										${fns:unescapeHtml(construction.examineDate)}
+								</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/divideAudit.jsp

@@ -7,7 +7,7 @@
 	<!-- SUMMERNOTE -->
 	<%@include file="/webpage/include/summernote.jsp" %>
 	<script type="text/javascript">
-		/*$(document).ready(function() {
+		$(document).ready(function() {
 			jp.ajaxForm("#inputForm",function(data){
 				if(data.success){
 					jp.success(data.msg);
@@ -22,45 +22,52 @@
 			$("#agree").click(function () {
 				jp.prompt("没有问题, 审批意见", function (message) {
 					jp.post("${ctx}/act/task/audit2",
-							{
-								"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)
+					{
+						"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")
-								}
-							})
+					},
+					function (data) {
+						if(data.success){
+							jp.success(data.msg);
+							jp.go("${ctx}/act/task/todo")
+						}
+					})
 				})
 			})
 
 
 			$("#reject").click(function () {
-				jp.prompt("存在问题, 审批意见", function (message) {
-					jp.post("${ctx}/act/task/audit2",
-							{
-								"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")
-								}
-							})
-				})
+				var remark = $("#remark").val();
+				var cId = $("#cId").val();
+				if (remark==null||remark=='') {
+					jp.error("请填写备注");
+				} else {
+					jp.prompt("存在问题, 审批意见", function (message) {
+						jp.post("${ctx}/act/task/audit2",
+						{
+							"taskId":"${construction.act.taskId}",
+							"taskName":"${construction.act.taskName}",
+							"taskDefKey":"${construction.act.taskDefKey}",
+							"procInsId":"${construction.act.procInsId}",
+							"procDefId":"${construction.act.procDefId}",
+							"cId":cId,
+							"flag":"no",
+							"comment":window.encodeURI(remark)
+						},
+						function (data) {
+							if(data.success){
+								jp.success(data.msg);
+								jp.go("${ctx}/act/task/todo")
+							}
+						})
+					});
+				}
 			})
 
 
@@ -81,7 +88,7 @@
 					}
 				}
 			});
-		});*/
+		});
 	</script>
 </head>
 <body>
@@ -100,7 +107,8 @@
 					</div>
 					<form:form id="inputForm" modelAttribute="construction" action="${ctx}/managementcenter/divide/save" method="post" class="form-horizontal">
 						<form:hidden path="id"/>
-						<input type="text" value="${construction.id}">
+						<input id="cId" type="hidden" value="${construction.id}">
+<%--						<input type="text" value="${construction.disclose.channel}">--%>
 						<table class="table table-bordered">
 							<tbody>
 <%--							<tr>
@@ -131,7 +139,7 @@
 								</td>
 								<td class="width-15 active"><label class="pull-right">备注说明：</label></td>
 								<td class="width-35">
-										${fns:unescapeHtml(construction.examineDate)}
+									<input type="text" class="form-control" id="remark" name="remark" value="">
 								</td>
 							</tr>
 							<tr>

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

@@ -24,13 +24,14 @@
 					</button>
 					<form:form id="inputForm" modelAttribute="construction" action="${ctx}/managementcenter/divide/save" method="post" class="form-horizontal">
 					<form:hidden path="id"/>
+
 						<input id="procInsId" type="hidden" value="${fns:unescapeHtml(construction.procInsId)}">
 						<input id="projectName" type="hidden" value="${fns:unescapeHtml(construction.projectName)}">
 						<input type="hidden" value="${fns:unescapeHtml(construction.id)}">
 
 						<table class="table table-bordered">
 							<tbody>
-							<tr>
+<%--							<tr>
 								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>申请人：</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.userName)}
@@ -40,7 +41,7 @@
 									<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>--%>
 							<tr>
 								<td class="width-15 active"><label class="pull-right">项目号：</label></td>
 								<td class="width-35">
@@ -164,11 +165,11 @@
 							<tr>
 								<td class="width-15 active"><label class="pull-right">施工通道：</label></td>
 								<td class="width-35">
-									<input type='text' readonly="readonly" id='channel'  name="channel" class="form-control required"  value="${construction.channel}"/>
+									<input type='text' readonly="readonly" id='channel'  name="channel" class="form-control required"  value="${construction.disclose.channel}"/>
 								</td>
 								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>设备基础是否可以扩容：</label></td>
 								<td class="width-35">
-									<input type='text' readonly="readonly" id='capacity'  name="capacity" class="form-control required"  value="${construction.capacity}"/>
+									<input type='text' readonly="readonly" id='capacity'  name="capacity" class="form-control required"  value="${construction.disclose.capacity}"/>
 										<%--<select id="capacity"  maxlength="100"  class=" form-control">
 										<option value="是">是</option>
 										<option value="否">否</option>
@@ -178,91 +179,91 @@
 							<tr>
 								<td class="width-15 active"><label class="pull-right">现场设备尺寸：</label></td>
 								<td class="width-35">
-									<input type='text' readonly="readonly" id='sceneSize'  name="sceneSize" class="form-control required"  value="${construction.sceneSize}"/>
+									<input type='text' readonly="readonly" id='sceneSize'  name="sceneSize" class="form-control required"  value="${construction.disclose.sceneSize}"/>
 								</td>
 								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>最多可扩容尺寸：</label></td>
 								<td class="width-35">
-									<input type='text' readonly="readonly" id='capacitySize'  name="capacitySize" class="form-control required"  value="${construction.capacitySize}"/>
+									<input type='text' readonly="readonly" id='capacitySize'  name="capacitySize" class="form-control required"  value="${construction.disclose.capacitySize}"/>
 								</td>
 							</tr>
 							<tr>
 								<td class="width-15 active"><label class="pull-right">方案安全隐患：</label></td>
 								<td class="width-35">
-									<input type='text' readonly="readonly" id='hiddenDanger'  name="hiddenDanger" class="form-control required"  value="${construction.hiddenDanger}"/>
+									<input type='text' readonly="readonly" id='hiddenDanger'  name="hiddenDanger" class="form-control required"  value="${construction.disclose.hiddenDanger}"/>
 								</td>
 								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>是否存在低压或通信线等影响施工：</label></td>
 								<td class="width-35">
-									<input type='text' readonly="readonly" id='influenceConstruction'  name="influenceConstruction" class="form-control required"  value="${construction.influenceConstruction}"/>
+									<input type='text' readonly="readonly" id='influenceConstruction'  name="influenceConstruction" class="form-control required"  value="${construction.disclose.influenceConstruction}"/>
 								</td>
 							</tr>
 							<tr>
 								<td class="width-15 active"><label class="pull-right">立项重复：</label></td>
 								<td class="width-35">
-									<input type='text' readonly="readonly" id='projectRepetition'  name="projectRepetition" class="form-control required"  value="${construction.projectRepetition}"/>
+									<input type='text' readonly="readonly" id='projectRepetition'  name="projectRepetition" class="form-control required"  value="${construction.disclose.projectRepetition}"/>
 								</td>
 								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>是否已实施：</label></td>
 								<td class="width-35">
-									<input type='text' readonly="readonly" id='implemented'  name="implemented" class="form-control required"  value="${construction.implemented}"/>
+									<input type='text' readonly="readonly" id='implemented'  name="implemented" class="form-control required"  value="${construction.disclose.implemented}"/>
 								</td>
 							</tr>
 							<tr>
 								<td class="width-15 active"><label class="pull-right">变压器无负荷：</label></td>
 								<td class="width-35">
-									<input type='text' readonly="readonly" id='transformer'  name="transformer" class="form-control required"  value="${construction.transformer}"/>
+									<input type='text' readonly="readonly" id='transformer'  name="transformer" class="form-control required"  value="${construction.disclose.transformer}"/>
 								</td>
 								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>线路名称一致性：</label></td>
 								<td class="width-35">
-									<input type='text' readonly="readonly" id='lineName'  name="lineName" class="form-control required"  value="${construction.lineName}"/>
+									<input type='text' readonly="readonly" id='lineName'  name="lineName" class="form-control required"  value="${construction.disclose.lineName}"/>
 								</td>
 							</tr>
 							<tr>
 								<td class="width-15 active"><label class="pull-right">工程量是否一致：</label></td>
 								<td class="width-35">
-									<input type='text' readonly="readonly" id='quantities'  name="quantities" class="form-control required"  value="${construction.quantities}"/>
+									<input type='text' readonly="readonly" id='quantities'  name="quantities" class="form-control required"  value="${construction.disclose.quantities}"/>
 								</td>
 								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>设备、开关、杆号一致性：</label></td>
 								<td class="width-35">
-									<input type='text' readonly="readonly" id='rodNumber'  name="rodNumber" class="form-control required"  value="${construction.rodNumber}"/>
+									<input type='text' readonly="readonly" id='rodNumber'  name="rodNumber" class="form-control required"  value="${construction.disclose.rodNumber}"/>
 								</td>
 							</tr>
 							<tr>
 								<td class="width-15 active"><label class="pull-right">政处类型：</label></td>
 								<td class="width-35">
-									<input type='text' readonly="readonly" id='administrationType'  name="administrationType" class="form-control required"  value="${construction.administrationType}"/>
+									<input type='text' readonly="readonly" id='administrationType'  name="administrationType" class="form-control required"  value="${construction.disclose.administrationType}"/>
 								</td>
 								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>是否存在严重政处问题（预判）：</label></td>
 								<td class="width-35">
-									<input type='text' readonly="readonly" id='politicalProblem'  name="politicalProblem" class="form-control required"  value="${construction.politicalProblem}"/>
+									<input type='text' readonly="readonly" id='politicalProblem'  name="politicalProblem" class="form-control required"  value="${construction.disclose.politicalProblem}"/>
 								</td>
 							</tr>
 							<tr>
 								<td class="width-15 active"><label class="pull-right">前置条件：</label></td>
 								<td class="width-35">
-									<input type='text' readonly="readonly" id='precondition'  name="precondition" class="form-control required"  value="${construction.precondition}"/>
+									<input type='text' readonly="readonly" id='precondition'  name="precondition" class="form-control required"  value="${construction.disclose.precondition}"/>
 								</td>
 								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>DTU安放方式核查：</label></td>
 								<td class="width-35">
-									<input type='text' readonly="readonly" id='placementMode'  name="placementMode" class="form-control required"  value="${construction.placementMode}"/>
+									<input type='text' readonly="readonly" id='placementMode'  name="placementMode" class="form-control required"  value="${construction.disclose.placementMode}"/>
 								</td>
 							</tr>
 							<tr>
 								<td class="width-15 active"><label class="pull-right">核查环网柜生产日期：</label></td>
 								<td class="width-35">
-									<input type='text' readonly="readonly" id='productionDate'  name="productionDate" class="form-control required"  value="${construction.productionDate}"/>
+									<input type='text' readonly="readonly" id='productionDate'  name="productionDate" class="form-control required"  value="${construction.disclose.productionDate}"/>
 								</td>
 								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>二次是否是集成模块：</label></td>
 								<td class="width-35">
-									<input type='text' readonly="readonly" id='IntegrateModule'  name="IntegrateModule" class="form-control required"  value="${construction.integrateModule}"/>
+									<input type='text' readonly="readonly" id='IntegrateModule'  name="IntegrateModule" class="form-control required"  value="${construction.disclose.integrateModule}"/>
 								</td>
 							</tr>
 							<tr>
 								<td class="width-15 active"><label class="pull-right">PT是否需要更换：</label></td>
 								<td class="width-35">
-									<input type='text' readonly="readonly" id='needReplace'  name="needReplace" class="form-control required"  value="${construction.needReplace}"/>
+									<input type='text' readonly="readonly" id='needReplace'  name="needReplace" class="form-control required"  value="${construction.disclose.needReplace}"/>
 								</td>
 								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>设备是否有整体改造的必要：</label></td>
 								<td class="width-35">
-									<input type='text' readonly="readonly" id='overallTransformation'  name="overallTransformation" class="form-control required"  value="${construction.overallTransformation}"/>
+									<input type='text' readonly="readonly" id='overallTransformation'  name="overallTransformation" class="form-control required"  value="${construction.disclose.overallTransformation}"/>
 								</td>
 							</tr>
 							</tbody>