Merge branch 'master' of http://192.168.2.4:3000/chengqiang/sg_audit

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

@@ -1112,6 +1112,65 @@ public class ActTaskService extends BaseService {
 	}
 
 	/**
+	 * 人工选择问题类型审批
+	 * @param act
+	 */
+	@Transactional(readOnly = false)
+	public void artificialTask(Act act) {
+		boolean pass1 = false;
+		boolean pass2 = false;
+		boolean pass3 = false;
+		boolean pass4 = false;
+		Map<String, Object> vars = Maps.newHashMap();
+		vars.put("pass4", false);
+		vars.put("pass1", false);
+		vars.put("pass2", false);
+		vars.put("pass3", false);
+		String flag = act.getFlag();
+		String[] split = flag.split(";");
+		for (String a : split) {
+			if ("pass1".equals(a)) {
+				pass1 = true;
+			} else if ("pass2".equals(a)) {
+				pass2 = true;
+			}else if ("pass3".equals(a)) {
+				pass3 = true;
+			}else if ("pass4".equals(a)) {
+				pass4 = true;
+			}
+		}
+		if (pass4 == true) {
+			act.setComment("[完成施工交底]" + act.getComment());
+			act.preUpdate();
+			// 对不同环节的业务逻辑进行操作
+			String taskDefKey = act.getTaskDefKey();
+			// 提交流程任务
+			vars.put("pass4", true);
+			complete(act.getTaskId(), act.getProcInsId(), act.getComment(), vars);
+		} else {
+			if (pass1 == true) {
+				vars.put("pass1", true);
+				vars.put("design", "sjdwry");
+			}
+			if (pass2 == true) {
+				vars.put("pass2", true);
+				vars.put("itemClose", "");
+			}
+			if (pass3 == true) {
+				vars.put("pass3", true);
+				vars.put("policy", "");
+			}
+			act.setComment("[存在问题]" + act.getComment());
+			act.preUpdate();
+			// 对不同环节的业务逻辑进行操作
+			String taskDefKey = act.getTaskDefKey();
+			// 提交流程任务
+			complete(act.getTaskId(), act.getProcInsId(), act.getComment(), vars);
+		}
+
+	}
+
+	/**
 	 * 经理保存审核意见
 	 * @param act
 	 */

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

@@ -381,6 +381,25 @@ public class ActTaskController extends BaseController {
 		return j;
 	}
 
+	/**
+	 * 人工选择问题类型审批
+	 * @param act
+	 */
+	@ResponseBody
+	@RequestMapping(value = "artificialTask")
+	public AjaxJson artificialTask(Act act) {
+		AjaxJson j = new AjaxJson();
+		try {
+			String comment = URLDecoder.decode(act.getComment(), "UTF-8");
+			act.setComment(comment);
+			actTaskService.artificialTask(act);
+		} catch (UnsupportedEncodingException e) {
+			e.printStackTrace();
+		}
+		j.setMsg("审批成功");
+		return j;
+	}
+
 
 	/**
 	 * 施工审批

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

@@ -16,5 +16,5 @@ import com.jeeplus.modules.sg.managementcenter.activiti.entity.Disclose;
 
 @MyBatisMapper
 public interface DiscloseMapper extends BaseMapper<Disclose> {
-
+    void newInsert(Disclose disclose);
 }

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

@@ -238,5 +238,75 @@
 	<select id="findUniqueByProperty" resultType="OALeave" statementType="STATEMENT">
 		select * FROM xm_disclose_conclusion  where ${propertyName} = '${value}'
 	</select>
-	
+
+
+	<insert id="newInsert">
+		replace into xm_disclose_conclusion(
+			id,
+			proc_ins_id,
+			conId,
+			channel,
+			capacity,
+			sceneSize,
+			capacitySize,
+			hiddenDanger,
+			influenceConstruction,
+			projectRepetition,
+			implemented,
+			transformer,
+			lineName,
+			quantities,
+			rodNumber,
+			administrationType,
+			politicalProblem,
+			precondition,
+			placementMode,
+			productionDate,
+			IntegrateModule,
+			needReplace,
+			overallTransformation,
+			explanationOfNecessity,
+			inconsistentDescription,
+			policyHandlingInstructions,
+			create_by,
+			create_date,
+			update_by,
+			update_date,
+			remarks,
+			del_flag
+		) VALUES (
+			#{id},
+			#{procInsId},
+			#{conId},
+			#{channel},
+			#{capacity},
+			#{sceneSize},
+			#{capacitySize},
+			#{hiddenDanger},
+			#{influenceConstruction},
+			#{projectRepetition},
+			#{implemented},
+			#{transformer},
+			#{lineName},
+			#{quantities},
+			#{rodNumber},
+			#{administrationType},
+			#{politicalProblem},
+			#{precondition},
+			#{placementMode},
+			#{productionDate},
+			#{IntegrateModule},
+			#{needReplace},
+			#{overallTransformation},
+			#{explanationOfNecessity},
+			#{inconsistentDescription},
+			#{policyHandlingInstructions},
+			#{createBy.id},
+			#{createDate},
+			#{updateBy.id},
+			#{updateDate},
+			#{remarks},
+			#{delFlag}
+		)
+	</insert>
 </mapper>

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

@@ -17,12 +17,13 @@ import java.util.List;
 
 /**
  * 施工交底Service
+ *
  * @author
  * @version 2019-11-08
  */
 @Service
 @Transactional(readOnly = true)
-public class DiscloseService extends CrudService<DiscloseMapper,Disclose> {
+public class DiscloseService extends CrudService<DiscloseMapper, Disclose> {
 
 	@Autowired
 	private DiscloseMapper discloseMapper;
@@ -52,4 +53,10 @@ public class DiscloseService extends CrudService<DiscloseMapper,Disclose> {
 	public void delete(Disclose entity) {
 		super.delete(entity);
 	}
+
+	@Transactional(readOnly = false)
+	public void newInsert(Disclose disclose) {
+		disclose.preInsert();
+		discloseMapper.newInsert(disclose);
+	}
 }

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

@@ -165,6 +165,23 @@ public class ConstructionController extends BaseController {
         return "modules/sg/managementcenter/activiti/artificialJudgment";
     }
 
+    /**
+     * 配网运行人员
+     * */
+    /**
+     * 查看，增加，编辑请假申请表单页面
+     */
+    @RequestMapping(value = "operatorDesignChange")
+    public String form3(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/operatorDesignChange";
+    }
+
 
     /**
      * 保存请假申请

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

@@ -115,7 +115,7 @@ public class DivideController extends BaseController {
 		model.addAttribute("construction", construction);
 		if("audit".equals(mode)){
 			return "modules/sg/managementcenter/activiti/divideAudit";
-		}else{//audit
+		}else{//add
 			return "modules/sg/managementcenter/activiti/divideForm";
 		}
 //		return "modules/sg/managementcenter/activiti/constructionForm";
@@ -195,20 +195,23 @@ public class DivideController extends BaseController {
 				disclose.setProjectRepetition(ei.getCellValue(row, 6 ).toString());
 				disclose.setImplemented(ei.getCellValue(row, 7 ).toString());
 				disclose.setTransformer(ei.getCellValue(row, 8 ).toString());
-				disclose.setLineName(ei.getCellValue(row, 9 ).toString());
-				disclose.setQuantities(ei.getCellValue(row, 10).toString());
-				disclose.setRodNumber(ei.getCellValue(row, 11).toString());
-				disclose.setAdministrationType(ei.getCellValue(row, 12).toString());
-				disclose.setPoliticalProblem(ei.getCellValue(row, 13).toString());
-				disclose.setPrecondition(ei.getCellValue(row, 14).toString());
-				disclose.setPlacementMode(ei.getCellValue(row, 15).toString());
-				disclose.setProductionDate(ei.getCellValue(row, 16).toString());
-				disclose.setIntegrateModule(ei.getCellValue(row, 17).toString());
-				disclose.setNeedReplace(ei.getCellValue(row, 18).toString());
-				disclose.setOverallTransformation(ei.getCellValue(row, 19).toString());
+				disclose.setExplanationOfNecessity(ei.getCellValue(row, 9).toString());
+				disclose.setLineName(ei.getCellValue(row, 10 ).toString());
+				disclose.setQuantities(ei.getCellValue(row, 11).toString());
+				disclose.setRodNumber(ei.getCellValue(row, 12).toString());
+				disclose.setInconsistentDescription(ei.getCellValue(row, 13).toString());
+				disclose.setAdministrationType(ei.getCellValue(row, 14).toString());
+				disclose.setPoliticalProblem(ei.getCellValue(row, 15).toString());
+				disclose.setPrecondition(ei.getCellValue(row, 16).toString());
+				disclose.setPolicyHandlingInstructions(ei.getCellValue(row, 17).toString());
+				disclose.setPlacementMode(ei.getCellValue(row, 18).toString());
+				disclose.setProductionDate(ei.getCellValue(row, 19).toString());
+				disclose.setIntegrateModule(ei.getCellValue(row, 20).toString());
+				disclose.setNeedReplace(ei.getCellValue(row, 21).toString());
+				disclose.setOverallTransformation(ei.getCellValue(row, 22).toString());
 			}
 			try {
-				discloseService.save(disclose);
+				discloseService.newInsert(disclose);
 				successNum++;
 			} catch (ConstraintViolationException ex) {
 				failureNum++;

src/main/java/com/jeeplus/modules/sys/mapper/xml/UserMapper.xml

@@ -144,7 +144,7 @@
 					<if test="dbName == 'mysql'">CONCAT('%,', #{office.id}, ',%'))</if>
 					<if test="dbName == 'mssql'">'%'+#{office.id}+'%')</if>
 		</if>
-<!--		<if  test="roleList !=null and roleList!= ''">
+		<if  test="roleList !=null and roleList.size>0">
 			and a.id in
 				(
 					select user_id from sys_user_role where role_id in
@@ -155,7 +155,7 @@
 							</foreach>
 					)
 				)
-		</if>-->
+		</if>
 		<!-- 如果不是超级管理员，则不显示超级管理员用户 -->
 		<if test="!currentUser.admin">
 			AND a.id != '1'

src/main/java/com/jeeplus/modules/sys/web/UserController.java

@@ -103,7 +103,17 @@ public class UserController extends BaseController {
     @RequiresPermissions("sys:user:index")
     @ResponseBody
     @RequestMapping(value = {"list", ""})
-    public Map<String, Object> list(User user, HttpServletRequest request, HttpServletResponse response, Model model) {
+    public Map<String, Object> list(User user, HttpServletRequest request, HttpServletResponse response, Model model,String roleName) {
+        if (roleName != null) {
+            String[] split = roleName.split(";");
+            Role role = new Role();
+            List<Role> roleList = new ArrayList<>();
+            for (int i = 0; i < split.length; i++) {
+                role.setName(split[i]);
+                roleList.add(role);
+            }
+            user.setRoleList(roleList);
+        }
         Page<User> page = systemService.findUser(new Page<User>(request, response), user);
         return getBootstrapData(page);
     }

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

@@ -9,14 +9,60 @@
 	<script type="text/javascript">
 		$(document).ready(function () {
 			$("#agree").click(function () {
-				var cValue =[];//定义一个数组
+				var cValue ="";//定义一个数组
+				var nValue = $('input[name="favorite"]:checked');
 				$('input[name="favorite"]:checked').each(function(){//遍历每一个名字为interest的复选框，其中选中的执行函数
 					console.log($(this).val());
-					cValue.push($(this).val());//将选中的值添加到数组chk_value中
+					cValue=cValue+";"+($(this).val());//将选中的值添加到数组chk_value中
 				});
-				console.log(cValue);
+				if (nValue == null || nValue.size() <= 0) {
+					jp.error("请选择问题类型");
+				} else {
+					console.log("cValue="+cValue);
+					console.log("nValue="+nValue.size());
+					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":cValue,
+							"projectName":"${fns:unescapeHtml(construction.projectName)}",
+							"comment":window.encodeURI(message)
+						},
+						function (data) {
+							if(data.success){
+								jp.success(data.msg);
+								jp.go("${ctx}/act/task/todo")
+							}
+						})
+					});
+				}
 				// console.log($('input[name="favorite"]:checked').val());
 			});
+			$("#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>
@@ -33,9 +79,9 @@
 				<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)}">
+						<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>
@@ -50,11 +96,11 @@
 								</td>
 							</tr>--%>
 							<tr>
-								<td class="width-15 active"><label class="pull-right">项目号：</label></td>
+								<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;
+									<input type="checkbox" name="favorite" value="pass1"> 设计变更 &nbsp;
+									<input type="checkbox" name="favorite" value="pass2"> 项目关闭 &nbsp;
+									<input type="checkbox" name="favorite" value="pass3"> 政策处理 &nbsp;
 								</td>
 							</tr>
 							<tr>

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

@@ -211,40 +211,55 @@
 								<td class="width-35">
 									<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-15 active"><label class="pull-right">项目实施必要性说明</label></td>
 								<td class="width-35">
-									<input type='text' readonly="readonly" id='lineName'  name="lineName" class="form-control required"  value="${construction.disclose.lineName}"/>
+									<input type='text' readonly="readonly" id='explanationOfNecessity'  name="needReplace" class="form-control required"  value="${construction.disclose.explanationOfNecessity}"/>
 								</td>
 							</tr>
 							<tr>
+								<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.disclose.lineName}"/>
+								</td>
 								<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.disclose.quantities}"/>
 								</td>
+
+							</tr>
+							<tr>
 								<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.disclose.rodNumber}"/>
 								</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='inconsistentDescription'  name="overallTransformation" class="form-control required"  value="${construction.disclose.inconsistentDescription}"/>
+								</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.disclose.administrationType}"/>
 								</td>
-								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>是否存在严重政处问题（预判）：</label></td>
+								<td class="width-15 active"><label class="pull-right">前置条件：</label></td>
 								<td class="width-35">
-									<input type='text' readonly="readonly" id='politicalProblem'  name="politicalProblem" class="form-control required"  value="${construction.disclose.politicalProblem}"/>
+									<input type='text' readonly="readonly" id='precondition'  name="precondition" class="form-control required"  value="${construction.disclose.precondition}"/>
 								</td>
+
+
 							</tr>
 							<tr>
-								<td class="width-15 active"><label class="pull-right">前置条件：</label></td>
+								<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.disclose.precondition}"/>
+									<input type='text' readonly="readonly" id='policyHandlingInstructions'  name="needReplace" class="form-control required"  value="${construction.disclose.policyHandlingInstructions}"/>
 								</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.disclose.placementMode}"/>
 								</td>
+
 							</tr>
 							<tr>
 								<td class="width-15 active"><label class="pull-right">核查环网柜生产日期：</label></td>
@@ -255,6 +270,7 @@
 								<td class="width-35">
 									<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>

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

@@ -0,0 +1,349 @@
+<%@ 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 ="";//定义一个数组
+				var nValue = $('input[name="favorite"]:checked');
+				$('input[name="favorite"]:checked').each(function(){//遍历每一个名字为interest的复选框，其中选中的执行函数
+					console.log($(this).val());
+					cValue=cValue+";"+($(this).val());//将选中的值添加到数组chk_value中
+				});
+				if (nValue == null || nValue.size() <= 0) {
+					jp.error("请选择问题类型");
+				} else {
+					console.log("cValue="+cValue);
+					console.log("nValue="+nValue.size());
+					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":cValue,
+							"projectName":"${fns:unescapeHtml(construction.projectName)}",
+							"comment":window.encodeURI(message)
+						},
+						function (data) {
+							if(data.success){
+								jp.success(data.msg);
+								jp.go("${ctx}/act/task/todo")
+							}
+						})
+					});
+				}
+				// console.log($('input[name="favorite"]:checked').val());
+			});
+			$("#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>