Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/sg/managementcenter/materialInventory/web/MaterialInventoryController.java

@@ -43,6 +43,7 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.servlet.ServletContext;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.io.InputStream;
 import java.util.List;
 import java.util.Map;
 
@@ -190,6 +191,7 @@ public class MaterialInventoryController extends BaseController {
 		AjaxJson j = new AjaxJson();
 		try {
 			StringBuilder failureMsg = new StringBuilder();
+//			new ImportUtil(file,failureMsg,1,0);
 			ImportUtil importUtil = new ImportUtil(file,1,0);
 			boolean judgeInventory = ImportPro.getJudgeInventory(importUtil);
 			if (judgeInventory){

src/main/java/com/jeeplus/modules/sg/managementcenter/project/entity/Project.java

@@ -11,22 +11,40 @@ public class Project extends DataEntity<Project> {
     private String bdzName;//变电站名称
     private String lineName;//线路名称
     private String requireName;//需求项目名称
+
+    private String reserveNumber;//储备编号
+
     private String projectId;//工程编号
     private String projectName;//项目名称
     private String projectNumber;//项目定义号
-    private String projectManageRole;//项目经理角色
-    private String distributionEngineering;//配网工程专职角色
-    private String distributionMaterials;//配网物资专职角色
-    private String distributionSystem;//配网系统专职角色
-    private String distributionPolicy;//配网政策处理专职角色
-    private String managementLeader;//项目管理中心领导角色
+    private String projectManageRole;//配网项目经理
+    private String distributionEngineering;//配网工程专职
+    private String distributionMaterials;//配网物资专职
+    private String distributionSystem;//配网系统专职
+    private String distributionPolicy;//配网政策处理专职
+    private String managementLeader;//项目管理中心领导
+
+    private String skillByFull;//项目管理中心技经专职
+
     private String runUnit;//运行单位
-    private String runUnitRole;//运行单位角色
+    private String runUnitRole;//运行单位角色(储备)
+
+    private String runUnitInspectionRole;//运行单位角色（运检）
+
     private String throughResearchRole;//经研所角色
+
+    private String constructionContractUnit; //施工合同单位
+    private Double constructionContractRate; //施工合同率
+    private String constructionContractSub; //施工分包单位
+
     private String constructionUnit;//施工单位
     private String constructionUnitRole;//施工单位角色
     private String constructionUnitManage;//施工单位项目经理
     private String constructionUnitLeader;//施工单位领导
+
+    private String constructionSkillByFull;//施工单位技经专职
+
+
     private String designUnit;//设计单位
     private String designUnitManage;//设计单位角色
     private String designUnitLeader;//施工 单位领导
@@ -35,7 +53,9 @@ public class Project extends DataEntity<Project> {
     private String bulbidResons;//建设理由
     private String asicEquipment;//设备基本情况
     private String runTheClass;//运行班
-    private String projectTeam;//项目组
+
+    private String projectTeam;//项目组（不要）
+
     private Double costEstimate;//费用估算
     private String whetherRheUpwind;//是否迎风期度夏项目
     private String sureDaDate;//确定下达时间
@@ -58,9 +78,12 @@ public class Project extends DataEntity<Project> {
     private String twoAndThreeRemote;//二或三
     private String phoneStyle;//通信方式
     private String stayOpenArea;//柱开集中或就业地
-    private String ringNetworkCabinet;//环网柜
-    private String stationDtu;//站房dtu
-    private String status;
+    private String ringNetworkCabinet;//环网柜DTU户内或户外
+
+    private String automatedRemarks;//自动化备注
+
+    private String stationDtu;//站房DTU
+    private String status;//
     private String acquisitionStatus;//领料状态
     private String constructionStatus;//施工状态
     private String whetherCloseStatus;//是否项目关闭
@@ -612,6 +635,7 @@ public class Project extends DataEntity<Project> {
         return stationDtu;
     }
 
+
     public void setStationDtu(String stationDtu) {
         this.stationDtu = stationDtu;
     }
@@ -624,8 +648,6 @@ public class Project extends DataEntity<Project> {
         this.earlyMaterial = earlyMaterial;
     }
 
-
-
     public Integer getPreConstruction() {
         return preConstruction;
     }
@@ -633,4 +655,68 @@ public class Project extends DataEntity<Project> {
     public void setPreConstruction(Integer preConstruction) {
         this.preConstruction = preConstruction;
     }
+
+    public String getReserveNumber() {
+        return reserveNumber;
+    }
+
+    public void setReserveNumber(String reserveNumber) {
+        this.reserveNumber = reserveNumber;
+    }
+
+    public String getSkillByFull() {
+        return skillByFull;
+    }
+
+    public void setSkillByFull(String skillByFull) {
+        this.skillByFull = skillByFull;
+    }
+
+    public String getRunUnitInspectionRole() {
+        return runUnitInspectionRole;
+    }
+
+    public void setRunUnitInspectionRole(String runUnitInspectionRole) {
+        this.runUnitInspectionRole = runUnitInspectionRole;
+    }
+
+    public String getConstructionContractUnit() {
+        return constructionContractUnit;
+    }
+
+    public void setConstructionContractUnit(String constructionContractUnit) {
+        this.constructionContractUnit = constructionContractUnit;
+    }
+
+    public Double getConstructionContractRate() {
+        return constructionContractRate;
+    }
+
+    public void setConstructionContractRate(Double constructionContractRate) {
+        this.constructionContractRate = constructionContractRate;
+    }
+
+    public String getConstructionContractSub() {
+        return constructionContractSub;
+    }
+
+    public void setConstructionContractSub(String constructionContractSub) {
+        this.constructionContractSub = constructionContractSub;
+    }
+
+    public String getConstructionSkillByFull() {
+        return constructionSkillByFull;
+    }
+
+    public void setConstructionSkillByFull(String constructionSkillByFull) {
+        this.constructionSkillByFull = constructionSkillByFull;
+    }
+
+    public String getAutomatedRemarks() {
+        return automatedRemarks;
+    }
+
+    public void setAutomatedRemarks(String automatedRemarks) {
+        this.automatedRemarks = automatedRemarks;
+    }
 }

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

@@ -64,6 +64,14 @@
     	a.stay_open_area AS "stayOpenArea",
     	a.ring_network_cabinet AS "ringNetworkCabinet",
     	a.station_dtu AS "stationDtu",
+    	a.reserve_number AS "reserveNumber",
+    	a.run_unit_inspection_role AS "runUnitInspectionRole",
+    	a.construction_contract_unit AS "constructionContractUnit",
+    	a.construction_contract_rate AS "constructionContractRate",
+    	a.construction_contract_sub AS "constructionContractSub",
+    	a.construction_skill_by_full AS "constructionSkillByFull",
+    	a.automated_remarks AS "automatedRemarks",
+    	a.skill_by_full AS "skillByFull",
 		a.status As "status",
 		a.acquisition_status AS "acquisitionStatus",
 		a.construction_status AS "constructionStatus",
@@ -238,6 +246,14 @@
 			stay_open_area,
 			ring_network_cabinet,
 			station_dtu,
+			reserve_number,
+			run_unit_inspection_role,
+			construction_contract_unit,
+			construction_contract_rate,
+			construction_contract_sub,
+			construction_skill_by_full,
+			automated_remarks,
+			skill_by_full,
 			status,
 			acquisition_status,
 			construction_status,
@@ -306,6 +322,14 @@
     	 	#{stayOpenArea},
     	 	#{ringNetworkCabinet},
     	 	#{stationDtu},
+			#{reserveNumber},
+			#{runUnitInspectionRole},
+			#{constructionContractUnit},
+			#{constructionContractRate},
+			#{constructionContractSub},
+			#{constructionSkillByFull},
+			#{automatedRemarks},
+			#{skillByFull},
     		#{status},
     		#{acquisitionStatus},
     		#{constructionStatus},
@@ -378,6 +402,14 @@
 		stay_open_area,
 		ring_network_cabinet,
 		station_dtu,
+		reserve_number,
+		run_unit_inspection_role,
+		construction_contract_unit,
+		construction_contract_rate,
+		construction_contract_sub,
+		construction_skill_by_full,
+		automated_remarks,
+		skill_by_full,
 		status,
 		acquisition_status,
 		construction_status,
@@ -448,6 +480,14 @@
 			#{item.stayOpenArea},
 			#{item.ringNetworkCabinet},
 			#{item.stationDtu},
+			#{item.reserveNumber},
+			#{item.runUnitInspectionRole},
+			#{item.constructionContractUnit},
+			#{item.constructionContractRate},
+			#{item.constructionContractSub},
+			#{item.constructionSkillByFull},
+			#{item.automatedRemarks},
+			#{item.skillByFull},
 			#{item.status},
 			#{item.acquisitionStatus},
 			#{item.constructionStatus},
@@ -463,41 +503,68 @@
 			update_by = #{updateBy.id},
 			update_date = #{updateDate},
 			remarks = #{remarks},
-			bdz_name = #{bdzName},
-			line_name = #{lineName},
-			require_name = #{requireName},
-			project_id = #{projectId},
-			project_name = #{projectName},
-			project_number = #{projectNumber},
-			build_classification_resons = #{bulidClassificationResons},
-			bulbid_resons = #{bulbidResons},
-			asic_equipment = #{asicEquipment},
-			run_the_class = #{runTheClass},
-			project_team = #{projectTeam},
-			cost_estimate = #{costEstimate},
-			whether_rhe_upwind = #{whetherRheUpwind},
-			sure_da_date = #{sureDaDate},
-			text_remark = #{textRemark},
-			power_line = #{powerLine},
-			power_scope = #{powerScope},
-			project_type = #{projectType},
-			power_flag_package = #{powerFlagPackage},
-			preliminary_judgment = #{preliminaryJudgment},
-			flag_civil_engineering = #{flagCivilEngineering},
-			steel_tube_pole = #{steelTubePole},
-			flag_approval_planning = #{flagApprovalPlanning},
-			equ_create_type = #{equCreateType},
-			equ_create_size = #{equCreateSize},
-			flag_new_equ_name = #{flagNewEquName},
-			include_bdz_news = #{includeBdzNews},
-			flag_no_electrical = #{flagNoElectrical},
-			drawings_work = #{drawingsWork},
-			flag_automation = #{flagAutomation},
-			two_and_three_remote = #{twoAndThreeRemote},
-			phone_style = #{phoneStyle},
-			stay_open_area = #{stayOpenArea},
-			ring_network_cabinet = #{ringNetworkCabinet},
-			station_dtu = #{stationDtu}
+			pro_type=#{type},
+			demand_unit=#{demandUnit},
+			bdz_name=#{bdzName},
+			line_name=#{lineName},
+			require_name=#{requireName},
+			project_id=#{projectId},
+			project_name=#{projectName},
+			project_number=#{projectNumber},
+			project_manage_role=#{projectManageRole},
+			distribution_engineering=#{distributionEngineering},
+			distribution_materials=#{distributionMaterials},
+			distribution_system=#{distributionSystem},
+			distribution_policy=#{distributionPolicy},
+			management_leader=#{managementLeader},
+			run_unit=#{runUnit},
+			run_unit_role=#{runUnitRole},
+			through_research_role=#{throughResearchRole},
+			construction_unit=#{constructionUnit},
+			construction_unit_role=#{constructionUnitRole},
+			construction_unit_manage=#{constructionUnitManage},
+			construction_unit_leader=#{constructionUnitLeader},
+			design_unit=#{designUnit},
+			design_unit_manage=#{designUnitManage},
+			design_unit_leader=#{designUnitLeader},
+			clarificaiton_type=#{clarificaitonType},
+			build_classification_resons=#{bulidClassificationResons},
+			bulbid_resons=#{bulbidResons},
+			asic_equipment=#{asicEquipment},
+			run_the_class=#{runTheClass},
+			project_team=#{projectTeam},
+			cost_estimate=#{costEstimate},
+			whether_rhe_upwind=#{whetherRheUpwind},
+			sure_da_date=#{sureDaDate},
+			text_remark=#{textRemark},
+			power_line=#{powerLine},
+			power_scope=#{powerScope},
+			project_type=#{projectType},
+			power_flag_package=#{powerFlagPackage},
+			preliminary_judgment=#{preliminaryJudgment},
+			flag_civil_engineering=#{flagCivilEngineering},
+			steel_tube_pole=#{steelTubePole},
+			flag_approval_planning=#{flagApprovalPlanning},
+			equ_create_type=#{equCreateType},
+			equ_create_size=#{equCreateSize},
+			flag_new_equ_name=#{flagNewEquName},
+			include_bdz_news=#{includeBdzNews},
+			flag_no_electrical=#{flagNoElectrical},
+			drawings_work=#{drawingsWork},
+			flag_automation=#{flagAutomation},
+			two_and_three_remote=#{twoAndThreeRemote},
+			phone_style=#{phoneStyle},
+			stay_open_area=#{stayOpenArea},
+			ring_network_cabinet=#{ringNetworkCabinet},
+			station_dtu=#{stationDtu},
+			reserve_number=#{reserveNumber},
+			run_unit_inspection_role=#{runUnitInspectionRole},
+			construction_contract_unit=#{constructionContractUnit},
+			construction_contract_rate=#{constructionContractRate},
+			construction_contract_sub=#{constructionContractSub},
+			construction_skill_by_full=#{constructionSkillByFull},
+			automated_remarks=#{automatedRemarks},
+			skill_by_full=#{skillByFull}
 		WHERE id = #{id}
 	</update>
 

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

@@ -3,9 +3,11 @@
  */
 package com.jeeplus.modules.sg.managementcenter.project.service;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
 
+import com.jeeplus.common.json.AjaxJson;
 import com.jeeplus.modules.sg.financial.settlement.entity.MaintainData;
 import com.jeeplus.modules.sg.managementcenter.project.entity.PickingRequisition;
 import com.jeeplus.modules.sg.managementcenter.project.entity.Project;
@@ -83,212 +85,51 @@ public class ProjectService extends CrudService<ProjectMapper, Project> {
 	//配网项目经理导入
 	@Transactional(readOnly = false)
 	public void saveList(List<Project> projects) {
-		String status = "0";
-		String acquisitionStatus="0";//领料状态
-		String constructionStatus="0";//施工状态
-		String whetherCloseStatus = "0";//项目是否关闭
-		Integer earlyMaterial = 0;//是否可以提前领料
-		Integer preConstruction = 0;//提前施工
+		Boolean flag = false;
+		String statusString = "0";
+		Integer statusInt = 0;
 		Project project1 = new Project();
 		List<Project> list = projectMapper.findList(project1);
-		for(Project project:projects){
-			project.setProjectType("");
-			status = "0";
-			acquisitionStatus="0";//领料状态
-			constructionStatus="0";//施工状态
-			whetherCloseStatus = "0";//项目是否关闭
-			earlyMaterial = 0;//是否可以提前领料
-			for (Project project2:list){
-				if (project.getRequireName().equals(project2.getRequireName())){
-					status = project2.getStatus();
-					acquisitionStatus = project2.getAcquisitionStatus();
-					constructionStatus = project2.getConstructionStatus();
-					whetherCloseStatus = project2.getWhetherCloseStatus();
-					earlyMaterial = project2.getEarlyMaterial();//是否可以提前领料
-					preConstruction = project2.getPreConstruction();//提前施工
-					project.setId(project2.getId());//项目id
-					project.setCreateBy(project2.getCreateBy());
-					project.setCreateDate(project2.getCreateDate());
-					if (!status.equals("3")){
-						if (!status.equals("0")||!acquisitionStatus.equals("0")
-								||!constructionStatus.equals("0")||earlyMaterial!=0
-								||preConstruction!=0){
-							project.setType(project2.getType());
-							project.setDemandUnit(project2.getDemandUnit());
-							project.setBdzName(project2.getBdzName());
-							project.setLineName(project2.getLineName());
-							project.setRequireName(project2.getRequireName());
-							project.setProjectId(project2.getProjectId());
-							project.setProjectName(project2.getProjectName());
-							project.setProjectNumber(project2.getProjectNumber());
-							project.setProjectManageRole(project2.getProjectManageRole());//项目经理角色
-							project.setDistributionEngineering(project2.getDistributionEngineering());//配网工程专职角色
-							project.setDistributionMaterials(project2.getDistributionMaterials());//配网物资专职角色
-							project.setDistributionSystem(project2.getDistributionSystem());//配网系统专职角色
-							project.setDistributionPolicy(project2.getDistributionPolicy());//配网政策处理专职角色
-							project.setManagementLeader(project2.getManagementLeader());//项目管理中心领导角色
-							project.setRunUnit(project2.getRunUnit());//运行单位
-							project.setRunUnitRole(project2.getRunUnitRole());//运行单位角色
-							project.setThroughResearchRole(project2.getThroughResearchRole());//经研所角色
-							project.setConstructionUnit(project2.getConstructionUnit());//施工单位
-							project.setConstructionUnitRole(project2.getConstructionUnitRole());//施工单位角色
-							project.setConstructionUnitManage(project2.getConstructionUnitManage());//施工单位项目经理
-							project.setConstructionUnitLeader(project2.getConstructionUnitLeader());//施工单位项目领导
-							project.setDesignUnit(project2.getDesignUnit());//设计单位
-							project.setDesignUnitManage(project2.getDesignUnitManage());//设计单位角色
-							project.setDesignUnitLeader(project2.getDesignUnitLeader());//设计单位领导
-							project.setClarificaitonType(project2.getClarificaitonType());//交底类型
-							project.setBulidClassificationResons(project2.getBulidClassificationResons());//建设理由分类
-							project.setBulbidResons(project2.getBulbidResons());//建设理由
-							project.setAsicEquipment(project2.getAsicEquipment());//设备基本情况
-							project.setRunTheClass(project2.getRunTheClass());//运行班
-							project.setProjectTeam(project2.getProjectTeam());//项目组
-							project.setCostEstimate(project2.getCostEstimate());//费用估算
-							project.setWhetherRheUpwind(project2.getWhetherRheUpwind());//是否迎风期度夏项目
-							project.setSureDaDate(project2.getSureDaDate());//确定下达时间
-							project.setTextRemark(project2.getTextRemark());//备注
-						}
-					}
-					project.setPowerLine(project2.getPowerLine());//停电线路
-					project.setPowerScope(project2.getPowerScope());//停电范围
-					project.setProjectType(project2.getProjectType());
-					project.setPowerFlagPackage(project2.getPowerFlagPackage());
-					project.setPreliminaryJudgment(project2.getPreliminaryJudgment());
-					project.setFlagCivilEngineering(project2.getFlagCivilEngineering());
-					project.setSteelTubePole(project2.getSteelTubePole());
-					project.setFlagApprovalPlanning(project2.getFlagApprovalPlanning());
-					project.setEquCreateType(project2.getEquCreateType());
-					project.setEquCreateSize(project2.getEquCreateSize());
-					project.setFlagNewEquName(project2.getFlagNewEquName());
-					project.setIncludeBdzNews(project2.getIncludeBdzNews());
-					project.setFlagNoElectrical(project2.getFlagNoElectrical());
-					project.setDrawingsWork(project2.getDrawingsWork());
-					project.setFlagAutomation(project2.getFlagAutomation());
-					project.setTwoAndThreeRemote(project2.getTwoAndThreeRemote());
-					project.setPhoneStyle(project2.getPhoneStyle());
-					project.setStayOpenArea(project2.getStayOpenArea());
-					project.setRingNetworkCabinet(project2.getRingNetworkCabinet());
-					project.setStationDtu(project2.getStationDtu());
+		List<Project> updateList = new ArrayList<Project>();//添加状态改变的
+		List<Project> insertList = new ArrayList<Project>();//添加状态不变的
+		for (Project projectA:projects){
+			flag = true;
+			for (Project projectB:list){
+				if (projectA.getRequireName().equals(projectB.getRequireName())){
+					projectA.setId(projectB.getId());
+					projectA.setStatus(projectB.getStatus());
+					projectA.setAcquisitionStatus(projectB.getAcquisitionStatus());
+					projectA.setWhetherCloseStatus(projectB.getWhetherCloseStatus());
+					projectA.setConstructionStatus(projectB.getConstructionStatus());
+					projectA.setEarlyMaterial(projectB.getEarlyMaterial());
+					projectA.setPreConstruction(projectB.getPreConstruction());
+					updateList.add(projectA);
+					flag = false;
 					break;
 				}
 			}
-			if (null!=project.getId()){
-				project.preUpdate();
-			}else {
-				project.preInsert();
+			if (flag){
+				projectA.setStatus(statusString);
+				projectA.setAcquisitionStatus(statusString);
+				projectA.setConstructionStatus(statusString);
+				projectA.setWhetherCloseStatus(statusString);
+				projectA.setEarlyMaterial(statusInt);
+				projectA.setPreConstruction(statusInt);
+				projectA.preInsert();
+				insertList.add(projectA);
 			}
-			if (!"".equals(project.getProjectType())){//项目类型
-				project.setStatus(status);
-				project.setAcquisitionStatus(acquisitionStatus);
-				project.setConstructionStatus(constructionStatus);
-				project.setWhetherCloseStatus(whetherCloseStatus);
-				project.setEarlyMaterial(earlyMaterial);
-				project.setPreConstruction(preConstruction);
-			}else {
-				project.setStatus("3");
-				project.setAcquisitionStatus("3");
-				project.setConstructionStatus("3");
-				project.setWhetherCloseStatus(whetherCloseStatus);
-				project.setEarlyMaterial(3);
-				project.setPreConstruction(3);
+		}
+		if (updateList.size()>0){
+			for (Project project:updateList){
+				project.preUpdate();
+				projectMapper.update(project);
 			}
 		}
-		if (null!=projects&&projects.size()>0){
-			projectMapper.insertList(projects);
+		if (insertList.size()>0){
+			projectMapper.insertList(insertList);
 		}
 	}
-		//项目经理导入
-		@Transactional(readOnly = false)
-		public void saveListManager(List<Project> projects,List<Project> projectList) {
-			String status = "0";
-			String acquisitionStatus="0";//领料状态
-			String constructionStatus="0";//施工状态
-			String whetherCloseStatus = "0";//项目是否关闭
-			Integer earlyMaterial = 0;//是否可以提前领料
-			Integer preConstruction = 0;//提前施工
-			for(Project project:projects){
-				status = "0";
-				acquisitionStatus="0";//领料状态
-				constructionStatus="0";//施工状态
-				whetherCloseStatus = "0";//项目是否关闭
-				earlyMaterial = 0;//是否可以提前领料
-				for (Project project2:projectList){
-					if (project.getRequireName().equals(project2.getRequireName())){
-						status = project2.getStatus();
-						acquisitionStatus = project2.getAcquisitionStatus();
-						constructionStatus = project2.getConstructionStatus();
-						whetherCloseStatus = project2.getWhetherCloseStatus();
-						earlyMaterial = project2.getEarlyMaterial();//是否可以提前领料
-						preConstruction = project2.getPreConstruction();//提前施工
-						if (status.equals("3")){
-							status = "0";
-						}
-						if (acquisitionStatus.equals("3")){
-							acquisitionStatus = "0";
-						}
-						if (constructionStatus.equals("3")){
-							constructionStatus = "0";
-						}
-						if (earlyMaterial==3){
-							earlyMaterial = 0;
-						}
-						if (preConstruction == 3){
-							preConstruction = 0;
-						}
-						project.setId(project2.getId());//项目id
-						project.setCreateBy(project2.getCreateBy());
-						project.setCreateDate(project2.getCreateDate());
-						project.setType(project2.getType());
-						project.setDemandUnit(project2.getDemandUnit());
-						project.setBdzName(project2.getBdzName());
-						project.setLineName(project2.getLineName());
-						project.setRequireName(project2.getRequireName());
-						project.setProjectId(project2.getProjectId());
-						project.setProjectName(project2.getProjectName());
-						project.setProjectNumber(project2.getProjectNumber());
-						project.setProjectManageRole(project2.getProjectManageRole());//项目经理角色
-						project.setDistributionEngineering(project2.getDistributionEngineering());//配网工程专职角色
-						project.setDistributionMaterials(project2.getDistributionMaterials());//配网物资专职角色
-						project.setDistributionSystem(project2.getDistributionSystem());//配网系统专职角色
-						project.setDistributionPolicy(project2.getDistributionPolicy());//配网政策处理专职角色
-						project.setManagementLeader(project2.getManagementLeader());//项目管理中心领导角色
-						project.setRunUnit(project2.getRunUnit());//运行单位
-						project.setRunUnitRole(project2.getRunUnitRole());//运行单位角色
-						project.setThroughResearchRole(project2.getThroughResearchRole());//经研所角色
-						project.setConstructionUnit(project2.getConstructionUnit());//施工单位
-						project.setConstructionUnitRole(project2.getConstructionUnitRole());//施工单位角色
-						project.setConstructionUnitManage(project2.getConstructionUnitManage());//施工单位项目经理
-						project.setConstructionUnitLeader(project2.getConstructionUnitLeader());//施工单位项目领导
-						project.setDesignUnit(project2.getDesignUnit());//设计单位
-						project.setDesignUnitManage(project2.getDesignUnitManage());//设计单位角色
-						project.setDesignUnitLeader(project2.getDesignUnitLeader());//设计单位领导
-						project.setClarificaitonType(project2.getClarificaitonType());//交底类型
-						project.setBulidClassificationResons(project2.getBulidClassificationResons());//建设理由分类
-						project.setBulbidResons(project2.getBulbidResons());//建设理由
-						project.setAsicEquipment(project2.getAsicEquipment());//设备基本情况
-						project.setRunTheClass(project2.getRunTheClass());//运行班
-						project.setProjectTeam(project2.getProjectTeam());//项目组
-						project.setCostEstimate(project2.getCostEstimate());//费用估算
-						project.setWhetherRheUpwind(project2.getWhetherRheUpwind());//是否迎风期度夏项目
-						project.setSureDaDate(project2.getSureDaDate());//确定下达时间
-						project.setTextRemark(project2.getTextRemark());//备注
-						break;
-					}
-				}
-				if (null!=project.getId()){
-					project.preUpdate();
-				}
-				project.setStatus(status);
-				project.setAcquisitionStatus(acquisitionStatus);
-				project.setConstructionStatus(constructionStatus);
-				project.setWhetherCloseStatus(whetherCloseStatus);
-				project.setEarlyMaterial(earlyMaterial);
-				project.setPreConstruction(preConstruction);
-			}
-			if (null!=projects&&projects.size()>0){
-				projectMapper.insertList(projects);
-			}
-		}
+
 	//根据id查找项目
 	public List<Project> getListProject(List<Project> projects){
 		return  projectMapper.findListProject(projects);

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

@@ -20,21 +20,23 @@ public  class ProExcelInfo {
     public static String[] PRO_PRE_JUDGEMENT = {"行政政处（城区道路）","民事政处/行政政处（公路/水利）","无","农村政处"};//政策初步判断
     public static String[] PRO_FLAG_CIVIL = {"可能有土建","无土建","含土建","纯土建"};//是否含土建
     public static String[] PRO_STEEL_TUBE = {"无","压桩","灌注桩"};//钢管杆基础类类型
-    public static String[] PRO_EQU_TYPE = {"无","环网柜","箱变","干变","其他"};//设备改造类型
+    public static String[] PRO_EQU_TYPE = {"无","环网柜","箱变","干变","其他","DTU","分支箱"};//设备改造类型
     public static String[] PRO_DRAWING_WORK = {"带电作业","停电作业","非涉电作业","未标注"};//图纸标注的带点作业情况
-    public static String[] PRO_TWO_THREE = {"二遥","三遥"};//二或三
-    public static String[] PRO_PHONE_STYLE = {"光纤","公网","专网"};//通信方式
-    public static String[] PRO_STAY_AREA={"集中","就地"};//柱开集中或就业地
-    public static String[] PRO_RING_NETWORK = {"户内","户外"};//环网柜
+    public static String[] PRO_TWO_THREE = {"二遥","三遥","混合"};//二或三
+    public static String[] PRO_PHONE_STYLE = {"光纤","公网","专网","混合"};//通信方式
+    public static String[] PRO_STAY_AREA={"集中","就地","混合"};//柱开集中或就业地
+    public static String[] PRO_RING_NETWORK = {"户内","户外","混合"};//环网柜
     public static String[] PRO_ITEM_TYPE = {"资本项目","成本项目"};//项目类型
 
+    public static String[] PRO_LINGTING = {"配电新区","配电工区"};//运行单位
+
     public final static String[] SYS_ROLE = {"项目经理","配网工程专职"};//
     /**
      * 获取表格数据
-     * @param importUtil 配网工程专职导入
+     * @param importUtil 导入
      * @return List<ErpAccount> 导入表格数据
      */
-    public static List<Project> getProjectUtilDistribution(ImportUtil importUtil)  {
+    public static List<Project> getProjectUtil(ImportUtil importUtil)  {
         int lastRow = importUtil.getLastDataRowNum();
         List<Project> list = new ArrayList<Project>();
         Project project = null;
@@ -42,67 +44,78 @@ public  class ProExcelInfo {
         for(int i=2; i<=lastRow;i++){
             project = new Project();
             Row row = importUtil.getRow(i);
-            String requireCode = (String) importUtil.getCellValue(row,5);
-            if(StringUtils.isNotBlank(requireCode)) {
-                project.setRequireName(requireCode);
+            String requireName= (String) importUtil.getCellValue(row,5);
+            if(StringUtils.isNotBlank(requireName)) {
+                project.setRequireName(requireName);//需求项目名称
                 project.setType((String)importUtil.getCellValue(row,1));//类型
                 project.setDemandUnit((String)importUtil.getCellValue(row,2));//需求提出单位
                 project.setBdzName((String)importUtil.getCellValue(row,3));//变电站名称
                 project.setLineName((String)importUtil.getCellValue(row,4));//线路名称
-                project.setProjectId((String)importUtil.getCellValue(row,6));//工程编号
-                project.setProjectName((String)importUtil.getCellValue(row,7));//项目名称
-                project.setProjectNumber((String)importUtil.getCellValue(row,8));//项目定义号
-                project.setProjectManageRole((String)importUtil.getCellValue(row,9));//项目经理角色
-                project.setDistributionEngineering((String)importUtil.getCellValue(row,10));//配网工程专职角色
-                project.setDistributionMaterials((String)importUtil.getCellValue(row,11));//配网物资专职角色
-                project.setDistributionSystem((String)importUtil.getCellValue(row,12));//配网系统专职角色
-                project.setDistributionPolicy((String)importUtil.getCellValue(row,13));//配网政策处理专职角色
-                project.setManagementLeader((String)importUtil.getCellValue(row,14));//项目管理中心领导角色'
-                project.setRunUnit((String)importUtil.getCellValue(row,15));//运行单位
-                project.setRunUnitRole((String)importUtil.getCellValue(row,16));//运行单位角色
-                project.setThroughResearchRole((String)importUtil.getCellValue(row,17));//经研所角色
-                project.setConstructionUnit((String)importUtil.getCellValue(row,18));//施工单位
-                project.setConstructionUnitRole((String)importUtil.getCellValue(row,19));//施工单位角色
-                project.setConstructionUnitManage((String)importUtil.getCellValue(row,20));//施工单位项目经理
-                project.setConstructionUnitLeader((String)importUtil.getCellValue(row,21));//施工单位领导
-                project.setDesignUnit((String)importUtil.getCellValue(row,22));//设计单位
-                project.setDesignUnitManage((String)importUtil.getCellValue(row,23));//设计单位项目领导
-                project.setDesignUnitLeader((String)importUtil.getCellValue(row,24));//设计单位领导
-                project.setClarificaitonType((String)importUtil.getCellValue(row,25));//交底类型
-                project.setBulidClassificationResons((String)importUtil.getCellValue(row,26));//建设理由分类
-                project.setBulbidResons((String)importUtil.getCellValue(row,27));//建设理由
-                project.setAsicEquipment((String)importUtil.getCellValue(row,28));//设备基本状况
-                project.setRunTheClass((String)importUtil.getCellValue(row,29));//运行班
-                project.setProjectTeam((String)importUtil.getCellValue(row,30));//项目组
-                costEstimate = (String) importUtil.getCellValue(row,31);
+                project.setReserveNumber((String) importUtil.getCellValue(row,6));//储备编号
+                project.setProjectId((String)importUtil.getCellValue(row,7));//工程编号
+                project.setProjectName((String)importUtil.getCellValue(row,8));//项目名称
+                project.setProjectNumber((String)importUtil.getCellValue(row,9));//项目定义号
+                project.setProjectManageRole((String)importUtil.getCellValue(row,10));//项目经理角色
+                project.setDistributionEngineering((String)importUtil.getCellValue(row,11));//配网工程专职角色
+                project.setDistributionMaterials((String)importUtil.getCellValue(row,12));//配网物资专职角色
+                project.setDistributionSystem((String)importUtil.getCellValue(row,13));//配网系统专职角色
+                project.setDistributionPolicy((String)importUtil.getCellValue(row,14));//配网政策处理专职角色
+                project.setManagementLeader((String)importUtil.getCellValue(row,15));//项目管理中心领导角色'
+                project.setSkillByFull((String)importUtil.getCellValue(row,16));//项目管理中心技经专职
+                project.setRunUnit((String)importUtil.getCellValue(row,17));//运行单位
+                project.setRunUnitRole((String)importUtil.getCellValue(row,18));//运行单位角色(储备）
+                project.setRunUnitInspectionRole((String)importUtil.getCellValue(row,19));//运行单位角色（运检）
+                project.setThroughResearchRole((String)importUtil.getCellValue(row,20));//经研所角色
+
+                project.setConstructionContractUnit((String)importUtil.getCellValue(row,21));//施工合同单位
+                costEstimate = (String) importUtil.getCellValue(row,22);
+                if (null!=costEstimate&&!costEstimate.equals("")){
+                    project.setConstructionContractRate(Double.parseDouble(costEstimate));//施工合同率
+                }
+                project.setConstructionContractSub((String)importUtil.getCellValue(row,23));//施工分包单位
+                project.setConstructionUnit((String)importUtil.getCellValue(row,24));//施工单位
+                project.setConstructionUnitRole((String)importUtil.getCellValue(row,25));//施工单位角色
+                project.setConstructionUnitManage((String)importUtil.getCellValue(row,26));//施工单位项目经理
+                project.setConstructionUnitLeader((String)importUtil.getCellValue(row,27));//施工单位领导
+                project.setConstructionSkillByFull((String)importUtil.getCellValue(row,28));//施工单位技经专职
+                project.setDesignUnit((String)importUtil.getCellValue(row,29));//设计单位
+                project.setDesignUnitManage((String)importUtil.getCellValue(row,30));//设计单位项目领导
+                project.setDesignUnitLeader((String)importUtil.getCellValue(row,31));//设计单位领导
+                project.setClarificaitonType((String)importUtil.getCellValue(row,32));//交底类型
+                project.setBulidClassificationResons((String)importUtil.getCellValue(row,33));//建设理由分类
+                project.setBulbidResons((String)importUtil.getCellValue(row,34));//建设理由
+                project.setAsicEquipment((String)importUtil.getCellValue(row,35));//设备基本状况
+                project.setRunTheClass((String)importUtil.getCellValue(row,36));//运行班
+                project.setProjectTeam((String)importUtil.getCellValue(row,36));//项目组
+                costEstimate = (String) importUtil.getCellValue(row,37);
                 if (null!=costEstimate&&!costEstimate.equals("")){
                     project.setCostEstimate(Double.parseDouble(costEstimate));//费用估算
                 }
-                project.setWhetherRheUpwind((String)importUtil.getCellValue(row,32));//是否迎风期度夏项目
-                project.setSureDaDate((String)importUtil.getCellValue(row,33));//确定下达时间
-                project.setTextRemark((String)importUtil.getCellValue(row,34));//备注
-//                project.setPowerLine((String)importUtil.getCellValue(row,35));//停电线路
-//                project.setPowerScope((String)importUtil.getCellValue(row,36));//停电范围
-//                project.setProjectType((String)importUtil.getCellValue(row,37));//项目类型
-//                project.setPowerFlagPackage((String)importUtil.getCellValue(row,38));//是否为停电打包项目
-//                project.setPreliminaryJudgment((String)importUtil.getCellValue(row,39));//证处初步判断
-//                project.setFlagCivilEngineering((String)importUtil.getCellValue(row,40));//是否含土建
-//                project.setSteelTubePole((String)importUtil.getCellValue(row,41));//钢管杆基础类型
-//                project.setFlagApprovalPlanning((String)importUtil.getCellValue(row,42));//是否需要规划报批
-//                project.setEquCreateType((String)importUtil.getCellValue(row,43));//设备改造类型
-//                project.setEquCreateSize((String)importUtil.getCellValue(row,44));//间隔数
-//                project.setFlagNewEquName((String)importUtil.getCellValue(row,45));//是否新设备命名
-//                project.setIncludeBdzNews((String)importUtil.getCellValue(row,46));//是否含变电站新闻格投运
-//                project.setFlagNoElectrical((String)importUtil.getCellValue(row,47));//是否非射电电气施工
-//                project.setDrawingsWork((String)importUtil.getCellValue(row,48));//图纸标注的带点作业情况
-//                project.setFlagAutomation((String)importUtil.getCellValue(row,49));//是否含自动化
-//                project.setTwoAndThreeRemote((String)importUtil.getCellValue(row,50));//二遥或三
-//                project.setPhoneStyle((String)importUtil.getCellValue(row,51));//通信方式
-//                project.setStayOpenArea((String)importUtil.getCellValue(row,52));//柱开集中或就业地
-//                project.setRingNetworkCabinet((String)importUtil.getCellValue(row,53));//环网柜
-//                project.setStationDtu((String)importUtil.getCellValue(row,54));//站房dtu
-//                project.setItemType((String)importUtil.getCellValue(row,55));//项目类型
-                  list.add(project);
+                project.setWhetherRheUpwind((String)importUtil.getCellValue(row,38));//是否迎风期度夏项目
+                project.setSureDaDate((String)importUtil.getCellValue(row,39));//确定下达时间
+                project.setTextRemark((String)importUtil.getCellValue(row,40));//备注
+                project.setPowerLine((String)importUtil.getCellValue(row,41));//停电线路
+                project.setPowerScope((String)importUtil.getCellValue(row,42));//停电范围
+                project.setProjectType((String)importUtil.getCellValue(row,43));//项目类型
+                project.setPowerFlagPackage((String)importUtil.getCellValue(row,44));//是否为停电打包项目
+                project.setPreliminaryJudgment((String)importUtil.getCellValue(row,45));//证处初步判断
+                project.setFlagCivilEngineering((String)importUtil.getCellValue(row,46));//是否含土建
+                project.setSteelTubePole((String)importUtil.getCellValue(row,47));//钢管杆基础类型
+                project.setFlagApprovalPlanning((String)importUtil.getCellValue(row,48));//是否需要规划报批
+                project.setEquCreateType((String)importUtil.getCellValue(row,49));//设备改造类型
+                project.setEquCreateSize((String)importUtil.getCellValue(row,50));//间隔数
+                project.setFlagNewEquName((String)importUtil.getCellValue(row,51));//是否新设备命名
+                project.setIncludeBdzNews((String)importUtil.getCellValue(row,52));//是否含变电站新闻格投运
+                project.setFlagNoElectrical((String)importUtil.getCellValue(row,53));//是否非射电电气施工
+                project.setDrawingsWork((String)importUtil.getCellValue(row,54));//图纸标注的带点作业情况
+                project.setFlagAutomation((String)importUtil.getCellValue(row,55));//是否含自动化
+                project.setTwoAndThreeRemote((String)importUtil.getCellValue(row,56));//二遥或三
+                project.setPhoneStyle((String)importUtil.getCellValue(row,57));//通信方式
+                project.setStayOpenArea((String)importUtil.getCellValue(row,58));//柱开集中或就业地
+                project.setRingNetworkCabinet((String)importUtil.getCellValue(row,59));//环网柜
+                project.setAutomatedRemarks((String)importUtil.getCellValue(row,60));//自动化备注
+                project.setStationDtu((String)importUtil.getCellValue(row,61));//站房dtu
+                list.add(project);
             }
         }
         return list;
@@ -159,10 +172,10 @@ public  class ProExcelInfo {
         if (!indexFive.contains("项目")){
             flag = true;
         }
-        if (!indexSix.contains("编号")){
+        if (!indexSix.contains("储备")){
             flag = true;
         }
-        if (!indexNine.contains("角色")){
+        if (!indexNine.contains("号")){
             flag = true;
         }
         return flag;
@@ -176,57 +189,71 @@ public  class ProExcelInfo {
         String str = "";
         boolean judgeLoginName = false;
         for (Project project:projects){
+            if(null==project.getBdzName()||"".equals(project.getBdzName())){//变电站名称
+                str+="变电站名称不能为空";
+            }
+            if (null==project.getLineName()||"".equals(project.getLineName())){//线路名称
+                str+="线路名称不能为空";
+            }
             if (null==project.getDistributionEngineering()||"".equals(project.getDistributionEngineering())){//配网工程专职角色
-                str+="配网工程专职角色不能为空;";
+                str+="配网工程专职不能为空;";
             }else {
                 judgeLoginName = getJudgeLoginName(users, project.getDistributionEngineering());
                 if (judgeLoginName){
-                    str+="配网工程专职角色不存在;";
+                    str+="配网工程专职不存在;";
                 }
             }
             if (null==project.getDistributionMaterials()||"".equals(project.getDistributionMaterials())){//配网物资专职角色
-                str+="配网物资专职角色不能为空;";
+                str+="配网物资专职不能为空;";
             }else {
                 judgeLoginName = getJudgeLoginName(users,project.getDistributionMaterials());
                 if (judgeLoginName){
-                    str+="配网物资专职角色不存在;";
+                    str+="配网物资专职不存在;";
                 }
             }
             if (null==project.getDistributionSystem()||"".equals(project.getDistributionSystem())){//配网系统专职角色
-                str+="配网系统专职角色不能为空;";
+                str+="配网系统专职角色为空;";
             }else {
                judgeLoginName = getJudgeLoginName(users, project.getDistributionSystem());
                 if (judgeLoginName){
-                    str+="配网系统专职角色不存在;";
+                    str+="配网系统专职不存在;";
                 }
             }
             if (null==project.getDistributionPolicy()||"".equals(project.getDistributionPolicy())){//配网政策处理专职角色
-                str+="配网政策处理专职角色不能为空;";
+                str+="配网政策处理专职不能为空;";
             }else {
                 judgeLoginName = getJudgeLoginName(users, project.getDistributionPolicy());
                 if (judgeLoginName){
-                    str+="配网政策处理专职角色不存在;";
+                    str+="配网政策处理专职不存在;";
                 }
             }
             if (null==project.getManagementLeader()||"".equals(project.getManagementLeader())){//项目管理中心领导角色
-                str+="项目管理中心领导角色不能为空;";
+                str+="项目管理中心领导不能为空;";
             }else {
                 judgeLoginName = getJudgeLoginName(users, project.getManagementLeader());
                 if (judgeLoginName){
-                    str+="项目管理中心领导角色不存在;";
+                    str+="项目管理中心领导不存在;";
                 }
             }
             if (null==project.getRunUnit()||"".equals(project.getRunUnit())){//运行单位
                 str+="运行单位不能为空;";
+            }else {
+                flag = getJudge(project.getRunUnit(),PRO_LINGTING);
+                if (flag){
+                    str+="运行单位填写有误";
+                }
             }
             if (null==project.getRunUnitRole()||"".equals(project.getRunUnitRole())){//运行单位角色
-                str+="运行单位角色不能为空;";
+                str+="运行单位储备专职不能为空;";
             }else {
                 judgeLoginName = getJudgeLoginName(users, project.getRunUnitRole());
                 if (judgeLoginName){
-                    str+="运行单位角色不存在;";
+                    str+="运行单位储备专职不存在;";
                 }
             }
+            if (null==project.getRunUnitInspectionRole()){
+                str+="运行单位运检不能为空";
+            }
             if (null==project.getThroughResearchRole()||"".equals(project.getThroughResearchRole())){//经研所角色
                 str+="经研所角色不能为空;";
             }else {
@@ -239,11 +266,11 @@ public  class ProExcelInfo {
                 str+="施工单位不能为空;";
             }
             if (null==project.getConstructionUnitRole()||"".equals(project.getConstructionUnitRole())){//施工单位:施工单位角色
-                str+="施工单位角色不能为空;";
+                str+="施工单位物质专职不能为空;";
             }else {
                judgeLoginName = getJudgeLoginName(users, project.getConstructionUnitRole());
                 if (judgeLoginName){
-                    str+="施工单位角色不存在;";
+                    str+="施工单位物资专职不存在;";
                 }
             }
             if (null==project.getConstructionUnitManage()||"".equals(project.getConstructionUnitManage())){//施工单位:施工单位角色
@@ -266,11 +293,11 @@ public  class ProExcelInfo {
                 str+="设计单位不能为空;";
             }
             if (null==project.getDesignUnitManage()||"".equals(project.getDesignUnitManage())){//设计单位角色
-                str+="设计单位项目经理不能为空;";
+                str+="设计单位人员不能为空;";
             }else {
                 judgeLoginName = getJudgeLoginName(users,project.getDesignUnitManage());
                 if (judgeLoginName){
-                    str+="设计单位项目经理不存在;";
+                    str+="设计单位人员不存在;";
                 }
             }
             if (null==project.getDesignUnitLeader()||"".equals(project.getDesignUnitLeader())){//设计单位
@@ -293,44 +320,33 @@ public  class ProExcelInfo {
                     str+="需求提出单位填写有误;";
                 }
             }
-            if (null!=project.getClarificaitonType()){//交底类型
+            if (null==project.getRunUnit()||"".equals(project.getRunUnit())){//设计单位
+                str+="运行单位不能为空;";
+            }else {
+                judgeLoginName = getJudge(project.getRunUnit(), PRO_LINGTING);
+                if (judgeLoginName){
+                    str+="运行单位填写有误;";
+                }
+            }
+            if (null==project.getClarificaitonType()||"".equals(project.getClarificaitonType())){//交底类型
+                    str+="交底类型不能为空;";
+            }else {
                 flag = getJudge(project.getClarificaitonType(),PRO_CLARIFICAITON);
                 if (flag){
                     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;
-    }
-    /*
-        对值进行验证：项目经理验证
-    */
-    public static String getJudgeValueManager(List<Project> projects){
-        Boolean flag = false;
-        String str = "";
-        for (Project project:projects){
-            if (null!=project.getPowerScope()){//停电范围
+            if (null==project.getPowerScope()||"".equals(project.getPowerScope())){//停电范围
+                str+="停电范围不能为空;";
+            }else {
                 flag = getJudge(project.getPowerScope(), PRO_POWERSCOPE);
                 if (flag){
                     str+="停单范围填写有误;";
                 }
             }
-            if (null!=project.getProjectType()){//项目类型
+            if (null==project.getProjectType()||"".equals(project.getProjectType())){//项目类型
+                str+="项目类型填写不能为空;";
+            }else {
                 flag = getJudge(project.getProjectType(), PRO_PROJECT_TYPE);
                 if (flag){
                     str+="项目类型填写有误;";
@@ -342,98 +358,178 @@ public  class ProExcelInfo {
                     str+="是否为停电打包项目填写有误;";
                 }
             }
-            if (null!=project.getPreliminaryJudgment()){//政策初步判断
+            if (null==project.getPreliminaryJudgment()||"".equals(project.getPreliminaryJudgment())){//政策初步判断
+                str+="政策初步判断不能为空;";
+            }else {
                 flag = getJudge(project.getPreliminaryJudgment(), PRO_PRE_JUDGEMENT);
                 if (flag){
                     str+="政策初步判断填写有误;";
                 }
             }
-            if (null!=project.getFlagCivilEngineering()){//是否含土建
+            if (null==project.getFlagCivilEngineering()||"".equals(project.getFlagCivilEngineering())){//是否含土建
+                str+="是否含土建填写不能为空;";
+            }else {
                 flag = getJudge(project.getFlagCivilEngineering(),PRO_FLAG_CIVIL);
                 if (flag){
                     str+="是否含土建填写有误;";
                 }
             }
-            if (null!=project.getSteelTubePole()){//钢管杆基础类类型
+            if (null==project.getSteelTubePole()||"".equals(project.getSteelTubePole())){//钢管杆基础类类型
+                str+="钢管杆基础类类型填写不能为空;";
+            }else {
                 flag = getJudge(project.getSteelTubePole(),PRO_STEEL_TUBE);
                 if (flag){
                     str+="钢管杆基础类类型填写有误;";
                 }
             }
-            if (null!=project.getFlagApprovalPlanning()){//是否需要规划报批
+            if (null==project.getFlagApprovalPlanning()||"".equals(project.getFlagApprovalPlanning())){//是否需要规划报批
+                str+="是否需要规划报批填写不能为空;";
+            }else {
                 flag = getJudge(project.getFlagApprovalPlanning(),PRO_FLAG);
                 if (flag){
                     str+="是否需要规划报批填写有误;";
                 }
             }
-            if (null!=project.getEquCreateType()){//设备改造类型
+            if (null==project.getEquCreateType()||"".equals(project.getEquCreateType())){//设备改造类型
+                str+="设备改造类型填写有误;";
+            }else {
                 flag = getJudge(project.getEquCreateType(),PRO_EQU_TYPE);
                 if (flag){
                     str+="设备改造类型填写有误;";
+                }else {
+                    if (project.getEquCreateType().equals("无")){
+                        if (null == project.getEquCreateSize() || "".equals(project.getEquCreateSize())){
+                            str+="改造设备尺寸及间隔数不能为空;";
+                        }
+                    }
                 }
             }
-            if (null!=project.getFlagNewEquName()){//是否含新设备命名
+            if (null==project.getFlagNewEquName()||"".equals(project.getFlagNewEquName())){//是否含新设备命名
+                str+="是否含新设备命名填写不能为空;";
+            }else {
                 flag = getJudge(project.getFlagNewEquName(),PRO_FLAG);
                 if (flag){
                     str+="是否含新设备命名填写有误;";
                 }
             }
-            if (null!=project.getIncludeBdzNews()){//是否含变电站新间间隔投运
+            if (null==project.getIncludeBdzNews()||"".equals(project.getIncludeBdzNews())){//是否含变电站新间间隔投运
+                    str+="是否含变电站新间间隔投运填写不能为空;";
+            }else {
                 flag = getJudge(project.getIncludeBdzNews(),PRO_FLAG);
                 if (flag){
                     str+="是否含变电站新间间隔投运填写有误;";
                 }
             }
-            if (null!=project.getFlagNoElectrical()){//是否含非设电电气施工
+            if (null==project.getFlagNoElectrical()||"".equals(project.getFlagNoElectrical())){//是否含非设电电气施工
+                str+="是否含非设电电气施工填写不能为空;";
+            }else {
                 flag = getJudge(project.getFlagNoElectrical(),PRO_FLAG);
                 if (flag){
                     str+="是否含非设电电气施工填写有误;";
                 }
             }
-            if (null!=project.getDrawingsWork()){//图纸标注的带点作业情况
+            if (null==project.getDrawingsWork()||"".equals(project.getDrawingsWork())){//图纸标注的带点作业情况
+                str+="图纸标注的带点作业情况填写不能为空;";
+            }else {
                 flag = getJudge(project.getDrawingsWork(),PRO_DRAWING_WORK);
                 if (flag){
                     str+="图纸标注的带点作业情况填写有误;";
                 }
             }
-            if (null!=project.getFlagAutomation()){//是否含自动化
+            //自动化
+            if (null==project.getFlagAutomation() || "".equals(project.getFlagAutomation())){//是否含自动化
+                    str+="是否含自动化填写不能为空;;";
+            }else {
                 flag = getJudge(project.getFlagAutomation(),PRO_FLAG);
                 if (flag){
                     str+="是否含自动化填写有误;";
+                }else {
+                    if (project.getFlagAutomation().equals("是")){
+                        //二遥或三摇
+                        if (null == project.getTwoAndThreeRemote()|| "".equals(project.getTwoAndThreeRemote())){
+                            str+="二摇或三摇填写不能为空;";
+                        }else {
+                            flag = getJudge(project.getTwoAndThreeRemote(),PRO_TWO_THREE);
+                            if (flag){
+                                str+="二摇或三摇填写有误;";
+                            }
+                        }
+                        //通讯方式
+                        if (null == project.getPhoneStyle() || "".equals(project.getPhoneStyle())){
+                            str+="通讯方式填写有误;";
+                        }else {
+                            flag = getJudge(project.getPhoneStyle(),PRO_PHONE_STYLE);
+                            if (flag){
+                                str+="通信方式填写有误;";
+                            }
+                        }
+                        boolean flag1=true;
+                        //柱开集中或就业地
+                        if (null!=project.getStayOpenArea()){//柱开集中或就业地
+                            flag = getJudge(project.getStayOpenArea(),PRO_STAY_AREA);
+                            if (flag){
+                                str+="柱开集中或就业地填写有误;";
+                            }
+                            flag1 = false;
+                        }
+                        if (null!=project.getRingNetworkCabinet()){//环网柜
+                            flag = getJudge(project.getRingNetworkCabinet(),PRO_RING_NETWORK);
+                            if (flag){
+                                str+="环网柜填写有误;";
+                            }
+                            flag1 = false;
+                        }
+                        if (flag){
+                            str +="柱开和环网柜必填之其中之一;";
+                        }
+                    }
+                }
+            }
+            boolean flag2 = false;
+            if (null!=project.getTwoAndThreeRemote()){
+                if (project.getTwoAndThreeRemote().equals("混合")){
+                    flag2 = true;
+                }
+            }
+            if (null!=project.getPhoneStyle()){
+                if (project.getPhoneStyle().equals("混合")){
+                    flag2 = true;
+                }
+            }
+            if (null!=project.getStayOpenArea()){
+                if (project.getStayOpenArea().equals("混合")){
+                    flag2 = true;
+                }
+            }
+            if (null!=project.getRingNetworkCabinet()){
+                if (project.getRingNetworkCabinet().equals("混合")){
+                    flag2 = true;
+                }
+            }
+            if (flag2){
+                if (null==project.getAutomatedRemarks()||"".equals(project.getAutomatedRemarks())){
+                    str+="自动化备注不能为空;";
                 }
             }
-            if (null!=project.getTwoAndThreeRemote()){//二或三
-                flag = getJudge(project.getTwoAndThreeRemote(),PRO_TWO_THREE);
-                if (flag){
-                    str+="二摇或三摇填写有误;";
-                }
-            }
-            if (null!=project.getPhoneStyle()){//通信方式
-                flag = getJudge(project.getPhoneStyle(),PRO_PHONE_STYLE);
-                if (flag){
-                    str+="通信方式填写有误;";
-                }
-            }
-            if (null!=project.getStayOpenArea()){//柱开集中或就业地
-                flag = getJudge(project.getStayOpenArea(),PRO_STAY_AREA);
-                if (flag){
-                    str+="柱开集中或就业地填写有误;";
-                }
-            }
-            if (null!=project.getRingNetworkCabinet()){//环网柜
-                flag = getJudge(project.getRingNetworkCabinet(),PRO_RING_NETWORK);
-                if (flag){
-                    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;
+    }
+
     public static Boolean getJudge(String name,String[] strings){
         boolean flag = true;
         if (null!=name){
@@ -469,6 +565,7 @@ public  class ProExcelInfo {
         }
         return  (machineId+String.format("%015d",hashCodeV));
     }
+
     //进行导入角色筛选 项目经理
     public static List<Project> getSureProjectsManager(List<Project> projects){
         String loginName = UserUtils.getUser().getName();
@@ -483,20 +580,6 @@ public  class ProExcelInfo {
         return projects;
     }
 
-    //进行导入角色筛选
-    public static List<Project> getSureProjects(List<Project> projects){
-        String loginName = UserUtils.getUser().getName();
-        for (int i = 0; i < projects.size(); i++) {
-            if (null!=projects.get(i).getProjectManageRole()){//项目经理角色
-                if (!loginName.equals(projects.get(i).getDistributionEngineering())){
-                    projects.remove(i);
-                    i--;
-                }
-            }
-        }
-        return projects;
-    }
-
     /**
      * @param projectsManager 项目经理操作的集合
      * @param projectList 数据库中查到的集合
@@ -522,6 +605,7 @@ public  class ProExcelInfo {
         return projectsManager;
     }
 
+    //判断导入角色名
     public static String getJudgeRole(User user){
         if (user.getRoleList().size()>1){
             return "3";

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

@@ -111,10 +111,11 @@ public class ProjectController extends BaseController {
 	@RequestMapping(value = "data")
 	public Map<String, Object> data(Project project, HttpServletRequest request, HttpServletResponse response, Model model) {
 		//获取登录名
-		String loginName = UserUtils.getUser().getName();//获取登录名
+		String loginName = UserUtils.getUser().getLoginName();//获取登录名
+		String name = UserUtils.getUser().getName();//获取登录名
 		if (!"admin".equals(loginName)){
 			project.setLoginNameFindStats("1");
-			project.setLoginNameFind(loginName);
+			project.setLoginNameFind(name);
 		}
 		HttpSession session = request.getSession();
 		session.setAttribute("projectEpo",project);
@@ -190,17 +191,15 @@ 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) {
-		model.addAttribute("leave1", project);
-		User userByLoginName = systemService.getUserByLoginName(UserUtils.getUser().getLoginName());
-		String judgeRole = ProExcelInfo.getJudgeRole(userByLoginName);
-		if ("0".equals(judgeRole)){
-			return "modules/sg/managementcenter/project/projectForm";
-		}else if ("3".equals(judgeRole)){
-			return "modules/sg/managementcenter/project/projectForm3";
-		}else {
-			return "modules/sg/managementcenter/project/projectForm2";
+		model.addAttribute("project", project);
+		if (null != project.getId()){
+			if (!project.getStatus().equals("0")||!project.getAcquisitionStatus().equals("0")
+					||!project.getConstructionStatus().equals("0")||project.getEarlyMaterial()!=0
+					||project.getPreConstruction()!=0) {
+				return "modules/sg/managementcenter/project/projectForm1";
+			}
 		}
-
+		return "modules/sg/managementcenter/project/projectForm";
 	}
 
 	/**
@@ -220,62 +219,23 @@ public class ProjectController extends BaseController {
 			j.setMsg(errMsg);
 			return j;
 		}
-		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")){
+		List<Project> list = projectService.findList(project);
+		if (null!=list && list.size()>0){
 			j.setSuccess(false);
-			j.setMsg("操作失败：您还没有操作的权限，如果需要请联系管理员!");
-			return j;
+			j.setMsg("新建失败：需求项目名称已存在");
 		}
-		String loginName = UserUtils.getUser().getLoginName();
-		List<String> allUser = projectService.findAllUser();
-		if ("0".equals(judgeRole)||"3".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{
-				boolean flagUpdate = ProExcelInfo.getFlagUpdate(project);
-				if (flagUpdate){
-					j.setSuccess(false);
-					j.setMsg("修改失败：流程正在发起中");
-					return j;
-				}
-				if (!"".equals(judgeValue)||!project.getDistributionEngineering().equals(loginName)){
-					j.setSuccess(false);
-					j.setMsg("修改失败："+judgeValue+"数据不符合规范");
-					return j;
-				}
-				projectService.saveList(projects);
-				j.setSuccess(true);
-				j.setMsg("修改需求基本信息成功");
-			}
-		}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("修改需求基本信息成功");
-			}
+		List<String> users = projectService.findAllUser();
+		List<Project> arrayLists = new ArrayList<Project>();
+		arrayLists.add(project);
+		String judgeValue = ProExcelInfo.getJudgeValue(arrayLists,users);
+		if (!"".equals(judgeValue)){
+			j.setSuccess(false);
+			j.setMsg("失败："+judgeValue+"数据不符合规范！");
+			return j;
 		}
+		projectService.save(project);
+		j.setSuccess(true);
+		j.setMsg("保存成功");
 		return j;
 	}
 	
@@ -365,7 +325,7 @@ public class ProjectController extends BaseController {
 			j.setSuccess(false);
 			j.setMsg("导出需求基本信息记录失败！失败信息："+e.getMessage());
 		}
-			return j;
+		return j;
     }
 
 	/**
@@ -375,16 +335,11 @@ public class ProjectController extends BaseController {
 	@ResponseBody
 	@RequiresPermissions("sg:managementcenter:project:import")
     @RequestMapping(value = "import")
-   	public AjaxJson importFile(@RequestParam("file")MultipartFile file, HttpServletResponse response, HttpServletRequest request){
+   	public AjaxJson importFile(@RequestParam("file")MultipartFile file, HttpServletResponse response, HttpServletRequest request) throws Exception{
 		AjaxJson j = new AjaxJson();
 		//获取登录名
 		User userByLoginName = systemService.getUserByLoginName(UserUtils.getUser().getLoginName());
 		String judgeRole = ProExcelInfo.getJudgeRole(userByLoginName);
-		if (judgeRole.equals("2")){
-			j.setSuccess(true);
-			j.setMsg("导入失败：您还没有导入的权限，如果需要请联系管理员!");
-			return j;
-		}
 		try {
 			ImportUtil importUtil = new ImportUtil(file, 0, 0);
 			//验证表是否规范
@@ -394,261 +349,25 @@ public class ProjectController extends BaseController {
 				j.setMsg("导入失败：表不符合规范,请修改后再导入");
 				return j;
 			}
-			if (judgeRole.equals("3")){
-				return getProject(j,importUtil);
-			}
-			if (judgeRole.equals("0")){
-				List<Project> projects =ProExcelInfo.getSureProjects(ProExcelInfo.getProjectUtilDistribution(importUtil));
-				List<String> users = projectService.findAllUser();
-				String judgeValue = ProExcelInfo.getJudgeValue(projects,users);
-				if (!"".equals(judgeValue)){
-					j.setSuccess(false);
-					j.setMsg("导入失败："+judgeValue+"数据不符合规范！");
-					return j;
-				}
-				if (null==projects||projects.size()<=0){
-					j.setSuccess(false);
-					j.setMsg("导入失败:无符合数据,请检查后再重新导入.");
-					return j;
-				}
-				projectService.saveList(projects);
-				j.setMsg( "已成功导入 "+projects.size()+" 条项目表单记录");
+			List<Project> projectLists = ProExcelInfo.getSureProjectsManager(ProExcelInfo.getProjectUtil(importUtil));
+			if (null==projectLists||projectLists.size()<=0){
+				j.setSuccess(false);
+				j.setMsg("导入失败:无符合数据,请检查后再重新导入.");
+				return j;
 			}
-			//项目经理操作
-			if (judgeRole.equals("1")){
-				//得到项目经理操作的集合
-				List<Project> projectsManager =ProExcelInfo.getSureProjectsManager(ProExcelInfo.getProjectUtilProjectManager(importUtil));
-				if(null==projectsManager||projectsManager.size()<=0){
-					j.setSuccess(false);
-					j.setMsg("导入失败:无符合数据,请检查后再重新导入.");
-					return j;
-				}
-				//根据项目名称去查找数据库中集合
-				List<Project> projectList = projectService.getListProject(projectsManager);
-				//得到可以导入数据库中集合
-				List<Project> sureManagerProject = ProExcelInfo.getSureManagerProject(projectsManager, projectList);
-				String judgeValue = ProExcelInfo.getJudgeValueManager(sureManagerProject);
-				if (!"".equals(judgeValue)){
-					j.setSuccess(false);
-					j.setMsg("导入失败："+judgeValue+"数据不符合规范！");
-					return j;
-				}
-				if (null!=sureManagerProject && sureManagerProject.size()>0){
-					projectService.saveListManager(sureManagerProject,projectList);
-					j.setMsg( "已成功导入 "+sureManagerProject.size()+" 条项目表单记录");
-				}else {
-					j.setSuccess(false);
-					j.setMsg("导入失败:配网工程专职还没有导入基础数据表.");
-					return j;
-				}
+			List<String> users = projectService.findAllUser();
+			String judgeValue = ProExcelInfo.getJudgeValue(projectLists,users);
+			if (!"".equals(judgeValue)){
+				j.setSuccess(false);
+				j.setMsg("导入失败："+judgeValue+"数据不符合规范！");
+				return j;
 			}
+			projectService.saveList(projectLists);
+			j.setMsg( "已成功导入 "+projectLists.size()+" 条项目表单记录");
 		} catch (Exception e) {
 			j.setSuccess(false);
 			j.setMsg("导入需求基本信息表单失败！失败信息："+e.getMessage());
 		}
 		return j;
     }
-
-	public AjaxJson getProject(AjaxJson j,ImportUtil importUtil){
-		List<Project> projects =ProExcelInfo.getSureProjects(ProExcelInfo.getProjectUtilDistribution(importUtil));
-		List<String> users = projectService.findAllUser();
-		String judgeValue = ProExcelInfo.getJudgeValue(projects,users);
-		if (!"".equals(judgeValue)){
-			j.setSuccess(false);
-			j.setMsg("导入失败："+judgeValue+"数据不符合规范！");
-			return j;
-		}
-		if (null==projects||projects.size()<=0){
-			j.setSuccess(false);
-			j.setMsg("导入失败:无符合数据,请检查后再重新导入.");
-			return j;
-		}
-		projectService.saveList(projects);
-
-		//得到项目经理操作的集合
-		List<Project> projectsManager =ProExcelInfo.getSureProjectsManager(ProExcelInfo.getProjectUtilProjectManager(importUtil));
-		if(null==projectsManager||projectsManager.size()<=0){
-			j.setSuccess(false);
-			j.setMsg("导入失败:无符合数据,请检查后再重新导入.");
-			return j;
-		}
-		//根据项目名称去查找数据库中集合
-		List<Project> projectList = projectService.getListProject(projectsManager);
-		//得到可以导入数据库中集合
-		List<Project> sureManagerProject = ProExcelInfo.getSureManagerProject(projectsManager, projectList);
-		String judgeValue1 = ProExcelInfo.getJudgeValueManager(sureManagerProject);
-		if (!"".equals(judgeValue1)){
-			j.setSuccess(false);
-			j.setMsg("导入失败："+judgeValue+"数据不符合规范！");
-			return j;
-		}
-		if (null!=sureManagerProject && sureManagerProject.size()>0){
-			projectService.saveListManager(sureManagerProject,projectList);
-			j.setMsg( "已成功导入 "+sureManagerProject.size()+" 条项目表单记录");
-		}
-		return j;
-	}
-
-
-//	/**
-//	 * 导入Excel数据
-//		领料单
-//	 */
-//	@ResponseBody
-//	@RequiresPermissions("sg:managementcenter:project:importPicking")
-//	@RequestMapping(value = "importPicking")
-//	public AjaxJson importFileRequisition(@RequestParam("file")MultipartFile file, HttpServletResponse response, HttpServletRequest request){
-//		AjaxJson j = new AjaxJson();
-//		String str = "";//提示
-//		try {
-//			ImportUtil importUtil = new ImportUtil(file, 0, 0);
-//			//读取表格list
-//			List<PickingRequisition> listPickRequisition = PickingInfo.getListPickRequisition(importUtil);
-//			/*
-//				如下3个list是导入操作（得到最终保存数据库的集合）。对领料单进行数据库保存。
-//			 */
-//			List<PickingRequisition> duplicateRemoval = PickingInfo.getDuplicateRemoval(listPickRequisition);//去重集合
-//			if (null==duplicateRemoval || duplicateRemoval.size()<=0){
-//				j.setSuccess(false);
-//				j.setMsg("导入失败：导入表格无数据");
-//				return j;
-//			}
-//			List<PickingRequisition> repeatRequisition = PickingInfo.getRepeatRequisition(duplicateRemoval);//去掉重复的领料单号
-//			List<PickingRequisition> pickingRequisitions = pickingRequisitionService.pickingRequisitions(repeatRequisition);//得到数据库中数据
-//			List<PickingRequisition> sureSavePicking = PickingInfo.getSureSavePicking(pickingRequisitions, repeatRequisition);//参数1：得到数据库集合 参数2：读取表格list
-//			if (null!=sureSavePicking&&sureSavePicking.size()>0){
-//				pickingRequisitionService.saveList(sureSavePicking);
-//			}
-//			//判断该项目已完成首次领料
-//			List<PickingRequisition> judgePicking = PickingInfo.getJudgePicking(listPickRequisition);//获取领料状态
-//			/**
-//			 * 一致的,修改领料状态
-//			 */
-//			//获取需求数量和已出库数量都一致领料单集合
-//			List<PickingRequisition> changePicking = PickingInfo.getChangePicking(judgePicking);
-//			if (null!=changePicking&&changePicking.size()>0){
-//				List<Project> listProjectPicking1 = projectService.findListProjectPicking(changePicking);
-//				for (Project project:listProjectPicking1){
-//					projectService.getUpdateAcquisitionStatus("2",project.getId());
-//				}
-//			}
-//			/*
-//				发送通知方法集合
-//			 */
-//			//获得该项目是否允许领料是否允许领料状态的项目:返回不一致集合
-//			List<PickingRequisition> notifyPickingRequisitions = PickingInfo.getUnifiedPicking(judgePicking);
-//			//去重
-//			List<PickingRequisition> duplicate = PickingInfo.getDuplicateRemoval(notifyPickingRequisitions);
-//			//根据项目定义号去项目表中查找项目信息
-//			List<Project> listProjectPicking = projectService.findListProjectPicking(duplicate);
-//			if (null!=listProjectPicking&&listProjectPicking.size()>0){
-//				//根据项目的id去数据库中查找项目领导审核时间
-//				List<Acquisition> findListDate = pickingRequisitionService.getFindListDate(listProjectPicking);
-//				if (null!=findListDate&&findListDate.size()>0){
-//					List<Acquisition> sureFindListDate = PickingInfo.getSureFindListDate(findListDate);
-//					//得到整合后的list集合（存在项目信息）
-//					List<ProjectAcquisition> listProjectAcquisition = PickingInfo.getListProjectAcquisition(listProjectPicking, sureFindListDate);
-//
-//					//得到和项目表匹配的pickAcquisition的集合同时判断给超过三天的领料做标识
-//					List<PickingRequisition> listSameSetOf = PickingInfo.getListSameSetOf(listProjectAcquisition, listPickRequisition);
-//					if (null!=listSameSetOf&&listSameSetOf.size()>0){
-//						//根据物料编码进行去重
-//						List<PickingRequisition> duplicateRemovalMaterCode = PickingInfo.getDuplicateRemovalMaterCode(listSameSetOf);
-//						//得到库存对应的集合
-//						List<MaterialInventory> byListPicking = materialInventoryService.findByListPicking(duplicateRemovalMaterCode);
-//
-//						//所有缺货未缺货信息的登记
-//						List<PickingRequisition> whetherStock = PickingInfo.getWhetherStock(listSameSetOf, byListPicking);
-//
-//						//得到非缺货信息1的通知
-//						List<OaNotifyMaterial> noStockList = PickingInfo.getNoStock(whetherStock);
-//						//得到缺货信息3的通知（缺货项目信息）
-//						List<OaNotifyMaterial> yesStock2List = PickingInfo.getYesStock2(whetherStock);
-//						//得到缺货信息2的通知
-//						List<OaNotifyMaterial> yesStock1List = PickingInfo.getYesStock1(whetherStock);
-//						//发送通知方法
-//						//非缺货信息1
-//						if (null!=noStockList && noStockList.size()>0){
-//							int count = 0;
-//							List<String> listUserId = PickingInfo.getListUserId(PickingInfo.ALL_USER_ID);
-//							List<String> userId = pickingRequisitionService.findUserId(listUserId);
-//							String stringJoiningTogether = PickingInfo.getStringJoiningTogether(userId);//获取通知人
-//							OaNotify oaNotify = new OaNotify();
-//							oaNotify.setType("5");
-//							oaNotify.setTitle("非缺货信息");//非缺货信息
-////							oaNotify.setContent(noStock);
-//							oaNotify.setContent("请在详情中查看...");
-//							oaNotify.setStatus("1");
-//							oaNotify.setOaNotifyRecordIds(stringJoiningTogether);
-//							oaNotifyService.saveList(oaNotify,noStockList);
-//							List<OaNotifyRecord> list = oaNotify.getOaNotifyRecordList();
-//							for(OaNotifyRecord o : list){
-//								count++;
-//								//发送通知到客户端
-//								ServletContext context = SpringContextHolder
-//										.getBean(ServletContext.class);
-//								new SystemInfoSocketHandler().sendMessageToUser(UserUtils.get(o.getUser().getId()).getLoginName(), "收到一条新通知，请到我的通知查看！");
-//							}
-//							str="已经发送非缺货信息通知;";
-//						}
-//						//非缺货信息2
-//						if (null!=yesStock1List&&yesStock1List.size()>0){
-//							int count = 0;
-//							List<String> listUserId = PickingInfo.getListUserId(PickingInfo.QH_USER_ID);
-//							List<String> userId = pickingRequisitionService.findUserId(listUserId);
-//							String stringJoiningTogether = PickingInfo.getStringJoiningTogether(userId);//获取通知人
-//							OaNotify oaNotify = new OaNotify();
-//							oaNotify.setType("6");
-//							oaNotify.setTitle("缺货信息");
-//							oaNotify.setContent("请在详情中查看...");
-//							oaNotify.setStatus("1");
-//							oaNotify.setOaNotifyRecordIds(stringJoiningTogether);
-//							oaNotifyService.saveList(oaNotify,yesStock1List);
-//							List<OaNotifyRecord> list = oaNotify.getOaNotifyRecordList();
-//							for(OaNotifyRecord o : list){
-//								count++;
-//								//发送通知到客户端
-//								ServletContext context = SpringContextHolder
-//										.getBean(ServletContext.class);
-//								new SystemInfoSocketHandler().sendMessageToUser(UserUtils.get(o.getUser().getId()).getLoginName(), "收到一条新通知，请到我的通知查看！");
-//							}
-//							str+="已经发送缺货信息通知;";
-//						}
-//						//非缺货信息2
-//						if (null!=yesStock2List&&yesStock2List.size()>0){
-//							int count = 0;
-//							List<String> listUserId = PickingInfo.getListUserId(PickingInfo.QH_USER_ID);
-//							List<String> userId = pickingRequisitionService.findUserId(listUserId);
-//							String stringJoiningTogether = PickingInfo.getStringJoiningTogether(userId);//获取通知人
-//							OaNotify oaNotify = new OaNotify();
-//							oaNotify.setType("7");
-//							oaNotify.setTitle("缺货项目信息");
-//							oaNotify.setContent("请在详情中查看...");
-//							oaNotify.setStatus("1");
-//							oaNotify.setOaNotifyRecordIds(stringJoiningTogether);
-//							oaNotifyService.saveList(oaNotify,yesStock2List);
-//							List<OaNotifyRecord> list = oaNotify.getOaNotifyRecordList();
-//							for(OaNotifyRecord o : list){
-//								count++;
-//								//发送通知到客户端
-//								ServletContext context = SpringContextHolder
-//										.getBean(ServletContext.class);
-//								new SystemInfoSocketHandler().sendMessageToUser(UserUtils.get(o.getUser().getId()).getLoginName(), "收到一条新通知，请到我的通知查看！");
-//							}
-//							str+="已经发送缺货项目信息通知;";
-//						}
-//					}
-//
-//				}
-//			}
-//			if (str.length()<=0){
-//				str+="暂无通知！";
-//			}
-//			j.setMsg( "已成功导入 "+listPickRequisition.size()+" 条领料表单记录."+str);
-//		} catch (Exception e) {
-//			j.setSuccess(false);
-//			j.setMsg("导入领料表单失败！失败信息："+e.getMessage());
-//		}
-//		return j;
-//	}
 }

src/main/java/com/jeeplus/modules/sys/web/UserController.java

@@ -375,10 +375,10 @@ public class UserController extends BaseController {
     @RequiresPermissions(value = {"sys:user:add", "sys:user:edit"}, logical = Logical.OR)
     @RequestMapping(value = "checkName")
     public String checkName(String name) {
+        System.out.println(UserUtils.getByUserName(name));
         if (name != null ) {
             User byUserName = UserUtils.getByUserName(name);
-            System.out.println(byUserName.getId());
-            if (null == byUserName.getId() || byUserName.getId()==""){
+            if (null!=byUserName.getId()){
                 return "true";
             }
         }

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

@@ -39,83 +39,103 @@
 </head>
 <body class="bg-white">
 		<form:form id="inputForm" modelAttribute="project" class="form-horizontal">
-		<form:hidden path="id"/>
+		<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"/>
+						<form:input path="requireName"   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:select  path="type" cssClass="form-control">
+							<form:option value="配网资本"/>
+							<form:option value="配网成本"/>
+						</form:select>
+					</td>
+				</tr>
+				<tr>
+					<td class="width-15 active"><label class="">储备编号：</label></td>
+					<td class="width-35">
+						<form:input path="reserveNumber"   htmlEscape="false" class="form-control"/>
 					</td>
 					<td class="width-15 active"><label class="">工程编号：</label></td>
 					<td class="width-35">
-						<form:input path="projectId" htmlEscape="false" class="form-control"/>
+						<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"/>
+						<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"/>
+						<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-15 active"><label class="pull-right"><font color="red">*</font>需求提出单位：</label></td>
 					<td class="width-35">
-						<form:input path="type" htmlEscape="false" class="form-control required"/>
+						<form:select  path="demandUnit" cssClass="form-control">
+							<form:option value="配电运检室"/>
+							<form:option value="经研所"/>
+							<form:option value="新区"/>
+						</form:select>
 					</td>
-					<td class="width-15 active"><label class="pull-right"><font color="red">*</font>需求提出单位：</label></td>
+					<td class="width-15 active"><label class="">变电站名称：</label></td>
 					<td class="width-35">
-						<form:input path="demandUnit" htmlEscape="false"   class="form-control required"/>
+						<form:input path="bdzName"  htmlEscape="false"    class="form-control"/>
 					</td>
 				</tr>
 				<tr>
-					<td class="width-15 active"><label class="">变电站名称：</label></td>
+					<td class="width-15 active"><label class="">线路名称：</label></td>
 					<td class="width-35">
-						<form:input path="bdzName" htmlEscape="false"    class="form-control"/>
+						<form:input path="lineName"  htmlEscape="false"    class="form-control"/>
 					</td>
-					<td class="width-15 active"><label class="">线路名称：</label></td>
+					<td class="width-15 active"><label class=""><font color="red">*</font>配网项目经理：</label></td>
 					<td class="width-35">
-						<form:input path="lineName" htmlEscape="false"    class="form-control"/>
+						<form:input path="projectManageRole"  disabled="disabled" 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-15 active"><label class=""><font color="red">*</font>配网工程专职：</label></td>
 					<td class="width-35">
-						<form:input path="projectManageRole" htmlEscape="false" class="form-control required"/>
+						<form:input path="distributionEngineering"  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="distributionEngineering" htmlEscape="false" class="form-control required"/>
+						<form:input path="distributionMaterials"  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-15 active"><label class=""><font color="red">*</font>配网系统专职：</label></td>
 					<td class="width-35">
-						<form:input path="distributionMaterials" htmlEscape="false" class="form-control required"/>
+						<form:input path="distributionSystem"  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="distributionSystem" htmlEscape="false" class="form-control required"/>
+						<form:input path="distributionPolicy"  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-15 active"><label class=""><font color="red">*</font>项目管理中心领导角色：</label></td>
 					<td class="width-35">
-						<form:input path="distributionPolicy" htmlEscape="false" class="form-control required"/>
+						<form:input path="managementLeader"  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="managementLeader" htmlEscape="false" class="form-control required"/>
+						<form:input path="skillByFull"  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"/>
+						<form:select  path="runUnit" cssClass="form-control">
+							<form:option value="配电新区"/>
+							<form:option value="配电工区"/>
+						</form:select>
 					</td>
 					<td class="width-15 active"><label class=""><font color="red">*</font>运行单位角色：</label></td>
 					<td class="width-35">
@@ -125,92 +145,287 @@
 				<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"/>
+						<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-15 active"><label class=""><font color="red">*</font>施工合同单位：</label></td>
 					<td class="width-35">
-						<form:input path="constructionUnit" htmlEscape="false" class="form-control required"/>
+						<form:input path="constructionContractUnit"  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-15 active"><label class=""><font color="red">*</font>施工合同率：</label></td>
 					<td class="width-35">
-						<form:input path="constructionUnitRole" htmlEscape="false" class="form-control required"/>
+						<form:input path="constructionContractRate"  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="constructionUnitManage" htmlEscape="false" class="form-control required"/>
+						<form:input path="constructionContractSub"  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="constructionUnit"  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="constructionUnitRole"  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="constructionUnitManage"  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="constructionUnitLeader" htmlEscape="false" class="form-control required"/>
+						<form:input path="constructionUnitLeader"  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="constructionSkillByFull" 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"/>
+						<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-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="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"/>
+						<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"/>
+						<form:select  path="clarificaitonType" cssClass="form-control">
+							<form:option value="施工单位自行交底"/>
+							<form:option value="项目经理组织交底"/>
+						</form:select>
+					</td>
+					<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:input path="bulidClassificationResons" htmlEscape="false"    class="form-control"/>
-						</td>
 				</tr>
 				<tr>
 					<td class="width-15 active"><label class="">建设理由：</label></td>
 					<td class="width-35">
-						<form:textarea path="bulbidResons" htmlEscape="false" rows="4"    class="form-control "/>
+						<form:textarea path="bulbidResons"  htmlEscape="false" rows="4"    class="form-control "/>
 					</td>
 					<td class="width-15 active"><label class="">设备基本情况：</label></td>
 					<td class="width-35">
-						<form:input path="asicEquipment" htmlEscape="false"    class="form-control"/>
+						<form:input path="asicEquipment"  htmlEscape="false"    class="form-control"/>
 					</td>
 				</tr>
 				<tr>
 					<td class="width-15 active"><label class="">运行班：</label></td>
 					<td class="width-35">
-						<form:input path="runTheClass" htmlEscape="false"    class="form-control"/>
+						<form:input path="runTheClass"  htmlEscape="false"    class="form-control"/>
 					</td>
-					<td class="width-15 active"><label class="">项目组：</label></td>
+					<td class="width-15 active"><label class="">费用估算：</label></td>
 					<td class="width-35">
-						<form:input path="projectTeam" htmlEscape="false"    class="form-control"/>
+						<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-15 active"><label class="">是否迎风期度夏项目：</label></td>
 					<td class="width-35">
-						<form:input path="costEstimate" htmlEscape="false"    class="form-control number"/>
+						<form:input path="whetherRheUpwind"   htmlEscape="false"    class="form-control"/>
 					</td>
-					<td class="width-15 active"><label class="">是否迎风期度夏项目：</label></td>
+					<td class="width-15 active"><label class="">确定下达时间：</label></td>
 					<td class="width-35">
-						<form:input path="whetherRheUpwind" htmlEscape="false"    class="form-control"/>
+						<form:input path="sureDaDate"  htmlEscape="false"    class="form-control"/>
 					</td>
 				</tr>
 				<tr>
-					<td class="width-15 active"><label class="">确定下达时间：</label></td>
+					<td class="width-15 active"><label class="">备注：</label></td>
 					<td class="width-35">
-						<form:input path="sureDaDate" htmlEscape="false"    class="form-control"/>
+						<form:textarea path="textRemark"  htmlEscape="false" rows="4"    class="form-control "/>
 					</td>
-					<td class="width-15 active"><label class="">备注：</label></td>
+					<td class="width-15 active"><label class="">自动化备注：</label></td>
+					<td class="width-35">
+						<form:input path="automatedRemarks"  htmlEscape="false"    class="form-control"/>
+					</td>
+				</tr>
+				<tr>
+					<td class="width-15 active"><label class="">停电线路：</label></td>
+					<td class="width-35">
+						<form:input path="powerLine" 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="powerScope" 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:select  path="projectType" cssClass="form-control">
+							<form:option value="配变改造"/>
+							<form:option value="配变新增"/>
+							<form:option value="电缆项目"/>
+							<form:option value="杆线项目"/>
+							<form:option value="混合项目"/>
+							<form:option value="纯自动化"/>
+							<form:option value="纯土建"/>
+							<form:option value="井盖维修"/>
+							<form:option value="环网柜更换"/>
+							<form:option value="箱变更换"/>
+							<form:option value="其他特殊类"/>
+						</form:select>
+					</td>
+					<td class="width-15 active"><label class=""><font color="red">*</font>是否为停电打包项目：</label></td>
+					<td class="width-35">
+						<form:select  path="powerFlagPackage" cssClass="form-control">
+							<form:option value="是"/>
+							<form:option value="否"/>
+						</form:select>
+					</td>
+				</tr>
+				<tr>
+					<td class="width-15 active"><label class=""><font color="red">*</font>政处初步判断：</label></td>
+					<td class="width-35">
+						<form:select  path="preliminaryJudgment" cssClass="form-control">
+							<form:option value="行政政处（城区道路）"/>
+							<form:option value="民事政处"/>
+							<form:option value="农村政处"/>
+							<form:option value="无"/>
+						</form:select>
+					</td>
+					<td class="width-15 active"><label class=""><font color="red">*</font>是否含土建（不含钢管杆）：</label></td>
+					<td class="width-35">
+						<form:select  path="flagCivilEngineering" cssClass="form-control">
+							<form:option value="可能有土建"/>
+							<form:option value="无土建"/>
+							<form:option value="含土建"/>
+							<form:option value="纯土建"/>
+						</form:select>
+					</td>
+				</tr>
+				<tr>
+					<td class="width-15 active"><label class=""><font color="red">*</font>钢管杆基础类型：</label></td>
+					<td>
+						<form:select  path="steelTubePole" cssClass="form-control">
+							<form:option value="压桩"/>
+							<form:option value="灌注桩"/>
+							<form:option value="无"/>
+						</form:select>
+					</td>
+					<td class="width-15 active"><label class=""><font color="red">*</font>是否需要规矩报批：</label></td>
+					<td class="width-35">
+						<form:select  path="flagApprovalPlanning" cssClass="form-control">
+							<form:option value="是"/>
+							<form:option value="否"/>
+						</form:select>
+					</td>
+				</tr>
+				<tr>
+					<td class="width-15 active"><label class=""><font color="red">*</font>设备改造类型：</label></td>
+					<td class="width-35">
+						<form:select  path="equCreateType" cssClass="form-control">
+							<form:option value="箱变"/>
+							<form:option value="环网柜"/>
+							<form:option value="分支箱"/>
+							<form:option value="DTU"/>
+							<form:option value="干变"/>
+							<form:option value="其他"/>
+							<form:option value="无"/>
+						</form:select>
+					</td>
+					<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:select  path="flagNewEquName" cssClass="form-control">
+							<form:option value="是"/>
+							<form:option value="否"/>
+						</form:select>
+					</td>
+					<td class="width-15 active"><label class=""><font color="red">*</font>是否含变电站新间格投运：</label></td>
+					<td class="width-35">
+						<form:select  path="includeBdzNews" cssClass="form-control">
+							<form:option value="是"/>
+							<form:option value="否"/>
+						</form:select>
+					</td>
+				</tr>
+				<tr>
+					<td class="width-15 active"><label class=""><font color="red">*</font>是否非涉电电气施工：</label></td>
+					<td class="width-35">
+						<form:select  path="flagNoElectrical" cssClass="form-control">
+							<form:option value="是"/>
+							<form:option value="否"/>
+						</form:select>
+					</td>
+					<td class="width-15 active"><label class=""><font color="red">*</font>图纸标注的带点作业情况：</label></td>
+					<td class="width-35">
+						<form:select  path="drawingsWork" cssClass="form-control">
+							<form:option value="带电作业"/>
+							<form:option value="停电作业"/>
+							<form:option value="未标注"/>
+							<form:option value="非涉电作业"/>
+						</form:select>
+					</td>
+				</tr>
+				<tr>
+					<td class="width-15 active"><label class=""><font color="red">*</font>是否含自动化：</label></td>
+					<td class="width-35">
+						<form:select  path="flagAutomation" cssClass="form-control">
+							<form:option value="是"/>
+							<form:option value="否"/>
+						</form:select>
+					</td>
+					<td class="width-15 active"><label class=""><font color="red">*</font>二遥或三摇：</label></td>
+					<td class="width-35">
+						<form:select  path="twoAndThreeRemote" cssClass="form-control">
+							<form:option value="二遥"/>
+							<form:option value="三摇"/>
+						</form:select>
+					</td>
+				</tr>
+				<tr>
+					<td class="width-15 active"><label class=""><font color="red">*</font>通讯方式：</label></td>
+					<td class="width-35">
+						<form:select  path="phoneStyle" cssClass="form-control">
+							<form:option value="公网"/>
+							<form:option value="专网"/>
+							<form:option value="光圈"/>
+							<form:option value="混合"/>
+						</form:select>
+					</td>
+					<td class="width-15 active"><label class=""><font color="red">*</font>柱开集中或就业地：</label></td>
+					<td class="width-35">
+						<form:select  path="stayOpenArea" cssClass="form-control">
+							<form:option value="集中"/>
+							<form:option value="就地"/>
+							<form:option value="混合"/>
+						</form:select>
+					</td>
+				</tr>
+				<tr>
+					<td class="width-15 active"><label class=""><font color="red">*</font>环网柜：</label></td>
+					<td class="width-35">
+						<form:select  path="ringNetworkCabinet" cssClass="form-control">
+							<form:option value="户内"/>
+							<form:option value="户外"/>
+							<form:option value="混合"/>
+						</form:select>
+					</td>
+					<td class="width-15 active"><label class="">站房dtu：</label></td>
 					<td class="width-35">
-						<form:textarea path="textRemark" htmlEscape="false" rows="4"    class="form-control "/>
+						<form:input path="stationDtu" htmlEscape="false"    class="form-control"/>
 					</td>
 				</tr>
 			</tbody>

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

@@ -47,169 +47,199 @@
 					<td class="width-35">
 						<form:input path="requireName" readonly="true"  htmlEscape="false"    class="form-control required"/>
 					</td>
-					<td class="width-15 active"><label class="">工程编号：</label></td>
+					<td class="width-15 active"><label class=""><font color="red">*</font>类型：</label></td>
 					<td class="width-35">
-						<form:input path="projectId"  readonly="true"  htmlEscape="false" class="form-control"/>
+						<form:input path="type" readonly="true"  htmlEscape="false"    class="form-control required"/>
 					</td>
 				</tr>
 				<tr>
-					<td class="width-15 active"><label class="">项目名称：</label></td>
+					<td class="width-15 active"><label class="">储备编号：</label></td>
 					<td class="width-35">
-						<form:input path="projectName" readonly="true" htmlEscape="false"    class="form-control"/>
+						<form:input path="reserveNumber" readonly="true"  htmlEscape="false" class="form-control"/>
 					</td>
-					<td class="width-15 active"><label class="">项目定义号：</label></td>
+					<td class="width-15 active"><label class="">工程编号：</label></td>
 					<td class="width-35">
-						<form:input path="projectNumber" readonly="true" htmlEscape="false" class="form-control"/>
+						<form:input path="projectId" readonly="true"  htmlEscape="false" class="form-control"/>
 					</td>
 				</tr>
 				<tr>
-					<td class="width-15 active"><label class=""><font color="red">*</font>类型：</label></td>
+					<td class="width-15 active"><label class="">项目名称：</label></td>
 					<td class="width-35">
-						<form:input path="type" readonly="true" htmlEscape="false" class="form-control required"/>
+						<form:input path="projectName" readonly="true"  htmlEscape="false"    class="form-control"/>
 					</td>
-					<td class="width-15 active"><label class="pull-right"><font color="red">*</font>需求提出单位：</label></td>
+					<td class="width-15 active"><label class="">项目定义号：</label></td>
 					<td class="width-35">
-						<form:input path="demandUnit" readonly="true" htmlEscape="false"   class="form-control required"/>
+						<form:input path="projectNumber" readonly="true"  htmlEscape="false" class="form-control"/>
 					</td>
 				</tr>
 				<tr>
+					<td class="width-15 active"><label class="pull-right"><font color="red">*</font>需求提出单位：</label></td>
+					<td class="width-35">
+						<form:input path="demandUnit" readonly="true"  htmlEscape="false"    class="form-control required"/>
+					</td>
 					<td class="width-15 active"><label class="">变电站名称：</label></td>
 					<td class="width-35">
 						<form:input path="bdzName" readonly="true" htmlEscape="false"    class="form-control"/>
 					</td>
+				</tr>
+				<tr>
 					<td class="width-15 active"><label class="">线路名称：</label></td>
 					<td class="width-35">
-						<form:input path="lineName" readonly="true" htmlEscape="false"    class="form-control"/>
+						<form:input path="lineName" readonly="true"  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="projectManageRole" readonly="true"  disabled="disabled" 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-15 active"><label class=""><font color="red">*</font>配网工程专职：</label></td>
 					<td class="width-35">
-						<form:input path="projectManageRole" readonly="true" disabled="disabled" htmlEscape="false" class="form-control required "/>
+						<form:input path="distributionEngineering" readonly="true"  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="distributionEngineering" readonly="true" htmlEscape="false" class="form-control required"/>
+						<form:input path="distributionMaterials" readonly="true"  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-15 active"><label class=""><font color="red">*</font>配网系统专职：</label></td>
 					<td class="width-35">
-						<form:input path="distributionMaterials" readonly="true" htmlEscape="false" class="form-control required"/>
+						<form:input path="distributionSystem" readonly="true"  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="distributionSystem" readonly="true" htmlEscape="false" class="form-control required"/>
+						<form:input path="distributionPolicy"  readonly="true" 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-15 active"><label class=""><font color="red">*</font>项目管理中心领导角色：</label></td>
 					<td class="width-35">
-						<form:input path="distributionPolicy" readonly="true" htmlEscape="false" class="form-control required"/>
+						<form:input path="managementLeader"  readonly="true" 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="managementLeader" readonly="true" htmlEscape="false" class="form-control required"/>
+						<form:input path="skillByFull" readonly="true"  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" readonly="true" htmlEscape="false" class="form-control required"/>
+						<form:input path="runUnit" readonly="true"  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" readonly="true" htmlEscape="false" class="form-control required"/>
+						<form:input path="runUnitRole" readonly="true"  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"  readonly="true" htmlEscape="false" class="form-control required"/>
+						<form:input path="throughResearchRole" readonly="true"   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="constructionUnit" readonly="true" htmlEscape="false" class="form-control required"/>
+						<form:input path="constructionContractUnit" readonly="true"   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-15 active"><label class=""><font color="red">*</font>施工合同率：</label></td>
 					<td class="width-35">
-						<form:input path="constructionUnitRole" readonly="true" htmlEscape="false" class="form-control required"/>
+						<form:input path="constructionContractRate"  readonly="true"  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="constructionUnitManage" readonly="true" htmlEscape="false" class="form-control required"/>
+						<form:input path="constructionContractSub" readonly="true"   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="constructionUnit" readonly="true"   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="constructionUnitRole" readonly="true"   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="constructionUnitManage" readonly="true"   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="constructionUnitLeader" readonly="true" htmlEscape="false" class="form-control required"/>
+						<form:input path="constructionUnitLeader" readonly="true"   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="constructionSkillByFull" readonly="true"  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" readonly="true" class="form-control required"/>
+						<form:input path="designUnit" htmlEscape="false" readonly="true"   class="form-control required"/>
 					</td>
 				</tr>
 				<tr>
-					<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="designUnitManage" htmlEscape="false" readonly="true" class="form-control required"/>
+						<form:input path="designUnitManage" htmlEscape="false" readonly="true"  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" readonly="true" htmlEscape="false" class="form-control required"/>
+						<form:input path="designUnitLeader"  htmlEscape="false" readonly="true"  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" readonly="true" htmlEscape="false" class="form-control required"/>
+						<form:input path="clarificaitonType"  htmlEscape="false" readonly="true"  class="form-control required"/>
 					</td>
 					<td class="width-15 active"><label class="">建设理由分类：</label></td>
 					<td class="width-35">
-						<form:input path="bulidClassificationResons" readonly="true" htmlEscape="false"    class="form-control"/>
+						<form:input path="bulidClassificationResons" htmlEscape="false"    class="form-control"/>
 					</td>
 				</tr>
 				<tr>
 					<td class="width-15 active"><label class="">建设理由：</label></td>
 					<td class="width-35">
-						<form:textarea path="bulbidResons" readonly="true" htmlEscape="false" rows="4"    class="form-control "/>
+						<form:textarea path="bulbidResons"  htmlEscape="false" rows="4"    class="form-control "/>
 					</td>
 					<td class="width-15 active"><label class="">设备基本情况：</label></td>
 					<td class="width-35">
-						<form:input path="asicEquipment" readonly="true" htmlEscape="false"    class="form-control"/>
+						<form:input path="asicEquipment"  htmlEscape="false"    class="form-control"/>
 					</td>
 				</tr>
 				<tr>
 					<td class="width-15 active"><label class="">运行班：</label></td>
 					<td class="width-35">
-						<form:input path="runTheClass" readonly="true" htmlEscape="false"    class="form-control"/>
+						<form:input path="runTheClass"  htmlEscape="false"    class="form-control"/>
 					</td>
-					<td class="width-15 active"><label class="">项目组：</label></td>
+					<td class="width-15 active"><label class="">费用估算：</label></td>
 					<td class="width-35">
-						<form:input path="projectTeam" readonly="true" htmlEscape="false"    class="form-control"/>
+						<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-15 active"><label class="">是否迎风期度夏项目：</label></td>
 					<td class="width-35">
-						<form:input path="costEstimate" readonly="true" htmlEscape="false"    class="form-control number"/>
+						<form:input path="whetherRheUpwind"   htmlEscape="false"    class="form-control"/>
 					</td>
-					<td class="width-15 active"><label class="">是否迎风期度夏项目：</label></td>
+					<td class="width-15 active"><label class="">确定下达时间：</label></td>
 					<td class="width-35">
-						<form:input path="whetherRheUpwind" readonly="true"  htmlEscape="false"    class="form-control"/>
+						<form:input path="sureDaDate"  htmlEscape="false"    class="form-control"/>
 					</td>
 				</tr>
 				<tr>
-					<td class="width-15 active"><label class="">确定下达时间：</label></td>
+					<td class="width-15 active"><label class="">备注：</label></td>
 					<td class="width-35">
-						<form:input path="sureDaDate" readonly="true" htmlEscape="false"    class="form-control"/>
+						<form:textarea path="textRemark"  htmlEscape="false" rows="4"    class="form-control "/>
 					</td>
-					<td class="width-15 active"><label class="">备注：</label></td>
+					<td class="width-15 active"><label class="">自动化备注：</label></td>
 					<td class="width-35">
-						<form:textarea path="textRemark" readonly="true" htmlEscape="false" rows="4"    class="form-control "/>
+						<form:input path="automatedRemarks"  htmlEscape="false"    class="form-control"/>
 					</td>
 				</tr>
 				<tr>
@@ -225,37 +255,77 @@
 				<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"/>
+						<form:select  path="projectType" cssClass="form-control">
+							<form:option value="配变改造"/>
+							<form:option value="配变新增"/>
+							<form:option value="电缆项目"/>
+							<form:option value="杆线项目"/>
+							<form:option value="混合项目"/>
+							<form:option value="纯自动化"/>
+							<form:option value="纯土建"/>
+							<form:option value="井盖维修"/>
+							<form:option value="环网柜更换"/>
+							<form:option value="箱变更换"/>
+							<form:option value="其他特殊类"/>
+						</form:select>
 					</td>
 					<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"/>
+						<form:select  path="powerFlagPackage" cssClass="form-control">
+							<form:option value="是"/>
+							<form:option value="否"/>
+						</form:select>
 					</td>
 				</tr>
 				<tr>
 					<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"/>
+						<form:select  path="preliminaryJudgment" cssClass="form-control">
+							<form:option value="行政政处（城区道路）"/>
+							<form:option value="民事政处"/>
+							<form:option value="农村政处"/>
+							<form:option value="无"/>
+						</form:select>
 					</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:select  path="flagCivilEngineering" cssClass="form-control">
+							<form:option value="可能有土建"/>
+							<form:option value="无土建"/>
+							<form:option value="含土建"/>
+							<form:option value="纯土建"/>
+						</form:select>
 					</td>
 				</tr>
 				<tr>
 					<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>
+						<form:select  path="steelTubePole" cssClass="form-control">
+							<form:option value="压桩"/>
+							<form:option value="灌注桩"/>
+							<form:option value="无"/>
+						</form:select>
 					</td>
 					<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"/>
+						<form:select  path="flagApprovalPlanning" cssClass="form-control">
+							<form:option value="是"/>
+							<form:option value="否"/>
+						</form:select>
 					</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"/>
+						<form:select  path="equCreateType" cssClass="form-control">
+							<form:option value="箱变"/>
+							<form:option value="环网柜"/>
+							<form:option value="分支箱"/>
+							<form:option value="DTU"/>
+							<form:option value="干变"/>
+							<form:option value="其他"/>
+							<form:option value="无"/>
+						</form:select>
 					</td>
 					<td class="width-15 active"><label class="">改造设备尺寸及间隔数：</label></td>
 					<td class="width-35">
@@ -265,47 +335,80 @@
 				<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"/>
+						<form:select  path="flagNewEquName" cssClass="form-control">
+							<form:option value="是"/>
+							<form:option value="否"/>
+						</form:select>
 					</td>
 					<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"/>
+						<form:select  path="includeBdzNews" cssClass="form-control">
+							<form:option value="是"/>
+							<form:option value="否"/>
+						</form:select>
 					</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"/>
+						<form:select  path="flagNoElectrical" cssClass="form-control">
+							<form:option value="是"/>
+							<form:option value="否"/>
+						</form:select>
 					</td>
 					<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"/>
+						<form:select  path="drawingsWork" cssClass="form-control">
+							<form:option value="带电作业"/>
+							<form:option value="停电作业"/>
+							<form:option value="未标注"/>
+							<form:option value="非涉电作业"/>
+						</form:select>
 					</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"/>
+						<form:select  path="flagAutomation" cssClass="form-control">
+							<form:option value="是"/>
+							<form:option value="否"/>
+						</form:select>
 					</td>
 					<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"/>
+						<form:select  path="twoAndThreeRemote" cssClass="form-control">
+							<form:option value="二遥"/>
+							<form:option value="三摇"/>
+						</form:select>
 					</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"/>
+						<form:select  path="phoneStyle" cssClass="form-control">
+							<form:option value="公网"/>
+							<form:option value="专网"/>
+							<form:option value="光圈"/>
+							<form:option value="混合"/>
+						</form:select>
 					</td>
 					<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"/>
+						<form:select  path="stayOpenArea" cssClass="form-control">
+							<form:option value="集中"/>
+							<form:option value="就地"/>
+							<form:option value="混合"/>
+						</form:select>
 					</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"/>
+						<form:select  path="ringNetworkCabinet" cssClass="form-control">
+							<form:option value="户内"/>
+							<form:option value="户外"/>
+							<form:option value="混合"/>
+						</form:select>
 					</td>
 					<td class="width-15 active"><label class="">站房dtu：</label></td>
 					<td class="width-35">

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

@@ -1,319 +0,0 @@
-<%@ 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"  disabled="disabled" 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"><label class="">建设理由分类：</label></td>
-					<td class="width-35">
-						<form:input path="bulidClassificationResons" htmlEscape="false"    class="form-control"/>
-					</td>
-				</tr>
-				<tr>
-					<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>
-					<td class="width-15 active"><label class="">设备基本情况：</label></td>
-					<td class="width-35">
-						<form:input path="asicEquipment"  htmlEscape="false"    class="form-control"/>
-					</td>
-				</tr>
-				<tr>
-					<td class="width-15 active"><label class="">运行班：</label></td>
-					<td class="width-35">
-						<form:input path="runTheClass"  htmlEscape="false"    class="form-control"/>
-					</td>
-					<td class="width-15 active"><label class="">项目组：</label></td>
-					<td class="width-35">
-						<form:input path="projectTeam"  htmlEscape="false"    class="form-control"/>
-					</td>
-				</tr>
-				<tr>
-					<td class="width-15 active"><label class="">费用估算：</label></td>
-					<td class="width-35">
-						<form:input path="costEstimate"  htmlEscape="false"    class="form-control number"/>
-					</td>
-					<td class="width-15 active"><label class="">是否迎风期度夏项目：</label></td>
-					<td class="width-35">
-						<form:input path="whetherRheUpwind"   htmlEscape="false"    class="form-control"/>
-					</td>
-				</tr>
-				<tr>
-					<td class="width-15 active"><label class="">确定下达时间：</label></td>
-					<td class="width-35">
-						<form:input path="sureDaDate"  htmlEscape="false"    class="form-control"/>
-					</td>
-					<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>
-				</tr>
-				<tr>
-					<td class="width-15 active"><label class="">停电线路：</label></td>
-					<td class="width-35">
-						<form:input path="powerLine" 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="powerScope" 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="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="powerFlagPackage" 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="preliminaryJudgment" 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="flagCivilEngineering" 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="steelTubePole" 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="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>
-					<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>
-					<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>
-					<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>
-					<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>
-					<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>
-					<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>

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

@@ -113,6 +113,12 @@ $(document).ready(function() {
 
                    }
                    ,{
+                       field: 'reserveNumber',
+                       title: '储备编号',
+                       width:110
+
+                   }
+                   ,{
                        field: 'projectId',
                        title: '工程编号',
                        width:110
@@ -125,7 +131,7 @@ $(document).ready(function() {
                    }
                    ,{
                        field: 'projectManageRole',
-                       title: '项目经理角色',
+                       title: '配网项目经理',
                        width:110
                    }
                    ,{
@@ -182,13 +188,23 @@ $(document).ready(function() {
                        width:150
                    }
                    ,{
+                       field: 'skillByFull',
+                       title: '项目管理中心技经专职',
+                       width:150
+                   }
+                   ,{
                        field: 'runUnit',
                        title: '运行单位',
                        width:90
                    }
                    ,{
                        field: 'runUnitRole',
-                       title: '运行单位角色',
+                       title: '运行单位储备专职',
+                       width:150
+                   }
+                   ,{
+                       field: 'runUnitInspectionRole',
+                       title: '运行单位运检专职',
                        width:100
                    }
                    ,{
@@ -197,13 +213,28 @@ $(document).ready(function() {
                        width:90
                    }
                    ,{
+                       field: 'constructionContractUnit',
+                       title: '施工合同单位',
+                       width:110
+                   }
+                   ,{
+                       field: 'constructionContractRate',
+                       title: '施工合同率',
+                       width:110
+                   }
+                   ,{
+                       field: 'constructionContractSub',
+                       title: '施工分包单位',
+                       width:110
+                   }
+                   ,{
                        field: 'constructionUnit',
                        title: '施工单位',
                        width:120
                    }
                    ,{
                        field: 'constructionUnitRole',
-                       title: '施工单位角色',
+                       title: '施工单位物资专职',
                        width:110
                    }
                    ,{
@@ -217,13 +248,18 @@ $(document).ready(function() {
                        width:110
                    }
                    ,{
+                       field: 'constructionSkillByFull',
+                       title: '施工单位技经专职',
+                       width:130
+                   }
+                   ,{
                        field: 'designUnit',
                        title: '设计单位',
                        width:110
                    }
                    ,{
                        field: 'designUnitManage',
-                       title: '设计单位项目经理',
+                       title: '设计单位设计人员',
                        width:130
                    }
                    ,{
@@ -262,12 +298,6 @@ $(document).ready(function() {
 
                    }
                    ,{
-                       field: 'projectTeam',
-                       title: '项目组',
-                       width:100
-
-                   }
-                   ,{
                        field: 'costEstimate',
                        title: '费用估算',
                        width:100
@@ -383,7 +413,12 @@ $(document).ready(function() {
                    }
                    ,{
                        field: 'ringNetworkCabinet',
-                       title: '环网柜',
+                       title: '环网柜DTU户内或户外',
+                       width:150
+                   }
+                   ,{
+                       field: 'automatedRemarks',
+                       title: '自动化备注',
                        width:120
                    }
                    ,{

src/main/webapp/webpage/modules/sys/user/userForm.jsp

@@ -69,7 +69,7 @@
 		      <tr>
 		         <td class="active"><label class="pull-right"><font color="red">*</font>姓名:</label></td>
 		         <td>
-					 <form:input path="name" htmlEscape="false" maxlength="50" class="form-control required "/></td>
+					 <form:input path="name" htmlEscape="false" maxlength="50" class="form-control required"/></td>
 		         <td class="active"><label class="pull-right"><font color="red">*</font>登录名:</label></td>
 		         <td><input id="oldLoginName" type="hidden" name="oldLoginName" value="${user.loginName}">
 					 <form:input path="loginName" htmlEscape="false" maxlength="50" class="form-control required userName"/></td>