Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/sg/managementcenter/project/util/ProExcelInfo.java

@@ -128,54 +128,41 @@ public  class ProExcelInfo {
         Boolean flag = false;
         String str = "";
         for (Project project:projects){
-            if (null==project.getDistributionEngineering()){//配网工程专职角色
-                flag = true;
-            }else {
+            if (null==project.getDistributionEngineering()||"".equals(project.getDistributionEngineering())){//配网工程专职角色
                 str+="配网工程专职角色不能为空;";
             }
-            if (null==project.getDistributionMaterials()){//配网物资专职角色
-                str+="配网工程专职角色不能为空;";
-                flag = true;
+            if (null==project.getDistributionMaterials()||"".equals(project.getDistributionMaterials())){//配网物资专职角色
+                str+="配网物资专职角色不能为空;";
             }
-            if (null==project.getDistributionSystem()){//配网系统专职角色
-                str+="配网工程专职角色不能为空;";
-                flag = true;
+            if (null==project.getDistributionSystem()||"".equals(project.getDistributionSystem())){//配网系统专职角色
+                str+="配网系统专职角色不能为空;";
             }
-            if (null==project.getDistributionPolicy()){//配网政策处理专职角色
-                str+="配网工程专职角色不能为空;";
-                flag = true;
+            if (null==project.getDistributionPolicy()||"".equals(project.getDistributionPolicy())){//配网政策处理专职角色
+                str+="配网政策处理专职角色不能为空;";
             }
-            if (null==project.getManagementLeader()){//项目管理中心领导角色
-                str+="配网工程专职角色不能为空;";
-                flag = true;
+            if (null==project.getManagementLeader()||"".equals(project.getManagementLeader())){//项目管理中心领导角色
+                str+="项目管理中心领导角色不能为空;";
             }
-            if (null==project.getRunUnit()){//运行单位
-                str+="配网工程专职角色不能为空;";
-                flag = true;
+            if (null==project.getRunUnit()||"".equals(project.getRunUnit())){//运行单位
+                str+="运行单位不能为空;";
             }
-            if (null==project.getRunUnitRole()){//运行单位角色
-                str+="配网工程专职角色不能为空;";
-                flag = true;
+            if (null==project.getRunUnitRole()||"".equals(project.getRunUnitRole())){//运行单位角色
+                str+="运行单位角色不能为空;";
             }
-            if (null==project.getThroughResearchRole()){//经研所角色
-                str+="配网工程专职角色不能为空;";
-                flag = true;
+            if (null==project.getThroughResearchRole()||"".equals(project.getThroughResearchRole())){//经研所角色
+                str+="经研所角色不能为空;";
             }
-            if (null==project.getConstructionUnit()){//施工单位
-                str+="配网工程专职角色不能为空;";
-                flag = true;
+            if (null==project.getConstructionUnit()||"".equals(project.getConstructionUnit())){//施工单位
+                str+="施工单位不能为空;";
             }
-            if (null==project.getConstructionUnitRole()){//施工单位:施工单位角色
-                str+="配网工程专职角色不能为空;";
-                flag = true;
+            if (null==project.getConstructionUnitRole()||"".equals(project.getConstructionUnitRole())){//施工单位:施工单位角色
+                str+="施工单位角色不能为空;";
             }
-            if (null==project.getDesignUnit()){//设计单位
-                str+="配网工程专职角色不能为空;";
-                flag = true;
+            if (null==project.getDesignUnit()||"".equals(project.getDesignUnit())){//设计单位
+                str+="设计单位不能为空;";
             }
-            if (null==project.getDesignUnitRole()){//设计单位角色
-                str+="配网工程专职角色不能为空;";
-                flag = true;
+            if (null==project.getDesignUnitRole()||"".equals(project.getDesignUnitRole())){//设计单位角色
+                str+="设计单位角色不能为空;";
             }
             if (null!=project.getType()){//类型
                 flag = getJudge(project.getType(), PRO_TYPE);

src/main/webapp/webpage/modules/sg/managementcenter/project/projectForm.jsp

@@ -217,76 +217,82 @@
 					<td class="width-35">
 						<form:input path="powerFlagPackage" htmlEscape="false"    class="form-control required"/>
 					</td>
-					<td class="width-15 active"><label class=""><font color="red">*</font>是否含土建（不含钢管杆）：</label></td>
+					<td class="width-15 active"><label class=""><font color="red">*</font>政处初步判断：</label></td>
 					<td class="width-35">
-						<form:input path="flagCivilEngineering" htmlEscape="false"    class="form-control required"/>
+						<form:input path="preliminaryJudgment" htmlEscape="false"    class="form-control required"/>
 					</td>
 				</tr>
 				<tr>
+					<td class="width-15 active"><label class=""><font color="red">*</font>是否含土建（不含钢管杆）：</label></td>
+					<td class="width-35">
+						<form:input path="flagCivilEngineering" htmlEscape="false"    class="form-control required"/>
+					</td>
 					<td class="width-15 active"><label class=""><font color="red">*</font>钢管杆基础类型：</label></td>
 					<td class="width-35">
 						<form:input path="steelTubePole" htmlEscape="false"    class="form-control required"/>
 					</td>
+				</tr>
+				<tr>
 					<td class="width-15 active"><label class=""><font color="red">*</font>是否需要规矩报批：</label></td>
 					<td class="width-35">
 						<form:input path="flagApprovalPlanning" htmlEscape="false"    class="form-control required"/>
 					</td>
-				</tr>
-				<tr>
 					<td class="width-15 active"><label class=""><font color="red">*</font>设备改造类型：</label></td>
 					<td class="width-35">
 						<form:input path="equCreateType" htmlEscape="false"    class="form-control required"/>
 					</td>
+				</tr>
+				<tr>
 					<td class="width-15 active"><label class="">改造设备尺寸及间隔数：</label></td>
 					<td class="width-35">
 						<form:input path="equCreateSize" htmlEscape="false" class="form-control"/>
 					</td>
-				</tr>
-				<tr>
 					<td class="width-15 active"><label class=""><font color="red">*</font>是否新设备命名：</label></td>
 					<td class="width-35">
 						<form:input path="flagNewEquName" htmlEscape="false"    class="form-control required"/>
 					</td>
+				</tr>
+				<tr>
 					<td class="width-15 active"><label class=""><font color="red">*</font>是否含变电站新间格投运：</label></td>
 					<td class="width-35">
 						<form:input path="includeBdzNews" htmlEscape="false"    class="form-control required"/>
 					</td>
-				</tr>
-				<tr>
 					<td class="width-15 active"><label class=""><font color="red">*</font>是否非涉电电气施工：</label></td>
 					<td class="width-35">
 						<form:input path="flagNoElectrical" htmlEscape="false"    class="form-control required"/>
 					</td>
+				</tr>
+				<tr>
 					<td class="width-15 active"><label class=""><font color="red">*</font>图纸标注的带点作业情况：</label></td>
 					<td class="width-35">
 						<form:input path="drawingsWork" htmlEscape="false"    class="form-control required"/>
 					</td>
-				</tr>
-				<tr>
 					<td class="width-15 active"><label class=""><font color="red">*</font>是否含自动化：</label></td>
 					<td class="width-35">
 						<form:input path="flagAutomation" htmlEscape="false"    class="form-control required"/>
 					</td>
+				</tr>
+				<tr>
 					<td class="width-15 active"><label class=""><font color="red">*</font>二遥或三摇：</label></td>
 					<td class="width-35">
 						<form:input path="twoAndThreeRemote" htmlEscape="false"    class="form-control required"/>
 					</td>
-				</tr>
-				<tr>
 					<td class="width-15 active"><label class=""><font color="red">*</font>通讯方式：</label></td>
 					<td class="width-35">
 						<form:input path="phoneStyle" htmlEscape="false"    class="form-control required"/>
 					</td>
+				</tr>
+				<tr>
 					<td class="width-15 active"><label class=""><font color="red">*</font>柱开集中或就业地：</label></td>
 					<td class="width-35">
 						<form:input path="stayOpenArea" htmlEscape="false"    class="form-control required"/>
 					</td>
-				</tr>
-				<tr>
 					<td class="width-15 active"><label class=""><font color="red">*</font>环网柜：</label></td>
 					<td class="width-35">
 						<form:input path="ringNetworkCabinet" htmlEscape="false"    class="form-control required"/>
 					</td>
+				</tr>
+				<tr>
 					<td class="width-15 active"><label class="">站房dtu：</label></td>
 					<td class="width-35">
 						<form:input path="stationDtu" htmlEscape="false"    class="form-control"/>

src/main/webapp/webpage/modules/sg/managementcenter/project/projectList.js

@@ -208,6 +208,7 @@ $(document).ready(function() {
                    }
                    ,{
                        field: 'designUnitRole',
+                       title: '设计单位角色',
                        width:110
                    }
                    ,{