20131112

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

@@ -9,7 +9,15 @@ public class Project extends DataEntity<Project> {
     private String demandUnit;//需求提出单位
     private String bdzName;//变电站名称
     private String lineName;//线路名称
-    private String requireName;//项目需求名称
+    private String requireName;//需求项目名称
+
+    private String projectId;//工程编号
+    private String projectName;//项目名称
+    private String projectNumber;//项目定义号
+    private String projectManageRole;//项目经理角色
+    private String constructionUnit;//施工单位
+    private String constructionUnitRole;//施工单位角色
+    private String clarificaitonType;//交底类型
     private String bulidClassificationResons;//建设理由分类
     private String bulbidResons;//建设理由
     private String asicEquipment;//设备基本情况
@@ -19,12 +27,28 @@ public class Project extends DataEntity<Project> {
     private String whetherRheUpwind;//是否迎风期度夏项目
     private String sureDaDate;//确定下达时间
     private String textRemark;//备注
-    private String status;
-
-    public String getStatus() {
-        return status;
-    }
 
+    private String powerLine;//停电线路
+    private String powerScope;//停电范围
+    private String projectType;//项目类型
+    private String powerFlagPackage;//是否为停电打包项目
+    private String preliminaryJudgment;//证处初步判断
+    private String flagCivilEngineering;//是否含土建（不含钢管杆）
+    private String steelTubePole;//钢管杆基础类型
+    private String flagApprovalPlanning;//是否需要规矩报批
+    private String equCreateType;//设备改造类型
+    private String equCreateSize;//改造设备尺寸及间隔数
+    private String flagNewEquName;//是否新设备命名
+    private String includeBdzNews;//是否含变电站新闻格投运
+    private String flagNoElectrical;//是否非涉电电气施工
+    private String drawingsWork;//图纸标注的带点作业情况
+    private String flagAutomation;//是否含自动化
+    private String twoAndThreeRemote;//二或三
+    private String phoneStyle;//通信方式
+    private String stayOpenArea;//柱开集中或就业地
+    private String ringNetworkCabinet;//环网柜
+    private String stationDtu;//站房dtu
+    private String status;
     public void setStatus(String status) {
         this.status = status;
     }
@@ -36,7 +60,8 @@ public class Project extends DataEntity<Project> {
     public void setType(String type) {
         this.type = type;
     }
-    @ExcelField(title="需求提出单位", align=2, sort=1)
+
+    @ExcelField(title="需求提出单位", align=2, sort=2)
     public String getDemandUnit() {
         return demandUnit;
     }
@@ -44,7 +69,7 @@ public class Project extends DataEntity<Project> {
     public void setDemandUnit(String demandUnit) {
         this.demandUnit = demandUnit;
     }
-    @ExcelField(title="变电站名称", align=2, sort=1)
+    @ExcelField(title="变电站名称", align=2, sort=3)
     public String getBdzName() {
         return bdzName;
     }
@@ -52,7 +77,7 @@ public class Project extends DataEntity<Project> {
     public void setBdzName(String bdzName) {
         this.bdzName = bdzName;
     }
-    @ExcelField(title="线路名称", align=2, sort=1)
+    @ExcelField(title="线路名称", align=2, sort=4)
     public String getLineName() {
         return lineName;
     }
@@ -60,15 +85,72 @@ public class Project extends DataEntity<Project> {
     public void setLineName(String lineName) {
         this.lineName = lineName;
     }
-    @ExcelField(title="项目需求名称", align=2, sort=1)
+    @ExcelField(title="项目需求名称", align=2, sort=5)
     public String getRequireName() {
         return requireName;
     }
 
+    @ExcelField(title="工程编号", align=2, sort=6)
+    public String getProjectId() {
+        return projectId;
+    }
+
+    public void setProjectId(String projectId) {
+        this.projectId = projectId;
+    }
+    @ExcelField(title="项目名称", align=2, sort=7)
+    public String getProjectName() {
+        return projectName;
+    }
+
+    public void setProjectName(String projectName) {
+        this.projectName = projectName;
+    }
+    @ExcelField(title="项目定义号", align=2, sort=8)
+    public String getProjectNumber() {
+        return projectNumber;
+    }
+
+    public void setProjectNumber(String projectNumber) {
+        this.projectNumber = projectNumber;
+    }
+    @ExcelField(title="项目经理角色", align=2, sort=9)
+    public String getProjectManageRole() {
+        return projectManageRole;
+    }
+
+    public void setProjectManageRole(String projectManageRole) {
+        this.projectManageRole = projectManageRole;
+    }
+    @ExcelField(title="施工单位", align=2, sort=10)
+    public String getConstructionUnit() {
+        return constructionUnit;
+    }
+
+    public void setConstructionUnit(String constructionUnit) {
+        this.constructionUnit = constructionUnit;
+    }
+    @ExcelField(title="施工单位角色", align=2, sort=11)
+    public String getConstructionUnitRole() {
+        return constructionUnitRole;
+    }
+
+    public void setConstructionUnitRole(String constructionUnitRole) {
+        this.constructionUnitRole = constructionUnitRole;
+    }
+    @ExcelField(title="交底类型", align=2, sort=12)
+    public String getClarificaitonType() {
+        return clarificaitonType;
+    }
+
+    public void setClarificaitonType(String clarificaitonType) {
+        this.clarificaitonType = clarificaitonType;
+    }
+
     public void setRequireName(String requireName) {
         this.requireName = requireName;
     }
-    @ExcelField(title="建设理由分类", align=2, sort=1)
+    @ExcelField(title="建设理由分类", align=2, sort=13)
     public String getBulidClassificationResons() {
         return bulidClassificationResons;
     }
@@ -76,7 +158,7 @@ public class Project extends DataEntity<Project> {
     public void setBulidClassificationResons(String bulidClassificationResons) {
         this.bulidClassificationResons = bulidClassificationResons;
     }
-    @ExcelField(title="建设理由", align=2, sort=1)
+    @ExcelField(title="建设理由", align=2, sort=14)
     public String getBulbidResons() {
         return bulbidResons;
     }
@@ -84,7 +166,7 @@ public class Project extends DataEntity<Project> {
     public void setBulbidResons(String bulbidResons) {
         this.bulbidResons = bulbidResons;
     }
-    @ExcelField(title="设备基本情况", align=2, sort=1)
+    @ExcelField(title="设备基本情况", align=2, sort=15)
     public String getAsicEquipment() {
         return asicEquipment;
     }
@@ -92,7 +174,7 @@ public class Project extends DataEntity<Project> {
     public void setAsicEquipment(String asicEquipment) {
         this.asicEquipment = asicEquipment;
     }
-    @ExcelField(title="运行班", align=2, sort=1)
+    @ExcelField(title="运行班", align=2, sort=16)
     public String getRunTheClass() {
         return runTheClass;
     }
@@ -100,7 +182,7 @@ public class Project extends DataEntity<Project> {
     public void setRunTheClass(String runTheClass) {
         this.runTheClass = runTheClass;
     }
-    @ExcelField(title="项目组", align=2, sort=1)
+    @ExcelField(title="项目组", align=2, sort=17)
     public String getProjectTeam() {
         return projectTeam;
     }
@@ -108,7 +190,7 @@ public class Project extends DataEntity<Project> {
     public void setProjectTeam(String projectTeam) {
         this.projectTeam = projectTeam;
     }
-    @ExcelField(title="费用估算", align=2, sort=1)
+    @ExcelField(title="费用估算", align=2, sort=18)
     public Double getCostEstimate() {
         return costEstimate;
     }
@@ -116,7 +198,7 @@ public class Project extends DataEntity<Project> {
     public void setCostEstimate(Double costEstimate) {
         this.costEstimate = costEstimate;
     }
-    @ExcelField(title="是否迎风期度夏项目", align=2, sort=1)
+    @ExcelField(title="是否迎风期度夏项目", align=2, sort=19)
     public String getWhetherRheUpwind() {
         return whetherRheUpwind;
     }
@@ -124,7 +206,7 @@ public class Project extends DataEntity<Project> {
     public void setWhetherRheUpwind(String whetherRheUpwind) {
         this.whetherRheUpwind = whetherRheUpwind;
     }
-    @ExcelField(title="确定下达时间", align=2, sort=1)
+    @ExcelField(title="确定下达时间", align=2, sort=20)
     public String getSureDaDate() {
         return sureDaDate;
     }
@@ -132,71 +214,182 @@ public class Project extends DataEntity<Project> {
     public void setSureDaDate(String sureDaDate) {
         this.sureDaDate = sureDaDate;
     }
-    @ExcelField(title="备注", align=2, sort=1)
+
+    @ExcelField(title="备注", align=2, sort=21)
     public String getTextRemark() {
         return textRemark;
     }
 
+    public static long getSerialVersionUID() {
+        return serialVersionUID;
+    }
+
     public void setTextRemark(String textRemark) {
         this.textRemark = textRemark;
     }
-    //    private String powerLine;//停电线路
-//    private String itemType;//项目类型
-//    private String prowerPagerItem;//是否为停电打包项目
-//    private String officeJudgment;//证处初步判断
-//    private String includedCivil;//是否含土建
-//    private String steelTube;//钢管杆基础类型
-//    private String bulidResons;//是否需要规划报批
-//    private String equipmentModificationType;//设备改造类型
-//    private String changeTheSize;//改造设备尺寸及间隔数
-//    private String canBecustomized;//是否可定制设备
-//    private String newDeviceName;//是否含新设备命名
-//    private String headOperationOf;//是否含变电站新间隔头运
-//    private String nonSetElectrical;//是否含非设电电气点电器施工
-//    private String automationIncluded;//是否含自动化
-//    private String twoOfThree;//二摇或三遥
-//    private String phoneStyle;//通信方式
-//    private String openCentralizedOr;//柱开集中或就地
-//    private String networkCabinet;//环网柜
-//    private String rightrOfWayDtu;//站房DTU
-//    private String checkHomeWork;//是否需要带带你作业查探
-//    private String constructionOfChannel;//施工通道
-//    private String canBexpanded;//设备基础是否可以扩容
-//    private String fieldEquipmentSize;//现场设备尺寸
-//    private String maximumCapacitySize;//最多可狂容尺寸
-//    private String programSecurityRisks;//方案安全隐患
-//    private String constructionImpact;//是否存在低压或同心县等施工影响
-//    private String projectToRepeat;//立项重复
-//    private String beenImplemented;//是否已经实施
-//    private String transformerNoLoad;//变压器无负荷
-//    private String LineConsistency;//线路名称一致性
-//    private String quantityConsistent;//工程量是否一致
-//    private String dryConsistency;//设备开光干好一致性
-//    private String thePlaceType;//证处类型
-//    private String precondition;//前置条件
-//    private String dtuEmplacement;//DTU安放核查
-//    private String dateOfProduction;//核查环网生产日期
-//    private String integrationModule;//二次是否集成模块
-//    private String ptReplaced;//PT是否需要更换
-//    private String overallTransformation;//设备是否有整体改造必要
-
-    @Override
-    public String toString() {
-        return "Project{" +
-                "type='" + type + '\'' +
-                ", demandUnit='" + demandUnit + '\'' +
-                ", bdzName='" + bdzName + '\'' +
-                ", lineName='" + lineName + '\'' +
-                ", requireName='" + requireName + '\'' +
-                ", bulidClassificationResons='" + bulidClassificationResons + '\'' +
-                ", bulbidResons='" + bulbidResons + '\'' +
-                ", asicEquipment='" + asicEquipment + '\'' +
-                ", runTheClass='" + runTheClass + '\'' +
-                ", projectTeam='" + projectTeam + '\'' +
-                ", costEstimate=" + costEstimate +
-                ", whetherRheUpwind='" + whetherRheUpwind + '\'' +
-                ", sureDaDate='" + sureDaDate + '\'' +
-                ", textRemark='" + textRemark + '\'' +
-                '}';
+
+    @ExcelField(title="停电线路", align=2, sort=22)
+    public String getPowerLine() {
+        return powerLine;
+    }
+
+    public void setPowerLine(String powerLine) {
+        this.powerLine = powerLine;
+    }
+    @ExcelField(title="停电范围", align=2, sort=23)
+    public String getPowerScope() {
+        return powerScope;
+    }
+
+    public void setPowerScope(String powerScope) {
+        this.powerScope = powerScope;
+    }
+    @ExcelField(title="项目类型", align=2, sort=24)
+    public String getProjectType() {
+        return projectType;
+    }
+
+    public void setProjectType(String projectType) {
+        this.projectType = projectType;
+    }
+    @ExcelField(title="是否为停电打包项目", align=2, sort=25)
+    public String getPowerFlagPackage() {
+        return powerFlagPackage;
+    }
+
+    public void setPowerFlagPackage(String powerFlagPackage) {
+        this.powerFlagPackage = powerFlagPackage;
+    }
+    @ExcelField(title="证处初步判断", align=2, sort=26)
+    public String getPreliminaryJudgment() {
+        return preliminaryJudgment;
+    }
+
+    public void setPreliminaryJudgment(String preliminaryJudgment) {
+        this.preliminaryJudgment = preliminaryJudgment;
+    }
+    @ExcelField(title="是否含土建（不含钢管杆）", align=2, sort=27)
+    public String getFlagCivilEngineering() {
+        return flagCivilEngineering;
+    }
+
+    public void setFlagCivilEngineering(String flagCivilEngineering) {
+        this.flagCivilEngineering = flagCivilEngineering;
+    }
+    @ExcelField(title="钢管杆基础类型", align=2, sort=28)
+    public String getSteelTubePole() {
+        return steelTubePole;
+    }
+
+    public void setSteelTubePole(String steelTubePole) {
+        this.steelTubePole = steelTubePole;
+    }
+    @ExcelField(title="是否需要规矩报批", align=2, sort=29)
+    public String getFlagApprovalPlanning() {
+        return flagApprovalPlanning;
+    }
+
+    public void setFlagApprovalPlanning(String flagApprovalPlanning) {
+        this.flagApprovalPlanning = flagApprovalPlanning;
+    }
+    @ExcelField(title="设备改造类型", align=2, sort=30)
+    public String getEquCreateType() {
+        return equCreateType;
+    }
+
+    public void setEquCreateType(String equCreateType) {
+        this.equCreateType = equCreateType;
+    }
+    @ExcelField(title="改造设备尺寸及间隔数", align=2, sort=31)
+    public String getEquCreateSize() {
+        return equCreateSize;
+    }
+
+    public void setEquCreateSize(String equCreateSize) {
+        this.equCreateSize = equCreateSize;
+    }
+    @ExcelField(title="是否新设备命名", align=2, sort=32)
+    public String getFlagNewEquName() {
+        return flagNewEquName;
+    }
+
+    public void setFlagNewEquName(String flagNewEquName) {
+        this.flagNewEquName = flagNewEquName;
+    }
+    @ExcelField(title="是否含变电站新闻隔投运", align=2, sort=33)
+    public String getIncludeBdzNews() {
+        return includeBdzNews;
+    }
+
+    public void setIncludeBdzNews(String includeBdzNews) {
+        this.includeBdzNews = includeBdzNews;
+    }
+    @ExcelField(title="是否非涉电电气施工", align=2, sort=34)
+    public String getFlagNoElectrical() {
+        return flagNoElectrical;
+    }
+
+    public void setFlagNoElectrical(String flagNoElectrical) {
+        this.flagNoElectrical = flagNoElectrical;
+    }
+    @ExcelField(title="图纸标注的带点作业情况", align=2, sort=35)
+    public String getDrawingsWork() {
+        return drawingsWork;
+    }
+
+    public void setDrawingsWork(String drawingsWork) {
+        this.drawingsWork = drawingsWork;
+    }
+    @ExcelField(title="是否含自动化", align=2, sort=36)
+    public String getFlagAutomation() {
+        return flagAutomation;
+    }
+
+    public void setFlagAutomation(String flagAutomation) {
+        this.flagAutomation = flagAutomation;
+    }
+    @ExcelField(title="二摇或三摇", align=2, sort=37)
+    public String getTwoAndThreeRemote() {
+        return twoAndThreeRemote;
+    }
+
+    public void setTwoAndThreeRemote(String twoAndThreeRemote) {
+        this.twoAndThreeRemote = twoAndThreeRemote;
+    }
+    @ExcelField(title="通信方式", align=2, sort=38)
+    public String getPhoneStyle() {
+        return phoneStyle;
+    }
+
+    public void setPhoneStyle(String phoneStyle) {
+        this.phoneStyle = phoneStyle;
+    }
+    @ExcelField(title="stayOpenArea", align=2, sort=39)
+    public String getStayOpenArea() {
+        return stayOpenArea;
+    }
+
+    public void setStayOpenArea(String stayOpenArea) {
+        this.stayOpenArea = stayOpenArea;
+    }
+    @ExcelField(title="环网柜", align=2, sort=40)
+    public String getRingNetworkCabinet() {
+        return ringNetworkCabinet;
+    }
+
+    public void setRingNetworkCabinet(String ringNetworkCabinet) {
+        this.ringNetworkCabinet = ringNetworkCabinet;
+    }
+    @ExcelField(title="站房DTU", align=2, sort=41)
+    public String getStationDtu() {
+        return stationDtu;
+    }
+
+    public void setStationDtu(String stationDtu) {
+        this.stationDtu = stationDtu;
+    }
+
+    public String getStatus() {
+        return status;
     }
 }

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

@@ -15,6 +15,13 @@
 		a.bdz_name As "bdzName",
 	  	a.line_name As "lineName",
 	  	a.require_name AS "requireName",
+	  	a.project_id AS "projectId",
+	  	a.project_name AS "projectName",
+	  	a.project_number AS "projectNumber",
+		a.project_manage_role AS "projectManageRole",
+		a.construction_unit AS "constructionUnit",
+		a.construction_unit_role AS "constructionUnitRole",
+		a.clarificaiton_type AS "clarificaitonType",
 		a.build_classification_resons As "bulidClassificationResons",
 		a.bulbid_resons As "bulbidResons",
 		a.asic_equipment AS "asicEquipment",
@@ -22,8 +29,27 @@
 		a.project_team AS "projectTeam",
 		a.cost_estimate As "costEstimate",
 		a.whether_rhe_upwind AS "whetherRheUpwind",
-		a.sure_da_date As "sureDaDate",
-		a.text_remark As "textRemark",
+		a.sure_da_date AS "sureDaDate",
+		a.text_remark AS "textRemark",
+		a.power_line AS "powerLine",
+    	a.power_scope AS "powerScope",
+    	a.project_type AS "projectType",
+        a.power_flag_package AS "powerFlagPackage",
+     	a.preliminary_judgment AS "preliminaryJudgment",
+    	a.flag_civil_engineering AS "flagCivilEngineering",
+    	a.steel_tube_pole AS "steelTubePole",
+    	a.flag_approval_planning AS "flagApprovalPlanning",
+    	a.equ_create_type AS "equCreateType",
+    	a.equ_create_size AS "equCreateSize",
+    	a.flag_new_equ_name AS "flagNewEquName",
+    	a.flag_no_electrical AS "flagNoElectrical",
+		a.drawings_work AS "drawingsWork",
+    	a.flag_automation AS "flagAutomation",
+    	a.two_and_three_remote AS "twoAndThreeRemote",
+    	a.phone_style AS "phoneStyle",
+    	a.stay_open_area AS "stayOpenArea",
+    	a.ring_network_cabinet AS "ringNetworkCabinet",
+    	a.station_dtu AS "stationDtu",
 		a.status As "a.status"
 	</sql>
     
@@ -93,6 +119,13 @@
 			bdz_name,
 			line_name,
 			require_name,
+			project_id,
+			project_name,
+			project_number,
+			project_manage_role,
+			construction_unit,
+			construction_unit_role,
+			clarificaiton_type,
 			build_classification_resons,
 			bulbid_resons,
 			asic_equipment,
@@ -102,6 +135,25 @@
 			whether_rhe_upwind,
 			sure_da_date,
 			text_remark,
+			power_line,
+			power_scope,
+			project_type,
+			power_flag_package,
+			preliminary_judgment,
+			flag_civil_engineering,
+			steel_tube_pole,
+			flag_approval_planning,
+			equ_create_type,
+			equ_create_size,
+			flag_new_equ_name,
+			flag_no_electrical,
+			drawings_work,
+			flag_automation,
+			two_and_three_remote,
+			phone_style,
+			stay_open_area,
+			ring_network_cabinet,
+			station_dtu,
 			status
 		) VALUES (
 			#{id},
@@ -116,6 +168,13 @@
 			#{bdzName},
 			#{lineName},
     		#{requireName},
+    		#{projectId},
+			#{projectName},
+			#{projectNumber},
+			#{projectManageRole},
+			#{constructionUnit},
+			#{constructionUnitRole},
+			#{clarificaitonType},
     		#{bulidClassificationResons},
     		#{bulbidResons},
     		#{asicEquipment},
@@ -125,6 +184,25 @@
     		#{whetherRheUpwind},
     		#{sureDaDate},
     		#{textRemark},
+    		#{powerLine},
+    	 	#{powerScope},
+    	 	#{projectType},
+        	#{powerFlagPackage},
+     	 	#{preliminaryJudgment},
+    	 	#{flagCivilEngineering},
+    	 	#{steelTubePole},
+    	 	#{flagApprovalPlanning},
+    		#{equCreateType},
+    		#{equCreateSize},
+    	 	#{flagNewEquName},
+    		#{flagNoElectrical},
+			#{drawingsWork},
+    	 	#{flagAutomation},
+    	 	#{twoAndThreeRemote},
+     		#{phoneStyle},
+    	 	#{stayOpenArea},
+    	 	#{ringNetworkCabinet},
+    	 	#{stationDtu},
     		#{status}
 		)
 	</insert>

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

@@ -28,16 +28,45 @@ public  class ProExcelInfo {
                 project.setDemandUnit((String)importUtil.getCellValue(row,2));//需求提出单位
                 project.setBdzName((String)importUtil.getCellValue(row,3));//变电站名称
                 project.setLineName((String)importUtil.getCellValue(row,4));//线路名称
-                project.setBulidClassificationResons((String)importUtil.getCellValue(row,6));//建设理由分类
-                project.setBulbidResons((String)importUtil.getCellValue(row,7));//建设理由
-                project.setAsicEquipment((String)importUtil.getCellValue(row,8));//设备基本状况
-                project.setRunTheClass((String)importUtil.getCellValue(row,9));//运行班
-                project.setProjectTeam((String)importUtil.getCellValue(row,10));//项目组
-                costEstimate = (String) importUtil.getCellValue(row,11);
-                project.setCostEstimate(Double.parseDouble(costEstimate));//费用估算
-                project.setWhetherRheUpwind((String)importUtil.getCellValue(row,12));//是否迎风期度夏项目
-                project.setSureDaDate((String)importUtil.getCellValue(row,13));//确定下达时间
-                project.setTextRemark((String)importUtil.getCellValue(row,14));//备注
+                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.setConstructionUnit((String)importUtil.getCellValue(row,10));//施工单位
+                project.setConstructionUnitRole((String)importUtil.getCellValue(row,11));//施工单位角色
+                project.setClarificaitonType((String)importUtil.getCellValue(row,12));//交底类型
+                project.setBulidClassificationResons((String)importUtil.getCellValue(row,13));//建设理由分类
+                project.setBulbidResons((String)importUtil.getCellValue(row,14));//建设理由
+                project.setAsicEquipment((String)importUtil.getCellValue(row,15));//设备基本状况
+                project.setRunTheClass((String)importUtil.getCellValue(row,16));//运行班
+                project.setProjectTeam((String)importUtil.getCellValue(row,17));//项目组
+                costEstimate = (String) importUtil.getCellValue(row,18);
+                if (null!=costEstimate&&!costEstimate.equals("")){
+                    project.setCostEstimate(Double.parseDouble(costEstimate));//费用估算
+                }
+                project.setWhetherRheUpwind((String)importUtil.getCellValue(row,19));//是否迎风期度夏项目
+                project.setSureDaDate((String)importUtil.getCellValue(row,20));//确定下达时间
+                project.setTextRemark((String)importUtil.getCellValue(row,21));//备注
+                project.setPowerLine((String)importUtil.getCellValue(row,22));//停电线路
+                project.setPowerScope((String)importUtil.getCellValue(row,23));//停电范围
+                project.setProjectType((String)importUtil.getCellValue(row,24));//项目类型
+                project.setPowerFlagPackage((String)importUtil.getCellValue(row,25));//是否为停电打包项目
+                project.setPreliminaryJudgment((String)importUtil.getCellValue(row,26));//证处初步判断
+                project.setFlagCivilEngineering((String)importUtil.getCellValue(row,27));//是否含土建
+                project.setSteelTubePole((String)importUtil.getCellValue(row,28));//钢管杆基础类型
+                project.setFlagApprovalPlanning((String)importUtil.getCellValue(row,29));//是否需要规划报批
+                project.setEquCreateType((String)importUtil.getCellValue(row,30));//设备改造类型
+                project.setEquCreateSize((String)importUtil.getCellValue(row,31));//间隔数
+                project.setFlagNewEquName((String)importUtil.getCellValue(row,32));//是否新设备命名
+                project.setIncludeBdzNews((String)importUtil.getCellValue(row,33));//是否含变电站新闻格投运
+                project.setFlagNoElectrical((String)importUtil.getCellValue(row,34));//是否非射电电气施工
+                project.setDrawingsWork((String)importUtil.getCellValue(row,35));//图纸标注的带点作业情况
+                project.setFlagAutomation((String)importUtil.getCellValue(row,36));//是否含自动化
+                project.setTwoAndThreeRemote((String)importUtil.getCellValue(row,37));//二遥或三
+                project.setPhoneStyle((String)importUtil.getCellValue(row,38));//通信方式
+                project.setStayOpenArea((String)importUtil.getCellValue(row,39));//柱开集中或就业地
+                project.setRingNetworkCabinet((String)importUtil.getCellValue(row,40));//环网柜
+                project.setStationDtu((String)importUtil.getCellValue(row,41));//站房dtu
                 project.setStatus("0");
                 list.add(project);
             }

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

@@ -3,6 +3,7 @@
  */
 package com.jeeplus.modules.sg.managementcenter.project.web;
 
+import java.io.IOException;
 import java.util.List;
 import java.util.Map;
 
@@ -14,6 +15,7 @@ import com.jeeplus.modules.sg.managementcenter.project.entity.Project;
 import com.jeeplus.modules.sg.managementcenter.project.service.ProjectService;
 import com.jeeplus.modules.sg.managementcenter.project.util.ImportUtil;
 import com.jeeplus.modules.sg.managementcenter.project.util.ProExcelInfo;
+import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
@@ -175,7 +177,7 @@ public class ProjectController extends BaseController {
 	@ResponseBody
 //	@RequiresPermissions("test:one:dialog:leave1: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){
 		AjaxJson j = new AjaxJson();
 		try {
 			int successNum = 0;
@@ -183,6 +185,9 @@ public class ProjectController extends BaseController {
 			StringBuilder failureMsg = new StringBuilder();
 			ImportUtil importUtil = new ImportUtil(file, 0, 0);
 			List<Project> projects = ProExcelInfo.getProjectUtil(importUtil);
+			for (Project project1:projects){
+				System.out.println(project1);
+			}
 			for (Project project : projects){
 				try{
 					projectService.save(project);

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

@@ -131,12 +131,44 @@ $(document).ready(function() {
                 width:120
 		       
 		    }
-			,{
-		        field: 'bulidClassificationResons',
-		        title: '建设理由分类',
-				width:100
-		       
-		    }
+
+                   ,{
+                       field: 'projectId',
+                       title: '工程编号',
+                       width:120
+
+                   }
+                   ,{
+                       field: 'projectName',
+                       title: '项目名称',
+                       width:120
+                   }
+                   ,{
+                       field: 'projectManageRole',
+                       title: '项目经理角色',
+                       width:120
+                   }
+                   ,{
+                       field: 'constructionUnit',
+                       title: '施工单位',
+                       width:120
+                   }
+                   ,{
+                       field: 'constructionUnitRole',
+                       title: '施工单位角色',
+                       width:160
+                   }
+                   ,{
+                       field: 'clarificaitonType',
+                       title: '交底类型',
+                       width:120
+                   }
+					,{
+						field: 'bulidClassificationResons',
+						title: '建设理由分类',
+						width:160
+
+					}
                    ,{
                        field: 'bulbidResons',
                        title: '建设理由',
@@ -147,7 +179,7 @@ $(document).ready(function() {
                    ,{
                        field: 'asicEquipment',
                        title: '设备基本情况',
-                       width:120
+                       width:160
 
                    }
                    ,{
@@ -185,6 +217,108 @@ $(document).ready(function() {
                        title: '备注',
                        width:120
                    }
+
+                   ,{
+                       field: 'powerLine',
+                       title: '停电线路',
+                       width:120
+                   }
+                   ,{
+                       field: 'powerScope',
+                       title: '停电范围',
+                       width:400
+                   }
+                   ,{
+                       field: 'projectType',
+                       title: '项目类型',
+                       width:300
+                   }
+                   ,{
+                       field: 'powerFlagPackage',
+                       title: '是否为停电打包项目',
+                       width:200
+                   }
+                   ,{
+                       field: 'preliminaryJudgment',
+                       title: '证处初步判断',
+                       width:220
+                   }
+                   ,{
+                       field: 'flagCivilEngineering',
+                       title: '是否含土建（不含钢管杆）',
+                       width:200
+                   }
+                   ,{
+                       field: 'steelTubePole',
+                       title: '钢管杆基础类型',
+                       width:160
+                   }
+                   ,{
+                       field: 'flagApprovalPlanning',
+                       title: '是否需要规矩报批',
+                       width:170
+                   }
+                   ,{
+                       field: 'equCreateType',
+                       title: '设备改造类型',
+                       width:160
+                   }
+                   ,{
+                       field: 'equCreateSize',
+                       title: '改造设备尺寸及间隔数',
+                       width:200
+                   }
+                   ,{
+                       field: 'flagNewEquName',
+                       title: '是否新设备命名',
+                       width:160
+                   }
+                   ,{
+                       field: 'includeBdzNews',
+                       title: '是否含变电站新闻格投运',
+                       width:200
+                   }
+                   ,{
+                       field: 'flagNoElectrical',
+                       title: '是否非涉电电气施工',
+                       width:200
+                   }
+                   ,{
+                       field: 'drawingsWork',
+                       title: '图纸标注的带点作业情况',
+                       width:200
+                   }
+                   ,{
+                       field: 'flagAutomation',
+                       title: '是否含自动化',
+                       width:120
+                   }
+                   ,{
+                       field: 'twoAndThreeRemote',
+                       title: '二摇或三摇',
+                       width:120
+                   }
+                   ,{
+                       field: 'phoneStyle',
+                       title: '通信方式',
+                       width:120
+                   }
+                   ,{
+                       field: 'stayOpenArea',
+                       title: '柱开集中或就业地',
+                       width:160
+                   }
+                   ,{
+                       field: 'ringNetworkCabinet',
+                       title: '环网柜',
+                       width:120
+                   }
+                   ,{
+                       field: 'stationDtu',
+                       title: '站房DTU',
+                       width:120
+                   }
+
 		     ]
 		
 		});