储备管理进度模块增删改查、导入导出功能代码

src/main/java/com/jeeplus/modules/sg/managementcenter/reserveManagement/entity/ReserveManagement.java

@@ -1,6 +1,9 @@
 package com.jeeplus.modules.sg.managementcenter.reserveManagement.entity;
 
+import com.jeeplus.common.utils.SpringContextHolder;
+import com.jeeplus.common.utils.StringUtils;
 import com.jeeplus.core.persistence.DataEntity;
+import org.apache.commons.lang3.math.NumberUtils;
 
 import java.util.Date;
 
@@ -11,76 +14,82 @@ import java.util.Date;
  */
 public class ReserveManagement extends DataEntity<ReserveManagement> {
 
-    private String projectNature;  //varchar(64) NULL 项目性质
-    private String demandUnit;  //varchar(64) NULL 需求单位
-    private String district;  //varchar(64) NULL 区域
-    private String projectGroup;  //varchar(64) NULL 项目分组
-    private String reserveBatches;  //varchar(64) NULL 储备批次
-    private String projectReserveId;  //varchar(64) NOT NULL 项目储备编号
-    private String projectName;  //varchar(64) NULL 项目名称
-    private String constructionNecessityAndContent;  //varchar(64) NULL 建设必要性及内容
-    private String substationName;  //varchar(64) NULL 变电站名称
-    private String circuitName;  //varchar(64) NULL 线路名称
-    private String netRackProjectDivide;  //varchar(64) NULL 网架项目划分
-    private String projectType;  //varchar(64) NULL 项目类型
-    private Double costEstimate;  //double(64,4) NULL 费用估算
-    private Integer whetherWindwardProject;  //tinyint(4) NULL 是否迎峰度夏项目(1：是，0：否 2：取消)
-    private Integer projectUrgencyDegree;  //tinyint(4) NULL  项目紧急程度（不是数字默认为空）
-    private String implementIssuedYear;  //varchar(64) NULL  拟实施下达年份
-    private String implementBatch;  //varchar(64) NULL  拟实施批次
+    private String projectNature;  //varchar(255) NULL 项目性质
+    private String demandUnit;  //varchar(255) NULL 需求单位
+    private String district;  //varchar(255) NULL 区域
+    private String projectGroup;  //varchar(255) NULL 项目分组
+    private String reserveBatches;  //varchar(255) NULL 储备批次
+    private String blockSupply;  //varchar(255) NULL 供电区域
+    private String gridNumber;  //varchar(255) NULL 网格编号
+    private String cellNumber;  //varchar(255) NULL 单元格编号
+    private String projectReserveId;  //varchar(255) NOT NULL 项目储备编号
+    private String powerGridProjectId;  //varchar(255) NOT NULL 电网项目编号
+    private String projectName;  //varchar(255) NULL 项目名称
+    private String constructionNecessityAndContent;  //varchar(255) NULL 建设必要性及内容
+    private String substationName;  //varchar(255) NULL 变电站名称
+    private String circuitName;  //varchar(255) NULL 线路名称
+    private String netRackProjectDivide;  //varchar(255) NULL 网架项目划分
+    private String projectType;  //varchar(255) NULL 项目类型
+    private Double costEstimate;  //double(255,4) NULL 费用估算
+    private String whetherWindwardProject;  //varcjar(64) NULL 是否迎峰度夏项目(1：是，0：否 2：取消)
+    private String projectUrgencyDegree;  //varcjar(64) NULL  项目紧急程度（不是数字默认为空）
+    private String implementIssuedYear;  //varchar(255) NULL  拟实施下达年份
+    private String implementBatch;  //varchar(255) NULL  拟实施批次
     private String basicRemarks;  //varchar(255) NULL  备注
 
-    private Integer designCondition;  //tinyint(4) NULL  设计状态（1：已完成，0：未完成）
-    private Integer whetherPassReview;  //tinyint(4) NULL  是否通过省公司评审（1：已通过，0：未通过）
-    private Integer whetherNeedWiringDiagram;  //tinyint(4) NULL  是否需提交路径图（政处）(1：是，0：否)
-    private Integer whetherFinishMaterials;  //tinyint(4) NULL  是否完成物资清册编制(1：是，0：否)
-    private Integer whetherFinishDrawing;  //tinyint(4) NULL  是否完成图纸移交(1：是，0：否)
-
-    private String disclosureToCoordinate;  //varchar(64) NULL  交底牵头部门
-    private String disclosureParticipate;  //varchar(64) NULL  交底参与部门
-    private Integer whetherFinishDisclosure;  //tinyint(4) NULL  是否完成交底(1：是，0：否)
-    private String projectManagementPeople;  //varchar(64) NULL  项目管理中心人员
-    private String designingInstitutePeople;  //varchar(64) NULL  设计院人员
-    private String ifoPeople;  //varchar(64) NULL  经研所人员
-    private String regionalCenterPeople;  //varchar(64) NULL  区域中心人员
-    private String uninterruptedOperationPeople;  //varchar(64) NULL  不停电作业中心人员
-    private String workMode;  //varchar(64) NULL  作业方式
+    private String designCondition;  //varcjar(64) NULL  设计状态（1：已完成，0：未完成）
+    private String whetherPassReview;  //varcjar(64) NULL  是否通过省公司评审（1：已通过，0：未通过）
+    private String whetherNeedWiringDiagram;  //varcjar(64) NULL  是否需提交路径图（政处）(1：是，0：否)
+    private String whetherFinishMaterials;  //varcjar(64) NULL  是否完成物资清册编制(1：是，0：否)
+    private String whetherFinishDrawing;  //varcjar(64) NULL  是否完成图纸移交(1：是，0：否)
+
+    private String disclosureToCoordinate;  //varchar(255) NULL  交底牵头部门
+    private String disclosureParticipate;  //varchar(255) NULL  交底参与部门
+    private String whetherFinishDisclosure;  //varcjar(64) NULL  是否完成交底(1：是，0：否)
+    private String projectManagementPeople;  //varchar(255) NULL  项目管理中心人员
+    private String designingInstitutePeople;  //varchar(255) NULL  设计院人员
+    private String ifoPeople;  //varchar(255) NULL  经研所人员
+    private String regionalCenterPeople;  //varchar(255) NULL  区域中心人员
+    private String uninterruptedOperationPeople;  //varchar(255) NULL  不停电作业中心人员
+    private String workMode;  //varchar(255) NULL  作业方式
     private Date disclosureFinishDate;  //datetime NULL  交底完成日期
     private String disclosureRemarks;  //varchar(255) NULL  备注
 
     private String projectDescription;  //varchar(255) NULL  立项说明
     private String doNotPossessProjectDescription;  //varchar(255) NULL  不具备立项条件说明
     private String changedProgramsExplain;  //varchar(255) NULL  方案变更说明
-    private String initialDifficulty;  //varchar(64) NULL  政处难度初判
-    private Integer capitalEquipment;  //tinyint(4) NULL  是否有资本设备(1：是，0：否)
-    private Integer substationNewLine;  //tinyint(4) NULL  是否有变电站新出线(1：是，0：否)
-    private Integer whetherImplement;  //tinyint(4) NULL  是否已实施(1：是，0：否)
+    private String initialDifficulty;  //varchar(255) NULL  政处难度初判
+    private String capitalEquipment;  //varcjar(64) NULL  是否有资本设备(1：是，0：否)
+    private String substationNewLine;  //varcjar(64) NULL  是否有变电站新出线(1：是，0：否)
+    private String whetherImplement;  //varcjar(64) NULL  是否已实施(1：是，0：否)
     private String fieldDescription;  //varchar(255) NULL  现场情况描述
-    private Integer necessaryOfImplementation;  //tinyint(4) NULL  是否有实施必要性(1：是，0：否)
+    private String necessaryOfImplementation;  //varcjar(64) NULL  是否有实施必要性(1：是，0：否)
     private String unnecessaryDescription;  //varchar(255) NULL  实施无必要描述
-    private Integer precondition;  //tinyint(4) NULL  是否存在前置条件(1：是，0：否)
+    private String precondition;  //varcjar(64) NULL  是否存在前置条件(1：是，0：否)
     private String conditionsDescribed;  //varchar(255) NULL  前置条件描述
-    private Integer constructionSchemeProblem;  //tinyint(4) NULL  是否存在施工方案问题(1：是，0：否)
+    private String constructionSchemeProblem;  //varcjar(64) NULL  是否存在施工方案问题(1：是，0：否)
     private String problemDescriptionOfConstructionScheme;  //varchar(255) NULL  施工方案问题描述
-    private Integer existingSecurityThreat;  //tinyint(4) NULL  现场是否存在安全隐患(1：是，0：否)
+    private String existingSecurityThreat;  //varcjar(64) NULL  现场是否存在安全隐患(1：是，0：否)
     private String safetyHazardDescription;  //varchar(255) NULL  安全隐患描述
-    private Integer customizedMaterials;  //tinyint(4) NULL  是否需要定制物资(1：是，0：否)
+    private String customizedMaterials;  //varcjar(64) NULL  是否需要定制物资(1：是，0：否)
     private String materialDescription;  //varchar(255) NULL  定制物资描述
-    private Integer dismantlingTheOldMaterial;  //tinyint(4) NULL  是否有拆旧物资(1：是，0：否)
-    private String operatingType;  //varchar(64) NULL  作业方式
+    private String dismantlingTheOldMaterial;  //varcjar(64) NULL  是否有拆旧物资(1：是，0：否)
+    private String operatingType;  //varchar(255) NULL  作业方式
     private String problemDescription;  //varchar(255) NULL  停电问题描述
-    private Integer civilWork;  //tinyint(4) NULL  是否有土建工作量(1：是，0：否)
-    private Integer verticalRodWorkload;  //tinyint(4) NULL  是否有立杆工作量(1：是，0：否)
+    private String civilWork;  //varcjar(64) NULL  是否有土建工作量(1：是，0：否)
+    private String verticalRodWorkload;  //varcjar(64) NULL  是否有立杆工作量(1：是，0：否)
     private String totalWorkloadDescription;  //varchar(255) NULL  总工作量描述
-    private String regionalCenter;  //varchar(64) NULL  区域中心
-    private String powerSupplyArea;  //varchar(64) NULL  供电所辖区
-    private String zhengLocation;  //varchar(64) NULL  政处地点
-    private String zhengType;  //varchar(64) NULL  政处类型（可多类）
-    private String zhengObject;  //varchar(64) NULL  政处对象（产权单位）
+    private String regionalCenter;  //varchar(255) NULL  区域中心
+    private String powerSupplyArea;  //varchar(255) NULL  供电所辖区
+    private String zhengLocation;  //varchar(255) NULL  政处地点
+    private String zhengType;  //varchar(255) NULL  政处类型（可多类）
+    private String zhengObject;  //varchar(255) NULL  政处对象（产权单位）
     private String zhengDescribe;  //varchar(255) NULL  政处描述
-    private Integer projectApproval;  //tinyint(4) NULL  是否需规划报批(1：是，0：否)
-    private Integer courseEvaluationProcedures;  //tinyint(4) NULL  是否需办理安评航评手续(1：是，0：否)
-    private String zhengDifficultyWarn;  //varchar(64) NULL  政处难点提醒
+    private String projectApproval;  //varcjar(64) NULL  是否需规划报批(1：是，0：否)
+    private String courseEvaluationProcedures;  //varcjar(64) NULL  是否需办理安评航评手续(1：是，0：否)
+    private String zhengDifficultyWarn;  //varchar(255) NULL  政处难点提醒
+
+    private String disclosureFinishDateStr;
 
     public String getProjectNature() {
         return projectNature;
@@ -122,6 +131,30 @@ public class ReserveManagement extends DataEntity<ReserveManagement> {
         this.reserveBatches = reserveBatches;
     }
 
+    public String getBlockSupply() {
+        return blockSupply;
+    }
+
+    public void setBlockSupply(String blockSupply) {
+        this.blockSupply = blockSupply;
+    }
+
+    public String getGridNumber() {
+        return gridNumber;
+    }
+
+    public void setGridNumber(String gridNumber) {
+        this.gridNumber = gridNumber;
+    }
+
+    public String getCellNumber() {
+        return cellNumber;
+    }
+
+    public void setCellNumber(String cellNumber) {
+        this.cellNumber = cellNumber;
+    }
+
     public String getProjectReserveId() {
         return projectReserveId;
     }
@@ -130,6 +163,14 @@ public class ReserveManagement extends DataEntity<ReserveManagement> {
         this.projectReserveId = projectReserveId;
     }
 
+    public String getPowerGridProjectId() {
+        return powerGridProjectId;
+    }
+
+    public void setPowerGridProjectId(String powerGridProjectId) {
+        this.powerGridProjectId = powerGridProjectId;
+    }
+
     public String getProjectName() {
         return projectName;
     }
@@ -186,19 +227,19 @@ public class ReserveManagement extends DataEntity<ReserveManagement> {
         this.costEstimate = costEstimate;
     }
 
-    public Integer getWhetherWindwardProject() {
+    public String getWhetherWindwardProject() {
         return whetherWindwardProject;
     }
 
-    public void setWhetherWindwardProject(Integer whetherWindwardProject) {
+    public void setWhetherWindwardProject(String whetherWindwardProject) {
         this.whetherWindwardProject = whetherWindwardProject;
     }
 
-    public Integer getProjectUrgencyDegree() {
+    public String getProjectUrgencyDegree() {
         return projectUrgencyDegree;
     }
 
-    public void setProjectUrgencyDegree(Integer projectUrgencyDegree) {
+    public void setProjectUrgencyDegree(String projectUrgencyDegree) {
         this.projectUrgencyDegree = projectUrgencyDegree;
     }
 
@@ -226,43 +267,43 @@ public class ReserveManagement extends DataEntity<ReserveManagement> {
         this.basicRemarks = basicRemarks;
     }
 
-    public Integer getDesignCondition() {
+    public String getDesignCondition() {
         return designCondition;
     }
 
-    public void setDesignCondition(Integer designCondition) {
+    public void setDesignCondition(String designCondition) {
         this.designCondition = designCondition;
     }
 
-    public Integer getWhetherPassReview() {
+    public String getWhetherPassReview() {
         return whetherPassReview;
     }
 
-    public void setWhetherPassReview(Integer whetherPassReview) {
+    public void setWhetherPassReview(String whetherPassReview) {
         this.whetherPassReview = whetherPassReview;
     }
 
-    public Integer getWhetherNeedWiringDiagram() {
+    public String getWhetherNeedWiringDiagram() {
         return whetherNeedWiringDiagram;
     }
 
-    public void setWhetherNeedWiringDiagram(Integer whetherNeedWiringDiagram) {
+    public void setWhetherNeedWiringDiagram(String whetherNeedWiringDiagram) {
         this.whetherNeedWiringDiagram = whetherNeedWiringDiagram;
     }
 
-    public Integer getWhetherFinishMaterials() {
+    public String getWhetherFinishMaterials() {
         return whetherFinishMaterials;
     }
 
-    public void setWhetherFinishMaterials(Integer whetherFinishMaterials) {
+    public void setWhetherFinishMaterials(String whetherFinishMaterials) {
         this.whetherFinishMaterials = whetherFinishMaterials;
     }
 
-    public Integer getWhetherFinishDrawing() {
+    public String getWhetherFinishDrawing() {
         return whetherFinishDrawing;
     }
 
-    public void setWhetherFinishDrawing(Integer whetherFinishDrawing) {
+    public void setWhetherFinishDrawing(String whetherFinishDrawing) {
         this.whetherFinishDrawing = whetherFinishDrawing;
     }
 
@@ -282,11 +323,11 @@ public class ReserveManagement extends DataEntity<ReserveManagement> {
         this.disclosureParticipate = disclosureParticipate;
     }
 
-    public Integer getWhetherFinishDisclosure() {
+    public String getWhetherFinishDisclosure() {
         return whetherFinishDisclosure;
     }
 
-    public void setWhetherFinishDisclosure(Integer whetherFinishDisclosure) {
+    public void setWhetherFinishDisclosure(String whetherFinishDisclosure) {
         this.whetherFinishDisclosure = whetherFinishDisclosure;
     }
 
@@ -386,27 +427,27 @@ public class ReserveManagement extends DataEntity<ReserveManagement> {
         this.initialDifficulty = initialDifficulty;
     }
 
-    public Integer getCapitalEquipment() {
+    public String getCapitalEquipment() {
         return capitalEquipment;
     }
 
-    public void setCapitalEquipment(Integer capitalEquipment) {
+    public void setCapitalEquipment(String capitalEquipment) {
         this.capitalEquipment = capitalEquipment;
     }
 
-    public Integer getSubstationNewLine() {
+    public String getSubstationNewLine() {
         return substationNewLine;
     }
 
-    public void setSubstationNewLine(Integer substationNewLine) {
+    public void setSubstationNewLine(String substationNewLine) {
         this.substationNewLine = substationNewLine;
     }
 
-    public Integer getWhetherImplement() {
+    public String getWhetherImplement() {
         return whetherImplement;
     }
 
-    public void setWhetherImplement(Integer whetherImplement) {
+    public void setWhetherImplement(String whetherImplement) {
         this.whetherImplement = whetherImplement;
     }
 
@@ -418,11 +459,11 @@ public class ReserveManagement extends DataEntity<ReserveManagement> {
         this.fieldDescription = fieldDescription;
     }
 
-    public Integer getNecessaryOfImplementation() {
+    public String getNecessaryOfImplementation() {
         return necessaryOfImplementation;
     }
 
-    public void setNecessaryOfImplementation(Integer necessaryOfImplementation) {
+    public void setNecessaryOfImplementation(String necessaryOfImplementation) {
         this.necessaryOfImplementation = necessaryOfImplementation;
     }
 
@@ -434,11 +475,11 @@ public class ReserveManagement extends DataEntity<ReserveManagement> {
         this.unnecessaryDescription = unnecessaryDescription;
     }
 
-    public Integer getPrecondition() {
+    public String getPrecondition() {
         return precondition;
     }
 
-    public void setPrecondition(Integer precondition) {
+    public void setPrecondition(String precondition) {
         this.precondition = precondition;
     }
 
@@ -450,11 +491,11 @@ public class ReserveManagement extends DataEntity<ReserveManagement> {
         this.conditionsDescribed = conditionsDescribed;
     }
 
-    public Integer getConstructionSchemeProblem() {
+    public String getConstructionSchemeProblem() {
         return constructionSchemeProblem;
     }
 
-    public void setConstructionSchemeProblem(Integer constructionSchemeProblem) {
+    public void setConstructionSchemeProblem(String constructionSchemeProblem) {
         this.constructionSchemeProblem = constructionSchemeProblem;
     }
 
@@ -466,11 +507,11 @@ public class ReserveManagement extends DataEntity<ReserveManagement> {
         this.problemDescriptionOfConstructionScheme = problemDescriptionOfConstructionScheme;
     }
 
-    public Integer getExistingSecurityThreat() {
+    public String getExistingSecurityThreat() {
         return existingSecurityThreat;
     }
 
-    public void setExistingSecurityThreat(Integer existingSecurityThreat) {
+    public void setExistingSecurityThreat(String existingSecurityThreat) {
         this.existingSecurityThreat = existingSecurityThreat;
     }
 
@@ -482,11 +523,11 @@ public class ReserveManagement extends DataEntity<ReserveManagement> {
         this.safetyHazardDescription = safetyHazardDescription;
     }
 
-    public Integer getCustomizedMaterials() {
+    public String getCustomizedMaterials() {
         return customizedMaterials;
     }
 
-    public void setCustomizedMaterials(Integer customizedMaterials) {
+    public void setCustomizedMaterials(String customizedMaterials) {
         this.customizedMaterials = customizedMaterials;
     }
 
@@ -498,11 +539,11 @@ public class ReserveManagement extends DataEntity<ReserveManagement> {
         this.materialDescription = materialDescription;
     }
 
-    public Integer getDismantlingTheOldMaterial() {
+    public String getDismantlingTheOldMaterial() {
         return dismantlingTheOldMaterial;
     }
 
-    public void setDismantlingTheOldMaterial(Integer dismantlingTheOldMaterial) {
+    public void setDismantlingTheOldMaterial(String dismantlingTheOldMaterial) {
         this.dismantlingTheOldMaterial = dismantlingTheOldMaterial;
     }
 
@@ -522,19 +563,19 @@ public class ReserveManagement extends DataEntity<ReserveManagement> {
         this.problemDescription = problemDescription;
     }
 
-    public Integer getCivilWork() {
+    public String getCivilWork() {
         return civilWork;
     }
 
-    public void setCivilWork(Integer civilWork) {
+    public void setCivilWork(String civilWork) {
         this.civilWork = civilWork;
     }
 
-    public Integer getVerticalRodWorkload() {
+    public String getVerticalRodWorkload() {
         return verticalRodWorkload;
     }
 
-    public void setVerticalRodWorkload(Integer verticalRodWorkload) {
+    public void setVerticalRodWorkload(String verticalRodWorkload) {
         this.verticalRodWorkload = verticalRodWorkload;
     }
 
@@ -594,19 +635,19 @@ public class ReserveManagement extends DataEntity<ReserveManagement> {
         this.zhengDescribe = zhengDescribe;
     }
 
-    public Integer getProjectApproval() {
+    public String getProjectApproval() {
         return projectApproval;
     }
 
-    public void setProjectApproval(Integer projectApproval) {
+    public void setProjectApproval(String projectApproval) {
         this.projectApproval = projectApproval;
     }
 
-    public Integer getCourseEvaluationProcedures() {
+    public String getCourseEvaluationProcedures() {
         return courseEvaluationProcedures;
     }
 
-    public void setCourseEvaluationProcedures(Integer courseEvaluationProcedures) {
+    public void setCourseEvaluationProcedures(String courseEvaluationProcedures) {
         this.courseEvaluationProcedures = courseEvaluationProcedures;
     }
 
@@ -617,4 +658,12 @@ public class ReserveManagement extends DataEntity<ReserveManagement> {
     public void setZhengDifficultyWarn(String zhengDifficultyWarn) {
         this.zhengDifficultyWarn = zhengDifficultyWarn;
     }
+
+    public String getDisclosureFinishDateStr() {
+        return disclosureFinishDateStr;
+    }
+
+    public void setDisclosureFinishDateStr(String disclosureFinishDateStr) {
+        this.disclosureFinishDateStr = disclosureFinishDateStr;
+    }
 }

src/main/java/com/jeeplus/modules/sg/managementcenter/reserveManagement/mapper/ReserveManagementMapper.java

@@ -1,8 +1,14 @@
 package com.jeeplus.modules.sg.managementcenter.reserveManagement.mapper;
 
 import com.jeeplus.core.persistence.BaseMapper;
+import com.jeeplus.core.persistence.Page;
 import com.jeeplus.core.persistence.annotation.MyBatisMapper;
+import com.jeeplus.modules.sg.financial.erpcredit.entity.ErpCreditEquipment;
 import com.jeeplus.modules.sg.managementcenter.reserveManagement.entity.ReserveManagement;
+import org.apache.ibatis.annotations.Param;
+import org.apache.poi.ss.formula.functions.T;
+
+import java.util.List;
 
 /**
  * 项目储备信息 Mapper
@@ -11,4 +17,30 @@ import com.jeeplus.modules.sg.managementcenter.reserveManagement.entity.ReserveM
  */
 @MyBatisMapper
 public interface ReserveManagementMapper extends BaseMapper<ReserveManagement> {
+    /**
+     * 根据项目储备id查询项目信息
+     * @param reserveManagement
+     * @return
+     */
+    ReserveManagement queryByProjectReserveId(ReserveManagement reserveManagement);
+
+    /**
+     * 经理修改
+     * @param reserveManagement
+     */
+    void updatejl(ReserveManagement reserveManagement);
+
+    /**
+     * 批量添加项目储备信息
+     * @param list
+     * @return
+     */
+    void insertList(@Param("list") List<ReserveManagement> list);
+
+    /**
+     * 导出数据查询
+     * @param reserveManagement
+     * @return
+     */
+    List<ReserveManagement> exportFindList(ReserveManagement reserveManagement);
 }

src/main/java/com/jeeplus/modules/sg/managementcenter/reserveManagement/mapper/xml/ReserveManagementMapper.xml

@@ -0,0 +1,700 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.jeeplus.modules.sg.managementcenter.reserveManagement.mapper.ReserveManagementMapper">
+
+    <sql id="reserveManagementColumns">
+        a.id as "id",
+        a.create_by AS "createBy.id",
+		a.create_date AS "createDate",
+		a.update_by AS "updateBy.id",
+		a.update_date AS "updateDate",
+		a.remarks AS "remarks",
+		a.del_flag AS "delFlag",
+        a.projectNature,
+        a.demandUnit,
+        a.district,
+        a.projectGroup,
+        a.reserveBatches,
+        a.blockSupply,
+        a.gridNumber,
+        a.cellNumber,
+        a.powerGridProjectId,
+        a.projectReserveId,
+        a.projectName,
+        a.constructionNecessityAndContent,
+        a.substationName,
+        a.circuitName,
+        a.netRackProjectDivide,
+        a.projectType,
+        a.costEstimate,
+        a.whetherWindwardProject,
+        a.projectUrgencyDegree,
+        a.implementIssuedYear,
+        a.implementBatch,
+        a.basicRemarks,
+        a.designCondition,
+        a.whetherPassReview,
+        a.whetherNeedWiringDiagram,
+        a.whetherFinishMaterials,
+        a.whetherFinishDrawing,
+        a.disclosureToCoordinate,
+        a.disclosureParticipate,
+        a.whetherFinishDisclosure,
+        a.projectManagementPeople,
+        a.designingInstitutePeople,
+        a.ifoPeople,
+        a.regionalCenterPeople,
+        a.uninterruptedOperationPeople,
+        a.workMode,
+        a.disclosureFinishDate,
+        a.disclosureRemarks,
+        a.projectDescription,
+        a.doNotPossessProjectDescription,
+        a.changedProgramsExplain,
+        a.initialDifficulty,
+        a.capitalEquipment,
+        a.substationNewLine,
+        a.whetherImplement,
+        a.fieldDescription,
+        a.necessaryOfImplementation,
+        a.unnecessaryDescription,
+        a.precondition,
+        a.conditionsDescribed,
+        a.constructionSchemeProblem,
+        a.problemDescriptionOfConstructionScheme,
+        a.existingSecurityThreat,
+        a.safetyHazardDescription,
+        a.customizedMaterials,
+        a.materialDescription,
+        a.dismantlingTheOldMaterial,
+        a.operatingType,
+        a.problemDescription,
+        a.civilWork,
+        a.verticalRodWorkload,
+        a.totalWorkloadDescription,
+        a.regionalCenter,
+        a.powerSupplyArea,
+        a.zhengLocation,
+        a.zhengType,
+        a.zhengObject,
+        a.zhengDescribe,
+        a.projectApproval,
+        a.courseEvaluationProcedures,
+        a.zhengDifficultyWarn
+    </sql>
+
+    <sql id="reserveManagementListColumns">
+        a.id as "id",
+        a.create_by AS "createBy.id",
+		a.create_date AS "createDate",
+		a.update_by AS "updateBy.id",
+		a.update_date AS "updateDate",
+		a.remarks AS "remarks",
+		a.del_flag AS "delFlag",
+        a.projectNature,
+        a.demandUnit,
+        a.district,
+        a.projectGroup,
+        a.reserveBatches,
+        a.blockSupply,
+        a.gridNumber,
+        a.cellNumber,
+        a.powerGridProjectId,
+        a.projectReserveId,
+        a.projectName,
+        a.constructionNecessityAndContent,
+        a.substationName,
+        a.circuitName,
+        a.netRackProjectDivide,
+        a.projectType,
+        a.costEstimate,
+        (case a.whetherWindwardProject when '1' then '是' when '0' then '否' else '取消' end) whetherWindwardProject,
+        a.projectUrgencyDegree,
+        a.implementIssuedYear,
+        a.implementBatch,
+        a.basicRemarks,
+        (case a.designCondition when '1' then '已完成' when '0' then '未完成' else '' end) designCondition,
+        (case a.whetherPassReview when '1' then '已通过' when '0' then '未通过' else '' end) whetherPassReview,
+        (case a.whetherNeedWiringDiagram when '1' then '是' when '0' then '否' else '' end) whetherNeedWiringDiagram,
+        (case a.whetherFinishMaterials when '1' then '是' when '0' then '否' else '' end) whetherFinishMaterials,
+        (case a.whetherFinishDrawing when '1' then '是' when '0' then '否' else '' end) whetherFinishDrawing,
+        a.disclosureToCoordinate,
+        a.disclosureParticipate,
+        (case a.whetherFinishDisclosure when '1' then '是' when '0' then '否' else '' end) whetherFinishDisclosure,
+        a.projectManagementPeople,
+        a.designingInstitutePeople,
+        a.ifoPeople,
+        a.regionalCenterPeople,
+        a.uninterruptedOperationPeople,
+        a.workMode,
+        a.disclosureFinishDate,
+        a.disclosureRemarks,
+        a.projectDescription,
+        a.doNotPossessProjectDescription,
+        a.changedProgramsExplain,
+        a.initialDifficulty,
+        (case a.capitalEquipment when '1' then '是' when '0' then '否' else '' end) capitalEquipment,
+        (case a.substationNewLine when '1' then '是' when '0' then '否' else '' end) substationNewLine,
+        (case a.whetherImplement when '1' then '是' when '0' then '否' else '' end) whetherImplement,
+        a.fieldDescription,
+        (case a.necessaryOfImplementation when '1' then '是' when '0' then '否' else '' end) necessaryOfImplementation,
+        a.unnecessaryDescription,
+        (case a.precondition when '1' then '是' when '0' then '否' else '' end) precondition,
+        a.conditionsDescribed,
+        (case a.constructionSchemeProblem when '1' then '是' when '0' then '否' else '' end) constructionSchemeProblem,
+        a.problemDescriptionOfConstructionScheme,
+        (case a.existingSecurityThreat when '1' then '是' when '0' then '否' else '' end) existingSecurityThreat,
+        a.safetyHazardDescription,
+        (case a.customizedMaterials when '1' then '是' when '0' then '否' else '' end) customizedMaterials,
+        a.materialDescription,
+        (case a.dismantlingTheOldMaterial when '1' then '是' when '0' then '否' else '' end) dismantlingTheOldMaterial,
+        a.operatingType,
+        a.problemDescription,
+        (case a.civilWork when '1' then '是' when '0' then '否' else '' end) civilWork,
+        (case a.verticalRodWorkload when '1' then '是' when '0' then '否' else '' end) verticalRodWorkload,
+        a.totalWorkloadDescription,
+        a.regionalCenter,
+        a.powerSupplyArea,
+        a.zhengLocation,
+        a.zhengType,
+        a.zhengObject,
+        a.zhengDescribe,
+        (case a.projectApproval when '1' then '是' when '0' then '否' else '' end) projectApproval,
+        (case a.courseEvaluationProcedures when '1' then '是' when '0' then '否' else '' end) courseEvaluationProcedures,
+        a.zhengDifficultyWarn
+    </sql>
+
+
+    <sql id="exportListColumns">
+        a.id as "id",
+        a.create_by AS "createBy.id",
+		a.create_date AS "createDate",
+		a.update_by AS "updateBy.id",
+		a.update_date AS "updateDate",
+		a.remarks AS "remarks",
+		a.del_flag AS "delFlag",
+        a.projectNature,
+        a.demandUnit,
+        a.district,
+        a.projectGroup,
+        a.reserveBatches,
+        a.blockSupply,
+        a.gridNumber,
+        a.cellNumber,
+        a.powerGridProjectId,
+        a.projectReserveId,
+        a.projectName,
+        a.constructionNecessityAndContent,
+        a.substationName,
+        a.circuitName,
+        a.netRackProjectDivide,
+        a.projectType,
+        a.costEstimate,
+        (case a.whetherWindwardProject when '1' then '是' when '0' then '否' else '取消' end) whetherWindwardProject,
+        a.projectUrgencyDegree,
+        a.implementIssuedYear,
+        a.implementBatch,
+        a.basicRemarks,
+        (case a.designCondition when '1' then '已完成' when '0' then '未完成' else '' end) designCondition,
+        (case a.whetherPassReview when '1' then '已通过' when '0' then '未通过' else '' end) whetherPassReview,
+        (case a.whetherNeedWiringDiagram when '1' then '是' when '0' then '否' else '' end) whetherNeedWiringDiagram,
+        (case a.whetherFinishMaterials when '1' then '是' when '0' then '否' else '' end) whetherFinishMaterials,
+        (case a.whetherFinishDrawing when '1' then '是' when '0' then '否' else '' end) whetherFinishDrawing,
+        a.disclosureToCoordinate,
+        a.disclosureParticipate,
+        (case a.whetherFinishDisclosure when '1' then '是' when '0' then '否' else '' end) whetherFinishDisclosure,
+        a.projectManagementPeople,
+        a.designingInstitutePeople,
+        a.ifoPeople,
+        a.regionalCenterPeople,
+        a.uninterruptedOperationPeople,
+        a.workMode,
+        date_format(a.disclosureFinishDate, '%Y-%m-%d') as "disclosureFinishDateStr",
+        a.disclosureRemarks,
+        a.projectDescription,
+        a.doNotPossessProjectDescription,
+        a.changedProgramsExplain,
+        a.initialDifficulty,
+        (case a.capitalEquipment when '1' then '是' when '0' then '否' else '' end) capitalEquipment,
+        (case a.substationNewLine when '1' then '是' when '0' then '否' else '' end) substationNewLine,
+        (case a.whetherImplement when '1' then '是' when '0' then '否' else '' end) whetherImplement,
+        a.fieldDescription,
+        (case a.necessaryOfImplementation when '1' then '是' when '0' then '否' else '' end) necessaryOfImplementation,
+        a.unnecessaryDescription,
+        (case a.precondition when '1' then '是' when '0' then '否' else '' end) precondition,
+        a.conditionsDescribed,
+        (case a.constructionSchemeProblem when '1' then '是' when '0' then '否' else '' end) constructionSchemeProblem,
+        a.problemDescriptionOfConstructionScheme,
+        (case a.existingSecurityThreat when '1' then '是' when '0' then '否' else '' end) existingSecurityThreat,
+        a.safetyHazardDescription,
+        (case a.customizedMaterials when '1' then '是' when '0' then '否' else '' end) customizedMaterials,
+        a.materialDescription,
+        (case a.dismantlingTheOldMaterial when '1' then '是' when '0' then '否' else '' end) dismantlingTheOldMaterial,
+        a.operatingType,
+        a.problemDescription,
+        (case a.civilWork when '1' then '是' when '0' then '否' else '' end) civilWork,
+        (case a.verticalRodWorkload when '1' then '是' when '0' then '否' else '' end) verticalRodWorkload,
+        a.totalWorkloadDescription,
+        a.regionalCenter,
+        a.powerSupplyArea,
+        a.zhengLocation,
+        a.zhengType,
+        a.zhengObject,
+        a.zhengDescribe,
+        (case a.projectApproval when '1' then '是' when '0' then '否' else '' end) projectApproval,
+        (case a.courseEvaluationProcedures when '1' then '是' when '0' then '否' else '' end) courseEvaluationProcedures,
+        a.zhengDifficultyWarn
+    </sql>
+
+    <select id="get" resultType="com.jeeplus.modules.sg.managementcenter.reserveManagement.entity.ReserveManagement">
+        select
+        <include refid="reserveManagementColumns"/>
+        from cb_reserve_management a
+        where a.id = #{id}
+    </select>
+
+    <select id="findList" resultType="com.jeeplus.modules.sg.managementcenter.reserveManagement.entity.ReserveManagement">
+        select
+        <include refid="reserveManagementListColumns"/>
+        from cb_reserve_management a
+        <where>
+            del_flag = 0
+            <if test="projectReserveId!=null and projectReserveId!=''">
+                and a.projectReserveId like concat('%', #{projectReserveId}, '%')
+            </if>
+            <if test="projectName!=null and projectName!=''">
+                and a.projectName like concat('%', #{projectName}, '%')
+            </if>
+            <if test="dataScope != null and dataScope != ''">
+                ${dataScope}
+            </if>
+        </where>
+        <choose>
+            <when test="page !=null and page.orderBy != null and page.orderBy != ''">
+                ORDER BY ${page.orderBy}
+            </when>
+            <otherwise>
+                ORDER BY a.update_date DESC
+            </otherwise>
+        </choose>
+    </select>
+
+    <select id="exportFindList" resultType="com.jeeplus.modules.sg.managementcenter.reserveManagement.entity.ReserveManagement">
+        select
+        <include refid="exportListColumns"/>
+        from cb_reserve_management a
+        <where>
+            del_flag = 0
+            <if test="projectReserveId!=null and projectReserveId!=''">
+                and a.projectReserveId like concat('%', #{projectReserveId}, '%')
+            </if>
+            <if test="projectName!=null and projectName!=''">
+                and a.projectName like concat('%', #{projectName}, '%')
+            </if>
+            <if test="dataScope != null and dataScope != ''">
+                ${dataScope}
+            </if>
+        </where>
+        ORDER BY a.update_date DESC
+    </select>
+
+    <select id="queryByProjectReserveId" resultType="com.jeeplus.modules.sg.managementcenter.reserveManagement.entity.ReserveManagement">
+        select
+        <include refid="reserveManagementColumns"/>
+        from cb_reserve_management a
+        where a.projectReserveId = #{projectReserveId}
+    </select>
+
+    <insert id="insert">
+        insert into cb_reserve_management (
+          id,
+          create_by,
+          create_date,
+          update_by,
+          update_date,
+          del_flag,
+          remarks,
+          projectNature,
+          demandUnit,
+          district,
+          projectGroup,
+          reserveBatches,
+          blockSupply,
+          gridNumber,
+          cellNumber,
+          powerGridProjectId,
+          projectReserveId,
+          projectName,
+          constructionNecessityAndContent,
+          substationName,
+          circuitName,
+          netRackProjectDivide,
+          projectType,
+          costEstimate,
+          whetherWindwardProject,
+          projectUrgencyDegree,
+          implementIssuedYear,
+          implementBatch,
+          basicRemarks,
+          designCondition,
+          whetherPassReview,
+          whetherNeedWiringDiagram,
+          whetherFinishMaterials,
+          whetherFinishDrawing
+        )
+        values
+          (
+            #{id},
+			#{createBy.id},
+			#{createDate},
+			#{updateBy.id},
+			#{updateDate},
+			#{delFlag},
+			#{remarks},
+            #{projectNature},
+            #{demandUnit},
+            #{district},
+            #{projectGroup},
+            #{reserveBatches},
+            #{blockSupply},
+            #{gridNumber},
+            #{cellNumber},
+            #{powerGridProjectId},
+            #{projectReserveId},
+            #{projectName},
+            #{constructionNecessityAndContent},
+            #{substationName},
+            #{circuitName},
+            #{netRackProjectDivide},
+            #{projectType},
+            #{costEstimate},
+            #{whetherWindwardProject},
+            #{projectUrgencyDegree},
+            #{implementIssuedYear},
+            #{implementBatch},
+            #{basicRemarks},
+            #{designCondition},
+            #{whetherPassReview},
+            #{whetherNeedWiringDiagram},
+            #{whetherFinishMaterials},
+            #{whetherFinishDrawing}
+		)
+    </insert>
+
+    <insert id="insertList">
+        insert into cb_reserve_management (
+          id,
+          create_by,
+          create_date,
+          update_by,
+          update_date,
+          del_flag,
+          remarks,
+          projectNature,
+          demandUnit,
+          district,
+          projectGroup,
+          reserveBatches,
+          blockSupply,
+          gridNumber,
+          cellNumber,
+          powerGridProjectId,
+          projectReserveId,
+          projectName,
+          constructionNecessityAndContent,
+          substationName,
+          circuitName,
+          netRackProjectDivide,
+          projectType,
+          costEstimate,
+          whetherWindwardProject,
+          projectUrgencyDegree,
+          implementIssuedYear,
+          implementBatch,
+          basicRemarks,
+          designCondition,
+          whetherPassReview,
+          whetherNeedWiringDiagram,
+          whetherFinishMaterials,
+          whetherFinishDrawing
+        )
+        values
+        <foreach collection="list" item="item" index="index" separator="," >
+              (
+                #{item.id},
+                #{item.createBy.id},
+                #{item.createDate},
+                #{item.updateBy.id},
+                #{item.updateDate},
+                #{item.delFlag},
+                #{item.remarks},
+                #{item.projectNature},
+                #{item.demandUnit},
+                #{item.district},
+                #{item.projectGroup},
+                #{item.reserveBatches},
+                #{item.blockSupply},
+                #{item.gridNumber},
+                #{item.cellNumber},
+                #{item.powerGridProjectId},
+                #{item.projectReserveId},
+                #{item.projectName},
+                #{item.constructionNecessityAndContent},
+                #{item.substationName},
+                #{item.circuitName},
+                #{item.netRackProjectDivide},
+                #{item.projectType},
+                #{item.costEstimate},
+                #{item.whetherWindwardProject},
+                #{item.projectUrgencyDegree},
+                #{item.implementIssuedYear},
+                #{item.implementBatch},
+                #{item.basicRemarks},
+                #{item.designCondition},
+                #{item.whetherPassReview},
+                #{item.whetherNeedWiringDiagram},
+                #{item.whetherFinishMaterials},
+                #{item.whetherFinishDrawing}
+            )
+        </foreach>
+    </insert>
+
+    <update id="update">
+		update
+            cb_reserve_management
+        set
+            update_by = #{updateBy.id},
+            update_date = #{updateDate},
+            remarks = #{remarks}
+
+            <if test="projectNature!=null and projectNature != ''">
+                ,projectNature = #{projectNature}
+            </if>
+            <if test="demandUnit!=null and demandUnit != ''">
+                ,demandUnit = #{demandUnit}
+            </if>
+            <if test="district!=null and district != ''">
+                ,district = #{district}
+            </if>
+            <if test="projectGroup!=null and projectGroup != ''">
+                ,projectGroup = #{projectGroup}
+            </if>
+            <if test="reserveBatches!=null and reserveBatches != ''">
+                ,reserveBatches = #{reserveBatches}
+            </if>
+            <if test="projectName!=null and projectName != ''">
+                ,projectName = #{projectName}
+            </if>
+            <if test="blockSupply!=null and blockSupply != ''">
+                ,blockSupply = #{blockSupply}
+            </if>
+            <if test="gridNumber!=null and gridNumber != ''">
+                ,gridNumber = #{gridNumber}
+            </if>
+            <if test="cellNumber!=null and cellNumber != ''">
+                ,cellNumber = #{cellNumber}
+            </if>
+            <if test="powerGridProjectId!=null and powerGridProjectId != ''">
+                ,powerGridProjectId = #{powerGridProjectId}
+            </if>
+            <if test="constructionNecessityAndContent!=null and constructionNecessityAndContent != ''">
+                ,constructionNecessityAndContent = #{constructionNecessityAndContent}
+            </if>
+            <if test="substationName!=null and substationName != ''">
+                ,substationName = #{substationName}
+            </if>
+            <if test="circuitName!=null and circuitName != ''">
+                ,circuitName = #{circuitName}
+            </if>
+            <if test="netRackProjectDivide!=null and netRackProjectDivide != ''">
+                ,netRackProjectDivide = #{netRackProjectDivide}
+            </if>
+            <if test="projectType!=null and projectType != ''">
+                ,projectType = #{projectType}
+            </if>
+            <if test="costEstimate!=null and costEstimate != ''">
+                ,costEstimate = #{costEstimate}
+            </if>
+            <if test="whetherWindwardProject!=null and whetherWindwardProject != ''">
+                ,whetherWindwardProject = #{whetherWindwardProject}
+            </if>
+            <if test="projectUrgencyDegree!=null and projectUrgencyDegree != ''">
+                ,projectUrgencyDegree = #{projectUrgencyDegree}
+            </if>
+            <if test="implementIssuedYear!=null and implementIssuedYear != ''">
+                ,implementIssuedYear = #{implementIssuedYear}
+            </if>
+            <if test="implementBatch!=null and implementBatch != ''">
+                ,implementBatch = #{implementBatch}
+            </if>
+            <if test="basicRemarks!=null and basicRemarks != ''">
+                ,basicRemarks = #{basicRemarks}
+            </if>
+            <if test="designCondition!=null and designCondition != ''">
+                ,designCondition = #{designCondition}
+            </if>
+            <if test="whetherPassReview!=null and whetherPassReview != ''">
+                ,whetherPassReview = #{whetherPassReview}
+            </if>
+            <if test="whetherNeedWiringDiagram!=null and whetherNeedWiringDiagram != ''">
+                ,whetherNeedWiringDiagram = #{whetherNeedWiringDiagram}
+            </if>
+            <if test="whetherFinishMaterials!=null and whetherFinishMaterials != ''">
+                ,whetherFinishMaterials = #{whetherFinishMaterials}
+            </if>
+            <if test="whetherFinishDrawing!=null and whetherFinishDrawing != ''">
+                ,whetherFinishDrawing = #{whetherFinishDrawing}
+            </if>
+        where id = #{id}
+	</update>
+
+    <update id="updatejl">
+        update
+        cb_reserve_management
+        set
+        update_by = #{updateBy.id},
+        update_date = #{updateDate},
+        remarks = #{remarks}
+
+        <if test="disclosureToCoordinate!=null and disclosureToCoordinate != ''">
+            ,disclosureToCoordinate = #{disclosureToCoordinate}
+        </if>
+        <if test="disclosureParticipate!=null and disclosureParticipate != ''">
+            ,disclosureParticipate = #{disclosureParticipate}
+        </if>
+        <if test="whetherFinishDisclosure!=null and whetherFinishDisclosure != ''">
+            ,whetherFinishDisclosure = #{whetherFinishDisclosure}
+        </if>
+        <if test="projectManagementPeople!=null and projectManagementPeople != ''">
+            ,projectManagementPeople = #{projectManagementPeople}
+        </if>
+        <if test="designingInstitutePeople!=null and designingInstitutePeople != ''">
+            ,designingInstitutePeople = #{designingInstitutePeople}
+        </if>
+        <if test="ifoPeople!=null and ifoPeople != ''">
+            ,ifoPeople = #{ifoPeople}
+        </if>
+        <if test="regionalCenterPeople!=null and regionalCenterPeople != ''">
+            ,regionalCenterPeople = #{regionalCenterPeople}
+        </if>
+        <if test="uninterruptedOperationPeople!=null and uninterruptedOperationPeople != ''">
+            ,uninterruptedOperationPeople = #{uninterruptedOperationPeople}
+        </if>
+        <if test="workMode!=null and workMode != ''">
+            ,workMode = #{workMode}
+        </if>
+        <if test="disclosureFinishDate!=null and disclosureFinishDate != ''">
+            ,disclosureFinishDate = #{disclosureFinishDate}
+        </if>
+        <if test="disclosureRemarks!=null and disclosureRemarks != ''">
+            ,disclosureRemarks = #{disclosureRemarks}
+        </if>
+        <if test="projectDescription!=null and projectDescription != ''">
+            ,projectDescription = #{projectDescription}
+        </if>
+        <if test="doNotPossessProjectDescription!=null and doNotPossessProjectDescription != ''">
+            ,doNotPossessProjectDescription = #{doNotPossessProjectDescription}
+        </if>
+        <if test="changedProgramsExplain!=null and changedProgramsExplain != ''">
+            ,changedProgramsExplain = #{changedProgramsExplain}
+        </if>
+        <if test="initialDifficulty!=null and initialDifficulty != ''">
+            ,initialDifficulty = #{initialDifficulty}
+        </if>
+        <if test="capitalEquipment!=null and capitalEquipment != ''">
+            ,capitalEquipment = #{capitalEquipment}
+        </if>
+        <if test="substationNewLine!=null and substationNewLine != ''">
+            ,substationNewLine = #{substationNewLine}
+        </if>
+        <if test="whetherImplement!=null and whetherImplement != ''">
+            ,whetherImplement = #{whetherImplement}
+        </if>
+        <if test="fieldDescription!=null and fieldDescription != ''">
+            ,fieldDescription = #{fieldDescription}
+        </if>
+        <if test="necessaryOfImplementation!=null and necessaryOfImplementation != ''">
+            ,necessaryOfImplementation = #{necessaryOfImplementation}
+        </if>
+        <if test="unnecessaryDescription!=null and unnecessaryDescription != ''">
+            ,unnecessaryDescription = #{unnecessaryDescription}
+        </if>
+        <if test="precondition!=null and precondition != ''">
+            ,precondition = #{precondition}
+        </if>
+        <if test="conditionsDescribed!=null and conditionsDescribed != ''">
+            ,conditionsDescribed = #{conditionsDescribed}
+        </if>
+        <if test="constructionSchemeProblem!=null and constructionSchemeProblem != ''">
+            ,constructionSchemeProblem = #{constructionSchemeProblem}
+        </if>
+        <if test="problemDescriptionOfConstructionScheme!=null and problemDescriptionOfConstructionScheme != ''">
+            ,problemDescriptionOfConstructionScheme = #{problemDescriptionOfConstructionScheme}
+        </if>
+        <if test="existingSecurityThreat!=null and existingSecurityThreat != ''">
+            ,existingSecurityThreat = #{existingSecurityThreat}
+        </if>
+        <if test="safetyHazardDescription!=null and safetyHazardDescription != ''">
+            ,safetyHazardDescription = #{safetyHazardDescription}
+        </if>
+        <if test="customizedMaterials!=null and customizedMaterials != ''">
+            ,customizedMaterials = #{customizedMaterials}
+        </if>
+        <if test="materialDescription!=null and materialDescription != ''">
+            ,materialDescription = #{materialDescription}
+        </if>
+        <if test="dismantlingTheOldMaterial!=null and dismantlingTheOldMaterial != ''">
+            ,dismantlingTheOldMaterial = #{dismantlingTheOldMaterial}
+        </if>
+        <if test="operatingType!=null and operatingType != ''">
+            ,operatingType = #{operatingType}
+        </if>
+        <if test="problemDescription!=null and problemDescription != ''">
+            ,problemDescription = #{problemDescription}
+        </if>
+        <if test="civilWork!=null and civilWork != ''">
+            ,civilWork = #{civilWork}
+        </if>
+        <if test="verticalRodWorkload!=null and verticalRodWorkload != ''">
+            ,verticalRodWorkload = #{verticalRodWorkload}
+        </if>
+        <if test="totalWorkloadDescription!=null and totalWorkloadDescription != ''">
+            ,totalWorkloadDescription = #{totalWorkloadDescription}
+        </if>
+        <if test="regionalCenter!=null and regionalCenter != ''">
+            ,regionalCenter = #{regionalCenter}
+        </if>
+        <if test="powerSupplyArea!=null and powerSupplyArea != ''">
+            ,powerSupplyArea = #{powerSupplyArea}
+        </if>
+        <if test="zhengLocation!=null and zhengLocation != ''">
+            ,zhengLocation = #{zhengLocation}
+        </if>
+        <if test="zhengType!=null and zhengType != ''">
+            ,zhengType = #{zhengType}
+        </if>
+        <if test="zhengObject!=null and zhengObject != ''">
+            ,zhengObject = #{zhengObject}
+        </if>
+        <if test="zhengDescribe!=null and zhengDescribe != ''">
+            ,zhengDescribe = #{zhengDescribe}
+        </if>
+        <if test="projectApproval!=null and projectApproval != ''">
+            ,projectApproval = #{projectApproval}
+        </if>
+        <if test="courseEvaluationProcedures!=null and courseEvaluationProcedures != ''">
+            ,courseEvaluationProcedures = #{courseEvaluationProcedures}
+        </if>
+        <if test="zhengDifficultyWarn!=null and zhengDifficultyWarn != ''">
+            ,zhengDifficultyWarn = #{zhengDifficultyWarn}
+        </if>
+        where id = #{id}
+    </update>
+
+    <update id="delete">
+        delete from
+        cb_reserve_management
+        where id = #{id}
+    </update>
+
+</mapper>

src/main/java/com/jeeplus/modules/sg/managementcenter/reserveManagement/service/ReserveManagementService.java

@@ -1,11 +1,16 @@
 package com.jeeplus.modules.sg.managementcenter.reserveManagement.service;
 
+import com.jeeplus.core.persistence.Page;
 import com.jeeplus.core.service.CrudService;
 import com.jeeplus.modules.sg.managementcenter.reserveManagement.entity.ReserveManagement;
 import com.jeeplus.modules.sg.managementcenter.reserveManagement.mapper.ReserveManagementMapper;
+import com.jeeplus.modules.sg.managementcenter.reserveManagement.utils.ReserveManagementUtil;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.*;
+
 /**
  * 项目储备信息 Service
  * @author 徐滕
@@ -15,4 +20,104 @@ import org.springframework.transaction.annotation.Transactional;
 @Transactional(readOnly = true)
 public class ReserveManagementService extends CrudService<ReserveManagementMapper, ReserveManagement> {
 
+    @Autowired
+    private ReserveManagementMapper dao;
+
+    public ReserveManagement get(String id) {
+        return super.get(id);
+    }
+
+    public Page<ReserveManagement> findPage(Page<ReserveManagement> page, ReserveManagement reserveManagement) {
+        Page<ReserveManagement> pageList = super.findPage(page, reserveManagement);
+        return pageList;
+    }
+
+    public List<ReserveManagement> exportFindList( ReserveManagement reserveManagement) {
+        List<ReserveManagement> pageList = dao.exportFindList(reserveManagement);
+        return pageList;
+    }
+
+    /**
+     * 新增方法
+     * @param reserveManagement
+     */
+    @Transactional(readOnly = false)
+    public void save(ReserveManagement reserveManagement) {
+        //查询数据表中是否含有同项目储备编号的数据 若有则进行修改 没有则新增
+        //根据项目储备编号 查询数据
+        ReserveManagement reserveManagementByProjectReserveId = dao.queryByProjectReserveId(reserveManagement);
+        //如果存在则修改信息
+        if(null !=reserveManagementByProjectReserveId){
+            reserveManagement.preUpdate();
+            reserveManagement.setId(reserveManagementByProjectReserveId.getId());
+            mapper.update(reserveManagement);
+        }else{
+            super.save(reserveManagement);
+        }
+    }
+
+    /**
+     * 专职修改方法
+     * @param reserveManagement
+     */
+    @Transactional(readOnly = false)
+    public void update(ReserveManagement reserveManagement) {
+        super.save(reserveManagement);
+    }
+    /**
+     * 经理修改方法
+     * @param reserveManagement
+     */
+    @Transactional(readOnly = false)
+    public void updatejl(ReserveManagement reserveManagement) {
+        reserveManagement.preUpdate();
+        dao.updatejl(reserveManagement);
+    }
+
+    /**
+     * 删除方法
+     * @param reserveManagement
+     */
+    @Transactional(readOnly = false)
+    public void delete(ReserveManagement reserveManagement) {
+        super.delete(reserveManagement);
+    }
+
+
+    /**
+     * 查询已有的参数数据 并分类返回已存在数据和未存在数据
+     * @param reserveManagement
+     * @return
+     */
+    public Map<String,List<ReserveManagement>> getExistProjectList(List<ReserveManagement> reserveManagement){
+        Map<String,List<ReserveManagement>> map = new HashMap();
+        List<ReserveManagement> existReserveManagementList = new ArrayList<>();
+        Iterator<ReserveManagement> iterator = reserveManagement.iterator();
+        while (iterator.hasNext()) {
+            ReserveManagement rm = iterator.next();
+            //对数据进行处理
+            rm.preInsert();
+            ReserveManagement reserveManag = dao.queryByProjectReserveId(rm);
+            //数据库中已含有的数据在list中删除并创建一个list加入 区分为已存在数据
+            if (null != reserveManag) {
+                rm.setId(reserveManag.getId());
+                existReserveManagementList.add(rm);
+                iterator.remove();//使用迭代器删除已存在的数据
+            }
+        }
+        map.put("without",reserveManagement);
+        map.put("exist",existReserveManagementList);
+        return map;
+    }
+
+    /**
+     * 批量添加数据
+     * @param reserveManagementList
+     */
+    @Transactional(readOnly = false)
+    public void insertList(List<ReserveManagement> reserveManagementList){
+        dao.insertList(reserveManagementList);
+    }
+
+
 }

src/main/java/com/jeeplus/modules/sg/managementcenter/reserveManagement/utils/ReserveManagementProUtil.java

@@ -0,0 +1,154 @@
+package com.jeeplus.modules.sg.managementcenter.reserveManagement.utils;
+
+import com.jeeplus.modules.sg.managementcenter.materialproject.util.ImportUtil;
+import com.jeeplus.modules.sg.managementcenter.reserveManagement.entity.ReserveManagement;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.poi.ss.usermodel.Row;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.Iterator;
+import java.util.List;
+
+public class ReserveManagementProUtil {
+
+    /**
+     * 获取表格数据
+     * @param importUtil
+     * @return List<ReserveManagementMapper> 导入表格数据
+     */
+    public static List<ReserveManagement> getProjectUtil(ImportUtil importUtil) throws ParseException {
+        int lastRow = importUtil.getLastDataRowNum();
+        List<ReserveManagement> list = new ArrayList<ReserveManagement>();
+        ReserveManagement reserveManagement = null;
+        for(int i=4; i<=lastRow;i++){
+            reserveManagement = new ReserveManagement();
+            Row row = importUtil.getRow(i);
+            String reserveProjectName = (String) importUtil.getCellValue(row,0);
+            //获取项目储备编号
+            String projectReserveId = (String) importUtil.getCellValue(row, 9);
+            if(StringUtils.isNotBlank(reserveProjectName) ) {
+                if(StringUtils.isNotBlank(projectReserveId)){
+                    reserveManagement.setProjectNature((String)importUtil.getCellValue(row,1));
+                    reserveManagement.setDemandUnit((String)importUtil.getCellValue(row,2));
+                    reserveManagement.setDistrict((String)importUtil.getCellValue(row,3));
+                    reserveManagement.setProjectGroup((String)importUtil.getCellValue(row,4));
+                    reserveManagement.setReserveBatches((String)importUtil.getCellValue(row,5));
+                    reserveManagement.setBlockSupply((String)importUtil.getCellValue(row,6));
+                    reserveManagement.setGridNumber((String)importUtil.getCellValue(row,7));
+                    reserveManagement.setCellNumber((String)importUtil.getCellValue(row,8));
+                    reserveManagement.setProjectReserveId((String)importUtil.getCellValue(row,9));
+                    reserveManagement.setPowerGridProjectId((String)importUtil.getCellValue(row,10));
+                    reserveManagement.setProjectName((String)importUtil.getCellValue(row,11));
+                    reserveManagement.setConstructionNecessityAndContent((String)importUtil.getCellValue(row,12));
+                    reserveManagement.setSubstationName((String)importUtil.getCellValue(row,13));
+                    reserveManagement.setCircuitName((String)importUtil.getCellValue(row,14));
+                    reserveManagement.setNetRackProjectDivide((String)importUtil.getCellValue(row,15));
+                    reserveManagement.setProjectType((String)importUtil.getCellValue(row,16));
+                    String costEstimateStr = importUtil.getCellValue(row,17).toString();
+                    if(StringUtils.isNotBlank(costEstimateStr)){
+                        reserveManagement.setCostEstimate(Double.parseDouble(costEstimateStr));
+                    }
+                    reserveManagement.setWhetherWindwardProject((String)importUtil.getCellValue(row,18));
+                    reserveManagement.setProjectUrgencyDegree((String)importUtil.getCellValue(row,19));
+                    reserveManagement.setImplementIssuedYear((String)importUtil.getCellValue(row,20));
+                    reserveManagement.setImplementBatch((String)importUtil.getCellValue(row,21));
+                    reserveManagement.setBasicRemarks((String)importUtil.getCellValue(row,22));
+                    reserveManagement.setDesignCondition((String)importUtil.getCellValue(row,23));
+                    reserveManagement.setWhetherPassReview((String)importUtil.getCellValue(row,24));
+                    reserveManagement.setWhetherNeedWiringDiagram((String)importUtil.getCellValue(row,25));
+                    reserveManagement.setWhetherFinishMaterials((String)importUtil.getCellValue(row,26));
+                    reserveManagement.setWhetherFinishDrawing((String)importUtil.getCellValue(row,27));
+
+
+                    //项目经理负责部分
+                    reserveManagement.setDisclosureToCoordinate((String)importUtil.getCellValue(row,28));
+                    reserveManagement.setDisclosureParticipate((String)importUtil.getCellValue(row,29));
+                    reserveManagement.setWhetherFinishDisclosure((String)importUtil.getCellValue(row,30));
+                    reserveManagement.setProjectManagementPeople((String)importUtil.getCellValue(row,31));
+                    reserveManagement.setDesigningInstitutePeople((String)importUtil.getCellValue(row,32));
+                    reserveManagement.setIfoPeople((String)importUtil.getCellValue(row,33));
+                    reserveManagement.setRegionalCenterPeople((String)importUtil.getCellValue(row,34));
+                    reserveManagement.setUninterruptedOperationPeople((String)importUtil.getCellValue(row,35));
+                    reserveManagement.setWorkMode((String)importUtil.getCellValue(row,36));
+                    String dateStr = importUtil.getCellValue(row,37).toString();
+                    if(StringUtils.isNotBlank(dateStr)){
+                        reserveManagement.setDisclosureFinishDate(new SimpleDateFormat("yyyy-MM-dd").parse(dateStr));
+                    }
+                    reserveManagement.setDisclosureRemarks((String)importUtil.getCellValue(row,38));
+                    reserveManagement.setProjectDescription((String)importUtil.getCellValue(row,39));
+                    reserveManagement.setDoNotPossessProjectDescription((String)importUtil.getCellValue(row,40));
+                    reserveManagement.setChangedProgramsExplain((String)importUtil.getCellValue(row,41));
+                    reserveManagement.setInitialDifficulty((String)importUtil.getCellValue(row,42));
+                    reserveManagement.setCapitalEquipment((String)importUtil.getCellValue(row,43));
+                    reserveManagement.setSubstationNewLine((String)importUtil.getCellValue(row,44));
+                    reserveManagement.setWhetherImplement((String)importUtil.getCellValue(row,45));
+                    reserveManagement.setFieldDescription((String)importUtil.getCellValue(row,46));
+                    reserveManagement.setNecessaryOfImplementation((String)importUtil.getCellValue(row,47));
+                    reserveManagement.setUnnecessaryDescription((String)importUtil.getCellValue(row,48));
+                    reserveManagement.setPrecondition((String)importUtil.getCellValue(row,49));
+                    reserveManagement.setConditionsDescribed((String)importUtil.getCellValue(row,50));
+                    reserveManagement.setConstructionSchemeProblem((String)importUtil.getCellValue(row,51));
+                    reserveManagement.setProblemDescriptionOfConstructionScheme((String)importUtil.getCellValue(row,52));
+                    reserveManagement.setExistingSecurityThreat((String)importUtil.getCellValue(row,53));
+                    reserveManagement.setSafetyHazardDescription((String)importUtil.getCellValue(row,54));
+                    reserveManagement.setCustomizedMaterials((String)importUtil.getCellValue(row,55));
+                    reserveManagement.setMaterialDescription((String)importUtil.getCellValue(row,56));
+                    reserveManagement.setDismantlingTheOldMaterial((String)importUtil.getCellValue(row,57));
+                    reserveManagement.setOperatingType((String)importUtil.getCellValue(row,58));
+                    reserveManagement.setProblemDescription((String)importUtil.getCellValue(row,59));
+                    reserveManagement.setCivilWork((String)importUtil.getCellValue(row,60));
+                    reserveManagement.setVerticalRodWorkload((String)importUtil.getCellValue(row,61));
+                    reserveManagement.setTotalWorkloadDescription((String)importUtil.getCellValue(row,62));
+                    reserveManagement.setRegionalCenter((String)importUtil.getCellValue(row,63));
+                    reserveManagement.setPowerSupplyArea((String)importUtil.getCellValue(row,64));
+                    reserveManagement.setZhengLocation((String)importUtil.getCellValue(row,65));
+                    reserveManagement.setZhengType((String)importUtil.getCellValue(row,66));
+                    reserveManagement.setZhengObject((String)importUtil.getCellValue(row,67));
+                    reserveManagement.setZhengDescribe((String)importUtil.getCellValue(row,68));
+                    reserveManagement.setProjectApproval((String)importUtil.getCellValue(row,69));
+                    reserveManagement.setCourseEvaluationProcedures((String)importUtil.getCellValue(row,70));
+                    reserveManagement.setZhengDifficultyWarn((String)importUtil.getCellValue(row,71));
+
+                    //对该数据进行数据处理
+                    disposeData(reserveManagement);
+                    list.add(reserveManagement);
+                }
+            }
+        }
+        return list;
+    }
+
+
+    /**
+     * 批量添加数据处理
+     * @param reserveManagement
+     */
+    private static void disposeData (ReserveManagement reserveManagement){
+        reserveManagement.setWhetherWindwardProject(ReserveManagementUtil.boolResultByInt(reserveManagement.getWhetherWindwardProject()));
+        reserveManagement.setProjectUrgencyDegree(ReserveManagementUtil.boolResultByDegree(reserveManagement.getProjectUrgencyDegree()));
+        reserveManagement.setDesignCondition(ReserveManagementUtil.boolResultByCondition(reserveManagement.getDesignCondition()));
+        reserveManagement.setWhetherPassReview(ReserveManagementUtil.boolResultByReview(reserveManagement.getWhetherPassReview()));
+        reserveManagement.setWhetherNeedWiringDiagram(ReserveManagementUtil.boolResultByInt(reserveManagement.getWhetherNeedWiringDiagram()));
+        reserveManagement.setWhetherFinishMaterials(ReserveManagementUtil.boolResultByInt(reserveManagement.getWhetherFinishMaterials()));
+        reserveManagement.setWhetherFinishDrawing(ReserveManagementUtil.boolResultByInt(reserveManagement.getWhetherFinishDrawing()));
+
+        //项目经理负责部分
+        reserveManagement.setWhetherFinishDisclosure(ReserveManagementUtil.boolResultByInt(reserveManagement.getWhetherFinishDisclosure()));
+        reserveManagement.setCapitalEquipment(ReserveManagementUtil.boolResultByInt(reserveManagement.getCapitalEquipment()));
+        reserveManagement.setSubstationNewLine(ReserveManagementUtil.boolResultByInt(reserveManagement.getSubstationNewLine()));
+        reserveManagement.setWhetherImplement(ReserveManagementUtil.boolResultByInt(reserveManagement.getWhetherImplement()));
+        reserveManagement.setNecessaryOfImplementation(ReserveManagementUtil.boolResultByInt(reserveManagement.getNecessaryOfImplementation()));
+        reserveManagement.setPrecondition(ReserveManagementUtil.boolResultByInt(reserveManagement.getPrecondition()));
+        reserveManagement.setConstructionSchemeProblem(ReserveManagementUtil.boolResultByInt(reserveManagement.getConstructionSchemeProblem()));
+        reserveManagement.setExistingSecurityThreat(ReserveManagementUtil.boolResultByInt(reserveManagement.getExistingSecurityThreat()));
+        reserveManagement.setCustomizedMaterials(ReserveManagementUtil.boolResultByInt(reserveManagement.getCustomizedMaterials()));
+        reserveManagement.setDismantlingTheOldMaterial(ReserveManagementUtil.boolResultByInt(reserveManagement.getDismantlingTheOldMaterial()));
+        reserveManagement.setCivilWork(ReserveManagementUtil.boolResultByInt(reserveManagement.getCivilWork()));
+        reserveManagement.setVerticalRodWorkload(ReserveManagementUtil.boolResultByInt(reserveManagement.getVerticalRodWorkload()));
+        reserveManagement.setProjectApproval(ReserveManagementUtil.boolResultByInt(reserveManagement.getProjectApproval()));
+        reserveManagement.setCourseEvaluationProcedures(ReserveManagementUtil.boolResultByInt(reserveManagement.getCourseEvaluationProcedures()));
+    }
+}

src/main/java/com/jeeplus/modules/sg/managementcenter/reserveManagement/utils/ReserveManagementUtil.java

@@ -0,0 +1,67 @@
+package com.jeeplus.modules.sg.managementcenter.reserveManagement.utils;
+
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.math.NumberUtils;
+
+public class ReserveManagementUtil {
+
+    public static String boolResultByInt(String str){
+        if(StringUtils.isNotBlank(str)){
+            switch (str){
+                case "是":
+                    str = "1";
+                    break;
+                case "否":
+                    str = "0";
+                    break;
+                default:
+                    str = "";
+                    break;
+            }
+        }
+        return str;
+    }
+
+    public static String boolResultByDegree(String str){
+        if(StringUtils.isNotBlank(str)) {
+            if (!NumberUtils.isDigits(str)) {
+                str = "";
+            }
+        }
+        return str;
+    }
+
+    public static String boolResultByCondition(String str){
+        if(StringUtils.isNotBlank(str)) {
+            switch (str) {
+                case "已完成":
+                    str = "1";
+                    break;
+                case "未完成":
+                    str = "0";
+                    break;
+                default:
+                    str = "";
+                    break;
+            }
+        }
+        return str;
+    }
+
+    public static String boolResultByReview(String str){
+        if(StringUtils.isNotBlank(str)) {
+            switch (str) {
+                case "已通过":
+                    str = "1";
+                    break;
+                case "未通过":
+                    str = "0";
+                    break;
+                default:
+                    str = "";
+                    break;
+            }
+        }
+        return str;
+    }
+}

src/main/java/com/jeeplus/modules/sg/managementcenter/reserveManagement/web/ReserveManagementController.java

@@ -1,11 +1,33 @@
 package com.jeeplus.modules.sg.managementcenter.reserveManagement.web;
 
+import com.jeeplus.common.json.AjaxJson;
+import com.jeeplus.common.utils.DateUtils;
 import com.jeeplus.common.utils.StringUtils;
+import com.jeeplus.common.utils.excel.ExportExcel;
+import com.jeeplus.common.utils.excel.ImportExcel;
+import com.jeeplus.core.persistence.Page;
 import com.jeeplus.core.web.BaseController;
+import com.jeeplus.modules.sg.audit.information.utils.FreemarkerUtil;
+import com.jeeplus.modules.sg.audit.information.utils.ResponseUtil;
+import com.jeeplus.modules.sg.managementcenter.materialProvided.entity.MaterialProvided;
+import com.jeeplus.modules.sg.managementcenter.materialProvided.entity.MaterialProvidedVersion;
+import com.jeeplus.modules.sg.managementcenter.materialplan.entity.MaterialPlan;
+import com.jeeplus.modules.sg.managementcenter.materialproject.entity.MaterialProject;
+import com.jeeplus.modules.sg.managementcenter.materialproject.util.ImportUtil;
+import com.jeeplus.modules.sg.managementcenter.materialproject.util.MaterialProUtil;
+import com.jeeplus.modules.sg.managementcenter.project.entity.Project;
+import com.jeeplus.modules.sg.managementcenter.project.util.ProjectImportUtil;
 import com.jeeplus.modules.sg.managementcenter.reserveManagement.entity.ReserveManagement;
 import com.jeeplus.modules.sg.managementcenter.reserveManagement.service.ReserveManagementService;
+import com.jeeplus.modules.sg.managementcenter.reserveManagement.utils.ReserveManagementProUtil;
+import com.jeeplus.modules.sg.settActivi.entity.SettActivi;
+import com.jeeplus.modules.sg.settActivi.entity.SettList;
 import com.jeeplus.modules.sys.entity.User;
 import com.jeeplus.modules.sys.utils.UserUtils;
+import freemarker.template.Configuration;
+import freemarker.template.Template;
+import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
+import org.apache.shiro.authz.annotation.Logical;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -14,10 +36,15 @@ import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.io.File;
+import java.io.IOException;
+import java.text.ParseException;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -53,7 +80,7 @@ public class ReserveManagementController extends BaseController {
     public String skipList(ReserveManagement reserveManagement, Model model) {
         User user = UserUtils.getUser();
         model.addAttribute("reserveManagement", reserveManagement);
-        return "modules/sg/managementcenter/reserveManagement/resrerveManagementInformation";
+        return "modules/sg/managementcenter/reserveManagement/reserveManagementInformation";
     }
 
     /**
@@ -63,21 +90,198 @@ public class ReserveManagementController extends BaseController {
     @RequiresPermissions("sg:managementcenter:reserveManagement:list")
     @RequestMapping(value = "list")
     public Map<String, Object> basicData(ReserveManagement reserveManagement, HttpServletRequest request, HttpServletResponse response, Model model) {
-        /*String reserveProjectName = project.getReserveProjectName();
-        List<String> reserveList = new ArrayList<>();
-        if (!"".equals(reserveProjectName)) {
-            String[] split = reserveProjectName.split("\\s+");
-            String reserveName = "";
-            for (int i = 0; i < split.length; i++) {
-                reserveName = split[i];
-                reserveList.add(reserveName);
+
+        Page<ReserveManagement> page = service.findPage(new Page<ReserveManagement>(request, response), reserveManagement);
+        return getBootstrapData(page);
+    }
+
+    /**
+     * 增加，编辑表单页面
+     */
+    @RequiresPermissions(value={"sg:managementcenter:reserveManagement:add","sg:managementcenter:reserveManagement:edit"},logical= Logical.OR)
+    @RequestMapping(value = "form")
+    public String form(ReserveManagement reserveManagement, Model model) {
+        User user = UserUtils.getUser();
+        model.addAttribute("reserveManagement", reserveManagement);
+        //判断id是否为空 如果未空则为新增 否则为修改
+        if(StringUtils.isBlank(reserveManagement.getId())){
+            return "modules/sg/managementcenter/reserveManagement/reserveManagementForm";
+        }
+        //判断是储备专职还是项目经理
+        // xmglzxcbzz：储备专职
+        // xmglzxld：储备经理
+        if("xmglzxcbzz".equals(user.getRoleList().get(0).getEnname())){
+            return "modules/sg/managementcenter/reserveManagement/reserveManagementModifyByzz";
+        }
+        return "modules/sg/managementcenter/reserveManagement/reserveManagementModifyByjl";
+    }
+
+    /**
+     * 查看表单页面
+     */
+    @RequiresPermissions(value={"sg:managementcenter:reserveManagement:view"},logical= Logical.OR)
+    @RequestMapping(value = "view")
+    public String view(ReserveManagement reserveManagement, Model model) {
+        model.addAttribute("reserveManagement", reserveManagement);
+        return "modules/sg/managementcenter/reserveManagement/reserveManagementView";
+    }
+
+    /**
+     * 保存表单
+     */
+    @ResponseBody
+    @RequiresPermissions(value={"sg:managementcenter:reserveManagement:add"},logical=Logical.OR)
+    @RequestMapping(value = "save")
+    public AjaxJson save(ReserveManagement reserveManagement){
+        AjaxJson j = new AjaxJson();
+        /**
+         * 后台hibernate-validation插件校验
+         */
+        String errMsg = beanValidator(reserveManagement);
+        if (StringUtils.isNotBlank(errMsg)){
+            j.setSuccess(false);
+            j.setMsg(errMsg);
+            return j;
+        }
+        //新增或编辑表单保存
+        service.save(reserveManagement);//保存
+        j.setSuccess(true);
+        j.setMsg("保存储备项目基本信息成功");
+        return j;
+    }
+
+    /**
+     * 修改表单
+     */
+    @ResponseBody
+    @RequiresPermissions(value={"sg:managementcenter:reserveManagement:edit"},logical=Logical.OR)
+    @RequestMapping(value = "update")
+    public AjaxJson update(ReserveManagement reserveManagement){
+        AjaxJson j = new AjaxJson();
+        User user = UserUtils.getUser();
+        /**
+         * 后台hibernate-validation插件校验
+         */
+        String errMsg = beanValidator(reserveManagement);
+        if (StringUtils.isNotBlank(errMsg)){
+            j.setSuccess(false);
+            j.setMsg(errMsg);
+            return j;
+        }
+        //新增或编辑表单保存
+        if("xmglzxcbzz".equals(user.getRoleList().get(0).getEnname())){
+            service.update(reserveManagement);
+        }else if("xmglzxld".equals(user.getRoleList().get(0).getEnname())){//经理人员修改对应信息
+            service.updatejl(reserveManagement);
+        }
+        j.setSuccess(true);
+        j.setMsg("修改储备项目基本信息成功");
+        return j;
+    }
+
+    /**
+     * 删除表单
+     */
+    @ResponseBody
+    @RequiresPermissions(value={"sg:managementcenter:reserveManagement:del"},logical=Logical.OR)
+    @RequestMapping(value = "deleteAll")
+    public AjaxJson delete(String ids){
+        AjaxJson j = new AjaxJson();
+        String idArray[] =ids.split(",");
+        for(String id : idArray){
+            service.delete(service.get(id));
+        }
+        j.setMsg("删除储备项目基本信息成功");
+        return j;
+    }
+
+    /**
+     * 导入Excel数据
+     */
+    @ResponseBody
+    @RequiresPermissions("sg:managementcenter:reserveManagement:import")
+    @RequestMapping(value = "import")
+    public AjaxJson importBasic(@RequestParam("file") MultipartFile file, HttpServletResponse response, HttpServletRequest request) {
+        AjaxJson j = new AjaxJson();
+        User user = UserUtils.getUser();
+        try {
+            ImportUtil importUtil = new ImportUtil(file, 0, 0);
+            //获取导入表格所有数据
+            List<ReserveManagement> reserveManagementList = ReserveManagementProUtil.getProjectUtil(importUtil);
+            //查询已有的参数数据 并分类返回已存在数据和未存在数据
+            Map map = service.getExistProjectList(reserveManagementList);
+            //未存在数据
+            List<ReserveManagement> withoutList = (List<ReserveManagement>) map.get("without");
+            //已存在数据
+            List<ReserveManagement> existList = (List<ReserveManagement>) map.get("exist");
+
+            //对未存在的数据进行批量导入
+            if(withoutList.size()>0){
+                //判断 只有专职人员才可以进行新增操作
+                if("xmglzxcbzz".equals(user.getRoleList().get(0).getEnname())) {
+                    service.insertList(withoutList);
+                }
+            }
+
+            //对已存在的数据进行修改
+            if(existList.size()>0){
+                // xmglzxcbzz：储备专职
+                // xmglzxld：储备经理
+                //专职人员修改对应信息
+                if("xmglzxcbzz".equals(user.getRoleList().get(0).getEnname())){
+                    for (ReserveManagement reserveManagement : existList) {
+                        service.update(reserveManagement);
+                    }
+                }else if("xmglzxld".equals(user.getRoleList().get(0).getEnname())){//经理人员修改对应信息
+                    for (ReserveManagement reserveManagement : existList) {
+                        service.updatejl(reserveManagement);
+                    }
+                }
+            }
+            int i = withoutList.size() + existList.size();
+            if("xmglzxcbzz".equals(user.getRoleList().get(0).getEnname())){
+                j.setMsg("已成功导入" + i + "条项目储备信息记录");
+            }else if("xmglzxld".equals(user.getRoleList().get(0).getEnname())){//经理人员修改对应信息
+                j.setMsg("已成功导入" + existList.size() + "条项目储备信息记录");
             }
-            project.setReserveList(reserveList);
+
+        } catch (Exception e) {
+            j.setSuccess(false);
+            j.setMsg("导入项目储备信息失败！失败信息：" + e.getMessage());
+        }
+        return j;
+    }
+
+    //导出excel
+    @ResponseBody
+    @RequiresPermissions("sg:managementcenter:reserveManagement:export")
+    @RequestMapping(value = "export")
+    public void exportExcel(ReserveManagement reserveManagement, HttpServletRequest request, HttpServletResponse response) {
+        Template template = null;
+        response.setContentType("text/text;charset=utf-8");
+        response.setCharacterEncoding("UTF-8");
+        File path = new File(this.getClass().getResource("/").getPath() + "/freemarker");
+        Configuration cfg = new Configuration();
+        try {
+            cfg.setDefaultEncoding("UTF-8");
+            //配置cfg对象
+            cfg.setDirectoryForTemplateLoading(path);
+//            根据模板名称获取Template对象
+            template = cfg.getTemplate("reserveManagement.ftl");
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        Map<String, Object> data = new HashMap<>();
+        List<ReserveManagement> list = service.exportFindList(reserveManagement);
+        //生成序列号
+        int i = 1;
+        for (ReserveManagement s : list) {
+            s.setId(String.valueOf(i));
+            i++;
         }
-        BasicInformation basicInformation = new BasicInformation();
-        project.setBasicInformation(basicInformation);
-        Page<Project> page = projectService.findPage(new Page<Project>(request, response), project);
-        return getBootstrapData(page);*/
-        return null;
+        data.put("list", list);
+        File docFile = new File(path + "\\镇江本部配网项目储备清单.xls");
+        FreemarkerUtil.generateFile(data, template, docFile);
+        ResponseUtil.docResponse("镇江本部配网项目储备清单.xls", docFile, response);
     }
 }

src/main/webapp/webpage/modules/sg/managementcenter/reserveManagement/reserveManagementForm.jsp

@@ -0,0 +1,227 @@
+<%@ 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 projectReserveId = $("#projectReserveId").val();
+		    var projectName = $("#projectName").val();
+		    if (null==projectReserveId||""==projectReserveId){
+                jp.error("请填写项目储备编号！");
+			}else if(null==projectName||""==projectName){
+				jp.error("请填写项目名称！");
+			}
+		    else {
+                var isValidate = jp.validateForm('#inputForm');//校验表单
+                if(!isValidate){
+                    return false;
+                }else{
+                    jp.loading();
+                    jp.post("${ctx}/sg/managementCenter/reserveManagement/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="reserveManagement" class="form-horizontal">
+		<form:hidden path="id"/>	
+		<table class="table table-bordered">
+		   	<tbody>
+				<tr>
+					<td colspan="4" class="width-15 active"><label class="">储备项目基本信息：</label></td>
+				</tr>
+				<tr>
+					<td class="width-15 active"><label class="">项目性质：</label></td>
+					<td class="width-35">
+						<form:input path="projectNature" htmlEscape="false" class="form-control"/>
+					</td>
+					<td class="width-15 active"><label class="">需求单位：</label></td>
+					<td class="width-35">
+						<form:input path="demandUnit" htmlEscape="false"    class="form-control"/>
+					</td>
+				</tr>
+				<tr>
+					<td class="width-15 active"><label class="">区域：</label></td>
+					<td class="width-35">
+						<form:input path="district" htmlEscape="false"    class="form-control"/>
+					</td>
+					<td class="width-15 active"><label class="">项目分组：</label></td>
+					<td class="width-35">
+						<form:input path="projectGroup" htmlEscape="false"    class="form-control"/>
+					</td>
+				</tr>
+				<tr>
+					<td class="width-15 active"><label class="">储备批次：</label></td>
+					<td class="width-35">
+						<form:input path="reserveBatches" htmlEscape="false"    class="form-control"/>
+					</td>
+					<td class="width-15 active"><label class="">供电区域：</label></td>
+					<td class="width-35">
+						<form:input path="blockSupply" htmlEscape="false"    class="form-control"/>
+					</td>
+				</tr>
+				<tr>
+					<td class="width-15 active"><label class="">网格编号：</label></td>
+					<td class="width-35">
+						<form:input path="gridNumber" htmlEscape="false"    class="form-control"/>
+					</td>
+					<td class="width-15 active"><label class="">单元格编号：</label></td>
+					<td class="width-35">
+						<form:input path="cellNumber" htmlEscape="false"    class="form-control"/>
+					</td>
+				</tr>
+				<tr>
+					<td class="width-15 active"><label class="">电网项目编号：</label></td>
+					<td class="width-35">
+						<form:input path="powerGridProjectId" 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="projectReserveId" 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="projectName" htmlEscape="false"    class="form-control required"/>
+					</td>
+					<td class="width-15 active"><label class="">建设必要性及内容：</label></td>
+					<td class="width-35">
+						<form:input path="constructionNecessityAndContent" htmlEscape="false"    class="form-control"/>
+					</td>
+				</tr>
+				<tr>
+					<td class="width-15 active"><label class="">变电站名称：</label></td>
+					<td class="width-35">
+						<form:input path="substationName" htmlEscape="false"    class="form-control"/>
+					</td>
+					<td class="width-15 active"><label class="">线路名称：</label></td>
+					<td class="width-35">
+						<form:input path="circuitName" htmlEscape="false"    class="form-control"/>
+					</td>
+				</tr>
+				<tr>
+					<td class="width-15 active"><label class="">网架项目划分：</label></td>
+					<td class="width-35">
+						<form:input path="netRackProjectDivide" htmlEscape="false"    class="form-control"/>
+					</td>
+					<td class="width-15 active"><label class="">项目类型：</label></td>
+					<td class="width-35">
+						<form:input path="projectType" 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 money"/>
+					</td>
+					<td class="width-15 active"><label class="">是否迎峰度夏项目：</label></td>
+					<td class="width-35">
+						<select id="whetherWindwardProject" name="whetherWindwardProject"  class="form-control">
+							<option value="">请选择</option>
+							<option value="1">是</option>
+							<option value="0">否</option>
+						</select>
+					</td>
+				</tr>
+				<tr>
+					<td class="width-15 active"><label class="">项目紧急程度：</label></td>
+					<td class="width-35">
+						<form:input path="projectUrgencyDegree" htmlEscape="false" class="form-control number"/>
+					</td>
+					<td class="width-15 active"><label class="">拟实施下达年份：</label></td>
+					<td class="width-35">
+						<form:input path="implementIssuedYear" htmlEscape="false" class="form-control"/>
+					</td>
+				</tr>
+				<tr>
+					<td class="width-15 active"><label class="">拟实施批次：</label></td>
+					<td class="width-35">
+						<form:input path="implementBatch" htmlEscape="false" class="form-control"/>
+					</td>
+					<td class="width-15 active"><label class="">备注：</label></td>
+					<td class="width-35">
+						<form:textarea path="basicRemarks" htmlEscape="false" rows="3" maxlength="200" class="form-control"/>
+					</td>
+				</tr>
+
+
+
+
+				<tr>
+					<td colspan="4" class="width-15 active"><label class="">设计及评审情况：</label></td>
+				</tr>
+				<tr>
+					<td class="width-15 active"><label class="">设计状态：</label></td>
+					<td class="width-35">
+						<select id="designCondition" name="designCondition"  class="form-control">
+							<option value="">请选择</option>
+							<option value="1">已完成</option>
+							<option value="0">未完成</option>
+						</select>
+					</td>
+					<td class="width-15 active"><label class="">是否通过省公司评审：</label></td>
+					<td class="width-35">
+						<select id="whetherPassReview" name="whetherPassReview" class="form-control">
+							<option value="">请选择</option>
+							<option value="1">已通过</option>
+							<option value="0">未通过</option>
+						</select>
+					</td>
+				</tr>
+				<tr>
+					<td class="width-15 active"><label class="">是否需提交路径图（政处）：</label></td>
+					<td class="width-35">
+						<select id="whetherNeedWiringDiagram" name="whetherNeedWiringDiagram" class="form-control">
+							<option value="">请选择</option>
+							<option value="1">是</option>
+							<option value="0">否</option>
+						</select>
+					</td>
+					<td class="width-15 active"><label class="">是否完成物资清册编制：</label></td>
+					<td class="width-35">
+						<select id="whetherFinishMaterials" name="whetherFinishMaterials" class="form-control">
+							<option value="">请选择</option>
+							<option value="1">是</option>
+							<option value="0">否</option>
+						</select>
+					</td>
+				</tr>
+				<tr>
+					<td class="width-15 active"><label class="">是否完成图纸移交：</label></td>
+					<td class="width-35">
+						<select id="whetherFinishDrawing" name="whetherFinishDrawing" class="form-control">
+							<option value="">请选择</option>
+							<option value="1">是</option>
+							<option value="0">否</option>
+						</select>
+					</td>
+				</tr>
+		 	</tbody>
+		</table>
+	</form:form>
+</body>
+</html>

src/main/webapp/webpage/modules/sg/managementcenter/reserveManagement/resrerveManagementInformation.js

@@ -36,7 +36,7 @@ $(document).ready(function () {
         //可供选择的每页的行数（*）
         pageList: [5, 10, 25, 50, 100],
         //这个接口需要处理bootstrap table传递的固定参数,并返回特定格式的json数据
-        url: "${ctx}/sg/managementcenter/project/basicData",
+        url: "${ctx}/sg/managementCenter/reserveManagement/list",
         //默认值为 'limit',传给服务端的参数为：limit, offset, search, sort, order Else
         //queryParamsType:'',
         ////查询参数,每次调用是会带上这个参数，可自定义
@@ -82,34 +82,24 @@ $(document).ready(function () {
             [[
                 {
                     title: "2021年镇江本部配网项目储备表",
-                    halign:"center",
-                    align:"center",
                     width:8000,
-                    colspan: 67,
+                    colspan: 72,
                 }
             ],[
                 {
                     title: "储备项目基本信息",
-                    halign:"center",
-                    align:"center",
                     width:2100,
-                    colspan:19,
+                    colspan:23,
                 },{
                     title: "设计及评审情况",
-                    halign:"center",
-                    align:"center",
                     width:500,
                     colspan:5,
                 },{
                     title: "方案交底组织",
-                    halign:"center",
-                    align:"center",
                     width:1100,
                     colspan:11,
                 },{
                     title: "方案交底结论",
-                    halign:"center",
-                    align:"center",
                     width:3300,
                     colspan:33,
                 }
@@ -145,10 +135,44 @@ $(document).ready(function () {
                     title: '储备批次',
                     rowspan:2,
                 },{
+                    field: 'blockSupply',
+                    width:100,
+                    title: '供电区域',
+                    rowspan:2,
+                },{
+                    field: 'gridNumber',
+                    width:100,
+                    title: '网格编号',
+                    rowspan:2,
+                },{
+                    field: 'cellNumber',
+                    width:100,
+                    title: '单元格编号',
+                    rowspan:2,
+                },{
                     field: 'projectReserveId',
                     width:150,
                     title: '项目储备编号',
                     rowspan:2,
+                    formatter:function(value, row , index){
+                        if(value == null || value ==""){
+                            value = "-";
+                        }
+                    <c:choose>
+                        <c:when test="${fns:hasPermission('sg:managementcenter:reserveManagement:view')}">
+                        return "<a href='javascript:view(\""+row.id+"\")'>"+value+"</a>";
+                    </c:when>
+                        <c:otherwise>
+                        return value;
+                    </c:otherwise>
+                        </c:choose>
+
+                    }
+                },{
+                    field: 'powerGridProjectId',
+                    width:100,
+                    title: '电网项目编号',
+                    rowspan:2,
                 },{
                     field: 'projectName',
                     width:200,
@@ -157,7 +181,7 @@ $(document).ready(function () {
                 },{
                     field: 'constructionNecessityAndContent',
                     width:200,
-                    title: '建设必要性及内容',
+                    title: '建设必要性及</br>内容',
                     rowspan:2,
                 },{
                     field: 'substationName',
@@ -187,7 +211,7 @@ $(document).ready(function () {
                 },{
                     field: 'whetherWindwardProject',
                     width:100,
-                    title: '是否迎峰度夏项目',
+                    title: '是否迎峰度夏</br>项目',
                     rowspan:2,
                 },{
                     field: 'projectUrgencyDegree',
@@ -197,7 +221,7 @@ $(document).ready(function () {
                 },{
                     field: 'implementIssuedYear',
                     width:100,
-                    title: '拟实施下达年份',
+                    title: '拟实施下达</br>年份',
                     rowspan:2,
                 },{
                     field: 'implementBatch',
@@ -219,22 +243,22 @@ $(document).ready(function () {
                 },{
                     field: 'whetherPassReview',
                     width:100,
-                    title: '是否通过省公司评审',
+                    title: '是否通过</br>省公司评审',
                     rowspan:2,
                 },{
                     field: 'whetherNeedWiringDiagram',
                     width:100,
-                    title: '是否需提交路径图',
+                    title: '是否需提交</br>路径图',
                     rowspan:2,
                 },{
                     field: 'whetherFinishMaterials',
                     width:100,
-                    title: '是否完成物资清册编制',
+                    title: '是否完成物资</br>清册编制',
                     rowspan:2,
                 },{
                     field: 'whetherFinishDrawing',
                     width:100,
-                    title: '是否完成图纸移交',
+                    title: '是否完成</br>图纸移交',
                     rowspan:2,
                 },
 /*方案交底组织*/
@@ -256,7 +280,7 @@ $(document).ready(function () {
                 },{
                     field: 'projectManagementPeople',
                     width:100,
-                    title: '项目管理中心人员',
+                    title: '项目管理中心</br>人员',
                     rowspan:2,
                 },{
                     field: 'designingInstitutePeople',
@@ -276,7 +300,7 @@ $(document).ready(function () {
                 },{
                     field: 'uninterruptedOperationPeople',
                     width:100,
-                    title: '不停电作业中心人员',
+                    title: '不停电作业</br>中心人员',
                     rowspan:2,
                 },{
                     field: 'workMode',
@@ -288,6 +312,11 @@ $(document).ready(function () {
                     width:100,
                     title: '交底完成日期',
                     rowspan:2,
+                    sortable: true,
+                    //——修改——获取日期列的值进行转换
+                    formatter: function (value, row, index) {
+                        return changeDateFormat(value)
+                    },
                 },{
                     field: 'disclosureRemarks',
                     width:100,
@@ -297,68 +326,46 @@ $(document).ready(function () {
 /*方案交底结论*/
                 {
                     title: "交底结论",
-                    halign:"center",
-                    align:"center",
                     width:400,
                     colspan:4,
                 },{
                     title: "成本资本划分",
-                    halign:"center",
-                    align:"center",
                     width:200,
                     colspan:2,
                 },{
                     title: "现场是否实施",
-                    halign:"center",
-                    align:"center",
                     width:200,
                     colspan:2,
                 },{
                     title: "实施必要性",
-                    halign:"center",
-                    align:"center",
                     width:200,
                     colspan:2,
                 },{
                     title: "施工前置条件检查",
-                    halign:"center",
-                    align:"center",
                     width:200,
                     colspan:2,
                 },{
                     title: "施工方案可行性检查",
-                    halign:"center",
-                    align:"center",
                     width:200,
                     colspan:2,
                 },{
                     title: "方案安全性检查",
-                    halign:"center",
-                    align:"center",
                     width:200,
                     colspan:2,
                 },{
                     title: "物资交底",
-                    halign:"center",
-                    align:"center",
                     width:300,
                     colspan:3,
                 },{
                     title: "作业方式",
-                    halign:"center",
-                    align:"center",
                     width:200,
                     colspan:2,
                 },{
                     title: "工作量描述",
-                    halign:"center",
-                    align:"center",
                     width:300,
                     colspan:3,
                 },{
                     title: "政处交底",
-                    halign:"center",
-                    align:"center",
                     width:900,
                     colspan:9,
                 }
@@ -371,7 +378,7 @@ $(document).ready(function () {
                 {
                     field: 'doNotPossessProjectDescription',
                     width:100,
-                    title: '不具备立项条件说明',
+                    title: '不具备立项</br>条件说明',
                 },
                 {
                     field: 'changedProgramsExplain',
@@ -386,12 +393,12 @@ $(document).ready(function () {
                 {
                     field: 'capitalEquipment',
                     width:100,
-                    title: '是否有资本设备',
+                    title: '是否有</br>资本设备',
                 },
                 {
                     field: 'substationNewLine',
                     width:100,
-                    title: '是否有变电站新出线',
+                    title: '是否有</br>变电站新出线',
                 },
                 {
                     field: 'whetherImplement',
@@ -406,17 +413,17 @@ $(document).ready(function () {
                 {
                     field: 'necessaryOfImplementation',
                     width:100,
-                    title: '是否有实施必要性',
+                    title: '是否有</br>实施必要性',
                 },
                 {
                     field: 'unnecessaryDescription',
                     width:100,
-                    title: '实施无必要描述',
+                    title: '实施无必要</br>描述',
                 },
                 {
                     field: 'precondition',
                     width:100,
-                    title: '是否存在前置条件',
+                    title: '是否存在</br>前置条件',
                 },
                 {
                     field: 'conditionsDescribed',
@@ -426,17 +433,17 @@ $(document).ready(function () {
                 {
                     field: 'constructionSchemeProblem',
                     width:100,
-                    title: '是否存在施工方案问题',
+                    title: '是否存在</br>施工方案问题',
                 },
                 {
                     field: 'problemDescriptionOfConstructionScheme',
                     width:100,
-                    title: '施工方案问题描述',
+                    title: '施工方案</br>问题描述',
                 },
                 {
                     field: 'existingSecurityThreat',
                     width:100,
-                    title: '现场是否存在安全隐患',
+                    title: '现场是否存在</br>安全隐患',
                 },
                 {
                     field: 'safetyHazardDescription',
@@ -446,7 +453,7 @@ $(document).ready(function () {
                 {
                     field: 'customizedMaterials',
                     width:100,
-                    title: '是否需要定制物资',
+                    title: '是否需要</br>定制物资',
                 },
                 {
                     field: 'materialDescription',
@@ -456,7 +463,7 @@ $(document).ready(function () {
                 {
                     field: 'dismantlingTheOldMaterial',
                     width:100,
-                    title: '是否有拆旧物资',
+                    title: '是否有</br>拆旧物资',
                 },
                 {
                     field: 'operatingType',
@@ -471,12 +478,12 @@ $(document).ready(function () {
                 {
                     field: 'civilWork',
                     width:100,
-                    title: '是否有土建工作量',
+                    title: '是否有</br>土建工作量',
                 },
                 {
                     field: 'verticalRodWorkload',
                     width:100,
-                    title: '是否有立杆工作量',
+                    title: '是否有</br>立杆工作量',
                 },
                 {
                     field: 'totalWorkloadDescription',
@@ -516,12 +523,12 @@ $(document).ready(function () {
                 {
                     field: 'projectApproval',
                     width:100,
-                    title: '是否需规划报批',
+                    title: '是否需</br>规划报批',
                 },
                 {
                     field: 'courseEvaluationProcedures',
                     width:100,
-                    title: '是否需办理安评航评手续',
+                    title: '是否需</br>办理安评航评</br>手续',
                 },
                 {
                     field: 'zhengDifficultyWarn',
@@ -553,7 +560,7 @@ $(document).ready(function () {
             btn: ['确定', '关闭'],
             btn1: function (index, layero) {
                 var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
-                iframeWin.contentWindow.importExcel('${ctx}/sg/managementcenter/project/importBasic', function (data) {
+                iframeWin.contentWindow.importExcel('${ctx}/sg/managementCenter/reserveManagement/import', function (data) {
                     if (data.success) {
                         jp.success(data.msg);
                         refresh();
@@ -572,11 +579,9 @@ $(document).ready(function () {
     });
 
     $("#btnExport").click(function () {
-        var id = getIdSelections();
-        var projectId = $("#projectId").val();
-        var reserveProjectName = $("#reserveProjectName").val();
+        var projectReserveId = $("#projectReserveId").val();
         var projectName = $("#projectName").val();
-        jp.downloadFile('${ctx}/sg/managementcenter/project/btnExport?id=' + id + '&reserveProjectName=' + reserveProjectName + '&projectId=' + projectId + '&projectName=' + projectName);
+        jp.downloadFile('${ctx}/sg/managementCenter/reserveManagement/export?projectReserveId=' + projectReserveId + '&projectName=' + projectName);
     });
 
     $("#search").click("click", function () {// 绑定查询按扭
@@ -614,7 +619,7 @@ function refresh() {
 }
 
 function add() {
-    jp.openSaveDialog('新增项目管理表单', "${ctx}/sg/managementcenter/project/form", '800px', '500px');
+    jp.openSaveDialog('新增储备项目基本信息', "${ctx}/sg/managementCenter/reserveManagement/form", '800px', '500px');
 }
 
 
@@ -622,15 +627,45 @@ function edit(id) {//没有权限时，不显示确定按钮
     if (id == undefined) {
         id = getIdSelections();
     }
-    jp.openSaveDialog('编辑项目管理表单', "${ctx}/sg/managementcenter/project/basicInformationForm?id=" + id, '800px', '500px');
+    jp.openSaveDialog('编辑储备项目基本信息', "${ctx}/sg/managementCenter/reserveManagement/form?id=" + id, '800px', '500px');
 }
 
 function view(id) {//没有权限时，不显示确定按钮
     if (id == undefined) {
         id = getIdSelections();
     }
-    jp.openViewDialog('查看项目管理表单', "${ctx}/sg/managementcenter/project/basicInformationForm?id=" + id, '800px', '500px');
+    jp.openViewDialog('查看储备项目基本信息', "${ctx}/sg/managementCenter/reserveManagement/view?id=" + id, '800px', '500px');
 }
 
+function deleteAll(){
+
+    jp.confirm('确认要删除该储备项目基本信息吗？', function(){
+        jp.loading();
+        jp.get("${ctx}/sg/managementCenter/reserveManagement/deleteAll?ids=" + getIdSelections(), function(data){
+            if(data.success){
+                $('#projectTable').bootstrapTable('refresh');
+                jp.success(data.msg);
+            }else{
+                jp.error(data.msg);
+            }
+        })
+
+    })
+}
+//转换日期格式(时间戳转换为datetime格式)
+function changeDateFormat(cellval) {
+    var dateVal = cellval + "";
+    if (cellval != null) {
+        var date = new Date(parseInt(dateVal.replace("/Date(", "").replace(")/", ""), 10));
+        var month = date.getMonth() + 1 < 10 ? "0" + (date.getMonth() + 1) : date.getMonth() + 1;
+        var currentDate = date.getDate() < 10 ? "0" + date.getDate() : date.getDate();
+
+        /*var hours = date.getHours() < 10 ? "0" + date.getHours() : date.getHours();
+        var minutes = date.getMinutes() < 10 ? "0" + date.getMinutes() : date.getMinutes();
+        var seconds = date.getSeconds() < 10 ? "0" + date.getSeconds() : date.getSeconds();*/
+
+        return date.getFullYear() + "-" + month + "-" + currentDate /*+ " " + hours + ":" + minutes + ":" + seconds*/;
+    }
+}
 
 </script>

src/main/webapp/webpage/modules/sg/managementcenter/reserveManagement/resrerveManagementInformation.jsp

@@ -7,7 +7,19 @@
 	<meta name="decorator" content="ani"/>
 	<%@ include file="/webpage/include/bootstraptable.jsp"%>
 	<%@include file="/webpage/include/treeview.jsp" %>
-	<%@include file="resrerveManagementInformation.js" %>
+	<%@include file="reserveManagementInformation.js" %>
+	<style type="text/css">
+		.table {
+			table-layout: fixed;
+			word-break: break-all;
+			word-wrap: break-word;
+			text-align: center;
+		}
+		.table th, .table td {
+			text-align: center;
+			vertical-align: middle !important;
+		}
+	</style>
 </head>
 <body>
 	<div class="wrapper wrapper-content">
@@ -41,10 +53,20 @@
 	<!-- 工具栏 -->
 	<div id="toolbar">
 			<shiro:hasPermission name="sg:managementcenter:reserveManagement:add">
+				<button id="add" class="btn btn-primary" onclick="add()">
+					<i class="glyphicon glyphicon-plus"></i> 新增
+				</button>
+			</shiro:hasPermission>
+			<shiro:hasPermission name="sg:managementcenter:reserveManagement:edit">
 				<button id="edit" class="btn btn-primary" onclick="edit()">
 					<i class="glyphicon glyphicon-edit"></i> 修改
 				</button>
 			</shiro:hasPermission>
+			<shiro:hasPermission name="sg:managementcenter:reserveManagement:del">
+				<button id="remove" class="btn btn-danger" onclick="deleteAll()">
+					<i class="glyphicon glyphicon-remove"></i> 删除
+				</button>
+			</shiro:hasPermission>
 			<shiro:hasPermission name="sg:managementcenter:reserveManagement:import">
 				<button id="btnImport" class="btn btn-info">
 					<i class="fa fa-folder-open-o"></i> 导入
@@ -57,7 +79,7 @@
 			</shiro:hasPermission>
 		    </div>
 	<!-- 表格 -->
-	<table id="projectTable"  style="table-layout:fixed"  data-toolbar="#toolbar"></table>
+	<table id="projectTable" style="table-layout:fixed" class="table" data-toolbar="#toolbar"></table>
 
 	</div>
 	</div>

src/main/webapp/webpage/modules/sg/managementcenter/reserveManagement/reserveManagementModifyByjl.jsp

@@ -0,0 +1,337 @@
+<%@ 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() {
+			$('#disclosureFinishDate').datetimepicker({
+				format: "YYYY-MM-DD"
+			});
+		});
+		function save() {
+			var isValidate = jp.validateForm('#inputForm');//校验表单
+			if(!isValidate){
+				return false;
+			}else{
+				jp.loading();
+				jp.post("${ctx}/sg/managementCenter/reserveManagement/update",$('#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="reserveManagement" class="form-horizontal">
+	<form:hidden path="id"/>
+	<table class="table table-bordered">
+		<tbody>
+		<tr>
+			<td colspan="4" class="width-15 active"><label class="">方案交底组织：</label></td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">交底牵头部门：</label></td>
+			<td class="width-35">
+				<form:input path="disclosureToCoordinate" htmlEscape="false" class="form-control"/>
+			</td>
+			<td class="width-15 active"><label class="">交底参与部门：</label></td>
+			<td class="width-35">
+				<form:input path="disclosureParticipate" htmlEscape="false"    class="form-control"/>
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">是否完成交底：</label></td>
+			<td class="width-35">
+				<select id="whetherFinishDisclosure" name="whetherFinishDisclosure"  class="form-control">
+					<option value="">请选择</option>
+					<option value="1" <c:if test="${reserveManagement.whetherFinishDisclosure=='1'}">selected</c:if>>是</option>
+					<option value="0" <c:if test="${reserveManagement.whetherFinishDisclosure=='0'}">selected</c:if>>否</option>
+				</select>
+			</td>
+			<td class="width-15 active"><label class="">项目管理中心人员：</label></td>
+			<td class="width-35">
+				<form:input path="projectManagementPeople" htmlEscape="false"    class="form-control"/>
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">设计院人员：</label></td>
+			<td class="width-35">
+				<form:input path="designingInstitutePeople" htmlEscape="false"    class="form-control"/>
+			</td>
+			<td class="width-15 active"><label class="">经研所人员：</label></td>
+			<td class="width-35">
+				<form:input path="ifoPeople" htmlEscape="false" class="form-control"/>
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">区域中心人员：</label></td>
+			<td class="width-35">
+				<form:input path="regionalCenterPeople" htmlEscape="false" class="form-control"/>
+			</td>
+			<td class="width-15 active"><label class="">不停电作业中心人员：</label></td>
+			<td class="width-35">
+				<form:input path="uninterruptedOperationPeople" htmlEscape="false"    class="form-control"/>
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">作业方式：</label></td>
+			<td class="width-35">
+				<form:input path="workMode" htmlEscape="false"    class="form-control"/>
+			</td>
+			<td class="width-15 active"><label class="">交底完成日期：</label></td>
+			<td class="width-35">
+				<div class='input-group form_datetime' id='disclosureFinishDate'>
+					<input type='text'  name="disclosureFinishDate" class="form-control required"  value="<fmt:formatDate value="${reserveManagement.disclosureFinishDate}" pattern="yyyy-MM-dd"/>"/>
+					<span class="input-group-addon">
+						<span class="glyphicon glyphicon-calendar"></span>
+					</span>
+				</div>
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">备注：</label></td>
+			<td class="width-35">
+				<form:textarea path="disclosureRemarks" htmlEscape="false" rows="3" maxlength="255" class="form-control"/>
+			</td>
+		</tr>
+
+
+
+
+		<tr>
+			<td colspan="4" class="width-15 active"><label class="">方案交底结论：</label></td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">立项说明：</label></td>
+			<td class="width-35">
+				<form:textarea path="projectDescription" htmlEscape="false" rows="3" maxlength="255" class="form-control"/>
+			</td>
+			<td class="width-15 active"><label class="">不具备立项条件说明：</label></td>
+			<td class="width-35">
+				<form:textarea path="doNotPossessProjectDescription" htmlEscape="false" rows="3" maxlength="255" class="form-control"/>
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">方案变更说明：</label></td>
+			<td class="width-35">
+				<form:textarea path="changedProgramsExplain" htmlEscape="false" rows="3" maxlength="255" class="form-control"/>
+			</td>
+			<td class="width-15 active"><label class="">政处难度初判：</label></td>
+			<td class="width-35">
+				<form:input path="initialDifficulty" htmlEscape="false"    class="form-control"/>
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">是否有资本设备：</label></td>
+			<td class="width-35">
+				<select id="capitalEquipment" name="capitalEquipment"  class="form-control">
+					<option value="">请选择</option>
+					<option value="1" <c:if test="${reserveManagement.capitalEquipment=='1'}">selected</c:if>>是</option>
+					<option value="0" <c:if test="${reserveManagement.capitalEquipment=='0'}">selected</c:if>>否</option>
+				</select>
+			</td>
+			<td class="width-15 active"><label class="">是否有变电站新出线：</label></td>
+			<td class="width-35">
+				<select id="substationNewLine" name="substationNewLine"  class="form-control">
+					<option value="">请选择</option>
+					<option value="1" <c:if test="${reserveManagement.substationNewLine=='1'}">selected</c:if>>是</option>
+					<option value="0" <c:if test="${reserveManagement.substationNewLine=='0'}">selected</c:if>>否</option>
+				</select>
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">是否已实施：</label></td>
+			<td class="width-35">
+				<select id="whetherImplement" name="whetherImplement"  class="form-control">
+					<option value="">请选择</option>
+					<option value="1" <c:if test="${reserveManagement.whetherImplement=='1'}">selected</c:if>>是</option>
+					<option value="0" <c:if test="${reserveManagement.whetherImplement=='0'}">selected</c:if>>否</option>
+				</select>
+			</td>
+			<td class="width-15 active"><label class="">现场情况描述：</label></td>
+			<td class="width-35">
+				<form:textarea path="fieldDescription" htmlEscape="false" rows="3" maxlength="255" class="form-control"/>
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">是否有实施必要性：</label></td>
+			<td class="width-35">
+				<select id="necessaryOfImplementation" name="necessaryOfImplementation"  class="form-control">
+					<option value="">请选择</option>
+					<option value="1" <c:if test="${reserveManagement.necessaryOfImplementation=='1'}">selected</c:if>>是</option>
+					<option value="0" <c:if test="${reserveManagement.necessaryOfImplementation=='0'}">selected</c:if>>否</option>
+				</select>
+			</td>
+			<td class="width-15 active"><label class="">实施无必要描述：</label></td>
+			<td class="width-35">
+				<form:textarea path="unnecessaryDescription" htmlEscape="false" rows="3" maxlength="255" class="form-control"/>
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">是否存在前置条件：</label></td>
+			<td class="width-35">
+				<select id="precondition" name="precondition"  class="form-control">
+					<option value="">请选择</option>
+					<option value="1" <c:if test="${reserveManagement.precondition=='1'}">selected</c:if>>是</option>
+					<option value="0" <c:if test="${reserveManagement.precondition=='0'}">selected</c:if>>否</option>
+				</select>
+			</td>
+			<td class="width-15 active"><label class="">前置条件描述：</label></td>
+			<td class="width-35">
+				<form:textarea path="conditionsDescribed" htmlEscape="false" rows="3" maxlength="255" class="form-control"/>
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">是否存在施工方案问题：</label></td>
+			<td class="width-35">
+				<select id="constructionSchemeProblem" name="constructionSchemeProblem"  class="form-control">
+					<option value="">请选择</option>
+					<option value="1" <c:if test="${reserveManagement.constructionSchemeProblem=='1'}">selected</c:if>>是</option>
+					<option value="0" <c:if test="${reserveManagement.constructionSchemeProblem=='0'}">selected</c:if>>否</option>
+				</select>
+			</td>
+			<td class="width-15 active"><label class="">施工方案问题描述：</label></td>
+			<td class="width-35">
+				<form:textarea path="problemDescriptionOfConstructionScheme" htmlEscape="false" rows="3" maxlength="255" class="form-control"/>
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">现场是否存在安全隐患：</label></td>
+			<td class="width-35">
+				<select id="existingSecurityThreat" name="existingSecurityThreat"  class="form-control">
+					<option value="">请选择</option>
+					<option value="1" <c:if test="${reserveManagement.existingSecurityThreat=='1'}">selected</c:if>>是</option>
+					<option value="0" <c:if test="${reserveManagement.existingSecurityThreat=='0'}">selected</c:if>>否</option>
+				</select>
+			</td>
+			<td class="width-15 active"><label class="">安全隐患描述：</label></td>
+			<td class="width-35">
+				<form:textarea path="safetyHazardDescription" htmlEscape="false" rows="3" maxlength="255" class="form-control"/>
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">是否需要定制物资：</label></td>
+			<td class="width-35">
+				<select id="customizedMaterials" name="customizedMaterials"  class="form-control">
+					<option value="">请选择</option>
+					<option value="1" <c:if test="${reserveManagement.customizedMaterials=='1'}">selected</c:if>>是</option>
+					<option value="0" <c:if test="${reserveManagement.customizedMaterials=='0'}">selected</c:if>>否</option>
+				</select>
+			</td>
+			<td class="width-15 active"><label class="">定制物资描述：</label></td>
+			<td class="width-35">
+				<form:textarea path="materialDescription" htmlEscape="false" rows="3" maxlength="255" class="form-control"/>
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">是否有拆旧物资：</label></td>
+			<td class="width-35">
+				<select id="dismantlingTheOldMaterial" name="dismantlingTheOldMaterial"  class="form-control">
+					<option value="">请选择</option>
+					<option value="1" <c:if test="${reserveManagement.dismantlingTheOldMaterial=='1'}">selected</c:if>>是</option>
+					<option value="0" <c:if test="${reserveManagement.dismantlingTheOldMaterial=='0'}">selected</c:if>>否</option>
+				</select>
+			</td>
+			<td class="width-15 active"><label class="">作业方式：</label></td>
+			<td class="width-35">
+				<form:input path="operatingType" htmlEscape="false"    class="form-control"/>
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">是否有土建工作量：</label></td>
+			<td class="width-35">
+				<select id="civilWork" name="civilWork"  class="form-control">
+					<option value="">请选择</option>
+					<option value="1" <c:if test="${reserveManagement.civilWork=='1'}">selected</c:if>>是</option>
+					<option value="0" <c:if test="${reserveManagement.civilWork=='0'}">selected</c:if>>否</option>
+				</select>
+			</td>
+			<td class="width-15 active"><label class="">停电问题描述：</label></td>
+			<td class="width-35">
+				<form:textarea path="problemDescription" htmlEscape="false" rows="3" maxlength="255" class="form-control"/>
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">是否有立杆工作量：</label></td>
+			<td class="width-35">
+				<select id="verticalRodWorkload" name="verticalRodWorkload"  class="form-control">
+					<option value="">请选择</option>
+					<option value="1" <c:if test="${reserveManagement.verticalRodWorkload=='1'}">selected</c:if>>是</option>
+					<option value="0" <c:if test="${reserveManagement.verticalRodWorkload=='0'}">selected</c:if>>否</option>
+				</select>
+			</td>
+			<td class="width-15 active"><label class="">总工作量描述：</label></td>
+			<td class="width-35">
+				<form:textarea path="totalWorkloadDescription" htmlEscape="false" rows="3" maxlength="255" class="form-control"/>
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">区域中心：</label></td>
+			<td class="width-35">
+				<form:input path="regionalCenter" htmlEscape="false" class="form-control"/>
+			</td>
+			<td class="width-15 active"><label class="">供电所辖区：</label></td>
+			<td class="width-35">
+				<form:input path="powerSupplyArea" htmlEscape="false" class="form-control"/>
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">政处地点：</label></td>
+			<td class="width-35">
+				<form:input path="zhengLocation" htmlEscape="false" class="form-control"/>
+			</td>
+			<td class="width-15 active"><label class="">政处类型（可多类）：</label></td>
+			<td class="width-35">
+				<form:input path="zhengType" htmlEscape="false" class="form-control"/>
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">政处对象（产权单位）：</label></td>
+			<td class="width-35">
+				<form:input path="zhengObject" htmlEscape="false" class="form-control"/>
+			</td>
+			<td class="width-15 active"><label class="">政处描述：</label></td>
+			<td class="width-35">
+				<form:textarea path="zhengDescribe" htmlEscape="false" rows="3" maxlength="255" class="form-control"/>
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">是否需规划报批：</label></td>
+			<td class="width-35">
+				<select id="projectApproval" name="projectApproval" class="form-control">
+					<option value="">请选择</option>
+					<option value="1" <c:if test="${reserveManagement.projectApproval=='1'}">selected</c:if>>是</option>
+					<option value="0" <c:if test="${reserveManagement.projectApproval=='0'}">selected</c:if>>否</option>
+				</select>
+			</td>
+			<td class="width-15 active"><label class="">是否需办理安评航评手续：</label></td>
+			<td class="width-35">
+				<select id="courseEvaluationProcedures" name="courseEvaluationProcedures" class="form-control">
+					<option value="">请选择</option>
+					<option value="1" <c:if test="${reserveManagement.courseEvaluationProcedures=='1'}">selected</c:if>>是</option>
+					<option value="0" <c:if test="${reserveManagement.courseEvaluationProcedures=='0'}">selected</c:if>>否</option>
+				</select>
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">政处难点提醒：</label></td>
+			<td class="width-35">
+				<form:textarea path="zhengDifficultyWarn" htmlEscape="false" rows="3" maxlength="255" class="form-control"/>
+			</td>
+		</tr>
+		</tbody>
+	</table>
+</form:form>
+</body>
+</html>

src/main/webapp/webpage/modules/sg/managementcenter/reserveManagement/reserveManagementModifyByzz.jsp

@@ -0,0 +1,227 @@
+<%@ 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 projectReserveId = $("#projectReserveId").val();
+		    var projectName = $("#projectName").val();
+		    if (null==projectReserveId||""==projectReserveId){
+                jp.error("请填写项目储备编号！");
+			}else if(null==projectName||""==projectName){
+				jp.error("请填写项目名称！");
+			}
+		    else {
+                var isValidate = jp.validateForm('#inputForm');//校验表单
+                if(!isValidate){
+                    return false;
+                }else{
+                    jp.loading();
+                    jp.post("${ctx}/sg/managementCenter/reserveManagement/update",$('#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="reserveManagement" class="form-horizontal">
+		<form:hidden path="id"/>
+		<table class="table table-bordered">
+		   	<tbody>
+				<tr>
+					<td colspan="4" class="width-15 active"><label class="">储备项目基本信息：</label></td>
+				</tr>
+				<tr>
+					<td class="width-15 active"><label class="">项目性质：</label></td>
+					<td class="width-35">
+						<form:input path="projectNature" htmlEscape="false" class="form-control"/>
+					</td>
+					<td class="width-15 active"><label class="">需求单位：</label></td>
+					<td class="width-35">
+						<form:input path="demandUnit" htmlEscape="false"    class="form-control"/>
+					</td>
+				</tr>
+				<tr>
+					<td class="width-15 active"><label class="">区域：</label></td>
+					<td class="width-35">
+						<form:input path="district" htmlEscape="false"    class="form-control"/>
+					</td>
+					<td class="width-15 active"><label class="">项目分组：</label></td>
+					<td class="width-35">
+						<form:input path="projectGroup" htmlEscape="false"    class="form-control"/>
+					</td>
+				</tr>
+				<tr>
+					<td class="width-15 active"><label class="">储备批次：</label></td>
+					<td class="width-35">
+						<form:input path="reserveBatches" htmlEscape="false"    class="form-control"/>
+					</td>
+					<td class="width-15 active"><label class="">供电区域：</label></td>
+					<td class="width-35">
+						<form:input path="blockSupply" htmlEscape="false"    class="form-control"/>
+					</td>
+				</tr>
+				<tr>
+					<td class="width-15 active"><label class="">网格编号：</label></td>
+					<td class="width-35">
+						<form:input path="gridNumber" htmlEscape="false"    class="form-control"/>
+					</td>
+					<td class="width-15 active"><label class="">单元格编号：</label></td>
+					<td class="width-35">
+						<form:input path="cellNumber" htmlEscape="false"    class="form-control"/>
+					</td>
+				</tr>
+				<tr>
+					<td class="width-15 active"><label class="">电网项目编号：</label></td>
+					<td class="width-35">
+						<form:input path="powerGridProjectId" 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="projectReserveId" 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="projectName" htmlEscape="false"    class="form-control required"/>
+					</td>
+					<td class="width-15 active"><label class="">建设必要性及内容：</label></td>
+					<td class="width-35">
+						<form:input path="constructionNecessityAndContent" htmlEscape="false"    class="form-control"/>
+					</td>
+				</tr>
+				<tr>
+					<td class="width-15 active"><label class="">变电站名称：</label></td>
+					<td class="width-35">
+						<form:input path="substationName" htmlEscape="false"    class="form-control"/>
+					</td>
+					<td class="width-15 active"><label class="">线路名称：</label></td>
+					<td class="width-35">
+						<form:input path="circuitName" htmlEscape="false"    class="form-control"/>
+					</td>
+				</tr>
+				<tr>
+					<td class="width-15 active"><label class="">网架项目划分：</label></td>
+					<td class="width-35">
+						<form:input path="netRackProjectDivide" htmlEscape="false"    class="form-control"/>
+					</td>
+					<td class="width-15 active"><label class="">项目类型：</label></td>
+					<td class="width-35">
+						<form:input path="projectType" 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 money"/>
+					</td>
+					<td class="width-15 active"><label class="">是否迎峰度夏项目：</label></td>
+					<td class="width-35">
+						<select id="whetherWindwardProject" name="whetherWindwardProject"  class="form-control">
+							<option value="">请选择</option>
+							<option value="1" <c:if test="${reserveManagement.whetherWindwardProject=='1'}">selected</c:if>>是</option>
+							<option value="0" <c:if test="${reserveManagement.whetherWindwardProject=='0'}">selected</c:if>>否</option>
+						</select>
+					</td>
+				</tr>
+				<tr>
+					<td class="width-15 active"><label class="">项目紧急程度：</label></td>
+					<td class="width-35">
+						<form:input path="projectUrgencyDegree" htmlEscape="false" class="form-control number"/>
+					</td>
+					<td class="width-15 active"><label class="">拟实施下达年份：</label></td>
+					<td class="width-35">
+						<form:input path="implementIssuedYear" htmlEscape="false" class="form-control"/>
+					</td>
+				</tr>
+				<tr>
+					<td class="width-15 active"><label class="">拟实施批次：</label></td>
+					<td class="width-35">
+						<form:input path="implementBatch" htmlEscape="false" class="form-control"/>
+					</td>
+					<td class="width-15 active"><label class="">备注：</label></td>
+					<td class="width-35">
+						<form:textarea path="basicRemarks" htmlEscape="false" rows="3" maxlength="200" class="form-control"/>
+					</td>
+				</tr>
+
+
+
+
+				<tr>
+					<td colspan="4" class="width-15 active"><label class="">设计及评审情况：</label></td>
+				</tr>
+				<tr>
+					<td class="width-15 active"><label class="">设计状态：</label></td>
+					<td class="width-35">
+						<select id="designCondition" name="designCondition"  class="form-control">
+							<option value="">请选择</option>
+							<option value="1" <c:if test="${reserveManagement.designCondition=='1'}">selected</c:if>>已完成</option>
+							<option value="0" <c:if test="${reserveManagement.designCondition=='0'}">selected</c:if>>未完成</option>
+						</select>
+					</td>
+					<td class="width-15 active"><label class="">是否通过省公司评审：</label></td>
+					<td class="width-35">
+						<select id="whetherPassReview" name="whetherPassReview" class="form-control">
+							<option value="">请选择</option>
+							<option value="1" <c:if test="${reserveManagement.whetherPassReview=='1'}">selected</c:if>>已通过</option>
+							<option value="0" <c:if test="${reserveManagement.whetherPassReview=='0'}">selected</c:if>>未通过</option>
+						</select>
+					</td>
+				</tr>
+				<tr>
+					<td class="width-15 active"><label class="">是否需提交路径图（政处）：</label></td>
+					<td class="width-35">
+						<select id="whetherNeedWiringDiagram" name="whetherNeedWiringDiagram" class="form-control">
+							<option value="">请选择</option>
+							<option value="1" <c:if test="${reserveManagement.whetherNeedWiringDiagram=='1'}">selected</c:if>>是</option>
+							<option value="0" <c:if test="${reserveManagement.whetherNeedWiringDiagram=='0'}">selected</c:if>>否</option>
+						</select>
+					</td>
+					<td class="width-15 active"><label class="">是否完成物资清册编制：</label></td>
+					<td class="width-35">
+						<select id="whetherFinishMaterials" name="whetherFinishMaterials" class="form-control">
+							<option value="">请选择</option>
+							<option value="1" <c:if test="${reserveManagement.whetherFinishMaterials=='1'}">selected</c:if>>是</option>
+							<option value="0" <c:if test="${reserveManagement.whetherFinishMaterials=='0'}">selected</c:if>>否</option>
+						</select>
+					</td>
+				</tr>
+				<tr>
+					<td class="width-15 active"><label class="">是否完成图纸移交：</label></td>
+					<td class="width-35">
+						<select id="whetherFinishDrawing" name="whetherFinishDrawing" class="form-control">
+							<option value="">请选择</option>
+							<option value="1" <c:if test="${reserveManagement.whetherFinishDrawing=='1'}">selected</c:if>>是</option>
+							<option value="0" <c:if test="${reserveManagement.whetherFinishDrawing=='0'}">selected</c:if>>否</option>
+						</select>
+					</td>
+				</tr>
+		 	</tbody>
+		</table>
+	</form:form>
+</body>
+</html>

src/main/webapp/webpage/modules/sg/managementcenter/reserveManagement/reserveManagementView.jsp

@@ -0,0 +1,487 @@
+<%@ 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() {
+			$('#disclosureFinishDate').datetimepicker({
+				format: "YYYY-MM-DD"
+			});
+		});
+		function save() {
+			var isValidate = jp.validateForm('#inputForm');//校验表单
+			if(!isValidate){
+				return false;
+			}else{
+				/*jp.loading();
+				jp.post("${ctx}/sg/managementCenter/reserveManagement/update",$('#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="reserveManagement" class="form-horizontal">
+	<form:hidden path="id"/>
+	<table class="table table-bordered">
+		<tbody>
+		<tr>
+			<td colspan="4" class="width-15 active"><label class="">储备项目基本信息：</label></td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">项目性质：</label></td>
+			<td class="width-35">
+				<form:input path="projectNature" htmlEscape="false" class="form-control"/>
+			</td>
+			<td class="width-15 active"><label class="">需求单位：</label></td>
+			<td class="width-35">
+				<form:input path="demandUnit" htmlEscape="false"    class="form-control"/>
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">区域：</label></td>
+			<td class="width-35">
+				<form:input path="district" htmlEscape="false"    class="form-control"/>
+			</td>
+			<td class="width-15 active"><label class="">项目分组：</label></td>
+			<td class="width-35">
+				<form:input path="projectGroup" htmlEscape="false"    class="form-control"/>
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">储备批次：</label></td>
+			<td class="width-35">
+				<form:input path="reserveBatches" htmlEscape="false"    class="form-control"/>
+			</td>
+			<td class="width-15 active"><label class="">项目储备编号：</label></td>
+			<td class="width-35">
+				<form:input path="projectReserveId" 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="constructionNecessityAndContent" htmlEscape="false"    class="form-control"/>
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">变电站名称：</label></td>
+			<td class="width-35">
+				<form:input path="substationName" htmlEscape="false"    class="form-control"/>
+			</td>
+			<td class="width-15 active"><label class="">线路名称：</label></td>
+			<td class="width-35">
+				<form:input path="circuitName" htmlEscape="false"    class="form-control"/>
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">网架项目划分：</label></td>
+			<td class="width-35">
+				<form:input path="netRackProjectDivide" htmlEscape="false"    class="form-control"/>
+			</td>
+			<td class="width-15 active"><label class="">项目类型：</label></td>
+			<td class="width-35">
+				<form:input path="projectType" 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 money"/>
+			</td>
+			<td class="width-15 active"><label class="">是否迎峰度夏项目：</label></td>
+			<td class="width-35">
+				<select id="whetherWindwardProject" name="whetherWindwardProject"  class="form-control">
+					<option value="">请选择</option>
+					<option value="1" <c:if test="${reserveManagement.whetherWindwardProject=='1'}">selected</c:if>>是</option>
+					<option value="0" <c:if test="${reserveManagement.whetherWindwardProject=='0'}">selected</c:if>>否</option>
+				</select>
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">项目紧急程度：</label></td>
+			<td class="width-35">
+				<form:input path="projectUrgencyDegree" htmlEscape="false" class="form-control number"/>
+			</td>
+			<td class="width-15 active"><label class="">拟实施下达年份：</label></td>
+			<td class="width-35">
+				<form:input path="implementIssuedYear" htmlEscape="false" class="form-control"/>
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">拟实施批次：</label></td>
+			<td class="width-35">
+				<form:input path="implementBatch" htmlEscape="false" class="form-control"/>
+			</td>
+			<td class="width-15 active"><label class="">备注：</label></td>
+			<td class="width-35">
+				<form:textarea path="basicRemarks" htmlEscape="false" rows="3" maxlength="200" class="form-control"/>
+			</td>
+		</tr>
+
+
+
+
+		<tr>
+			<td colspan="4" class="width-15 active"><label class="">设计及评审情况：</label></td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">设计状态：</label></td>
+			<td class="width-35">
+				<select id="designCondition" name="designCondition"  class="form-control">
+					<option value="">请选择</option>
+					<option value="1" <c:if test="${reserveManagement.designCondition=='1'}">selected</c:if>>已完成</option>
+					<option value="0" <c:if test="${reserveManagement.designCondition=='0'}">selected</c:if>>未完成</option>
+				</select>
+			</td>
+			<td class="width-15 active"><label class="">是否通过省公司评审：</label></td>
+			<td class="width-35">
+				<select id="whetherPassReview" name="whetherPassReview" class="form-control">
+					<option value="">请选择</option>
+					<option value="1" <c:if test="${reserveManagement.whetherPassReview=='1'}">selected</c:if>>已通过</option>
+					<option value="0" <c:if test="${reserveManagement.whetherPassReview=='0'}">selected</c:if>>未通过</option>
+				</select>
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">是否需提交路径图（政处）：</label></td>
+			<td class="width-35">
+				<select id="whetherNeedWiringDiagram" name="whetherNeedWiringDiagram" class="form-control">
+					<option value="">请选择</option>
+					<option value="1" <c:if test="${reserveManagement.whetherNeedWiringDiagram=='1'}">selected</c:if>>是</option>
+					<option value="0" <c:if test="${reserveManagement.whetherNeedWiringDiagram=='0'}">selected</c:if>>否</option>
+				</select>
+			</td>
+			<td class="width-15 active"><label class="">是否完成物资清册编制：</label></td>
+			<td class="width-35">
+				<select id="whetherFinishMaterials" name="whetherFinishMaterials" class="form-control">
+					<option value="">请选择</option>
+					<option value="1" <c:if test="${reserveManagement.whetherFinishMaterials=='1'}">selected</c:if>>是</option>
+					<option value="0" <c:if test="${reserveManagement.whetherFinishMaterials=='0'}">selected</c:if>>否</option>
+				</select>
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">是否完成图纸移交：</label></td>
+			<td class="width-35">
+				<select id="whetherFinishDrawing" name="whetherFinishDrawing" class="form-control">
+					<option value="">请选择</option>
+					<option value="1" <c:if test="${reserveManagement.whetherFinishDrawing=='1'}">selected</c:if>>是</option>
+					<option value="0" <c:if test="${reserveManagement.whetherFinishDrawing=='0'}">selected</c:if>>否</option>
+				</select>
+			</td>
+		</tr>
+		<tr>
+			<td colspan="4" class="width-15 active"><label class="">方案交底组织：</label></td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">交底牵头部门：</label></td>
+			<td class="width-35">
+				<form:input path="disclosureToCoordinate" htmlEscape="false" class="form-control"/>
+			</td>
+			<td class="width-15 active"><label class="">交底参与部门：</label></td>
+			<td class="width-35">
+				<form:input path="disclosureParticipate" htmlEscape="false"    class="form-control"/>
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">是否完成交底：</label></td>
+			<td class="width-35">
+				<select id="whetherFinishDisclosure" name="whetherFinishDisclosure"  class="form-control">
+					<option value="">请选择</option>
+					<option value="1" <c:if test="${reserveManagement.whetherFinishDisclosure=='1'}">selected</c:if>>是</option>
+					<option value="0" <c:if test="${reserveManagement.whetherFinishDisclosure=='0'}">selected</c:if>>否</option>
+				</select>
+			</td>
+			<td class="width-15 active"><label class="">项目管理中心人员：</label></td>
+			<td class="width-35">
+				<form:input path="projectManagementPeople" htmlEscape="false"    class="form-control"/>
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">设计院人员：</label></td>
+			<td class="width-35">
+				<form:input path="designingInstitutePeople" htmlEscape="false"    class="form-control"/>
+			</td>
+			<td class="width-15 active"><label class="">经研所人员：</label></td>
+			<td class="width-35">
+				<form:input path="ifoPeople" htmlEscape="false" class="form-control"/>
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">区域中心人员：</label></td>
+			<td class="width-35">
+				<form:input path="regionalCenterPeople" htmlEscape="false" class="form-control"/>
+			</td>
+			<td class="width-15 active"><label class="">不停电作业中心人员：</label></td>
+			<td class="width-35">
+				<form:input path="uninterruptedOperationPeople" htmlEscape="false"    class="form-control"/>
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">作业方式：</label></td>
+			<td class="width-35">
+				<form:input path="workMode" htmlEscape="false"    class="form-control"/>
+			</td>
+			<td class="width-15 active"><label class="">交底完成日期：</label></td>
+			<td class="width-35">
+				<div class='input-group form_datetime' id='disclosureFinishDate'>
+					<input type='text'  name="disclosureFinishDate" class="form-control required"  value="<fmt:formatDate value="${reserveManagement.disclosureFinishDate}" pattern="yyyy-MM-dd"/>"/>
+					<span class="input-group-addon">
+						<span class="glyphicon glyphicon-calendar"></span>
+					</span>
+				</div>
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">备注：</label></td>
+			<td class="width-35">
+				<form:textarea path="disclosureRemarks" htmlEscape="false" rows="3" maxlength="255" class="form-control"/>
+			</td>
+		</tr>
+
+
+
+
+		<tr>
+			<td colspan="4" class="width-15 active"><label class="">方案交底结论：</label></td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">立项说明：</label></td>
+			<td class="width-35">
+				<form:textarea path="projectDescription" htmlEscape="false" rows="3" maxlength="255" class="form-control"/>
+			</td>
+			<td class="width-15 active"><label class="">不具备立项条件说明：</label></td>
+			<td class="width-35">
+				<form:textarea path="doNotPossessProjectDescription" htmlEscape="false" rows="3" maxlength="255" class="form-control"/>
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">方案变更说明：</label></td>
+			<td class="width-35">
+				<form:textarea path="changedProgramsExplain" htmlEscape="false" rows="3" maxlength="255" class="form-control"/>
+			</td>
+			<td class="width-15 active"><label class="">政处难度初判：</label></td>
+			<td class="width-35">
+				<form:input path="initialDifficulty" htmlEscape="false"    class="form-control"/>
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">是否有资本设备：</label></td>
+			<td class="width-35">
+				<select id="capitalEquipment" name="capitalEquipment"  class="form-control">
+					<option value="">请选择</option>
+					<option value="1" <c:if test="${reserveManagement.capitalEquipment=='1'}">selected</c:if>>是</option>
+					<option value="0" <c:if test="${reserveManagement.capitalEquipment=='0'}">selected</c:if>>否</option>
+				</select>
+			</td>
+			<td class="width-15 active"><label class="">是否有变电站新出线：</label></td>
+			<td class="width-35">
+				<select id="substationNewLine" name="substationNewLine"  class="form-control">
+					<option value="">请选择</option>
+					<option value="1" <c:if test="${reserveManagement.substationNewLine=='1'}">selected</c:if>>是</option>
+					<option value="0" <c:if test="${reserveManagement.substationNewLine=='0'}">selected</c:if>>否</option>
+				</select>
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">是否已实施：</label></td>
+			<td class="width-35">
+				<select id="whetherImplement" name="whetherImplement"  class="form-control">
+					<option value="">请选择</option>
+					<option value="1" <c:if test="${reserveManagement.whetherImplement=='1'}">selected</c:if>>是</option>
+					<option value="0" <c:if test="${reserveManagement.whetherImplement=='0'}">selected</c:if>>否</option>
+				</select>
+			</td>
+			<td class="width-15 active"><label class="">现场情况描述：</label></td>
+			<td class="width-35">
+				<form:textarea path="fieldDescription" htmlEscape="false" rows="3" maxlength="255" class="form-control"/>
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">是否有实施必要性：</label></td>
+			<td class="width-35">
+				<select id="necessaryOfImplementation" name="necessaryOfImplementation"  class="form-control">
+					<option value="">请选择</option>
+					<option value="1" <c:if test="${reserveManagement.necessaryOfImplementation=='1'}">selected</c:if>>是</option>
+					<option value="0" <c:if test="${reserveManagement.necessaryOfImplementation=='0'}">selected</c:if>>否</option>
+				</select>
+			</td>
+			<td class="width-15 active"><label class="">实施无必要描述：</label></td>
+			<td class="width-35">
+				<form:textarea path="unnecessaryDescription" htmlEscape="false" rows="3" maxlength="255" class="form-control"/>
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">是否存在前置条件：</label></td>
+			<td class="width-35">
+				<select id="precondition" name="precondition"  class="form-control">
+					<option value="">请选择</option>
+					<option value="1" <c:if test="${reserveManagement.precondition=='1'}">selected</c:if>>是</option>
+					<option value="0" <c:if test="${reserveManagement.precondition=='0'}">selected</c:if>>否</option>
+				</select>
+			</td>
+			<td class="width-15 active"><label class="">前置条件描述：</label></td>
+			<td class="width-35">
+				<form:textarea path="conditionsDescribed" htmlEscape="false" rows="3" maxlength="255" class="form-control"/>
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">是否存在施工方案问题：</label></td>
+			<td class="width-35">
+				<select id="constructionSchemeProblem" name="constructionSchemeProblem"  class="form-control">
+					<option value="">请选择</option>
+					<option value="1" <c:if test="${reserveManagement.constructionSchemeProblem=='1'}">selected</c:if>>是</option>
+					<option value="0" <c:if test="${reserveManagement.constructionSchemeProblem=='0'}">selected</c:if>>否</option>
+				</select>
+			</td>
+			<td class="width-15 active"><label class="">施工方案问题描述：</label></td>
+			<td class="width-35">
+				<form:textarea path="problemDescriptionOfConstructionScheme" htmlEscape="false" rows="3" maxlength="255" class="form-control"/>
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">现场是否存在安全隐患：</label></td>
+			<td class="width-35">
+				<select id="existingSecurityThreat" name="existingSecurityThreat"  class="form-control">
+					<option value="">请选择</option>
+					<option value="1" <c:if test="${reserveManagement.existingSecurityThreat=='1'}">selected</c:if>>是</option>
+					<option value="0" <c:if test="${reserveManagement.existingSecurityThreat=='0'}">selected</c:if>>否</option>
+				</select>
+			</td>
+			<td class="width-15 active"><label class="">安全隐患描述：</label></td>
+			<td class="width-35">
+				<form:textarea path="safetyHazardDescription" htmlEscape="false" rows="3" maxlength="255" class="form-control"/>
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">是否需要定制物资：</label></td>
+			<td class="width-35">
+				<select id="customizedMaterials" name="customizedMaterials"  class="form-control">
+					<option value="">请选择</option>
+					<option value="1" <c:if test="${reserveManagement.customizedMaterials=='1'}">selected</c:if>>是</option>
+					<option value="0" <c:if test="${reserveManagement.customizedMaterials=='0'}">selected</c:if>>否</option>
+				</select>
+			</td>
+			<td class="width-15 active"><label class="">定制物资描述：</label></td>
+			<td class="width-35">
+				<form:textarea path="materialDescription" htmlEscape="false" rows="3" maxlength="255" class="form-control"/>
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">是否有拆旧物资：</label></td>
+			<td class="width-35">
+				<select id="dismantlingTheOldMaterial" name="dismantlingTheOldMaterial"  class="form-control">
+					<option value="">请选择</option>
+					<option value="1" <c:if test="${reserveManagement.dismantlingTheOldMaterial=='1'}">selected</c:if>>是</option>
+					<option value="0" <c:if test="${reserveManagement.dismantlingTheOldMaterial=='0'}">selected</c:if>>否</option>
+				</select>
+			</td>
+			<td class="width-15 active"><label class="">作业方式：</label></td>
+			<td class="width-35">
+				<form:input path="operatingType" htmlEscape="false"    class="form-control"/>
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">是否有土建工作量：</label></td>
+			<td class="width-35">
+				<select id="civilWork" name="civilWork"  class="form-control">
+					<option value="">请选择</option>
+					<option value="1" <c:if test="${reserveManagement.civilWork=='1'}">selected</c:if>>是</option>
+					<option value="0" <c:if test="${reserveManagement.civilWork=='0'}">selected</c:if>>否</option>
+				</select>
+			</td>
+			<td class="width-15 active"><label class="">停电问题描述：</label></td>
+			<td class="width-35">
+				<form:textarea path="problemDescription" htmlEscape="false" rows="3" maxlength="255" class="form-control"/>
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">是否有立杆工作量：</label></td>
+			<td class="width-35">
+				<select id="verticalRodWorkload" name="verticalRodWorkload"  class="form-control">
+					<option value="">请选择</option>
+					<option value="1" <c:if test="${reserveManagement.verticalRodWorkload=='1'}">selected</c:if>>是</option>
+					<option value="0" <c:if test="${reserveManagement.verticalRodWorkload=='0'}">selected</c:if>>否</option>
+				</select>
+			</td>
+			<td class="width-15 active"><label class="">总工作量描述：</label></td>
+			<td class="width-35">
+				<form:textarea path="totalWorkloadDescription" htmlEscape="false" rows="3" maxlength="255" class="form-control"/>
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">区域中心：</label></td>
+			<td class="width-35">
+				<form:input path="regionalCenter" htmlEscape="false" class="form-control"/>
+			</td>
+			<td class="width-15 active"><label class="">供电所辖区：</label></td>
+			<td class="width-35">
+				<form:input path="powerSupplyArea" htmlEscape="false" class="form-control"/>
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">政处地点：</label></td>
+			<td class="width-35">
+				<form:input path="zhengLocation" htmlEscape="false" class="form-control"/>
+			</td>
+			<td class="width-15 active"><label class="">政处类型（可多类）：</label></td>
+			<td class="width-35">
+				<form:input path="zhengType" htmlEscape="false" class="form-control"/>
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">政处对象（产权单位）：</label></td>
+			<td class="width-35">
+				<form:input path="zhengObject" htmlEscape="false" class="form-control"/>
+			</td>
+			<td class="width-15 active"><label class="">政处描述：</label></td>
+			<td class="width-35">
+				<form:textarea path="zhengDescribe" htmlEscape="false" rows="3" maxlength="255" class="form-control"/>
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">是否需规划报批：</label></td>
+			<td class="width-35">
+				<select id="projectApproval" name="projectApproval" class="form-control">
+					<option value="">请选择</option>
+					<option value="1" <c:if test="${reserveManagement.projectApproval=='1'}">selected</c:if>>是</option>
+					<option value="0" <c:if test="${reserveManagement.projectApproval=='0'}">selected</c:if>>否</option>
+				</select>
+			</td>
+			<td class="width-15 active"><label class="">是否需办理安评航评手续：</label></td>
+			<td class="width-35">
+				<select id="courseEvaluationProcedures" name="courseEvaluationProcedures" class="form-control">
+					<option value="">请选择</option>
+					<option value="1" <c:if test="${reserveManagement.courseEvaluationProcedures=='1'}">selected</c:if>>是</option>
+					<option value="0" <c:if test="${reserveManagement.courseEvaluationProcedures=='0'}">selected</c:if>>否</option>
+				</select>
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">政处难点提醒：</label></td>
+			<td class="width-35">
+				<form:textarea path="zhengDifficultyWarn" htmlEscape="false" rows="3" maxlength="255" class="form-control"/>
+			</td>
+		</tr>
+		</tbody>
+	</table>
+</form:form>
+</body>
+</html>