Browse Source

基本项目信息

yue 5 years ago
parent
commit
c6e812c194

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

@@ -305,7 +305,7 @@ public  class ProExcelInfo {
             }
             if (null==project.getPowerScope()||"".equals(project.getPowerScope())){//停电范围
                 str+="停电范围不能为空;";
-            }else {
+            }/*else {
                 String[] split = project.getPowerScope().split(";");
                 for (int i = 0; i <split.length; i++) {
                     flag = getJudge(split[i], PRO_POWERSCOPE);
@@ -313,7 +313,7 @@ public  class ProExcelInfo {
                         str+="停单范围填写有误;";
                     }
                 }
-            }
+            }*/
             if (null==project.getProjectType()||"".equals(project.getProjectType())){//项目类型
                 str+="项目类型填写不能为空;";
             }else {

+ 4 - 4
src/main/java/com/jeeplus/modules/sg/managementcenter/project/web/ProjectController.java

@@ -192,7 +192,7 @@ public class ProjectController extends BaseController {
 	@RequiresPermissions(value={"sg:managementcenter:project:view","sg:managementcenter:project:add","sg:managementcenter:project:edit"},logical= Logical.OR)
 	@RequestMapping(value = "form")
 	public String form(Project project, Model model) {
-		String powerScope = project.getPowerScope();
+		/*String powerScope = project.getPowerScope();
 		if (null != powerScope) {
 			List<String> newList = new ArrayList<>();
 			String[] split = powerScope.split(";");
@@ -200,7 +200,7 @@ public class ProjectController extends BaseController {
 				newList.add(split[i]);
 			}
 			project.setPowerScopeList(newList);
-		}
+		}*/
 		model.addAttribute("project", project);
 		if (null != project.getId()){
 			if (!project.getStatus().equals("0")||!project.getAcquisitionStatus().equals("0")
@@ -236,12 +236,12 @@ public class ProjectController extends BaseController {
 		}
 		List<String> users = projectService.findAllUser();
 		List<Project> arrayLists = new ArrayList<Project>();
-		List<String> powerScopeList = project.getPowerScopeList();
+		/*List<String> powerScopeList = project.getPowerScopeList();
 		String b = "";
 		for (String a : powerScopeList) {
 			b += a + ";";
 		}
-		project.setPowerScope(b);
+		project.setPowerScope(b);*/
 		arrayLists.add(project);
 		String judgeValue = ProExcelInfo.getJudgeValue(arrayLists,users);
 		if (!"".equals(judgeValue)){

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

@@ -273,8 +273,8 @@
 					</td>
 					<td class="width-15 active"><label class=""><font color="red">*</font>停电范围:</label></td>
 					<td class="width-35">
-<%--						<form:input path="powerScope" htmlEscape="false"    class="form-control"/>--%>
-						<form:checkboxes path="powerScopeList" items="${fns:getDictList('Range')}" itemLabel="label" itemValue="value" htmlEscape="false" cssClass="i-checks required"/>
+						<form:input path="powerScope" htmlEscape="false"    class="form-control"/>
+<%--						<form:checkboxes path="powerScopeList" items="${fns:getDictList('Range')}" itemLabel="label" itemValue="value" htmlEscape="false" cssClass="i-checks required"/>--%>
 <%--						<form:select  path="powerScope" cssClass="form-control">
 							<form:option value="670"/>
 							<form:option value="67001+"/>

+ 2 - 2
src/main/webapp/webpage/modules/sg/managementcenter/project/projectForm1.jsp

@@ -249,8 +249,8 @@
 					</td>
 					<td class="width-15 active"><label class=""><font color="red">*</font>停电范围:</label></td>
 					<td class="width-35">
-						<form:checkboxes path="powerScopeList" items="${fns:getDictList('Range')}" itemLabel="label" itemValue="value" htmlEscape="false" cssClass="i-checks required"/>
-<%--						<form:input path="powerScope" htmlEscape="false"    class="form-control"/>--%>
+<%--						<form:checkboxes path="powerScopeList" items="${fns:getDictList('Range')}" itemLabel="label" itemValue="value" htmlEscape="false" cssClass="i-checks required"/>--%>
+						<form:input path="powerScope" htmlEscape="false"    class="form-control"/>
 					</td>
 				</tr>
 				<tr>