流程

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

@@ -7,6 +7,7 @@ import com.jeeplus.core.persistence.Page;
 import com.jeeplus.core.service.CrudService;
 import com.jeeplus.modules.sg.managementcenter.activiti.entity.Construction;
 import com.jeeplus.modules.sg.managementcenter.activiti.mapper.ConstructionMapper;
+import com.jeeplus.modules.sg.managementcenter.activiti.utils.MyImportUtils;
 import com.jeeplus.modules.sg.managementcenter.project.entity.Project;
 import com.jeeplus.modules.sys.entity.User;
 import com.jeeplus.modules.test.activiti.entity.OALeave;
@@ -30,7 +31,8 @@ public class ConstructionService extends CrudService<ConstructionMapper, Constru
 	private ConstructionMapper constructionMapper;
 
 	public Construction get(String id) {
-		return super.get(id);
+		Construction construction = super.get(id);
+		return  MyImportUtils.getAddUnit(construction);
 	}
 	
 	public List<Construction> findList(Construction construction) {

src/main/java/com/jeeplus/modules/sg/managementcenter/activiti/utils/MyImportUtils.java

@@ -157,6 +157,25 @@ public class MyImportUtils {
         return reurnMap;
     }
 
+    //则现场设备尺寸、最多可扩容尺寸需填写，且默认单位为米
+    public static Construction getAddUnit(Construction construction){
+        String size = "";
+        if (null!=construction.getDisclose()){
+            size = construction.getDisclose().getSceneSize();
+            if (null!=size&&!"".equals(size)){
+                if (!size.contains("米")){
+                    construction.getDisclose().setSceneSize(size+"米");
+                }
+            }
+            size = construction.getDisclose().getCapacitySize();
+            if (null!=size && !"".equals(size)){
+                if (!size.contains("米")){
+                    construction.getDisclose().setCapacitySize(size+"米");
+                }
+            }
+        }
+        return construction;
+    }
     //人工审核：回显
     public static void getTheEcho(Construction construction, Model model){
         //前置条件
@@ -210,6 +229,15 @@ public class MyImportUtils {
         }
         if ("".equals(disclose.getCapacity()) || disclose.getCapacity() == null||(!"是".equals(disclose.getCapacity())&&!"否".equals(disclose.getCapacity()))) {
             tips += "设备基础是否可以扩容填写有误;";
+        }else {
+            if ("是".equals(disclose.getCapacity())){
+                if ("".equals(disclose.getSceneSize())||disclose.getSceneSize() == null){
+                    tips+="现场设备尺寸不能为空;";
+                }
+                if ("".equals(disclose.getCapacitySize())||disclose.getCapacitySize()==null){
+                    tips+="最多可扩容尺寸不能为空;";
+                }
+            }
         }
         if ("".equals(disclose.getHiddenDanger()) || disclose.getHiddenDanger() == null||(!"有".equals(disclose.getHiddenDanger())&&!"无".equals(disclose.getHiddenDanger()))) {
             tips += "方案安全隐患填写有误;";
@@ -254,16 +282,37 @@ public class MyImportUtils {
                 }
             }
         }
-        if ("".equals(disclose.getIntegrateModule()) || disclose.getIntegrateModule() == null||(!"是".equals(disclose.getIntegrateModule())&&!"否".equals(disclose.getIntegrateModule()))) {
-            tips += "二次是否是集成模块填写有误;";
+        //DTU  安放方式检查
+        if ("".equals(disclose.getPlacementMode())||disclose.getPlacementMode() == null||(!"户外".equals(disclose.getPlacementMode())&&!"户内".equals(disclose.getPlacementMode())&&!"无".equals(disclose.getPlacementMode()))){
+            tips+="DTU安放方式核查填写有误";
+        }else {
+            if ("户外".equals(disclose.getPlacementMode())||"户内".equals(disclose.getPlacementMode())){
+                if ("".equals(disclose.getProductionDate())||disclose.getProductionDate() == null){
+                    tips +="核查环网柜生产日期不能为空;";
+                }
+            }
+        }
+        if ("".equals(disclose.getIntegrateModule()) || disclose.getIntegrateModule() == null) {
+            tips += "二次是否是集成模块不能为空;";
+        }else {
+            if (!"是".equals(disclose.getIntegrateModule())&&!"否".equals(disclose.getIntegrateModule())){
+                tips += "二次是否是集成模块填写有误;";
+            }
         }
-        if ("".equals(disclose.getNeedReplace()) || disclose.getNeedReplace() == null||(!"是".equals(disclose.getNeedReplace())&&!"否".equals(disclose.getNeedReplace()))) {
-            tips += "PT是否需要更换填写有误;";
+        if ("".equals(disclose.getNeedReplace()) || disclose.getNeedReplace() == null) {
+            tips += "PT是否需要更换不能为空;";
+        }else {
+            if (!"是".equals(disclose.getNeedReplace())&&!"否".equals(disclose.getNeedReplace())){
+                tips += "PT是否需要更换填写有误;";
+            }
         }
-        if ("".equals(disclose.getOverallTransformation()) || disclose.getOverallTransformation() == null||(!"是".equals(disclose.getOverallTransformation())&&!"否".equals(disclose.getOverallTransformation()))) {
-            tips += "设备是否有整体改造的必要填写有误;";
+        if ("".equals(disclose.getOverallTransformation()) || disclose.getOverallTransformation() == null) {
+            tips += "设备是否有整体改造的必要不能为空;";
+        }else {
+            if (!"是".equals(disclose.getOverallTransformation())&&!"否".equals(disclose.getOverallTransformation())){
+                tips += "设备是否有整体改造的必要填写有误;";
+            }
         }
         return tips;
     }
-
 }

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

@@ -156,8 +156,6 @@ public class DivideController extends BaseController {
     @ResponseBody
     @RequestMapping(value = "importConclusion")
     public AjaxJson importConclusion(@RequestParam("file") MultipartFile file, HttpServletResponse response, HttpServletRequest request,String procInsId,String projectName){
-        System.out.println(procInsId);
-        System.out.println(projectName);
         AjaxJson j = new AjaxJson();
         try {
             projectName = URLDecoder.decode(projectName, "UTF-8");

src/main/java/com/jeeplus/modules/sg/managementcenter/project/mapper/xml/ProjectMapper.xml

@@ -545,8 +545,11 @@
 			,through_research_role
 			,construction_unit
 			,construction_unit_role
+			,construction_unit_manage
+			,construction_unit_leader
 			,design_unit
-			,design_unit_role
+			,design_unit_manage
+			,design_unit_leader
 		FROM xm_project_details
 		WHERE require_name = (select project_name from xm_construction_clarificaiton where proc_ins_id=#{procInsId});
 	</select>

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

@@ -100,21 +100,13 @@
 								<td class="width-35">
 									<sys:fileUpload  path="pic" fileNumLimit="50" fileSizeLimit="50" value="${testPic.pic}" type="file" uploadPath="/list"></sys:fileUpload>
 								</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}"--%>
-													<%--loginName="loginName" loginValue="政策处理2" cssClass="form-control required"/>--%>
-								<%--</td>--%>
 							</tr>
-							<%--<tr>--%>
-								<%----%>
-							<%--</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-15 active"><label class="pull-right">停电范围（中间统一用中文分号）：</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.blackoutArea)}
 								</td>
@@ -124,7 +116,7 @@
 								<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-15 active"><label class="pull-right">政处初步判断：</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.preliminaryJudgment)}
 								</td>
@@ -134,7 +126,7 @@
 								<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-15 active"><label class="pull-right">钢管杆基础类型：</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.baseType)}
 								</td>
@@ -144,7 +136,7 @@
 								<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-15 active"><label class="pull-right">设备改造类型：</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.transformationType)}
 								</td>
@@ -154,7 +146,7 @@
 								<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-15 active"><label class="pull-right">是否含新设备命名：</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.newNamed)}
 								</td>
@@ -164,7 +156,7 @@
 								<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-15 active"><label class="pull-right">是否含非涉电电气施工：</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.electricalConstruction)}
 								</td>
@@ -173,8 +165,8 @@
 								<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>
+								<td class="width-15 active"><label class="pull-right">是否含自动化：</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.automation)}
 								</td>
@@ -184,7 +176,7 @@
 								<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-15 active"><label class="pull-right">通信方式：</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.communicationMode)}
 								</td>
@@ -194,7 +186,7 @@
 								<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-15 active"><label class="pull-right">环网柜DTU户外或户内：</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.networkCabinet)}
 								</td>
@@ -204,7 +196,7 @@
 								<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-15 active"><label class="pull-right">是否为停电打包项目：</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.powerFailure)}
 								</td>
@@ -214,13 +206,9 @@
 								<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-15 active"><label class="pull-right">设备基础是否可以扩容：</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>
@@ -228,7 +216,7 @@
 								<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-15 active"><label class="pull-right">最多可扩容尺寸：</label></td>
 								<td class="width-35">
 										${construction.disclose.capacitySize}
 								</td>
@@ -238,7 +226,7 @@
 								<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-15 active"><label class="pull-right">是否存在低压或通信线等影响施工：</label></td>
 								<td class="width-35">
 										${construction.disclose.influenceConstruction}
 								</td>
@@ -248,7 +236,7 @@
 								<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-15 active"><label class="pull-right">是否已实施：</label></td>
 								<td class="width-35">
 										${construction.disclose.implemented}
 								</td>
@@ -258,141 +246,47 @@
 								<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-15 active"><label class="pull-right">必要性问题说明：</label></td>
 								<td class="width-35">
-										${construction.disclose.lineName}
+										${construction.disclose.explanationOfNecessity}
 								</td>
 							</tr>
 							<tr>
+								<td class="width-15 active"><label class="pull-right">线路名称一致性：</label></td>
+								<td class="width-35">
+										${construction.disclose.lineName}
+								</td>
 								<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>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">设备、开关、杆号一致性：</label></td>
 								<td class="width-35">
 										${construction.disclose.rodNumber}
 								</td>
+								<td class="width-15 active"><label class="pull-right">图纸现场不一致说明：</label></td>
+								<td class="width-35">
+										${construction.disclose.inconsistentDescription}
+								</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-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}
+										${construction.disclose.policyHandlingInstructions}
 								</td>
-								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>DTU安放方式核查：</label></td>
+								<td class="width-15 active"><label class="pull-right">DTU安放方式核查：</label></td>
 								<td class="width-35">
 										${construction.disclose.placementMode}
 								</td>
@@ -402,7 +296,7 @@
 								<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-15 active"><label class="pull-right">二次是否是集成模块：</label></td>
 								<td class="width-35">
 										${construction.disclose.integrateModule}
 								</td>
@@ -412,7 +306,7 @@
 								<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-15 active"><label class="pull-right">设备是否有整体改造的必要：</label></td>
 								<td class="width-35">
 										${construction.disclose.overallTransformation}
 								</td>

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

@@ -44,22 +44,8 @@
 				<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">
@@ -75,18 +61,13 @@
 								<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-15 active"><label class="pull-right">停电范围（中间统一用中文分号）：</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.blackoutArea)}
 								</td>
@@ -96,7 +77,7 @@
 								<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-15 active"><label class="pull-right">政处初步判断：</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.preliminaryJudgment)}
 								</td>
@@ -106,7 +87,7 @@
 								<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-15 active"><label class="pull-right">钢管杆基础类型：</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.baseType)}
 								</td>
@@ -116,7 +97,7 @@
 								<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-15 active"><label class="pull-right">设备改造类型：</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.transformationType)}
 								</td>
@@ -126,7 +107,7 @@
 								<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-15 active"><label class="pull-right">是否含新设备命名：</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.newNamed)}
 								</td>
@@ -136,7 +117,7 @@
 								<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-15 active"><label class="pull-right">是否含非涉电电气施工：</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.electricalConstruction)}
 								</td>
@@ -145,8 +126,8 @@
 								<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>
+								<td class="width-15 active"><label class="pull-right">是否含自动化：</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.automation)}
 								</td>
@@ -156,7 +137,7 @@
 								<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-15 active"><label class="pull-right">通信方式：</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.communicationMode)}
 								</td>
@@ -166,7 +147,7 @@
 								<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-15 active"><label class="pull-right">环网柜DTU户外或户内：</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.networkCabinet)}
 								</td>
@@ -176,7 +157,7 @@
 								<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-15 active"><label class="pull-right">是否为停电打包项目：</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.powerFailure)}
 								</td>
@@ -186,13 +167,9 @@
 								<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-15 active"><label class="pull-right">设备基础是否可以扩容：</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>
@@ -200,7 +177,7 @@
 								<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-15 active"><label class="pull-right">最多可扩容尺寸：</label></td>
 								<td class="width-35">
 										${construction.disclose.capacitySize}
 								</td>
@@ -210,7 +187,7 @@
 								<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-15 active"><label class="pull-right">是否存在低压或通信线等影响施工：</label></td>
 								<td class="width-35">
 										${construction.disclose.influenceConstruction}
 								</td>
@@ -220,7 +197,7 @@
 								<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-15 active"><label class="pull-right">是否已实施：</label></td>
 								<td class="width-35">
 										${construction.disclose.implemented}
 								</td>
@@ -230,37 +207,47 @@
 								<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-15 active"><label class="pull-right">必要性问题说明：</label></td>
 								<td class="width-35">
-										${construction.disclose.lineName}
+										${construction.disclose.explanationOfNecessity}
 								</td>
 							</tr>
 							<tr>
+								<td class="width-15 active"><label class="pull-right">线路名称一致性：</label></td>
+								<td class="width-35">
+										${construction.disclose.lineName}
+								</td>
 								<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>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">设备、开关、杆号一致性：</label></td>
 								<td class="width-35">
 										${construction.disclose.rodNumber}
 								</td>
+								<td class="width-15 active"><label class="pull-right">图纸现场不一致说明：</label></td>
+								<td class="width-35">
+										${construction.disclose.inconsistentDescription}
+								</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>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">政策处理说明：</label></td>
+								<td class="width-35">
+										${construction.disclose.policyHandlingInstructions}
+								</td>
+								<td class="width-15 active"><label class="pull-right">DTU安放方式核查：</label></td>
 								<td class="width-35">
 										${construction.disclose.placementMode}
 								</td>
@@ -270,7 +257,7 @@
 								<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-15 active"><label class="pull-right">二次是否是集成模块：</label></td>
 								<td class="width-35">
 										${construction.disclose.integrateModule}
 								</td>
@@ -280,7 +267,7 @@
 								<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-15 active"><label class="pull-right">设备是否有整体改造的必要：</label></td>
 								<td class="width-35">
 										${construction.disclose.overallTransformation}
 								</td>

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

@@ -103,7 +103,7 @@
 								<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-15 active"><label class="pull-right">停电范围（中间统一用中文分号）：</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.blackoutArea)}
 								</td>
@@ -113,7 +113,7 @@
 								<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-15 active"><label class="pull-right">政处初步判断：</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.preliminaryJudgment)}
 								</td>
@@ -123,7 +123,7 @@
 								<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-15 active"><label class="pull-right">钢管杆基础类型：</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.baseType)}
 								</td>
@@ -133,7 +133,7 @@
 								<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-15 active"><label class="pull-right">设备改造类型：</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.transformationType)}
 								</td>
@@ -143,7 +143,7 @@
 								<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-15 active"><label class="pull-right">是否含新设备命名：</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.newNamed)}
 								</td>
@@ -153,7 +153,7 @@
 								<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-15 active"><label class="pull-right">是否含非涉电电气施工：</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.electricalConstruction)}
 								</td>
@@ -162,8 +162,8 @@
 								<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>
+								<td class="width-15 active"><label class="pull-right">是否含自动化：</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.automation)}
 								</td>
@@ -173,7 +173,7 @@
 								<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-15 active"><label class="pull-right">通信方式：</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.communicationMode)}
 								</td>
@@ -183,7 +183,7 @@
 								<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-15 active"><label class="pull-right">环网柜DTU户外或户内：</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.networkCabinet)}
 								</td>
@@ -193,7 +193,7 @@
 								<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-15 active"><label class="pull-right">是否为停电打包项目：</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.powerFailure)}
 								</td>
@@ -203,13 +203,9 @@
 								<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-15 active"><label class="pull-right">设备基础是否可以扩容：</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>
@@ -217,7 +213,7 @@
 								<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-15 active"><label class="pull-right">最多可扩容尺寸：</label></td>
 								<td class="width-35">
 										${construction.disclose.capacitySize}
 								</td>
@@ -227,7 +223,7 @@
 								<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-15 active"><label class="pull-right">是否存在低压或通信线等影响施工：</label></td>
 								<td class="width-35">
 										${construction.disclose.influenceConstruction}
 								</td>
@@ -237,7 +233,7 @@
 								<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-15 active"><label class="pull-right">是否已实施：</label></td>
 								<td class="width-35">
 										${construction.disclose.implemented}
 								</td>
@@ -247,141 +243,47 @@
 								<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-15 active"><label class="pull-right">必要性问题说明：</label></td>
 								<td class="width-35">
-										${construction.disclose.lineName}
+										${construction.disclose.explanationOfNecessity}
 								</td>
 							</tr>
 							<tr>
+								<td class="width-15 active"><label class="pull-right">线路名称一致性：</label></td>
+								<td class="width-35">
+										${construction.disclose.lineName}
+								</td>
 								<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>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">设备、开关、杆号一致性：</label></td>
 								<td class="width-35">
 										${construction.disclose.rodNumber}
 								</td>
+								<td class="width-15 active"><label class="pull-right">图纸现场不一致说明：</label></td>
+								<td class="width-35">
+										${construction.disclose.inconsistentDescription}
+								</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-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}
+										${construction.disclose.policyHandlingInstructions}
 								</td>
-								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>DTU安放方式核查：</label></td>
+								<td class="width-15 active"><label class="pull-right">DTU安放方式核查：</label></td>
 								<td class="width-35">
 										${construction.disclose.placementMode}
 								</td>
@@ -391,7 +293,7 @@
 								<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-15 active"><label class="pull-right">二次是否是集成模块：</label></td>
 								<td class="width-35">
 										${construction.disclose.integrateModule}
 								</td>
@@ -401,7 +303,7 @@
 								<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-15 active"><label class="pull-right">设备是否有整体改造的必要：</label></td>
 								<td class="width-35">
 										${construction.disclose.overallTransformation}
 								</td>

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

@@ -114,33 +114,27 @@
 									<input type="checkbox" name="favorite" value="pass6"  <c:if test="${pass_construction4=='0'}">checked="checked"</c:if> onclick="return false"> 民事政处/行政政处（公路/水利）
 									<input type="checkbox" name="favorite" value="pass7"  <c:if test="${pass_construction6=='0'}">checked="checked"</c:if> onclick="return false"> 人工判断
 								</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">
+										${fns:unescapeHtml(construction.projectId)}
+								</td>
 								<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-15 active"><label class="pull-right">停电范围（中间统一用中文分号）：</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.blackoutArea)}
 								</td>
@@ -150,7 +144,7 @@
 								<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-15 active"><label class="pull-right">政处初步判断：</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.preliminaryJudgment)}
 								</td>
@@ -160,7 +154,7 @@
 								<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-15 active"><label class="pull-right">钢管杆基础类型：</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.baseType)}
 								</td>
@@ -170,7 +164,7 @@
 								<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-15 active"><label class="pull-right">设备改造类型：</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.transformationType)}
 								</td>
@@ -180,7 +174,7 @@
 								<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-15 active"><label class="pull-right">是否含新设备命名：</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.newNamed)}
 								</td>
@@ -190,7 +184,7 @@
 								<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-15 active"><label class="pull-right">是否含非涉电电气施工：</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.electricalConstruction)}
 								</td>
@@ -199,8 +193,8 @@
 								<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>
+								<td class="width-15 active"><label class="pull-right">是否含自动化：</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.automation)}
 								</td>
@@ -210,7 +204,7 @@
 								<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-15 active"><label class="pull-right">通信方式：</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.communicationMode)}
 								</td>
@@ -220,7 +214,7 @@
 								<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-15 active"><label class="pull-right">环网柜DTU户外或户内：</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.networkCabinet)}
 								</td>
@@ -230,7 +224,7 @@
 								<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-15 active"><label class="pull-right">是否为停电打包项目：</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.powerFailure)}
 								</td>
@@ -240,13 +234,9 @@
 								<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-15 active"><label class="pull-right">设备基础是否可以扩容：</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>
@@ -254,7 +244,7 @@
 								<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-15 active"><label class="pull-right">最多可扩容尺寸：</label></td>
 								<td class="width-35">
 										${construction.disclose.capacitySize}
 								</td>
@@ -264,7 +254,7 @@
 								<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-15 active"><label class="pull-right">是否存在低压或通信线等影响施工：</label></td>
 								<td class="width-35">
 										${construction.disclose.influenceConstruction}
 								</td>
@@ -274,7 +264,7 @@
 								<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-15 active"><label class="pull-right">是否已实施：</label></td>
 								<td class="width-35">
 										${construction.disclose.implemented}
 								</td>
@@ -284,36 +274,47 @@
 								<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-15 active"><label class="pull-right">必要性问题说明：</label></td>
 								<td class="width-35">
-										${construction.disclose.lineName}
+										${construction.disclose.explanationOfNecessity}
 								</td>
 							</tr>
 							<tr>
+								<td class="width-15 active"><label class="pull-right">线路名称一致性：</label></td>
+								<td class="width-35">
+										${construction.disclose.lineName}
+								</td>
 								<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>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">设备、开关、杆号一致性：</label></td>
 								<td class="width-35">
 										${construction.disclose.rodNumber}
 								</td>
+								<td class="width-15 active"><label class="pull-right">图纸现场不一致说明：</label></td>
+								<td class="width-35">
+										${construction.disclose.inconsistentDescription}
+								</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-15 active"><label class="pull-right">前置条件：</label></td>
 								<td class="width-35">
+										${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">
-										${construction.disclose.precondition}
+										${construction.disclose.policyHandlingInstructions}
 								</td>
-								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>DTU安放方式核查：</label></td>
+								<td class="width-15 active"><label class="pull-right">DTU安放方式核查：</label></td>
 								<td class="width-35">
 										${construction.disclose.placementMode}
 								</td>
@@ -323,7 +324,7 @@
 								<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-15 active"><label class="pull-right">二次是否是集成模块：</label></td>
 								<td class="width-35">
 										${construction.disclose.integrateModule}
 								</td>
@@ -333,29 +334,11 @@
 								<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-15 active"><label class="pull-right">设备是否有整体改造的必要：</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.explanationOfNecessity}
-								</td>
-								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>图纸现场不一致说明：</label></td>
-								<td class="width-35">
-										${construction.disclose.inconsistentDescription}
-								</td>
-							</tr>
-							<tr>
-								<td class="width-15 active"><label class="pull-right">政策处理说明：</label></td>
-								<td class="width-35">
-										${construction.disclose.policyHandlingInstructions}
-								</td>
-							</tr>
 							</tbody>
 						</table>
 					</form:form>

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

@@ -65,22 +65,8 @@
 				<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">
@@ -96,19 +82,13 @@
 								<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-15 active"><label class="pull-right">停电范围（中间统一用中文分号）：</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.blackoutArea)}
 								</td>
@@ -118,7 +98,7 @@
 								<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-15 active"><label class="pull-right">政处初步判断：</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.preliminaryJudgment)}
 								</td>
@@ -128,7 +108,7 @@
 								<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-15 active"><label class="pull-right">钢管杆基础类型：</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.baseType)}
 								</td>
@@ -138,7 +118,7 @@
 								<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-15 active"><label class="pull-right">设备改造类型：</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.transformationType)}
 								</td>
@@ -148,7 +128,7 @@
 								<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-15 active"><label class="pull-right">是否含新设备命名：</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.newNamed)}
 								</td>
@@ -158,7 +138,7 @@
 								<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-15 active"><label class="pull-right">是否含非涉电电气施工：</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.electricalConstruction)}
 								</td>
@@ -167,8 +147,8 @@
 								<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>
+								<td class="width-15 active"><label class="pull-right">是否含自动化：</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.automation)}
 								</td>
@@ -178,7 +158,7 @@
 								<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-15 active"><label class="pull-right">通信方式：</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.communicationMode)}
 								</td>
@@ -188,7 +168,7 @@
 								<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-15 active"><label class="pull-right">环网柜DTU户外或户内：</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.networkCabinet)}
 								</td>
@@ -198,7 +178,7 @@
 								<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-15 active"><label class="pull-right">是否为停电打包项目：</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.powerFailure)}
 								</td>
@@ -208,13 +188,9 @@
 								<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-15 active"><label class="pull-right">设备基础是否可以扩容：</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>
@@ -222,7 +198,7 @@
 								<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-15 active"><label class="pull-right">最多可扩容尺寸：</label></td>
 								<td class="width-35">
 										${construction.disclose.capacitySize}
 								</td>
@@ -232,7 +208,7 @@
 								<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-15 active"><label class="pull-right">是否存在低压或通信线等影响施工：</label></td>
 								<td class="width-35">
 										${construction.disclose.influenceConstruction}
 								</td>
@@ -242,7 +218,7 @@
 								<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-15 active"><label class="pull-right">是否已实施：</label></td>
 								<td class="width-35">
 										${construction.disclose.implemented}
 								</td>
@@ -252,37 +228,47 @@
 								<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-15 active"><label class="pull-right">必要性问题说明：</label></td>
 								<td class="width-35">
-										${construction.disclose.lineName}
+										${construction.disclose.explanationOfNecessity}
 								</td>
 							</tr>
 							<tr>
+								<td class="width-15 active"><label class="pull-right">线路名称一致性：</label></td>
+								<td class="width-35">
+										${construction.disclose.lineName}
+								</td>
 								<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>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">设备、开关、杆号一致性：</label></td>
 								<td class="width-35">
 										${construction.disclose.rodNumber}
 								</td>
+								<td class="width-15 active"><label class="pull-right">图纸现场不一致说明：</label></td>
+								<td class="width-35">
+										${construction.disclose.inconsistentDescription}
+								</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>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">政策处理说明：</label></td>
+								<td class="width-35">
+										${construction.disclose.policyHandlingInstructions}
+								</td>
+								<td class="width-15 active"><label class="pull-right">DTU安放方式核查：</label></td>
 								<td class="width-35">
 										${construction.disclose.placementMode}
 								</td>
@@ -292,7 +278,7 @@
 								<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-15 active"><label class="pull-right">二次是否是集成模块：</label></td>
 								<td class="width-35">
 										${construction.disclose.integrateModule}
 								</td>
@@ -302,7 +288,7 @@
 								<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-15 active"><label class="pull-right">设备是否有整体改造的必要：</label></td>
 								<td class="width-35">
 										${construction.disclose.overallTransformation}
 								</td>

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

@@ -104,7 +104,7 @@
 								<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-15 active"><label class="pull-right">停电范围（中间统一用中文分号）：</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.blackoutArea)}
 								</td>
@@ -114,7 +114,7 @@
 								<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-15 active"><label class="pull-right">政处初步判断：</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.preliminaryJudgment)}
 								</td>
@@ -124,7 +124,7 @@
 								<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-15 active"><label class="pull-right">钢管杆基础类型：</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.baseType)}
 								</td>
@@ -134,7 +134,7 @@
 								<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-15 active"><label class="pull-right">设备改造类型：</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.transformationType)}
 								</td>
@@ -144,7 +144,7 @@
 								<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-15 active"><label class="pull-right">是否含新设备命名：</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.newNamed)}
 								</td>
@@ -154,7 +154,7 @@
 								<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-15 active"><label class="pull-right">是否含非涉电电气施工：</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.electricalConstruction)}
 								</td>
@@ -163,8 +163,8 @@
 								<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>
+								<td class="width-15 active"><label class="pull-right">是否含自动化：</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.automation)}
 								</td>
@@ -174,7 +174,7 @@
 								<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-15 active"><label class="pull-right">通信方式：</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.communicationMode)}
 								</td>
@@ -184,7 +184,7 @@
 								<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-15 active"><label class="pull-right">环网柜DTU户外或户内：</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.networkCabinet)}
 								</td>
@@ -194,7 +194,7 @@
 								<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-15 active"><label class="pull-right">是否为停电打包项目：</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.powerFailure)}
 								</td>
@@ -204,13 +204,9 @@
 								<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-15 active"><label class="pull-right">设备基础是否可以扩容：</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>
@@ -218,7 +214,7 @@
 								<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-15 active"><label class="pull-right">最多可扩容尺寸：</label></td>
 								<td class="width-35">
 										${construction.disclose.capacitySize}
 								</td>
@@ -228,7 +224,7 @@
 								<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-15 active"><label class="pull-right">是否存在低压或通信线等影响施工：</label></td>
 								<td class="width-35">
 										${construction.disclose.influenceConstruction}
 								</td>
@@ -238,7 +234,7 @@
 								<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-15 active"><label class="pull-right">是否已实施：</label></td>
 								<td class="width-35">
 										${construction.disclose.implemented}
 								</td>
@@ -248,141 +244,47 @@
 								<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-15 active"><label class="pull-right">必要性问题说明：</label></td>
 								<td class="width-35">
-										${construction.disclose.lineName}
+										${construction.disclose.explanationOfNecessity}
 								</td>
 							</tr>
 							<tr>
+								<td class="width-15 active"><label class="pull-right">线路名称一致性：</label></td>
+								<td class="width-35">
+										${construction.disclose.lineName}
+								</td>
 								<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>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">设备、开关、杆号一致性：</label></td>
 								<td class="width-35">
 										${construction.disclose.rodNumber}
 								</td>
+								<td class="width-15 active"><label class="pull-right">图纸现场不一致说明：</label></td>
+								<td class="width-35">
+										${construction.disclose.inconsistentDescription}
+								</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-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}
+										${construction.disclose.policyHandlingInstructions}
 								</td>
-								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>DTU安放方式核查：</label></td>
+								<td class="width-15 active"><label class="pull-right">DTU安放方式核查：</label></td>
 								<td class="width-35">
 										${construction.disclose.placementMode}
 								</td>
@@ -392,7 +294,7 @@
 								<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-15 active"><label class="pull-right">二次是否是集成模块：</label></td>
 								<td class="width-35">
 										${construction.disclose.integrateModule}
 								</td>
@@ -402,7 +304,7 @@
 								<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-15 active"><label class="pull-right">设备是否有整体改造的必要：</label></td>
 								<td class="width-35">
 										${construction.disclose.overallTransformation}
 								</td>

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

@@ -104,7 +104,7 @@
 								<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-15 active"><label class="pull-right">停电范围（中间统一用中文分号）：</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.blackoutArea)}
 								</td>
@@ -114,7 +114,7 @@
 								<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-15 active"><label class="pull-right">政处初步判断：</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.preliminaryJudgment)}
 								</td>
@@ -124,7 +124,7 @@
 								<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-15 active"><label class="pull-right">钢管杆基础类型：</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.baseType)}
 								</td>
@@ -134,7 +134,7 @@
 								<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-15 active"><label class="pull-right">设备改造类型：</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.transformationType)}
 								</td>
@@ -144,7 +144,7 @@
 								<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-15 active"><label class="pull-right">是否含新设备命名：</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.newNamed)}
 								</td>
@@ -154,7 +154,7 @@
 								<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-15 active"><label class="pull-right">是否含非涉电电气施工：</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.electricalConstruction)}
 								</td>
@@ -164,7 +164,7 @@
 								<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-15 active"><label class="pull-right">是否含自动化：</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.automation)}
 								</td>
@@ -174,7 +174,7 @@
 								<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-15 active"><label class="pull-right">通信方式：</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.communicationMode)}
 								</td>
@@ -184,7 +184,7 @@
 								<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-15 active"><label class="pull-right">环网柜DTU户外或户内：</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.networkCabinet)}
 								</td>
@@ -194,7 +194,7 @@
 								<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-15 active"><label class="pull-right">是否为停电打包项目：</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.powerFailure)}
 								</td>
@@ -204,13 +204,9 @@
 								<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-15 active"><label class="pull-right">设备基础是否可以扩容：</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>
@@ -218,7 +214,7 @@
 								<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-15 active"><label class="pull-right">最多可扩容尺寸：</label></td>
 								<td class="width-35">
 										${construction.disclose.capacitySize}
 								</td>
@@ -228,7 +224,7 @@
 								<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-15 active"><label class="pull-right">是否存在低压或通信线等影响施工：</label></td>
 								<td class="width-35">
 										${construction.disclose.influenceConstruction}
 								</td>
@@ -238,7 +234,7 @@
 								<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-15 active"><label class="pull-right">是否已实施：</label></td>
 								<td class="width-35">
 										${construction.disclose.implemented}
 								</td>
@@ -248,141 +244,47 @@
 								<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-15 active"><label class="pull-right">必要性问题说明：</label></td>
 								<td class="width-35">
-										${construction.disclose.lineName}
+										${construction.disclose.explanationOfNecessity}
 								</td>
 							</tr>
 							<tr>
+								<td class="width-15 active"><label class="pull-right">线路名称一致性：</label></td>
+								<td class="width-35">
+										${construction.disclose.lineName}
+								</td>
 								<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>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">设备、开关、杆号一致性：</label></td>
 								<td class="width-35">
 										${construction.disclose.rodNumber}
 								</td>
+								<td class="width-15 active"><label class="pull-right">图纸现场不一致说明：</label></td>
+								<td class="width-35">
+										${construction.disclose.inconsistentDescription}
+								</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-15 active"><label class="pull-right">政策处理说明：</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}
+										${construction.disclose.policyHandlingInstructions}
 								</td>
-								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>DTU安放方式核查：</label></td>
+								<td class="width-15 active"><label class="pull-right">DTU安放方式核查：</label></td>
 								<td class="width-35">
 										${construction.disclose.placementMode}
 								</td>
@@ -392,7 +294,7 @@
 								<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-15 active"><label class="pull-right">二次是否是集成模块：</label></td>
 								<td class="width-35">
 										${construction.disclose.integrateModule}
 								</td>
@@ -402,7 +304,7 @@
 								<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-15 active"><label class="pull-right">设备是否有整体改造的必要：</label></td>
 								<td class="width-35">
 										${construction.disclose.overallTransformation}
 								</td>

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

@@ -104,7 +104,7 @@
 								<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-15 active"><label class="pull-right">停电范围（中间统一用中文分号）：</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.blackoutArea)}
 								</td>
@@ -114,7 +114,7 @@
 								<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-15 active"><label class="pull-right">政处初步判断：</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.preliminaryJudgment)}
 								</td>
@@ -124,7 +124,7 @@
 								<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-15 active"><label class="pull-right">钢管杆基础类型：</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.baseType)}
 								</td>
@@ -134,7 +134,7 @@
 								<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-15 active"><label class="pull-right">设备改造类型：</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.transformationType)}
 								</td>
@@ -144,7 +144,7 @@
 								<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-15 active"><label class="pull-right">是否含新设备命名：</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.newNamed)}
 								</td>
@@ -154,7 +154,7 @@
 								<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-15 active"><label class="pull-right">是否含非涉电电气施工：</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.electricalConstruction)}
 								</td>
@@ -163,8 +163,8 @@
 								<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>
+								<td class="width-15 active"><label class="pull-right">是否含自动化：</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.automation)}
 								</td>
@@ -174,7 +174,7 @@
 								<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-15 active"><label class="pull-right">通信方式：</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.communicationMode)}
 								</td>
@@ -184,7 +184,7 @@
 								<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-15 active"><label class="pull-right">环网柜DTU户外或户内：</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.networkCabinet)}
 								</td>
@@ -194,7 +194,7 @@
 								<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-15 active"><label class="pull-right">是否为停电打包项目：</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.powerFailure)}
 								</td>
@@ -204,13 +204,9 @@
 								<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-15 active"><label class="pull-right">设备基础是否可以扩容：</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>
@@ -218,7 +214,7 @@
 								<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-15 active"><label class="pull-right">最多可扩容尺寸：</label></td>
 								<td class="width-35">
 										${construction.disclose.capacitySize}
 								</td>
@@ -228,7 +224,7 @@
 								<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-15 active"><label class="pull-right">是否存在低压或通信线等影响施工：</label></td>
 								<td class="width-35">
 										${construction.disclose.influenceConstruction}
 								</td>
@@ -238,7 +234,7 @@
 								<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-15 active"><label class="pull-right">是否已实施：</label></td>
 								<td class="width-35">
 										${construction.disclose.implemented}
 								</td>
@@ -248,141 +244,47 @@
 								<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-15 active"><label class="pull-right">必要性问题说明：</label></td>
 								<td class="width-35">
-										${construction.disclose.lineName}
+										${construction.disclose.explanationOfNecessity}
 								</td>
 							</tr>
 							<tr>
+								<td class="width-15 active"><label class="pull-right">线路名称一致性：</label></td>
+								<td class="width-35">
+										${construction.disclose.lineName}
+								</td>
 								<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>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">设备、开关、杆号一致性：</label></td>
 								<td class="width-35">
 										${construction.disclose.rodNumber}
 								</td>
+								<td class="width-15 active"><label class="pull-right">图纸现场不一致说明：</label></td>
+								<td class="width-35">
+										${construction.disclose.inconsistentDescription}
+								</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-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}
+										${construction.disclose.policyHandlingInstructions}
 								</td>
-								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>DTU安放方式核查：</label></td>
+								<td class="width-15 active"><label class="pull-right">DTU安放方式核查：</label></td>
 								<td class="width-35">
 										${construction.disclose.placementMode}
 								</td>
@@ -392,7 +294,7 @@
 								<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-15 active"><label class="pull-right">二次是否是集成模块：</label></td>
 								<td class="width-35">
 										${construction.disclose.integrateModule}
 								</td>
@@ -402,7 +304,7 @@
 								<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-15 active"><label class="pull-right">设备是否有整体改造的必要：</label></td>
 								<td class="width-35">
 										${construction.disclose.overallTransformation}
 								</td>

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

@@ -65,22 +65,8 @@
 				<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">
@@ -96,19 +82,13 @@
 								<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">--%>
-									<%--&lt;%&ndash;<input id="loginName" value="${construction.tuser.loginName}">&ndash;%&gt;--%>
-									<%--<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>
 								<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-15 active"><label class="pull-right">停电范围（中间统一用中文分号）：</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.blackoutArea)}
 								</td>
@@ -118,7 +98,7 @@
 								<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-15 active"><label class="pull-right">政处初步判断：</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.preliminaryJudgment)}
 								</td>
@@ -128,7 +108,7 @@
 								<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-15 active"><label class="pull-right">钢管杆基础类型：</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.baseType)}
 								</td>
@@ -138,7 +118,7 @@
 								<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-15 active"><label class="pull-right">设备改造类型：</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.transformationType)}
 								</td>
@@ -148,7 +128,7 @@
 								<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-15 active"><label class="pull-right">是否含新设备命名：</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.newNamed)}
 								</td>
@@ -158,7 +138,7 @@
 								<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-15 active"><label class="pull-right">是否含非涉电电气施工：</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.electricalConstruction)}
 								</td>
@@ -167,8 +147,8 @@
 								<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>
+								<td class="width-15 active"><label class="pull-right">是否含自动化：</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.automation)}
 								</td>
@@ -178,7 +158,7 @@
 								<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-15 active"><label class="pull-right">通信方式：</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.communicationMode)}
 								</td>
@@ -188,7 +168,7 @@
 								<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-15 active"><label class="pull-right">环网柜DTU户外或户内：</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.networkCabinet)}
 								</td>
@@ -198,7 +178,7 @@
 								<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-15 active"><label class="pull-right">是否为停电打包项目：</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.powerFailure)}
 								</td>
@@ -208,13 +188,9 @@
 								<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-15 active"><label class="pull-right">设备基础是否可以扩容：</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>
@@ -222,7 +198,7 @@
 								<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-15 active"><label class="pull-right">最多可扩容尺寸：</label></td>
 								<td class="width-35">
 										${construction.disclose.capacitySize}
 								</td>
@@ -232,7 +208,7 @@
 								<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-15 active"><label class="pull-right">是否存在低压或通信线等影响施工：</label></td>
 								<td class="width-35">
 										${construction.disclose.influenceConstruction}
 								</td>
@@ -242,7 +218,7 @@
 								<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-15 active"><label class="pull-right">是否已实施：</label></td>
 								<td class="width-35">
 										${construction.disclose.implemented}
 								</td>
@@ -252,37 +228,47 @@
 								<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-15 active"><label class="pull-right">必要性问题说明：</label></td>
 								<td class="width-35">
-										${construction.disclose.lineName}
+										${construction.disclose.explanationOfNecessity}
 								</td>
 							</tr>
 							<tr>
+								<td class="width-15 active"><label class="pull-right">线路名称一致性：</label></td>
+								<td class="width-35">
+										${construction.disclose.lineName}
+								</td>
 								<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>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">设备、开关、杆号一致性：</label></td>
 								<td class="width-35">
 										${construction.disclose.rodNumber}
 								</td>
+								<td class="width-15 active"><label class="pull-right">图纸现场不一致说明：</label></td>
+								<td class="width-35">
+										${construction.disclose.inconsistentDescription}
+								</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>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">政策处理说明：</label></td>
+								<td class="width-35">
+										${construction.disclose.policyHandlingInstructions}
+								</td>
+								<td class="width-15 active"><label class="pull-right">DTU安放方式核查：</label></td>
 								<td class="width-35">
 										${construction.disclose.placementMode}
 								</td>
@@ -292,7 +278,7 @@
 								<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-15 active"><label class="pull-right">二次是否是集成模块：</label></td>
 								<td class="width-35">
 										${construction.disclose.integrateModule}
 								</td>
@@ -302,7 +288,7 @@
 								<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-15 active"><label class="pull-right">设备是否有整体改造的必要：</label></td>
 								<td class="width-35">
 										${construction.disclose.overallTransformation}
 								</td>