修改

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

@@ -71,19 +71,18 @@ public class MyImportUtils {
             //设备是否有整体改造的必要
             String overallTransformation = disclose.getOverallTransformation();
             if (precondition!=null&&!"".equals(precondition)) {
-
             }else {
                 if ("".equals(projectName) || projectName == null) {
                     flag = true;
                     tips +="项目名称不能为空";
                 }
-                if ("".equals(capacity) || capacity == null||(!"是".equals(capacity)&&!"否".equals(capacity))) {
+                if ("".equals(capacity) || capacity == null||(!"有".equals(capacity)&&!"无".equals(capacity))) {
                     flag = true;
-                    tips += "设备基础是否可以扩容填写有误";
+                    tips += "有无设备基础改造填写有误";
                 }
-                if("是".equals(capacity)){
+                if("有".equals(capacity)){
                     if("".equals(sceneSize) || sceneSize == null||"".equals(capacitySize) || capacitySize == null){
-                        tips += "设备基础是否可以扩容填写有误";
+                        tips += "原设备尺寸|现场是否具备扩宽的条件 填写有误";
                     }
                 }
                 if ("".equals(hiddenDanger) || hiddenDanger == null||(!"有".equals(hiddenDanger)&&!"无".equals(hiddenDanger))) {
@@ -114,16 +113,12 @@ public class MyImportUtils {
                 }
                 if ("".equals(lineName) || lineName == null||(!"一致".equals(lineName)&&!"不一致".equals(lineName))) {
                     flag = true;
-                    tips += "线路名称一致性填写有误";
+                    tips += "线路名称、设备、开关、杆号一致性填写有误";
                 }
                 if ("".equals(quantities) || quantities == null||(!"是".equals(quantities)&&!"否".equals(quantities))) {
                     flag = true;
                     tips += "工程量是否一致填写有误";
                 }
-                if ("".equals(rodNumber) || rodNumber == null||(!"一致".equals(rodNumber)&&!"不一致".equals(rodNumber))) {
-                    flag = true;
-                    tips += "设备、开关、杆号一致性填写有误";
-                }
                 if ("不一致".equals(lineName)||"否".equals(quantities)||"不一致".equals(rodNumber)) {
                     if ("".equals(inconsistentDescription) || inconsistentDescription == null) {
                         flag = true;
@@ -353,14 +348,11 @@ public class MyImportUtils {
             }
         }
         if ("".equals(disclose.getLineName()) || disclose.getLineName() == null||(!"一致".equals(disclose.getLineName())&&!"不一致".equals(disclose.getLineName()))) {
-            tips += "线路名称一致性填写有误;";
+            tips += "线路名称、设备、开关、杆号一致性填写有误;";
         }
         if ("".equals(disclose.getQuantities()) || disclose.getQuantities() == null||(!"是".equals(disclose.getQuantities())&&!"否".equals(disclose.getQuantities()))) {
             tips += "工程量是否一致填写有误;";
         }
-        if ("".equals(disclose.getRodNumber()) || disclose.getRodNumber() == null||(!"一致".equals(disclose.getRodNumber())&&!"不一致".equals(disclose.getRodNumber()))) {
-            tips += "设备、开关、杆号一致性填写有误;";
-        }
         if ("不一致".equals(disclose.getLineName())||"否".equals(disclose.getQuantities())||"不一致".equals(disclose.getRodNumber())) {
             if ("".equals(disclose.getInconsistentDescription()) || disclose.getInconsistentDescription() == null) {
                 tips += "图纸现场不一致说明不能为空;";

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

@@ -427,8 +427,6 @@ public class ConstructionController extends BaseController {
         String lineName = disclose.getLineName();
         //工程量是否一致
         String quantities = disclose.getQuantities();
-        //设备、开关、杆号一致性
-        String rodNumber = disclose.getRodNumber();
         //图纸现场不一致描述
         String inconsistentDescription = disclose.getInconsistentDescription();
         //政处类型
@@ -455,7 +453,7 @@ public class ConstructionController extends BaseController {
                 j.setSuccess(false);
                 flag = false;
             }
-        }else if ("不一致".equals(lineName)||"否".equals(quantities)||"不一致".equals(rodNumber)) {
+        }else if ("不一致".equals(lineName)||"否".equals(quantities)) {
             if ("".equals(inconsistentDescription) || inconsistentDescription == null) {
                 j.setMsg("图纸现场不一致描述不能为空");
                 j.setSuccess(false);

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

@@ -24,6 +24,7 @@ import com.jeeplus.modules.sg.managementcenter.activiti.service.UploadImagesServ
 import com.jeeplus.modules.sg.managementcenter.activiti.utils.MyActiviUtils;
 import com.jeeplus.modules.sg.managementcenter.activiti.utils.MyImportUtils;
 import com.jeeplus.modules.sg.managementcenter.project.entity.Project;
+import com.jeeplus.modules.sys.utils.UserUtils;
 import org.activiti.engine.*;
 import org.activiti.engine.repository.ProcessDefinition;
 import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
@@ -173,7 +174,7 @@ public class DivideController extends BaseController {
             int lastDataRowNum = ei.getLastDataRowNum();
             Disclose disclose = new Disclose();
             disclose.setProcInsId(procInsId);
-            for (int i = 1; i < lastDataRowNum; i++) {
+            for (int i = 2; i < lastDataRowNum; i++) {
                 Row row = ei.getRow(i);
                 String requireName = ei.getCellValue(row, 1).toString();
                 if (projectName.equals(requireName)) {
@@ -194,17 +195,16 @@ public class DivideController extends BaseController {
                     disclose.setExplanationOfNecessity(ei.getCellValue(row, 14).toString());
                     disclose.setLineName(ei.getCellValue(row, 15).toString());
                     disclose.setQuantities(ei.getCellValue(row, 16).toString());
-                    disclose.setRodNumber(ei.getCellValue(row, 17).toString());
-                    disclose.setInconsistentDescription(ei.getCellValue(row, 18).toString());
-                    disclose.setAdministrationType(ei.getCellValue(row, 19).toString());
-                    disclose.setPolicyHandlingInstructions(ei.getCellValue(row, 20).toString());
-                    disclose.setPrecondition(ei.getCellValue(row, 21).toString());
-                    disclose.setPlacementMode(ei.getCellValue(row, 22).toString());
-                    disclose.setProductionDate(ei.getCellValue(row, 23).toString());
-                    disclose.setIntegrateModule(ei.getCellValue(row, 24).toString());
-                    disclose.setNeedReplace(ei.getCellValue(row, 25).toString());
-                    disclose.setOverallTransformation(ei.getCellValue(row, 26).toString());
-                    disclose.setOtherProblem(ei.getCellValue(row, 27).toString());
+                    disclose.setInconsistentDescription(ei.getCellValue(row, 17).toString());
+                    disclose.setAdministrationType(ei.getCellValue(row, 18).toString());
+                    disclose.setPolicyHandlingInstructions(ei.getCellValue(row, 19).toString());
+                    disclose.setPrecondition(ei.getCellValue(row, 20).toString());
+                    disclose.setPlacementMode(ei.getCellValue(row, 21).toString());
+                    disclose.setProductionDate(ei.getCellValue(row, 22).toString());
+                    disclose.setIntegrateModule(ei.getCellValue(row, 23).toString());
+                    disclose.setNeedReplace(ei.getCellValue(row, 24).toString());
+                    disclose.setOverallTransformation(ei.getCellValue(row, 25).toString());
+                    disclose.setOtherProblem(ei.getCellValue(row, 26).toString());
                 }
             }
             try {
@@ -263,7 +263,7 @@ public class DivideController extends BaseController {
             int lastDataRowNum = ei.getLastDataRowNum();
             Disclose disclose;
             //将所有项目信息存入list
-            for (int i = 1; i < lastDataRowNum; i++) {
+            for (int i = 2; i < lastDataRowNum; i++) {
                 disclose = new Disclose();
                 Row row = ei.getRow(i);
                 disclose.setRequireName(ei.getCellValue(row, 1).toString());//需求项目名称
@@ -281,19 +281,18 @@ public class DivideController extends BaseController {
                 disclose.setImplemented(ei.getCellValue(row, 12).toString());//是否已实施
                 disclose.setTransformer(ei.getCellValue(row, 13).toString());//变压器无负荷
                 disclose.setExplanationOfNecessity(ei.getCellValue(row, 14).toString());//必要性问题说明
-                disclose.setLineName(ei.getCellValue(row, 15).toString());//线路名称一致性
+                disclose.setLineName(ei.getCellValue(row, 15).toString());//线路名称、设备、开关、杆号一致性
                 disclose.setQuantities(ei.getCellValue(row, 16).toString());//工程量是否一致
-                disclose.setRodNumber(ei.getCellValue(row, 17).toString());//设备、开关、杆号一致性
-                disclose.setInconsistentDescription(ei.getCellValue(row, 18).toString()); //图纸现场不一致说明
-                disclose.setAdministrationType(ei.getCellValue(row, 19).toString());//政处类型
-                disclose.setPolicyHandlingInstructions(ei.getCellValue(row, 20).toString());//政策处理说明
-                disclose.setPrecondition(ei.getCellValue(row, 21).toString());//前置条件
-                disclose.setPlacementMode(ei.getCellValue(row, 22).toString()); //DTU安放方式核查
-                disclose.setProductionDate(ei.getCellValue(row, 23).toString());//核查环网柜生产日期
-                disclose.setIntegrateModule(ei.getCellValue(row, 24).toString()); //二次是否是集成模块
-                disclose.setNeedReplace(ei.getCellValue(row, 25).toString());//PT是否需要更换
-                disclose.setOverallTransformation(ei.getCellValue(row, 26).toString());//设备是否有整体改造的必要
-                disclose.setOtherProblem(ei.getCellValue(row, 27).toString());//其它问题描述
+                disclose.setInconsistentDescription(ei.getCellValue(row, 17).toString()); //图纸现场不一致说明
+                disclose.setAdministrationType(ei.getCellValue(row, 18).toString());//政处类型
+                disclose.setPolicyHandlingInstructions(ei.getCellValue(row, 19).toString());//政策处理说明
+                disclose.setPrecondition(ei.getCellValue(row, 20).toString());//前置条件
+                disclose.setPlacementMode(ei.getCellValue(row, 21).toString()); //DTU安放方式核查
+                disclose.setProductionDate(ei.getCellValue(row, 22).toString());//核查环网柜生产日期
+                disclose.setIntegrateModule(ei.getCellValue(row, 23).toString()); //二次是否是集成模块
+                disclose.setNeedReplace(ei.getCellValue(row, 24).toString());//PT是否需要更换
+                disclose.setOverallTransformation(ei.getCellValue(row, 25).toString());//设备是否有整体改造的必要
+                disclose.setOtherProblem(ei.getCellValue(row, 26).toString());//其它问题描述
                 discloseList.add(disclose);
             }
             //记录所有符合情况的数据
@@ -339,7 +338,7 @@ public class DivideController extends BaseController {
                     ) {
                         vars.put("problem", false);
                         vars.put("pass4", true);
-                        vars.put("processer", user.getProjectManageRole());
+                        vars.put("processer", UserUtils.getByUserName(user.getProjectManageRole()).getLoginName());
                     } else {
                         //没有前置条件，判断是否为无问题
                         if (
@@ -350,16 +349,14 @@ public class DivideController extends BaseController {
                                         "有".equals(d.getTransformer()) &&
                                         "一致".equals(d.getLineName()) &&
                                         "是".equals(d.getQuantities()) &&
-                                        "一致".equals(d.getRodNumber()) &&
                                         "4.无".equals(d.getAdministrationType())
                         ) {
                             vars.put("finish", true);
                         } else {
                             vars.put("pass4", false);
                             vars.put("problem", true);
-                            vars.put("processer", user.getProjectManageRole());
+                            vars.put("processer", UserUtils.getByUserName(user.getProjectManageRole()).getLoginName());
                         }
-
                     }
                     actTaskService.complete(d.getTaskId(), d.getProcInsId(), "系统判断成功，请自行查看", vars);
                 }

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

@@ -17,7 +17,6 @@
 				var flag81 = false;//记录选择无问题的同时，有没有选择其它问题类型
 				var nValue = $('input[name="favorite"]:checked');
 				$('input[name="favorite"]:checked').each(function(){//遍历每一个名字为interest的复选框，其中选中的执行函数
-					console.log($(this).val());
 					//判断选取的值如果时pass2，flag2为true，代表选择了项目关闭，选取的值不为pass2，flag1为true代表其它类型被选择
 					if ("pass8" == $(this).val()){
 						flag8 = true;
@@ -206,7 +205,7 @@
 								</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">
 									<c:choose>
 										<c:when test="${not empty construction.disclose.lineName}">
@@ -232,17 +231,6 @@
 
 							</tr>
 							<tr>
-								<td class="width-15 active"><label class="pull-right"> 设备、开关、杆号一致性：</label></td>
-								<td class="width-35">
-									<c:choose>
-										<c:when test="${not empty construction.disclose.rodNumber}">
-											<input type='text' readonly="readonly" id='rodNumber'  name="rodNumber" class="form-control required"  value="${construction.disclose.rodNumber}"/>
-										</c:when>
-										<c:otherwise>
-											<input type='text' readonly="readonly" id='rodNumber'  name="rodNumber" class="form-control required"  value="一致"/>
-										</c:otherwise>
-									</c:choose>
-								</td>
 								<td class="width-15 active"><label class="pull-right"> 图纸现场不一致描述：</label></td>
 								<td class="width-35">
 									<input type='text' readonly="readonly" id='inconsistentDescription'  name="overallTransformation" class="form-control required"  value="${construction.disclose.inconsistentDescription}"/>

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

@@ -6,19 +6,65 @@
     <meta name="decorator" content="ani"/>
     <!-- SUMMERNOTE -->
     <%@include file="/webpage/include/summernote.jsp" %>
-    <%@include file="divideForm.js" %>
+    <style type="text/css">
+        input::-webkit-input-placeholder {
+            color: red !important;
+        }
+
+        input::-moz-placeholder { /* Mozilla Firefox 19+ */
+            color: red !important;
+        }
+
+        input:-moz-placeholder { /* Mozilla Firefox 4 to 18 */
+            color: red !important;
+        }
+
+        input:-ms-input-placeholder { /* Internet Explorer 10-11 */
+            color: red !important;
+        }
+    </style>
     <script type="text/javascript">
-        $(document).ready(function() {
+        $(document).ready(function () {
             $('#beginDate').datetimepicker({
                 format: "YYYY-MM-DD HH:mm:ss"
             });
             $('#endDate').datetimepicker({
                 format: "YYYY-MM-DD HH:mm:ss"
             });
+            $('select').change(function () {
+                var hiddenDanger = $('#hiddenDanger').val();
+                var influenceConstruction = $('#influenceConstruction').val();
+                var projectRepetition = $('#projectRepetition').val();
+                var implemented = $('#implemented').val();
+                var transformer = $('#transformer').val();
+                if (hiddenDanger == '有' || influenceConstruction == '是' || projectRepetition == '是' || implemented == '是' || transformer == '无') {
+                    $('#explanationOfNecessity').attr('placeholder', '项目实施必要性描述不能为空');
+                } else if (hiddenDanger == '无' && influenceConstruction == '否' && projectRepetition == '否' && implemented == '否' && transformer == '有') {
+                    $('#explanationOfNecessity').removeAttr('placeholder');
+                }
+
+                var lineName = $('#lineName').val();
+                var quantities = $('#quantities').val();
+                if (lineName == '不一致' || quantities == '否') {
+                    $('#inconsistentDescription').attr('placeholder', '项目实施必要性描述不能为空');
+                } else if (lineName == '一致' && quantities == '是') {
+                    $('#inconsistentDescription').removeAttr('placeholder');
+                }
+
+                var administrationType = $('#administrationType').val();
+                if (administrationType != '1.无') {
+                    $('#policyHandlingInstructions').attr('placeholder', '项目实施必要性描述不能为空');
+                } else {
+                    $('#policyHandlingInstructions').removeAttr('placeholder');
+                }
+
+            });
+
         });
+
         function save() {
             jp.loading();
-            jp.post("${ctx}/managementcenter/activiti/editConSave",$("#inputForm").serialize(),function (data) {
+            jp.post("${ctx}/managementcenter/activiti/editConSave", $("#inputForm").serialize(), function (data) {
                 if (data.success) {
                     jp.getParent().refresh();
                     var dialogIndex = parent.layer.getFrameIndex(window.name); //获取窗口索引
@@ -59,154 +105,152 @@
                             <tr>
                                 <td class="width-15 active"><label class="pull-right">现场设备尺寸：</label></td>
                                 <td class="width-35">
-									<form:input path="disclose.sceneSize" cssClass="form-control"/>
+                                    <form:input path="disclose.sceneSize" cssClass="form-control"/>
                                 </td>
                                 <td class="width-15 active"><label class="pull-right"> 最多可扩容尺寸：</label></td>
                                 <td class="width-35">
-									<form:input path="disclose.capacitySize" cssClass="form-control"/>
+                                    <form:input path="disclose.capacitySize" cssClass="form-control"/>
                                 </td>
                             </tr>
                             <tr>
                                 <td class="width-15 active"><label class="pull-right">方案安全隐患：</label></td>
                                 <td class="width-35">
-									<form:select path="disclose.hiddenDanger" cssClass="form-control">
-										<form:option value="无"/>
-										<form:option value="有"/>
-									</form:select>
+                                    <form:select id="hiddenDanger" path="disclose.hiddenDanger" cssClass="form-control">
+                                        <form:option value="无"/>
+                                        <form:option value="有"/>
+                                    </form:select>
                                 </td>
                                 <td class="width-15 active"><label class="pull-right"> 是否存在低压或通信线等影响施工：</label></td>
                                 <td class="width-35">
-									<form:select path="disclose.influenceConstruction" cssClass="form-control">
-										<form:option value="否"/>
-										<form:option value="是"/>
-									</form:select>
+                                    <form:select id="influenceConstruction" path="disclose.influenceConstruction"
+                                                 cssClass="form-control">
+                                        <form:option value="否"/>
+                                        <form:option value="是"/>
+                                    </form:select>
                                 </td>
                             </tr>
                             <tr>
                                 <td class="width-15 active"><label class="pull-right">立项重复：</label></td>
                                 <td class="width-35">
-									<form:select path="disclose.projectRepetition" cssClass="form-control">
-										<form:option value="否"/>
-										<form:option value="是"/>
-									</form:select>
+                                    <form:select id="projectRepetition" path="disclose.projectRepetition"
+                                                 cssClass="form-control">
+                                        <form:option value="否"/>
+                                        <form:option value="是"/>
+                                    </form:select>
                                 </td>
                                 <td class="width-15 active"><label class="pull-right"> 是否已实施：</label></td>
                                 <td class="width-35">
-									<form:select path="disclose.implemented" cssClass="form-control">
-										<form:option value="否"/>
-										<form:option value="是"/>
-									</form:select>
+                                    <form:select id="implemented" path="disclose.implemented" cssClass="form-control">
+                                        <form:option value="否"/>
+                                        <form:option value="是"/>
+                                    </form:select>
                                 </td>
                             </tr>
                             <tr>
                                 <td class="width-15 active"><label class="pull-right">变压器无负荷：</label></td>
                                 <td class="width-35">
-									<form:select path="disclose.transformer" cssClass="form-control">
-										<form:option value="有"/>
-										<form:option value="无"/>
-									</form:select>
+                                    <form:select id="transformer" path="disclose.transformer" cssClass="form-control">
+                                        <form:option value="有"/>
+                                        <form:option value="无"/>
+                                    </form:select>
                                 </td>
                                 <td class="width-15 active"><label class="pull-right">项目实施必要性描述</label></td>
                                 <td class="width-35">
-									<form:input path="disclose.explanationOfNecessity" cssClass="form-control"/>
+                                    <form:input id="explanationOfNecessity" path="disclose.explanationOfNecessity"
+                                                cssClass="form-control"/>
                                 </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">
-									<form:select path="disclose.lineName" cssClass="form-control">
-										<form:option value="一致"/>
-										<form:option value="不一致"/>
-									</form:select>
+                                    <form:select id="lineName" path="disclose.lineName" cssClass="form-control">
+                                        <form:option value="一致"/>
+                                        <form:option value="不一致"/>
+                                    </form:select>
                                 </td>
                                 <td class="width-15 active"><label class="pull-right">工程量是否一致：</label></td>
                                 <td class="width-35">
-									<form:select path="disclose.quantities" cssClass="form-control">
-										<form:option value="是"/>
-										<form:option value="否"/>
-									</form:select>
+                                    <form:select id="quantities" path="disclose.quantities" cssClass="form-control">
+                                        <form:option value="是"/>
+                                        <form:option value="否"/>
+                                    </form:select>
                                 </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">
-									<form:select path="disclose.rodNumber" cssClass="form-control">
-										<form:option value="一致"/>
-										<form:option value="不一致"/>
-									</form:select>
+                                    <form:input id="inconsistentDescription" path="disclose.inconsistentDescription"
+                                                cssClass="form-control"/>
                                 </td>
-                                <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">
-									<form:input path="disclose.inconsistentDescription" cssClass="form-control"/>
+                                    <form:select id="administrationType" path="disclose.administrationType"
+                                                 cssClass="form-control">
+                                        <form:option value="1.无"/>
+                                        <form:option value="2.农村政处"/>
+                                        <form:option value="3.民事政处/行政政处（公路/水利）"/>
+                                        <form:option value="4.行政政处（城区道路）"/>
+                                        <form:option value="5.农村政处;民事政处/行政政处（公路/水利）"/>
+                                        <form:option value="6.农村政处;行政政处（城区道路）"/>
+                                        <form:option value="7.民事政处/行政政处（公路/水利）;行政政处（城区道路）"/>
+                                        <form:option value="8.农村政处;民事政处/行政政处（公路/水利）;行政政处（城区道路）"/>
+                                    </form:select>
                                 </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">
-									<form:select path="disclose.administrationType" cssClass="form-control">
-										<form:option value="1.无"/>
-										<form:option value="2.农村政处"/>
-										<form:option value="3.民事政处/行政政处（公路/水利）"/>
-										<form:option value="4.行政政处（城区道路）"/>
-										<form:option value="5.农村政处;民事政处/行政政处（公路/水利）"/>
-										<form:option value="6.农村政处;行政政处（城区道路）"/>
-										<form:option value="7.民事政处/行政政处（公路/水利）;行政政处（城区道路）"/>
-										<form:option value="8.农村政处;民事政处/行政政处（公路/水利）;行政政处（城区道路）"/>
-									</form:select>
+                                    <form:input id="policyHandlingInstructions"
+                                                path="disclose.policyHandlingInstructions" cssClass="form-control"/>
                                 </td>
                                 <td class="width-15 active"><label class="pull-right">前置条件：</label></td>
                                 <td class="width-35">
-									<form:input path="disclose.precondition" cssClass="form-control"/>
+                                    <form:input id="precondition" path="disclose.precondition" cssClass="form-control"/>
                                 </td>
                             </tr>
                             <tr>
-                                <td class="width-15 active"><label class="pull-right">政策处理描述：</label></td>
-                                <td class="width-35">
-									<form:input path="disclose.policyHandlingInstructions" cssClass="form-control"/>
-                                </td>
                                 <td class="width-15 active"><label class="pull-right"> DTU安放方式核查：</label></td>
                                 <td class="width-35">
-									<form:select path="disclose.placementMode" cssClass="form-control">
-										<form:option value="无"/>
-										<form:option value="户内"/>
-										<form:option value="户外"/>
-									</form:select>
+                                    <form:select path="disclose.placementMode" cssClass="form-control">
+                                        <form:option value="无"/>
+                                        <form:option value="户内"/>
+                                        <form:option value="户外"/>
+                                    </form:select>
                                 </td>
-                            </tr>
-                            <tr>
                                 <td class="width-15 active"><label class="pull-right">核查环网柜生产日期：</label></td>
                                 <td class="width-35">
-									<form:input path="disclose.productionDate" cssClass="form-control"/>
+                                    <form:input path="disclose.productionDate" cssClass="form-control"/>
                                 </td>
+                            </tr>
+                            <tr>
+
                                 <td class="width-15 active"><label class="pull-right"> 二次是否是集成模块：</label></td>
                                 <td class="width-35">
-									<form:select path="disclose.integrateModule" cssClass="form-control">
-										<form:option value="否"/>
-										<form:option value="是"/>
-									</form:select>
+                                    <form:select path="disclose.integrateModule" cssClass="form-control">
+                                        <form:option value="否"/>
+                                        <form:option value="是"/>
+                                    </form:select>
                                 </td>
-
-                            </tr>
-                            <tr>
                                 <td class="width-15 active"><label class="pull-right">PT是否需要更换：</label></td>
                                 <td class="width-35">
-									<form:select path="disclose.needReplace" cssClass="form-control">
-										<form:option value="否"/>
-										<form:option value="是"/>
-									</form:select>
+                                    <form:select path="disclose.needReplace" cssClass="form-control">
+                                        <form:option value="否"/>
+                                        <form:option value="是"/>
+                                    </form:select>
                                 </td>
+                            </tr>
+                            <tr>
+
                                 <td class="width-15 active"><label class="pull-right"> 设备是否有整体改造的必要：</label></td>
                                 <td class="width-35">
-									<form:select path="disclose.overallTransformation" cssClass="form-control">
-										<form:option value="否"/>
-										<form:option value="是"/>
-									</form:select>
+                                    <form:select path="disclose.overallTransformation" cssClass="form-control">
+                                        <form:option value="否"/>
+                                        <form:option value="是"/>
+                                    </form:select>
                                 </td>
-                            </tr>
-                            <tr>
                                 <td class="width-15 active"><label class="pull-right">其它问题类型：</label></td>
                                 <td class="width-35">
-                                    <form:input path="disclose.otherProblem" cssClass="form-control"/>
+                                    <form:input id="otherProblem" path="disclose.otherProblem" cssClass="form-control"/>
                                 </td>
                             </tr>
                             </tbody>
@@ -218,4 +262,4 @@
     </div>
 </div>
 </body>
-</html>
+</html>

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

@@ -263,7 +263,7 @@
 								</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.lineName}
 								</td>
@@ -273,50 +273,46 @@
 								</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>
+							</tr>
+							<tr>
 								<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-35">
 										${construction.disclose.policyHandlingInstructions}
 								</td>
+							</tr>
+							<tr>
 								<td class="width-15 active"><label class="pull-right">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>
+							</tr>
+							<tr>
 								<td class="width-15 active"><label class="pull-right">二次是否是集成模块：</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>
+							</tr>
+							<tr>
 								<td class="width-15 active"><label class="pull-right">设备是否有整体改造的必要：</label></td>
 								<td class="width-35">
 										${construction.disclose.overallTransformation}