Merge remote-tracking branch 'origin/master'

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

@@ -7,6 +7,7 @@ import com.jeeplus.core.persistence.BaseMapper;
 import com.jeeplus.core.persistence.annotation.MyBatisMapper;
 import com.jeeplus.modules.sg.managementcenter.project.entity.PickingRequisition;
 import com.jeeplus.modules.sg.managementcenter.project.entity.Project;
+import com.jeeplus.modules.sys.entity.User;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -37,5 +38,6 @@ public interface ProjectMapper extends BaseMapper<Project> {
 
     //查找项目信息
     List<Project> findListProjectRequisitions(@Param("list") List<PickingRequisition> list);
-
+    //查找所有用户
+    List<String> findAllUser();
 }

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

@@ -476,8 +476,7 @@
 			station_dtu = #{stationDtu}
 		WHERE id = #{id}
 	</update>
-	
-	
+
 	<!--物理删除-->
 	<update id="delete">
 		DELETE FROM xm_project_details
@@ -582,4 +581,12 @@
 			</foreach>
 		</if>
 	</select>
+
+	<select id="findAllUser" resultType="java.lang.String">
+		<!-- 查询全部用户 -->
+		SELECT
+			a.login_name AS "loginName"
+		FROM sys_user a
+		WHERE a.del_flag = '0'
+	</select>
 </mapper>

src/main/java/com/jeeplus/modules/sg/managementcenter/project/service/ProjectService.java

@@ -11,6 +11,7 @@ import com.jeeplus.modules.sg.managementcenter.project.entity.PickingRequisition
 import com.jeeplus.modules.sg.managementcenter.project.entity.Project;
 import com.jeeplus.modules.sg.managementcenter.project.entity.ProjectManager;
 import com.jeeplus.modules.sg.managementcenter.project.mapper.ProjectMapper;
+import com.jeeplus.modules.sys.entity.User;
 import io.swagger.models.auth.In;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -311,4 +312,8 @@ public class ProjectService extends CrudService<ProjectMapper, Project> {
 	public void getUpdateAcquisitionStatus(String acquisitionStatus,String id){
 		projectMapper.updateAcquisitionStatus(acquisitionStatus,id);
 	}
+	//查找所有用户信息
+	public List<String> findAllUser(){
+		return projectMapper.findAllUser();
+	}
 }

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

@@ -171,54 +171,115 @@ public  class ProExcelInfo {
     /*
         对值进行验证 配网工程专职验证
      */
-    public static String getJudgeValue(List<Project> projects){
+    public static String getJudgeValue(List<Project> projects,List<String> users){
         Boolean flag = false;
         String str = "";
+        boolean judgeLoginName = false;
         for (Project project:projects){
             if (null==project.getDistributionEngineering()||"".equals(project.getDistributionEngineering())){//配网工程专职角色
                 str+="配网工程专职角色不能为空;";
+            }else {
+                judgeLoginName = getJudgeLoginName(users, project.getDistributionEngineering());
+                if (judgeLoginName){
+                    str+="配网工程专职角色不存在;";
+                }
             }
             if (null==project.getDistributionMaterials()||"".equals(project.getDistributionMaterials())){//配网物资专职角色
                 str+="配网物资专职角色不能为空;";
+            }else {
+                judgeLoginName = getJudgeLoginName(users,project.getDistributionMaterials());
+                if (judgeLoginName){
+                    str+="配网物资专职角色不存在;";
+                }
             }
             if (null==project.getDistributionSystem()||"".equals(project.getDistributionSystem())){//配网系统专职角色
                 str+="配网系统专职角色不能为空;";
+            }else {
+               judgeLoginName = getJudgeLoginName(users, project.getDistributionSystem());
+                if (judgeLoginName){
+                    str+="配网系统专职角色不存在;";
+                }
             }
             if (null==project.getDistributionPolicy()||"".equals(project.getDistributionPolicy())){//配网政策处理专职角色
                 str+="配网政策处理专职角色不能为空;";
+            }else {
+                judgeLoginName = getJudgeLoginName(users, project.getDistributionPolicy());
+                if (judgeLoginName){
+                    str+="配网政策处理专职角色不存在;";
+                }
             }
             if (null==project.getManagementLeader()||"".equals(project.getManagementLeader())){//项目管理中心领导角色
                 str+="项目管理中心领导角色不能为空;";
+            }else {
+                judgeLoginName = getJudgeLoginName(users, project.getManagementLeader());
+                if (judgeLoginName){
+                    str+="项目管理中心领导角色不存在;";
+                }
             }
             if (null==project.getRunUnit()||"".equals(project.getRunUnit())){//运行单位
                 str+="运行单位不能为空;";
             }
             if (null==project.getRunUnitRole()||"".equals(project.getRunUnitRole())){//运行单位角色
                 str+="运行单位角色不能为空;";
+            }else {
+                judgeLoginName = getJudgeLoginName(users, project.getRunUnitRole());
+                if (judgeLoginName){
+                    str+="运行单位角色不存在;";
+                }
             }
             if (null==project.getThroughResearchRole()||"".equals(project.getThroughResearchRole())){//经研所角色
                 str+="经研所角色不能为空;";
+            }else {
+                judgeLoginName = getJudgeLoginName(users, project.getThroughResearchRole());
+                if (judgeLoginName){
+                    str+="经研所角色不存在;";
+                }
             }
             if (null==project.getConstructionUnit()||"".equals(project.getConstructionUnit())){//施工单位
                 str+="施工单位不能为空;";
             }
             if (null==project.getConstructionUnitRole()||"".equals(project.getConstructionUnitRole())){//施工单位:施工单位角色
                 str+="施工单位角色不能为空;";
+            }else {
+               judgeLoginName = getJudgeLoginName(users, project.getConstructionUnitRole());
+                if (judgeLoginName){
+                    str+="施工单位角色不存在;";
+                }
             }
             if (null==project.getConstructionUnitManage()||"".equals(project.getConstructionUnitManage())){//施工单位:施工单位角色
                 str+="施工单位项目经理不能为空;";
+            }else {
+                judgeLoginName = getJudgeLoginName(users, project.getConstructionUnitManage());
+                if (judgeLoginName){
+                    str+="施工单位项目经理不存在;";
+                }
             }
             if (null==project.getConstructionUnitLeader()||"".equals(project.getConstructionUnitLeader())){//施工单位:施工单位角色
                 str+="施工单位领导不能为空;";
+            }else {
+                judgeLoginName = getJudgeLoginName(users, project.getConstructionUnitLeader());
+                if (judgeLoginName){
+                    str+="施工单位领导不存在;";
+                }
             }
             if (null==project.getDesignUnit()||"".equals(project.getDesignUnit())){//设计单位
                 str+="设计单位不能为空;";
             }
             if (null==project.getDesignUnitManage()||"".equals(project.getDesignUnitManage())){//设计单位角色
                 str+="设计单位项目经理不能为空;";
+            }else {
+                judgeLoginName = getJudgeLoginName(users,project.getDesignUnitManage());
+                if (judgeLoginName){
+                    str+="设计单位项目经理不存在;";
+                }
             }
             if (null==project.getDesignUnitLeader()||"".equals(project.getDesignUnitLeader())){//设计单位
                 str+="设计单位领导不能为空;";
+            }else {
+                judgeLoginName = getJudgeLoginName(users, project.getDesignUnitLeader());
+                if (judgeLoginName){
+                    str+="设计单位领导不存在;";
+                }
             }
             if (null!=project.getType()){//类型
                 flag = getJudge(project.getType(), PRO_TYPE);
@@ -238,13 +299,24 @@ public  class ProExcelInfo {
                     str+="交底类型填写有误;";
                 }
             }
-        }
-        if (!"".equals(str)){
-            return str;
+            if (!"".equals(str)){
+                return str;
+            }
         }
         return str;
     }
 
+    //对登录人进行验证
+    public static boolean getJudgeLoginName(List<String> users,String string){
+        boolean flag = true;
+        for (String user:users){
+            if (string.equals(user)){
+                flag = false;
+                break;
+            }
+        }
+        return flag;
+    }
     /*
         对值进行验证：项目经理验证
     */

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

@@ -166,7 +166,14 @@ public class ProjectController extends BaseController {
 	@RequestMapping(value = "form")
 	public String form(Project project, Model model) {
 		model.addAttribute("leave1", project);
-		return "modules/sg/managementcenter/project/projectForm";
+		User userByLoginName = systemService.getUserByLoginName(UserUtils.getUser().getLoginName());
+		String judgeRole = ProExcelInfo.getJudgeRole(userByLoginName);
+		if ("0".equals(judgeRole)){
+			return "modules/sg/managementcenter/project/projectForm";
+		}else {
+			return "modules/sg/managementcenter/project/projectForm2";
+		}
+
 	}
 
 	/**
@@ -188,28 +195,53 @@ public class ProjectController extends BaseController {
 		}
 		List<Project> projects = new ArrayList<Project>();
 		projects.add(project);
+		//获取登录名
+		User userByLoginName = systemService.getUserByLoginName(UserUtils.getUser().getLoginName());
+		String judgeRole = ProExcelInfo.getJudgeRole(userByLoginName);
+		if (judgeRole.equals("2")){
+			j.setSuccess(false);
+			j.setMsg("操作失败：您还没有操作的权限，如果需要请联系管理员!");
+			return j;
+		}
 		String loginName = UserUtils.getUser().getLoginName();
-		String judgeValue = ProExcelInfo.getJudgeValue(projects);
-		if (project.getIsNewRecord()){
-			if (!"".equals(judgeValue)||!project.getProjectManageRole().equals(loginName)){
-				j.setSuccess(false);
-				j.setMsg("新建失败:"+judgeValue+"数据不符合规范");
-				return j;
+		List<String> allUser = projectService.findAllUser();
+		if ("0".equals(judgeRole)){
+			String judgeValue = ProExcelInfo.getJudgeValue(projects,allUser);
+			if (project.getIsNewRecord()){
+				if (!"".equals(judgeValue)||!project.getDistributionEngineering().equals(loginName)){
+					j.setSuccess(false);
+					j.setMsg("新建失败:"+judgeValue+"数据不符合规范");
+					return j;
+				}
+				projectService.saveList(projects);
+				j.setSuccess(true);
+				j.setMsg("保存需求基本信息成功");
+			}else{
+				if (!"".equals(judgeValue)||!project.getDistributionEngineering().equals(loginName)){
+					j.setSuccess(false);
+					j.setMsg("修改失败："+judgeValue+"数据不符合规范");
+					return j;
+				}
+				projectService.saveList(projects);
+				j.setSuccess(true);
+				j.setMsg("修改需求基本信息成功");
 			}
-			project.preInsert();
-			projectService.saveList(projects);
-			j.setSuccess(true);
-			j.setMsg("保存需求基本信息成功");
-		}else{
-			if (!"".equals(judgeValue)||!project.getProjectManageRole().equals(loginName)){
-				j.setSuccess(false);
-				j.setMsg("修改失败："+judgeValue+"数据不符合规范");
-				return j;
+		}else {
+			String judgeValue = ProExcelInfo.getJudgeValueManager(projects);
+			if (project.getIsNewRecord()){
+				j.setSuccess(true);
+				j.setMsg("保存需求基本信息成功");
+			}else{
+				if (!"".equals(judgeValue)||!project.getProjectManageRole().equals(loginName)){
+					j.setSuccess(false);
+					j.setMsg("修改失败："+judgeValue+"数据不符合规范");
+					return j;
+				}
+				project.preUpdate();
+				projectService.save(project);
+				j.setSuccess(true);
+				j.setMsg("修改需求基本信息成功");
 			}
-			project.preUpdate();
-			projectService.save(project);
-			j.setSuccess(true);
-			j.setMsg("修改需求基本信息成功");
 		}
 		return j;
 	}
@@ -326,7 +358,8 @@ public class ProjectController extends BaseController {
 			}
 			if (judgeRole.equals("0")){
 				List<Project> projects =ProExcelInfo.getSureProjects(ProExcelInfo.getProjectUtilDistribution(importUtil));
-				String judgeValue = ProExcelInfo.getJudgeValue(projects);
+				List<String> users = projectService.findAllUser();
+				String judgeValue = ProExcelInfo.getJudgeValue(projects,users);
 				if (!"".equals(judgeValue)){
 					j.setSuccess(false);
 					j.setMsg("导入失败："+judgeValue+"数据不符合规范！");
@@ -383,10 +416,10 @@ public class ProjectController extends BaseController {
 	@ResponseBody
 	@RequiresPermissions("sg:managementcenter:project:importPicking")
 	@RequestMapping(value = "importPicking")
-	public AjaxJson importFileRequisition(@RequestParam("file")MultipartFile file, HttpServletResponse response, HttpServletRequest request) throws IOException, InvalidFormatException {
+	public AjaxJson importFileRequisition(@RequestParam("file")MultipartFile file, HttpServletResponse response, HttpServletRequest request) {
 		AjaxJson j = new AjaxJson();
 		String str = "";//提示
-//		try {
+		try {
 			ImportUtil importUtil = new ImportUtil(file, 0, 0);
 			//读取表格list
 			List<PickingRequisition> listPickRequisition = PickingInfo.getListPickRequisition(importUtil);
@@ -527,10 +560,10 @@ public class ProjectController extends BaseController {
 				}
 			}
 			j.setMsg( "已成功导入 "+sureSavePicking.size()+" 条领料表单记录."+str);
-//		} catch (Exception e) {
-//			j.setSuccess(false);
-//			j.setMsg("导入领料表单失败！失败信息："+e.getMessage());
-//		}
+		} catch (Exception e) {
+			j.setSuccess(false);
+			j.setMsg("导入领料表单失败！失败信息："+e.getMessage());
+		}
 		return j;
 	}
 }

src/main/java/com/jeeplus/modules/sys/service/SystemService.java

@@ -251,7 +251,7 @@ public class SystemService extends BaseService implements InitializingBean {
 	public List<Role> findAllRole(){
 		return UserUtils.getRoleList();
 	}
-	
+
 	@Transactional(readOnly = false)
 	public void saveRole(Role role) {
 		if (StringUtils.isBlank(role.getId())){

src/main/webapp/webpage/modules/sg/advence/activiti/constructionAdvanceForm.jsp

@@ -36,8 +36,8 @@
 							<tr>
 								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>项目名称：</label></td>
 								<td class="width-35">
-									<sys:itemselect url="${ctx}/sg/managementcenter/project/dataAdvance" id="project" name="projectId" value="${showList.projectName}" labelName="project.requireName" labelValue="${showList.projectName}"
-													title="选择项目号" cssClass="form-control " fieldLabels="${fns:urlEncode('项目需求名称|工程编号|项目名称|项目定义号')}" fieldKeys="requireName|projecId|projectName|projectNumber" searchLabels="${fns:urlEncode('项目需求名称')}" searchKeys="requireName"  isMultiSelected="false"></sys:itemselect>
+									<sys:itemselect url="${ctx}/sg/managementcenter/project/dataAdvance" id="project" name="projectId" value="${construction.projectName}" labelName="project.requireName" labelValue="${construction.projectName}"
+													title="选择项目号" cssClass="form-control " fieldLabels="${fns:urlEncode('项目需求名称|工程编号|项目名称|项目定义号')}" fieldKeys="requireName|projectId|projectName|projectNumber" searchLabels="${fns:urlEncode('项目需求名称')}|${fns:urlEncode('工程编号')}|${fns:urlEncode('项目名称')}|${fns:urlEncode('项目定义号')}" searchKeys="requireName|projectId|projectName|projectNumber"  isMultiSelected="true"></sys:itemselect>
 								</td>
 							</tr>
 							<tr>

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

@@ -139,13 +139,13 @@
 					</td>
 					<td class="width-15 active"><label class=""><font color="red">*</font>施工单位项目经理：</label></td>
 					<td class="width-35">
-						<form:input path="designUnitManage" htmlEscape="false" class="form-control required"/>
+						<form:input path="constructionUnitManage" 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="designUnitLeader" htmlEscape="false" class="form-control required"/>
+						<form:input path="constructionUnitLeader" htmlEscape="false" class="form-control required"/>
 					</td>
 					<td class="width-15 active"><label class=""><font color="red">*</font>设计单位：</label></td>
 					<td class="width-35">
@@ -163,14 +163,18 @@
 					</td>
 				</tr>
 				<tr>
-					<td class="width-15 active"><label class=""><font color="red">*</font>项目类型：</label></td>
-					<td class="width-35">
-						<form:input path="projectType" 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="projectType" 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="clarificaitonType" htmlEscape="false" class="form-control required"/>
 					</td>
+						<td class="width-15 active"></td>
+						<td class="width-35">
+								<%--<form:input path="projectType" htmlEscape="false" class="form-control required"/>--%>
+						</td>
 				</tr>
 				<tr>
 					<td class="width-15 active"><label class="">建设理由分类：</label></td>
@@ -217,107 +221,111 @@
 					<td class="width-35">
 						<form:textarea path="textRemark" htmlEscape="false" rows="4"    class="form-control "/>
 					</td>
-					<td class="width-15 active"><label class="">停电线路：</label></td>
-					<td class="width-35">
-						<form:input path="powerLine" 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="powerScope" 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="projectType" 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="powerFlagPackage" 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="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>
-					<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>
-					<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>
-					<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>
-					<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>
-					<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>
-					<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-15 active"></td>
 					<td class="width-35">
-						<form:input path="stationDtu" htmlEscape="false"    class="form-control"/>
+							<%--<form:input path="projectType" htmlEscape="false" class="form-control required"/>--%>
 					</td>
+					<%--<td class="width-15 active"><label class="">停电线路：</label></td>--%>
+					<%--<td class="width-35">--%>
+						<%--<form:input path="powerLine" 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="powerScope" 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="projectType" 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="powerFlagPackage" 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="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>--%>
+					<%--<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>--%>
+					<%--<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>--%>
+					<%--<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>--%>
+					<%--<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>--%>
+					<%--<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>--%>
+					<%--<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"/>--%>
+					<%--</td>--%>
+				<%--</tr>--%>
 			</tbody>
 		</table>
 	</form:form>

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

@@ -0,0 +1,325 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<%@ include file="/webpage/include/taglib.jsp"%>
+<html>
+<head>
+	<title>需求基本信息</title>
+	<meta name="decorator" content="ani"/>
+	<script type="text/javascript">
+
+		$(document).ready(function() {
+
+	        $('#beginDate').datetimepicker({
+				 format: "YYYY-MM-DD HH:mm:ss"
+		    });
+	        $('#endDate').datetimepicker({
+				 format: "YYYY-MM-DD HH:mm:ss"
+		    });
+		});
+		function save() {
+            var isValidate = jp.validateForm('#inputForm');//校验表单
+            if(!isValidate){
+                return false;
+			}else{
+                jp.loading();
+                jp.post("${ctx}/sg/managementcenter/project/save",$('#inputForm').serialize(),function(data){
+                    if(data.success){
+                        jp.getParent().refresh();
+                        var dialogIndex = parent.layer.getFrameIndex(window.name); // 获取窗口索引
+                        parent.layer.close(dialogIndex);
+                        jp.success(data.msg)
+
+                    }else{
+                        jp.error(data.msg);
+                    }
+                })
+			}
+
+        }
+	</script>
+</head>
+<body class="bg-white">
+		<form:form id="inputForm" modelAttribute="project" class="form-horizontal">
+		<form:hidden path="id"/>	
+		<table class="table table-bordered">
+			<tbody>
+				<tr>
+					<td class="width-15 active"><label class=""><font color="red">*</font>项目需求名称：</label></td>
+					<td class="width-35">
+						<form:input path="requireName" htmlEscape="false"    class="form-control required"/>
+					</td>
+					<td class="width-15 active"><label class="">工程编号：</label></td>
+					<td class="width-35">
+						<form:input path="projectId" htmlEscape="false" class="form-control"/>
+					</td>
+				</tr>
+				<tr>
+					<td class="width-15 active"><label class="">项目名称：</label></td>
+					<td class="width-35">
+						<form:input path="projectName" htmlEscape="false"    class="form-control"/>
+					</td>
+					<td class="width-15 active"><label class="">项目定义号：</label></td>
+					<td class="width-35">
+						<form:input path="projectNumber" 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="type" htmlEscape="false" class="form-control required"/>
+					</td>
+					<td class="width-15 active"><label class="pull-right"><font color="red">*</font>需求提出单位：</label></td>
+					<td class="width-35">
+						<form:input path="demandUnit" 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="bdzName" htmlEscape="false"    class="form-control"/>
+					</td>
+					<td class="width-15 active"><label class="">线路名称：</label></td>
+					<td class="width-35">
+						<form:input path="lineName" 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="projectManageRole" 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="distributionEngineering" 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="distributionMaterials" 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="distributionSystem" 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="distributionPolicy" 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="managementLeader" 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="runUnit" 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="runUnitRole" 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="throughResearchRole" 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="constructionUnit" 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="constructionUnitRole" 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="constructionUnitManage" 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="constructionUnitLeader" 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="designUnit" 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="designUnitManage" 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="designUnitLeader" 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="clarificaitonType" htmlEscape="false" class="form-control required"/>
+					</td>
+					<td class="width-15 active"></td>
+					<td class="width-35">
+							<%--<form:input path="projectType" 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="bulidClassificationResons" htmlEscape="false"    class="form-control"/>
+					</td>
+					<td class="width-15 active"><label class="">建设理由：</label></td>
+					<td class="width-35">
+						<form:textarea path="bulbidResons" htmlEscape="false" rows="4"    class="form-control "/>
+					</td>
+				</tr>
+				<tr>
+					<td class="width-15 active"><label class="">设备基本情况：</label></td>
+					<td class="width-35">
+						<form:input path="asicEquipment" htmlEscape="false"    class="form-control"/>
+					</td>
+					<td class="width-15 active"><label class="">运行班：</label></td>
+					<td class="width-35">
+						<form:input path="runTheClass" htmlEscape="false"    class="form-control"/>
+					</td>
+				</tr>
+				<tr>
+					<td class="width-15 active"><label class="">项目组：</label></td>
+					<td class="width-35">
+						<form:input path="projectTeam" htmlEscape="false"    class="form-control"/>
+					</td>
+					<td class="width-15 active"><label class="">费用估算：</label></td>
+					<td class="width-35">
+						<form:input path="costEstimate" htmlEscape="false"    class="form-control number"/>
+					</td>
+				</tr>
+				<tr>
+					<td class="width-15 active"><label class="">是否迎风期度夏项目：</label></td>
+					<td class="width-35">
+						<form:input path="whetherRheUpwind" htmlEscape="false"    class="form-control"/>
+					</td>
+					<td class="width-15 active"><label class="">确定下达时间：</label></td>
+					<td class="width-35">
+						<form:input path="sureDaDate" htmlEscape="false"    class="form-control"/>
+					</td>
+				</tr>
+				<tr>
+					<td class="width-15 active"><label class="">备注：</label></td>
+					<td class="width-35">
+						<form:textarea path="textRemark" htmlEscape="false" rows="4"    class="form-control "/>
+					</td>
+					<td class="width-15 active"><label class="">停电线路：</label></td>
+					<td class="width-35">
+						<form:input path="powerLine" 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="powerScope" 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="projectType" 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="powerFlagPackage" 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="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>
+					<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>
+					<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>
+					<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>
+					<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>
+					<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>
+					<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"/>
+					</td>
+				</tr>
+			</tbody>
+		</table>
+	</form:form>
+</body>
+</html>