储备模块功能调整

src/main/java/com/jeeplus/modules/cg/reservemanagementcenter/reserveManage/entity/CompanyReview.java

@@ -14,6 +14,7 @@ public class CompanyReview extends DataEntity<CompanyReview> {
     private String demandUnit;              //需求单位
     private String district;                //区域
     private String projectGroup;            //项目分组
+    private String projectManager;          //业主储备项目经理
     private String reserveBatches;          //储备批次
     private String blockSupply;             //供电区域
     private String gridNumber;              //网格编号
@@ -25,6 +26,7 @@ public class CompanyReview extends DataEntity<CompanyReview> {
     private String circuitName;              //线路名称
     private String netRackProjectDivide;     //网架项目划分
     private String requirementType;          //需求类型
+    private String projectType;          //项目类型
     private String costEstimate;             //费用估算
     private String basicRemarks;             //备注
 
@@ -75,6 +77,14 @@ public class CompanyReview extends DataEntity<CompanyReview> {
         this.projectGroup = projectGroup;
     }
 
+    public String getProjectManager() {
+        return projectManager;
+    }
+
+    public void setProjectManager(String projectManager) {
+        this.projectManager = projectManager;
+    }
+
     public String getReserveBatches() {
         return reserveBatches;
     }
@@ -163,6 +173,14 @@ public class CompanyReview extends DataEntity<CompanyReview> {
         this.requirementType = requirementType;
     }
 
+    public String getProjectType() {
+        return projectType;
+    }
+
+    public void setProjectType(String projectType) {
+        this.projectType = projectType;
+    }
+
     public String getCostEstimate() {
         return costEstimate;
     }

src/main/java/com/jeeplus/modules/cg/reservemanagementcenter/reserveManage/entity/ProjectScreen.java

@@ -0,0 +1,549 @@
+package com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.entity;
+
+import com.jeeplus.core.persistence.DataEntity;
+
+/**
+ * 储备项目立项筛选统计表
+ * @author: 王强
+ * @create: 2023-06-28 08:54
+ **/
+public class ProjectScreen extends DataEntity<ProjectScreen> {
+
+    private String projectManager;          //项目储备经理
+    private String projectYear;             //项目年份
+    private String projectNature;           //项目性质
+    private String demandUnit;              //需求单位
+    private String district;                //区域
+    private String projectGroup;            //项目分组
+    private String reserveBatches;          //储备批次
+    private String blockSupply;             //供电区域
+    private String gridNumber;              //网格编号
+    private String cellNumber;              //单元格编号
+    private String projectReserveId;        //项目储备编号
+    private String projectName;             //项目名称
+    private String stateGridProjectCode;             //国网项目编码
+    private String stateGridProjectName;             //国网项目名称
+    private String constructionNecessityAndContent;           //建设必要性及内容
+    private String substationName;           //变电站名称
+    private String circuitName;              //线路名称
+    private String netRackProjectDivide;     //网架项目划分
+    private String requirementType;          //需求类型
+    private String projectType;          //项目类型
+    private String costEstimate;             //费用估算
+    private String basicRemarks;             //储备项目基本信息-备注
+
+    private String reserveProgress;          //储备进度
+    private String implementReserve;         //是否纳入储备
+    private String implementBatch;           //初定实施批次
+
+    private String civilWorkload;             //是否含土建工作量
+    private String civilWorkloadStatistics;   //土建工作量统计
+    private String uprightPoleWorkload;             //是否含立杆工作量
+    private String uprightPoleWorkloadStatistics;   //立杆工作量统计
+    private String budgetIncludesTax;        //预算含税
+    private String budgetNotIncludesTax;     //预算不含税
+    private String constructCostExcludeTax;  //施工费（不含税）
+    private String projectQuantityRemarks;         //储备项目工程量统计-备注
+
+    private String comprehensiveProject;      //项目综合可实施性
+    private String officeDifficulty;         //政处难度
+    private String officeProgress;           //政处描述
+    private String powerFailureDifficulty;   //停电难度
+    private String powerFailureDescribe;     //停电描述
+    private String otherProblemDifficulty;   //其他问题难度
+    private String otherProblemDescribe;     //其他问题描述
+    private String runPlanRequire;           //是否需重跑方案
+    private String programChangeDescription; //方案变更说明
+    private String discloseRemarks;          //储备项目交底信息-备注
+
+    private String projectPromotion;        //储备项目推进任务。
+    private String completeProgress;        //完成进度。
+    private String fireAdministrativeDepartment;  //是否启动政处
+    private String administrativeProgress;           //政处进度
+    private String preliminaryWorkPreparationRemarks;           //储备项目前期准备工作-备注。
+
+    private String requirementUnitPriority;     //需求单位优先级
+    private String implementPlan;            //是否纳入实施计划
+    private String implementBatchScreen;           //立项筛选-初定实施批次
+    private String constructionUnit;           //初定施工单位
+    private String projectApprovalBatch;           //实际立项批次
+    private String realityConstructionUnit;           //实际施工单位
+    private String approvalDiagram;           //是否需出规划报批图
+    private String approvalDiagramTime;           //要求移交规划报批图时间
+    private String paperDrawing;           //是否需出纸质图
+    private String paperDrawingTime;           //要求移交纸质图纸时间
+    private String screenRemarks;           //立项筛选-备注
+
+
+    public String getProjectManager() {
+        return projectManager;
+    }
+
+    public void setProjectManager(String projectManager) {
+        this.projectManager = projectManager;
+    }
+
+    public String getProjectYear() {
+        return projectYear;
+    }
+
+    public void setProjectYear(String projectYear) {
+        this.projectYear = projectYear;
+    }
+
+    public String getProjectNature() {
+        return projectNature;
+    }
+
+    public void setProjectNature(String projectNature) {
+        this.projectNature = projectNature;
+    }
+
+    public String getDemandUnit() {
+        return demandUnit;
+    }
+
+    public void setDemandUnit(String demandUnit) {
+        this.demandUnit = demandUnit;
+    }
+
+    public String getDistrict() {
+        return district;
+    }
+
+    public void setDistrict(String district) {
+        this.district = district;
+    }
+
+    public String getProjectGroup() {
+        return projectGroup;
+    }
+
+    public void setProjectGroup(String projectGroup) {
+        this.projectGroup = projectGroup;
+    }
+
+    public String getReserveBatches() {
+        return reserveBatches;
+    }
+
+    public void setReserveBatches(String reserveBatches) {
+        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;
+    }
+
+    public void setProjectReserveId(String projectReserveId) {
+        this.projectReserveId = projectReserveId;
+    }
+
+    public String getProjectName() {
+        return projectName;
+    }
+
+    public void setProjectName(String projectName) {
+        this.projectName = projectName;
+    }
+
+    public String getStateGridProjectCode() {
+        return stateGridProjectCode;
+    }
+
+    public void setStateGridProjectCode(String stateGridProjectCode) {
+        this.stateGridProjectCode = stateGridProjectCode;
+    }
+
+    public String getStateGridProjectName() {
+        return stateGridProjectName;
+    }
+
+    public void setStateGridProjectName(String stateGridProjectName) {
+        this.stateGridProjectName = stateGridProjectName;
+    }
+
+    public String getConstructionNecessityAndContent() {
+        return constructionNecessityAndContent;
+    }
+
+    public void setConstructionNecessityAndContent(String constructionNecessityAndContent) {
+        this.constructionNecessityAndContent = constructionNecessityAndContent;
+    }
+
+    public String getSubstationName() {
+        return substationName;
+    }
+
+    public void setSubstationName(String substationName) {
+        this.substationName = substationName;
+    }
+
+    public String getCircuitName() {
+        return circuitName;
+    }
+
+    public void setCircuitName(String circuitName) {
+        this.circuitName = circuitName;
+    }
+
+    public String getNetRackProjectDivide() {
+        return netRackProjectDivide;
+    }
+
+    public void setNetRackProjectDivide(String netRackProjectDivide) {
+        this.netRackProjectDivide = netRackProjectDivide;
+    }
+
+    public String getRequirementType() {
+        return requirementType;
+    }
+
+    public void setRequirementType(String requirementType) {
+        this.requirementType = requirementType;
+    }
+
+    public String getProjectType() {
+        return projectType;
+    }
+
+    public void setProjectType(String projectType) {
+        this.projectType = projectType;
+    }
+
+    public String getCostEstimate() {
+        return costEstimate;
+    }
+
+    public void setCostEstimate(String costEstimate) {
+        this.costEstimate = costEstimate;
+    }
+
+    public String getBasicRemarks() {
+        return basicRemarks;
+    }
+
+    public void setBasicRemarks(String basicRemarks) {
+        this.basicRemarks = basicRemarks;
+    }
+
+    public String getReserveProgress() {
+        return reserveProgress;
+    }
+
+    public void setReserveProgress(String reserveProgress) {
+        this.reserveProgress = reserveProgress;
+    }
+
+    public String getImplementReserve() {
+        return implementReserve;
+    }
+
+    public void setImplementReserve(String implementReserve) {
+        this.implementReserve = implementReserve;
+    }
+
+    public String getImplementBatch() {
+        return implementBatch;
+    }
+
+    public void setImplementBatch(String implementBatch) {
+        this.implementBatch = implementBatch;
+    }
+
+    public String getCivilWorkload() {
+        return civilWorkload;
+    }
+
+    public void setCivilWorkload(String civilWorkload) {
+        this.civilWorkload = civilWorkload;
+    }
+
+    public String getCivilWorkloadStatistics() {
+        return civilWorkloadStatistics;
+    }
+
+    public void setCivilWorkloadStatistics(String civilWorkloadStatistics) {
+        this.civilWorkloadStatistics = civilWorkloadStatistics;
+    }
+
+    public String getUprightPoleWorkload() {
+        return uprightPoleWorkload;
+    }
+
+    public void setUprightPoleWorkload(String uprightPoleWorkload) {
+        this.uprightPoleWorkload = uprightPoleWorkload;
+    }
+
+    public String getUprightPoleWorkloadStatistics() {
+        return uprightPoleWorkloadStatistics;
+    }
+
+    public void setUprightPoleWorkloadStatistics(String uprightPoleWorkloadStatistics) {
+        this.uprightPoleWorkloadStatistics = uprightPoleWorkloadStatistics;
+    }
+
+    public String getBudgetIncludesTax() {
+        return budgetIncludesTax;
+    }
+
+    public void setBudgetIncludesTax(String budgetIncludesTax) {
+        this.budgetIncludesTax = budgetIncludesTax;
+    }
+
+    public String getBudgetNotIncludesTax() {
+        return budgetNotIncludesTax;
+    }
+
+    public void setBudgetNotIncludesTax(String budgetNotIncludesTax) {
+        this.budgetNotIncludesTax = budgetNotIncludesTax;
+    }
+
+    public String getConstructCostExcludeTax() {
+        return constructCostExcludeTax;
+    }
+
+    public void setConstructCostExcludeTax(String constructCostExcludeTax) {
+        this.constructCostExcludeTax = constructCostExcludeTax;
+    }
+
+    public String getProjectQuantityRemarks() {
+        return projectQuantityRemarks;
+    }
+
+    public void setProjectQuantityRemarks(String projectQuantityRemarks) {
+        this.projectQuantityRemarks = projectQuantityRemarks;
+    }
+
+    public String getComprehensiveProject() {
+        return comprehensiveProject;
+    }
+
+    public void setComprehensiveProject(String comprehensiveProject) {
+        this.comprehensiveProject = comprehensiveProject;
+    }
+
+    public String getOfficeDifficulty() {
+        return officeDifficulty;
+    }
+
+    public void setOfficeDifficulty(String officeDifficulty) {
+        this.officeDifficulty = officeDifficulty;
+    }
+
+    public String getOfficeProgress() {
+        return officeProgress;
+    }
+
+    public void setOfficeProgress(String officeProgress) {
+        this.officeProgress = officeProgress;
+    }
+
+    public String getPowerFailureDifficulty() {
+        return powerFailureDifficulty;
+    }
+
+    public void setPowerFailureDifficulty(String powerFailureDifficulty) {
+        this.powerFailureDifficulty = powerFailureDifficulty;
+    }
+
+    public String getPowerFailureDescribe() {
+        return powerFailureDescribe;
+    }
+
+    public void setPowerFailureDescribe(String powerFailureDescribe) {
+        this.powerFailureDescribe = powerFailureDescribe;
+    }
+
+    public String getOtherProblemDifficulty() {
+        return otherProblemDifficulty;
+    }
+
+    public void setOtherProblemDifficulty(String otherProblemDifficulty) {
+        this.otherProblemDifficulty = otherProblemDifficulty;
+    }
+
+    public String getOtherProblemDescribe() {
+        return otherProblemDescribe;
+    }
+
+    public void setOtherProblemDescribe(String otherProblemDescribe) {
+        this.otherProblemDescribe = otherProblemDescribe;
+    }
+
+    public String getRunPlanRequire() {
+        return runPlanRequire;
+    }
+
+    public void setRunPlanRequire(String runPlanRequire) {
+        this.runPlanRequire = runPlanRequire;
+    }
+
+    public String getProgramChangeDescription() {
+        return programChangeDescription;
+    }
+
+    public void setProgramChangeDescription(String programChangeDescription) {
+        this.programChangeDescription = programChangeDescription;
+    }
+
+    public String getDiscloseRemarks() {
+        return discloseRemarks;
+    }
+
+    public void setDiscloseRemarks(String discloseRemarks) {
+        this.discloseRemarks = discloseRemarks;
+    }
+
+    public String getProjectPromotion() {
+        return projectPromotion;
+    }
+
+    public void setProjectPromotion(String projectPromotion) {
+        this.projectPromotion = projectPromotion;
+    }
+
+    public String getCompleteProgress() {
+        return completeProgress;
+    }
+
+    public void setCompleteProgress(String completeProgress) {
+        this.completeProgress = completeProgress;
+    }
+
+    public String getFireAdministrativeDepartment() {
+        return fireAdministrativeDepartment;
+    }
+
+    public void setFireAdministrativeDepartment(String fireAdministrativeDepartment) {
+        this.fireAdministrativeDepartment = fireAdministrativeDepartment;
+    }
+
+    public String getAdministrativeProgress() {
+        return administrativeProgress;
+    }
+
+    public void setAdministrativeProgress(String administrativeProgress) {
+        this.administrativeProgress = administrativeProgress;
+    }
+
+    public String getPreliminaryWorkPreparationRemarks() {
+        return preliminaryWorkPreparationRemarks;
+    }
+
+    public void setPreliminaryWorkPreparationRemarks(String preliminaryWorkPreparationRemarks) {
+        this.preliminaryWorkPreparationRemarks = preliminaryWorkPreparationRemarks;
+    }
+
+    public String getRequirementUnitPriority() {
+        return requirementUnitPriority;
+    }
+
+    public void setRequirementUnitPriority(String requirementUnitPriority) {
+        this.requirementUnitPriority = requirementUnitPriority;
+    }
+
+    public String getImplementPlan() {
+        return implementPlan;
+    }
+
+    public void setImplementPlan(String implementPlan) {
+        this.implementPlan = implementPlan;
+    }
+
+    public String getImplementBatchScreen() {
+        return implementBatchScreen;
+    }
+
+    public void setImplementBatchScreen(String implementBatchScreen) {
+        this.implementBatchScreen = implementBatchScreen;
+    }
+
+    public String getConstructionUnit() {
+        return constructionUnit;
+    }
+
+    public void setConstructionUnit(String constructionUnit) {
+        this.constructionUnit = constructionUnit;
+    }
+
+    public String getProjectApprovalBatch() {
+        return projectApprovalBatch;
+    }
+
+    public void setProjectApprovalBatch(String projectApprovalBatch) {
+        this.projectApprovalBatch = projectApprovalBatch;
+    }
+
+    public String getRealityConstructionUnit() {
+        return realityConstructionUnit;
+    }
+
+    public void setRealityConstructionUnit(String realityConstructionUnit) {
+        this.realityConstructionUnit = realityConstructionUnit;
+    }
+
+    public String getApprovalDiagram() {
+        return approvalDiagram;
+    }
+
+    public void setApprovalDiagram(String approvalDiagram) {
+        this.approvalDiagram = approvalDiagram;
+    }
+
+    public String getApprovalDiagramTime() {
+        return approvalDiagramTime;
+    }
+
+    public void setApprovalDiagramTime(String approvalDiagramTime) {
+        this.approvalDiagramTime = approvalDiagramTime;
+    }
+
+    public String getPaperDrawing() {
+        return paperDrawing;
+    }
+
+    public void setPaperDrawing(String paperDrawing) {
+        this.paperDrawing = paperDrawing;
+    }
+
+    public String getPaperDrawingTime() {
+        return paperDrawingTime;
+    }
+
+    public void setPaperDrawingTime(String paperDrawingTime) {
+        this.paperDrawingTime = paperDrawingTime;
+    }
+
+    public String getScreenRemarks() {
+        return screenRemarks;
+    }
+
+    public void setScreenRemarks(String screenRemarks) {
+        this.screenRemarks = screenRemarks;
+    }
+}

src/main/java/com/jeeplus/modules/cg/reservemanagementcenter/reserveManage/entity/ProjectTypeVerificate.java

@@ -0,0 +1,372 @@
+package com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.entity;
+
+import com.jeeplus.core.persistence.DataEntity;
+
+/**
+ * 储备项目项目类型校核表
+ * @author: 王强
+ * @create: 2022-07-20 13:40
+ **/
+public class ProjectTypeVerificate extends DataEntity<ProjectTypeVerificate> {
+
+    private String projectManager;          //项目储备经理
+    private String projectYear;             //项目年份
+    private String demandUnit;              //需求单位
+    private String district;                //区域
+    private String projectGroup;            //项目分组
+    private String reserveBatches;          //储备批次
+    private String blockSupply;             //供电区域
+    private String gridNumber;              //网格编号
+    private String cellNumber;              //单元格编号
+    private String projectReserveId;        //项目储备编号
+    private String projectName;             //项目名称
+    private String stateGridProjectCode;             //国网项目编码
+    private String stateGridProjectName;             //国网项目名称
+    private String constructionNecessityAndContent;           //建设必要性及内容
+    private String substationName;           //变电站名称
+    private String circuitName;              //线路名称
+    private String netRackProjectDivide;     //网架项目划分
+    private String requirementType;          //需求类型
+    private String costEstimate;             //费用估算
+    private String basicRemarks;             //储备项目基本信息-备注
+    private String reserveProgress;          //储备进度
+    private String implementPlan;            //是否纳入实施计划
+    private String implementBatch;           //初定实施批次
+    private String projectNature;           //项目性质（初定）
+    private String newSubstation;           //是否含变电站新出线
+    private String includeCapitalEquipment;    //是否含资本设备
+    private String projectProperties;    //项目属性（系统判断）
+    private String projectNatureArtificial;   //项目性质（人工判断）
+    private String projectType;   //项目类型（初定）
+    private String civilEngineer;           //是否含土建
+    private String includeCables;           //是否含电缆
+    private String poleWorkload;           //是否含立杆工作量
+    private String oldPoleWorkload;           //是否含架空线
+    private String ringNetworkCabinet;           //是否含环网柜
+    private String oldRingNetworkCabinet;           //是否含拆旧环网柜
+    private String boxTransformer;           //是否含箱变
+    private String oldBoxTransformer;           //是否含拆旧箱变
+    private String distributionTransformer;           //是否含配变
+    private String oldDistributionTransformer;           //是否含拆旧配变
+    private String includeCablesArtificial;           //项目类型（人工判断）
+
+    public String getProjectManager() {
+        return projectManager;
+    }
+
+    public void setProjectManager(String projectManager) {
+        this.projectManager = projectManager;
+    }
+
+    public String getProjectYear() {
+        return projectYear;
+    }
+
+    public void setProjectYear(String projectYear) {
+        this.projectYear = projectYear;
+    }
+
+    public String getDemandUnit() {
+        return demandUnit;
+    }
+
+    public void setDemandUnit(String demandUnit) {
+        this.demandUnit = demandUnit;
+    }
+
+    public String getDistrict() {
+        return district;
+    }
+
+    public void setDistrict(String district) {
+        this.district = district;
+    }
+
+    public String getProjectGroup() {
+        return projectGroup;
+    }
+
+    public void setProjectGroup(String projectGroup) {
+        this.projectGroup = projectGroup;
+    }
+
+    public String getReserveBatches() {
+        return reserveBatches;
+    }
+
+    public void setReserveBatches(String reserveBatches) {
+        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;
+    }
+
+    public void setProjectReserveId(String projectReserveId) {
+        this.projectReserveId = projectReserveId;
+    }
+
+    public String getProjectName() {
+        return projectName;
+    }
+
+    public void setProjectName(String projectName) {
+        this.projectName = projectName;
+    }
+
+    public String getStateGridProjectCode() {
+        return stateGridProjectCode;
+    }
+
+    public void setStateGridProjectCode(String stateGridProjectCode) {
+        this.stateGridProjectCode = stateGridProjectCode;
+    }
+
+    public String getStateGridProjectName() {
+        return stateGridProjectName;
+    }
+
+    public void setStateGridProjectName(String stateGridProjectName) {
+        this.stateGridProjectName = stateGridProjectName;
+    }
+
+    public String getConstructionNecessityAndContent() {
+        return constructionNecessityAndContent;
+    }
+
+    public void setConstructionNecessityAndContent(String constructionNecessityAndContent) {
+        this.constructionNecessityAndContent = constructionNecessityAndContent;
+    }
+
+    public String getSubstationName() {
+        return substationName;
+    }
+
+    public void setSubstationName(String substationName) {
+        this.substationName = substationName;
+    }
+
+    public String getCircuitName() {
+        return circuitName;
+    }
+
+    public void setCircuitName(String circuitName) {
+        this.circuitName = circuitName;
+    }
+
+    public String getNetRackProjectDivide() {
+        return netRackProjectDivide;
+    }
+
+    public void setNetRackProjectDivide(String netRackProjectDivide) {
+        this.netRackProjectDivide = netRackProjectDivide;
+    }
+
+    public String getRequirementType() {
+        return requirementType;
+    }
+
+    public void setRequirementType(String requirementType) {
+        this.requirementType = requirementType;
+    }
+
+    public String getCostEstimate() {
+        return costEstimate;
+    }
+
+    public void setCostEstimate(String costEstimate) {
+        this.costEstimate = costEstimate;
+    }
+
+    public String getBasicRemarks() {
+        return basicRemarks;
+    }
+
+    public void setBasicRemarks(String basicRemarks) {
+        this.basicRemarks = basicRemarks;
+    }
+
+    public String getReserveProgress() {
+        return reserveProgress;
+    }
+
+    public void setReserveProgress(String reserveProgress) {
+        this.reserveProgress = reserveProgress;
+    }
+
+    public String getImplementPlan() {
+        return implementPlan;
+    }
+
+    public void setImplementPlan(String implementPlan) {
+        this.implementPlan = implementPlan;
+    }
+
+    public String getImplementBatch() {
+        return implementBatch;
+    }
+
+    public void setImplementBatch(String implementBatch) {
+        this.implementBatch = implementBatch;
+    }
+
+    public String getProjectNature() {
+        return projectNature;
+    }
+
+    public void setProjectNature(String projectNature) {
+        this.projectNature = projectNature;
+    }
+
+    public String getNewSubstation() {
+        return newSubstation;
+    }
+
+    public void setNewSubstation(String newSubstation) {
+        this.newSubstation = newSubstation;
+    }
+
+    public String getIncludeCapitalEquipment() {
+        return includeCapitalEquipment;
+    }
+
+    public void setIncludeCapitalEquipment(String includeCapitalEquipment) {
+        this.includeCapitalEquipment = includeCapitalEquipment;
+    }
+
+    public String getProjectProperties() {
+        return projectProperties;
+    }
+
+    public void setProjectProperties(String projectProperties) {
+        this.projectProperties = projectProperties;
+    }
+
+    public String getProjectNatureArtificial() {
+        return projectNatureArtificial;
+    }
+
+    public void setProjectNatureArtificial(String projectNatureArtificial) {
+        this.projectNatureArtificial = projectNatureArtificial;
+    }
+
+    public String getProjectType() {
+        return projectType;
+    }
+
+    public void setProjectType(String projectType) {
+        this.projectType = projectType;
+    }
+
+    public String getCivilEngineer() {
+        return civilEngineer;
+    }
+
+    public void setCivilEngineer(String civilEngineer) {
+        this.civilEngineer = civilEngineer;
+    }
+
+    public String getIncludeCables() {
+        return includeCables;
+    }
+
+    public void setIncludeCables(String includeCables) {
+        this.includeCables = includeCables;
+    }
+
+    public String getPoleWorkload() {
+        return poleWorkload;
+    }
+
+    public void setPoleWorkload(String poleWorkload) {
+        this.poleWorkload = poleWorkload;
+    }
+
+    public String getOldPoleWorkload() {
+        return oldPoleWorkload;
+    }
+
+    public void setOldPoleWorkload(String oldPoleWorkload) {
+        this.oldPoleWorkload = oldPoleWorkload;
+    }
+
+    public String getRingNetworkCabinet() {
+        return ringNetworkCabinet;
+    }
+
+    public void setRingNetworkCabinet(String ringNetworkCabinet) {
+        this.ringNetworkCabinet = ringNetworkCabinet;
+    }
+
+    public String getOldRingNetworkCabinet() {
+        return oldRingNetworkCabinet;
+    }
+
+    public void setOldRingNetworkCabinet(String oldRingNetworkCabinet) {
+        this.oldRingNetworkCabinet = oldRingNetworkCabinet;
+    }
+
+    public String getBoxTransformer() {
+        return boxTransformer;
+    }
+
+    public void setBoxTransformer(String boxTransformer) {
+        this.boxTransformer = boxTransformer;
+    }
+
+    public String getOldBoxTransformer() {
+        return oldBoxTransformer;
+    }
+
+    public void setOldBoxTransformer(String oldBoxTransformer) {
+        this.oldBoxTransformer = oldBoxTransformer;
+    }
+
+    public String getDistributionTransformer() {
+        return distributionTransformer;
+    }
+
+    public void setDistributionTransformer(String distributionTransformer) {
+        this.distributionTransformer = distributionTransformer;
+    }
+
+    public String getOldDistributionTransformer() {
+        return oldDistributionTransformer;
+    }
+
+    public void setOldDistributionTransformer(String oldDistributionTransformer) {
+        this.oldDistributionTransformer = oldDistributionTransformer;
+    }
+
+    public String getIncludeCablesArtificial() {
+        return includeCablesArtificial;
+    }
+
+    public void setIncludeCablesArtificial(String includeCablesArtificial) {
+        this.includeCablesArtificial = includeCablesArtificial;
+    }
+}

src/main/java/com/jeeplus/modules/cg/reservemanagementcenter/reserveManage/entity/ReserveElectricityWork.java

@@ -15,12 +15,15 @@ public class ReserveElectricityWork extends DataEntity<ReserveElectricityWork> {
     private String demandUnit;              //需求单位
     private String district;                //区域
     private String projectGroup;            //项目分组
+    private String projectManager;          //项目储备经理
     private String reserveBatches;          //储备批次
     private String blockSupply;             //供电区域
     private String gridNumber;              //网格编号
     private String cellNumber;              //单元格编号
     private String projectReserveId;        //项目储备编号
     private String projectName;             //项目名称
+    private String stateGridProjectCode;             //国网项目编码
+    private String stateGridProjectName;             //国网项目名称
     private String constructionNecessityAndContent;           //建设必要性及内容
     private String substationName;           //变电站名称
     private String circuitName;              //线路名称
@@ -89,7 +92,16 @@ public class ReserveElectricityWork extends DataEntity<ReserveElectricityWork> {
         this.projectGroup = projectGroup;
     }
 
-    @ExcelField(title="储备批次", align=2, sort=6)
+    @ExcelField(title="项目储备经理", align=2, sort=6)
+    public String getProjectManager() {
+        return projectManager;
+    }
+
+    public void setProjectManager(String projectManager) {
+        this.projectManager = projectManager;
+    }
+
+    @ExcelField(title="储备批次", align=2, sort=7)
     public String getReserveBatches() {
         return reserveBatches;
     }
@@ -98,7 +110,7 @@ public class ReserveElectricityWork extends DataEntity<ReserveElectricityWork> {
         this.reserveBatches = reserveBatches;
     }
 
-    @ExcelField(title="供电区域", align=2, sort=7)
+    @ExcelField(title="供电区域", align=2, sort=8)
     public String getBlockSupply() {
         return blockSupply;
     }
@@ -107,7 +119,7 @@ public class ReserveElectricityWork extends DataEntity<ReserveElectricityWork> {
         this.blockSupply = blockSupply;
     }
 
-    @ExcelField(title="网格编号", align=2, sort=8)
+    @ExcelField(title="网格编号", align=2, sort=9)
     public String getGridNumber() {
         return gridNumber;
     }
@@ -116,7 +128,7 @@ public class ReserveElectricityWork extends DataEntity<ReserveElectricityWork> {
         this.gridNumber = gridNumber;
     }
 
-    @ExcelField(title="单元格编号", align=2, sort=9)
+    @ExcelField(title="单元格编号", align=2, sort=10)
     public String getCellNumber() {
         return cellNumber;
     }
@@ -125,7 +137,7 @@ public class ReserveElectricityWork extends DataEntity<ReserveElectricityWork> {
         this.cellNumber = cellNumber;
     }
 
-    @ExcelField(title="项目储备编号", align=2, sort=10)
+    @ExcelField(title="项目储备编号", align=2, sort=11)
     public String getProjectReserveId() {
         return projectReserveId;
     }
@@ -134,7 +146,7 @@ public class ReserveElectricityWork extends DataEntity<ReserveElectricityWork> {
         this.projectReserveId = projectReserveId;
     }
 
-    @ExcelField(title="项目名称", align=2, sort=11)
+    @ExcelField(title="项目名称", align=2, sort=12)
     public String getProjectName() {
         return projectName;
     }
@@ -143,7 +155,25 @@ public class ReserveElectricityWork extends DataEntity<ReserveElectricityWork> {
         this.projectName = projectName;
     }
 
-    @ExcelField(title="建设必要性及内容", align=2, sort=12)
+    @ExcelField(title="国网项目编码", align=2, sort=13)
+    public String getStateGridProjectCode() {
+        return stateGridProjectCode;
+    }
+
+    public void setStateGridProjectCode(String stateGridProjectCode) {
+        this.stateGridProjectCode = stateGridProjectCode;
+    }
+
+    @ExcelField(title="国网项目名称", align=2, sort=14)
+    public String getStateGridProjectName() {
+        return stateGridProjectName;
+    }
+
+    public void setStateGridProjectName(String stateGridProjectName) {
+        this.stateGridProjectName = stateGridProjectName;
+    }
+
+    @ExcelField(title="建设必要性及内容", align=2, sort=15)
     public String getConstructionNecessityAndContent() {
         return constructionNecessityAndContent;
     }
@@ -152,7 +182,7 @@ public class ReserveElectricityWork extends DataEntity<ReserveElectricityWork> {
         this.constructionNecessityAndContent = constructionNecessityAndContent;
     }
 
-    @ExcelField(title="变电站名称", align=2, sort=13)
+    @ExcelField(title="变电站名称", align=2, sort=16)
     public String getSubstationName() {
         return substationName;
     }
@@ -161,7 +191,7 @@ public class ReserveElectricityWork extends DataEntity<ReserveElectricityWork> {
         this.substationName = substationName;
     }
 
-    @ExcelField(title="线路名称", align=2, sort=14)
+    @ExcelField(title="线路名称", align=2, sort=17)
     public String getCircuitName() {
         return circuitName;
     }
@@ -170,7 +200,7 @@ public class ReserveElectricityWork extends DataEntity<ReserveElectricityWork> {
         this.circuitName = circuitName;
     }
 
-    @ExcelField(title="网架项目划分", align=2, sort=15)
+    @ExcelField(title="网架项目划分", align=2, sort=18)
     public String getNetRackProjectDivide() {
         return netRackProjectDivide;
     }
@@ -179,7 +209,7 @@ public class ReserveElectricityWork extends DataEntity<ReserveElectricityWork> {
         this.netRackProjectDivide = netRackProjectDivide;
     }
 
-    @ExcelField(title="需求类型", align=2, sort=16)
+    @ExcelField(title="需求类型", align=2, sort=19)
     public String getRequirementType() {
         return requirementType;
     }
@@ -188,7 +218,7 @@ public class ReserveElectricityWork extends DataEntity<ReserveElectricityWork> {
         this.requirementType = requirementType;
     }
 
-    @ExcelField(title="费用估算", align=2, sort=17)
+    @ExcelField(title="费用估算", align=2, sort=20)
     public String getCostEstimate() {
         return costEstimate;
     }
@@ -197,7 +227,7 @@ public class ReserveElectricityWork extends DataEntity<ReserveElectricityWork> {
         this.costEstimate = costEstimate;
     }
 
-    @ExcelField(title="备注", align=2, sort=18)
+    @ExcelField(title="备注", align=2, sort=21)
     public String getBasicRemarks() {
         return basicRemarks;
     }
@@ -206,7 +236,7 @@ public class ReserveElectricityWork extends DataEntity<ReserveElectricityWork> {
         this.basicRemarks = basicRemarks;
     }
 
-    @ExcelField(title="储备进度", align=2, sort=19)
+    @ExcelField(title="储备进度", align=2, sort=22)
     public String getReserveProgress() {
         return reserveProgress;
     }
@@ -215,7 +245,7 @@ public class ReserveElectricityWork extends DataEntity<ReserveElectricityWork> {
         this.reserveProgress = reserveProgress;
     }
 
-    @ExcelField(title="是否纳入实施计划", align=2, sort=20)
+    @ExcelField(title="是否纳入实施计划", align=2, sort=23)
     public String getImplementPlan() {
         return implementPlan;
     }
@@ -224,7 +254,7 @@ public class ReserveElectricityWork extends DataEntity<ReserveElectricityWork> {
         this.implementPlan = implementPlan;
     }
 
-    @ExcelField(title="初定实施批次", align=2, sort=21)
+    @ExcelField(title="初定实施批次", align=2, sort=24)
     public String getImplementBatch() {
         return implementBatch;
     }
@@ -233,7 +263,7 @@ public class ReserveElectricityWork extends DataEntity<ReserveElectricityWork> {
         this.implementBatch = implementBatch;
     }
 
-    @ExcelField(title="项目类型", align=2, sort=22)
+    @ExcelField(title="项目类型", align=2, sort=25)
     public String getProjectType() {
         return projectType;
     }
@@ -242,7 +272,7 @@ public class ReserveElectricityWork extends DataEntity<ReserveElectricityWork> {
         this.projectType = projectType;
     }
 
-    @ExcelField(title="是否含带电作业", align=2, sort=23)
+    @ExcelField(title="是否含带电作业", align=2, sort=26)
     public String getHotLineWork() {
         return hotLineWork;
     }
@@ -251,7 +281,7 @@ public class ReserveElectricityWork extends DataEntity<ReserveElectricityWork> {
         this.hotLineWork = hotLineWork;
     }
 
-    @ExcelField(title="用户分界开关数量", align=2, sort=24)
+    @ExcelField(title="用户分界开关数量", align=2, sort=27)
     public String getBoundarySwitchNum() {
         return boundarySwitchNum;
     }
@@ -260,7 +290,7 @@ public class ReserveElectricityWork extends DataEntity<ReserveElectricityWork> {
         this.boundarySwitchNum = boundarySwitchNum;
     }
 
-    @ExcelField(title="带电作业类型编号/次数", align=2, sort=25)
+    @ExcelField(title="带电作业类型编号/次数", align=2, sort=28)
     public String getHotLineWorkTypeNo() {
         return hotLineWorkTypeNo;
     }
@@ -269,7 +299,7 @@ public class ReserveElectricityWork extends DataEntity<ReserveElectricityWork> {
         this.hotLineWorkTypeNo = hotLineWorkTypeNo;
     }
 
-    @ExcelField(title="不停电作业方案", align=2, sort=26)
+    @ExcelField(title="不停电作业方案", align=2, sort=29)
     public String getNoStopWorkPlan() {
         return noStopWorkPlan;
     }
@@ -278,7 +308,7 @@ public class ReserveElectricityWork extends DataEntity<ReserveElectricityWork> {
         this.noStopWorkPlan = noStopWorkPlan;
     }
 
-    @ExcelField(title="节约停电时户数", align=2, sort=27)
+    @ExcelField(title="节约停电时户数", align=2, sort=30)
     public String getPowerFailureNum() {
         return powerFailureNum;
     }
@@ -287,7 +317,7 @@ public class ReserveElectricityWork extends DataEntity<ReserveElectricityWork> {
         this.powerFailureNum = powerFailureNum;
     }
 
-    @ExcelField(title="无法不停电作业原因", align=2, sort=28)
+    @ExcelField(title="无法不停电作业原因", align=2, sort=31)
     public String getReasonsForNotWorkInterruption() {
         return reasonsForNotWorkInterruption;
     }
@@ -296,7 +326,7 @@ public class ReserveElectricityWork extends DataEntity<ReserveElectricityWork> {
         this.reasonsForNotWorkInterruption = reasonsForNotWorkInterruption;
     }
 
-    @ExcelField(title="停电作业方案", align=2, sort=29)
+    @ExcelField(title="停电作业方案", align=2, sort=32)
     public String getPowerOutagePlan() {
         return powerOutagePlan;
     }
@@ -305,7 +335,7 @@ public class ReserveElectricityWork extends DataEntity<ReserveElectricityWork> {
         this.powerOutagePlan = powerOutagePlan;
     }
 
-    @ExcelField(title="方案编制人", align=2, sort=30)
+    @ExcelField(title="方案编制人", align=2, sort=33)
     public String getPlanner() {
         return planner;
     }
@@ -314,7 +344,7 @@ public class ReserveElectricityWork extends DataEntity<ReserveElectricityWork> {
         this.planner = planner;
     }
 
-    @ExcelField(title="现场查勘人", align=2, sort=31)
+    @ExcelField(title="现场查勘人", align=2, sort=34)
     public String getSiteSurveyor() {
         return siteSurveyor;
     }

src/main/java/com/jeeplus/modules/cg/reservemanagementcenter/reserveManage/entity/ReserveProcessProject.java

@@ -22,18 +22,20 @@ public class ReserveProcessProject extends DataEntity<ReserveProcessProject> {
     private String cellNumber;              //单元格编号
     private String projectReserveId;        //项目储备编号
     private String projectName;             //项目名称
+    private String stateGridProjectCode;             //国网项目编码
+    private String stateGridProjectName;             //国网项目名称
     private String constructionNecessityAndContent;           //建设必要性及内容
     private String substationName;           //变电站名称
     private String circuitName;              //线路名称
     private String netRackProjectDivide;     //网架项目划分
     private String requirementType;          //需求类型
+    private String projectType;          //项目类型
     private double costEstimate;             //费用估算
     private String basicRemarks;             //备注
     private String requester;                //需求提报人
     private String ownerReserveFullTime;     //业主储备专职
     private String ownerDistributionNerworkFullTime;           //业主配网专职
     private String ownerReserveProjectManagre; //业主储备项目经理
-    private String ownerProjectManager;      //业主项目经理
     private String materialSoleDuty;         //业主物资专职
     private String technicalStaff;           //业主技经人员
     private String operationAndMaintenancePersonnel;           //运维人员
@@ -41,8 +43,6 @@ public class ReserveProcessProject extends DataEntity<ReserveProcessProject> {
     private String budgetPreparer;           //概算编制人员
     private int processStatus;           //流程状态 (0：未开始，1：进行中，2：完成，3：取消，4：待定 )
     private String uninterruptedWorkSurveyPersonnel;           //不停电作业查勘人员
-    private String clearOrNot;           //是否取消
-    private String noStartTheDesign;     //否启动设计交底流程
 
     @ExcelField(title="项目年份", align=2, sort=1)
     public String getProjectYear() {
@@ -135,7 +135,24 @@ public class ReserveProcessProject extends DataEntity<ReserveProcessProject> {
     public void setProjectName(String projectName) {
         this.projectName = projectName;
     }
-    @ExcelField(title="建设必要性及内容", align=2, sort=12)
+    @ExcelField(title="国网项目编码", align=2, sort=12)
+    public String getStateGridProjectCode() {
+        return stateGridProjectCode;
+    }
+
+    public void setStateGridProjectCode(String stateGridProjectCode) {
+        this.stateGridProjectCode = stateGridProjectCode;
+    }
+    @ExcelField(title="国网项目名称", align=2, sort=13)
+    public String getStateGridProjectName() {
+        return stateGridProjectName;
+    }
+
+    public void setStateGridProjectName(String stateGridProjectName) {
+        this.stateGridProjectName = stateGridProjectName;
+    }
+
+    @ExcelField(title="建设必要性及内容", align=2, sort=14)
     public String getConstructionNecessityAndContent() {
         return constructionNecessityAndContent;
     }
@@ -143,7 +160,7 @@ public class ReserveProcessProject extends DataEntity<ReserveProcessProject> {
     public void setConstructionNecessityAndContent(String constructionNecessityAndContent) {
         this.constructionNecessityAndContent = constructionNecessityAndContent;
     }
-    @ExcelField(title="变电站名称", align=2, sort=13)
+    @ExcelField(title="变电站名称", align=2, sort=15)
     public String getSubstationName() {
         return substationName;
     }
@@ -151,7 +168,7 @@ public class ReserveProcessProject extends DataEntity<ReserveProcessProject> {
     public void setSubstationName(String substationName) {
         this.substationName = substationName;
     }
-    @ExcelField(title="线路名称", align=2, sort=14)
+    @ExcelField(title="线路名称", align=2, sort=16)
     public String getCircuitName() {
         return circuitName;
     }
@@ -159,7 +176,7 @@ public class ReserveProcessProject extends DataEntity<ReserveProcessProject> {
     public void setCircuitName(String circuitName) {
         this.circuitName = circuitName;
     }
-    @ExcelField(title="网架项目划分", align=2, sort=15)
+    @ExcelField(title="网架项目划分", align=2, sort=17)
     public String getNetRackProjectDivide() {
         return netRackProjectDivide;
     }
@@ -167,7 +184,7 @@ public class ReserveProcessProject extends DataEntity<ReserveProcessProject> {
     public void setNetRackProjectDivide(String netRackProjectDivide) {
         this.netRackProjectDivide = netRackProjectDivide;
     }
-    @ExcelField(title="需求类型", align=2, sort=16)
+    @ExcelField(title="需求类型", align=2, sort=18)
     public String getRequirementType() {
         return requirementType;
     }
@@ -175,7 +192,16 @@ public class ReserveProcessProject extends DataEntity<ReserveProcessProject> {
     public void setRequirementType(String requirementType) {
         this.requirementType = requirementType;
     }
-    @ExcelField(title="费用估算", align=2, sort=17)
+    @ExcelField(title="项目类型", align=2, sort=19)
+    public String getProjectType() {
+        return projectType;
+    }
+
+    public void setProjectType(String projectType) {
+        this.projectType = projectType;
+    }
+
+    @ExcelField(title="费用估算", align=2, sort=20)
     public double getCostEstimate() {
         return costEstimate;
     }
@@ -183,7 +209,7 @@ public class ReserveProcessProject extends DataEntity<ReserveProcessProject> {
     public void setCostEstimate(double costEstimate) {
         this.costEstimate = costEstimate;
     }
-    @ExcelField(title="备注", align=2, sort=18)
+    @ExcelField(title="备注", align=2, sort=21)
     public String getBasicRemarks() {
         return basicRemarks;
     }
@@ -191,7 +217,7 @@ public class ReserveProcessProject extends DataEntity<ReserveProcessProject> {
     public void setBasicRemarks(String basicRemarks) {
         this.basicRemarks = basicRemarks;
     }
-    @ExcelField(title="需求提报人", align=2, sort=19)
+    @ExcelField(title="需求提报人", align=2, sort=22)
     public String getRequester() {
         return requester;
     }
@@ -199,7 +225,7 @@ public class ReserveProcessProject extends DataEntity<ReserveProcessProject> {
     public void setRequester(String requester) {
         this.requester = requester;
     }
-    @ExcelField(title="业主储备专职", align=2, sort=20)
+    @ExcelField(title="业主储备专职", align=2, sort=23)
     public String getOwnerReserveFullTime() {
         return ownerReserveFullTime;
     }
@@ -207,12 +233,12 @@ public class ReserveProcessProject extends DataEntity<ReserveProcessProject> {
     public void setOwnerReserveFullTime(String ownerReserveFullTime) {
         this.ownerReserveFullTime = ownerReserveFullTime;
     }
-    @ExcelField(title="业主配网专职", align=2, sort=21)
+    @ExcelField(title="业主配网专职", align=2, sort=24)
     public String getOwnerDistributionNerworkFullTime() {
         return ownerDistributionNerworkFullTime;
     }
 
-    @ExcelField(title="业主储备项目经理", align=2, sort=22)
+    @ExcelField(title="业主储备项目经理", align=2, sort=25)
     public String getOwnerReserveProjectManagre() {
         return ownerReserveProjectManagre;
     }
@@ -224,15 +250,7 @@ public class ReserveProcessProject extends DataEntity<ReserveProcessProject> {
     public void setOwnerDistributionNerworkFullTime(String ownerDistributionNerworkFullTime) {
         this.ownerDistributionNerworkFullTime = ownerDistributionNerworkFullTime;
     }
-    @ExcelField(title="业主项目经理", align=2, sort=23)
-    public String getOwnerProjectManager() {
-        return ownerProjectManager;
-    }
-
-    public void setOwnerProjectManager(String ownerProjectManager) {
-        this.ownerProjectManager = ownerProjectManager;
-    }
-    @ExcelField(title="业主物资专职", align=2, sort=24)
+    @ExcelField(title="业主物资专职", align=2, sort=26)
     public String getMaterialSoleDuty() {
         return materialSoleDuty;
     }
@@ -241,7 +259,7 @@ public class ReserveProcessProject extends DataEntity<ReserveProcessProject> {
         this.materialSoleDuty = materialSoleDuty;
     }
 
-    @ExcelField(title="业主技经人员", align=2, sort=25)
+    @ExcelField(title="业主技经人员", align=2, sort=27)
     public String getTechnicalStaff() {
         return technicalStaff;
     }
@@ -249,7 +267,7 @@ public class ReserveProcessProject extends DataEntity<ReserveProcessProject> {
     public void setTechnicalStaff(String technicalStaff) {
         this.technicalStaff = technicalStaff;
     }
-    @ExcelField(title="运维人员", align=2, sort=26)
+    @ExcelField(title="运维人员", align=2, sort=28)
     public String getOperationAndMaintenancePersonnel() {
         return operationAndMaintenancePersonnel;
     }
@@ -257,7 +275,7 @@ public class ReserveProcessProject extends DataEntity<ReserveProcessProject> {
     public void setOperationAndMaintenancePersonnel(String operationAndMaintenancePersonnel) {
         this.operationAndMaintenancePersonnel = operationAndMaintenancePersonnel;
     }
-    @ExcelField(title="设计人员", align=2, sort=27)
+    @ExcelField(title="设计人员", align=2, sort=29)
     public String getDesigner() {
         return designer;
     }
@@ -265,7 +283,7 @@ public class ReserveProcessProject extends DataEntity<ReserveProcessProject> {
     public void setDesigner(String designer) {
         this.designer = designer;
     }
-    @ExcelField(title="概算编制人员", align=2, sort=28)
+    @ExcelField(title="概算编制人员", align=2, sort=30)
     public String getBudgetPreparer() {
         return budgetPreparer;
     }
@@ -282,7 +300,7 @@ public class ReserveProcessProject extends DataEntity<ReserveProcessProject> {
         this.processStatus = processStatus;
     }
 
-    @ExcelField(title="不停电作业查勘人", align=2, sort=29)
+    @ExcelField(title="不停电作业查勘人", align=2, sort=31)
     public String getUninterruptedWorkSurveyPersonnel() {
         return uninterruptedWorkSurveyPersonnel;
     }
@@ -291,21 +309,4 @@ public class ReserveProcessProject extends DataEntity<ReserveProcessProject> {
         this.uninterruptedWorkSurveyPersonnel = uninterruptedWorkSurveyPersonnel;
     }
 
-    @ExcelField(title="是否取消", align=2, sort=30)
-    public String getClearOrNot() {
-        return clearOrNot;
-    }
-
-    public void setClearOrNot(String clearOrNot) {
-        this.clearOrNot = clearOrNot;
-    }
-
-    @ExcelField(title="否启动设计交底流程", align=2, sort=31)
-    public String getNoStartTheDesign() {
-        return noStartTheDesign;
-    }
-
-    public void setNoStartTheDesign(String noStartTheDesign) {
-        this.noStartTheDesign = noStartTheDesign;
-    }
 }

src/main/java/com/jeeplus/modules/cg/reservemanagementcenter/reserveManage/entity/ReserveSafety.java

@@ -47,20 +47,26 @@ public class ReserveSafety extends DataEntity<ReserveSafety> {
     private String demandUnit;              //需求单位
     private String district;                //区域
     private String projectGroup;            //项目分组
+    private String projectManager;          //业主储备项目经理
     private String reserveBatches;          //储备批次
     private String blockSupply;             //供电区域
     private String gridNumber;              //网格编号
     private String cellNumber;              //单元格编号
     private String projectReserveId;        //项目储备编号
     private String projectName;             //项目名称
+    private String stateGridProjectCode;             //国网项目编码
+    private String stateGridProjectName;             //国网项目名称
     private String constructionNecessityAndContent;           //建设必要性及内容
     private String substationName;           //变电站名称
     private String circuitName;              //线路名称
     private String netRackProjectDivide;     //网架项目划分
     private String requirementType;          //需求类型
+    private String projectType;              //项目类型
     private String costEstimate;             //费用估算
     private String basicRemarks;             //备注
     private String reserveProgress;          //储备进度
+    private String implementPlan;            //是否纳入实施计划
+    private String implementBatch;           //初定实施批次
     private String transmissionWork;         //是否临近（交叉）输电线路作业（含土建）
     private String workDescribe;             //是否临近（交叉）输电线路作业（含土建） 描述
     private String transmissionErection;     //是否与输电线路同杆架设
@@ -127,7 +133,16 @@ public class ReserveSafety extends DataEntity<ReserveSafety> {
     public void setProjectGroup(String projectGroup) {
         this.projectGroup = projectGroup;
     }
-    @ExcelField(title="储备批次", align=2, sort=6)
+    @ExcelField(title="业主储备项目经理", align=2, sort=6)
+    public String getProjectManager() {
+        return projectManager;
+    }
+
+    public void setProjectManager(String projectManager) {
+        this.projectManager = projectManager;
+    }
+
+    @ExcelField(title="储备批次", align=2, sort=7)
     public String getReserveBatches() {
         return reserveBatches;
     }
@@ -135,7 +150,7 @@ public class ReserveSafety extends DataEntity<ReserveSafety> {
     public void setReserveBatches(String reserveBatches) {
         this.reserveBatches = reserveBatches;
     }
-    @ExcelField(title="供电区域", align=2, sort=7)
+    @ExcelField(title="供电区域", align=2, sort=8)
     public String getBlockSupply() {
         return blockSupply;
     }
@@ -143,7 +158,7 @@ public class ReserveSafety extends DataEntity<ReserveSafety> {
     public void setBlockSupply(String blockSupply) {
         this.blockSupply = blockSupply;
     }
-    @ExcelField(title="网格编号", align=2, sort=8)
+    @ExcelField(title="网格编号", align=2, sort=9)
     public String getGridNumber() {
         return gridNumber;
     }
@@ -151,7 +166,7 @@ public class ReserveSafety extends DataEntity<ReserveSafety> {
     public void setGridNumber(String gridNumber) {
         this.gridNumber = gridNumber;
     }
-    @ExcelField(title="单元格编号", align=2, sort=9)
+    @ExcelField(title="单元格编号", align=2, sort=10)
     public String getCellNumber() {
         return cellNumber;
     }
@@ -159,7 +174,7 @@ public class ReserveSafety extends DataEntity<ReserveSafety> {
     public void setCellNumber(String cellNumber) {
         this.cellNumber = cellNumber;
     }
-    @ExcelField(title="项目储备编号", align=2, sort=10)
+    @ExcelField(title="项目储备编号", align=2, sort=11)
     public String getProjectReserveId() {
         return projectReserveId;
     }
@@ -167,7 +182,7 @@ public class ReserveSafety extends DataEntity<ReserveSafety> {
     public void setProjectReserveId(String projectReserveId) {
         this.projectReserveId = projectReserveId;
     }
-    @ExcelField(title="项目名称", align=2, sort=11)
+    @ExcelField(title="项目名称", align=2, sort=12)
     public String getProjectName() {
         return projectName;
     }
@@ -175,7 +190,26 @@ public class ReserveSafety extends DataEntity<ReserveSafety> {
     public void setProjectName(String projectName) {
         this.projectName = projectName;
     }
-    @ExcelField(title="建设必要性及内容", align=2, sort=12)
+
+    @ExcelField(title="国网项目编码", align=2, sort=13)
+    public String getStateGridProjectCode() {
+        return stateGridProjectCode;
+    }
+
+    public void setStateGridProjectCode(String stateGridProjectCode) {
+        this.stateGridProjectCode = stateGridProjectCode;
+    }
+
+    @ExcelField(title="国网项目名称", align=2, sort=14)
+    public String getStateGridProjectName() {
+        return stateGridProjectName;
+    }
+
+    public void setStateGridProjectName(String stateGridProjectName) {
+        this.stateGridProjectName = stateGridProjectName;
+    }
+
+    @ExcelField(title="建设必要性及内容", align=2, sort=15)
     public String getConstructionNecessityAndContent() {
         return constructionNecessityAndContent;
     }
@@ -183,7 +217,7 @@ public class ReserveSafety extends DataEntity<ReserveSafety> {
     public void setConstructionNecessityAndContent(String constructionNecessityAndContent) {
         this.constructionNecessityAndContent = constructionNecessityAndContent;
     }
-    @ExcelField(title="变电站名称", align=2, sort=13)
+    @ExcelField(title="变电站名称", align=2, sort=16)
     public String getSubstationName() {
         return substationName;
     }
@@ -191,7 +225,7 @@ public class ReserveSafety extends DataEntity<ReserveSafety> {
     public void setSubstationName(String substationName) {
         this.substationName = substationName;
     }
-    @ExcelField(title="线路名称", align=2, sort=14)
+    @ExcelField(title="线路名称", align=2, sort=17)
     public String getCircuitName() {
         return circuitName;
     }
@@ -199,7 +233,7 @@ public class ReserveSafety extends DataEntity<ReserveSafety> {
     public void setCircuitName(String circuitName) {
         this.circuitName = circuitName;
     }
-    @ExcelField(title="网架项目划分", align=2, sort=15)
+    @ExcelField(title="网架项目划分", align=2, sort=18)
     public String getNetRackProjectDivide() {
         return netRackProjectDivide;
     }
@@ -207,7 +241,7 @@ public class ReserveSafety extends DataEntity<ReserveSafety> {
     public void setNetRackProjectDivide(String netRackProjectDivide) {
         this.netRackProjectDivide = netRackProjectDivide;
     }
-    @ExcelField(title="需求类型", align=2, sort=16)
+    @ExcelField(title="需求类型", align=2, sort=19)
     public String getRequirementType() {
         return requirementType;
     }
@@ -215,7 +249,17 @@ public class ReserveSafety extends DataEntity<ReserveSafety> {
     public void setRequirementType(String requirementType) {
         this.requirementType = requirementType;
     }
-    @ExcelField(title="费用估算", align=2, sort=17)
+
+    @ExcelField(title="项目类型", align=2, sort=20)
+    public String getProjectType() {
+        return projectType;
+    }
+
+    public void setProjectType(String projectType) {
+        this.projectType = projectType;
+    }
+
+    @ExcelField(title="费用估算", align=2, sort=21)
     public String getCostEstimate() {
         return costEstimate;
     }
@@ -223,7 +267,7 @@ public class ReserveSafety extends DataEntity<ReserveSafety> {
     public void setCostEstimate(String costEstimate) {
         this.costEstimate = costEstimate;
     }
-    @ExcelField(title="备注", align=2, sort=18)
+    @ExcelField(title="备注", align=2, sort=22)
     public String getBasicRemarks() {
         return basicRemarks;
     }
@@ -231,7 +275,7 @@ public class ReserveSafety extends DataEntity<ReserveSafety> {
     public void setBasicRemarks(String basicRemarks) {
         this.basicRemarks = basicRemarks;
     }
-    @ExcelField(title="储备进度", align=2, sort=19)
+    @ExcelField(title="储备进度", align=2, sort=23)
     public String getReserveProgress() {
         return reserveProgress;
     }
@@ -239,7 +283,26 @@ public class ReserveSafety extends DataEntity<ReserveSafety> {
     public void setReserveProgress(String reserveProgress) {
         this.reserveProgress = reserveProgress;
     }
-    @ExcelField(title="是否临近(交叉)输电线路作业(含土建)", align=2, sort=20)
+
+    @ExcelField(title="是否纳入实施计划", align=2, sort=24)
+    public String getImplementPlan() {
+        return implementPlan;
+    }
+
+    public void setImplementPlan(String implementPlan) {
+        this.implementPlan = implementPlan;
+    }
+
+    @ExcelField(title="初定实施批次", align=2, sort=25)
+    public String getImplementBatch() {
+        return implementBatch;
+    }
+
+    public void setImplementBatch(String implementBatch) {
+        this.implementBatch = implementBatch;
+    }
+
+    @ExcelField(title="是否临近(交叉)输电线路作业(含土建)", align=2, sort=26)
     public String getTransmissionWork() {
         return transmissionWork;
     }
@@ -247,7 +310,7 @@ public class ReserveSafety extends DataEntity<ReserveSafety> {
     public void setTransmissionWork(String transmissionWork) {
         this.transmissionWork = transmissionWork;
     }
-    @ExcelField(title="是否临近(交叉)输电线路作业(含土建)-描述", align=2, sort=21)
+    @ExcelField(title="是否临近(交叉)输电线路作业(含土建)-描述", align=2, sort=27)
     public String getWorkDescribe() {
         return workDescribe;
     }
@@ -255,7 +318,7 @@ public class ReserveSafety extends DataEntity<ReserveSafety> {
     public void setWorkDescribe(String workDescribe) {
         this.workDescribe = workDescribe;
     }
-    @ExcelField(title="是否与输电线路同杆架设", align=2, sort=22)
+    @ExcelField(title="是否与输电线路同杆架设", align=2, sort=28)
     public String getTransmissionErection() {
         return transmissionErection;
     }
@@ -263,7 +326,7 @@ public class ReserveSafety extends DataEntity<ReserveSafety> {
     public void setTransmissionErection(String transmissionErection) {
         this.transmissionErection = transmissionErection;
     }
-    @ExcelField(title="是否与输电线路同杆架设-描述", align=2, sort=23)
+    @ExcelField(title="是否与输电线路同杆架设-描述", align=2, sort=29)
     public String getErecteDescribe() {
         return erecteDescribe;
     }
@@ -271,7 +334,7 @@ public class ReserveSafety extends DataEntity<ReserveSafety> {
     public void setErecteDescribe(String erecteDescribe) {
         this.erecteDescribe = erecteDescribe;
     }
-    @ExcelField(title="是否与输电线路共沟", align=2, sort=24)
+    @ExcelField(title="是否与输电线路共沟", align=2, sort=30)
     public String getTransmissionCommonTrench() {
         return transmissionCommonTrench;
     }
@@ -279,7 +342,7 @@ public class ReserveSafety extends DataEntity<ReserveSafety> {
     public void setTransmissionCommonTrench(String transmissionCommonTrench) {
         this.transmissionCommonTrench = transmissionCommonTrench;
     }
-    @ExcelField(title="是否与输电线路共沟-描述", align=2, sort=25)
+    @ExcelField(title="是否与输电线路共沟-描述", align=2, sort=31)
     public String getTrenchDescribe() {
         return trenchDescribe;
     }
@@ -287,7 +350,7 @@ public class ReserveSafety extends DataEntity<ReserveSafety> {
     public void setTrenchDescribe(String trenchDescribe) {
         this.trenchDescribe = trenchDescribe;
     }
-    @ExcelField(title="是否临近带电中压线路作业", align=2, sort=26)
+    @ExcelField(title="是否临近带电中压线路作业", align=2, sort=32)
     public String getMediumVoltageWork() {
         return mediumVoltageWork;
     }
@@ -295,7 +358,7 @@ public class ReserveSafety extends DataEntity<ReserveSafety> {
     public void setMediumVoltageWork(String mediumVoltageWork) {
         this.mediumVoltageWork = mediumVoltageWork;
     }
-    @ExcelField(title="是否临近带电中压线路作业-描述", align=2, sort=27)
+    @ExcelField(title="是否临近带电中压线路作业-描述", align=2, sort=33)
     public String getVoltageWorkDescribe() {
         return voltageWorkDescribe;
     }
@@ -303,7 +366,7 @@ public class ReserveSafety extends DataEntity<ReserveSafety> {
     public void setVoltageWorkDescribe(String voltageWorkDescribe) {
         this.voltageWorkDescribe = voltageWorkDescribe;
     }
-    @ExcelField(title="是否有限空间作业", align=2, sort=28)
+    @ExcelField(title="是否有限空间作业", align=2, sort=34)
     public String getConfineSpaceWork() {
         return confineSpaceWork;
     }
@@ -311,7 +374,7 @@ public class ReserveSafety extends DataEntity<ReserveSafety> {
     public void setConfineSpaceWork(String confineSpaceWork) {
         this.confineSpaceWork = confineSpaceWork;
     }
-    @ExcelField(title="是否有限空间作业-描述", align=2, sort=29)
+    @ExcelField(title="是否有限空间作业-描述", align=2, sort=35)
     public String getSpaceDescribe() {
         return spaceDescribe;
     }
@@ -319,7 +382,7 @@ public class ReserveSafety extends DataEntity<ReserveSafety> {
     public void setSpaceDescribe(String spaceDescribe) {
         this.spaceDescribe = spaceDescribe;
     }
-    @ExcelField(title="是否存在变电站出线电缆搭接-是", align=2, sort=30)
+    @ExcelField(title="是否存在变电站出线电缆搭接-是", align=2, sort=36)
     public String getSubStationCableBonding() {
         return subStationCableBonding;
     }
@@ -327,7 +390,7 @@ public class ReserveSafety extends DataEntity<ReserveSafety> {
     public void setSubStationCableBonding(String subStationCableBonding) {
         this.subStationCableBonding = subStationCableBonding;
     }
-    @ExcelField(title="是否存在变电站出线电缆搭接-是-描述", align=2, sort=31)
+    @ExcelField(title="是否存在变电站出线电缆搭接-是-描述", align=2, sort=37)
     public String getCableDescribe() {
         return cableDescribe;
     }
@@ -335,7 +398,7 @@ public class ReserveSafety extends DataEntity<ReserveSafety> {
     public void setCableDescribe(String cableDescribe) {
         this.cableDescribe = cableDescribe;
     }
-    @ExcelField(title="是否存在跨越公路、铁路、航道作业", align=2, sort=32)
+    @ExcelField(title="是否存在跨越公路、铁路、航道作业", align=2, sort=38)
     public String getRoadRailwaysAndWaterwaysWork() {
         return roadRailwaysAndWaterwaysWork;
     }
@@ -343,7 +406,7 @@ public class ReserveSafety extends DataEntity<ReserveSafety> {
     public void setRoadRailwaysAndWaterwaysWork(String roadRailwaysAndWaterwaysWork) {
         this.roadRailwaysAndWaterwaysWork = roadRailwaysAndWaterwaysWork;
     }
-    @ExcelField(title="是否存在跨越公路、铁路、航道作业-描述", align=2, sort=33)
+    @ExcelField(title="是否存在跨越公路、铁路、航道作业-描述", align=2, sort=39)
     public String getWaterDescribe() {
         return waterDescribe;
     }
@@ -351,7 +414,7 @@ public class ReserveSafety extends DataEntity<ReserveSafety> {
     public void setWaterDescribe(String waterDescribe) {
         this.waterDescribe = waterDescribe;
     }
-    @ExcelField(title="是否存在动火作业", align=2, sort=34)
+    @ExcelField(title="是否存在动火作业", align=2, sort=40)
     public String getHotWork() {
         return hotWork;
     }
@@ -359,7 +422,7 @@ public class ReserveSafety extends DataEntity<ReserveSafety> {
     public void setHotWork(String hotWork) {
         this.hotWork = hotWork;
     }
-    @ExcelField(title="是否存在动火作业-描述", align=2, sort=35)
+    @ExcelField(title="是否存在动火作业-描述", align=2, sort=41)
     public String getHotWorkDescribe() {
         return hotWorkDescribe;
     }
@@ -367,7 +430,7 @@ public class ReserveSafety extends DataEntity<ReserveSafety> {
     public void setHotWorkDescribe(String hotWorkDescribe) {
         this.hotWorkDescribe = hotWorkDescribe;
     }
-    @ExcelField(title="是否需停电四条以上线路", align=2, sort=36)
+    @ExcelField(title="是否需停电四条以上线路", align=2, sort=42)
     public String getBlackoutLineFour() {
         return blackoutLineFour;
     }
@@ -375,7 +438,7 @@ public class ReserveSafety extends DataEntity<ReserveSafety> {
     public void setBlackoutLineFour(String blackoutLineFour) {
         this.blackoutLineFour = blackoutLineFour;
     }
-    @ExcelField(title="是否需停电四条以上线路-描述", align=2, sort=37)
+    @ExcelField(title="是否需停电四条以上线路-描述", align=2, sort=43)
     public String getLineFourDescribe() {
         return lineFourDescribe;
     }
@@ -383,7 +446,7 @@ public class ReserveSafety extends DataEntity<ReserveSafety> {
     public void setLineFourDescribe(String lineFourDescribe) {
         this.lineFourDescribe = lineFourDescribe;
     }
-    @ExcelField(title="是否三条以上线路负荷改接", align=2, sort=38)
+    @ExcelField(title="是否三条以上线路负荷改接", align=2, sort=44)
     public String getLineLoadRedirectionThree() {
         return lineLoadRedirectionThree;
     }
@@ -391,7 +454,7 @@ public class ReserveSafety extends DataEntity<ReserveSafety> {
     public void setLineLoadRedirectionThree(String lineLoadRedirectionThree) {
         this.lineLoadRedirectionThree = lineLoadRedirectionThree;
     }
-    @ExcelField(title="是否三条以上线路负荷改接-描述", align=2, sort=39)
+    @ExcelField(title="是否三条以上线路负荷改接-描述", align=2, sort=45)
     public String getThreeRedirectDescribe() {
         return threeRedirectDescribe;
     }
@@ -399,7 +462,7 @@ public class ReserveSafety extends DataEntity<ReserveSafety> {
     public void setThreeRedirectDescribe(String threeRedirectDescribe) {
         this.threeRedirectDescribe = threeRedirectDescribe;
     }
-    @ExcelField(title="是否多专业、多班组大型作业", align=2, sort=40)
+    @ExcelField(title="是否多专业、多班组大型作业", align=2, sort=46)
     public String getLargeScaleMultiTeamWork() {
         return largeScaleMultiTeamWork;
     }
@@ -407,7 +470,7 @@ public class ReserveSafety extends DataEntity<ReserveSafety> {
     public void setLargeScaleMultiTeamWork(String largeScaleMultiTeamWork) {
         this.largeScaleMultiTeamWork = largeScaleMultiTeamWork;
     }
-    @ExcelField(title="是否多专业、多班组大型作业-描述", align=2, sort=41)
+    @ExcelField(title="是否多专业、多班组大型作业-描述", align=2, sort=47)
     public String getTeamWorkDescribe() {
         return teamWorkDescribe;
     }
@@ -415,7 +478,7 @@ public class ReserveSafety extends DataEntity<ReserveSafety> {
     public void setTeamWorkDescribe(String teamWorkDescribe) {
         this.teamWorkDescribe = teamWorkDescribe;
     }
-    @ExcelField(title="是否需编制三措", align=2, sort=42)
+    @ExcelField(title="是否需编制三措", align=2, sort=48)
     public String getPrepareThreeMeasures() {
         return prepareThreeMeasures;
     }
@@ -423,7 +486,7 @@ public class ReserveSafety extends DataEntity<ReserveSafety> {
     public void setPrepareThreeMeasures(String prepareThreeMeasures) {
         this.prepareThreeMeasures = prepareThreeMeasures;
     }
-    @ExcelField(title="是否需编制三措-描述", align=2, sort=43)
+    @ExcelField(title="是否需编制三措-描述", align=2, sort=49)
     public String getMeasureDescribe() {
         return measureDescribe;
     }

src/main/java/com/jeeplus/modules/cg/reservemanagementcenter/reserveManage/entity/ReserveSummary.java

@@ -14,13 +14,15 @@ public class ReserveSummary extends DataEntity<ReserveSummary> {
     private String demandUnit;              //需求单位
     private String district;                //区域
     private String projectGroup;            //项目分组
-    private String projectManager;          //项目经理
+    private String projectManager;          //项目储备经理
     private String reserveBatches;          //储备批次
     private String blockSupply;             //供电区域
     private String gridNumber;              //网格编号
     private String cellNumber;              //单元格编号
     private String projectReserveId;        //项目储备编号
     private String projectName;             //项目名称
+    private String stateGridProjectCode;             //国网项目编码
+    private String stateGridProjectName;             //国网项目名称
     private String constructionNecessityAndContent;           //建设必要性及内容
     private String substationName;           //变电站名称
     private String circuitName;              //线路名称
@@ -28,14 +30,14 @@ public class ReserveSummary extends DataEntity<ReserveSummary> {
     private String requirementType;          //需求类型
     private String projectType;              //项目类型
     private String costEstimate;             //费用估算
-//    private String budgetPreparationStatus;  //预算编制状态
-//    private String budgetIncludesTax;        //预算含税
-//    private String budgetNotIncludesTax;     //预算不含税
-    private String basicRemarks;             //储备项目基本信息-备注
+
     private String reserveProgress;          //储备进度
     private String includeReserve;           //是否纳入储备
-
     private String reasonForCancel;          //取消原因说明
+    private String startDesignOrNot;         //是否启动设计
+
+    private String completeDisclose;        //是否完成交底
+    private String completeDiscloseTime;    //交底完成时间
     private String comprehensiveProject;     //项目综合可实施性
     private String officeDifficulty;         //政处难度
     private String officeProgress;           //政处描述
@@ -47,51 +49,11 @@ public class ReserveSummary extends DataEntity<ReserveSummary> {
     private String programChangeDescription; //方案变更说明
     private String discloseRemarks;          //储备项目交底信息-备注
 
-    private String demandUnitPriority;       //需求单位优先级
-    private String preliminaryArrangement;   //立项初安排
-    private String initialImplementBatch;    //初定实施批次
-    private String initialImplementUnit;     //初定实施单位
-    private String projectManagementCenter;  //储备项目推进计划（项目管理中心）
-    private String completeProgressUnit;     //项目管理单位完成进度
-    private String projectReservePlan;       //储备项目推进计划（需求单位）
-    private String demandUnitProgress;       //需求单位完成进度
-    private String departmentPlan;           //政处计划（政处单位）
-    private String administrativeProgress;   //政处进度
-    private String drawMapPath;              //是否出路径图
-    private String planRemarks;              //储备项目推进计划-备注
-    private String arrangementProject;       //立项安排
-    private String implementationBatch;      //实施批次
-    private String constructionUnit;         //施工单位
-    private String drawOfficeDrawn;          //是否出正式图
-    private String projectInitiateRemarks;   //立项筛选-备注
-    private String startDesignOrNot;            //是否启动设计
-
-    private String pretrialEstimateAmount;  //概算信息（审前）- 总概算金额（含税）
-    private String pretrialEstimateAmountExcludeTax;  //概算信息（审前）- 总概算金额（不含税）
-    private String afterTrialEstimateAmount;  //概算信息（审后）- 总概算金额（含税）
-    private String afterTrialEstimateAmountExcludeTax;  //概算信息（审后）- 总概算金额（不含税）
-
     private String processStatus;       //流程状态
 
     public ReserveSummary() {
     }
 
-    public String getBasicRemarks() {
-        return basicRemarks;
-    }
-
-    public void setBasicRemarks(String basicRemarks) {
-        this.basicRemarks = basicRemarks;
-    }
-
-    public String getProcessStatus() {
-        return processStatus;
-    }
-
-    public void setProcessStatus(String processStatus) {
-        this.processStatus = processStatus;
-    }
-
     public String getProjectYear() {
         return projectYear;
     }
@@ -188,6 +150,22 @@ public class ReserveSummary extends DataEntity<ReserveSummary> {
         this.projectName = projectName;
     }
 
+    public String getStateGridProjectCode() {
+        return stateGridProjectCode;
+    }
+
+    public void setStateGridProjectCode(String stateGridProjectCode) {
+        this.stateGridProjectCode = stateGridProjectCode;
+    }
+
+    public String getStateGridProjectName() {
+        return stateGridProjectName;
+    }
+
+    public void setStateGridProjectName(String stateGridProjectName) {
+        this.stateGridProjectName = stateGridProjectName;
+    }
+
     public String getConstructionNecessityAndContent() {
         return constructionNecessityAndContent;
     }
@@ -268,6 +246,30 @@ public class ReserveSummary extends DataEntity<ReserveSummary> {
         this.reasonForCancel = reasonForCancel;
     }
 
+    public String getStartDesignOrNot() {
+        return startDesignOrNot;
+    }
+
+    public void setStartDesignOrNot(String startDesignOrNot) {
+        this.startDesignOrNot = startDesignOrNot;
+    }
+
+    public String getCompleteDisclose() {
+        return completeDisclose;
+    }
+
+    public void setCompleteDisclose(String completeDisclose) {
+        this.completeDisclose = completeDisclose;
+    }
+
+    public String getCompleteDiscloseTime() {
+        return completeDiscloseTime;
+    }
+
+    public void setCompleteDiscloseTime(String completeDiscloseTime) {
+        this.completeDiscloseTime = completeDiscloseTime;
+    }
+
     public String getComprehensiveProject() {
         return comprehensiveProject;
     }
@@ -348,179 +350,11 @@ public class ReserveSummary extends DataEntity<ReserveSummary> {
         this.discloseRemarks = discloseRemarks;
     }
 
-    public String getPretrialEstimateAmount() {
-        return pretrialEstimateAmount;
-    }
-
-    public void setPretrialEstimateAmount(String pretrialEstimateAmount) {
-        this.pretrialEstimateAmount = pretrialEstimateAmount;
-    }
-
-    public String getPretrialEstimateAmountExcludeTax() {
-        return pretrialEstimateAmountExcludeTax;
-    }
-
-    public void setPretrialEstimateAmountExcludeTax(String pretrialEstimateAmountExcludeTax) {
-        this.pretrialEstimateAmountExcludeTax = pretrialEstimateAmountExcludeTax;
-    }
-
-    public String getAfterTrialEstimateAmount() {
-        return afterTrialEstimateAmount;
-    }
-
-    public void setAfterTrialEstimateAmount(String afterTrialEstimateAmount) {
-        this.afterTrialEstimateAmount = afterTrialEstimateAmount;
-    }
-
-    public String getAfterTrialEstimateAmountExcludeTax() {
-        return afterTrialEstimateAmountExcludeTax;
-    }
-
-    public void setAfterTrialEstimateAmountExcludeTax(String afterTrialEstimateAmountExcludeTax) {
-        this.afterTrialEstimateAmountExcludeTax = afterTrialEstimateAmountExcludeTax;
-    }
-
-    public String getDemandUnitPriority() {
-        return demandUnitPriority;
-    }
-
-    public void setDemandUnitPriority(String demandUnitPriority) {
-        this.demandUnitPriority = demandUnitPriority;
-    }
-
-    public String getPreliminaryArrangement() {
-        return preliminaryArrangement;
-    }
-
-    public void setPreliminaryArrangement(String preliminaryArrangement) {
-        this.preliminaryArrangement = preliminaryArrangement;
-    }
-
-    public String getInitialImplementBatch() {
-        return initialImplementBatch;
-    }
-
-    public void setInitialImplementBatch(String initialImplementBatch) {
-        this.initialImplementBatch = initialImplementBatch;
-    }
-
-    public String getInitialImplementUnit() {
-        return initialImplementUnit;
-    }
-
-    public void setInitialImplementUnit(String initialImplementUnit) {
-        this.initialImplementUnit = initialImplementUnit;
-    }
-
-    public String getProjectManagementCenter() {
-        return projectManagementCenter;
-    }
-
-    public void setProjectManagementCenter(String projectManagementCenter) {
-        this.projectManagementCenter = projectManagementCenter;
-    }
-
-    public String getCompleteProgressUnit() {
-        return completeProgressUnit;
-    }
-
-    public void setCompleteProgressUnit(String completeProgressUnit) {
-        this.completeProgressUnit = completeProgressUnit;
-    }
-
-    public String getProjectReservePlan() {
-        return projectReservePlan;
-    }
-
-    public void setProjectReservePlan(String projectReservePlan) {
-        this.projectReservePlan = projectReservePlan;
-    }
-
-    public String getDemandUnitProgress() {
-        return demandUnitProgress;
-    }
-
-    public void setDemandUnitProgress(String demandUnitProgress) {
-        this.demandUnitProgress = demandUnitProgress;
-    }
-
-    public String getDepartmentPlan() {
-        return departmentPlan;
-    }
-
-    public void setDepartmentPlan(String departmentPlan) {
-        this.departmentPlan = departmentPlan;
-    }
-
-    public String getAdministrativeProgress() {
-        return administrativeProgress;
-    }
-
-    public void setAdministrativeProgress(String administrativeProgress) {
-        this.administrativeProgress = administrativeProgress;
-    }
-
-    public String getDrawMapPath() {
-        return drawMapPath;
-    }
-
-    public void setDrawMapPath(String drawMapPath) {
-        this.drawMapPath = drawMapPath;
-    }
-
-    public String getPlanRemarks() {
-        return planRemarks;
-    }
-
-    public void setPlanRemarks(String planRemarks) {
-        this.planRemarks = planRemarks;
-    }
-
-    public String getArrangementProject() {
-        return arrangementProject;
-    }
-
-    public void setArrangementProject(String arrangementProject) {
-        this.arrangementProject = arrangementProject;
-    }
-
-    public String getImplementationBatch() {
-        return implementationBatch;
-    }
-
-    public void setImplementationBatch(String implementationBatch) {
-        this.implementationBatch = implementationBatch;
-    }
-
-    public String getConstructionUnit() {
-        return constructionUnit;
-    }
-
-    public void setConstructionUnit(String constructionUnit) {
-        this.constructionUnit = constructionUnit;
-    }
-
-    public String getDrawOfficeDrawn() {
-        return drawOfficeDrawn;
-    }
-
-    public void setDrawOfficeDrawn(String drawOfficeDrawn) {
-        this.drawOfficeDrawn = drawOfficeDrawn;
-    }
-
-    public String getProjectInitiateRemarks() {
-        return projectInitiateRemarks;
-    }
-
-    public void setProjectInitiateRemarks(String projectInitiateRemarks) {
-        this.projectInitiateRemarks = projectInitiateRemarks;
-    }
-
-    public String getStartDesignOrNot() {
-        return startDesignOrNot;
+    public String getProcessStatus() {
+        return processStatus;
     }
 
-    public void setStartDesignOrNot(String startDesignOrNot) {
-        this.startDesignOrNot = startDesignOrNot;
+    public void setProcessStatus(String processStatus) {
+        this.processStatus = processStatus;
     }
 }

src/main/java/com/jeeplus/modules/cg/reservemanagementcenter/reserveManage/mapper/ProjectScreenMapper.java

@@ -0,0 +1,80 @@
+package com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.mapper;
+
+import com.jeeplus.core.persistence.BaseMapper;
+import com.jeeplus.core.persistence.annotation.MyBatisMapper;
+import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.entity.ProjectScreen;
+import com.jeeplus.modules.cg.reservemanagementcenter.statisticalTable.entity.History;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * @author: 王强
+ * @create: 2023-06-28 09:33
+ **/
+@MyBatisMapper
+public interface ProjectScreenMapper extends BaseMapper<ProjectScreen> {
+
+    /**
+     * 批量添加项目储备信息
+     * @param list
+     * @return
+     */
+    void insertList(@Param("list") List<ProjectScreen> list);
+
+    /**
+     * 根据项目储备id查询项目信息
+     * @param reserveManagement
+     * @return
+     */
+    ProjectScreen queryByProjectReserveId(ProjectScreen reserveManagement);
+
+    /**
+     * 获取所有的  项目储备编号
+     * @return
+     */
+    List<String> getAllProId();
+
+    /**
+     * 从基本数据表中获取所有的  项目储备编号
+     * @return
+     */
+    List<String> getAllProId2();
+
+    /**
+     * 根据项目储备编号查看是否有该数据
+     * @param proId
+     * @return
+     */
+    ProjectScreen getByProId(String proId);
+
+    /**
+     * 导出数据查询
+     * @param verificate
+     * @return
+     */
+    List<ProjectScreen> exportFindList(ProjectScreen verificate);
+
+    /**
+     * 根据projectReserveId查出proc_ins_id
+     * @param projectReserveId
+     * @return
+     */
+    String getByProjectReserveId(String projectReserveId);
+
+
+    /**
+     * 根据executeId查出历史节点信息
+     * @param executeId
+     * @return
+     */
+    List<History> getHistoryByExecuteId(String executeId);
+
+    /**
+     * 根据executeId查出当前节点的名称
+     * @param executeId
+     * @return
+     */
+    String getByExecuteId(String executeId);
+
+}

src/main/java/com/jeeplus/modules/cg/reservemanagementcenter/reserveManage/mapper/ProjectTypeVerificateMapper.java

@@ -0,0 +1,85 @@
+package com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.mapper;
+
+import com.jeeplus.core.persistence.BaseMapper;
+import com.jeeplus.core.persistence.annotation.MyBatisMapper;
+import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.entity.ProjectTypeVerificate;
+import com.jeeplus.modules.cg.reservemanagementcenter.statisticalTable.entity.History;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * @author: 王强
+ * @create: 2023-06-26 14:00
+ **/
+@MyBatisMapper
+public interface ProjectTypeVerificateMapper extends BaseMapper<ProjectTypeVerificate> {
+
+    /**
+     * 根据项目名称去在线开甲供材表中查询物料名称
+     * @param projectName
+     * @return
+     */
+    List<String> getMaterialName(String projectName);
+
+    /**
+     * 导出数据查询
+     * @param verificate
+     * @return
+     */
+    List<ProjectTypeVerificate> exportFindList(ProjectTypeVerificate verificate);
+
+    /**
+     * 批量添加项目储备信息
+     * @param list
+     * @return
+     */
+    void insertList(@Param("list") List<ProjectTypeVerificate> list);
+
+    /**
+     * 根据项目储备id查询项目信息
+     * @param reserveManagement
+     * @return
+     */
+    ProjectTypeVerificate queryByProjectReserveId(ProjectTypeVerificate reserveManagement);
+
+    /**
+     * 获取所有的  项目储备编号
+     * @return
+     */
+    List<String> getAllProId();
+
+    /**
+     * 从基本数据表中获取所有的  项目储备编号
+     * @return
+     */
+    List<String> getAllProId2();
+
+    /**
+     * 根据项目储备编号查看是否有该数据
+     * @param proId
+     * @return
+     */
+    ProjectTypeVerificate getByProId(String proId);
+
+    /**
+     * 根据projectReserveId查出proc_ins_id
+     * @param projectReserveId
+     * @return
+     */
+    String getByProjectReserveId(String projectReserveId);
+
+    /**
+     * 根据executeId查出历史节点信息
+     * @param executeId
+     * @return
+     */
+    List<History> getHistoryByExecuteId(String executeId);
+
+    /**
+     * 根据executeId查出当前节点的名称
+     * @param executeId
+     * @return
+     */
+    String getByExecuteId(String executeId);
+}

src/main/java/com/jeeplus/modules/cg/reservemanagementcenter/reserveManage/mapper/SummaryStatisticMapper.java

@@ -29,6 +29,12 @@ public interface SummaryStatisticMapper extends BaseMapper<ReserveSummary> {
     List<ReserveSummary> getAllCode();
 
     /**
+     * 查出 项目编码 及 是否纳入储备字段
+     * @return
+     */
+    ReserveSummary getCodeByProId(String projectReserveId);
+
+    /**
      * 从数据库中查出所有的 项目储备编号
      * @return
      */

src/main/java/com/jeeplus/modules/cg/reservemanagementcenter/reserveManage/mapper/xml/CompanyReviewMapper.xml

@@ -10,7 +10,6 @@
 		a.update_date AS "updateDate",
 		a.del_flag AS "delFlag",
 		a.projectYear,
-		a.projectNature,
 		a.demandUnit,
 		a.district,
 		a.projectGroup,
@@ -32,7 +31,9 @@
 		IFNULL(b.passProvincialCompanyReview,"") as passProvincialCompanyReview,
 		IFNULL(b.reviewComments,"") as reviewComments,
 		IFNULL(b.designChangeRequired,"") as designChangeRequired,
-		IFNULL(b.companyRemarks,"") as companyRemarks
+		IFNULL(b.companyRemarks,"") as companyRemarks,
+		tv.projectNatureArtificial AS projectNature,
+		COALESCE(NULLIF(tv.includeCablesArtificial,''), tv.projectType) AS projectType
     </sql>
 
     <insert id="insert">
@@ -133,6 +134,7 @@
         from cg_reserve_process a
         left join cg_reserve_company_review b
         on a.projectReserveId = b.projectReserveId
+        left join cg_project_type_verificate tv on a.projectReserveId = tv.projectReserveId
         <where>
             a.del_flag = 0
             <if test="projectReserveId!=null and projectReserveId!=''">
@@ -162,6 +164,7 @@
         from cg_reserve_process a
         left join cg_reserve_company_review b
         on a.projectReserveId = b.projectReserveId
+        left join cg_project_type_verificate tv on a.projectReserveId = tv.projectReserveId
         where a.id = #{id}
     </select>
 
@@ -186,6 +189,7 @@
         from cg_reserve_process a
         left join cg_reserve_company_review b
         on a.projectReserveId = b.projectReserveId
+        left join cg_project_type_verificate tv on a.projectReserveId = tv.projectReserveId
         <where>
             a.del_flag = 0
             <if test="projectReserveId!=null and projectReserveId!=''">

src/main/java/com/jeeplus/modules/cg/reservemanagementcenter/reserveManage/mapper/xml/ProjectScreenMapper.xml

@@ -0,0 +1,308 @@
+<?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.cg.reservemanagementcenter.reserveManage.mapper.ProjectScreenMapper">
+
+    <sql id="companyReviewColumns">
+        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.del_flag AS "delFlag",
+		a.ownerReserveProjectManagre as projectManager,
+        a.projectYear,
+        a.demandUnit,
+        a.district,
+        a.projectGroup,
+        a.reserveBatches,
+        a.blockSupply,
+        a.gridNumber,
+        a.cellNumber,
+        a.projectReserveId,
+        a.projectName,
+        a.constructionNecessityAndContent,
+        a.substationName,
+        a.circuitName,
+        a.netRackProjectDivide,
+        a.requirementType,
+        a.costEstimate,
+        a.basicRemarks,
+        b.implementPlan as implementReserve,
+        b.implementPlan,
+        b.projectPromotion,
+        b.completeProgress,
+        b.preliminaryWorkPreparationRemarks,
+        b.requirementUnitPriority,
+        b.implementBatchScreen,
+        b.implementBatchScreen as implementBatch,
+        b.constructionUnit,
+        b.projectApprovalBatch,
+        b.realityConstructionUnit,
+        b.approvalDiagram,
+        b.approvalDiagramTime,
+        b.paperDrawing,
+        b.paperDrawingTime,
+        b.screenRemarks,
+        IFNULL(c.comprehensiveProject,"") as comprehensiveProject,
+        IFNULL(c.powerFailureDifficulty,"") as powerFailureDifficulty,
+        IFNULL(c.powerFailureDescribe,"") as powerFailureDescribe,
+        IFNULL(c.otherProblemDifficulty,"") as otherProblemDifficulty,
+        IFNULL(c.otherProblemDescribe,"") as otherProblemDescribe,
+        IFNULL(c.runPlanRequire,"") as runPlanRequire,
+        IFNULL(c.programChangeDescription,"") as programChangeDescription,
+        IFNULL(c.discloseRemarks,"") as discloseRemarks,
+        tv.projectNatureArtificial AS projectNature,
+        COALESCE(NULLIF(tv.includeCablesArtificial,''), tv.projectType) AS projectType
+    </sql>
+
+    <sql id="reserveManagementColumn">
+        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.del_flag AS "delFlag",
+        a.implementPlan,
+        a.projectPromotion,
+        a.completeProgress,
+        a.preliminaryWorkPreparationRemarks,
+        a.requirementUnitPriority,
+        a.implementBatchScreen,
+        a.constructionUnit,
+        a.projectApprovalBatch,
+        a.realityConstructionUnit,
+        a.approvalDiagram,
+        a.approvalDiagramTime,
+        a.paperDrawing,
+        a.paperDrawingTime,
+        a.screenRemarks
+    </sql>
+
+    <select id="findList" resultType="com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.entity.ProjectScreen">
+        select
+        <include refid="companyReviewColumns"/>
+        from cg_reserve_process a
+        left join cg_project_screen b
+        on a.projectReserveId = b.projectReserveId
+        left join cg_reserve_summary_statistics c
+        on a.projectReserveId = c.projectReserveId
+        left join cg_project_type_verificate tv on a.projectReserveId = tv.projectReserveId
+        <where>
+            a.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.cg.reservemanagementcenter.reserveManage.entity.ProjectScreen">
+        select
+        <include refid="companyReviewColumns"/>
+        from cg_reserve_process a
+        left join cg_project_screen b
+        on a.projectReserveId = b.projectReserveId
+        left join cg_reserve_summary_statistics c
+        on a.projectReserveId = c.projectReserveId
+        left join cg_project_type_verificate tv on a.projectReserveId = tv.projectReserveId
+        <where>
+            a.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>
+    </select>
+
+    <select id="get" resultType="com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.entity.ProjectScreen">
+        select
+        <include refid="companyReviewColumns"/>
+        from cg_reserve_process a
+        left join cg_project_screen b
+        on a.projectReserveId = b.projectReserveId
+        left join cg_reserve_summary_statistics c
+        on a.projectReserveId = c.projectReserveId
+        left join cg_project_type_verificate tv on a.projectReserveId = tv.projectReserveId
+        where a.id = #{id}
+    </select>
+
+    <select id="getByProjectReserveId" resultType="java.lang.String">
+        SELECT proc_ins_id from cg_personnel_activiti where projectReserveId = #{projectReserveId}
+    </select>
+    <select id="getHistoryByExecuteId"
+            resultType="com.jeeplus.modules.cg.reservemanagementcenter.statisticalTable.entity.History">
+        select ACT_NAME_ as name,START_TIME_ as startTime,END_TIME_ as endTime from act_hi_actinst
+        WHERE EXECUTION_ID_ = #{executeId} and ACT_NAME_ is not null ORDER BY startTime desc
+    </select>
+    <select id="getByExecuteId" resultType="java.lang.String">
+        SELECT NAME_ FROM `act_ru_task` WHERE EXECUTION_ID_ = #{executeId}
+    </select>
+    <select id="getByProId"
+            resultType="com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.entity.ProjectScreen">
+        select
+        <include refid="reserveManagementColumn"/>
+        from cg_project_screen a where a.projectReserveId = #{proId}
+    </select>
+
+    <insert id="insert">
+        insert into cg_project_screen (
+        id,
+        create_by,
+        create_date,
+        update_by,
+        update_date,
+        del_flag,
+        remarks,
+        projectReserveId,
+        projectPromotion,
+        completeProgress,
+        preliminaryWorkPreparationRemarks,
+        requirementUnitPriority,
+        implementPlan,
+        implementBatchScreen,
+        constructionUnit,
+        projectApprovalBatch,
+        realityConstructionUnit,
+        approvalDiagram,
+        approvalDiagramTime,
+        paperDrawing,
+        paperDrawingTime,
+        screenRemarks
+        )
+        values
+            (
+            #{id},
+            #{createBy.id},
+            #{createDate},
+            #{updateBy.id},
+            #{updateDate},
+            #{delFlag},
+            #{remarks},
+            #{projectReserveId},
+            #{projectPromotion},
+            #{completeProgress},
+            #{preliminaryWorkPreparationRemarks},
+            #{requirementUnitPriority},
+            #{implementPlan},
+            #{implementBatchScreen},
+            #{constructionUnit},
+            #{projectApprovalBatch},
+            #{realityConstructionUnit},
+            #{approvalDiagram},
+            #{approvalDiagramTime},
+            #{paperDrawing},
+            #{paperDrawingTime},
+            #{screenRemarks}
+            )
+    </insert>
+    <insert id="insertList">
+        insert into cg_project_screen (
+        id,
+        create_by,
+        create_date,
+        update_by,
+        update_date,
+        del_flag,
+        remarks,
+        projectReserveId,
+        projectPromotion,
+        completeProgress,
+        preliminaryWorkPreparationRemarks,
+        requirementUnitPriority,
+        implementPlan,
+        implementBatchScreen,
+        constructionUnit,
+        projectApprovalBatch,
+        realityConstructionUnit,
+        approvalDiagram,
+        approvalDiagramTime,
+        paperDrawing,
+        paperDrawingTime,
+        screenRemarks
+        )
+        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.projectReserveId},
+            #{item.projectPromotion},
+            #{item.completeProgress},
+            #{item.preliminaryWorkPreparationRemarks},
+            #{item.requirementUnitPriority},
+            #{item.implementPlan},
+            #{item.implementBatchScreen},
+            #{item.constructionUnit},
+            #{item.projectApprovalBatch},
+            #{item.realityConstructionUnit},
+            #{item.approvalDiagram},
+            #{item.approvalDiagramTime},
+            #{item.paperDrawing},
+            #{item.paperDrawingTime},
+            #{item.screenRemarks}
+            )
+        </foreach>
+    </insert>
+
+    <update id="update">
+		update
+        cg_project_screen
+        set
+        update_by = #{updateBy.id},
+        update_date = #{updateDate},
+        remarks = #{remarks},
+        projectPromotion = #{projectPromotion},
+        completeProgress = #{completeProgress},
+        preliminaryWorkPreparationRemarks = #{preliminaryWorkPreparationRemarks},
+        requirementUnitPriority = #{requirementUnitPriority},
+        implementPlan = #{implementPlan},
+        implementBatchScreen = #{implementBatchScreen},
+        constructionUnit = #{constructionUnit},
+        projectApprovalBatch = #{projectApprovalBatch},
+        realityConstructionUnit = #{realityConstructionUnit},
+        approvalDiagram = #{approvalDiagram},
+        approvalDiagramTime = #{approvalDiagramTime},
+        paperDrawing = #{paperDrawing},
+        paperDrawingTime = #{paperDrawingTime},
+        screenRemarks = #{screenRemarks}
+        where id = #{id}
+	</update>
+
+    <select id="getAllProId" resultType="java.lang.String">
+        select projectReserveId from cg_project_screen
+    </select>
+    <select id="getAllProId2" resultType="java.lang.String">
+        select projectReserveId from cg_reserve_process
+    </select>
+    <select id="queryByProjectReserveId"
+            resultType="com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.entity.ProjectScreen">
+        select
+        <include refid="reserveManagementColumn"/>
+        from cg_project_screen a
+        where a.projectReserveId = #{projectReserveId}
+    </select>
+
+</mapper>

src/main/java/com/jeeplus/modules/cg/reservemanagementcenter/reserveManage/mapper/xml/ProjectTypeVerificateMapper.xml

@@ -0,0 +1,236 @@
+<?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.cg.reservemanagementcenter.reserveManage.mapper.ProjectTypeVerificateMapper">
+
+    <sql id="companyReviewColumns">
+        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.del_flag AS "delFlag",
+		a.ownerReserveProjectManagre as projectManager,
+        a.projectYear,
+        a.demandUnit,
+        a.district,
+        a.projectGroup,
+        a.reserveBatches,
+        a.blockSupply,
+        a.gridNumber,
+        a.cellNumber,
+        a.projectReserveId,
+        a.projectName,
+        a.constructionNecessityAndContent,
+        a.substationName,
+        a.circuitName,
+        a.netRackProjectDivide,
+        a.requirementType,
+        a.costEstimate,
+        a.basicRemarks,
+        IFNULL(b.projectNature,"") as projectNature,
+        IFNULL(b.newSubstation,"") as newSubstation,
+        IFNULL(b.projectNatureArtificial,"") as projectNatureArtificial,
+        IFNULL(b.projectType,"") as projectType,
+        IFNULL(b.includeCablesArtificial,"") as includeCablesArtificial,
+        IFNULL(c.implementPlan,"") as implementPlan,
+		IFNULL(c.implementBatchScreen,"") as implementBatch
+    </sql>
+
+    <sql id="reserveManagementColumn">
+        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.del_flag AS "delFlag",
+		a.projectNature,
+        a.newSubstation,
+        a.projectNatureArtificial,
+        a.projectType,
+        a.includeCablesArtificial
+
+    </sql>
+
+    <select id="get" resultType="com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.entity.ProjectTypeVerificate">
+        select
+        <include refid="companyReviewColumns"/>
+        from cg_reserve_process a
+        left join cg_project_type_verificate b
+        on a.projectReserveId = b.projectReserveId
+        left join cg_project_screen c
+        on a.projectReserveId = c.projectReserveId
+        where a.id = #{id}
+    </select>
+
+    <select id="findList" resultType="com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.entity.ProjectTypeVerificate">
+        select
+        <include refid="companyReviewColumns"/>
+        from cg_reserve_process a
+        left join cg_project_type_verificate b
+        on a.projectReserveId = b.projectReserveId
+        left join cg_project_screen c
+        on a.projectReserveId = c.projectReserveId
+        <where>
+            a.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.cg.reservemanagementcenter.reserveManage.entity.ProjectTypeVerificate">
+        select
+        <include refid="companyReviewColumns"/>
+        from cg_reserve_process a
+        left join cg_project_type_verificate b
+        on a.projectReserveId = b.projectReserveId
+        left join cg_project_screen c
+        on a.projectReserveId = c.projectReserveId
+        <where>
+            a.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>
+    </select>
+    <select id="queryByProjectReserveId"
+            resultType="com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.entity.ProjectTypeVerificate">
+        select
+        <include refid="reserveManagementColumn"/>
+        from cg_project_type_verificate a
+        where a.projectReserveId = #{projectReserveId}
+    </select>
+    <select id="getAllProId" resultType="java.lang.String">
+        select projectReserveId from cg_project_type_verificate
+    </select>
+    <select id="getAllProId2" resultType="java.lang.String">
+        select projectReserveId from cg_reserve_process
+    </select>
+    <select id="getByProId"
+            resultType="com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.entity.ProjectTypeVerificate">
+        select
+        <include refid="reserveManagementColumn"/>
+        from cg_project_type_verificate a where a.projectReserveId = #{proId}
+    </select>
+
+    <insert id="insert">
+        insert into cg_project_type_verificate (
+        id,
+        create_by,
+        create_date,
+        update_by,
+        update_date,
+        del_flag,
+        remarks,
+        projectNature,
+        newSubstation,
+        projectNatureArtificial,
+        projectType,
+        includeCablesArtificial,
+        projectReserveId
+        )
+        values
+            (
+            #{id},
+            #{createBy.id},
+            #{createDate},
+            #{updateBy.id},
+            #{updateDate},
+            #{delFlag},
+            #{remarks},
+            #{projectNature},
+            #{newSubstation},
+            #{projectNatureArtificial},
+            #{projectType},
+            #{includeCablesArtificial},
+            #{projectReserveId}
+            )
+    </insert>
+    <insert id="insertList">
+        insert into cg_project_type_verificate (
+        id,
+        create_by,
+        create_date,
+        update_by,
+        update_date,
+        del_flag,
+        remarks,
+        projectNature,
+        newSubstation,
+        projectNatureArtificial,
+        projectType,
+        includeCablesArtificial,
+        projectReserveId
+        )
+        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.newSubstation},
+            #{item.projectNatureArtificial},
+            #{item.projectType},
+            #{item.includeCablesArtificial},
+            #{item.projectReserveId}
+            )
+        </foreach>
+    </insert>
+
+    <update id="update">
+		update
+        cg_project_type_verificate
+        set
+        update_by = #{updateBy.id},
+        update_date = #{updateDate},
+        remarks = #{remarks},
+        projectNature = #{projectNature},
+        newSubstation = #{newSubstation},
+        projectNatureArtificial = #{projectNatureArtificial},
+        projectType = #{projectType},
+        includeCablesArtificial = #{includeCablesArtificial}
+        where id = #{id}
+	</update>
+
+    <select id="getByProjectReserveId" resultType="java.lang.String">
+        SELECT proc_ins_id from cg_personnel_activiti where projectReserveId = #{projectReserveId}
+    </select>
+    <select id="getHistoryByExecuteId"
+            resultType="com.jeeplus.modules.cg.reservemanagementcenter.statisticalTable.entity.History">
+        select ACT_NAME_ as name,START_TIME_ as startTime,END_TIME_ as endTime from act_hi_actinst
+        WHERE EXECUTION_ID_ = #{executeId} and ACT_NAME_ is not null ORDER BY startTime desc
+    </select>
+    <select id="getByExecuteId" resultType="java.lang.String">
+        SELECT NAME_ FROM `act_ru_task` WHERE EXECUTION_ID_ = #{executeId}
+    </select>
+
+    <select id="getMaterialName" resultType="java.lang.String">
+        select materialName from cg_material_data where projectName = #{projectName}
+    </select>
+
+</mapper>

src/main/java/com/jeeplus/modules/cg/reservemanagementcenter/reserveManage/mapper/xml/ReserveElectricityWorkMapper.xml

@@ -30,10 +30,12 @@
 		a.update_date AS "updateDate",
 		a.del_flag AS "delFlag",
 		a.projectYear,
-		a.projectNature,
 		a.demandUnit,
 		a.district,
 		a.projectGroup,
+		a.ownerReserveProjectManagre,
+		tv.projectNatureArtificial AS projectNature,
+		COALESCE(NULLIF(tv.includeCablesArtificial,''), tv.projectType) AS projectType,
 		a.reserveBatches,
 		a.blockSupply,
 		a.gridNumber,
@@ -56,8 +58,8 @@
 		IFNULL(b.powerOutagePlan,"") as powerOutagePlan,
 		IFNULL(b.planner,"") as planner,
 		IFNULL(b.siteSurveyor,"") as siteSurveyor,
-		IFNULL(c.includeReserve,"") as implementPlan,
-		IFNULL(c.initialImplementBatch,"") as implementBatch
+		IFNULL(c.implementPlan,"") as implementPlan,
+		IFNULL(c.implementBatchScreen,"") as implementBatch
 
     </sql>
 
@@ -184,8 +186,9 @@
         from cg_reserve_process a
         left join cg_reserve_electricity_work_information b
         on a.projectReserveId = b.projectReserveId
-        left join cg_reserve_summary_statistics c
+        left join cg_project_screen c
         on b.projectReserveId = c.projectReserveId
+        left join cg_project_type_verificate tv on a.projectReserveId = tv.projectReserveId
         <where>
             a.del_flag = 0
             <if test="projectReserveId!=null and projectReserveId!=''">
@@ -214,8 +217,9 @@
         from cg_reserve_process a
         left join cg_reserve_electricity_work_information b
         on a.projectReserveId = b.projectReserveId
-        left join cg_reserve_summary_statistics c
+        left join cg_project_screen c
         on a.projectReserveId = c.projectReserveId
+        left join cg_project_type_verificate tv on a.projectReserveId = tv.projectReserveId
         <where>
             a.del_flag = 0
             <if test="projectReserveId!=null and projectReserveId!=''">
@@ -237,8 +241,9 @@
         from cg_reserve_process a
         left join cg_reserve_electricity_work_information b
         on a.projectReserveId = b.projectReserveId
-        left join cg_reserve_summary_statistics c
+        left join cg_project_screen c
         on a.projectReserveId = c.projectReserveId
+        left join cg_project_type_verificate tv on a.projectReserveId = tv.projectReserveId
         where a.id = #{id}
     </select>
     <select id="getByProjectReserveId" resultType="java.lang.String">

src/main/java/com/jeeplus/modules/cg/reservemanagementcenter/reserveManage/mapper/xml/ReservePreconstructMapper.xml

@@ -22,7 +22,6 @@
 		a.update_date AS "updateDate",
 		a.del_flag AS "delFlag",
 		a.projectYear,
-		a.projectNature,
 		a.demandUnit,
 		a.district,
 		a.projectGroup,
@@ -42,9 +41,9 @@
 		IFNULL(b.confessCivilFoundation,"") as confessCivilFoundation,
 		IFNULL(b.confessPrefab,"") as confessPrefab,
 		IFNULL(b.confessPrefabDescription,"") as confessPrefabDescription,
-		IFNULL(c.includeReserve,"") as implementPlan,
-		IFNULL(c.initialImplementBatch,"") as implementBatch
-
+		IFNULL(c.implementPlan,"") as implementPlan,
+		IFNULL(c.implementBatchScreen,"") as implementBatch,
+        tv.projectNatureArtificial AS projectNature
     </sql>
 
     <insert id="insert">
@@ -135,8 +134,9 @@
         from cg_reserve_process a
         left join cg_reserve_preconstruction_information b
         on a.projectReserveId = b.projectReserveId
-        left join cg_reserve_summary_statistics c
+        left join cg_project_screen c
         on a.projectReserveId = c.projectReserveId
+        left join cg_project_type_verificate tv on a.projectReserveId = tv.projectReserveId
         <where>
             a.del_flag = 0
             <if test="projectReserveId!=null and projectReserveId!=''">
@@ -165,8 +165,9 @@
         from cg_reserve_process a
         left join cg_reserve_preconstruction_information b
         on a.projectReserveId = b.projectReserveId
-        left join cg_reserve_summary_statistics c
+        left join cg_project_screen c
         on a.projectReserveId = c.projectReserveId
+        left join cg_project_type_verificate tv on a.projectReserveId = tv.projectReserveId
         <where>
             a.del_flag = 0
             <if test="projectReserveId!=null and projectReserveId!=''">
@@ -188,8 +189,9 @@
         from cg_reserve_process a
         left join cg_reserve_preconstruction_information b
         on a.projectReserveId = b.projectReserveId
-        left join cg_reserve_summary_statistics c
+        left join cg_project_screen c
         on a.projectReserveId = c.projectReserveId
+        left join cg_project_type_verificate tv on a.projectReserveId = tv.projectReserveId
         where a.id = #{id}
     </select>
 

src/main/java/com/jeeplus/modules/cg/reservemanagementcenter/reserveManage/mapper/xml/ReserveProcessProjectMapper.xml

@@ -10,7 +10,7 @@
 		a.update_date AS "updateDate",
 		a.del_flag AS "delFlag",
 		a.projectYear,
-		a.projectNature,
+		tv.projectNatureArtificial AS projectNature,
 		a.demandUnit,
 		a.district,
 		a.projectGroup,
@@ -25,21 +25,19 @@
 		a.circuitName,
 		a.netRackProjectDivide,
 		a.requirementType,
+		COALESCE(NULLIF(tv.includeCablesArtificial,''), tv.projectType) AS projectType,
 		a.costEstimate,
 		a.basicRemarks,
 		a.requester,
 		a.ownerReserveFullTime,
 		a.ownerReserveProjectManagre,
 		a.ownerDistributionNerworkFullTime,
-		a.ownerProjectManager,
 		a.materialSoleDuty,
 		a.technicalStaff,
 		a.operationAndMaintenancePersonnel,
 		a.designer,
 		a.budgetPreparer,
-		a.processStatus,
-		a.clearOrNot,
-        a.noStartTheDesign
+		a.processStatus
     </sql>
 
     <insert id="insert">
@@ -51,7 +49,6 @@
         update_date,
         del_flag,
         projectYear,
-        projectNature,
         demandUnit,
         district,
         projectGroup,
@@ -72,15 +69,12 @@
         ownerReserveFullTime,
         ownerReserveProjectManagre,
         ownerDistributionNerworkFullTime,
-        ownerProjectManager,
         materialSoleDuty,
         technicalStaff,
         operationAndMaintenancePersonnel,
         designer,
         budgetPreparer,
-        processStatus,
-        clearOrNot,
-        noStartTheDesign
+        processStatus
         )
         values
             (
@@ -91,7 +85,6 @@
             #{updateDate},
             #{delFlag},
             #{projectYear},
-            #{projectNature},
             #{demandUnit},
             #{district},
             #{projectGroup},
@@ -112,15 +105,12 @@
             #{ownerReserveFullTime},
             #{ownerReserveProjectManagre},
             #{ownerDistributionNerworkFullTime},
-            #{ownerProjectManager},
             #{materialSoleDuty},
             #{technicalStaff},
             #{operationAndMaintenancePersonnel},
             #{designer},
             #{budgetPreparer},
-            #{processStatus},
-            #{clearOrNot},
-            #{noStartTheDesign}
+            #{processStatus}
             )
     </insert>
     <insert id="insertList">
@@ -132,7 +122,6 @@
         update_date,
         del_flag,
         projectYear,
-        projectNature,
         demandUnit,
         district,
         projectGroup,
@@ -153,15 +142,12 @@
         ownerReserveFullTime,
         ownerReserveProjectManagre,
         ownerDistributionNerworkFullTime,
-        ownerProjectManager,
         materialSoleDuty,
         technicalStaff,
         operationAndMaintenancePersonnel,
         designer,
         budgetPreparer,
-        processStatus,
-        clearOrNot,
-        noStartTheDesign
+        processStatus
         )
         values
         <foreach collection="list" item="item" index="index" separator="," >
@@ -173,7 +159,6 @@
             #{item.updateDate},
             #{item.delFlag},
             #{item.projectYear},
-            #{item.projectNature},
             #{item.demandUnit},
             #{item.district},
             #{item.projectGroup},
@@ -194,15 +179,12 @@
             #{item.ownerReserveFullTime},
             #{item.ownerReserveProjectManagre},
             #{item.ownerDistributionNerworkFullTime},
-            #{item.ownerProjectManager},
             #{item.materialSoleDuty},
             #{item.technicalStaff},
             #{item.operationAndMaintenancePersonnel},
             #{item.designer},
             #{item.budgetPreparer},
-            #{item.processStatus},
-            #{item.clearOrNot},
-            #{item.noStartTheDesign}
+            #{item.processStatus}
             )
         </foreach>
     </insert>
@@ -214,7 +196,6 @@
         update_by = #{updateBy.id},
         update_date = #{updateDate},
         projectYear = #{projectYear},
-        projectNature = #{projectNature},
         demandUnit = #{demandUnit},
         district = #{district},
         projectGroup = #{projectGroup},
@@ -232,15 +213,12 @@
         ownerReserveFullTime = #{ownerReserveFullTime},
         ownerReserveProjectManagre = #{ownerReserveProjectManagre},
         ownerDistributionNerworkFullTime = #{ownerDistributionNerworkFullTime},
-        ownerProjectManager = #{ownerProjectManager},
         materialSoleDuty = #{materialSoleDuty},
         technicalStaff = #{technicalStaff},
         operationAndMaintenancePersonnel = #{operationAndMaintenancePersonnel},
         designer = #{designer},
         budgetPreparer = #{budgetPreparer},
-        processStatus = #{processStatus},
-        clearOrNot = #{clearOrNot},
-        noStartTheDesign = #{noStartTheDesign}
+        processStatus = #{processStatus}
         where id = #{id}
 	</update>
 
@@ -251,7 +229,6 @@
         update_by = #{updateBy.id},
         update_date = #{updateDate},
         projectYear = #{projectYear},
-        projectNature = #{projectNature},
         demandUnit = #{demandUnit},
         district = #{district},
         projectGroup = #{projectGroup},
@@ -275,9 +252,6 @@
         <if test="ownerDistributionNerworkFullTime != null and ownerDistributionNerworkFullTime != ''">
             ownerDistributionNerworkFullTime = #{ownerDistributionNerworkFullTime},
         </if>
-        <if test="ownerProjectManager != null and ownerProjectManager != ''">
-            ownerProjectManager = #{ownerProjectManager},
-        </if>
         <if test="materialSoleDuty != null and materialSoleDuty != ''">
             materialSoleDuty = #{materialSoleDuty},
         </if>
@@ -291,9 +265,7 @@
             designer = #{designer},
         </if>
         budgetPreparer = #{budgetPreparer},
-        processStatus = #{processStatus},
-        clearOrNot = #{clearOrNot},
-        noStartTheDesign = #{noStartTheDesign}
+        processStatus = #{processStatus}
 --         uninterruptedWorkSurveyPersonnel = #{uninterruptedWorkSurveyPersonnel}
         where id = #{id}
     </update>
@@ -304,7 +276,6 @@
         update_by = #{updateBy.id},
         update_date = #{updateDate},
         projectYear = #{projectYear},
-        projectNature = #{projectNature},
         demandUnit = #{demandUnit},
         district = #{district},
         projectGroup = #{projectGroup},
@@ -328,9 +299,6 @@
         <if test="ownerDistributionNerworkFullTime != null and ownerDistributionNerworkFullTime != ''">
             ownerDistributionNerworkFullTime = #{ownerDistributionNerworkFullTime},
         </if>
-        <if test="ownerProjectManager != null and ownerProjectManager != ''">
-            ownerProjectManager = #{ownerProjectManager},
-        </if>
         <if test="materialSoleDuty != null and materialSoleDuty != ''">
             materialSoleDuty = #{materialSoleDuty},
         </if>
@@ -354,6 +322,7 @@
         select
         <include refid="reserveManagementColumns"/>
         from cg_reserve_process a
+        left join cg_project_type_verificate tv on a.projectReserveId = tv.projectReserveId
         where a.projectReserveId = #{projectReserveId}
     </select>
     <select id="findByProjectId" resultType="java.lang.Integer">
@@ -370,6 +339,7 @@
         from cg_reserve_process a
         left join cg_reserve_electricity_work_information b
         on a.projectReserveId = b.projectReserveId
+        left join cg_project_type_verificate tv on a.projectReserveId = tv.projectReserveId
         <where>
             a.del_flag = 0
             <if test="projectReserveId!=null and projectReserveId!=''">
@@ -389,6 +359,7 @@
         select
         <include refid="reserveManagementColumns"/>
         from cg_reserve_process a
+        left join cg_project_type_verificate tv on a.projectReserveId = tv.projectReserveId
         <where>
             del_flag = 0
             <if test="projectReserveId!=null and projectReserveId!=''">
@@ -412,6 +383,7 @@
         select
         <include refid="reserveManagementColumns"/>
         from cg_reserve_process a
+        left join cg_project_type_verificate tv on a.projectReserveId = tv.projectReserveId
         <where>
             del_flag = 0
             <if test="projectReserveId!=null and projectReserveId!=''">
@@ -437,45 +409,44 @@
     </select>
     <select id="findByProcInsId"
             resultType="com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.entity.ReserveProcessProject">
-        select id,
-               create_by,
-               create_date,
-               update_by,
-               update_date,
-               del_flag,
-               projectYear,
-		projectNature,
-		demandUnit,
-		district,
-		projectGroup,
-		reserveBatches,
-		blockSupply,
-		gridNumber,
-		cellNumber,
-		projectReserveId,
-		projectName,
-		constructionNecessityAndContent,
-		substationName,
-		circuitName,
-		netRackProjectDivide,
-		requirementType,
-		costEstimate,
-		basicRemarks,
-		requester,
-		ownerReserveFullTime,
-		ownerReserveProjectManagre,
-		ownerDistributionNerworkFullTime,
-		ownerProjectManager,
-		materialSoleDuty,
-		technicalStaff,
-		operationAndMaintenancePersonnel,
-		designer,
-		budgetPreparer,
-		processStatus,
-		clearOrNot,
-        noStartTheDesign
+        select a.id,
+               a.create_by,
+               a.create_date,
+               a.update_by,
+               a.update_date,
+               a.del_flag,
+               a.projectYear,
+		tv.projectNatureArtificial AS projectNature,
+		a.demandUnit,
+		a.district,
+		a.projectGroup,
+		a.reserveBatches,
+		a.blockSupply,
+		a.gridNumber,
+		a.cellNumber,
+		a.projectReserveId,
+		a.projectName,
+		a.constructionNecessityAndContent,
+		a.substationName,
+		a.circuitName,
+		a.netRackProjectDivide,
+		a.requirementType,
+		COALESCE(NULLIF(tv.includeCablesArtificial,''), tv.projectType) AS projectType,
+		a.costEstimate,
+		a.basicRemarks,
+		a.requester,
+		a.ownerReserveFullTime,
+		a.ownerReserveProjectManagre,
+		a.ownerDistributionNerworkFullTime,
+		a.materialSoleDuty,
+		a.technicalStaff,
+		a.operationAndMaintenancePersonnel,
+		a.designer,
+		a.budgetPreparer,
+		a.processStatus
 -- 		uninterruptedWorkSurveyPersonnel
-        from cg_reserve_process
+        from cg_reserve_process a
+        left join cg_project_type_verificate tv on a.projectReserveId = tv.projectReserveId
         where projectReserveId = (select projectReserveId from cb_personnel_activiti where proc_ins_id = #{procInsId})
     </select>
 
@@ -486,6 +457,7 @@
         from cg_reserve_process a
         left join cg_reserve_electricity_work_information b
         on a.projectReserveId = b.projectReserveId
+        left join cg_project_type_verificate tv on a.projectReserveId = tv.projectReserveId
         where a.id = #{id}
     </select>
 
@@ -496,6 +468,7 @@
         from cg_reserve_process a
         left join cg_reserve_electricity_work_information b
         on a.projectReserveId = b.projectReserveId
+        left join cg_project_type_verificate tv on a.projectReserveId = tv.projectReserveId
         <where>
             a.del_flag = 0
             <if test="projectReserveId!=null and projectReserveId!=''">
@@ -525,6 +498,7 @@
         select
         <include refid="reserveManagementColumns"/>
         from cg_reserve_process a
+        left join cg_project_type_verificate tv on a.projectReserveId = tv.projectReserveId
         where a.projectReserveId = #{projectReserveId}
     </select>
 

src/main/java/com/jeeplus/modules/cg/reservemanagementcenter/reserveManage/mapper/xml/ReserveSafeDisclosureMapper.xml

@@ -45,10 +45,10 @@
 		a.update_date AS "updateDate",
 		a.del_flag AS "delFlag",
 		a.projectYear,
-		a.projectNature,
 		a.demandUnit,
 		a.district,
 		a.projectGroup,
+		a.ownerReserveProjectManagre as projectManager,
 		a.reserveBatches,
 		a.blockSupply,
 		a.gridNumber,
@@ -86,7 +86,11 @@
 		IFNULL(b.teamWorkDescribe,"") as teamWorkDescribe,
 		IFNULL(b.prepareThreeMeasures,"") as prepareThreeMeasures,
 		IFNULL(b.measureDescribe,"") as measureDescribe,
-		IFNULL(b.jobRiskLevelPrediction,"") as jobRiskLevelPrediction
+		IFNULL(b.jobRiskLevelPrediction,"") as jobRiskLevelPrediction,
+		IFNULL(c.implementPlan,"") as implementPlan,
+		IFNULL(c.implementBatchScreen,"") as implementBatch,
+		tv.projectNatureArtificial AS projectNature,
+		COALESCE(NULLIF(tv.includeCablesArtificial,''), tv.projectType) AS projectType
 
     </sql>
 
@@ -289,6 +293,9 @@
         from cg_reserve_process a
         left join cg_reserve_safety_disclosure_information b
         on a.projectReserveId = b.projectReserveId
+        left join cg_project_screen c
+        on a.projectReserveId = c.projectReserveId
+        left join cg_project_type_verificate tv on a.projectReserveId = tv.projectReserveId
         <where>
             a.del_flag = 0
             <if test="projectReserveId!=null and projectReserveId!=''">
@@ -317,6 +324,9 @@
         from cg_reserve_process a
         left join cg_reserve_safety_disclosure_information b
         on a.projectReserveId = b.projectReserveId
+        left join cg_project_screen c
+        on a.projectReserveId = c.projectReserveId
+        left join cg_project_type_verificate tv on a.projectReserveId = tv.projectReserveId
         <where>
             a.del_flag = 0
             <if test="projectReserveId!=null and projectReserveId!=''">
@@ -338,6 +348,9 @@
         from cg_reserve_process a
         left join cg_reserve_safety_disclosure_information b
         on a.projectReserveId = b.projectReserveId
+        left join cg_project_screen c
+        on a.projectReserveId = c.projectReserveId
+        left join cg_project_type_verificate tv on a.projectReserveId = tv.projectReserveId
         where a.id = #{id}
     </select>
     <select id="getByProjectReserveId" resultType="java.lang.String">

src/main/java/com/jeeplus/modules/cg/reservemanagementcenter/reserveManage/mapper/xml/ReserveSummaryProcessMapper.xml

@@ -12,7 +12,7 @@
 		a.projectReserveId,
         b.projectName,
 		b.projectYear as 'reserveSummary.projectYear',
-		b.projectNature as 'reserveSummary.projectNature',
+		tv.projectNatureArtificial AS 'reserveSummary.projectNature',
 		b.demandUnit as 'reserveSummary.demandUnit',
 		b.district as 'reserveSummary.district',
 		b.projectGroup as 'reserveSummary.projectGroup',
@@ -38,23 +38,7 @@
 		a.otherProblemDescribe as 'reserveSummary.otherProblemDescribe',
 		a.runPlanRequire as 'reserveSummary.runPlanRequire',
 		a.programChangeDescription as 'reserveSummary.programChangeDescription',
-		a.discloseRemarks as 'reserveSummary.discloseRemarks',
-		a.demandUnitPriority as 'reserveSummary.demandUnitPriority',
-		a.preliminaryArrangement as 'reserveSummary.preliminaryArrangement',
-		a.initialImplementBatch as 'reserveSummary.initialImplementBatch',
-		a.initialImplementUnit as 'reserveSummary.initialImplementUnit',
-		a.projectManagementCenter as 'reserveSummary.projectManagementCenter',
-		a.completeProgressUnit as 'reserveSummary.completeProgressUnit',
-		a.projectReservePlan as 'reserveSummary.projectReservePlan',
-		a.demandUnitProgress as 'reserveSummary.demandUnitProgress',
-		a.departmentPlan as 'reserveSummary.departmentPlan',
-		a.planRemarks as 'reserveSummary.planRemarks',
-		a.drawMapPath as 'reserveSummary.drawMapPath',
-		a.arrangementProject as 'reserveSummary.arrangementProject',
-		a.implementationBatch as 'reserveSummary.implementationBatch',
-		a.constructionUnit as 'reserveSummary.constructionUnit',
-		a.drawOfficeDrawn as 'reserveSummary.drawOfficeDrawn',
-		a.projectInitiateRemarks as 'reserveSummary.projectInitiateRemarks'
+		a.discloseRemarks as 'reserveSummary.discloseRemarks'
 
     </sql>
 
@@ -263,6 +247,7 @@
         left join cg_personnel_activiti cpa on a.projectReserveId = cpa.projectReserveId
         left join cg_feedback_on_budget fe on a.projectReserveId = fe.projectReserveId
         left join cg_reserve_process b on a.projectReserveId = b.projectReserveId
+        left join cg_project_type_verificate tv on a.projectReserveId = tv.projectReserveId
         where a.projectReserveId = #{projectReserveId}
     </select>
     <select id="findMaterialData" resultType="java.lang.Integer">
@@ -362,11 +347,7 @@
     </select>
     <select id="getByProId"
             resultType="com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.entity.ActRunTaskTest">
-        select rev,executionId,procInsId,procDefId,name,
-            parentTaskId,description,taskDefKey,owner,
-            assignee,delegation,priority,createTime,
-            dueDate,category,suspension,tenantId,
-            formKey from cg_act_run_task where projectReserveId = #{proId}
+        select proc_ins_id as procInsId from cg_personnel_activiti where projectReserveId = #{proId}
     </select>
     <select id="getMessage" resultType="java.lang.String">
         SELECT MESSAGE_ FROM `act_hi_comment` ORDER BY TIME_ DESC LIMIT 1

src/main/java/com/jeeplus/modules/cg/reservemanagementcenter/reserveManage/mapper/xml/SummaryStatisticMapper.xml

@@ -10,7 +10,6 @@
 		a.update_date AS "updateDate",
 		a.del_flag AS "delFlag",
 		a.projectYear,
-		a.projectNature,
 		a.demandUnit,
 		a.district,
 		a.projectGroup,
@@ -28,6 +27,8 @@
 		a.costEstimate,
 		a.basicRemarks,
 		b.startDesignOrNot as startDesignOrNot,
+		b.completeDisclose as completeDisclose,
+		b.completeDiscloseTime as completeDiscloseTime,
 		IFNULL(b.includeReserve,"") as includeReserve,
 		IFNULL(b.reasonForCancel,"") as reasonForCancel,
 		IFNULL(b.comprehensiveProject,"") as comprehensiveProject,
@@ -38,30 +39,11 @@
 		IFNULL(b.runPlanRequire,"") as runPlanRequire,
 		IFNULL(b.programChangeDescription,"") as programChangeDescription,
 		IFNULL(b.discloseRemarks,"") as discloseRemarks,
-		IFNULL(b.demandUnitPriority,"") as demandUnitPriority,
-		IFNULL(b.preliminaryArrangement,"") as preliminaryArrangement,
-		IFNULL(b.initialImplementBatch,"") as initialImplementBatch,
-		IFNULL(b.initialImplementUnit,"") as initialImplementUnit,
-		IFNULL(b.projectManagementCenter,"") as projectManagementCenter,
-		IFNULL(b.completeProgressUnit,"") as completeProgressUnit,
-		IFNULL(b.projectReservePlan,"") as projectReservePlan,
-		IFNULL(b.demandUnitProgress,"") as demandUnitProgress,
-		IFNULL(b.departmentPlan,"") as departmentPlan,
-		IFNULL(b.drawMapPath,"") as drawMapPath,
-		IFNULL(b.planRemarks,"") as planRemarks,
-		IFNULL(b.arrangementProject,"") as arrangementProject,
-		IFNULL(b.implementationBatch,"") as implementationBatch,
-		IFNULL(b.constructionUnit,"") as constructionUnit,
-		IFNULL(b.drawOfficeDrawn,"") as drawOfficeDrawn,
-		IFNULL(b.projectInitiateRemarks,"") as projectInitiateRemarks,
-        a.ownerProjectManager as 'projectManager',
+        a.ownerReserveProjectManagre as 'projectManager',
         IFNULL(c.administrativeDifficulty,"") as officeDifficulty,
         IFNULL(c.officeProgress,"") as officeProgress,
-        IFNULL(cg.pretrialEstimateAmount,"") as pretrialEstimateAmount,
-        IFNULL(cg.pretrialEstimateAmountExcludeTax,"") as pretrialEstimateAmountExcludeTax,
-        IFNULL(cg.afterTrialEstimateAmount,"") as afterTrialEstimateAmount,
-        IFNULL(cg.afterTrialEstimateAmountExcludeTax,"") as afterTrialEstimateAmountExcludeTax
-
+        tv.projectNatureArtificial AS projectNature,
+        COALESCE(NULLIF(tv.includeCablesArtificial,''), tv.projectType) AS projectType
     </sql>
 
     <insert id="insert">
@@ -75,6 +57,9 @@
         projectReserveId,
 		includeReserve,
 		reasonForCancel,
+		startDesignOrNot,
+		completeDisclose,
+		completeDiscloseTime,
 		comprehensiveProject,
 		powerFailureDifficulty,
 		powerFailureDescribe,
@@ -82,24 +67,7 @@
 		otherProblemDescribe,
 		runPlanRequire,
 		programChangeDescription,
-		discloseRemarks,
-		demandUnitPriority,
-		preliminaryArrangement,
-		initialImplementBatch,
-		initialImplementUnit,
-		projectManagementCenter,
-		completeProgressUnit,
-		projectReservePlan,
-		demandUnitProgress,
-		departmentPlan,
-		drawMapPath,
-		planRemarks,
-		arrangementProject,
-		implementationBatch,
-		constructionUnit,
-		drawOfficeDrawn,
-		projectInitiateRemarks,
-		startDesignOrNot
+		discloseRemarks
         )
         values
             (
@@ -112,6 +80,9 @@
             #{projectReserveId},
             #{includeReserve},
             #{reasonForCancel},
+            #{startDesignOrNot},
+            #{completeDisclose},
+		    #{completeDiscloseTime},
             #{comprehensiveProject},
             #{powerFailureDifficulty},
             #{powerFailureDescribe},
@@ -119,24 +90,7 @@
             #{otherProblemDescribe},
             #{runPlanRequire},
             #{programChangeDescription},
-            #{discloseRemarks},
-            #{demandUnitPriority},
-            #{preliminaryArrangement},
-            #{initialImplementBatch},
-            #{initialImplementUnit},
-            #{projectManagementCenter},
-            #{completeProgressUnit},
-            #{projectReservePlan},
-            #{demandUnitProgress},
-            #{departmentPlan},
-            #{drawMapPath},
-            #{planRemarks},
-            #{arrangementProject},
-            #{implementationBatch},
-            #{constructionUnit},
-            #{drawOfficeDrawn},
-            #{projectInitiateRemarks},
-            #{startDesignOrNot}
+            #{discloseRemarks}
             )
     </insert>
 
@@ -151,6 +105,9 @@
         projectReserveId,
         includeReserve,
         reasonForCancel,
+        startDesignOrNot,
+        completeDisclose,
+        completeDiscloseTime,
         comprehensiveProject,
         powerFailureDifficulty,
         powerFailureDescribe,
@@ -158,24 +115,7 @@
         otherProblemDescribe,
         runPlanRequire,
         programChangeDescription,
-        discloseRemarks,
-        demandUnitPriority,
-        preliminaryArrangement,
-        initialImplementBatch,
-        initialImplementUnit,
-        projectManagementCenter,
-        completeProgressUnit,
-        projectReservePlan,
-        demandUnitProgress,
-        departmentPlan,
-        drawMapPath,
-        planRemarks,
-        arrangementProject,
-        implementationBatch,
-        constructionUnit,
-        drawOfficeDrawn,
-        projectInitiateRemarks,
-        startDesignOrNot
+        discloseRemarks
         )
         values
         <foreach collection="list" item="item" index="index" separator="," >
@@ -189,6 +129,9 @@
             #{item.projectReserveId},
             #{item.includeReserve},
             #{item.reasonForCancel},
+            #{item.startDesignOrNot},
+            #{item.completeDisclose},
+            #{item.completeDiscloseTime},
             #{item.comprehensiveProject},
             #{item.powerFailureDifficulty},
             #{item.powerFailureDescribe},
@@ -196,24 +139,7 @@
             #{item.otherProblemDescribe},
             #{item.runPlanRequire},
             #{item.programChangeDescription},
-            #{item.discloseRemarks},
-            #{item.demandUnitPriority},
-            #{item.preliminaryArrangement},
-            #{item.initialImplementBatch},
-            #{item.initialImplementUnit},
-            #{item.projectManagementCenter},
-            #{item.completeProgressUnit},
-            #{item.projectReservePlan},
-            #{item.demandUnitProgress},
-            #{item.departmentPlan},
-            #{item.drawMapPath},
-            #{item.planRemarks},
-            #{item.arrangementProject},
-            #{item.implementationBatch},
-            #{item.constructionUnit},
-            #{item.drawOfficeDrawn},
-            #{item.projectInitiateRemarks},
-            #{item.startDesignOrNot}
+            #{item.discloseRemarks}
             )
         </foreach>
     </insert>
@@ -226,6 +152,9 @@
         update_date = #{updateDate},
         includeReserve = #{includeReserve},
         reasonForCancel = #{reasonForCancel},
+        startDesignOrNot = #{startDesignOrNot},
+        completeDisclose = #{completeDisclose},
+        completeDiscloseTime = #{completeDiscloseTime},
         comprehensiveProject = #{comprehensiveProject},
         powerFailureDifficulty = #{powerFailureDifficulty},
         powerFailureDescribe = #{powerFailureDescribe},
@@ -233,24 +162,7 @@
         otherProblemDescribe = #{otherProblemDescribe},
         runPlanRequire = #{runPlanRequire},
         programChangeDescription = #{programChangeDescription},
-        discloseRemarks = #{discloseRemarks},
-        demandUnitPriority = #{demandUnitPriority},
-        preliminaryArrangement = #{preliminaryArrangement},
-        initialImplementBatch = #{initialImplementBatch},
-        initialImplementUnit = #{initialImplementUnit},
-        projectManagementCenter = #{projectManagementCenter},
-        completeProgressUnit = #{completeProgressUnit},
-        projectReservePlan = #{projectReservePlan},
-        demandUnitProgress = #{demandUnitProgress},
-        departmentPlan = #{departmentPlan},
-        drawMapPath = #{drawMapPath},
-        planRemarks = #{planRemarks},
-        arrangementProject = #{arrangementProject},
-        implementationBatch = #{implementationBatch},
-        constructionUnit = #{constructionUnit},
-        drawOfficeDrawn = #{drawOfficeDrawn},
-        projectInitiateRemarks = #{projectInitiateRemarks},
-        startDesignOrNot = #{startDesignOrNot}
+        discloseRemarks = #{discloseRemarks}
 
         where id = #{id}
 	</update>
@@ -274,6 +186,7 @@
         on a.projectReserveId = c.projectReserveId
         left join cg_budget_stats cg
         on cg.projectReserveId = a.projectReserveId
+        left join cg_project_type_verificate tv on a.projectReserveId = tv.projectReserveId
         <where>
             a.del_flag = 0
             <if test="projectReserveId!=null and projectReserveId!=''">
@@ -306,6 +219,7 @@
         on a.projectReserveId = c.projectReserveId
         left join cg_budget_stats cg
         on cg.projectReserveId = a.projectReserveId
+        left join cg_project_type_verificate tv on a.projectReserveId = tv.projectReserveId
         <where>
             a.del_flag = 0
             <if test="projectReserveId!=null and projectReserveId!=''">
@@ -331,6 +245,7 @@
         on a.projectReserveId = c.projectReserveId
         left join cg_budget_stats cg
         on cg.projectReserveId = a.projectReserveId
+        left join cg_project_type_verificate tv on a.projectReserveId = tv.projectReserveId
         where a.id = #{id}
     </select>
     <select id="getByProjectReserveId" resultType="java.lang.String">
@@ -352,11 +267,17 @@
     </select>
     <select id="getAllCode"
             resultType="com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.entity.ReserveSummary">
-        select a.projectReserveId,includeReserve,processStatus from cg_reserve_summary_statistics a
+        select a.projectReserveId,includeReserve,processStatus,startDesignOrNot from cg_reserve_summary_statistics a
         left join cg_reserve_process b on a.projectReserveId = b.projectReserveId
     </select>
     <select id="getByProId"
             resultType="com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.entity.ReserveSummary">
         select * from cg_reserve_summary_statistics where projectReserveId = #{proId}
     </select>
+    <select id="getCodeByProId"
+            resultType="com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.entity.ReserveSummary">
+        select a.projectReserveId,includeReserve,processStatus,startDesignOrNot from cg_reserve_summary_statistics a
+        left join cg_reserve_process b on a.projectReserveId = b.projectReserveId
+        where b.projectReserveId = #{projectReserveId}
+    </select>
 </mapper>

src/main/java/com/jeeplus/modules/cg/reservemanagementcenter/reserveManage/service/ProjectScreenService.java

@@ -0,0 +1,114 @@
+package com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.service;
+
+import com.jeeplus.core.persistence.Page;
+import com.jeeplus.core.service.CrudService;
+import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.entity.ProjectScreen;
+import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.mapper.ProjectScreenMapper;
+import com.jeeplus.modules.cg.reservemanagementcenter.statisticalTable.entity.History;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.*;
+
+/**
+ * @author: 王强
+ * @create: 2023-06-28 09:35
+ **/
+@Service
+@Transactional(readOnly = true)
+public class ProjectScreenService extends CrudService<ProjectScreenMapper, ProjectScreen> {
+
+    @Autowired
+    private ProjectScreenMapper dao;
+
+    public List<ProjectScreen> exportFindList(ProjectScreen verificate) {
+        List<ProjectScreen> pageList = dao.exportFindList(verificate);
+        return pageList;
+    }
+
+    public Page<ProjectScreen> findPage(Page<ProjectScreen> page, ProjectScreen verificate) {
+        Page<ProjectScreen> pageList = super.findPage(page, verificate);
+        return pageList;
+    }
+
+    public String getByProjectReserveId(String projectReserveId){
+        return dao.getByProjectReserveId(projectReserveId);
+    }
+
+    public List<History> getHistoryByExecuteId(String executeId){
+        return dao.getHistoryByExecuteId(executeId);
+    }
+
+    public String getByExecuteId(String executeId){
+        return dao.getByExecuteId(executeId);
+    }
+
+    public ProjectScreen getByProId(String proId){
+        return dao.getByProId(proId);
+    }
+
+    /**
+     * 专职修改方法
+     * @param reserveManagement
+     */
+    @Transactional(readOnly = false)
+    public void update(ProjectScreen reserveManagement) {
+
+        super.save(reserveManagement);
+    }
+
+    /**
+     * 获取所有的  项目储备编号
+     * @return
+     */
+    public List<String> getAllProId(){
+        return dao.getAllProId();
+    }
+
+    /**
+     * 获取所有的  项目储备编号
+     * @return
+     */
+    public List<String> getAllProId2(){
+        return dao.getAllProId2();
+    }
+
+    /**
+     * 查询已有的参数数据 并分类返回已存在数据和未存在数据
+     * @param reserveManagement
+     * @return
+     */
+    public Map<String, List<ProjectScreen>> getExistProjectList(List<ProjectScreen> reserveManagement){
+        Map<String,List<ProjectScreen>> map = new HashMap();
+        List<ProjectScreen> existReserveManagementList = new ArrayList<>();
+        Iterator<ProjectScreen> iterator = reserveManagement.iterator();
+        while (iterator.hasNext()) {
+            ProjectScreen rm = iterator.next();
+            //对数据进行处理
+            rm.preInsert();
+            ProjectScreen 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<ProjectScreen> reserveManagementList){
+
+        dao.insertList(reserveManagementList);
+    }
+}

src/main/java/com/jeeplus/modules/cg/reservemanagementcenter/reserveManage/service/ProjectTypeVerificateService.java

@@ -0,0 +1,118 @@
+package com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.service;
+
+import com.jeeplus.core.persistence.Page;
+import com.jeeplus.core.service.CrudService;
+import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.entity.ProjectTypeVerificate;
+import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.mapper.ProjectTypeVerificateMapper;
+import com.jeeplus.modules.cg.reservemanagementcenter.statisticalTable.entity.History;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.*;
+
+/**
+ * @author: 王强
+ * @create: 2023-06-26 14:02
+ **/
+@Service
+@Transactional(readOnly = true)
+public class ProjectTypeVerificateService extends CrudService<ProjectTypeVerificateMapper, ProjectTypeVerificate> {
+
+    @Autowired
+    private ProjectTypeVerificateMapper dao;
+
+    public List<String> getMaterialName(String projectName){
+        return dao.getMaterialName(projectName);
+    }
+
+    public Page<ProjectTypeVerificate> findPage(Page<ProjectTypeVerificate> page, ProjectTypeVerificate verificate) {
+        Page<ProjectTypeVerificate> pageList = super.findPage(page, verificate);
+        return pageList;
+    }
+
+    public List<ProjectTypeVerificate> exportFindList(ProjectTypeVerificate verificate) {
+        List<ProjectTypeVerificate> pageList = dao.exportFindList(verificate);
+        return pageList;
+    }
+
+    /**
+     * 专职修改方法
+     * @param reserveManagement
+     */
+    @Transactional(readOnly = false)
+    public void update(ProjectTypeVerificate reserveManagement) {
+
+        super.save(reserveManagement);
+    }
+
+    /**
+     * 批量添加数据
+     * @param reserveManagementList
+     */
+    @Transactional(readOnly = false)
+    public void insertList(List<ProjectTypeVerificate> reserveManagementList){
+
+        dao.insertList(reserveManagementList);
+    }
+
+    /**
+     * 查询已有的参数数据 并分类返回已存在数据和未存在数据
+     * @param reserveManagement
+     * @return
+     */
+    public Map<String, List<ProjectTypeVerificate>> getExistProjectList(List<ProjectTypeVerificate> reserveManagement){
+        Map<String,List<ProjectTypeVerificate>> map = new HashMap();
+        List<ProjectTypeVerificate> existReserveManagementList = new ArrayList<>();
+        Iterator<ProjectTypeVerificate> iterator = reserveManagement.iterator();
+        while (iterator.hasNext()) {
+            ProjectTypeVerificate rm = iterator.next();
+            //对数据进行处理
+            rm.preInsert();
+            ProjectTypeVerificate 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;
+    }
+
+    /**
+     * 获取所有的  项目储备编号
+     * @return
+     */
+    public List<String> getAllProId(){
+        return dao.getAllProId();
+    }
+
+    /**
+     * 获取所有的  项目储备编号
+     * @return
+     */
+    public List<String> getAllProId2(){
+        return dao.getAllProId2();
+    }
+
+    public ProjectTypeVerificate getByProId(String proId){
+        return dao.getByProId(proId);
+    }
+
+    public String getByProjectReserveId(String projectReserveId){
+        return dao.getByProjectReserveId(projectReserveId);
+    }
+
+    public List<History> getHistoryByExecuteId(String executeId){
+        return dao.getHistoryByExecuteId(executeId);
+    }
+
+    public String getByExecuteId(String executeId){
+        return dao.getByExecuteId(executeId);
+    }
+}

src/main/java/com/jeeplus/modules/cg/reservemanagementcenter/reserveManage/service/ReserveSummaryProcessService.java

@@ -14,6 +14,9 @@ import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.mapper.Reser
 import com.jeeplus.modules.sg.managementcenter.activiti.utils.MyActiviUtils;
 import com.jeeplus.modules.sg.managementcenter.materialinfo.entity.MaterialInfo;
 import com.jeeplus.modules.sg.managementcenter.materialinfo.util.MaterialInfoUtil;
+import com.jeeplus.modules.sg.raiseCapitalDesign.entity.CableSectionData;
+import com.jeeplus.modules.sg.raiseCapitalDesign.entity.CableSectionInfo;
+import com.jeeplus.modules.sg.raiseCapitalDesign.service.RaiseCapitalDesignService;
 import org.activiti.engine.TaskService;
 import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
 import org.apache.poi.ss.usermodel.Row;
@@ -61,6 +64,9 @@ public class ReserveSummaryProcessService extends CrudService<ReserveSummaryProc
     @Autowired
     private FeedBackBudgetMapper feedMapper;
 
+    @Autowired
+    private RaiseCapitalDesignService raiseCapitalDesignService;
+
     /**
      * 根据 项目储备编号  查出设计单位节点信息
      * @param proId
@@ -137,7 +143,7 @@ public class ReserveSummaryProcessService extends CrudService<ReserveSummaryProc
      *在年度物资上报统计表中保存项目信息，在年度上报明细表中保存物资信息
      */
     @Transactional(readOnly = false)
-    public void saveData(MultipartFile file) throws IOException, InvalidFormatException {
+    public void saveData(MultipartFile file,String projectReserveId) throws IOException, InvalidFormatException {
         ImportExcel module = new ImportExcel(file,1,"模块表");
         Row row = module.getRow(0);
         Object obj = module.getCellValue(row, 1);
@@ -158,6 +164,70 @@ public class ReserveSummaryProcessService extends CrudService<ReserveSummaryProc
         List<MaterialInfo> list = MaterialInfoUtil.combineData(materialInfoList);      //合并数据
         //通过甲供材信息比对物料规范获得项目建设规模
         saveList(list);
+        //获取电缆分段表的数据，将数据存入到redis中
+//        ImportUtil importUtil = new ImportUtil(file, 0, 5);
+        ImportExcel importUtil = new ImportExcel(file,3,"电缆分段表");
+        int lastRow = importUtil.getLastDataRowNum();
+        //获取指定的列数据  YJV22-3×400mm²单元格下的行数据
+        List<CableSectionInfo> cableFourHundredList = new ArrayList<>();
+        List<CableSectionInfo> cableThreeHundredList = new ArrayList<>();   //YJV22-3×300mm²
+        List<CableSectionInfo> cableTwoHundredFortyList = new ArrayList<>();    //YJV22-3×240mm²
+        List<CableSectionInfo> cableSeventyList = new ArrayList<>();       //YJV22-3×70mm²
+        for (int i=2;i<=lastRow;i++){
+            Row infoRow = importUtil.getRow(i);
+            CableSectionInfo hundredInfo = new CableSectionInfo();
+            if (StringUtils.isNotBlank(importUtil.getCellValue(infoRow,0).toString()) && !importUtil.getCellValue(infoRow,0).toString().equals("总长（km)：")){
+                hundredInfo.setDestination(importUtil.getCellValue(infoRow,0).toString());
+                hundredInfo.setPathLength(importUtil.getCellValue(infoRow,1).toString());
+                hundredInfo.setUpperRod(importUtil.getCellValue(infoRow,2).toString());
+                hundredInfo.setArrival(importUtil.getCellValue(infoRow,3).toString());
+                hundredInfo.setIncomingEquipment(importUtil.getCellValue(infoRow,4).toString());
+                hundredInfo.setCoefficient(importUtil.getCellValue(infoRow,5).toString());
+                hundredInfo.setElectricalChief(importUtil.getCellValue(infoRow,6).toString());
+                cableFourHundredList.add(hundredInfo);
+            }
+
+            if (StringUtils.isNotBlank(importUtil.getCellValue(infoRow,8).toString())&& !importUtil.getCellValue(infoRow,0).toString().equals("总长（km)：")){
+                CableSectionInfo hundredAndTwenty = new CableSectionInfo();
+                hundredAndTwenty.setDestination(importUtil.getCellValue(infoRow,8).toString());
+                hundredAndTwenty.setPathLength(importUtil.getCellValue(infoRow,9).toString());
+                hundredAndTwenty.setUpperRod(importUtil.getCellValue(infoRow,10).toString());
+                hundredAndTwenty.setArrival(importUtil.getCellValue(infoRow,11).toString());
+                hundredAndTwenty.setIncomingEquipment(importUtil.getCellValue(infoRow,12).toString());
+                hundredAndTwenty.setCoefficient(importUtil.getCellValue(infoRow,13).toString());
+                hundredAndTwenty.setElectricalChief(importUtil.getCellValue(infoRow,14).toString());
+                cableThreeHundredList.add(hundredAndTwenty);
+            }
+
+            if (StringUtils.isNotBlank(importUtil.getCellValue(infoRow,16).toString())&& !importUtil.getCellValue(infoRow,0).toString().equals("总长（km)：")){
+                CableSectionInfo hundredAndTwenty = new CableSectionInfo();
+                hundredAndTwenty.setDestination(importUtil.getCellValue(infoRow,16).toString());
+                hundredAndTwenty.setPathLength(importUtil.getCellValue(infoRow,17).toString());
+                hundredAndTwenty.setUpperRod(importUtil.getCellValue(infoRow,18).toString());
+                hundredAndTwenty.setArrival(importUtil.getCellValue(infoRow,19).toString());
+                hundredAndTwenty.setIncomingEquipment(importUtil.getCellValue(infoRow,20).toString());
+                hundredAndTwenty.setCoefficient(importUtil.getCellValue(infoRow,21).toString());
+                hundredAndTwenty.setElectricalChief(importUtil.getCellValue(infoRow,22).toString());
+                cableTwoHundredFortyList.add(hundredAndTwenty);
+            }
+            if (StringUtils.isNotBlank(importUtil.getCellValue(infoRow,24).toString())&& !importUtil.getCellValue(infoRow,0).toString().equals("总长（km)：")){
+                CableSectionInfo hundredAndTwenty = new CableSectionInfo();
+                hundredAndTwenty.setDestination(importUtil.getCellValue(infoRow,24).toString());
+                hundredAndTwenty.setPathLength(importUtil.getCellValue(infoRow,25).toString());
+                hundredAndTwenty.setUpperRod(importUtil.getCellValue(infoRow,26).toString());
+                hundredAndTwenty.setArrival(importUtil.getCellValue(infoRow,27).toString());
+                hundredAndTwenty.setIncomingEquipment( importUtil.getCellValue(infoRow,28).toString());
+                hundredAndTwenty.setCoefficient(importUtil.getCellValue(infoRow,29).toString());
+                hundredAndTwenty.setElectricalChief(importUtil.getCellValue(infoRow,30).toString());
+                cableSeventyList.add(hundredAndTwenty);
+            }
+        }
+        CableSectionData cableSectionData = new CableSectionData();
+        cableSectionData.setCableFourHundredList(cableFourHundredList);
+        cableSectionData.setCableThreeHundredList(cableThreeHundredList);
+        cableSectionData.setCableTwoHundredFortyList(cableTwoHundredFortyList);
+        cableSectionData.setCableSeventyList(cableSeventyList);
+        raiseCapitalDesignService.saveCableOnline(cableSectionData,projectReserveId);
     }
 
     @Transactional(readOnly = false)
@@ -226,7 +296,7 @@ public class ReserveSummaryProcessService extends CrudService<ReserveSummaryProc
 
         //根据用户名去数据库中查找登录名
         String cbzz = mapper.getLoginNameByName(user.getOwnerReserveFullTime());
-        String xmjl = mapper.getLoginNameByName(user.getOwnerProjectManager());
+        String xmjl = mapper.getLoginNameByName(user.getOwnerReserveProjectManagre());
 //        list.add(cbzz);
 //        list.add(xmjl);
         String title = user.getCurrentUser().getName() + "在" + DateUtils.getDateTime() + "发起联合审图";

src/main/java/com/jeeplus/modules/cg/reservemanagementcenter/reserveManage/service/SummaryStatisticService.java

@@ -45,6 +45,14 @@ public class SummaryStatisticService extends CrudService<SummaryStatisticMapper,
     }
 
     /**
+     * 查出 项目编码 及 是否纳入储备字段
+     * @return
+     */
+    public ReserveSummary getCodeByProId(String projectReserveId){
+        return dao.getCodeByProId(projectReserveId);
+    }
+
+    /**
      * 获取所有的 项目储备编号
      * @return
      */

src/main/java/com/jeeplus/modules/cg/reservemanagementcenter/reserveManage/utils/ReserveProcessProjectExportUtil.java

@@ -59,32 +59,35 @@ public class ReserveProcessProjectExportUtil {
                 Cell cell3 = crateCell(workbook,row,3); //需求单位
                 Cell cell4 = crateCell(workbook,row,4); //区域
                 Cell cell5 = crateCell(workbook,row,5); //项目分组
-                Cell cell6 = crateCell(workbook,row,6); //储备批次
-                Cell cell7 = crateCell(workbook,row,7); //供电区域
-                Cell cell8 = crateCell(workbook,row,8); //网格编号
-                Cell cell9 = crateCell(workbook,row,9); //单元格编号
-                Cell cell10 = crateCell(workbook,row,10); //项目储备编号
-                Cell cell11 = crateCell(workbook,row,11); //项目名称
-                Cell cell12 = crateCell(workbook,row,12); //建设必要性及内容
-                Cell cell13 = crateCell(workbook,row,13); //变电站名称
-                Cell cell14 = crateCell(workbook,row,14); //线路名称
-                Cell cell15 = crateCell(workbook,row,15); //网架项目划分
-                Cell cell16 = crateCell(workbook,row,16); //需求类型
-                Cell cell17 = crateCell(workbook,row,17); //费用估算
-                Cell cell18 = crateCell(workbook,row,18); //备注
-                Cell cell19 = crateCell(workbook,row,19); //储备进度
-                Cell cell20 = crateCell(workbook,row,20); //是否纳入实施计划
-                Cell cell21 = crateCell(workbook,row,21); //初定实施批次
-                Cell cell22 = crateCell(workbook,row,22); //项目类型
-                Cell cell23 = crateCell(workbook,row,23); //是否含带电作业
-                Cell cell24 = crateCell(workbook,row,24); //用户分界开关数量
-                Cell cell25 = crateCell(workbook,row,25); //带电作业类型编号/次数
-                Cell cell26 = crateCell(workbook,row,26); //不停电作业方案
-                Cell cell27 = crateCell(workbook,row,27); //节约停电时户数
-                Cell cell28 = crateCell(workbook,row,28); //无法不停电作业原因
-                Cell cell29 = crateCell(workbook,row,29); //停电作业方案
-                Cell cell30 = crateCell(workbook,row,30); //方案编制人
-                Cell cell31 = crateCell(workbook,row,31); //现场查勘人
+                Cell cell6 = crateCell(workbook,row,6); //储备项目经理
+                Cell cell7 = crateCell(workbook,row,7); //储备批次
+                Cell cell8 = crateCell(workbook,row,8); //供电区域
+                Cell cell9 = crateCell(workbook,row,9); //网格编号
+                Cell cell10 = crateCell(workbook,row,10); //单元格编号
+                Cell cell11 = crateCell(workbook,row,11); //项目储备编号
+                Cell cell12 = crateCell(workbook,row,12); //项目名称
+                Cell cell13 = crateCell(workbook,row,13); //国网项目编码
+                Cell cell14 = crateCell(workbook,row,14); //国网项目名称
+                Cell cell15 = crateCell(workbook,row,15); //建设必要性及内容
+                Cell cell16 = crateCell(workbook,row,16); //变电站名称
+                Cell cell17 = crateCell(workbook,row,17); //线路名称
+                Cell cell18 = crateCell(workbook,row,18); //网架项目划分
+                Cell cell19 = crateCell(workbook,row,19); //需求类型
+                Cell cell20 = crateCell(workbook,row,20); //项目类型
+                Cell cell21 = crateCell(workbook,row,21); //费用估算
+                Cell cell22 = crateCell(workbook,row,22); //储备进度
+                Cell cell23 = crateCell(workbook,row,23); //是否纳入实施计划
+                Cell cell24 = crateCell(workbook,row,24); //初定实施批次
+                Cell cell25 = crateCell(workbook,row,25); //项目类型
+                Cell cell26 = crateCell(workbook,row,26); //是否含带电作业
+                Cell cell27 = crateCell(workbook,row,27); //用户分界开关数量
+                Cell cell28 = crateCell(workbook,row,28); //带电作业类型编号/次数
+                Cell cell29 = crateCell(workbook,row,29); //不停电作业方案
+                Cell cell30 = crateCell(workbook,row,30); //节约停电时户数
+                Cell cell31 = crateCell(workbook,row,31); //无法不停电作业原因
+                Cell cell32 = crateCell(workbook,row,32); //停电作业方案
+                Cell cell33 = crateCell(workbook,row,33); //方案编制人
+                Cell cell34 = crateCell(workbook,row,34); //现场查勘人
 
 
                 ReserveElectricityWork reserveManagement = list.get(i);
@@ -95,37 +98,39 @@ public class ReserveProcessProjectExportUtil {
                 cell3.setCellValue(reserveManagement.getDemandUnit());
                 cell4.setCellValue(reserveManagement.getDistrict());
                 cell5.setCellValue(reserveManagement.getProjectGroup());
-                cell6.setCellValue(reserveManagement.getReserveBatches());
-                cell7.setCellValue(reserveManagement.getBlockSupply());
-                cell8.setCellValue(reserveManagement.getGridNumber());
-                cell9.setCellValue(reserveManagement.getCellNumber());
-                cell10.setCellValue(reserveManagement.getProjectReserveId());
-                cell11.setCellValue(reserveManagement.getProjectName());
-                cell12.setCellValue(reserveManagement.getConstructionNecessityAndContent());
-                cell13.setCellValue(reserveManagement.getSubstationName());
-                cell14.setCellValue(reserveManagement.getCircuitName());
-                cell15.setCellValue(reserveManagement.getNetRackProjectDivide());
-                cell16.setCellValue(reserveManagement.getRequirementType());
+                cell6.setCellValue(reserveManagement.getProjectManager());
+                cell7.setCellValue(reserveManagement.getReserveBatches());
+                cell8.setCellValue(reserveManagement.getBlockSupply());
+                cell9.setCellValue(reserveManagement.getGridNumber());
+                cell10.setCellValue(reserveManagement.getCellNumber());
+                cell11.setCellValue(reserveManagement.getProjectReserveId());
+                cell12.setCellValue(reserveManagement.getProjectName());
+                cell13.setCellValue(reserveManagement.getStateGridProjectCode());
+                cell14.setCellValue(reserveManagement.getStateGridProjectName());
+                cell15.setCellValue(reserveManagement.getConstructionNecessityAndContent());
+                cell16.setCellValue(reserveManagement.getSubstationName());
+                cell17.setCellValue(reserveManagement.getCircuitName());
+                cell18.setCellValue(reserveManagement.getNetRackProjectDivide());
+                cell19.setCellValue(reserveManagement.getRequirementType());
+                cell20.setCellValue(reserveManagement.getProjectType());
 
                 String costEstimateStr= reserveManagement.getCostEstimate().toString();
                 if(StringUtils.isNotBlank(costEstimateStr)){
-                    cell17.setCellValue(Double.parseDouble(costEstimateStr));
+                    cell21.setCellValue(Double.parseDouble(costEstimateStr));
                 }
-                cell18.setCellValue(reserveManagement.getBasicRemarks());
-                cell19.setCellValue(reserveManagement.getReserveProgress());
-                cell20.setCellValue(reserveManagement.getImplementPlan());
-                cell21.setCellValue(reserveManagement.getImplementBatch());
-                cell22.setCellValue(reserveManagement.getProjectType());
-                cell23.setCellValue(reserveManagement.getHotLineWork());
-                cell24.setCellValue(reserveManagement.getBoundarySwitchNum());
-                cell25.setCellValue(reserveManagement.getHotLineWorkTypeNo());
-                cell26.setCellValue(reserveManagement.getNoStopWorkPlan());
-                cell27.setCellValue(reserveManagement.getPowerFailureNum());
-                cell28.setCellValue(reserveManagement.getReasonsForNotWorkInterruption());
-                cell29.setCellValue(reserveManagement.getPowerOutagePlan());
-                cell30.setCellValue(reserveManagement.getPlanner());
-                cell31.setCellValue(reserveManagement.getSiteSurveyor());
-
+                cell22.setCellValue(reserveManagement.getReserveProgress());
+                cell23.setCellValue(reserveManagement.getImplementPlan());
+                cell24.setCellValue(reserveManagement.getImplementBatch());
+                cell25.setCellValue(reserveManagement.getProjectType());
+                cell26.setCellValue(reserveManagement.getHotLineWork());
+                cell27.setCellValue(reserveManagement.getBoundarySwitchNum());
+                cell28.setCellValue(reserveManagement.getHotLineWorkTypeNo());
+                cell29.setCellValue(reserveManagement.getNoStopWorkPlan());
+                cell30.setCellValue(reserveManagement.getPowerFailureNum());
+                cell31.setCellValue(reserveManagement.getReasonsForNotWorkInterruption());
+                cell32.setCellValue(reserveManagement.getPowerOutagePlan());
+                cell33.setCellValue(reserveManagement.getPlanner());
+                cell34.setCellValue(reserveManagement.getSiteSurveyor());
 
 
             }
@@ -167,28 +172,28 @@ public class ReserveProcessProjectExportUtil {
                 Cell cell9 = crateCell(workbook,row,9); //单元格编号
                 Cell cell10 = crateCell(workbook,row,10); //项目储备编号
                 Cell cell11 = crateCell(workbook,row,11); //项目名称
-                Cell cell12 = crateCell(workbook,row,12); //建设必要性及内容
-                Cell cell13 = crateCell(workbook,row,13); //变电站名称
-                Cell cell14 = crateCell(workbook,row,14); //线路名称
-                Cell cell15 = crateCell(workbook,row,15); //网架项目划分
-                Cell cell16 = crateCell(workbook,row,16); //需求类型
-                Cell cell17 = crateCell(workbook,row,17); //费用估算
-                Cell cell18 = crateCell(workbook,row,18); //备注
-
-                Cell cell19 = crateCell(workbook,row,19); //需求提报人
-                Cell cell20 = crateCell(workbook,row,20); //业主储备专职
-                Cell cell21 = crateCell(workbook,row,21); //业主配网专职
-                Cell cell22 = crateCell(workbook,row,22); //业主储备项目经理
-                Cell cell23 = crateCell(workbook,row,23); //业主项目经理
-                Cell cell24 = crateCell(workbook,row,24); //业主物资专职
-                Cell cell25 = crateCell(workbook,row,25); //技经人员
-                Cell cell26 = crateCell(workbook,row,26); //运维人员
-
-                Cell cell27 = crateCell(workbook,row,27); //设计人员
-                Cell cell28 = crateCell(workbook,row,28); //概算编制人员
-                Cell cell29 = crateCell(workbook,row,29); //不停电作业查勘人
-                Cell cell30 = crateCell(workbook,row,30); //是否取消
-                Cell cell31 = crateCell(workbook,row,31); //否启动设计交底流程
+                Cell cell12 = crateCell(workbook,row,12); //国网项目编码
+                Cell cell13 = crateCell(workbook,row,13); //国网项目名称
+                Cell cell14 = crateCell(workbook,row,14); //建设必要性及内容
+                Cell cell15 = crateCell(workbook,row,15); //变电站名称
+                Cell cell16 = crateCell(workbook,row,16); //线路名称
+                Cell cell17 = crateCell(workbook,row,17); //网架项目划分
+                Cell cell18 = crateCell(workbook,row,18); //需求类型
+
+                Cell cell19 = crateCell(workbook,row,19); //项目类型
+                Cell cell20 = crateCell(workbook,row,20); //费用估算
+                Cell cell21 = crateCell(workbook,row,21); //备注
+                Cell cell22 = crateCell(workbook,row,22); //需求提报人
+                Cell cell23 = crateCell(workbook,row,23); //业主储备专职
+                Cell cell24 = crateCell(workbook,row,24); //业主配网专职
+                Cell cell25 = crateCell(workbook,row,25); //业主储备项目经理
+                Cell cell26 = crateCell(workbook,row,26); //业主物资专职
+
+                Cell cell27 = crateCell(workbook,row,27); //业主技经人员
+                Cell cell28 = crateCell(workbook,row,28); //运维人员
+                Cell cell29 = crateCell(workbook,row,29); //设计人员
+                Cell cell30 = crateCell(workbook,row,30); //概算编制人员
+                Cell cell31 = crateCell(workbook,row,31); //不停电作业查勘人员
 
                 ReserveProcessProject reserveManagement = list.get(i);
 
@@ -204,31 +209,31 @@ public class ReserveProcessProjectExportUtil {
                 cell9.setCellValue(reserveManagement.getCellNumber());
                 cell10.setCellValue(reserveManagement.getProjectReserveId());
                 cell11.setCellValue(reserveManagement.getProjectName());
-                cell12.setCellValue(reserveManagement.getConstructionNecessityAndContent());
-                cell13.setCellValue(reserveManagement.getSubstationName());
-                cell14.setCellValue(reserveManagement.getCircuitName());
-                cell15.setCellValue(reserveManagement.getNetRackProjectDivide());
-                cell16.setCellValue(reserveManagement.getRequirementType());
+                cell12.setCellValue(reserveManagement.getStateGridProjectCode());
+                cell13.setCellValue(reserveManagement.getStateGridProjectName());
+                cell14.setCellValue(reserveManagement.getConstructionNecessityAndContent());
+                cell15.setCellValue(reserveManagement.getSubstationName());
+                cell16.setCellValue(reserveManagement.getCircuitName());
 
+                cell17.setCellValue(reserveManagement.getNetRackProjectDivide());
+                cell18.setCellValue(reserveManagement.getRequirementType());
+
+                cell19.setCellValue(reserveManagement.getProjectType());
                 String costEstimateStr= reserveManagement.getCostEstimate() + "";
                 if(StringUtils.isNotBlank(costEstimateStr)){
-                    cell17.setCellValue(Double.parseDouble(costEstimateStr));
+                    cell20.setCellValue(Double.parseDouble(costEstimateStr));
                 }
-                cell18.setCellValue(reserveManagement.getBasicRemarks());
-
-                cell19.setCellValue(reserveManagement.getRequester());
-                cell20.setCellValue(reserveManagement.getOwnerReserveFullTime());
-                cell21.setCellValue(reserveManagement.getOwnerDistributionNerworkFullTime());
-                cell22.setCellValue(reserveManagement.getOwnerReserveProjectManagre());
-                cell23.setCellValue(reserveManagement.getOwnerProjectManager());
-                cell24.setCellValue(reserveManagement.getMaterialSoleDuty());
-                cell25.setCellValue(reserveManagement.getTechnicalStaff());
-                cell26.setCellValue(reserveManagement.getOperationAndMaintenancePersonnel());
-                cell27.setCellValue(reserveManagement.getDesigner());
-                cell28.setCellValue(reserveManagement.getBudgetPreparer());
-                cell29.setCellValue(reserveManagement.getUninterruptedWorkSurveyPersonnel());
-                cell30.setCellValue(reserveManagement.getClearOrNot());
-                cell31.setCellValue(reserveManagement.getNoStartTheDesign());
+                cell21.setCellValue(reserveManagement.getBasicRemarks());
+                cell22.setCellValue(reserveManagement.getRequester());
+                cell23.setCellValue(reserveManagement.getOwnerReserveFullTime());
+                cell24.setCellValue(reserveManagement.getOwnerDistributionNerworkFullTime());
+                cell25.setCellValue(reserveManagement.getOwnerReserveProjectManagre());
+                cell26.setCellValue(reserveManagement.getMaterialSoleDuty());
+                cell27.setCellValue(reserveManagement.getTechnicalStaff());
+                cell28.setCellValue(reserveManagement.getOperationAndMaintenancePersonnel());
+                cell29.setCellValue(reserveManagement.getDesigner());
+                cell30.setCellValue(reserveManagement.getBudgetPreparer());
+                cell31.setCellValue(reserveManagement.getUninterruptedWorkSurveyPersonnel());
             }
 
             String str = URLEncoder.encode("储备项目基本信息.xlsx", "UTF8");
@@ -359,45 +364,50 @@ public class ReserveProcessProjectExportUtil {
                 Cell cell3 = crateCell(workbook,row,3); //需求单位
                 Cell cell4 = crateCell(workbook,row,4); //区域
                 Cell cell5 = crateCell(workbook,row,5); //项目分组
-                Cell cell6 = crateCell(workbook,row,6); //储备批次
-                Cell cell7 = crateCell(workbook,row,7); //供电区域
-                Cell cell8 = crateCell(workbook,row,8); //网格编号
-                Cell cell9 = crateCell(workbook,row,9); //单元格编号
-                Cell cell10 = crateCell(workbook,row,10); //项目储备编号
-                Cell cell11 = crateCell(workbook,row,11); //项目名称
-                Cell cell12 = crateCell(workbook,row,12); //建设必要性及内容
-                Cell cell13 = crateCell(workbook,row,13); //变电站名称
-                Cell cell14 = crateCell(workbook,row,14); //线路名称
-                Cell cell15 = crateCell(workbook,row,15); //网架项目划分
-                Cell cell16 = crateCell(workbook,row,16); //需求类型
-                Cell cell17 = crateCell(workbook,row,17); //费用估算
-                Cell cell18 = crateCell(workbook,row,18); //备注
-                Cell cell19 = crateCell(workbook,row,19); //储备进度
-                Cell cell20 = crateCell(workbook,row,20); //是否临近（交叉）输电线路作业（含土建）
-                Cell cell21 = crateCell(workbook,row,21); //是否临近（交叉）输电线路作业（含土建）-描述
-                Cell cell22 = crateCell(workbook,row,22); //是否与输电线路同杆架设
-                Cell cell23 = crateCell(workbook,row,23); //是否与输电线路同杆架设-描述
-                Cell cell24 = crateCell(workbook,row,24); //是否与输电线路共沟
-                Cell cell25 = crateCell(workbook,row,25); //是否与输电线路共沟-描述
-                Cell cell26 = crateCell(workbook,row,26); //是否临近带电中压线路作业
-                Cell cell27 = crateCell(workbook,row,27); //是否临近带电中压线路作业-描述
-                Cell cell28 = crateCell(workbook,row,28); //是否有限空间作业
-                Cell cell29 = crateCell(workbook,row,29); //是否有限空间作业-描述
-                Cell cell30 = crateCell(workbook,row,30); //是否存在变电站出线电缆搭接-是
-                Cell cell31 = crateCell(workbook,row,31); //是否存在变电站出线电缆搭接-是-描述
-                Cell cell32 = crateCell(workbook,row,32); //是否存在跨越公路、铁路、航道作业
-                Cell cell33 = crateCell(workbook,row,33); //是否存在跨越公路、铁路、航道作业-描述
-                Cell cell34 = crateCell(workbook,row,34); //是否存在动火作业
-                Cell cell35 = crateCell(workbook,row,35); //是否存在动火作业-描述
-                Cell cell36 = crateCell(workbook,row,36); //是否需停电四条以上线路
-                Cell cell37 = crateCell(workbook,row,37); //是否需停电四条以上线路-描述
-                Cell cell38 = crateCell(workbook,row,38); //是否三条以上线路负荷改接
-                Cell cell39 = crateCell(workbook,row,39); //是否三条以上线路负荷改接-描述
-                Cell cell40 = crateCell(workbook,row,40); //是否多专业、多班组大型作业
-                Cell cell41 = crateCell(workbook,row,41); //是否多专业、多班组大型作业-描述
-                Cell cell42 = crateCell(workbook,row,42); //是否需编制三措
-                Cell cell43 = crateCell(workbook,row,43); //是否需编制三措-描述
-                Cell cell44 = crateCell(workbook,row,44); //作业风险等级预判
+                Cell cell6 = crateCell(workbook,row,6); //业主储备项目经理
+                Cell cell7 = crateCell(workbook,row,7); //储备批次
+                Cell cell8 = crateCell(workbook,row,8); //供电区域
+                Cell cell9 = crateCell(workbook,row,9); //网格编号
+                Cell cell10 = crateCell(workbook,row,10); //单元格编号
+                Cell cell11 = crateCell(workbook,row,11); //项目储备编号
+                Cell cell12 = crateCell(workbook,row,12); //项目名称
+                Cell cell13 = crateCell(workbook,row,13); //国网项目编码
+                Cell cell14 = crateCell(workbook,row,14); //国网项目名称
+                Cell cell15 = crateCell(workbook,row,15); //建设必要性及内容
+                Cell cell16 = crateCell(workbook,row,16); //变电站名称
+                Cell cell17 = crateCell(workbook,row,17); //线路名称
+                Cell cell18 = crateCell(workbook,row,18); //网架项目划分
+                Cell cell19 = crateCell(workbook,row,19); //需求类型
+                Cell cell20 = crateCell(workbook,row,20); //项目类型
+                Cell cell21 = crateCell(workbook,row,21); //费用估算
+                Cell cell22 = crateCell(workbook,row,22); //储备进度
+                Cell cell23 = crateCell(workbook,row,23); //是否纳入实施计划
+                Cell cell24 = crateCell(workbook,row,24); //初定实施批次
+                Cell cell25 = crateCell(workbook,row,25); //是否临近（交叉）输电线路作业（含土建）
+                Cell cell26 = crateCell(workbook,row,26); //是否临近（交叉）输电线路作业（含土建）-描述
+                Cell cell27 = crateCell(workbook,row,27); //是否与输电线路同杆架设
+                Cell cell28 = crateCell(workbook,row,28); //是否与输电线路同杆架设-描述
+                Cell cell29 = crateCell(workbook,row,29); //是否与输电线路共沟
+                Cell cell30 = crateCell(workbook,row,30); //是否与输电线路共沟-描述
+                Cell cell31 = crateCell(workbook,row,31); //是否临近带电中压线路作业
+                Cell cell32 = crateCell(workbook,row,32); //是否临近带电中压线路作业-描述
+                Cell cell33 = crateCell(workbook,row,33); //是否有限空间作业
+                Cell cell34 = crateCell(workbook,row,34); //是否有限空间作业-描述
+                Cell cell35 = crateCell(workbook,row,35); //是否存在变电站出线电缆搭接-是
+                Cell cell36 = crateCell(workbook,row,36); //是否存在变电站出线电缆搭接-是-描述
+                Cell cell37 = crateCell(workbook,row,37); //是否存在跨越公路、铁路、航道作业
+                Cell cell38 = crateCell(workbook,row,38); //是否存在跨越公路、铁路、航道作业-描述
+                Cell cell39 = crateCell(workbook,row,39); //是否存在动火作业
+                Cell cell40 = crateCell(workbook,row,40); //是否存在动火作业-描述
+                Cell cell41 = crateCell(workbook,row,41); //是否需停电四条以上线路
+                Cell cell42 = crateCell(workbook,row,42); //是否需停电四条以上线路-描述
+                Cell cell43 = crateCell(workbook,row,43); //是否三条以上线路负荷改接
+                Cell cell44 = crateCell(workbook,row,44); //是否三条以上线路负荷改接-描述
+                Cell cell45 = crateCell(workbook,row,45); //是否多专业、多班组大型作业
+                Cell cell46 = crateCell(workbook,row,46); //是否多专业、多班组大型作业-描述
+                Cell cell47 = crateCell(workbook,row,47); //是否需编制三措
+                Cell cell48 = crateCell(workbook,row,48); //是否需编制三措-描述
+                Cell cell49 = crateCell(workbook,row,49); //作业风险等级预判
 
 
                 ReserveSafety reserveManagement = list.get(i);
@@ -408,49 +418,55 @@ public class ReserveProcessProjectExportUtil {
                 cell3.setCellValue(reserveManagement.getDemandUnit());
                 cell4.setCellValue(reserveManagement.getDistrict());
                 cell5.setCellValue(reserveManagement.getProjectGroup());
-                cell6.setCellValue(reserveManagement.getReserveBatches());
-                cell7.setCellValue(reserveManagement.getBlockSupply());
-                cell8.setCellValue(reserveManagement.getGridNumber());
-                cell9.setCellValue(reserveManagement.getCellNumber());
-                cell10.setCellValue(reserveManagement.getProjectReserveId());
-                cell11.setCellValue(reserveManagement.getProjectName());
-                cell12.setCellValue(reserveManagement.getConstructionNecessityAndContent());
-                cell13.setCellValue(reserveManagement.getSubstationName());
-                cell14.setCellValue(reserveManagement.getCircuitName());
-                cell15.setCellValue(reserveManagement.getNetRackProjectDivide());
-                cell16.setCellValue(reserveManagement.getRequirementType());
+                cell6.setCellValue(reserveManagement.getProjectManager());
+                cell7.setCellValue(reserveManagement.getReserveBatches());
+                cell8.setCellValue(reserveManagement.getBlockSupply());
+                cell9.setCellValue(reserveManagement.getGridNumber());
+                cell10.setCellValue(reserveManagement.getCellNumber());
+                cell11.setCellValue(reserveManagement.getProjectReserveId());
+                cell12.setCellValue(reserveManagement.getProjectName());
+                cell13.setCellValue(reserveManagement.getStateGridProjectCode());
+                cell14.setCellValue(reserveManagement.getStateGridProjectName());
+                cell15.setCellValue(reserveManagement.getConstructionNecessityAndContent());
+                cell16.setCellValue(reserveManagement.getSubstationName());
+                cell17.setCellValue(reserveManagement.getCircuitName());
+                cell18.setCellValue(reserveManagement.getNetRackProjectDivide());
+                cell19.setCellValue(reserveManagement.getRequirementType());
+                cell20.setCellValue(reserveManagement.getProjectType());
 
                 String costEstimateStr= reserveManagement.getCostEstimate().toString();
                 if(StringUtils.isNotBlank(costEstimateStr)){
-                    cell17.setCellValue(Double.parseDouble(costEstimateStr));
+                    cell21.setCellValue(Double.parseDouble(costEstimateStr));
                 }
-                cell18.setCellValue(reserveManagement.getBasicRemarks());
-                cell19.setCellValue(reserveManagement.getReserveProgress());
-                cell20.setCellValue(reserveManagement.getTransmissionWork());
-                cell21.setCellValue(reserveManagement.getWorkDescribe());
-                cell22.setCellValue(reserveManagement.getTransmissionErection());
-                cell23.setCellValue(reserveManagement.getErecteDescribe());
-                cell24.setCellValue(reserveManagement.getTransmissionCommonTrench());
-                cell25.setCellValue(reserveManagement.getTrenchDescribe());
-                cell26.setCellValue(reserveManagement.getMediumVoltageWork());
-                cell27.setCellValue(reserveManagement.getVoltageWorkDescribe());
-                cell28.setCellValue(reserveManagement.getConfineSpaceWork());
-                cell29.setCellValue(reserveManagement.getSpaceDescribe());
-                cell30.setCellValue(reserveManagement.getSubStationCableBonding());
-                cell31.setCellValue(reserveManagement.getCableDescribe());
-                cell32.setCellValue(reserveManagement.getRoadRailwaysAndWaterwaysWork());
-                cell33.setCellValue(reserveManagement.getWaterDescribe());
-                cell34.setCellValue(reserveManagement.getHotWork());
-                cell35.setCellValue(reserveManagement.getHotWorkDescribe());
-                cell36.setCellValue(reserveManagement.getBlackoutLineFour());
-                cell37.setCellValue(reserveManagement.getLineFourDescribe());
-                cell38.setCellValue(reserveManagement.getLineLoadRedirectionThree());
-                cell39.setCellValue(reserveManagement.getThreeRedirectDescribe());
-                cell40.setCellValue(reserveManagement.getLargeScaleMultiTeamWork());
-                cell41.setCellValue(reserveManagement.getTeamWorkDescribe());
-                cell42.setCellValue(reserveManagement.getPrepareThreeMeasures());
-                cell43.setCellValue(reserveManagement.getMeasureDescribe());
-                cell44.setCellValue(reserveManagement.getJobRiskLevelPrediction());
+                cell22.setCellValue(reserveManagement.getReserveProgress());
+                cell23.setCellValue(reserveManagement.getImplementPlan());
+                cell24.setCellValue(reserveManagement.getImplementBatch());
+                cell25.setCellValue(reserveManagement.getTransmissionWork());
+
+                cell26.setCellValue(reserveManagement.getWorkDescribe());
+                cell27.setCellValue(reserveManagement.getTransmissionErection());
+                cell28.setCellValue(reserveManagement.getErecteDescribe());
+                cell29.setCellValue(reserveManagement.getTransmissionCommonTrench());
+                cell30.setCellValue(reserveManagement.getTrenchDescribe());
+                cell31.setCellValue(reserveManagement.getMediumVoltageWork());
+                cell32.setCellValue(reserveManagement.getVoltageWorkDescribe());
+                cell33.setCellValue(reserveManagement.getConfineSpaceWork());
+                cell34.setCellValue(reserveManagement.getSpaceDescribe());
+                cell35.setCellValue(reserveManagement.getSubStationCableBonding());
+                cell36.setCellValue(reserveManagement.getCableDescribe());
+                cell37.setCellValue(reserveManagement.getRoadRailwaysAndWaterwaysWork());
+                cell38.setCellValue(reserveManagement.getWaterDescribe());
+                cell39.setCellValue(reserveManagement.getHotWork());
+                cell40.setCellValue(reserveManagement.getHotWorkDescribe());
+                cell41.setCellValue(reserveManagement.getBlackoutLineFour());
+                cell42.setCellValue(reserveManagement.getLineFourDescribe());
+                cell43.setCellValue(reserveManagement.getLineLoadRedirectionThree());
+                cell44.setCellValue(reserveManagement.getThreeRedirectDescribe());
+                cell45.setCellValue(reserveManagement.getLargeScaleMultiTeamWork());
+                cell46.setCellValue(reserveManagement.getTeamWorkDescribe());
+                cell47.setCellValue(reserveManagement.getPrepareThreeMeasures());
+                cell48.setCellValue(reserveManagement.getMeasureDescribe());
+                cell49.setCellValue(reserveManagement.getJobRiskLevelPrediction());
 
             }
 
@@ -711,34 +727,40 @@ public class ReserveProcessProjectExportUtil {
                 Cell cell3 = crateCell(workbook,row,3); //需求单位
                 Cell cell4 = crateCell(workbook,row,4); //区域
                 Cell cell5 = crateCell(workbook,row,5); //项目分组
-                Cell cell6 = crateCell(workbook,row,6); //项目经理
+                Cell cell6 = crateCell(workbook,row,6); //项目储备经理
                 Cell cell7 = crateCell(workbook,row,7); //储备批次
                 Cell cell8 = crateCell(workbook,row,8); //供电区域
                 Cell cell9 = crateCell(workbook,row,9); //网格编号
                 Cell cell10 = crateCell(workbook,row,10); //单元格编号
                 Cell cell11 = crateCell(workbook,row,11); //项目储备编号
                 Cell cell12 = crateCell(workbook,row,12); //项目名称
-                Cell cell13 = crateCell(workbook,row,13); //建设必要性及内容
-                Cell cell14 = crateCell(workbook,row,14); //变电站名称
-                Cell cell15 = crateCell(workbook,row,15); //线路名称
-                Cell cell16 = crateCell(workbook,row,16); //网架项目划分
-                Cell cell17 = crateCell(workbook,row,17); //需求类型
-                Cell cell18 = crateCell(workbook,row,18); //项目类型
-                Cell cell19 = crateCell(workbook,row,19); //费用估算
-                Cell cell20 = crateCell(workbook,row,20); //项目综合可实施性
-                Cell cell21 = crateCell(workbook,row,21); //政处难度
-                Cell cell22 = crateCell(workbook,row,22); //政处描述
-                Cell cell23 = crateCell(workbook,row,23); //停电难度
-                Cell cell24 = crateCell(workbook,row,24); //停电描述
-                Cell cell25 = crateCell(workbook,row,25); //其他问题难度
-                Cell cell26 = crateCell(workbook,row,26); //其他问题描述
-                Cell cell27 = crateCell(workbook,row,27); //是否需重跑方案
-                Cell cell28 = crateCell(workbook,row,28); //方案变更说明
-                Cell cell29 = crateCell(workbook,row,29); //储备项目交底信息-备注
-                Cell cell30 = crateCell(workbook,row,30); //储备进度
-                Cell cell31 = crateCell(workbook,row,31); //是否纳入储备
-                Cell cell32 = crateCell(workbook,row,32); //取消原因说明
-                Cell cell33 = crateCell(workbook,row,33); //是否启动设计
+                Cell cell13 = crateCell(workbook,row,13); //国网项目编码
+                Cell cell14 = crateCell(workbook,row,14); //国网项目名称
+                Cell cell15 = crateCell(workbook,row,15); //建设必要性及内容
+                Cell cell16 = crateCell(workbook,row,16); //变电站名称
+                Cell cell17 = crateCell(workbook,row,17); //线路名称
+                Cell cell18 = crateCell(workbook,row,18); //网架项目划分
+                Cell cell19 = crateCell(workbook,row,19); //需求类型
+                Cell cell20 = crateCell(workbook,row,20); //项目类型
+                Cell cell21 = crateCell(workbook,row,21); //费用估算
+
+                Cell cell22 = crateCell(workbook,row,22); //储备进度
+                Cell cell23 = crateCell(workbook,row,23); //是否纳入储备
+                Cell cell24 = crateCell(workbook,row,24); //取消原因说明
+                Cell cell25 = crateCell(workbook,row,25); //是否启动设计
+
+                Cell cell26 = crateCell(workbook,row,26); //是否完成交底
+                Cell cell27 = crateCell(workbook,row,27); //交底完成时间
+                Cell cell28 = crateCell(workbook,row,28); //项目综合可实施性
+                Cell cell29 = crateCell(workbook,row,29); //政处难度
+                Cell cell30 = crateCell(workbook,row,30); //政处描述
+                Cell cell31 = crateCell(workbook,row,31); //停电难度
+                Cell cell32 = crateCell(workbook,row,32); //停电描述
+                Cell cell33 = crateCell(workbook,row,33); //其他问题难度
+                Cell cell34 = crateCell(workbook,row,34); //其他问题描述
+                Cell cell35 = crateCell(workbook,row,35); //是否需重跑方案
+                Cell cell36 = crateCell(workbook,row,36); //方案变更说明
+                Cell cell37 = crateCell(workbook,row,37); //储备项目交底信息-备注
 
                 ReserveSummary reserveManagement = list.get(i);
 
@@ -755,31 +777,35 @@ public class ReserveProcessProjectExportUtil {
                 cell10.setCellValue(reserveManagement.getCellNumber());
                 cell11.setCellValue(reserveManagement.getProjectReserveId());
                 cell12.setCellValue(reserveManagement.getProjectName());
-                cell13.setCellValue(reserveManagement.getConstructionNecessityAndContent());
-                cell14.setCellValue(reserveManagement.getSubstationName());
-                cell15.setCellValue(reserveManagement.getCircuitName());
-                cell16.setCellValue(reserveManagement.getNetRackProjectDivide());
-                cell17.setCellValue(reserveManagement.getRequirementType());
-                cell18.setCellValue(reserveManagement.getProjectType());
+                cell13.setCellValue(reserveManagement.getStateGridProjectCode());
+                cell14.setCellValue(reserveManagement.getStateGridProjectName());
+                cell15.setCellValue(reserveManagement.getConstructionNecessityAndContent());
+                cell16.setCellValue(reserveManagement.getSubstationName());
+                cell17.setCellValue(reserveManagement.getCircuitName());
+                cell18.setCellValue(reserveManagement.getNetRackProjectDivide());
+                cell19.setCellValue(reserveManagement.getRequirementType());
+                cell20.setCellValue(reserveManagement.getProjectType());
 
                 String costEstimateStr= reserveManagement.getCostEstimate().toString();
                 if(StringUtils.isNotBlank(costEstimateStr)){
-                    cell19.setCellValue(Double.parseDouble(costEstimateStr));
+                    cell21.setCellValue(Double.parseDouble(costEstimateStr));
                 }
-                cell20.setCellValue(reserveManagement.getComprehensiveProject());
-                cell21.setCellValue(reserveManagement.getOfficeDifficulty());
-                cell22.setCellValue(reserveManagement.getOfficeProgress());
-                cell23.setCellValue(reserveManagement.getPowerFailureDifficulty());
-                cell24.setCellValue(reserveManagement.getPowerFailureDescribe());
-                cell25.setCellValue(reserveManagement.getOtherProblemDifficulty());
-                cell26.setCellValue(reserveManagement.getOtherProblemDescribe());
-                cell27.setCellValue(reserveManagement.getRunPlanRequire());
-                cell28.setCellValue(reserveManagement.getProgramChangeDescription());
-                cell29.setCellValue(reserveManagement.getDiscloseRemarks());
-                cell30.setCellValue(reserveManagement.getReserveProgress());
-                cell31.setCellValue(reserveManagement.getIncludeReserve());
-                cell32.setCellValue(reserveManagement.getReasonForCancel());
-                cell33.setCellValue(reserveManagement.getStartDesignOrNot());
+                cell22.setCellValue(reserveManagement.getReserveProgress());
+                cell23.setCellValue(reserveManagement.getIncludeReserve());
+                cell24.setCellValue(reserveManagement.getReasonForCancel());
+                cell25.setCellValue(reserveManagement.getStartDesignOrNot());
+                cell26.setCellValue(reserveManagement.getCompleteDisclose());
+                cell27.setCellValue(reserveManagement.getCompleteDiscloseTime());
+                cell28.setCellValue(reserveManagement.getComprehensiveProject());
+                cell29.setCellValue(reserveManagement.getOfficeDifficulty());
+                cell30.setCellValue(reserveManagement.getOfficeProgress());
+                cell31.setCellValue(reserveManagement.getPowerFailureDifficulty());
+                cell32.setCellValue(reserveManagement.getPowerFailureDescribe());
+                cell33.setCellValue(reserveManagement.getOtherProblemDifficulty());
+                cell34.setCellValue(reserveManagement.getOtherProblemDescribe());
+                cell35.setCellValue(reserveManagement.getRunPlanRequire());
+                cell36.setCellValue(reserveManagement.getProgramChangeDescription());
+                cell37.setCellValue(reserveManagement.getDiscloseRemarks());
             }
 
             String str = URLEncoder.encode("储备项目交底信息汇总统计.xlsx", "UTF8");
@@ -813,32 +839,137 @@ public class ReserveProcessProjectExportUtil {
                 Cell cell3 = crateCell(workbook,row,3); //需求单位
                 Cell cell4 = crateCell(workbook,row,4); //区域
                 Cell cell5 = crateCell(workbook,row,5); //项目分组
+                Cell cell6 = crateCell(workbook,row,6); //项目经理
+                Cell cell7 = crateCell(workbook,row,7); //储备批次
+                Cell cell8 = crateCell(workbook,row,8); //供电区域
+                Cell cell9 = crateCell(workbook,row,9); //网格编号
+                Cell cell10 = crateCell(workbook,row,10); //单元格编号
+                Cell cell11 = crateCell(workbook,row,11); //项目储备编号
+                Cell cell12 = crateCell(workbook,row,12); //项目名称
+                Cell cell13 = crateCell(workbook,row,13); //建设必要性及内容
+                Cell cell14 = crateCell(workbook,row,14); //变电站名称
+                Cell cell15 = crateCell(workbook,row,15); //线路名称
+                Cell cell16 = crateCell(workbook,row,16); //网架项目划分
+                Cell cell17 = crateCell(workbook,row,17); //需求类型
+                Cell cell18 = crateCell(workbook,row,18); //项目类型
+                Cell cell19 = crateCell(workbook,row,19); //费用估算
+                Cell cell20 = crateCell(workbook,row,20); //是否参加省公司评审
+                Cell cell21 = crateCell(workbook,row,21); //省公司评审批次/日期
+                Cell cell22 = crateCell(workbook,row,22); //是否通过省公司评审
+                Cell cell23 = crateCell(workbook,row,23); //评审意见
+                Cell cell24 = crateCell(workbook,row,24); //是否需设计变更
+                Cell cell25 = crateCell(workbook,row,25); //备注
+
+
+                CompanyReview companyReview = list.get(i);
+
+                cell0.setCellValue(String.valueOf(index++));
+                cell1.setCellValue(companyReview.getProjectYear());
+                cell2.setCellValue(companyReview.getProjectNature());
+                cell3.setCellValue(companyReview.getDemandUnit());
+                cell4.setCellValue(companyReview.getDistrict());
+                cell5.setCellValue(companyReview.getProjectGroup());
+                cell6.setCellValue(companyReview.getProjectManager());
+                cell7.setCellValue(companyReview.getReserveBatches());
+                cell8.setCellValue(companyReview.getBlockSupply());
+                cell9.setCellValue(companyReview.getGridNumber());
+                cell10.setCellValue(companyReview.getCellNumber());
+                cell11.setCellValue(companyReview.getProjectReserveId());
+                cell12.setCellValue(companyReview.getProjectName());
+                cell13.setCellValue(companyReview.getConstructionNecessityAndContent());
+                cell14.setCellValue(companyReview.getSubstationName());
+                cell15.setCellValue(companyReview.getCircuitName());
+                cell16.setCellValue(companyReview.getNetRackProjectDivide());
+                cell17.setCellValue(companyReview.getRequirementType());
+                cell18.setCellValue(companyReview.getProjectType());
+
+                String costEstimateStr= companyReview.getCostEstimate().toString();
+                if(StringUtils.isNotBlank(costEstimateStr)){
+                    cell19.setCellValue(Double.parseDouble(costEstimateStr));
+                }
+                cell20.setCellValue(companyReview.getJoinProvincialCompanyReview());
+                cell21.setCellValue(companyReview.getBatchOfProvincialCompany());
+                cell22.setCellValue(companyReview.getPassProvincialCompanyReview());
+                cell23.setCellValue(companyReview.getReviewComments());
+                cell24.setCellValue(companyReview.getDesignChangeRequired());
+                cell25.setCellValue(companyReview.getCompanyRemarks());
+            }
+
+            String str = URLEncoder.encode("省公司评审.xlsx", "UTF8");
+            response.setHeader("Content-Disposition", "attachment;filename="+str);
+            response.setContentType("application/vnd.ms-excel;charset=UTF-8");
+            OutputStream outputStream = response.getOutputStream();
+            workbook.write(outputStream);
+            outputStream.flush();
+            outputStream.close();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+    /**
+     * 导出项目类型校核表信息
+     * @param response
+     * @param workbook
+     * @param list
+     */
+    public void exportVerificate(HttpServletResponse response, XSSFWorkbook workbook, List<ProjectTypeVerificate> list){
+        try {
+            int index = 1;//第一列序号
+            int rowNum = 3;//数据起始列
+            Sheet sheet = workbook.getSheetAt(0);
+            for(int i=0;i<list.size();i++){
+                Row row = sheet.createRow(rowNum+i);
+                Cell cell0 = crateCell(workbook,row,0); //序号
+                Cell cell1 = crateCell(workbook,row,1); //项目储备经理
+                Cell cell2 = crateCell(workbook,row,2); //项目年份
+                Cell cell3 = crateCell(workbook,row,3); //需求单位
+                Cell cell4 = crateCell(workbook,row,4); //区域
+                Cell cell5 = crateCell(workbook,row,5); //项目分组
                 Cell cell6 = crateCell(workbook,row,6); //储备批次
                 Cell cell7 = crateCell(workbook,row,7); //供电区域
                 Cell cell8 = crateCell(workbook,row,8); //网格编号
                 Cell cell9 = crateCell(workbook,row,9); //单元格编号
                 Cell cell10 = crateCell(workbook,row,10); //项目储备编号
                 Cell cell11 = crateCell(workbook,row,11); //项目名称
-                Cell cell12 = crateCell(workbook,row,12); //建设必要性及内容
-                Cell cell13 = crateCell(workbook,row,13); //变电站名称
-                Cell cell14 = crateCell(workbook,row,14); //线路名称
-                Cell cell15 = crateCell(workbook,row,15); //网架项目划分
-                Cell cell16 = crateCell(workbook,row,16); //需求类型
-                Cell cell17 = crateCell(workbook,row,17); //费用估算
-                Cell cell18 = crateCell(workbook,row,18); //备注
-                Cell cell19 = crateCell(workbook,row,19); //是否参加省公司评审
-                Cell cell20 = crateCell(workbook,row,20); //省公司评审批次/日期
-                Cell cell21 = crateCell(workbook,row,21); //是否通过省公司评审
-                Cell cell22 = crateCell(workbook,row,22); //评审意见
-                Cell cell23 = crateCell(workbook,row,23); //是否需设计变更
-                Cell cell24 = crateCell(workbook,row,24); //备注
-
+                Cell cell12 = crateCell(workbook,row,12); //国网项目编码
+                Cell cell13 = crateCell(workbook,row,13); //国网项目名称
+                Cell cell14 = crateCell(workbook,row,14); //建设必要性及内容
+                Cell cell15 = crateCell(workbook,row,15); //变电站名称
+                Cell cell16 = crateCell(workbook,row,16); //线路名称
+                Cell cell17 = crateCell(workbook,row,17); //网架项目划分
+                Cell cell18 = crateCell(workbook,row,18); //需求类型
+                Cell cell19 = crateCell(workbook,row,19); //费用估算
+                Cell cell20 = crateCell(workbook,row,20); //备注
 
-                CompanyReview companyReview = list.get(i);
+                Cell cell21 = crateCell(workbook,row,21); //储备进度
+                Cell cell22 = crateCell(workbook,row,22); //是否纳入实施计划
+                Cell cell23 = crateCell(workbook,row,23); //初定实施批次
+                Cell cell24 = crateCell(workbook,row,24); //项目性质（初定）
+                Cell cell25 = crateCell(workbook,row,25); //是否含变电站新出线
+                Cell cell26 = crateCell(workbook,row,26); //是否含资本设备
+                Cell cell27 = crateCell(workbook,row,27); //项目属性（系统判断）
+                Cell cell28 = crateCell(workbook,row,28); //项目性质（人工判断）
+                Cell cell29 = crateCell(workbook,row,29); //项目类型（初定）
+                Cell cell30 = crateCell(workbook,row,30); //是否含土建
+                Cell cell31 = crateCell(workbook,row,31); //是否含电缆
+                Cell cell32 = crateCell(workbook,row,32); //是否含立杆工作量
+                Cell cell33 = crateCell(workbook,row,33); //是否含架空线
+                Cell cell34 = crateCell(workbook,row,34); //是否含环网柜
+                Cell cell35 = crateCell(workbook,row,35); //是否含拆旧环网柜
+                Cell cell36 = crateCell(workbook,row,36); //是否含箱变
+                Cell cell37 = crateCell(workbook,row,37); //是否含拆旧箱变
+                Cell cell38 = crateCell(workbook,row,38); //是否含配变
+                Cell cell39 = crateCell(workbook,row,39); //是否含拆旧配变
+                Cell cell40 = crateCell(workbook,row,40); //项目类型（人工判断）
+
+
+                ProjectTypeVerificate companyReview = list.get(i);
 
                 cell0.setCellValue(String.valueOf(index++));
-                cell1.setCellValue(companyReview.getProjectYear());
-                cell2.setCellValue(companyReview.getProjectNature());
+                cell1.setCellValue(companyReview.getProjectManager());
+                cell2.setCellValue(companyReview.getProjectYear());
+
                 cell3.setCellValue(companyReview.getDemandUnit());
                 cell4.setCellValue(companyReview.getDistrict());
                 cell5.setCellValue(companyReview.getProjectGroup());
@@ -848,26 +979,204 @@ public class ReserveProcessProjectExportUtil {
                 cell9.setCellValue(companyReview.getCellNumber());
                 cell10.setCellValue(companyReview.getProjectReserveId());
                 cell11.setCellValue(companyReview.getProjectName());
-                cell12.setCellValue(companyReview.getConstructionNecessityAndContent());
-                cell13.setCellValue(companyReview.getSubstationName());
-                cell14.setCellValue(companyReview.getCircuitName());
-                cell15.setCellValue(companyReview.getNetRackProjectDivide());
-                cell16.setCellValue(companyReview.getRequirementType());
+
+                cell12.setCellValue(companyReview.getStateGridProjectCode());
+                cell13.setCellValue(companyReview.getStateGridProjectName());
+                cell14.setCellValue(companyReview.getConstructionNecessityAndContent());
+
+                cell15.setCellValue(companyReview.getSubstationName());
+                cell16.setCellValue(companyReview.getCircuitName());
+                cell17.setCellValue(companyReview.getNetRackProjectDivide());
+                cell18.setCellValue(companyReview.getRequirementType());
 
                 String costEstimateStr= companyReview.getCostEstimate().toString();
                 if(StringUtils.isNotBlank(costEstimateStr)){
-                    cell17.setCellValue(Double.parseDouble(costEstimateStr));
+                    cell19.setCellValue(Double.parseDouble(costEstimateStr));
                 }
-                cell18.setCellValue(companyReview.getBasicRemarks());
-                cell19.setCellValue(companyReview.getJoinProvincialCompanyReview());
-                cell20.setCellValue(companyReview.getBatchOfProvincialCompany());
-                cell21.setCellValue(companyReview.getPassProvincialCompanyReview());
-                cell22.setCellValue(companyReview.getReviewComments());
-                cell23.setCellValue(companyReview.getDesignChangeRequired());
-                cell24.setCellValue(companyReview.getCompanyRemarks());
+
+                cell20.setCellValue(companyReview.getBasicRemarks());
+                cell21.setCellValue(companyReview.getReserveProgress());
+                cell22.setCellValue(companyReview.getImplementPlan());
+                cell23.setCellValue(companyReview.getImplementBatch());
+                cell24.setCellValue(companyReview.getProjectNature());
+                cell25.setCellValue(companyReview.getNewSubstation());
+                cell26.setCellValue(companyReview.getIncludeCapitalEquipment());
+                cell27.setCellValue(companyReview.getProjectProperties());
+                cell28.setCellValue(companyReview.getProjectNatureArtificial());
+
+
+                cell29.setCellValue(companyReview.getProjectType());
+                cell30.setCellValue(companyReview.getCivilEngineer());
+                cell31.setCellValue(companyReview.getIncludeCables());
+                cell32.setCellValue(companyReview.getPoleWorkload());
+                cell33.setCellValue(companyReview.getOldPoleWorkload());
+                cell34.setCellValue(companyReview.getRingNetworkCabinet());
+                cell35.setCellValue(companyReview.getOldRingNetworkCabinet());
+                cell36.setCellValue(companyReview.getBoxTransformer());
+                cell37.setCellValue(companyReview.getOldBoxTransformer());
+                cell38.setCellValue(companyReview.getDistributionTransformer());
+                cell39.setCellValue(companyReview.getOldDistributionTransformer());
+                cell40.setCellValue(companyReview.getIncludeCablesArtificial());
+
             }
 
-            String str = URLEncoder.encode("省公司评审.xlsx", "UTF8");
+            String str = URLEncoder.encode("储备项目项目类型校核表.xlsx", "UTF8");
+            response.setHeader("Content-Disposition", "attachment;filename="+str);
+            response.setContentType("application/vnd.ms-excel;charset=UTF-8");
+            OutputStream outputStream = response.getOutputStream();
+            workbook.write(outputStream);
+            outputStream.flush();
+            outputStream.close();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+    /**
+     * 导出项目类型校核表信息
+     * @param response
+     * @param workbook
+     * @param list
+     */
+    public void exportProjectScreen(HttpServletResponse response, XSSFWorkbook workbook, List<ProjectScreen> list){
+        try {
+            int index = 1;//第一列序号
+            int rowNum = 2;//数据起始列
+            Sheet sheet = workbook.getSheetAt(0);
+            for(int i=0;i<list.size();i++){
+                Row row = sheet.createRow(rowNum+i);
+                Cell cell0 = crateCell(workbook,row,0); //序号
+                Cell cell1 = crateCell(workbook,row,1); //项目储备经理
+                Cell cell2 = crateCell(workbook,row,2); //项目年份
+                Cell cell3 = crateCell(workbook,row,3); //项目性质
+                Cell cell4 = crateCell(workbook,row,4); //需求单位
+                Cell cell5 = crateCell(workbook,row,5); //区域
+                Cell cell6 = crateCell(workbook,row,6); //项目分组
+                Cell cell7 = crateCell(workbook,row,7); //储备批次
+                Cell cell8 = crateCell(workbook,row,8); //供电区域
+                Cell cell9 = crateCell(workbook,row,9); //网格编号
+                Cell cell10 = crateCell(workbook,row,10); //单元格编号
+                Cell cell11 = crateCell(workbook,row,11); //项目储备编号
+                Cell cell12 = crateCell(workbook,row,12); //项目名称
+                Cell cell13 = crateCell(workbook,row,13); //国网项目编码
+                Cell cell14 = crateCell(workbook,row,14); //国网项目名称
+                Cell cell15 = crateCell(workbook,row,15); //建设必要性及内容
+                Cell cell16 = crateCell(workbook,row,16); //变电站名称
+                Cell cell17 = crateCell(workbook,row,17); //线路名称
+                Cell cell18 = crateCell(workbook,row,18); //网架项目划分
+                Cell cell19 = crateCell(workbook,row,19); //需求类型
+                Cell cell20 = crateCell(workbook,row,20); //项目类型
+                Cell cell21 = crateCell(workbook,row,21); //费用估算
+                Cell cell22 = crateCell(workbook,row,22); //备注
+
+                Cell cell23 = crateCell(workbook,row,23); //储备进度
+                Cell cell24 = crateCell(workbook,row,24); //是否纳入储备
+                Cell cell25 = crateCell(workbook,row,25); //初定实施批次
+                Cell cell26 = crateCell(workbook,row,26); //是否含土建工作量
+                Cell cell27 = crateCell(workbook,row,27); //土建工作量统计
+                Cell cell28 = crateCell(workbook,row,28); //是否含立杆工作量
+                Cell cell29 = crateCell(workbook,row,29); //立杆工作量统计
+                Cell cell30 = crateCell(workbook,row,30); //预算含税
+                Cell cell31 = crateCell(workbook,row,31); //预算不含税
+                Cell cell32 = crateCell(workbook,row,32); //施工费（不含税）
+                Cell cell33 = crateCell(workbook,row,33); //储备项目工程量统计-备注
+                Cell cell34 = crateCell(workbook,row,34); //项目综合可实施性
+                Cell cell35 = crateCell(workbook,row,35); //政处难度
+                Cell cell36 = crateCell(workbook,row,36); //政处描述
+                Cell cell37 = crateCell(workbook,row,37); //停电难度
+                Cell cell38 = crateCell(workbook,row,38); //停电描述
+                Cell cell39 = crateCell(workbook,row,39); //其他问题难度
+                Cell cell40 = crateCell(workbook,row,40); //其他问题描述
+                Cell cell41 = crateCell(workbook,row,41); //是否需重跑方案
+                Cell cell42 = crateCell(workbook,row,42); //方案变更说明
+                Cell cell43 = crateCell(workbook,row,43); //储备项目交底信息-备注
+                Cell cell44 = crateCell(workbook,row,44); //储备项目推进任务
+                Cell cell45 = crateCell(workbook,row,45); //完成进度
+                Cell cell46 = crateCell(workbook,row,46); //是否启动政处
+                Cell cell47 = crateCell(workbook,row,47); //政处进度
+                Cell cell48 = crateCell(workbook,row,48); //储备项目前期准备工作-备注。
+                Cell cell49 = crateCell(workbook,row,49); //需求单位优先级
+                Cell cell50 = crateCell(workbook,row,50); //是否纳入实施计划
+                Cell cell51 = crateCell(workbook,row,51); //立项筛选-初定实施批次
+                Cell cell52 = crateCell(workbook,row,52); //初定施工单位
+                Cell cell53 = crateCell(workbook,row,53); //实际立项批次
+                Cell cell54 = crateCell(workbook,row,54); //实际施工单位
+                Cell cell55 = crateCell(workbook,row,55); //是否需出规划报批图
+                Cell cell56 = crateCell(workbook,row,56); //要求移交规划报批图时间
+                Cell cell57 = crateCell(workbook,row,57); //是否需出纸质图
+                Cell cell58 = crateCell(workbook,row,58); //要求移交纸质图纸时间
+                Cell cell59 = crateCell(workbook,row,59); //立项筛选-备注
+
+
+                ProjectScreen companyReview = list.get(i);
+
+                cell0.setCellValue(String.valueOf(index++));
+                cell1.setCellValue(companyReview.getProjectManager());
+                cell2.setCellValue(companyReview.getProjectYear());
+                cell3.setCellValue(companyReview.getProjectNature());
+                cell4.setCellValue(companyReview.getDemandUnit());
+                cell5.setCellValue(companyReview.getDistrict());
+                cell6.setCellValue(companyReview.getProjectGroup());
+                cell7.setCellValue(companyReview.getReserveBatches());
+                cell8.setCellValue(companyReview.getBlockSupply());
+                cell9.setCellValue(companyReview.getGridNumber());
+                cell10.setCellValue(companyReview.getCellNumber());
+                cell11.setCellValue(companyReview.getProjectReserveId());
+                cell12.setCellValue(companyReview.getProjectName());
+                cell13.setCellValue(companyReview.getStateGridProjectCode());
+                cell14.setCellValue(companyReview.getStateGridProjectName());
+                cell15.setCellValue(companyReview.getConstructionNecessityAndContent());
+                cell16.setCellValue(companyReview.getSubstationName());
+                cell17.setCellValue(companyReview.getCircuitName());
+                cell18.setCellValue(companyReview.getNetRackProjectDivide());
+                cell19.setCellValue(companyReview.getRequirementType());
+                cell20.setCellValue(companyReview.getProjectType());
+                String costEstimateStr= companyReview.getCostEstimate().toString();
+                if(StringUtils.isNotBlank(costEstimateStr)){
+                    cell21.setCellValue(Double.parseDouble(costEstimateStr));
+                }
+                cell22.setCellValue(companyReview.getBasicRemarks());
+                cell23.setCellValue(companyReview.getReserveProgress());
+                cell24.setCellValue(companyReview.getImplementReserve());
+                cell25.setCellValue(companyReview.getImplementBatch());
+                cell26.setCellValue(companyReview.getCivilWorkload());
+                cell27.setCellValue(companyReview.getCivilWorkloadStatistics());
+                cell28.setCellValue(companyReview.getUprightPoleWorkload());
+                cell29.setCellValue(companyReview.getUprightPoleWorkloadStatistics());
+                cell30.setCellValue(companyReview.getBudgetIncludesTax());
+                cell31.setCellValue(companyReview.getBudgetNotIncludesTax());
+                cell32.setCellValue(companyReview.getConstructCostExcludeTax());
+                cell33.setCellValue(companyReview.getProjectQuantityRemarks());
+                cell34.setCellValue(companyReview.getComprehensiveProject());
+                cell35.setCellValue(companyReview.getOfficeDifficulty());
+                cell36.setCellValue(companyReview.getOfficeProgress());
+                cell37.setCellValue(companyReview.getPowerFailureDifficulty());
+                cell38.setCellValue(companyReview.getPowerFailureDescribe());
+                cell39.setCellValue(companyReview.getOtherProblemDifficulty());
+                cell40.setCellValue(companyReview.getOtherProblemDescribe());
+                cell41.setCellValue(companyReview.getRunPlanRequire());
+                cell42.setCellValue(companyReview.getProgramChangeDescription());
+                cell43.setCellValue(companyReview.getDiscloseRemarks());
+                cell44.setCellValue(companyReview.getProjectPromotion());
+                cell45.setCellValue(companyReview.getCompleteProgress());
+                cell46.setCellValue(companyReview.getFireAdministrativeDepartment());
+                cell47.setCellValue(companyReview.getAdministrativeProgress());
+                cell48.setCellValue(companyReview.getPreliminaryWorkPreparationRemarks());
+                cell49.setCellValue(companyReview.getRequirementUnitPriority());
+                cell50.setCellValue(companyReview.getImplementPlan());
+                cell51.setCellValue(companyReview.getImplementBatchScreen());
+                cell52.setCellValue(companyReview.getConstructionUnit());
+                cell53.setCellValue(companyReview.getProjectApprovalBatch());
+                cell54.setCellValue(companyReview.getRealityConstructionUnit());
+                cell55.setCellValue(companyReview.getApprovalDiagram());
+                cell56.setCellValue(companyReview.getApprovalDiagramTime());
+                cell57.setCellValue(companyReview.getPaperDrawing());
+                cell58.setCellValue(companyReview.getPaperDrawingTime());
+                cell59.setCellValue(companyReview.getScreenRemarks());
+
+            }
+
+            String str = URLEncoder.encode("储备项目立项筛选统计表.xlsx", "UTF8");
             response.setHeader("Content-Disposition", "attachment;filename="+str);
             response.setContentType("application/vnd.ms-excel;charset=UTF-8");
             OutputStream outputStream = response.getOutputStream();

src/main/java/com/jeeplus/modules/cg/reservemanagementcenter/reserveManage/utils/ReserveProcessProjectProUtil.java

@@ -41,7 +41,7 @@ public class ReserveProcessProjectProUtil {
                 if(StringUtils.isNotBlank(projectReserveId)){
 
                     reserveManagement.setProjectYear((String) importUtil.getCellValue(row,1));
-                    reserveManagement.setProjectNature((String) importUtil.getCellValue(row,2));
+//                    reserveManagement.setProjectNature((String) importUtil.getCellValue(row,2));
                     reserveManagement.setDemandUnit((String) importUtil.getCellValue(row,3));
                     reserveManagement.setDistrict((String) importUtil.getCellValue(row,4));
                     reserveManagement.setProjectGroup((String) importUtil.getCellValue(row,5));
@@ -57,37 +57,37 @@ public class ReserveProcessProjectProUtil {
                     getBmList(proIdList,reserveManagement.getProjectReserveId());
 
                     reserveManagement.setProjectName((String) importUtil.getCellValue(row,11));
+                    reserveManagement.setStateGridProjectCode((String) importUtil.getCellValue(row,12));
+                    reserveManagement.setStateGridProjectName((String) importUtil.getCellValue(row,13));
                     //判断库钟是否有重复的项目名称、建设必要性及内容
                     getNaList(projectNameList,reserveManagement.getProjectName());
 
-                    reserveManagement.setConstructionNecessityAndContent((String) importUtil.getCellValue(row,12));
+                    reserveManagement.setConstructionNecessityAndContent((String) importUtil.getCellValue(row,14));
                     //建设必要性及内容
                     getCoList(contentList,reserveManagement.getConstructionNecessityAndContent());
 
-                    reserveManagement.setSubstationName((String) importUtil.getCellValue(row,13));
-                    reserveManagement.setCircuitName((String) importUtil.getCellValue(row,14));
-                    reserveManagement.setNetRackProjectDivide((String) importUtil.getCellValue(row,15));
-                    reserveManagement.setRequirementType((String) importUtil.getCellValue(row,16));
+                    reserveManagement.setSubstationName((String) importUtil.getCellValue(row,15));
+                    reserveManagement.setCircuitName((String) importUtil.getCellValue(row,16));
+                    reserveManagement.setNetRackProjectDivide((String) importUtil.getCellValue(row,17));
+                    reserveManagement.setRequirementType((String) importUtil.getCellValue(row,18));
+                    reserveManagement.setProjectType((String) importUtil.getCellValue(row,19));
 
-                    String costEstimateStr = importUtil.getCellValue(row,17).toString();
+                    String costEstimateStr = importUtil.getCellValue(row,20).toString();
                     if(StringUtils.isNotBlank(costEstimateStr)){
                         reserveManagement.setCostEstimate(Double.parseDouble(costEstimateStr));
                     }
-                    reserveManagement.setBasicRemarks((String) importUtil.getCellValue(row,18));
-                    reserveManagement.setRequester((String) importUtil.getCellValue(row,19));
-                    reserveManagement.setOwnerReserveFullTime((String) importUtil.getCellValue(row,20));
-                    reserveManagement.setOwnerDistributionNerworkFullTime((String) importUtil.getCellValue(row,21));
-                    reserveManagement.setOwnerReserveProjectManagre((String) importUtil.getCellValue(row,22));
-                    reserveManagement.setOwnerProjectManager((String) importUtil.getCellValue(row,23));
-                    reserveManagement.setMaterialSoleDuty((String) importUtil.getCellValue(row,24));
-                    reserveManagement.setTechnicalStaff((String) importUtil.getCellValue(row,25));
-                    reserveManagement.setOperationAndMaintenancePersonnel((String) importUtil.getCellValue(row,26));
-                    reserveManagement.setDesigner((String) importUtil.getCellValue(row,27));
-                    reserveManagement.setBudgetPreparer((String) importUtil.getCellValue(row,28));
+                    reserveManagement.setBasicRemarks((String) importUtil.getCellValue(row,21));
+                    reserveManagement.setRequester((String) importUtil.getCellValue(row,22));
+                    reserveManagement.setOwnerReserveFullTime((String) importUtil.getCellValue(row,23));
+                    reserveManagement.setOwnerDistributionNerworkFullTime((String) importUtil.getCellValue(row,24));
+                    reserveManagement.setOwnerReserveProjectManagre((String) importUtil.getCellValue(row,25));
+                    reserveManagement.setMaterialSoleDuty((String) importUtil.getCellValue(row,26));
+                    reserveManagement.setTechnicalStaff((String) importUtil.getCellValue(row,27));
+                    reserveManagement.setOperationAndMaintenancePersonnel((String) importUtil.getCellValue(row,28));
+                    reserveManagement.setDesigner((String) importUtil.getCellValue(row,29));
+                    reserveManagement.setBudgetPreparer((String) importUtil.getCellValue(row,30));
 //                    reserveManagement.setUninterruptedWorkSurveyPersonnel((String) importUtil.getCellValue(row,28));
                     reserveManagement.setProcessStatus(0);
-                    reserveManagement.setClearOrNot((String) importUtil.getCellValue(row,30));
-                    reserveManagement.setNoStartTheDesign((String) importUtil.getCellValue(row,31));
 //                    reserveManagement.setUninterruptedWorkSurveyPersonnel((String) importUtil.getCellValue(row,27));
 
 
@@ -141,22 +141,19 @@ public class ReserveProcessProjectProUtil {
             Row row = importUtil.getRow(i);
             //储备人员流转信息
             //获取项目储备编号
-            String projectReserveId = (String) importUtil.getCellValue(row, 10);
+            String projectReserveId = (String) importUtil.getCellValue(row, 11);
             if(StringUtils.isNotBlank(projectReserveId)){
 
-                reserveManagement.setProjectReserveId((String) importUtil.getCellValue(row,10));
+                reserveManagement.setProjectReserveId((String) importUtil.getCellValue(row,11));
 
                 //和基本信息表比对，是否有对应的数据
                 getBmList2(proIdList2,reserveManagement.getProjectReserveId());
 
-                reserveManagement.setHotLineWork((String) importUtil.getCellValue(row,23));
-
-
-                reserveManagement.setBoundarySwitchNum("");
+                reserveManagement.setHotLineWork((String) importUtil.getCellValue(row,26));
 
-                reserveManagement.setHotLineWorkTypeNo((String) importUtil.getCellValue(row,25));
-                reserveManagement.setNoStopWorkPlan((String) importUtil.getCellValue(row,26));
-                reserveManagement.setPowerFailureNum((String) importUtil.getCellValue(row,27));
+                reserveManagement.setHotLineWorkTypeNo((String) importUtil.getCellValue(row,28));
+                reserveManagement.setNoStopWorkPlan((String) importUtil.getCellValue(row,29));
+                reserveManagement.setPowerFailureNum((String) importUtil.getCellValue(row,30));
 
                 if (reserveManagement.getHotLineWork().equals("是") & (reserveManagement.getHotLineWorkTypeNo().equals("")
                     || reserveManagement.getNoStopWorkPlan().equals("") || reserveManagement.getPowerFailureNum().equals(""))){
@@ -164,10 +161,10 @@ public class ReserveProcessProjectProUtil {
                     throw new Exception(reserveManagement.getProjectReserveId() + "项目，带电作业信息填写不完整！");
                 }
 
-                reserveManagement.setReasonsForNotWorkInterruption((String) importUtil.getCellValue(row,28));
-                reserveManagement.setPowerOutagePlan((String) importUtil.getCellValue(row,29));
-                reserveManagement.setPlanner((String) importUtil.getCellValue(row,30));
-                reserveManagement.setSiteSurveyor((String) importUtil.getCellValue(row,31));
+                reserveManagement.setReasonsForNotWorkInterruption((String) importUtil.getCellValue(row,31));
+                reserveManagement.setPowerOutagePlan((String) importUtil.getCellValue(row,32));
+                reserveManagement.setPlanner((String) importUtil.getCellValue(row,33));
+                reserveManagement.setSiteSurveyor((String) importUtil.getCellValue(row,34));
 
                 if (list.size() == 0){
                     list.add(reserveManagement);
@@ -245,6 +242,115 @@ public class ReserveProcessProjectProUtil {
     }
 
     /**
+     * 获取项目类型校核表格数据
+     * @param importUtil
+     * @return List<ReserveManagementMapper> 导入表格数据
+     */
+    public static List<ProjectTypeVerificate> getVerificateUtil(ImportUtil importUtil,List<String> proIdList,List<String> proIdList2) throws Exception {
+        int lastRow = importUtil.getLastDataRowNum();
+        List<ProjectTypeVerificate> list = new ArrayList<ProjectTypeVerificate>();
+        //项目储备编号唯一性判断
+        List<String> cbbhList = new ArrayList<>();
+        //项目名称唯一性判断
+        List<String> nameList = new ArrayList<>();
+        //建设必要性及内容
+        List<String> jsList = new ArrayList<>();
+        ProjectTypeVerificate reserveManagement = null;
+        for(int i=2; i<=lastRow;i++){
+            reserveManagement = new ProjectTypeVerificate();
+            Row row = importUtil.getRow(i);
+            //储备人员流转信息
+            //获取项目储备编号
+            String projectReserveId = (String) importUtil.getCellValue(row, 10);
+            if(StringUtils.isNotBlank(projectReserveId)){
+
+                reserveManagement.setProjectReserveId((String) importUtil.getCellValue(row,10));
+
+                //和基本信息表比对，是否有对应的数据
+                getBmList2(proIdList2,reserveManagement.getProjectReserveId());
+
+                reserveManagement.setProjectNature((String) importUtil.getCellValue(row,24));
+                reserveManagement.setNewSubstation((String) importUtil.getCellValue(row,25));
+                reserveManagement.setProjectNatureArtificial((String) importUtil.getCellValue(row,28));
+                reserveManagement.setProjectType((String) importUtil.getCellValue(row,29));
+                reserveManagement.setIncludeCablesArtificial((String) importUtil.getCellValue(row,40));
+
+                if (list.size() == 0){
+                    list.add(reserveManagement);
+
+                    cbbhList.add(reserveManagement.getProjectReserveId());
+                }else {
+                    if (!cbbhList.contains(reserveManagement.getProjectReserveId())){
+                        list.add(reserveManagement);
+                        cbbhList.add(reserveManagement.getProjectReserveId());
+                    }
+                }
+
+            }
+        }
+        return list;
+    }
+
+    /**
+     * 获取立项筛选统计表表格数据
+     * @param importUtil
+     * @return List<ReserveManagementMapper> 导入表格数据
+     */
+    public static List<ProjectScreen> getProjectScreenUtil(ImportUtil importUtil,List<String> proIdList,List<String> proIdList2) throws Exception {
+        int lastRow = importUtil.getLastDataRowNum();
+        List<ProjectScreen> list = new ArrayList<ProjectScreen>();
+        //项目储备编号唯一性判断
+        List<String> cbbhList = new ArrayList<>();
+        //项目名称唯一性判断
+        List<String> nameList = new ArrayList<>();
+        //建设必要性及内容
+        List<String> jsList = new ArrayList<>();
+        ProjectScreen reserveManagement = null;
+        for(int i=2; i<=lastRow;i++){
+            reserveManagement = new ProjectScreen();
+            Row row = importUtil.getRow(i);
+            //储备人员流转信息
+            //获取项目储备编号
+            String projectReserveId = (String) importUtil.getCellValue(row, 11);
+            if(StringUtils.isNotBlank(projectReserveId)){
+
+                reserveManagement.setProjectReserveId((String) importUtil.getCellValue(row,11));
+
+                //和基本信息表比对，是否有对应的数据
+                getBmList2(proIdList2,reserveManagement.getProjectReserveId());
+
+                reserveManagement.setProjectPromotion((String) importUtil.getCellValue(row,44));
+                reserveManagement.setCompleteProgress((String) importUtil.getCellValue(row,45));
+                reserveManagement.setPreliminaryWorkPreparationRemarks((String) importUtil.getCellValue(row,48));
+                reserveManagement.setRequirementUnitPriority((String) importUtil.getCellValue(row,49));
+                reserveManagement.setImplementPlan((String) importUtil.getCellValue(row,50));
+                reserveManagement.setImplementBatchScreen((String) importUtil.getCellValue(row,51));
+                reserveManagement.setConstructionUnit((String) importUtil.getCellValue(row,52));
+                reserveManagement.setProjectApprovalBatch((String) importUtil.getCellValue(row,53));
+                reserveManagement.setRealityConstructionUnit((String) importUtil.getCellValue(row,54));
+                reserveManagement.setApprovalDiagram((String) importUtil.getCellValue(row,55));
+                reserveManagement.setApprovalDiagramTime((String) importUtil.getCellValue(row,56));
+                reserveManagement.setPaperDrawing((String) importUtil.getCellValue(row,57));
+                reserveManagement.setPaperDrawingTime((String) importUtil.getCellValue(row,58));
+                reserveManagement.setScreenRemarks((String) importUtil.getCellValue(row,59));
+
+                if (list.size() == 0){
+                    list.add(reserveManagement);
+
+                    cbbhList.add(reserveManagement.getProjectReserveId());
+                }else {
+                    if (!cbbhList.contains(reserveManagement.getProjectReserveId())){
+                        list.add(reserveManagement);
+                        cbbhList.add(reserveManagement.getProjectReserveId());
+                    }
+                }
+
+            }
+        }
+        return list;
+    }
+
+    /**
      * 获取储备项目安全交底信息表格数据
      * @param importUtil
      * @return List<ReserveManagementMapper> 导入表格数据
@@ -263,39 +369,39 @@ public class ReserveProcessProjectProUtil {
             reserveManagement = new ReserveSafety();
             Row row = importUtil.getRow(i);
             //获取项目储备编号
-            String projectReserveId = (String) importUtil.getCellValue(row, 10);
+            String projectReserveId = (String) importUtil.getCellValue(row, 11);
             if(StringUtils.isNotBlank(projectReserveId)){
 
-                reserveManagement.setProjectReserveId((String) importUtil.getCellValue(row,10));
+                reserveManagement.setProjectReserveId((String) importUtil.getCellValue(row,11));
 
                 //和基本信息表比对，是否有对应的数据
                 getBmList2(proIdList2,reserveManagement.getProjectReserveId());
 
-                reserveManagement.setTransmissionWork((String) importUtil.getCellValue(row,20));
-                reserveManagement.setWorkDescribe((String) importUtil.getCellValue(row,21));
-                reserveManagement.setTransmissionErection((String) importUtil.getCellValue(row,22));
-                reserveManagement.setErecteDescribe((String) importUtil.getCellValue(row,23));
-                reserveManagement.setTransmissionCommonTrench((String) importUtil.getCellValue(row,24));
-                reserveManagement.setTrenchDescribe((String) importUtil.getCellValue(row,25));
-                reserveManagement.setMediumVoltageWork((String) importUtil.getCellValue(row,26));
-                reserveManagement.setVoltageWorkDescribe((String) importUtil.getCellValue(row,27));
-                reserveManagement.setConfineSpaceWork((String) importUtil.getCellValue(row,28));
-                reserveManagement.setSpaceDescribe((String) importUtil.getCellValue(row,29));
-                reserveManagement.setSubStationCableBonding((String) importUtil.getCellValue(row,30));
-                reserveManagement.setCableDescribe((String) importUtil.getCellValue(row,31));
-                reserveManagement.setRoadRailwaysAndWaterwaysWork((String) importUtil.getCellValue(row,32));
-                reserveManagement.setWaterDescribe((String) importUtil.getCellValue(row,33));
-                reserveManagement.setHotWork((String) importUtil.getCellValue(row,34));
-                reserveManagement.setHotWorkDescribe((String) importUtil.getCellValue(row,35));
-                reserveManagement.setBlackoutLineFour((String) importUtil.getCellValue(row,36));
-                reserveManagement.setLineFourDescribe((String) importUtil.getCellValue(row,37));
-                reserveManagement.setLineLoadRedirectionThree((String) importUtil.getCellValue(row,38));
-                reserveManagement.setThreeRedirectDescribe((String) importUtil.getCellValue(row,39));
-                reserveManagement.setLargeScaleMultiTeamWork((String) importUtil.getCellValue(row,40));
-                reserveManagement.setTeamWorkDescribe((String) importUtil.getCellValue(row,41));
-                reserveManagement.setPrepareThreeMeasures((String) importUtil.getCellValue(row,42));
-                reserveManagement.setMeasureDescribe((String) importUtil.getCellValue(row,43));
-                reserveManagement.setJobRiskLevelPrediction((String) importUtil.getCellValue(row,44));
+                reserveManagement.setTransmissionWork((String) importUtil.getCellValue(row,25));
+                reserveManagement.setWorkDescribe((String) importUtil.getCellValue(row,26));
+                reserveManagement.setTransmissionErection((String) importUtil.getCellValue(row,27));
+                reserveManagement.setErecteDescribe((String) importUtil.getCellValue(row,28));
+                reserveManagement.setTransmissionCommonTrench((String) importUtil.getCellValue(row,29));
+                reserveManagement.setTrenchDescribe((String) importUtil.getCellValue(row,30));
+                reserveManagement.setMediumVoltageWork((String) importUtil.getCellValue(row,31));
+                reserveManagement.setVoltageWorkDescribe((String) importUtil.getCellValue(row,32));
+                reserveManagement.setConfineSpaceWork((String) importUtil.getCellValue(row,33));
+                reserveManagement.setSpaceDescribe((String) importUtil.getCellValue(row,34));
+                reserveManagement.setSubStationCableBonding((String) importUtil.getCellValue(row,35));
+                reserveManagement.setCableDescribe((String) importUtil.getCellValue(row,36));
+                reserveManagement.setRoadRailwaysAndWaterwaysWork((String) importUtil.getCellValue(row,37));
+                reserveManagement.setWaterDescribe((String) importUtil.getCellValue(row,38));
+                reserveManagement.setHotWork((String) importUtil.getCellValue(row,39));
+                reserveManagement.setHotWorkDescribe((String) importUtil.getCellValue(row,40));
+                reserveManagement.setBlackoutLineFour((String) importUtil.getCellValue(row,41));
+                reserveManagement.setLineFourDescribe((String) importUtil.getCellValue(row,42));
+                reserveManagement.setLineLoadRedirectionThree((String) importUtil.getCellValue(row,43));
+                reserveManagement.setThreeRedirectDescribe((String) importUtil.getCellValue(row,44));
+                reserveManagement.setLargeScaleMultiTeamWork((String) importUtil.getCellValue(row,45));
+                reserveManagement.setTeamWorkDescribe((String) importUtil.getCellValue(row,46));
+                reserveManagement.setPrepareThreeMeasures((String) importUtil.getCellValue(row,47));
+                reserveManagement.setMeasureDescribe((String) importUtil.getCellValue(row,48));
+                reserveManagement.setJobRiskLevelPrediction((String) importUtil.getCellValue(row,49));
 
 
 
@@ -447,7 +553,7 @@ public class ReserveProcessProjectProUtil {
             Row row = importUtil.getRow(i);
 
             //获取项目储备编号
-            String projectReserveId = (String) importUtil.getCellValue(row, 10);
+            String projectReserveId = (String) importUtil.getCellValue(row, 11);
 
             if(StringUtils.isNotBlank(projectReserveId)){
 
@@ -455,33 +561,19 @@ public class ReserveProcessProjectProUtil {
                 //和基本信息表对比      是否无对应数据
                 getBmList2(proIdList2,reserveManagement.getProjectReserveId());
 
-                reserveManagement.setIncludeReserve((String) importUtil.getCellValue(row,31));
-                reserveManagement.setReasonForCancel((String) importUtil.getCellValue(row,32));
-                reserveManagement.setComprehensiveProject((String) importUtil.getCellValue(row,20));
-                reserveManagement.setPowerFailureDifficulty((String) importUtil.getCellValue(row,23));
-                reserveManagement.setPowerFailureDescribe((String) importUtil.getCellValue(row,24));
-                reserveManagement.setOtherProblemDifficulty((String) importUtil.getCellValue(row,25));
-                reserveManagement.setOtherProblemDescribe((String) importUtil.getCellValue(row,26));
-                reserveManagement.setRunPlanRequire((String) importUtil.getCellValue(row,27));
-                reserveManagement.setProgramChangeDescription((String) importUtil.getCellValue(row,28));
-                reserveManagement.setDiscloseRemarks((String) importUtil.getCellValue(row,29));
-                reserveManagement.setStartDesignOrNot((String) importUtil.getCellValue(row,33));
-//                reserveManagement.setDemandUnitPriority((String) importUtil.getCellValue(row,37));
-//                reserveManagement.setPreliminaryArrangement((String) importUtil.getCellValue(row,38));
-//                reserveManagement.setInitialImplementBatch((String) importUtil.getCellValue(row,39));
-//                reserveManagement.setInitialImplementUnit((String) importUtil.getCellValue(row,40));
-//                reserveManagement.setProjectManagementCenter((String) importUtil.getCellValue(row,41));
-//                reserveManagement.setCompleteProgressUnit((String) importUtil.getCellValue(row,42));
-//                reserveManagement.setProjectReservePlan((String) importUtil.getCellValue(row,43));
-//                reserveManagement.setDemandUnitProgress((String) importUtil.getCellValue(row,44));
-//                reserveManagement.setDepartmentPlan((String) importUtil.getCellValue(row,45));
-//                reserveManagement.setDrawMapPath((String) importUtil.getCellValue(row,47));
-//                reserveManagement.setPlanRemarks((String) importUtil.getCellValue(row,48));
-//                reserveManagement.setArrangementProject((String) importUtil.getCellValue(row,49));
-//                reserveManagement.setImplementationBatch((String) importUtil.getCellValue(row,50));
-//                reserveManagement.setConstructionUnit((String) importUtil.getCellValue(row,51));
-//                reserveManagement.setDrawOfficeDrawn((String) importUtil.getCellValue(row,52));
-//                reserveManagement.setProjectInitiateRemarks((String) importUtil.getCellValue(row,53));
+                reserveManagement.setIncludeReserve((String) importUtil.getCellValue(row,23));
+                reserveManagement.setReasonForCancel((String) importUtil.getCellValue(row,24));
+                reserveManagement.setStartDesignOrNot((String) importUtil.getCellValue(row,25));
+                reserveManagement.setCompleteDisclose((String) importUtil.getCellValue(row,26));
+                reserveManagement.setCompleteDiscloseTime((String) importUtil.getCellValue(row,27));
+                reserveManagement.setComprehensiveProject("");
+                reserveManagement.setPowerFailureDifficulty((String) importUtil.getCellValue(row,31));
+                reserveManagement.setPowerFailureDescribe((String) importUtil.getCellValue(row,32));
+                reserveManagement.setOtherProblemDifficulty((String) importUtil.getCellValue(row,33));
+                reserveManagement.setOtherProblemDescribe((String) importUtil.getCellValue(row,34));
+                reserveManagement.setRunPlanRequire((String) importUtil.getCellValue(row,35));
+                reserveManagement.setProgramChangeDescription((String) importUtil.getCellValue(row,36));
+                reserveManagement.setDiscloseRemarks((String) importUtil.getCellValue(row,37));
 
 
                 if (list.size() == 0){
@@ -539,7 +631,7 @@ public class ReserveProcessProjectProUtil {
             Row row = importUtil.getRow(i);
 
             //获取项目储备编号
-            String projectReserveId = (String) importUtil.getCellValue(row, 10);
+            String projectReserveId = (String) importUtil.getCellValue(row, 11);
 
             if(StringUtils.isNotBlank(projectReserveId)){
 
@@ -548,12 +640,12 @@ public class ReserveProcessProjectProUtil {
                 //去汇总表中查看是否有对应数据
                 getBmList3(proIdList2,companyReview.getProjectReserveId());
 
-                companyReview.setJoinProvincialCompanyReview((String) importUtil.getCellValue(row,19));
-                companyReview.setBatchOfProvincialCompany((String) importUtil.getCellValue(row,20));
-                companyReview.setPassProvincialCompanyReview((String) importUtil.getCellValue(row,21));
-                companyReview.setReviewComments((String) importUtil.getCellValue(row,22));
-                companyReview.setDesignChangeRequired((String) importUtil.getCellValue(row,23));
-                companyReview.setCompanyRemarks((String) importUtil.getCellValue(row,24));
+                companyReview.setJoinProvincialCompanyReview((String) importUtil.getCellValue(row,20));
+                companyReview.setBatchOfProvincialCompany((String) importUtil.getCellValue(row,21));
+                companyReview.setPassProvincialCompanyReview((String) importUtil.getCellValue(row,22));
+                companyReview.setReviewComments((String) importUtil.getCellValue(row,23));
+                companyReview.setDesignChangeRequired((String) importUtil.getCellValue(row,24));
+                companyReview.setCompanyRemarks((String) importUtil.getCellValue(row,25));
                 list.add(companyReview);
             }
         }

src/main/java/com/jeeplus/modules/cg/reservemanagementcenter/reserveManage/web/CompanyReviewController.java

@@ -7,14 +7,13 @@ import com.jeeplus.core.web.BaseController;
 import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.entity.ActRunTaskTest;
 import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.entity.CompanyReview;
 import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.entity.ReserveSummary;
-import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.service.CompanyReviewService;
-import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.service.ReserveProcessProjectService;
-import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.service.ReserveSummaryProcessService;
-import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.service.SummaryStatisticService;
+import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.service.*;
 import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.utils.ReserveProcessProjectExportUtil;
 import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.utils.ReserveProcessProjectProUtil;
 import com.jeeplus.modules.cg.reservemanagementcenter.statisticalTable.service.BudgetStatsService;
 import com.jeeplus.modules.sg.managementcenter.materialproject.util.ImportUtil;
+import com.jeeplus.modules.sg.picking.activiti.entity.PickList;
+import com.jeeplus.modules.sg.raiseCapital.service.RaiseCapitalService;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.apache.shiro.authz.annotation.Logical;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -29,6 +28,7 @@ import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -56,6 +56,12 @@ public class CompanyReviewController extends BaseController {
     @Autowired
     private BudgetStatsService statsService;
 
+    @Autowired
+    private RaiseCapitalService raiseCapitalService;
+
+    @Autowired
+    private ProjectTypeVerificateService verificateService;
+
     @ModelAttribute
     public CompanyReview get(@RequestParam(required = false) String id) {
         CompanyReview entity = null;
@@ -111,24 +117,26 @@ public class CompanyReviewController extends BaseController {
                     }else if (c.getPassProvincialCompanyReview().equals("取消") & a.getProjectReserveId().equals(c.getProjectReserveId())){
                         //取消的状态
                         //流程开始的状态
-                        if (a.getIncludeReserve().equals("是") & !a.getProcessStatus().equals("2")){
+//                        if (a.getIncludeReserve().equals("是") & !a.getProcessStatus().equals("2")){
+                        if (a.getStartDesignOrNot().equals("是") & !a.getProcessStatus().equals("2")){
                             //修改基础表的流程字段为取消，修改汇总表的是否纳入储备为取消，将取消原因放入到汇总表的取消原因说明字段 结束流程
                             projectService.updateProcessStatus(a.getProjectReserveId(),3);
 
                             ReserveSummary summary = new ReserveSummary();
                             summary.setProjectReserveId(a.getProjectReserveId());
                             ReserveSummary summary1 = statisticService.queryByProjectReserveId(summary);
-                            summary1.setIncludeReserve("取消");
+                            summary1.setStartDesignOrNot("否");
                             summary1.setReasonForCancel(c.getReviewComments());
                             statisticService.update(summary1);
 
+                            ActRunTaskTest taskTest = summaryProcessService.getByProId(c.getProjectReserveId());
 //                            statisticService.updateReserveSummary(a.getProjectReserveId(),"取消",c.getReviewComments());
                             //取消流程   将流程表中的流程信息删除
                             service.deleteActivityByProId(a.getProjectReserveId());
 
                             //将act_ru_task表中的任务删除
-                            ActRunTaskTest taskTest = summaryProcessService.getByProId(c.getProjectReserveId());
-                            summaryProcessService.deleteByProcId(taskTest.getProcInsId(),"");
+//                            ActRunTaskTest taskTest = summaryProcessService.getByProId(c.getProjectReserveId());
+//                            summaryProcessService.deleteByProcId(taskTest.getProcInsId(),"");
                             //删除联合审图的并行任务
                             summaryProcessService.deleteExecution(taskTest.getProcInsId(),"sid-A0FF4858-9940-4B37-B14E-2DEA24AB37E5");
                             summaryProcessService.deleteExecution(taskTest.getProcInsId(),"sid-C92A1CEE-3775-4A11-AAD0-64FA836AC97C");
@@ -198,6 +206,39 @@ public class CompanyReviewController extends BaseController {
     public Map<String, Object> basicData(CompanyReview companyReview, HttpServletRequest request, HttpServletResponse response, Model model) {
 
         Page<CompanyReview> page = service.findPage(new Page<CompanyReview>(request, response), companyReview);
+        List<CompanyReview> list = page.getList();
+        List<CompanyReview> reviews = new ArrayList<>();
+        //获取所有小类的名称
+        List<String> nameList = new ArrayList<>();
+        List<PickList> pickListList = raiseCapitalService.newAllList();
+        if (null != pickListList) {
+            pickListList.forEach(k->{
+                if (k.getName().equals("三、设备")){
+                    k.getMdTheClassList().forEach(v->{
+                        v.getMdSmallClassList().forEach(na->{
+                            nameList.add(na.getName());
+                        });
+                    });
+                }
+            });
+        }
+        for (CompanyReview review : list) {
+            //根据项目储备id去在线开甲供材表中查询物理信息
+            List<String> materialNameList = verificateService.getMaterialName(review.getProjectName());
+            if (null != nameList & null != materialNameList){
+                nameList.forEach(n->{
+                    if (StringUtils.isBlank(review.getProjectNature())){
+                        if (materialNameList.contains(n)){
+                            review.setProjectNature("资本");
+                        } else {
+                            review.setProjectNature("成本");
+                        }
+                    }
+                });
+            }
+            reviews.add(review);
+        }
+        page.setList(reviews);
         return getBootstrapData(page);
     }
 
@@ -208,11 +249,39 @@ public class CompanyReviewController extends BaseController {
     public void exportExcel(CompanyReview companyReview, HttpServletRequest request, HttpServletResponse response) {
         List<CompanyReview> list = service.exportFindList(companyReview);
 
+        //获取所有小类的名称
+        List<String> nameList = new ArrayList<>();
+        List<PickList> pickListList = raiseCapitalService.newAllList();
+        if (null != pickListList) {
+            pickListList.forEach(k->{
+                if (k.getName().equals("三、设备")){
+                    k.getMdTheClassList().forEach(v->{
+                        v.getMdSmallClassList().forEach(na->{
+                            nameList.add(na.getName());
+                        });
+                    });
+                }
+            });
+        }
+
         //生成序列号
         int i = 1;
         for (CompanyReview s : list) {
             s.setId(String.valueOf(i));
             i++;
+            //根据项目储备id去在线开甲供材表中查询物理信息
+            List<String> materialNameList = verificateService.getMaterialName(s.getProjectName());
+            if (null != nameList & null != materialNameList){
+                nameList.forEach(n->{
+                    if (StringUtils.isBlank(s.getProjectNature())){
+                        if (materialNameList.contains(n)){
+                            s.setProjectNature("资本");
+                        } else {
+                            s.setProjectNature("成本");
+                        }
+                    }
+                });
+            }
         }
 
         ReserveProcessProjectExportUtil util = ReserveProcessProjectExportUtil.getOne();
@@ -261,27 +330,31 @@ public class CompanyReviewController extends BaseController {
             proId.setDesignChangeRequired(companyReview.getDesignChangeRequired());
             proId.setCompanyRemarks(companyReview.getCompanyRemarks());
             //获取汇总表中的数据  物料编码 和 是否纳入储备字段
-            List<ReserveSummary> allCode = statisticService.getAllCode();
+//            List<ReserveSummary> allCode = statisticService.getAllCode();
+
+            ReserveSummary reserveSummary = statisticService.getCodeByProId(companyReview.getProjectReserveId());
+
 
             //修改时的两种情况
             //1、在流程进行中修改(修改基础表的流程字段为取消，修改汇总表的是否纳入储备为取消，将取消原因放入到汇总表的取消原因说明字段 结束流程)
             //2、流程未开始修改（正常操作不进行其他处理）
             CompanyReview finalProId = proId;
-            allCode.forEach(a->{
-                if (companyReview.getPassProvincialCompanyReview().equals("取消") &a.getIncludeReserve().equals("是") & !a.getProcessStatus().equals("2")){
 
-                    ReserveSummary summary = new ReserveSummary();
-                    summary.setProjectReserveId(companyReview.getProjectReserveId());
-                    ReserveSummary summary1 = statisticService.queryByProjectReserveId(summary);
-                    summary1.setIncludeReserve("取消");
-                    summary1.setReasonForCancel(companyReview.getReviewComments());
+            if (companyReview.getPassProvincialCompanyReview().equals("取消") &reserveSummary.getStartDesignOrNot().equals("是") & !reserveSummary.getProcessStatus().equals("2")){
 
+                ReserveSummary summary = new ReserveSummary();
+                summary.setProjectReserveId(companyReview.getProjectReserveId());
+                ReserveSummary summary1 = statisticService.queryByProjectReserveId(summary);
+                if (null != summary1) {
+                    summary1.setStartDesignOrNot("否");
+                    summary1.setReasonForCancel(companyReview.getReviewComments());
 
+                    ActRunTaskTest taskTest = summaryProcessService.getByProId(companyReview.getProjectReserveId());
                     //取消流程   将流程表中的流程信息删除
                     service.deleteActivityByProId(companyReview.getProjectReserveId());
                     //将act_ru_task表中的任务删除
-                    ActRunTaskTest taskTest = summaryProcessService.getByProId(companyReview.getProjectReserveId());
-                    summaryProcessService.deleteByProcId(taskTest.getProcInsId(),"");
+
+//                    summaryProcessService.deleteByProcId(taskTest.getProcInsId(),"");
                     //删除联合审图的并行任务
                     String taskKey = summaryProcessService.selectTaskKey(taskTest.getProcInsId(), "联合审图");
                     String taskKey2 = summaryProcessService.selectTaskKey(taskTest.getProcInsId(), "项目经理审图");
@@ -292,6 +365,49 @@ public class CompanyReviewController extends BaseController {
 
                     projectService.updateProcessStatus(companyReview.getProjectReserveId(),3);
                     statisticService.update(summary1);
+
+                }
+                //新增或编辑表单保存
+                service.update(finalProId);
+
+                j.setSuccess(true);
+                j.setMsg("修改省公司评审信息成功");
+            }else {
+                //新增或编辑表单保存
+                service.update(finalProId);
+
+                j.setSuccess(true);
+                j.setMsg("修改省公司评审信息成功");
+            }
+            /*allCode.forEach(a->{
+//                if (companyReview.getPassProvincialCompanyReview().equals("取消") &a.getIncludeReserve().equals("是") & !a.getProcessStatus().equals("2")){
+                if (companyReview.getPassProvincialCompanyReview().equals("取消") &a.getStartDesignOrNot().equals("是") & !a.getProcessStatus().equals("2")){
+
+                    ReserveSummary summary = new ReserveSummary();
+                    summary.setProjectReserveId(companyReview.getProjectReserveId());
+                    ReserveSummary summary1 = statisticService.queryByProjectReserveId(summary);
+                    if (null != summary1) {
+                        summary1.setIncludeReserve("取消");
+                        summary1.setReasonForCancel(companyReview.getReviewComments());
+
+
+                        //取消流程   将流程表中的流程信息删除
+                        service.deleteActivityByProId(companyReview.getProjectReserveId());
+                        //将act_ru_task表中的任务删除
+                        ActRunTaskTest taskTest = summaryProcessService.getByProId(companyReview.getProjectReserveId());
+                        summaryProcessService.deleteByProcId(taskTest.getProcInsId(),"");
+                        //删除联合审图的并行任务
+                        String taskKey = summaryProcessService.selectTaskKey(taskTest.getProcInsId(), "联合审图");
+                        String taskKey2 = summaryProcessService.selectTaskKey(taskTest.getProcInsId(), "项目经理审图");
+                        String taskKey3 = summaryProcessService.selectTaskKey(taskTest.getProcInsId(), "技经人员审预算");
+                        summaryProcessService.deleteExecution(taskTest.getProcInsId(),taskKey);
+                        summaryProcessService.deleteExecution(taskTest.getProcInsId(),taskKey2);
+                        summaryProcessService.deleteExecution(taskTest.getProcInsId(),taskKey3);
+
+                        projectService.updateProcessStatus(companyReview.getProjectReserveId(),3);
+                        statisticService.update(summary1);
+
+                    }
                     //新增或编辑表单保存
                     service.update(finalProId);
 
@@ -304,7 +420,7 @@ public class CompanyReviewController extends BaseController {
                     j.setSuccess(true);
                     j.setMsg("修改省公司评审信息成功");
                 }
-            });
+            });*/
         }
 
         return j;

src/main/java/com/jeeplus/modules/cg/reservemanagementcenter/reserveManage/web/ProcessController.java

@@ -22,6 +22,7 @@ import com.jeeplus.modules.sg.managementcenter.materialinfo.entity.MaterialInfo;
 import com.jeeplus.modules.sg.managementcenter.materialproject.util.ImportUtil;
 import com.jeeplus.modules.sg.managementcenter.reserveManagement.entity.ReserveProcess;
 import com.jeeplus.modules.sg.picking.activiti.entity.ShowList;
+import com.jeeplus.modules.sg.raiseCapitalDesign.service.RaiseCapitalDesignService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.mock.web.MockMultipartFile;
 import org.springframework.stereotype.Controller;
@@ -82,6 +83,9 @@ public class ProcessController extends BaseController {
     @Autowired
     private CableService cableService;
 
+    @Autowired
+    private RaiseCapitalDesignService raiseCapitalDesignService;
+
     @ModelAttribute
     public ReserveSummaryProcess get(@RequestParam(required = false) String id) {
         ReserveSummaryProcess entity = null;
@@ -173,12 +177,12 @@ public class ProcessController extends BaseController {
      */
     @ResponseBody
     @RequestMapping(value = "importCGValidations")
-    public AjaxJson importCGValidations(@RequestParam("file") MultipartFile[] file) {
+    public AjaxJson importCGValidations(@RequestParam("file") MultipartFile[] file,String projectReserveId) {
         AjaxJson j = new AjaxJson();
 
         try {
             for (int k = 0; k < file.length; k++) {
-                reserveProcessService.saveData(file[k]);
+                reserveProcessService.saveData(file[k],projectReserveId);
             }
             j.setSuccess(true);
             j.setErrorCode("0");

src/main/java/com/jeeplus/modules/cg/reservemanagementcenter/reserveManage/web/ProjectScreenController.java

@@ -0,0 +1,340 @@
+package com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.web;
+
+import com.jeeplus.common.json.AjaxJson;
+import com.jeeplus.common.utils.StringUtils;
+import com.jeeplus.core.persistence.Page;
+import com.jeeplus.core.web.BaseController;
+import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.entity.ProjectScreen;
+import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.service.ProjectScreenService;
+import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.service.ProjectTypeVerificateService;
+import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.utils.ReserveProcessProjectExportUtil;
+import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.utils.ReserveProcessProjectProUtil;
+import com.jeeplus.modules.cg.reservemanagementcenter.statisticalTable.entity.History;
+import com.jeeplus.modules.sg.managementcenter.materialproject.util.ImportUtil;
+import com.jeeplus.modules.sg.picking.activiti.entity.PickList;
+import com.jeeplus.modules.sg.raiseCapital.service.RaiseCapitalService;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+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;
+import org.springframework.ui.Model;
+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.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author: 王强
+ * @create: 2023-06-28 09:36
+ **/
+@Controller
+@RequestMapping(value = "${adminPath}/cg/reservemanagementcenter/projectScreen")
+public class ProjectScreenController extends BaseController {
+
+    @Autowired
+    private ProjectScreenService service;
+
+    @Autowired
+    private RaiseCapitalService raiseCapitalService;
+
+    @Autowired
+    private ProjectTypeVerificateService verificateService;
+
+    @ModelAttribute
+    public ProjectScreen get(@RequestParam(required = false) String id) {
+        ProjectScreen entity = null;
+        if (StringUtils.isNotBlank(id)) {
+            entity = service.get(id);
+        }
+        if (entity == null) {
+            entity = new ProjectScreen();
+        }
+        return entity;
+    }
+
+    /**
+     * 省公司评审信息列表页面
+     * @param review
+     * @param model
+     * @return
+     */
+    @RequiresPermissions("cg:reservemanagementcenter:projectScreen:list")
+    @RequestMapping(value = "skipList")
+    public String skipList(ProjectScreen review, Model model) {
+        model.addAttribute("review", review);
+        return "modules/cg/reservemanagementcenter/reserveManage/projectScreen/projectScreenInfo";
+    }
+
+    /**
+     * 查看表单页面
+     */
+    @RequiresPermissions(value={"cg:reservemanagementcenter:projectScreen:view"},logical= Logical.OR)
+    @RequestMapping(value = "view")
+    public String view(ProjectScreen verificate, Model model) {
+        model.addAttribute("verificate", verificate);
+        return "modules/cg/reservemanagementcenter/reserveManage/projectScreen/projectScreenView";
+    }
+
+    /**
+     * 编辑表单页面
+     * @param verificate
+     * @param model
+     * @return
+     */
+    @RequiresPermissions(value={"cg:reservemanagementcenter:projectScreen:add","cg:reservemanagementcenter:projectScreen:edit"},logical= Logical.OR)
+    @RequestMapping(value = "form")
+    public String form(ProjectScreen verificate, Model model) {
+
+        model.addAttribute("verificate", verificate);
+        //判断id是否为空 如果未空则为新增 否则为修改
+        if(StringUtils.isBlank(verificate.getId())){
+            return "modules/cg/reservemanagementcenter/reserveManage/projectScreen/projectScreenForm";
+        }
+        return "modules/cg/reservemanagementcenter/reserveManage/projectScreen/projectScreenByzz";
+    }
+
+    /**
+     * 项目储备信息数据列表
+     * @param verificate
+     * @param request
+     * @param response
+     * @param model
+     * @return
+     */
+    @ResponseBody
+    @RequiresPermissions("cg:reservemanagementcenter:projectScreen:list")
+    @RequestMapping(value = "list")
+    public Map<String, Object> basicData(ProjectScreen verificate, HttpServletRequest request, HttpServletResponse response, Model model) {
+
+        Page<ProjectScreen> page = service.findPage(new Page<ProjectScreen>(request, response), verificate);
+        List<ProjectScreen> list = page.getList();
+        List<ProjectScreen> workList = new ArrayList<>();
+
+        //获取所有小类的名称
+        List<String> nameList = new ArrayList<>();
+        List<PickList> pickListList = raiseCapitalService.newAllList();
+        if (null != pickListList) {
+            pickListList.forEach(k->{
+                if (k.getName().equals("三、设备")){
+                    k.getMdTheClassList().forEach(v->{
+                        v.getMdSmallClassList().forEach(na->{
+                            nameList.add(na.getName());
+                        });
+                    });
+                }
+            });
+        }
+
+        for (ProjectScreen work : list) {
+            //根据projectReserveId查出流程表的proc_ins_id
+            String procInsId = service.getByProjectReserveId(work.getProjectReserveId());
+            //根据procInsId查出历史流程名称和时间
+            if (StringUtils.isNotEmpty(procInsId)){
+                List<History> histories = service.getHistoryByExecuteId(procInsId);
+                //当size>0时待办有历史流程，
+                if (histories.size()>0){
+                    //根据proc_ins_id去运行时任务节点表（act_ru_task）中查出当前流程名称
+                    String name = service.getByExecuteId(procInsId);
+                    //设置项目进度
+                    if (StringUtils.isNotEmpty(name)){
+                        work.setReserveProgress(name);
+                    }else {
+                        work.setReserveProgress("");
+                    }
+                }else {
+                    work.setReserveProgress("");
+                }
+            }else {
+                work.setReserveProgress("");
+            }
+
+            //根据项目储备id去在线开甲供材表中查询物理信息
+            List<String> materialNameList = verificateService.getMaterialName(work.getProjectName());
+            if (null != nameList & null != materialNameList){
+                nameList.forEach(n->{
+                    if (StringUtils.isBlank(work.getProjectNature())){
+                        if (materialNameList.contains(n)){
+                            work.setProjectNature("资本");
+                        } else {
+                            work.setProjectNature("成本");
+                        }
+                    }
+                });
+            }
+
+            workList.add(work);
+        }
+        page.setList(workList);
+        return getBootstrapData(page);
+    }
+
+    //导出excel
+    @ResponseBody
+    @RequiresPermissions("cg:reservemanagementcenter:projectScreen:export")
+    @RequestMapping(value = "export")
+    public void exportExcel(ProjectScreen verificate, HttpServletRequest request, HttpServletResponse response) {
+        List<ProjectScreen> list = service.exportFindList(verificate);
+
+        //获取所有小类的名称
+        List<String> nameList = new ArrayList<>();
+        List<PickList> pickListList = raiseCapitalService.newAllList();
+        if (null != pickListList) {
+            pickListList.forEach(k->{
+                if (k.getName().equals("三、设备")){
+                    k.getMdTheClassList().forEach(v->{
+                        v.getMdSmallClassList().forEach(na->{
+                            nameList.add(na.getName());
+                        });
+                    });
+                }
+            });
+        }
+
+        //生成序列号
+        int i = 1;
+        for (ProjectScreen s : list) {
+            s.setId(String.valueOf(i));
+            i++;
+
+            //根据项目储备id去在线开甲供材表中查询物理信息
+            List<String> materialNameList = verificateService.getMaterialName(s.getProjectName());
+            if (null != nameList & null != materialNameList){
+                nameList.forEach(n->{
+                    if (StringUtils.isBlank(s.getProjectNature())){
+                        if (materialNameList.contains(n)){
+                            s.setProjectNature("资本");
+                        } else {
+                            s.setProjectNature("成本");
+                        }
+                    }
+                });
+            }
+        }
+
+        ReserveProcessProjectExportUtil util = ReserveProcessProjectExportUtil.getOne();
+        XSSFWorkbook workbook = util.getWorkbook("projectScreen");
+        util.exportProjectScreen(response,workbook,list);
+    }
+
+    /**
+     * 专职人员修改表单
+     * @param reserveManagement
+     * @return
+     */
+    @ResponseBody
+    @RequiresPermissions(value={"cg:reservemanagementcenter:projectScreen:edit"},logical=Logical.OR)
+    @RequestMapping(value = "update")
+    public AjaxJson update(ProjectScreen reserveManagement) {
+        AjaxJson j = new AjaxJson();
+        /**
+         * 后台hibernate-validation插件校验
+         */
+        String errMsg = beanValidator(reserveManagement);
+        if (StringUtils.isNotBlank(errMsg)){
+            j.setSuccess(false);
+            j.setMsg(errMsg);
+            return j;
+        }
+        //根据id去项目校核表中查是否有这个数据
+        ProjectScreen cityWork = service.getByProId(reserveManagement.getProjectReserveId());
+        if (null == cityWork){
+            //进行保存操作
+            cityWork = new ProjectScreen();
+            cityWork.setProjectReserveId(reserveManagement.getProjectReserveId());
+            cityWork.setProjectPromotion(reserveManagement.getProjectPromotion());
+            cityWork.setCompleteProgress(reserveManagement.getCompleteProgress());
+            cityWork.setPreliminaryWorkPreparationRemarks(reserveManagement.getPreliminaryWorkPreparationRemarks());
+            cityWork.setRequirementUnitPriority(reserveManagement.getRequirementUnitPriority());
+            cityWork.setImplementPlan(reserveManagement.getImplementPlan());
+            cityWork.setImplementBatchScreen(reserveManagement.getImplementBatchScreen());
+            cityWork.setConstructionUnit(reserveManagement.getConstructionUnit());
+            cityWork.setProjectApprovalBatch(reserveManagement.getProjectApprovalBatch());
+            cityWork.setRealityConstructionUnit(reserveManagement.getRealityConstructionUnit());
+            cityWork.setApprovalDiagram(reserveManagement.getApprovalDiagram());
+            cityWork.setApprovalDiagramTime(reserveManagement.getApprovalDiagramTime());
+            cityWork.setPaperDrawing(reserveManagement.getPaperDrawing());
+            cityWork.setPaperDrawingTime(reserveManagement.getPaperDrawingTime());
+            cityWork.setScreenRemarks(reserveManagement.getScreenRemarks());
+            service.save(cityWork);
+        }else {
+            //新增或编辑表单保存
+            cityWork.setProjectReserveId(reserveManagement.getProjectReserveId());
+            cityWork.setProjectPromotion(reserveManagement.getProjectPromotion());
+            cityWork.setCompleteProgress(reserveManagement.getCompleteProgress());
+            cityWork.setPreliminaryWorkPreparationRemarks(reserveManagement.getPreliminaryWorkPreparationRemarks());
+            cityWork.setRequirementUnitPriority(reserveManagement.getRequirementUnitPriority());
+            cityWork.setImplementPlan(reserveManagement.getImplementPlan());
+            cityWork.setImplementBatchScreen(reserveManagement.getImplementBatchScreen());
+            cityWork.setConstructionUnit(reserveManagement.getConstructionUnit());
+            cityWork.setProjectApprovalBatch(reserveManagement.getProjectApprovalBatch());
+            cityWork.setRealityConstructionUnit(reserveManagement.getRealityConstructionUnit());
+            cityWork.setApprovalDiagram(reserveManagement.getApprovalDiagram());
+            cityWork.setApprovalDiagramTime(reserveManagement.getApprovalDiagramTime());
+            cityWork.setPaperDrawing(reserveManagement.getPaperDrawing());
+            cityWork.setPaperDrawingTime(reserveManagement.getPaperDrawingTime());
+            cityWork.setScreenRemarks(reserveManagement.getScreenRemarks());
+            service.update(cityWork);
+        }
+        j.setSuccess(true);
+        j.setMsg("修改储备项目项目校核信息成功");
+        return j;
+    }
+
+    /**
+     * 导入Excel数据
+     * @param file
+     * @param response
+     * @param request
+     * @return
+     */
+    @ResponseBody
+    @RequiresPermissions("cg:reservemanagementcenter:projectScreen:import")
+    @RequestMapping(value = "import")
+    public AjaxJson importBasic(@RequestParam("file") MultipartFile file, HttpServletResponse response, HttpServletRequest request) {
+        AjaxJson j = new AjaxJson();
+        try {
+            ImportUtil importUtil = new ImportUtil(file, 0, 0);
+            //从数据库中查出所有的 项目储备编号
+            List<String> proIdList = service.getAllProId();
+
+            //从基本数据表中查出所有的 项目储备编号
+            List<String> proIdList2 = service.getAllProId2();
+
+            //获取导入表格所有数据
+            List<ProjectScreen> reserveManagementList = ReserveProcessProjectProUtil.getProjectScreenUtil(importUtil,proIdList,proIdList2);
+            //查询已有的参数数据 并分类返回已存在数据和未存在数据
+            Map map = service.getExistProjectList(reserveManagementList);
+            //未存在数据
+            List<ProjectScreen> withoutList = (List<ProjectScreen>) map.get("without");
+            //已存在数据
+            List<ProjectScreen> existList = (List<ProjectScreen>) map.get("exist");
+
+            //对未存在的数据进行批量导入
+            if(withoutList.size()>0){
+                service.insertList(withoutList);
+            }
+
+            //对已存在的数据进行修改
+            if(existList.size()>0){
+                for (ProjectScreen reserveManagement : existList) {
+                    service.update(reserveManagement);
+                }
+            }
+            int i = withoutList.size() + existList.size();
+            j.setMsg("已成功导入" + i + "条项目储备信息记录");
+
+        } catch (Exception e) {
+            j.setSuccess(false);
+            j.setMsg("导入项目储备信息失败！失败信息：" + e.getMessage());
+        }
+        return j;
+    }
+}

src/main/java/com/jeeplus/modules/cg/reservemanagementcenter/reserveManage/web/ProjectTypeVerificateController.java

@@ -0,0 +1,322 @@
+package com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.web;
+
+import com.jeeplus.common.json.AjaxJson;
+import com.jeeplus.common.utils.StringUtils;
+import com.jeeplus.core.persistence.Page;
+import com.jeeplus.core.web.BaseController;
+import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.entity.ProjectTypeVerificate;
+import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.service.ProjectTypeVerificateService;
+import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.utils.ReserveProcessProjectExportUtil;
+import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.utils.ReserveProcessProjectProUtil;
+import com.jeeplus.modules.cg.reservemanagementcenter.statisticalTable.entity.History;
+import com.jeeplus.modules.sg.managementcenter.materialproject.util.ImportUtil;
+import com.jeeplus.modules.sg.picking.activiti.entity.PickList;
+import com.jeeplus.modules.sg.raiseCapital.service.RaiseCapitalService;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+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;
+import org.springframework.ui.Model;
+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.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author: 王强
+ * @create: 2023-06-26 14:03
+ **/
+@Controller
+@RequestMapping(value = "${adminPath}/cg/reservemanagementcenter/projectTypeVerificate")
+public class ProjectTypeVerificateController extends BaseController {
+
+    @Autowired
+    private ProjectTypeVerificateService service;
+
+    @Autowired
+    private RaiseCapitalService raiseCapitalService;
+
+    @ModelAttribute
+    public ProjectTypeVerificate get(@RequestParam(required = false) String id) {
+        ProjectTypeVerificate entity = null;
+        if (StringUtils.isNotBlank(id)) {
+            entity = service.get(id);
+        }
+        if (entity == null) {
+            entity = new ProjectTypeVerificate();
+        }
+        return entity;
+    }
+
+    /**
+     * 省公司评审信息列表页面
+     * @param review
+     * @param model
+     * @return
+     */
+    @RequiresPermissions("cg:reservemanagementcenter:projectTypeVerificate:list")
+    @RequestMapping(value = "skipList")
+    public String skipList(ProjectTypeVerificate review, Model model) {
+        model.addAttribute("review", review);
+        return "modules/cg/reservemanagementcenter/reserveManage/projectTypeVerificate/projectTypeVerificateInfo";
+    }
+
+    /**
+     * 查看表单页面
+     */
+    @RequiresPermissions(value={"cg:reservemanagementcenter:projectTypeVerificate:view"},logical= Logical.OR)
+    @RequestMapping(value = "view")
+    public String view(ProjectTypeVerificate verificate, Model model) {
+        model.addAttribute("verificate", verificate);
+        return "modules/cg/reservemanagementcenter/reserveManage/projectTypeVerificate/projectTypeVerificateView";
+    }
+
+    /**
+     * 编辑表单页面
+     * @param verificate
+     * @param model
+     * @return
+     */
+    @RequiresPermissions(value={"cg:reservemanagementcenter:projectTypeVerificate:add","cg:reservemanagementcenter:projectTypeVerificate:edit"},logical= Logical.OR)
+    @RequestMapping(value = "form")
+    public String form(ProjectTypeVerificate verificate, Model model) {
+
+        model.addAttribute("verificate", verificate);
+        //判断id是否为空 如果未空则为新增 否则为修改
+        if(StringUtils.isBlank(verificate.getId())){
+            return "modules/cg/reservemanagementcenter/reserveManage/projectTypeVerificate/projectTypeVerificateForm";
+        }
+        return "modules/cg/reservemanagementcenter/reserveManage/projectTypeVerificate/projectTypeVerificateByzz";
+    }
+
+    /**
+     * 项目储备信息数据列表
+     * @param verificate
+     * @param request
+     * @param response
+     * @param model
+     * @return
+     */
+    @ResponseBody
+    @RequiresPermissions("cg:reservemanagementcenter:projectTypeVerificate:list")
+    @RequestMapping(value = "list")
+    public Map<String, Object> basicData(ProjectTypeVerificate verificate, HttpServletRequest request, HttpServletResponse response, Model model) {
+
+        Page<ProjectTypeVerificate> page = service.findPage(new Page<ProjectTypeVerificate>(request, response), verificate);
+        List<ProjectTypeVerificate> list = page.getList();
+        List<ProjectTypeVerificate> workList = new ArrayList<>();
+
+        List<String> nameList = new ArrayList<>();
+        //获取所有小类的名称
+        List<PickList> pickListList = raiseCapitalService.newAllList();
+        if (null != pickListList) {
+            pickListList.forEach(k->{
+                if (k.getName().equals("三、设备")){
+                    k.getMdTheClassList().forEach(v->{
+                        v.getMdSmallClassList().forEach(na->{
+                            nameList.add(na.getName());
+                        });
+                    });
+                }
+            });
+        }
+
+        for (ProjectTypeVerificate work : list) {
+            //根据projectReserveId查出流程表的proc_ins_id
+            String procInsId = service.getByProjectReserveId(work.getProjectReserveId());
+            //根据procInsId查出历史流程名称和时间
+            if (StringUtils.isNotEmpty(procInsId)){
+                List<History> histories = service.getHistoryByExecuteId(procInsId);
+                //当size>0时待办有历史流程，
+                if (histories.size()>0){
+                    //根据proc_ins_id去运行时任务节点表（act_ru_task）中查出当前流程名称
+                    String name = service.getByExecuteId(procInsId);
+                    //设置项目进度
+                    if (StringUtils.isNotEmpty(name)){
+                        work.setReserveProgress(name);
+                    }else {
+                        work.setReserveProgress("");
+                    }
+                }else {
+                    work.setReserveProgress("");
+                }
+            }else {
+                work.setReserveProgress("");
+            }
+
+            //根据项目储备id去在线开甲供材表中查询物理信息
+            List<String> materialNameList = service.getMaterialName(work.getProjectName());
+            if (null != nameList & null != materialNameList){
+                nameList.forEach(n->{
+                    if (materialNameList.contains(n)){
+                        work.setIncludeCapitalEquipment("是");
+                        work.setProjectProperties("资本");
+                    } else {
+                        work.setIncludeCapitalEquipment("否");
+                        work.setProjectProperties("成本");
+                    }
+                });
+            }
+
+            workList.add(work);
+        }
+        page.setList(workList);
+        return getBootstrapData(page);
+    }
+
+    //导出excel
+    @ResponseBody
+    @RequiresPermissions("cg:reservemanagementcenter:projectTypeVerificate:export")
+    @RequestMapping(value = "export")
+    public void exportExcel(ProjectTypeVerificate verificate, HttpServletRequest request, HttpServletResponse response) {
+        List<ProjectTypeVerificate> list = service.exportFindList(verificate);
+
+        List<String> nameList = new ArrayList<>();
+        //获取所有小类的名称
+        List<PickList> pickListList = raiseCapitalService.newAllList();
+        if (null != pickListList) {
+            pickListList.forEach(k->{
+                if (k.getName().equals("三、设备")){
+                    k.getMdTheClassList().forEach(v->{
+                        v.getMdSmallClassList().forEach(na->{
+                            nameList.add(na.getName());
+                        });
+                    });
+                }
+            });
+        }
+
+        //生成序列号
+        int i = 1;
+        for (ProjectTypeVerificate s : list) {
+            s.setId(String.valueOf(i));
+            i++;
+            //根据项目储备id去在线开甲供材表中查询物理信息
+            List<String> materialNameList = service.getMaterialName(s.getProjectName());
+            if (null != nameList & null != materialNameList){
+                nameList.forEach(n->{
+                    if (materialNameList.contains(n)){
+                        s.setIncludeCapitalEquipment("是");
+                        s.setProjectProperties("资本");
+                    } else {
+                        s.setIncludeCapitalEquipment("否");
+                        s.setProjectProperties("成本");
+                    }
+                });
+            }
+        }
+
+        ReserveProcessProjectExportUtil util = ReserveProcessProjectExportUtil.getOne();
+        XSSFWorkbook workbook = util.getWorkbook("projectTypeVerificate");
+        util.exportVerificate(response,workbook,list);
+    }
+
+    /**
+     * 专职人员修改表单
+     * @param reserveManagement
+     * @return
+     */
+    @ResponseBody
+    @RequiresPermissions(value={"cg:reservemanagementcenter:projectTypeVerificate:edit"},logical=Logical.OR)
+    @RequestMapping(value = "update")
+    public AjaxJson update(ProjectTypeVerificate reserveManagement) {
+        AjaxJson j = new AjaxJson();
+        /**
+         * 后台hibernate-validation插件校验
+         */
+        String errMsg = beanValidator(reserveManagement);
+        if (StringUtils.isNotBlank(errMsg)){
+            j.setSuccess(false);
+            j.setMsg(errMsg);
+            return j;
+        }
+        //根据id去项目校核表中查是否有这个数据
+        ProjectTypeVerificate cityWork = service.getByProId(reserveManagement.getProjectReserveId());
+        if (null == cityWork){
+            //进行保存操作
+            cityWork = new ProjectTypeVerificate();
+            cityWork.setProjectReserveId(reserveManagement.getProjectReserveId());
+            cityWork.setProjectNature(reserveManagement.getProjectNature());
+            cityWork.setNewSubstation(reserveManagement.getNewSubstation());
+            cityWork.setProjectNatureArtificial(reserveManagement.getProjectNatureArtificial());
+            cityWork.setProjectType(reserveManagement.getProjectType());
+            cityWork.setIncludeCablesArtificial(reserveManagement.getIncludeCablesArtificial());
+            service.save(cityWork);
+        }else {
+            //新增或编辑表单保存
+            cityWork.setProjectReserveId(reserveManagement.getProjectReserveId());
+            cityWork.setProjectNature(reserveManagement.getProjectNature());
+            cityWork.setNewSubstation(reserveManagement.getNewSubstation());
+            cityWork.setProjectNatureArtificial(reserveManagement.getProjectNatureArtificial());
+            cityWork.setProjectType(reserveManagement.getProjectType());
+            cityWork.setIncludeCablesArtificial(reserveManagement.getIncludeCablesArtificial());
+            service.update(cityWork);
+        }
+        j.setSuccess(true);
+        j.setMsg("修改储备项目项目校核信息成功");
+        return j;
+    }
+
+    /**
+     * 导入Excel数据
+     * @param file
+     * @param response
+     * @param request
+     * @return
+     */
+    @ResponseBody
+    @RequiresPermissions("cg:reservemanagementcenter:projectTypeVerificate:import")
+    @RequestMapping(value = "import")
+    public AjaxJson importBasic(@RequestParam("file") MultipartFile file, HttpServletResponse response, HttpServletRequest request) {
+        AjaxJson j = new AjaxJson();
+        try {
+            ImportUtil importUtil = new ImportUtil(file, 0, 0);
+            //从数据库中查出所有的 项目储备编号
+            List<String> proIdList = service.getAllProId();
+
+            //从基本数据表中查出所有的 项目储备编号
+            List<String> proIdList2 = service.getAllProId2();
+
+            //获取导入表格所有数据
+            List<ProjectTypeVerificate> reserveManagementList = ReserveProcessProjectProUtil.getVerificateUtil(importUtil,proIdList,proIdList2);
+            //查询已有的参数数据 并分类返回已存在数据和未存在数据
+            Map map = service.getExistProjectList(reserveManagementList);
+            //未存在数据
+            List<ProjectTypeVerificate> withoutList = (List<ProjectTypeVerificate>) map.get("without");
+            //已存在数据
+            List<ProjectTypeVerificate> existList = (List<ProjectTypeVerificate>) map.get("exist");
+
+            //对未存在的数据进行批量导入
+            if(withoutList.size()>0){
+                service.insertList(withoutList);
+            }
+
+            //对已存在的数据进行修改
+            if(existList.size()>0){
+                for (ProjectTypeVerificate reserveManagement : existList) {
+                    service.update(reserveManagement);
+                }
+            }
+            int i = withoutList.size() + existList.size();
+            j.setMsg("已成功导入" + i + "条项目储备信息记录");
+
+        } catch (Exception e) {
+            j.setSuccess(false);
+            j.setMsg("导入项目储备信息失败！失败信息：" + e.getMessage());
+        }
+        return j;
+    }
+
+
+
+
+
+}

src/main/java/com/jeeplus/modules/cg/reservemanagementcenter/reserveManage/web/ReserveElectricityWorkController.java

@@ -5,11 +5,14 @@ import com.jeeplus.common.utils.StringUtils;
 import com.jeeplus.core.persistence.Page;
 import com.jeeplus.core.web.BaseController;
 import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.entity.ReserveElectricityWork;
+import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.service.ProjectTypeVerificateService;
 import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.service.ReserveElectricityWorkService;
 import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.utils.ReserveProcessProjectExportUtil;
 import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.utils.ReserveProcessProjectProUtil;
 import com.jeeplus.modules.cg.reservemanagementcenter.statisticalTable.entity.History;
 import com.jeeplus.modules.sg.managementcenter.materialproject.util.ImportUtil;
+import com.jeeplus.modules.sg.picking.activiti.entity.PickList;
+import com.jeeplus.modules.sg.raiseCapital.service.RaiseCapitalService;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.apache.shiro.authz.annotation.Logical;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -40,6 +43,12 @@ public class ReserveElectricityWorkController extends BaseController {
     @Autowired
     private ReserveElectricityWorkService workService;
 
+    @Autowired
+    private RaiseCapitalService raiseCapitalService;
+
+    @Autowired
+    private ProjectTypeVerificateService verificateService;
+
 
     @ModelAttribute
     public ReserveElectricityWork get(@RequestParam(required = false) String id) {
@@ -84,6 +93,22 @@ public class ReserveElectricityWorkController extends BaseController {
         Page<ReserveElectricityWork> page = workService.findPage(new Page<ReserveElectricityWork>(request, response), reserveManagement);
         List<ReserveElectricityWork> list = page.getList();
         List<ReserveElectricityWork> workList = new ArrayList<>();
+
+        //获取所有小类的名称
+        List<String> nameList = new ArrayList<>();
+        List<PickList> pickListList = raiseCapitalService.newAllList();
+        if (null != pickListList) {
+            pickListList.forEach(k->{
+                if (k.getName().equals("三、设备")){
+                    k.getMdTheClassList().forEach(v->{
+                        v.getMdSmallClassList().forEach(na->{
+                            nameList.add(na.getName());
+                        });
+                    });
+                }
+            });
+        }
+
         for (ReserveElectricityWork work : list) {
             //根据projectReserveId查出流程表的proc_ins_id
             String procInsId = workService.getByProjectReserveId(work.getProjectReserveId());
@@ -106,6 +131,21 @@ public class ReserveElectricityWorkController extends BaseController {
             }else {
                 work.setReserveProgress("");
             }
+
+            //根据项目储备id去在线开甲供材表中查询物理信息
+            List<String> materialNameList = verificateService.getMaterialName(work.getProjectName());
+            if (null != nameList & null != materialNameList){
+                nameList.forEach(n->{
+                    if (StringUtils.isBlank(work.getProjectNature())){
+                        if (materialNameList.contains(n)){
+                            work.setProjectNature("资本");
+                        } else {
+                            work.setProjectNature("成本");
+                        }
+                    }
+                });
+            }
+
             workList.add(work);
         }
         page.setList(workList);
@@ -261,6 +301,22 @@ public class ReserveElectricityWorkController extends BaseController {
         List<ReserveElectricityWork> list = workService.exportFindList(reserveManagement);
 
         List<ReserveElectricityWork> workList = new ArrayList<>();
+
+        //获取所有小类的名称
+        List<String> nameList = new ArrayList<>();
+        List<PickList> pickListList = raiseCapitalService.newAllList();
+        if (null != pickListList) {
+            pickListList.forEach(k->{
+                if (k.getName().equals("三、设备")){
+                    k.getMdTheClassList().forEach(v->{
+                        v.getMdSmallClassList().forEach(na->{
+                            nameList.add(na.getName());
+                        });
+                    });
+                }
+            });
+        }
+
         for (ReserveElectricityWork work : list) {
             //根据projectReserveId查出流程表的proc_ins_id
             String procInsId = workService.getByProjectReserveId(work.getProjectReserveId());
@@ -275,6 +331,21 @@ public class ReserveElectricityWorkController extends BaseController {
             }else {
                 work.setReserveProgress("");
             }
+
+            //根据项目储备id去在线开甲供材表中查询物理信息
+            List<String> materialNameList = verificateService.getMaterialName(work.getProjectName());
+            if (null != nameList & null != materialNameList){
+                nameList.forEach(n->{
+                    if (StringUtils.isBlank(work.getProjectNature())){
+                        if (materialNameList.contains(n)){
+                            work.setProjectNature("资本");
+                        } else {
+                            work.setProjectNature("成本");
+                        }
+                    }
+                });
+            }
+
             workList.add(work);
         }
 

src/main/java/com/jeeplus/modules/cg/reservemanagementcenter/reserveManage/web/ReservePreconstructController.java

@@ -5,6 +5,7 @@ import com.jeeplus.common.utils.StringUtils;
 import com.jeeplus.core.persistence.Page;
 import com.jeeplus.core.web.BaseController;
 import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.entity.ReservePreconstruction;
+import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.service.ProjectTypeVerificateService;
 import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.service.ReservePreconstructService;
 import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.utils.ReserveProcessProjectExportUtil;
 import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.utils.ReserveProcessProjectProUtil;
@@ -12,6 +13,8 @@ import com.jeeplus.modules.cg.reservemanagementcenter.statisticalTable.entity.Hi
 import com.jeeplus.modules.cg.reservemanagementcenter.statisticalTable.entity.MaterialData;
 import com.jeeplus.modules.cg.reservemanagementcenter.statisticalTable.service.EnginnerQueryService;
 import com.jeeplus.modules.sg.managementcenter.materialproject.util.ImportUtil;
+import com.jeeplus.modules.sg.picking.activiti.entity.PickList;
+import com.jeeplus.modules.sg.raiseCapital.service.RaiseCapitalService;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.apache.shiro.authz.annotation.Logical;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -45,6 +48,12 @@ public class ReservePreconstructController extends BaseController {
     @Autowired
     private EnginnerQueryService queryService;
 
+    @Autowired
+    private RaiseCapitalService raiseCapitalService;
+
+    @Autowired
+    private ProjectTypeVerificateService verificateService;
+
     @ModelAttribute
     public ReservePreconstruction get(@RequestParam(required = false) String id) {
         ReservePreconstruction entity = null;
@@ -88,6 +97,22 @@ public class ReservePreconstructController extends BaseController {
         Page<ReservePreconstruction> page = structService.findPage(new Page<ReservePreconstruction>(request, response), reserveManagement);
         List<ReservePreconstruction> list = page.getList();
         List<ReservePreconstruction> preList = new ArrayList<>();
+
+        //获取所有小类的名称
+        List<String> nameList = new ArrayList<>();
+        List<PickList> pickListList = raiseCapitalService.newAllList();
+        if (null != pickListList) {
+            pickListList.forEach(k->{
+                if (k.getName().equals("三、设备")){
+                    k.getMdTheClassList().forEach(v->{
+                        v.getMdSmallClassList().forEach(na->{
+                            nameList.add(na.getName());
+                        });
+                    });
+                }
+            });
+        }
+
         for (ReservePreconstruction pre : list) {
 
             //根据projectReserveId查出流程表的proc_ins_id
@@ -309,6 +334,20 @@ public class ReservePreconstructController extends BaseController {
                 pre.setDesignList(designList);
             }
 
+            //根据项目储备id去在线开甲供材表中查询物理信息
+            List<String> materialNameList = verificateService.getMaterialName(pre.getProjectName());
+            if (null != nameList & null != materialNameList){
+                nameList.forEach(n->{
+                    if (StringUtils.isBlank(pre.getProjectNature())){
+                        if (materialNameList.contains(n)){
+                            pre.setProjectNature("资本");
+                        } else {
+                            pre.setProjectNature("成本");
+                        }
+                    }
+                });
+            }
+
             preList.add(pre);
         }
 
@@ -451,6 +490,22 @@ public class ReservePreconstructController extends BaseController {
         List<ReservePreconstruction> list = structService.exportFindList(reserveManagement);
 
         List<ReservePreconstruction> preList = new ArrayList<>();
+
+        //获取所有小类的名称
+        List<String> nameList = new ArrayList<>();
+        List<PickList> pickListList = raiseCapitalService.newAllList();
+        if (null != pickListList) {
+            pickListList.forEach(k->{
+                if (k.getName().equals("三、设备")){
+                    k.getMdTheClassList().forEach(v->{
+                        v.getMdSmallClassList().forEach(na->{
+                            nameList.add(na.getName());
+                        });
+                    });
+                }
+            });
+        }
+
         for (ReservePreconstruction pre : list) {
 
             //根据projectReserveId查出流程表的proc_ins_id
@@ -664,7 +719,19 @@ public class ReservePreconstructController extends BaseController {
                 pre.setCastInPlaceList(castInPlaceList);
                 pre.setDesignList(designList);
             }
-
+            //根据项目储备id去在线开甲供材表中查询物理信息
+            List<String> materialNameList = verificateService.getMaterialName(pre.getProjectName());
+            if (null != nameList & null != materialNameList){
+                nameList.forEach(n->{
+                    if (StringUtils.isBlank(pre.getProjectNature())){
+                        if (materialNameList.contains(n)){
+                            pre.setProjectNature("资本");
+                        } else {
+                            pre.setProjectNature("成本");
+                        }
+                    }
+                });
+            }
 
             preList.add(pre);
         }

src/main/java/com/jeeplus/modules/cg/reservemanagementcenter/reserveManage/web/ReserveProcessProjectController.java

@@ -14,6 +14,8 @@ import com.jeeplus.modules.filing.basicInformation.entity.BasicInformation;
 import com.jeeplus.modules.sg.managementcenter.materialproject.util.ImportUtil;
 import com.jeeplus.modules.sg.managementcenter.reserveManagement.entity.ExportScheme;
 import com.jeeplus.modules.sg.managementcenter.reserveManagement.service.ReserveManagementService;
+import com.jeeplus.modules.sg.picking.activiti.entity.PickList;
+import com.jeeplus.modules.sg.raiseCapital.service.RaiseCapitalService;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.apache.shiro.authz.annotation.Logical;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -28,6 +30,7 @@ import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -61,6 +64,12 @@ public class ReserveProcessProjectController extends BaseController {
     @Autowired
     private CompanyReviewService reviewService;
 
+    @Autowired
+    private RaiseCapitalService raiseCapitalService;
+
+    @Autowired
+    private ProjectTypeVerificateService verificateService;
+
     @ModelAttribute
     public ReserveProcessProject get(@RequestParam(required = false) String id) {
         ReserveProcessProject entity = null;
@@ -115,6 +124,43 @@ public class ReserveProcessProjectController extends BaseController {
     public Map<String, Object> basicData(ReserveProcessProject reserveManagement, HttpServletRequest request, HttpServletResponse response, Model model) {
 
         Page<ReserveProcessProject> page = projectService.findPage(new Page<ReserveProcessProject>(request, response), reserveManagement);
+
+        List<ReserveProcessProject> list = page.getList();
+        List<ReserveProcessProject> projects = new ArrayList<>();
+
+
+        List<String> nameList = new ArrayList<>();
+        //获取所有小类的名称
+        List<PickList> pickListList = raiseCapitalService.newAllList();
+        if (null != pickListList) {
+            pickListList.forEach(k->{
+                if (k.getName().equals("三、设备")){
+                    k.getMdTheClassList().forEach(v->{
+                        v.getMdSmallClassList().forEach(na->{
+                            nameList.add(na.getName());
+                        });
+                    });
+                }
+            });
+        }
+
+        for (ReserveProcessProject processProject : list) {
+            //根据项目储备id去在线开甲供材表中查询物理信息
+            List<String> materialNameList = verificateService.getMaterialName(processProject.getProjectName());
+            if (null != nameList & null != materialNameList){
+                nameList.forEach(n->{
+                    if (StringUtils.isBlank(processProject.getProjectNature())){
+                        if (materialNameList.contains(n)){
+                            processProject.setProjectNature("资本");
+                        } else {
+                            processProject.setProjectNature("成本");
+                        }
+                    }
+                });
+            }
+            projects.add(processProject);
+        }
+        page.setList(projects);
         return getBootstrapData(page);
     }
 
@@ -419,11 +465,40 @@ public class ReserveProcessProjectController extends BaseController {
     @RequestMapping(value = "export")
     public void exportExcel(ReserveProcessProject reserveManagement, HttpServletRequest request, HttpServletResponse response) {
         List<ReserveProcessProject> list = projectService.exportFindList(reserveManagement);
+
+        List<String> nameList = new ArrayList<>();
+        //获取所有小类的名称
+        List<PickList> pickListList = raiseCapitalService.newAllList();
+        if (null != pickListList) {
+            pickListList.forEach(k->{
+                if (k.getName().equals("三、设备")){
+                    k.getMdTheClassList().forEach(v->{
+                        v.getMdSmallClassList().forEach(na->{
+                            nameList.add(na.getName());
+                        });
+                    });
+                }
+            });
+        }
+
         //生成序列号
         int i = 1;
         for (ReserveProcessProject s : list) {
             s.setId(String.valueOf(i));
             i++;
+            //根据项目储备id去在线开甲供材表中查询物理信息
+            List<String> materialNameList = verificateService.getMaterialName(s.getProjectName());
+            if (null != nameList & null != materialNameList){
+                nameList.forEach(n->{
+                    if (StringUtils.isBlank(s.getProjectNature())){
+                        if (materialNameList.contains(n)){
+                            s.setProjectNature("资本");
+                        } else {
+                            s.setProjectNature("成本");
+                        }
+                    }
+                });
+            }
         }
 
         ReserveProcessProjectExportUtil util = ReserveProcessProjectExportUtil.getOne();

src/main/java/com/jeeplus/modules/cg/reservemanagementcenter/reserveManage/web/ReserveSafeDisclosureController.java

@@ -5,11 +5,14 @@ import com.jeeplus.common.utils.StringUtils;
 import com.jeeplus.core.persistence.Page;
 import com.jeeplus.core.web.BaseController;
 import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.entity.ReserveSafety;
+import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.service.ProjectTypeVerificateService;
 import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.service.ReserveSafeDisclosureService;
 import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.utils.ReserveProcessProjectExportUtil;
 import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.utils.ReserveProcessProjectProUtil;
 import com.jeeplus.modules.cg.reservemanagementcenter.statisticalTable.entity.History;
 import com.jeeplus.modules.sg.managementcenter.materialproject.util.ImportUtil;
+import com.jeeplus.modules.sg.picking.activiti.entity.PickList;
+import com.jeeplus.modules.sg.raiseCapital.service.RaiseCapitalService;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.apache.shiro.authz.annotation.Logical;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -43,6 +46,12 @@ public class ReserveSafeDisclosureController extends BaseController {
     @Autowired
     private ReserveSafeDisclosureService safeService;
 
+    @Autowired
+    private RaiseCapitalService raiseCapitalService;
+
+    @Autowired
+    private ProjectTypeVerificateService verificateService;
+
 
     @ModelAttribute
     public ReserveSafety get(@RequestParam(required = false) String id) {
@@ -87,6 +96,22 @@ public class ReserveSafeDisclosureController extends BaseController {
         Page<ReserveSafety> page = safeService.findPage(new Page<ReserveSafety>(request, response), reserveManagement);
         List<ReserveSafety> list = page.getList();
         List<ReserveSafety> safetyList = new ArrayList<>();
+
+        //获取所有小类的名称
+        List<String> nameList = new ArrayList<>();
+        List<PickList> pickListList = raiseCapitalService.newAllList();
+        if (null != pickListList) {
+            pickListList.forEach(k->{
+                if (k.getName().equals("三、设备")){
+                    k.getMdTheClassList().forEach(v->{
+                        v.getMdSmallClassList().forEach(na->{
+                            nameList.add(na.getName());
+                        });
+                    });
+                }
+            });
+        }
+
         for (ReserveSafety safety : list){
             //根据projectReserveId查出流程表的proc_ins_id
             String procInsId = safeService.getByProjectReserveId(safety.getProjectReserveId());
@@ -101,6 +126,21 @@ public class ReserveSafeDisclosureController extends BaseController {
             }else {
                 safety.setReserveProgress("");
             }
+
+            //根据项目储备id去在线开甲供材表中查询物理信息
+            List<String> materialNameList = verificateService.getMaterialName(safety.getProjectName());
+            if (null != nameList & null != materialNameList){
+                nameList.forEach(n->{
+                    if (StringUtils.isBlank(safety.getProjectNature())){
+                        if (materialNameList.contains(n)){
+                            safety.setProjectNature("资本");
+                        } else {
+                            safety.setProjectNature("成本");
+                        }
+                    }
+                });
+            }
+
             safetyList.add(safety);
         }
         return getBootstrapData(page);
@@ -275,6 +315,22 @@ public class ReserveSafeDisclosureController extends BaseController {
         List<ReserveSafety> list = safeService.exportFindList(reserveManagement);
 
         List<ReserveSafety> safetyList = new ArrayList<>();
+
+        //获取所有小类的名称
+        List<String> nameList = new ArrayList<>();
+        List<PickList> pickListList = raiseCapitalService.newAllList();
+        if (null != pickListList) {
+            pickListList.forEach(k->{
+                if (k.getName().equals("三、设备")){
+                    k.getMdTheClassList().forEach(v->{
+                        v.getMdSmallClassList().forEach(na->{
+                            nameList.add(na.getName());
+                        });
+                    });
+                }
+            });
+        }
+
         for (ReserveSafety safety : list){
             //根据projectReserveId查出流程表的proc_ins_id
             String procInsId = safeService.getByProjectReserveId(safety.getProjectReserveId());
@@ -289,6 +345,21 @@ public class ReserveSafeDisclosureController extends BaseController {
             }else {
                 safety.setReserveProgress("");
             }
+
+            //根据项目储备id去在线开甲供材表中查询物理信息
+            List<String> materialNameList = verificateService.getMaterialName(safety.getProjectName());
+            if (null != nameList & null != materialNameList){
+                nameList.forEach(n->{
+                    if (StringUtils.isBlank(safety.getProjectNature())){
+                        if (materialNameList.contains(n)){
+                            safety.setProjectNature("资本");
+                        } else {
+                            safety.setProjectNature("成本");
+                        }
+                    }
+                });
+            }
+
             safetyList.add(safety);
         }
 

src/main/java/com/jeeplus/modules/cg/reservemanagementcenter/reserveManage/web/SummaryStatisticController.java

@@ -12,16 +12,15 @@ import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.entity.Compa
 import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.entity.ReserveProcessProject;
 import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.entity.ReserveSummary;
 import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.entity.ReserveSummaryProcess;
-import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.service.CompanyReviewService;
-import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.service.ReserveProcessProjectService;
-import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.service.ReserveSummaryProcessService;
-import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.service.SummaryStatisticService;
+import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.service.*;
 import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.utils.ReserveProcessProjectExportUtil;
 import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.utils.ReserveProcessProjectProUtil;
 import com.jeeplus.modules.cg.reservemanagementcenter.statisticalTable.entity.History;
 import com.jeeplus.modules.cg.reservemanagementcenter.statisticalTable.service.BudgetStatsService;
 import com.jeeplus.modules.sg.managementcenter.materialproject.util.ImportUtil;
 import com.jeeplus.modules.sg.managementcenter.reserveManagement.service.PersonnelTurnoverService;
+import com.jeeplus.modules.sg.picking.activiti.entity.PickList;
+import com.jeeplus.modules.sg.raiseCapital.service.RaiseCapitalService;
 import com.jeeplus.modules.sg.raiseCapitalDesign.entity.CableSectionData;
 import com.jeeplus.modules.sg.raiseCapitalDesign.entity.CableSectionInfo;
 import com.jeeplus.modules.sg.raiseCapitalDesign.entity.VoltageInfo;
@@ -83,6 +82,11 @@ public class SummaryStatisticController extends BaseController {
     @Autowired
     private RaiseCapitalDesignService raiseCapitalDesignService;
 
+    @Autowired
+    private RaiseCapitalService raiseCapitalService;
+
+    @Autowired
+    private ProjectTypeVerificateService verificateService;
 
     @ModelAttribute
     public ReserveSummary get(@RequestParam(required = false) String id) {
@@ -125,6 +129,22 @@ public class SummaryStatisticController extends BaseController {
         Page<ReserveSummary> page = statisticService.findPage(new Page<ReserveSummary>(request, response), reserveManagement);
         List<ReserveSummary> list = page.getList();
         List<ReserveSummary> summaryList = new ArrayList<>();
+
+        List<String> nameList = new ArrayList<>();
+        //获取所有小类的名称
+        List<PickList> pickListList = raiseCapitalService.newAllList();
+        if (null != pickListList) {
+            pickListList.forEach(k->{
+                if (k.getName().equals("三、设备")){
+                    k.getMdTheClassList().forEach(v->{
+                        v.getMdSmallClassList().forEach(na->{
+                            nameList.add(na.getName());
+                        });
+                    });
+                }
+            });
+        }
+
         for (ReserveSummary summary : list) {
 
             //设置  预算（含税）    预算（不含税）
@@ -158,6 +178,20 @@ public class SummaryStatisticController extends BaseController {
                 summary.setReserveProgress("");
             }
 
+            //根据项目储备id去在线开甲供材表中查询物理信息
+            List<String> materialNameList = verificateService.getMaterialName(summary.getProjectName());
+            if (null != nameList & null != materialNameList){
+                nameList.forEach(n->{
+                    if (StringUtils.isBlank(summary.getProjectNature())){
+                        if (materialNameList.contains(n)){
+                            summary.setProjectNature("资本");
+                        } else {
+                            summary.setProjectNature("成本");
+                        }
+                    }
+                });
+            }
+
             summaryList.add(summary);
         }
 
@@ -242,22 +276,8 @@ public class SummaryStatisticController extends BaseController {
             proId.setProgramChangeDescription(reserveManagement.getProgramChangeDescription());
             proId.setDiscloseRemarks(reserveManagement.getDiscloseRemarks());
             proId.setStartDesignOrNot(reserveManagement.getStartDesignOrNot());
-            proId.setDemandUnitPriority(reserveManagement.getDemandUnitPriority());
-            proId.setPreliminaryArrangement(reserveManagement.getPreliminaryArrangement());
-            proId.setInitialImplementBatch(reserveManagement.getInitialImplementBatch());
-            proId.setInitialImplementUnit(reserveManagement.getInitialImplementUnit());
-            proId.setProjectManagementCenter(reserveManagement.getProjectManagementCenter());
-            proId.setCompleteProgressUnit(reserveManagement.getCompleteProgressUnit());
-            proId.setProjectReservePlan(reserveManagement.getProjectReservePlan());
-            proId.setDemandUnitProgress(reserveManagement.getDemandUnitProgress());
-            proId.setDepartmentPlan(reserveManagement.getDepartmentPlan());
-            proId.setPlanRemarks(reserveManagement.getPlanRemarks());
-            proId.setDrawMapPath(reserveManagement.getDrawMapPath());
-            proId.setArrangementProject(reserveManagement.getArrangementProject());
-            proId.setImplementationBatch(reserveManagement.getImplementationBatch());
-            proId.setConstructionUnit(reserveManagement.getConstructionUnit());
-            proId.setDrawOfficeDrawn(reserveManagement.getDrawOfficeDrawn());
-            proId.setProjectInitiateRemarks(reserveManagement.getProjectInitiateRemarks());
+            proId.setCompleteDisclose(reserveManagement.getCompleteDisclose());
+            proId.setCompleteDiscloseTime(reserveManagement.getCompleteDiscloseTime());
             statisticService.save(proId);
         }else {
 //            BeanUtils.copyProperties(reserveManagement,proId);
@@ -273,23 +293,8 @@ public class SummaryStatisticController extends BaseController {
             proId.setProgramChangeDescription(reserveManagement.getProgramChangeDescription());
             proId.setDiscloseRemarks(reserveManagement.getDiscloseRemarks());
             proId.setStartDesignOrNot(reserveManagement.getStartDesignOrNot());
-            proId.setDemandUnitPriority(reserveManagement.getDemandUnitPriority());
-            proId.setPreliminaryArrangement(reserveManagement.getPreliminaryArrangement());
-            proId.setInitialImplementBatch(reserveManagement.getInitialImplementBatch());
-            proId.setInitialImplementUnit(reserveManagement.getInitialImplementUnit());
-            proId.setProjectManagementCenter(reserveManagement.getProjectManagementCenter());
-            proId.setCompleteProgressUnit(reserveManagement.getCompleteProgressUnit());
-            proId.setProjectReservePlan(reserveManagement.getProjectReservePlan());
-            proId.setDemandUnitProgress(reserveManagement.getDemandUnitProgress());
-            proId.setDepartmentPlan(reserveManagement.getDepartmentPlan());
-            proId.setPlanRemarks(reserveManagement.getPlanRemarks());
-            proId.setDrawMapPath(reserveManagement.getDrawMapPath());
-            proId.setArrangementProject(reserveManagement.getArrangementProject());
-            proId.setImplementationBatch(reserveManagement.getImplementationBatch());
-            proId.setConstructionUnit(reserveManagement.getConstructionUnit());
-            proId.setDrawOfficeDrawn(reserveManagement.getDrawOfficeDrawn());
-            proId.setProjectInitiateRemarks(reserveManagement.getProjectInitiateRemarks());
-            proId.setProjectInitiateRemarks(reserveManagement.getProjectInitiateRemarks());
+            proId.setCompleteDisclose(reserveManagement.getCompleteDisclose());
+            proId.setCompleteDiscloseTime(reserveManagement.getCompleteDiscloseTime());
             //修改时需要从  省公司评审表中查看是否可以发起流程
             CompanyReview review = new CompanyReview();
             review.setProjectReserveId(reserveManagement.getProjectReserveId());
@@ -305,7 +310,8 @@ public class SummaryStatisticController extends BaseController {
                 //去掉之前的流程，重新开始流程
                 reserveProcessService.deleteAct(reserveManagement.getProjectReserveId());
 
-                if (reserveManagement.getIncludeReserve().equals("是")){
+//                if (reserveManagement.getIncludeReserve().equals("是")){
+                if (reserveManagement.getStartDesignOrNot().equals("是")){
                     //发起流程
                     ReserveSummaryProcess reserveProcess = new ReserveSummaryProcess();
                     reserveProcess.preInsert();
@@ -330,7 +336,8 @@ public class SummaryStatisticController extends BaseController {
                 }
                 //新增或编辑表单保存
                 statisticService.update(proId);
-            }else if (companyReview.getPassProvincialCompanyReview().equals("取消") & reserveManagement.getIncludeReserve().equals("是")){
+//            }else if (companyReview.getPassProvincialCompanyReview().equals("取消") & reserveManagement.getIncludeReserve().equals("是")){
+            }else if (companyReview.getPassProvincialCompanyReview().equals("取消") & reserveManagement.getStartDesignOrNot().equals("是")){
                 j.setSuccess(false);
                 j.setMsg(reserveManagement.getProjectReserveId() + "项目未通过省公司评审，无法发起流程！");
                 return j;
@@ -345,7 +352,8 @@ public class SummaryStatisticController extends BaseController {
                 //去掉之前的流程，重新开始流程
                 reserveProcessService.deleteAct(reserveManagement.getProjectReserveId());
 
-                if (reserveManagement.getIncludeReserve().equals("是")){
+//                if (reserveManagement.getIncludeReserve().equals("是")){
+                if (reserveManagement.getStartDesignOrNot().equals("是")){
                     //发起流程
                     ReserveSummaryProcess reserveProcess = new ReserveSummaryProcess();
                     reserveProcess.preInsert();
@@ -447,7 +455,8 @@ public class SummaryStatisticController extends BaseController {
                     System.out.println("ReserveSummary：" + s);*/
                     statisticService.insert(s);
 
-                    if (s.getIncludeReserve().equals("是")){
+//                    if (s.getIncludeReserve().equals("是")){
+                    if (s.getStartDesignOrNot().equals("是")){
 
                         ReserveSummaryProcess reserveProcess = new ReserveSummaryProcess();
                         reserveProcess.preInsert();
@@ -480,7 +489,8 @@ public class SummaryStatisticController extends BaseController {
                     //去掉之前的流程，重新开始流程
                     reserveProcessService.deleteAct(reserveManagement.getProjectReserveId());
                     statisticService.update(reserveManagement);
-                    if (reserveManagement.getIncludeReserve().equals("是")){
+//                    if (reserveManagement.getIncludeReserve().equals("是")){
+                    if (reserveManagement.getStartDesignOrNot().equals("是")){
                         ReserveSummaryProcess reserveProcess = new ReserveSummaryProcess();
                         reserveProcess.preInsert();
                         reserveProcess.setProjectReserveId(reserveManagement.getProjectReserveId());
@@ -520,20 +530,23 @@ public class SummaryStatisticController extends BaseController {
         List<ReserveSummary> list = statisticService.exportFindList(reserveManagement);
 
         List<ReserveSummary> summaryList = new ArrayList<>();
-        for (ReserveSummary summary : list) {
 
-            //设置  预算（含税）    预算（不含税）
-//            if (StringUtils.isNotEmpty(summary.getAfterTrialEstimateAmount())){
-//                summary.setBudgetIncludesTax(summary.getAfterTrialEstimateAmount());
-//            }else {
-//                summary.setBudgetIncludesTax(summary.getPretrialEstimateAmount());
-//            }
-//
-//            if (StringUtils.isNotEmpty(summary.getAfterTrialEstimateAmountExcludeTax())){
-//                summary.setBudgetIncludesTax(summary.getAfterTrialEstimateAmountExcludeTax());
-//            }else {
-//                summary.setBudgetIncludesTax(summary.getPretrialEstimateAmountExcludeTax());
-//            }
+        List<String> nameList = new ArrayList<>();
+        //获取所有小类的名称
+        List<PickList> pickListList = raiseCapitalService.newAllList();
+        if (null != pickListList) {
+            pickListList.forEach(k->{
+                if (k.getName().equals("三、设备")){
+                    k.getMdTheClassList().forEach(v->{
+                        v.getMdSmallClassList().forEach(na->{
+                            nameList.add(na.getName());
+                        });
+                    });
+                }
+            });
+        }
+
+        for (ReserveSummary summary : list) {
 
             //根据projectReserveId查出流程表的proc_ins_id
             String procInsId = statisticService.getByProjectReserveId(summary.getProjectReserveId());
@@ -549,6 +562,20 @@ public class SummaryStatisticController extends BaseController {
                 summary.setReserveProgress("");
             }
 
+            //根据项目储备id去在线开甲供材表中查询物理信息
+            List<String> materialNameList = verificateService.getMaterialName(summary.getProjectName());
+            if (null != nameList & null != materialNameList){
+                nameList.forEach(n->{
+                    if (StringUtils.isBlank(summary.getProjectNature())){
+                        if (materialNameList.contains(n)){
+                            summary.setProjectNature("资本");
+                        } else {
+                            summary.setProjectNature("成本");
+                        }
+                    }
+                });
+            }
+
             summaryList.add(summary);
         }
 
@@ -603,11 +630,11 @@ public class SummaryStatisticController extends BaseController {
     @RequestMapping(value = "cableSectionForm")
     public String cableSectionForm(String uuid, Model model,String projectName,String projectReserveId) {
         List<CableSectionData> cableSectionData = raiseCapitalDesignService.getCableSectionData();
-        List<CableSectionInfo> cableFourHundredList = raiseCapitalDesignService.getCableSection(uuid + "cableFourHundred","cableFourHundred");
-        List<CableSectionInfo> cableHundredAndTwentyList = raiseCapitalDesignService.getCableSection(uuid + "cableHundredAndTwenty","cableHundredAndTwenty");
-        List<CableSectionInfo> cableThreeHundredList = raiseCapitalDesignService.getCableSection(uuid + "cableThreeHundred","cableThreeHundred");
-        List<CableSectionInfo> cableTwoHundredFortyList = raiseCapitalDesignService.getCableSection(uuid + "cableTwoHundredForty","cableTwoHundredForty");
-        List<CableSectionInfo> cableSeventyList = raiseCapitalDesignService.getCableSection(uuid + "cableSeventy","cableSeventy");
+        List<CableSectionInfo> cableFourHundredList = raiseCapitalDesignService.getCableSection(projectReserveId + "cableFourHundred","cableFourHundred");
+        List<CableSectionInfo> cableHundredAndTwentyList = raiseCapitalDesignService.getCableSection(projectReserveId + "cableHundredAndTwenty","cableHundredAndTwenty");
+        List<CableSectionInfo> cableThreeHundredList = raiseCapitalDesignService.getCableSection(projectReserveId + "cableThreeHundred","cableThreeHundred");
+        List<CableSectionInfo> cableTwoHundredFortyList = raiseCapitalDesignService.getCableSection(projectReserveId + "cableTwoHundredForty","cableTwoHundredForty");
+        List<CableSectionInfo> cableSeventyList = raiseCapitalDesignService.getCableSection(projectReserveId + "cableSeventy","cableSeventy");
         //获取电缆分段的系数
         String cableFactor = DictUtils.getDictLabel("cableFactor", "designCalculateCoefficient", "");
         model.addAttribute("cableFactor", cableFactor);

src/main/java/com/jeeplus/modules/cg/reservemanagementcenter/statisticalTable/mapper/xml/BudgetStatsMapper.xml

@@ -10,7 +10,6 @@
 		a.update_date AS "updateDate",
 		a.del_flag AS "delFlag",
 		a.projectYear,
-		a.projectNature,
 		a.demandUnit,
 		a.district,
 		a.projectGroup,
@@ -48,7 +47,8 @@
 		IFNULL(b.afterTrialDesignFee,"") as afterTrialDesignFee,
 		IFNULL(b.afterTrialSupervisionFee,"") as afterTrialSupervisionFee,
 		IFNULL(c.includeReserve,"") as implementPlan,
-		IFNULL(c.initialImplementBatch,"") as implementBatch
+		IFNULL(c.initialImplementBatch,"") as implementBatch,
+		tv.projectNatureArtificial AS projectNature
     </sql>
 
     <insert id="insert">
@@ -218,6 +218,7 @@
         on a.projectReserveId = b.projectReserveId
         left join cg_reserve_summary_statistics c
         on a.projectReserveId = c.projectReserveId
+        left join cg_project_type_verificate tv on a.projectReserveId = tv.projectReserveId
         <where>
             a.del_flag = 0
             <if test="projectReserveId!=null and projectReserveId!=''">
@@ -254,6 +255,7 @@
         on a.projectReserveId = b.projectReserveId
         left join cg_reserve_summary_statistics c
         on a.projectReserveId = c.projectReserveId
+        left join cg_project_type_verificate tv on a.projectReserveId = tv.projectReserveId
         where a.id = #{id}
     </select>
     <select id="selectCount" resultType="java.lang.Integer">
@@ -268,6 +270,7 @@
         on a.projectReserveId = b.projectReserveId
         left join cg_reserve_summary_statistics c
         on a.projectReserveId = c.projectReserveId
+        left join cg_project_type_verificate tv on a.projectReserveId = tv.projectReserveId
         <where>
             a.del_flag = 0
             <if test="projectReserveId!=null and projectReserveId!=''">

src/main/java/com/jeeplus/modules/cg/reservemanagementcenter/statisticalTable/mapper/xml/CableMapper.xml

@@ -10,7 +10,6 @@
 		a.update_date AS "updateDate",
 		a.del_flag AS "delFlag",
 		a.projectYear,
-		a.projectNature,
 		a.demandUnit,
 		a.district,
 		a.projectGroup,
@@ -36,8 +35,8 @@
         IFNULL(b.remarks,"") as remarks,
         IFNULL(b.cableTrenchBuild,"") as cableTrenchBuild,
         IFNULL(cgp.implementPlan,"") as implementPlan,
-        IFNULL(cgp.implementBatch,"") as implementBatch
-
+        IFNULL(cgp.implementBatch,"") as implementBatch,
+        tv.projectNatureArtificial AS projectNature
     </sql>
 
     <insert id="insert">
@@ -136,6 +135,7 @@
         on a.projectReserveId = b.projectReserveId
         left join cg_reserve_preliminary_preparations cgp
         on a.projectReserveId = cgp.projectReserveId
+        left join cg_project_type_verificate tv on a.projectReserveId = tv.projectReserveId
         <where>
             a.del_flag = 0
             <if test="projectReserveId!=null and projectReserveId!=''">
@@ -172,6 +172,7 @@
         on a.projectReserveId = b.projectReserveId
         left join cg_reserve_preliminary_preparations cgp
         on a.projectReserveId = cgp.projectReserveId
+        left join cg_project_type_verificate tv on a.projectReserveId = tv.projectReserveId
         where a.id = #{id}
     </select>
     <select id="exportFindList"
@@ -183,6 +184,7 @@
         on a.projectReserveId = b.projectReserveId
         left join cg_reserve_preliminary_preparations cgp
         on a.projectReserveId = cgp.projectReserveId
+        left join cg_project_type_verificate tv on a.projectReserveId = tv.projectReserveId
         <where>
             a.del_flag = 0
             <if test="projectReserveId!=null and projectReserveId!=''">

src/main/java/com/jeeplus/modules/cg/reservemanagementcenter/statisticalTable/mapper/xml/EnginnerQueryMapper.xml

@@ -4,7 +4,6 @@
 
     <sql id="reserveManagementColumns">
         b.projectYear,
-		b.projectNature,
 		b.demandUnit,
 		b.district,
 		b.projectGroup,
@@ -22,7 +21,8 @@
 		b.costEstimate,
 		b.basicRemarks,
 		IFNULL(c.includeReserve,"") as implementPlan,
-		IFNULL(c.initialImplementBatch,"") as implementBatch
+		IFNULL(c.initialImplementBatch,"") as implementBatch,
+		tv.projectNatureArtificial AS projectNature
     </sql>
 
     <select id="findList" resultType="com.jeeplus.modules.cg.reservemanagementcenter.statisticalTable.entity.EnginnerQuery">
@@ -31,6 +31,7 @@
         from cg_reserve_process b
         left join cg_reserve_summary_statistics c
         on b.projectReserveId = c.projectReserveId
+        left join cg_project_type_verificate tv on b.projectReserveId = tv.projectReserveId
         <where>
             b.del_flag = 0
             <if test="projectReserveId!=null and projectReserveId!=''">
@@ -59,6 +60,7 @@
         from cg_reserve_process b
         left join cg_reserve_summary_statistics c
         on b.projectReserveId = c.projectReserveId
+        left join cg_project_type_verificate tv on b.projectReserveId = tv.projectReserveId
         where b.id = #{id}
     </select>
 
@@ -69,6 +71,7 @@
         from cg_reserve_process b
         left join cg_reserve_summary_statistics c
         on b.projectReserveId = c.projectReserveId
+        left join cg_project_type_verificate tv on b.projectReserveId = tv.projectReserveId
         <where>
             b.del_flag = 0
             <if test="projectReserveId!=null and projectReserveId!=''">

src/main/java/com/jeeplus/modules/cg/reservemanagementcenter/statisticalTable/mapper/xml/NormativeAuditMapper.xml

@@ -4,7 +4,6 @@
 
     <sql id="reserveManagementColumns">
         a.projectYear,
-		a.projectNature,
 		a.demandUnit,
 		a.district,
 		a.projectGroup,
@@ -44,7 +43,8 @@
 		IFNULL(d.communicationProblem,"") as communicationProblem,
 		IFNULL(d.civilPrefabricateProblem,"") as civilPrefabricateProblem,
 		IFNULL(d.liveWorkNumProblem,"") as liveWorkNumProblem,
-		IFNULL(d.projectManagerOtherProblem,"") as projectManagerOtherProblem
+		IFNULL(d.projectManagerOtherProblem,"") as projectManagerOtherProblem,
+		tv.projectNatureArtificial AS projectNature
     </sql>
     <update id="updateDocumentInfo">
         update cg_document_info set
@@ -70,6 +70,7 @@
         on a.projectReserveId = c.projectReserveId
         left join cg_feedback_on_budget d
         on a.projectReserveId = d.projectReserveId
+        left join cg_project_type_verificate tv on a.projectReserveId = tv.projectReserveId
         <where>
             a.del_flag = 0
             <if test="projectReserveId!=null and projectReserveId!=''">
@@ -104,6 +105,7 @@
         on a.projectReserveId = c.projectReserveId
         left join cg_feedback_on_budget d
         on a.projectReserveId = d.projectReserveId
+        left join cg_project_type_verificate tv on a.projectReserveId = tv.projectReserveId
         <where>
             a.del_flag = 0
             <if test="projectReserveId!=null and projectReserveId!=''">
@@ -136,6 +138,7 @@
         on a.projectReserveId = c.projectReserveId
         left join cg_feedback_on_budget d
         on a.projectReserveId = d.projectReserveId
+        left join cg_project_type_verificate tv on a.projectReserveId = tv.projectReserveId
         where a.id = #{id}
     </select>
     <select id="getCountByProjectReserveId" resultType="java.lang.Integer">

src/main/java/com/jeeplus/modules/cg/reservemanagementcenter/statisticalTable/mapper/xml/ProgressStatsMapper.xml

@@ -10,7 +10,6 @@
 		a.update_date AS "updateDate",
 		a.del_flag AS "delFlag",
 		a.projectYear,
-		a.projectNature,
 		a.demandUnit,
 		a.district,
 		a.projectGroup,
@@ -46,7 +45,8 @@
         IFNULL(d.passProvincialCompanyReview,"") as passProvincialCompanyReview,
         IFNULL(d.reviewComments,"") as causeAnalysis,
         IFNULL(d.designChangeRequired,"") as designChange,
-        IFNULL(d.companyRemarks,"") as provincialCompanyRemarks
+        IFNULL(d.companyRemarks,"") as provincialCompanyRemarks,
+        tv.projectNatureArtificial AS projectNature
     </sql>
 
     <insert id="insertList">
@@ -106,6 +106,7 @@
         on a.projectReserveId = c.projectReserveId
         left join cg_reserve_company_review d
         on a.projectReserveId = d.projectReserveId
+        left join cg_project_type_verificate tv on a.projectReserveId = tv.projectReserveId
         <where>
             a.del_flag = 0
             <if test="projectReserveId!=null and projectReserveId!=''">
@@ -144,6 +145,7 @@
         on a.projectReserveId = c.projectReserveId
         left join cg_reserve_company_review d
         on a.projectReserveId = d.projectReserveId
+        left join cg_project_type_verificate tv on a.projectReserveId = tv.projectReserveId
         where a.id = #{id}
     </select>
     <select id="selectCount" resultType="java.lang.Integer">
@@ -160,6 +162,7 @@
         on a.projectReserveId = c.projectReserveId
         left join cg_reserve_company_review d
         on a.projectReserveId = d.projectReserveId
+        left join cg_project_type_verificate tv on a.projectReserveId = tv.projectReserveId
         <where>
             a.del_flag = 0
             <if test="projectReserveId!=null and projectReserveId!=''">

src/main/java/com/jeeplus/modules/cg/reservemanagementcenter/statisticalTable/mapper/xml/SpecialSupplyMapper.xml

@@ -4,7 +4,6 @@
 
     <sql id="reserveManagementColumns">
         b.projectYear,
-		b.projectNature,
 		b.demandUnit,
 		b.district,
 		b.projectGroup,
@@ -29,7 +28,8 @@
 		IFNULL(d.specialSizeA,"") as specialSizeA,
 		IFNULL(d.specialSizeB,"") as specialSizeB,
 		IFNULL(d.specialSizeC,"") as specialSizeC,
-		IFNULL(d.specialSizeD,"") as specialSizeD
+		IFNULL(d.specialSizeD,"") as specialSizeD,
+		tv.projectNatureArtificial AS projectNature
     </sql>
     <insert id="insertList">
         insert into cg_special_supply (
@@ -80,6 +80,7 @@
         on b.projectReserveId = c.projectReserveId
         left join cg_special_supply d
         on b.projectReserveId = d.projectReserveId
+        left join cg_project_type_verificate tv on b.projectReserveId = tv.projectReserveId
         <where>
             b.del_flag = 0
             <if test="projectReserveId!=null and projectReserveId!=''">
@@ -111,6 +112,7 @@
         on b.projectReserveId = c.projectReserveId
         left join cg_special_supply d
         on b.projectReserveId = d.projectReserveId
+        left join cg_project_type_verificate tv on b.projectReserveId = tv.projectReserveId
         <where>
             b.del_flag = 0
             <if test="projectReserveId!=null and projectReserveId!=''">
@@ -141,6 +143,7 @@
         on b.projectReserveId = c.projectReserveId
         left join cg_special_supply d
         on b.projectReserveId = d.projectReserveId
+        left join cg_project_type_verificate tv on b.projectReserveId = tv.projectReserveId
         where b.id = #{id}
     </select>
     <select id="getData" resultType="java.lang.Double">

src/main/java/com/jeeplus/modules/cg/reservemanagementcenter/statisticalTable/web/CableController.java

@@ -96,11 +96,11 @@ public class CableController extends BaseController {
         for (int i=0;i<list.size();i++){
             ca = list.get(i);
             String uuid = cableService.getRedisIdByProjectReserveId(ca.getProjectReserveId());
-            List<CableSectionInfo> cableFourHundredList = raiseCapitalDesignService.getCableSection(uuid + "cableFourHundred","cableFourHundred");
-            List<CableSectionInfo> cableHundredAndTwentyList = raiseCapitalDesignService.getCableSection(uuid + "cableHundredAndTwenty","cableHundredAndTwenty");
-            List<CableSectionInfo> cableThreeHundredList = raiseCapitalDesignService.getCableSection(uuid + "cableThreeHundred","cableThreeHundred");
-            List<CableSectionInfo> cableTwoHundredFortyList = raiseCapitalDesignService.getCableSection(uuid + "cableTwoHundredForty","cableTwoHundredForty");
-            List<CableSectionInfo> cableSeventyList = raiseCapitalDesignService.getCableSection(uuid + "cableSeventy","cableSeventy");
+            List<CableSectionInfo> cableFourHundredList = raiseCapitalDesignService.getCableSection(ca.getProjectReserveId() + "cableFourHundred","cableFourHundred");
+            List<CableSectionInfo> cableHundredAndTwentyList = raiseCapitalDesignService.getCableSection(ca.getProjectReserveId() + "cableHundredAndTwenty","cableHundredAndTwenty");
+            List<CableSectionInfo> cableThreeHundredList = raiseCapitalDesignService.getCableSection(ca.getProjectReserveId() + "cableThreeHundred","cableThreeHundred");
+            List<CableSectionInfo> cableTwoHundredFortyList = raiseCapitalDesignService.getCableSection(ca.getProjectReserveId() + "cableTwoHundredForty","cableTwoHundredForty");
+            List<CableSectionInfo> cableSeventyList = raiseCapitalDesignService.getCableSection(ca.getProjectReserveId() + "cableSeventy","cableSeventy");
             ca.setReserveProgress(statsService.getReserveProgress(ca.getProjectReserveId()));
 
             ca.setDestination("");
@@ -264,11 +264,11 @@ public class CableController extends BaseController {
         for (int i=0;i<list.size();i++){
             ca = list.get(i);
             String uuid = cableService.getRedisIdByProjectReserveId(ca.getProjectReserveId());
-            List<CableSectionInfo> cableFourHundredList = raiseCapitalDesignService.getCableSection(uuid + "cableFourHundred","cableFourHundred");
-            List<CableSectionInfo> cableHundredAndTwentyList = raiseCapitalDesignService.getCableSection(uuid + "cableHundredAndTwenty","cableHundredAndTwenty");
-            List<CableSectionInfo> cableThreeHundredList = raiseCapitalDesignService.getCableSection(uuid + "cableThreeHundred","cableThreeHundred");
-            List<CableSectionInfo> cableTwoHundredFortyList = raiseCapitalDesignService.getCableSection(uuid + "cableTwoHundredForty","cableTwoHundredForty");
-            List<CableSectionInfo> cableSeventyList = raiseCapitalDesignService.getCableSection(uuid + "cableSeventy","cableSeventy");
+            List<CableSectionInfo> cableFourHundredList = raiseCapitalDesignService.getCableSection(ca.getProjectReserveId() + "cableFourHundred","cableFourHundred");
+            List<CableSectionInfo> cableHundredAndTwentyList = raiseCapitalDesignService.getCableSection(ca.getProjectReserveId() + "cableHundredAndTwenty","cableHundredAndTwenty");
+            List<CableSectionInfo> cableThreeHundredList = raiseCapitalDesignService.getCableSection(ca.getProjectReserveId() + "cableThreeHundred","cableThreeHundred");
+            List<CableSectionInfo> cableTwoHundredFortyList = raiseCapitalDesignService.getCableSection(ca.getProjectReserveId() + "cableTwoHundredForty","cableTwoHundredForty");
+            List<CableSectionInfo> cableSeventyList = raiseCapitalDesignService.getCableSection(ca.getProjectReserveId() + "cableSeventy","cableSeventy");
 
             ca.setDestination("");
             ca.setPathLength("");

src/main/java/com/jeeplus/modules/sg/raiseCapitalDesign/service/RaiseCapitalDesignService.java

@@ -15,17 +15,11 @@ import com.jeeplus.modules.sg.picking.activiti.entity.*;
 import com.jeeplus.modules.sg.picking.activiti.mapper.PickIngMapper;
 import com.jeeplus.modules.sg.picking.activiti.mapper.ShowListMapper;
 import com.jeeplus.modules.sg.raiseCapital.entity.RaiseCapital;
-import com.jeeplus.modules.sg.raiseCapital.mapper.RaiseCapitalMapper;
-import com.jeeplus.modules.sg.raiseCapital.utils.RaiseExportUtil;
-import com.jeeplus.modules.sg.raiseCapital.utils.RaiseTemplate;
 import com.jeeplus.modules.sg.raiseCapitalDesign.entity.*;
 import com.jeeplus.modules.sg.raiseCapitalDesign.mapper.RaiseCapitalDesignMapper;
 import com.jeeplus.modules.sg.raiseCapitalDesign.utils.RaiseCapitalDesignExportUtil;
 import com.jeeplus.modules.sg.raiseCapitalDesign.utils.RaiseCapitalDesignTemplate;
-import com.jeeplus.modules.sys.entity.DictValue;
 import com.jeeplus.modules.sys.utils.UserUtils;
-import com.jeeplus.modules.test.one.dialog.mapper.Leave1Mapper;
-import io.swagger.models.auth.In;
 import net.oschina.j2cache.CacheChannel;
 import net.oschina.j2cache.J2Cache;
 import net.oschina.j2cache.redis.RedisCacheProvider;
@@ -34,7 +28,6 @@ import org.apache.poi.xssf.usermodel.XSSFFont;
 import org.apache.poi.xssf.usermodel.XSSFSheet;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.method.P;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import redis.clients.jedis.BinaryJedisCommands;
@@ -644,6 +637,47 @@ public class RaiseCapitalDesignService extends CrudService<RaiseCapitalDesignMap
 
 
 	}
+
+	/**
+	 * 电缆分段计算处理（在线）
+	 * @param cableSectionData
+	 */
+	@Transactional(readOnly = false)
+	public void saveCableOnline(CableSectionData cableSectionData,String projectReserveId) {
+		List<DisposeCableData> dataList = this.CableDataList(cableSectionData);
+		List<CableSectionInfo> cableFourHundredList=cableSectionData.getCableFourHundredList();
+		List<CableSectionInfo> cableHundredAndTwentyList=cableSectionData.getCableHundredAndTwentyList();
+		List<CableSectionInfo> cableThreeHundredList=cableSectionData.getCableThreeHundredList();
+		List<CableSectionInfo> cableTwoHundredFortyList=cableSectionData.getCableTwoHundredFortyList();
+		List<CableSectionInfo> cableSeventyList=cableSectionData.getCableSeventyList();
+		String cableDisposeDataJson = JSON.toJSONString(dataList);
+		String cableFourHundredListJson = JSON.toJSONString(cableFourHundredList);
+		String cableHundredAndTwentyListJson = JSON.toJSONString(cableHundredAndTwentyList);
+		String cableThreeHundredListJson = JSON.toJSONString(cableThreeHundredList);
+		String cableTwoHundredFortyListJson = JSON.toJSONString(cableTwoHundredFortyList);
+		String cableSeventyListJson = JSON.toJSONString(cableSeventyList);
+		CacheChannel channel = J2Cache.getChannel();
+		RedisClient client = ((RedisCacheProvider)channel.getL2Provider()).getRedisClient();
+		try {
+			BinaryJedisCommands binaryJedisCommands = client.get();
+			binaryJedisCommands.set((projectReserveId+"cableDisposeData").getBytes(),cableDisposeDataJson.getBytes());
+			binaryJedisCommands.set((projectReserveId+"cableFourHundred").getBytes(),cableFourHundredListJson.getBytes());
+			binaryJedisCommands.set((projectReserveId+"cableHundredAndTwenty").getBytes(),cableHundredAndTwentyListJson.getBytes());
+			binaryJedisCommands.set((projectReserveId+"cableThreeHundred").getBytes(),cableThreeHundredListJson.getBytes());
+			binaryJedisCommands.set((projectReserveId+"cableTwoHundredForty").getBytes(),cableTwoHundredFortyListJson.getBytes());
+			binaryJedisCommands.set((projectReserveId+"cableSeventy").getBytes(),cableSeventyListJson.getBytes());
+			binaryJedisCommands.expire((projectReserveId+"cableDisposeData").getBytes(),86400);
+			binaryJedisCommands.expire((projectReserveId+"cableFourHundred").getBytes(),86400);
+			binaryJedisCommands.expire((projectReserveId+"cableHundredAndTwenty").getBytes(),86400);
+			binaryJedisCommands.expire((projectReserveId+"cableThreeHundred").getBytes(),86400);
+			binaryJedisCommands.expire((projectReserveId+"cableTwoHundredForty").getBytes(),86400);
+			binaryJedisCommands.expire((projectReserveId+"cableSeventy").getBytes(),86400);
+		}finally {
+			client.release();
+		}
+
+
+	}
 	/**
 	 * 拆旧材料清单计算处理
 	 * @param inventoryData

src/main/java/com/jeeplus/modules/sg/raiseCapitalDesign/web/RaiseCapitalDesignController.java

@@ -3,10 +3,8 @@
  */
 package com.jeeplus.modules.sg.raiseCapitalDesign.web;
 
-import com.alibaba.fastjson.JSON;
 import com.google.common.collect.Lists;
 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;
@@ -14,13 +12,9 @@ import com.jeeplus.core.persistence.Page;
 import com.jeeplus.core.web.BaseController;
 import com.jeeplus.modules.sg.financial.erpcredit.util.Result;
 import com.jeeplus.modules.sg.financial.erpcredit.util.SerializeUtil;
-import com.jeeplus.modules.sg.picking.activiti.entity.PickIng;
 import com.jeeplus.modules.sg.picking.activiti.entity.PickList;
 import com.jeeplus.modules.sg.picking.activiti.entity.ShowList;
-import com.jeeplus.modules.sg.picking.activiti.service.PickIngService;
-import com.jeeplus.modules.sg.picking.activiti.service.ShowListService;
 import com.jeeplus.modules.sg.raiseCapital.entity.RaiseCapital;
-import com.jeeplus.modules.sg.raiseCapital.service.RaiseCapitalService;
 import com.jeeplus.modules.sg.raiseCapitalDesign.entity.*;
 import com.jeeplus.modules.sg.raiseCapitalDesign.service.RaiseCapitalDesignService;
 import com.jeeplus.modules.sys.utils.DictUtils;
@@ -29,7 +23,6 @@ import net.oschina.j2cache.CacheChannel;
 import net.oschina.j2cache.J2Cache;
 import net.oschina.j2cache.redis.RedisCacheProvider;
 import net.oschina.j2cache.redis.RedisClient;
-import net.oschina.j2cache.redis.RedisUtils;
 import org.apache.shiro.authz.annotation.Logical;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -41,14 +34,10 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.multipart.MultipartFile;
 import redis.clients.jedis.BinaryJedisCommands;
-import redis.clients.jedis.Jedis;
 
-import javax.json.Json;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
 import javax.validation.ConstraintViolationException;
-import java.math.BigDecimal;
 import java.util.*;
 
 /**
@@ -242,6 +231,28 @@ public class RaiseCapitalDesignController extends BaseController {
 		return j;
 	}
 	/**
+	 * 电缆分段计算处理（在线）
+	 */
+	@ResponseBody
+	@RequestMapping(value = "saveCableOnline")
+	public AjaxJson saveCableOnline(CableSectionData cableSectionData, Model model,String projectReserveId) throws Exception{
+		AjaxJson j = new AjaxJson();
+		/**
+		 * 后台hibernate-validation插件校验
+		 */
+		String errMsg = beanValidator(cableSectionData);
+		if (StringUtils.isNotBlank(errMsg)){
+			j.setSuccess(false);
+			j.setMsg(errMsg);
+			return j;
+		}
+		//新增或编辑表单保存
+		raiseCapitalDesignService.saveCableOnline(cableSectionData,projectReserveId);//处理
+		j.setSuccess(true);
+		j.setMsg("处理完成");
+		return j;
+	}
+	/**
 	 * 电缆分段计算处理
 	 */
 	@ResponseBody

src/main/webapp/webpage/modules/bpm/task/todo/taskTodoList.js

@@ -123,7 +123,6 @@ $(document).ready(function() {
                                if(row['task.executionId'] == undefined || row['task.executionId'] == ""){
                        	  			arra.push( '<a href="${ctx}/act/task/deleteTask?taskId='+row['task.id']+'&reason=" onclick="return jp.prompt(\'删除原因\',this.href);">【删除任务】</a>')
                                };
-
                            </shiro:hasPermission>
                            arra.push('<a  href="javascript:jp.openViewDialog(\'跟踪\',\'${ctx}/act/task/trace/photo/'+row['task.processDefinitionId']+'/'+row['task.executionId']+'\',\'1000px\', \'600px\')">【跟踪】</a>');
 
@@ -177,6 +176,19 @@ $(document).ready(function() {
 
 	});
 
+function confirmDeleteReason() {
+	var deleteReason = prompt("请输入删除原因：");
+	if (deleteReason) {
+		// 在这里将删除原因拼接到链接中，并返回true继续执行链接跳转
+		var link = document.querySelector("a[href*='/act/task/deleteTask']");
+		link.href = link.href + encodeURIComponent(deleteReason);
+		return true;
+	} else {
+		// 如果未输入删除原因，则返回false取消链接跳转
+		return false;
+	}
+}
+
   function getIdSelections() {
         return $.map($("#actTable").bootstrapTable('getSelections'), function (row) {
             return row.id

src/main/webapp/webpage/modules/cg/reservemanagementcenter/raiseCapital/cableSectionForm.jsp

@@ -86,12 +86,13 @@
 
 		function save() {
 			var isValidate = jp.validateForm('#inputForm');//校验表单
+			var projectReserveId = $("#projectReserveId").val();
 			if(!isValidate){
 				return false;
 			}else{
 				var uuid = $("#uuid").val();
 				jp.loading();
-				jp.post("${ctx}/raiseCapitalDesign/saveCable",$('#inputForm').serialize(),function(data){
+				jp.post("${ctx}/raiseCapitalDesign/saveCableOnline?projectReserveId=" + projectReserveId,$('#inputForm').serialize(),function(data){
 					if(data.success){
 						jp.getParent().refresh();
 						jp.getParent().testSay(uuid);

src/main/webapp/webpage/modules/cg/reservemanagementcenter/raiseCapital/raiseCapital.js

@@ -438,8 +438,9 @@ function aerialConductor(){
 
 function cableSection(){
     var pickUuid = $("#pickUuid").val();
+    var projectReserveId = $("#projectReserveId").val();
     console.log(pickUuid);
-    jp.openSaveDialog('新增领料信息', "${ctx}/cg/reservemanagementcenter/summaryStatistics/cableSectionForm?uuid="+pickUuid, '80%', '80%');
+    jp.openSaveDialog('新增领料信息', "${ctx}/cg/reservemanagementcenter/summaryStatistics/cableSectionForm?uuid="+pickUuid+"&projectReserveId="+projectReserveId, '80%', '80%');
 }
 
 

src/main/webapp/webpage/modules/cg/reservemanagementcenter/reserveManage/companyReview/companyReviewForm.jsp

@@ -69,16 +69,20 @@
 			<td class="width-35">
 				<form:input path="demandUnit" htmlEscape="false"    class="form-control" readonly="true"/>
 			</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" readonly="true"/>
 			</td>
+		</tr>
+		<tr>
 			<td class="width-15 active"><label class="">项目分组：</label></td>
 			<td class="width-35">
 				<form:input path="projectGroup" htmlEscape="false"    class="form-control" readonly="true"/>
 			</td>
+			<td class="width-15 active"><label class="">项目经理：</label></td>
+			<td class="width-35">
+				<form:input path="projectManager" htmlEscape="false"  readonly="true"  class="form-control" />
+			</td>
 		</tr>
 		<tr>
 			<td class="width-15 active"><label class="">储备批次：</label></td>
@@ -136,15 +140,15 @@
 			<td class="width-35">
 				<form:input path="requirementType" htmlEscape="false" class="form-control" readonly="true"/>
 			</td>
-			<td class="width-15 active"><label class="">费用估算：</label></td>
+			<td class="width-15 active"><label class="">项目类型：</label></td>
 			<td class="width-35">
-				<form:input path="costEstimate" htmlEscape="false" class="form-control number money" readonly="true"/>
+				<form:input path="projectType" htmlEscape="false" class="form-control" readonly="true"/>
 			</td>
 		</tr>
 		<tr>
-			<td class="width-15 active"><label class="">备注：</label></td>
+			<td class="width-15 active"><label class="">费用估算：</label></td>
 			<td class="width-35">
-				<form:textarea path="basicRemarks" htmlEscape="false" rows="3" maxlength="200" class="form-control" readonly="true"/>
+				<form:input path="costEstimate" htmlEscape="false" class="form-control number money" readonly="true"/>
 			</td>
 		</tr>
 		<tr>

src/main/webapp/webpage/modules/cg/reservemanagementcenter/reserveManage/companyReview/companyReviewInfo.js

@@ -81,7 +81,7 @@ $(document).ready(function () {
             [
                 [
                     {checkbox:true,width: 36},
-                    {"title":"储备项目基本信息","colspan":18,"halign":"center","align": "center",width: "3600px"},
+                    {"title":"储备项目基本信息","colspan":19,"halign":"center","align": "center",width: "3800px"},
                     {"title":"省公司评审","colspan":6,"halign":"center","align": "center",width: "1200px"}
                 ],
                     [
@@ -91,6 +91,7 @@ $(document).ready(function () {
                         { field: 'demandUnit', title: "需求单位", valign:"middle", align:"center", colspan: 1 },
                         { field: 'district', title: "区域", valign:"middle", align:"center", colspan: 1 },
                         { field: 'projectGroup', title: "项目分组", valign:"middle", align:"center", colspan: 1 },
+                        { field: 'projectManager', title: "项目经理", valign:"middle", align:"center", colspan: 1 },
                         { field: 'reserveBatches', title: "储备批次", valign:"middle", align:"center", colspan: 1 },
                         { field: 'blockSupply', title: "供电区域", valign:"middle", align:"center", colspan: 1 },
                         { field: 'gridNumber', title: "网格编号", valign:"middle", align:"center", colspan: 1 },
@@ -110,14 +111,14 @@ $(document).ready(function () {
                             </c:otherwise>
                                 </c:choose>
                             }},
-                        { field: 'projectName', title: "项目名称", valign:"middle", align:"center", colspan: 1,formatter:paramsMatter},
+                        { field: 'projectName', title: "储备项目名称", valign:"middle", align:"center", colspan: 1,formatter:paramsMatter},
                         { field: 'constructionNecessityAndContent', title: "建设必要性及内容", valign:"middle", align:"center", colspan: 1,formatter:paramsMatter},
                         { field: 'substationName', title: "变电站名称", valign:"middle", align:"center", colspan: 1 },
                         { field: 'circuitName', title: "线路名称", valign:"middle", align:"center", colspan: 1 },
                         { field: 'netRackProjectDivide', title: "网架项目划分", valign:"middle", align:"center", colspan: 1 },
                         { field: 'requirementType', title: "需求类型", valign:"middle", align:"center", colspan: 1 },
+                        { field: 'projectType', title: "项目类型", valign:"middle", align:"center", colspan: 1 },
                         { field: 'costEstimate', title: "费用估算", valign:"middle", align:"center", colspan: 1 },
-                        { field: 'basicRemarks', title: "备注", valign:"middle", align:"center", colspan: 1 ,formatter:paramsMatter},
 
                         { field: 'joinProvincialCompanyReview', title: "是否参加省公司评审", valign:"middle", align:"center", colspan: 1 },
                         { field: 'batchOfProvincialCompany', title: "省公司评审批次/日期", valign:"middle", align:"center", colspan: 1 },

src/main/webapp/webpage/modules/cg/reservemanagementcenter/reserveManage/companyReview/companyReviewModifyByzz.jsp

@@ -67,16 +67,20 @@
 			<td class="width-35">
 				<form:input path="demandUnit" htmlEscape="false"    class="form-control" readonly="true"/>
 			</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" readonly="true"/>
 			</td>
+		</tr>
+		<tr>
 			<td class="width-15 active"><label class="">项目分组：</label></td>
 			<td class="width-35">
 				<form:input path="projectGroup" htmlEscape="false"    class="form-control" readonly="true"/>
 			</td>
+			<td class="width-15 active"><label class="">项目经理：</label></td>
+			<td class="width-35">
+				<form:input path="projectManager" htmlEscape="false"  readonly="true"  class="form-control" />
+			</td>
 		</tr>
 		<tr>
 			<td class="width-15 active"><label class="">储备批次：</label></td>
@@ -134,15 +138,15 @@
 			<td class="width-35">
 				<form:input path="requirementType" htmlEscape="false" class="form-control" readonly="true"/>
 			</td>
-			<td class="width-15 active"><label class="">费用估算：</label></td>
+			<td class="width-15 active"><label class="">项目类型：</label></td>
 			<td class="width-35">
-				<form:input path="costEstimate" htmlEscape="false" class="form-control number money" readonly="true"/>
+				<form:input path="projectType" htmlEscape="false" class="form-control" readonly="true"/>
 			</td>
 		</tr>
 		<tr>
-			<td class="width-15 active"><label class="">备注：</label></td>
+			<td class="width-15 active"><label class="">费用估算：</label></td>
 			<td class="width-35">
-				<form:textarea path="basicRemarks" htmlEscape="false" rows="3" maxlength="200" class="form-control" readonly="true"/>
+				<form:input path="costEstimate" htmlEscape="false" class="form-control number money" readonly="true"/>
 			</td>
 		</tr>
 		<tr>

src/main/webapp/webpage/modules/cg/reservemanagementcenter/reserveManage/companyReview/companyReviewView.jsp

@@ -56,16 +56,20 @@
 			<td class="width-35">
 				<form:input path="demandUnit" htmlEscape="false"  readonly="true"  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"  readonly="true"  class="form-control" />
 			</td>
+		</tr>
+		<tr>
 			<td class="width-15 active"><label class="">项目分组：</label></td>
 			<td class="width-35">
 				<form:input path="projectGroup" htmlEscape="false"  readonly="true"  class="form-control" />
 			</td>
+			<td class="width-15 active"><label class="">项目经理：</label></td>
+			<td class="width-35">
+				<form:input path="projectManager" htmlEscape="false"  readonly="true"  class="form-control" />
+			</td>
 		</tr>
 		<tr>
 			<td class="width-15 active"><label class="">储备批次：</label></td>
@@ -123,15 +127,15 @@
 			<td class="width-35">
 				<form:input path="requirementType" htmlEscape="false" readonly="true" class="form-control" />
 			</td>
-			<td class="width-15 active"><label class="">费用估算：</label></td>
+			<td class="width-15 active"><label class="">项目类型：</label></td>
 			<td class="width-35">
-				<form:input path="costEstimate" htmlEscape="false" readonly="true" class="form-control number money" />
+				<form:input path="projectType" htmlEscape="false" class="form-control" readonly="true"/>
 			</td>
 		</tr>
 		<tr>
-			<td class="width-15 active"><label class="">备注：</label></td>
+			<td class="width-15 active"><label class="">费用估算：</label></td>
 			<td class="width-35">
-				<form:textarea path="basicRemarks" htmlEscape="false" readonly="true" rows="3" maxlength="200" class="form-control" />
+				<form:input path="costEstimate" htmlEscape="false" class="form-control number money" readonly="true"/>
 			</td>
 		</tr>
 		<tr>

src/main/webapp/webpage/modules/cg/reservemanagementcenter/reserveManage/projectScreen/projectScreenByzz.jsp

@@ -0,0 +1,372 @@
+<%@ 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 review = $("#passProvincialCompanyReview").val();
+			//
+			// if (null==review||""==review){
+			// 	jp.error("请填写是否通过省公司评审！");
+			// }
+
+			var isValidate = jp.validateForm('#inputForm');//校验表单
+			if(!isValidate){
+				return false;
+			}else{
+				jp.loading();
+				jp.post("${ctx}/cg/reservemanagementcenter/projectScreen/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="verificate" 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="projectManager" readonly="true" htmlEscape="false" class="form-control" />
+			</td>
+			<td class="width-15 active"><label class="">项目年份：</label></td>
+			<td class="width-35">
+				<form:input path="projectYear" readonly="true" htmlEscape="false" class="form-control" />
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">项目性质：</label></td>
+			<td class="width-35">
+				<form:input path="projectNature" htmlEscape="false"  readonly="true"  class="form-control" />
+			</td>
+			<td class="width-15 active"><label class="">需求单位：</label></td>
+			<td class="width-35">
+				<form:input path="demandUnit" htmlEscape="false"  readonly="true"  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"  readonly="true"  class="form-control" />
+			</td>
+			<td class="width-15 active"><label class="">项目分组：</label></td>
+			<td class="width-35">
+				<form:input path="projectGroup" htmlEscape="false"  readonly="true"  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" readonly="true"   class="form-control" />
+			</td>
+			<td class="width-15 active"><label class="">供电区域：</label></td>
+			<td class="width-35">
+				<form:input path="blockSupply" htmlEscape="false"  readonly="true"  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"  readonly="true"  class="form-control" />
+			</td>
+			<td class="width-15 active"><label class="">单元格编号：</label></td>
+			<td class="width-35">
+				<form:input path="cellNumber" htmlEscape="false"  readonly="true"  class="form-control" />
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">项目储备编号：</label></td>
+			<td class="width-35">
+				<form:input path="projectReserveId" htmlEscape="false"  readonly="true"  class="form-control required"/>
+			</td>
+			<td class="width-15 active"><label class="">储备项目名称：</label></td>
+			<td class="width-35">
+				<form:input path="projectName" htmlEscape="false"  readonly="true"  class="form-control required" />
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">国网项目编码：</label></td>
+			<td class="width-35">
+				<form:input path="stateGridProjectCode" htmlEscape="false"  readonly="true"  class="form-control" />
+			</td>
+			<td class="width-15 active"><label class="">国网项目名称：</label></td>
+			<td class="width-35">
+				<form:input path="stateGridProjectName" htmlEscape="false"  readonly="true"  class="form-control" />
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">建设必要性及内容：</label></td>
+			<td class="width-35">
+				<form:input path="constructionNecessityAndContent" htmlEscape="false"  readonly="true"  class="form-control" />
+			</td>
+			<td class="width-15 active"><label class="">变电站名称：</label></td>
+			<td class="width-35">
+				<form:input path="substationName" htmlEscape="false"  readonly="true"  class="form-control" />
+			</td>
+		</tr>
+
+		<tr>
+			<td class="width-15 active"><label class="">线路名称：</label></td>
+			<td class="width-35">
+				<form:input path="circuitName" htmlEscape="false" readonly="true" class="form-control" />
+			</td>
+			<td class="width-15 active"><label class="">网架项目划分：</label></td>
+			<td class="width-35">
+				<form:input path="netRackProjectDivide" htmlEscape="false"  readonly="true"  class="form-control" />
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">需求类型：</label></td>
+			<td class="width-35">
+				<form:input path="requirementType" htmlEscape="false" readonly="true" class="form-control" />
+			</td>
+			<td class="width-15 active"><label class="">项目类型：</label></td>
+			<td class="width-35">
+				<form:input path="projectType" htmlEscape="false" readonly="true" 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" readonly="true" class="form-control number money" />
+			</td>
+			<td class="width-15 active"><label class="">备注：</label></td>
+			<td class="width-35">
+				<form:textarea path="basicRemarks" htmlEscape="false" readonly="true" 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">
+				<form:input path="reserveProgress" htmlEscape="false" readonly="true" rows="3" maxlength="200" class="form-control" />
+			</td>
+			<td class="width-15 active"><label class="">是否纳入储备：</label></td>
+			<td class="width-35">
+				<form:input path="implementReserve" htmlEscape="false" readonly="true" rows="3" maxlength="200" 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" readonly="true" 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">
+				<form:input path="civilWorkload" htmlEscape="false" readonly="true" rows="3" maxlength="200" class="form-control" />
+			</td>
+			<td class="width-15 active"><label class="">土建工作量统计：</label></td>
+			<td class="width-35">
+				<form:input path="civilWorkloadStatistics" htmlEscape="false" readonly="true" rows="3" maxlength="200" class="form-control" />
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">是否含立杆工作量：</label></td>
+			<td class="width-35">
+				<form:input path="uprightPoleWorkload" htmlEscape="false" readonly="true" rows="3" maxlength="200" class="form-control" />
+			</td>
+			<td class="width-15 active"><label class="">立杆工作量统计：</label></td>
+			<td class="width-35">
+				<form:input path="uprightPoleWorkloadStatistics" htmlEscape="false" readonly="true" rows="3" maxlength="200" class="form-control" />
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">预算（含税）：</label></td>
+			<td class="width-35">
+				<form:input path="budgetIncludesTax" htmlEscape="false" readonly="true" rows="3" maxlength="200" class="form-control" />
+			</td>
+			<td class="width-15 active"><label class="">预算（不含税）：</label></td>
+			<td class="width-35">
+				<form:input path="budgetNotIncludesTax" htmlEscape="false" readonly="true" rows="3" maxlength="200" class="form-control" />
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">施工费（不含税）：</label></td>
+			<td class="width-35">
+				<form:input path="constructCostExcludeTax" htmlEscape="false" readonly="true" rows="3" maxlength="200" class="form-control" />
+			</td>
+			<td class="width-15 active"><label class="">备注：</label></td>
+			<td class="width-35">
+				<form:input path="projectQuantityRemarks" htmlEscape="false" readonly="true" 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">
+				<form:input path="comprehensiveProject" htmlEscape="false" readonly="true" rows="3" maxlength="200" class="form-control" />
+			</td>
+			<td class="width-15 active"><label class="">政处难度：</label></td>
+			<td class="width-35">
+				<form:input path="officeDifficulty" htmlEscape="false" readonly="true" rows="3" maxlength="200" class="form-control" />
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">政处描述：</label></td>
+			<td class="width-35">
+				<form:input path="officeProgress" htmlEscape="false" readonly="true" rows="3" maxlength="200" class="form-control" />
+			</td>
+			<td class="width-15 active"><label class="">停电难度：</label></td>
+			<td class="width-35">
+				<form:input path="powerFailureDifficulty" htmlEscape="false" readonly="true" rows="3" maxlength="200" class="form-control" />
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">停电描述：</label></td>
+			<td class="width-35">
+				<form:input path="powerFailureDescribe" htmlEscape="false" readonly="true" rows="3" maxlength="200" class="form-control" />
+			</td>
+			<td class="width-15 active"><label class="">其他问题难度：</label></td>
+			<td class="width-35">
+				<form:input path="otherProblemDifficulty" htmlEscape="false" readonly="true" rows="3" maxlength="200" class="form-control" />
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">其他问题描述：</label></td>
+			<td class="width-35">
+				<form:input path="otherProblemDescribe" htmlEscape="false" readonly="true" rows="3" maxlength="200" class="form-control" />
+			</td>
+			<td class="width-15 active"><label class="">是否需重跑方案：</label></td>
+			<td class="width-35">
+				<form:input path="runPlanRequire" htmlEscape="false" readonly="true" rows="3" maxlength="200" class="form-control" />
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">方案变更说明：</label></td>
+			<td class="width-35">
+				<form:input path="programChangeDescription" htmlEscape="false" readonly="true" rows="3" maxlength="200" class="form-control" />
+			</td>
+			<td class="width-15 active"><label class="">备注：</label></td>
+			<td class="width-35">
+				<form:input path="discloseRemarks" htmlEscape="false" readonly="true" 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">
+				<form:input path="projectPromotion" htmlEscape="false" rows="3" maxlength="200" class="form-control" />
+			</td>
+			<td class="width-15 active"><label class="">完成进度：</label></td>
+			<td class="width-35">
+				<form:input path="completeProgress" htmlEscape="false" rows="3" maxlength="200" class="form-control" />
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">是否启动政处：</label></td>
+			<td class="width-35">
+				<form:input path="fireAdministrativeDepartment" htmlEscape="false" readonly="true" rows="3" maxlength="200" class="form-control" />
+			</td>
+			<td class="width-15 active"><label class="">政处进度：</label></td>
+			<td class="width-35">
+				<form:input path="administrativeProgress" htmlEscape="false" readonly="true" rows="3" maxlength="200" class="form-control" />
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">备注：</label></td>
+			<td class="width-35">
+				<form:input path="preliminaryWorkPreparationRemarks" 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">
+				<form:input path="requirementUnitPriority" htmlEscape="false" rows="3" maxlength="200" class="form-control" />
+			</td>
+			<td class="width-15 active"><label class="">是否纳入实施计划：</label></td>
+			<td class="width-35">
+				<form:input path="implementPlan" htmlEscape="false" rows="3" maxlength="200" class="form-control" />
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">初定实施批次：</label></td>
+			<td class="width-35">
+				<form:input path="implementBatchScreen" htmlEscape="false" rows="3" maxlength="200" class="form-control" />
+			</td>
+			<td class="width-15 active"><label class="">初定施工单位：</label></td>
+			<td class="width-35">
+				<form:input path="constructionUnit" htmlEscape="false" rows="3" maxlength="200" class="form-control" />
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">实际立项批次：</label></td>
+			<td class="width-35">
+				<form:input path="projectApprovalBatch" htmlEscape="false" rows="3" maxlength="200" class="form-control" />
+			</td>
+			<td class="width-15 active"><label class="">实际施工单位：</label></td>
+			<td class="width-35">
+				<form:input path="realityConstructionUnit" htmlEscape="false" rows="3" maxlength="200" class="form-control" />
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">是否需出规划报批图：</label></td>
+			<td class="width-35">
+				<form:input path="approvalDiagram" htmlEscape="false" rows="3" maxlength="200" class="form-control" />
+			</td>
+			<td class="width-15 active"><label class="">要求移交规划报批图时间：</label></td>
+			<td class="width-35">
+				<form:input path="approvalDiagramTime" htmlEscape="false" rows="3" maxlength="200" class="form-control" />
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">是否需出纸质图：</label></td>
+			<td class="width-35">
+				<form:input path="paperDrawing" htmlEscape="false" rows="3" maxlength="200" class="form-control" />
+			</td>
+			<td class="width-15 active"><label class="">要求移交纸质图纸时间：</label></td>
+			<td class="width-35">
+				<form:input path="paperDrawingTime" htmlEscape="false" rows="3" maxlength="200" class="form-control" />
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">备注：</label></td>
+			<td class="width-35">
+				<form:input path="screenRemarks" htmlEscape="false" rows="3" maxlength="200" class="form-control" />
+			</td>
+		</tr>
+		</tbody>
+	</table>
+</form:form>
+</body>
+</html>

src/main/webapp/webpage/modules/cg/reservemanagementcenter/reserveManage/projectScreen/projectScreenForm.jsp

@@ -0,0 +1,374 @@
+<%@ 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 review = $("#passProvincialCompanyReview").val();
+
+			if (null==review||""==review){
+				jp.error("请填写是否通过省公司评审！");
+			}
+
+
+		    else {
+                var isValidate = jp.validateForm('#inputForm');//校验表单
+                if(!isValidate){
+                    return false;
+                }else{
+                    jp.loading();
+                    jp.post("${ctx}/cg/reservemanagementcenter/reservePreconstruct/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="verificate" 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="projectManager" readonly="true" htmlEscape="false" class="form-control" />
+			</td>
+			<td class="width-15 active"><label class="">项目年份：</label></td>
+			<td class="width-35">
+				<form:input path="projectYear" readonly="true" htmlEscape="false" class="form-control" />
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">项目性质：</label></td>
+			<td class="width-35">
+				<form:input path="projectNature" htmlEscape="false"  readonly="true"  class="form-control" />
+			</td>
+			<td class="width-15 active"><label class="">需求单位：</label></td>
+			<td class="width-35">
+				<form:input path="demandUnit" htmlEscape="false"  readonly="true"  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"  readonly="true"  class="form-control" />
+			</td>
+			<td class="width-15 active"><label class="">项目分组：</label></td>
+			<td class="width-35">
+				<form:input path="projectGroup" htmlEscape="false"  readonly="true"  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" readonly="true"   class="form-control" />
+			</td>
+			<td class="width-15 active"><label class="">供电区域：</label></td>
+			<td class="width-35">
+				<form:input path="blockSupply" htmlEscape="false"  readonly="true"  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"  readonly="true"  class="form-control" />
+			</td>
+			<td class="width-15 active"><label class="">单元格编号：</label></td>
+			<td class="width-35">
+				<form:input path="cellNumber" htmlEscape="false"  readonly="true"  class="form-control" />
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">项目储备编号：</label></td>
+			<td class="width-35">
+				<form:input path="projectReserveId" htmlEscape="false"  readonly="true"  class="form-control required"/>
+			</td>
+			<td class="width-15 active"><label class="">储备项目名称：</label></td>
+			<td class="width-35">
+				<form:input path="projectName" htmlEscape="false"  readonly="true"  class="form-control required" />
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">国网项目编码：</label></td>
+			<td class="width-35">
+				<form:input path="stateGridProjectCode" htmlEscape="false"  readonly="true"  class="form-control" />
+			</td>
+			<td class="width-15 active"><label class="">国网项目名称：</label></td>
+			<td class="width-35">
+				<form:input path="stateGridProjectName" htmlEscape="false"  readonly="true"  class="form-control" />
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">建设必要性及内容：</label></td>
+			<td class="width-35">
+				<form:input path="constructionNecessityAndContent" htmlEscape="false"  readonly="true"  class="form-control" />
+			</td>
+			<td class="width-15 active"><label class="">变电站名称：</label></td>
+			<td class="width-35">
+				<form:input path="substationName" htmlEscape="false"  readonly="true"  class="form-control" />
+			</td>
+		</tr>
+
+		<tr>
+			<td class="width-15 active"><label class="">线路名称：</label></td>
+			<td class="width-35">
+				<form:input path="circuitName" htmlEscape="false" readonly="true" class="form-control" />
+			</td>
+			<td class="width-15 active"><label class="">网架项目划分：</label></td>
+			<td class="width-35">
+				<form:input path="netRackProjectDivide" htmlEscape="false"  readonly="true"  class="form-control" />
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">需求类型：</label></td>
+			<td class="width-35">
+				<form:input path="requirementType" htmlEscape="false" readonly="true" class="form-control" />
+			</td>
+			<td class="width-15 active"><label class="">项目类型：</label></td>
+			<td class="width-35">
+				<form:input path="projectType" htmlEscape="false" readonly="true" 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" readonly="true" class="form-control number money" />
+			</td>
+			<td class="width-15 active"><label class="">备注：</label></td>
+			<td class="width-35">
+				<form:textarea path="basicRemarks" htmlEscape="false" readonly="true" 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">
+				<form:input path="reserveProgress" htmlEscape="false" readonly="true" rows="3" maxlength="200" class="form-control" />
+			</td>
+			<td class="width-15 active"><label class="">是否纳入储备：</label></td>
+			<td class="width-35">
+				<form:input path="implementReserve" htmlEscape="false" readonly="true" rows="3" maxlength="200" 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" readonly="true" 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">
+				<form:input path="civilWorkload" htmlEscape="false" readonly="true" rows="3" maxlength="200" class="form-control" />
+			</td>
+			<td class="width-15 active"><label class="">土建工作量统计：</label></td>
+			<td class="width-35">
+				<form:input path="civilWorkloadStatistics" htmlEscape="false" readonly="true" rows="3" maxlength="200" class="form-control" />
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">是否含立杆工作量：</label></td>
+			<td class="width-35">
+				<form:input path="uprightPoleWorkload" htmlEscape="false" readonly="true" rows="3" maxlength="200" class="form-control" />
+			</td>
+			<td class="width-15 active"><label class="">立杆工作量统计：</label></td>
+			<td class="width-35">
+				<form:input path="uprightPoleWorkloadStatistics" htmlEscape="false" readonly="true" rows="3" maxlength="200" class="form-control" />
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">预算（含税）：</label></td>
+			<td class="width-35">
+				<form:input path="budgetIncludesTax" htmlEscape="false" readonly="true" rows="3" maxlength="200" class="form-control" />
+			</td>
+			<td class="width-15 active"><label class="">预算（不含税）：</label></td>
+			<td class="width-35">
+				<form:input path="budgetNotIncludesTax" htmlEscape="false" readonly="true" rows="3" maxlength="200" class="form-control" />
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">施工费（不含税）：</label></td>
+			<td class="width-35">
+				<form:input path="constructCostExcludeTax" htmlEscape="false" readonly="true" rows="3" maxlength="200" class="form-control" />
+			</td>
+			<td class="width-15 active"><label class="">备注：</label></td>
+			<td class="width-35">
+				<form:input path="projectQuantityRemarks" htmlEscape="false" readonly="true" 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">
+				<form:input path="comprehensiveProject" htmlEscape="false" readonly="true" rows="3" maxlength="200" class="form-control" />
+			</td>
+			<td class="width-15 active"><label class="">政处难度：</label></td>
+			<td class="width-35">
+				<form:input path="officeDifficulty" htmlEscape="false" readonly="true" rows="3" maxlength="200" class="form-control" />
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">政处描述：</label></td>
+			<td class="width-35">
+				<form:input path="officeProgress" htmlEscape="false" readonly="true" rows="3" maxlength="200" class="form-control" />
+			</td>
+			<td class="width-15 active"><label class="">停电难度：</label></td>
+			<td class="width-35">
+				<form:input path="powerFailureDifficulty" htmlEscape="false" readonly="true" rows="3" maxlength="200" class="form-control" />
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">停电描述：</label></td>
+			<td class="width-35">
+				<form:input path="powerFailureDescribe" htmlEscape="false" readonly="true" rows="3" maxlength="200" class="form-control" />
+			</td>
+			<td class="width-15 active"><label class="">其他问题难度：</label></td>
+			<td class="width-35">
+				<form:input path="otherProblemDifficulty" htmlEscape="false" readonly="true" rows="3" maxlength="200" class="form-control" />
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">其他问题描述：</label></td>
+			<td class="width-35">
+				<form:input path="otherProblemDescribe" htmlEscape="false" readonly="true" rows="3" maxlength="200" class="form-control" />
+			</td>
+			<td class="width-15 active"><label class="">是否需重跑方案：</label></td>
+			<td class="width-35">
+				<form:input path="runPlanRequire" htmlEscape="false" readonly="true" rows="3" maxlength="200" class="form-control" />
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">方案变更说明：</label></td>
+			<td class="width-35">
+				<form:input path="programChangeDescription" htmlEscape="false" readonly="true" rows="3" maxlength="200" class="form-control" />
+			</td>
+			<td class="width-15 active"><label class="">备注：</label></td>
+			<td class="width-35">
+				<form:input path="discloseRemarks" htmlEscape="false" readonly="true" 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">
+				<form:input path="projectPromotion" htmlEscape="false" rows="3" maxlength="200" class="form-control" />
+			</td>
+			<td class="width-15 active"><label class="">完成进度：</label></td>
+			<td class="width-35">
+				<form:input path="completeProgress" htmlEscape="false" rows="3" maxlength="200" class="form-control" />
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">是否启动政处：</label></td>
+			<td class="width-35">
+				<form:input path="fireAdministrativeDepartment" htmlEscape="false" readonly="true" rows="3" maxlength="200" class="form-control" />
+			</td>
+			<td class="width-15 active"><label class="">政处进度：</label></td>
+			<td class="width-35">
+				<form:input path="administrativeProgress" htmlEscape="false" readonly="true" rows="3" maxlength="200" class="form-control" />
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">备注：</label></td>
+			<td class="width-35">
+				<form:input path="preliminaryWorkPreparationRemarks" 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">
+				<form:input path="requirementUnitPriority" htmlEscape="false" rows="3" maxlength="200" class="form-control" />
+			</td>
+			<td class="width-15 active"><label class="">是否纳入实施计划：</label></td>
+			<td class="width-35">
+				<form:input path="implementPlan" htmlEscape="false" rows="3" maxlength="200" class="form-control" />
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">初定实施批次：</label></td>
+			<td class="width-35">
+				<form:input path="implementBatchScreen" htmlEscape="false" rows="3" maxlength="200" class="form-control" />
+			</td>
+			<td class="width-15 active"><label class="">初定施工单位：</label></td>
+			<td class="width-35">
+				<form:input path="constructionUnit" htmlEscape="false" rows="3" maxlength="200" class="form-control" />
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">实际立项批次：</label></td>
+			<td class="width-35">
+				<form:input path="projectApprovalBatch" htmlEscape="false" rows="3" maxlength="200" class="form-control" />
+			</td>
+			<td class="width-15 active"><label class="">实际施工单位：</label></td>
+			<td class="width-35">
+				<form:input path="realityConstructionUnit" htmlEscape="false" rows="3" maxlength="200" class="form-control" />
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">是否需出规划报批图：</label></td>
+			<td class="width-35">
+				<form:input path="approvalDiagram" htmlEscape="false" rows="3" maxlength="200" class="form-control" />
+			</td>
+			<td class="width-15 active"><label class="">要求移交规划报批图时间：</label></td>
+			<td class="width-35">
+				<form:input path="approvalDiagramTime" htmlEscape="false" rows="3" maxlength="200" class="form-control" />
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">是否需出纸质图：</label></td>
+			<td class="width-35">
+				<form:input path="paperDrawing" htmlEscape="false" rows="3" maxlength="200" class="form-control" />
+			</td>
+			<td class="width-15 active"><label class="">要求移交纸质图纸时间：</label></td>
+			<td class="width-35">
+				<form:input path="paperDrawingTime" htmlEscape="false" rows="3" maxlength="200" class="form-control" />
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">备注：</label></td>
+			<td class="width-35">
+				<form:input path="screenRemarks" htmlEscape="false" rows="3" maxlength="200" class="form-control" />
+			</td>
+		</tr>
+		</tbody>
+	</table>
+</form:form>
+</body>
+</html>

src/main/webapp/webpage/modules/cg/reservemanagementcenter/reserveManage/projectScreen/projectScreenInfo.js

@@ -0,0 +1,348 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<script >
+$(document).ready(function () {
+    $('#projectTable').bootstrapTable({
+        //请求方法
+        method: 'post',
+        //类型json
+        dataType: "json",
+        contentType: "application/x-www-form-urlencoded",
+        //显示检索按钮
+        showSearch: true,
+        //显示刷新按钮
+        showRefresh: true,
+        //显示切换手机试图按钮
+        showToggle: true,
+        //显示 内容列下拉框
+        showColumns: true,
+        //显示到处按钮
+        showExport: true,
+        //显示切换分页按钮
+        showPaginationSwitch: true,
+        //最低显示2行
+        minimumCountColumns: 2,
+        //是否显示行间隔色
+        striped: true,
+        //是否使用缓存，默认为true，所以一般情况下需要设置一下这个属性（*）
+        cache: false,
+        //是否显示分页（*）
+        pagination: true,
+        //排序方式
+        sortOrder: "asc",
+        //初始化加载第一页，默认第一页
+        pageNumber: 1,
+        //每页的记录行数（*）
+        pageSize: 25,
+        //可供选择的每页的行数（*）
+        pageList: [5, 10, 25, 50, 100],
+        //这个接口需要处理bootstrap table传递的固定参数,并返回特定格式的json数据
+        url: "${ctx}/cg/reservemanagementcenter/projectScreen/list",
+        //默认值为 'limit',传给服务端的参数为：limit, offset, search, sort, order Else
+        //queryParamsType:'',
+        ////查询参数,每次调用是会带上这个参数，可自定义
+        queryParams: function (params) {
+            var searchParam = $("#searchForm").serializeJSON();
+            searchParam.pageNo = params.limit === undefined ? "1" : params.offset / params.limit + 1;
+            searchParam.pageSize = params.limit === undefined ? -1 : params.limit;
+            searchParam.orderBy = params.sort === undefined ? "" : params.sort + " " + params.order;
+            return searchParam;
+        },
+        //分页方式：client客户端分页，server服务端分页（*）
+        sidePagination: "server",
+        contextMenuTrigger: "right",//pc端 按右键弹出菜单
+        contextMenuTriggerMobile: "press",//手机端 弹出菜单，click：单击， press：长按。
+        contextMenu: '#context-menu',
+        onContextMenuItem: function (row, $el) {
+            if ($el.data("item") == "edit") {
+                edit(row.id);
+            } else if ($el.data("item") == "view") {
+                view(row.id);
+            } else if ($el.data("item") == "delete") {
+                jp.confirm('确认要删除该表单记录吗？', function () {
+                    jp.loading();
+                    jp.get("${ctx}/cg/reservemanagementcenter/project/delete?id=" + row.id, function (data) {
+                        if (data.success) {
+                            $('#projectTable').bootstrapTable('refresh');
+                            jp.success(data.msg);
+                        } else {
+                            jp.error(data.msg);
+                        }
+                    })
+                });
+            }
+        },
+
+        onClickRow: function (row, $el) {
+        },
+        onShowSearch: function () {
+            $("#search-collapse").slideToggle();
+        },
+        columns:
+            [
+                [
+                    {checkbox:true,width: 36},
+                    {"title":"储备项目基本信息","colspan":22,"halign":"center","align": "center",width: "4400px"},
+                    {"title":"储备进度","colspan":3,"halign":"center","align": "center",width: "600px"},
+                    {"title":"储备项目工程量统计","colspan":8,"halign":"center","align": "center",width: "1600px"},
+                    {"title":"储备项目交底信息统计","colspan":10,"halign":"center","align": "center",width: "2000px"},
+                    {"title":"储备项目前期准备工作","colspan":5,"halign":"center","align": "center",width: "1000px"},
+                    {"title":"立项筛选","colspan":11,"halign":"center","align": "center",width: "2200px"}
+                ],
+                    [
+                    {checkbox:true,width: 36},
+                        { field: 'projectManager', title: "储备项目经理", valign:"middle", align:"center", colspan: 1 },
+                        { field: 'projectYear', title: "项目年份", valign:"middle", align:"center", colspan: 1 },
+                        { field: 'projectNature', title: "项目性质", valign:"middle", align:"center", colspan: 1 },
+                        { field: 'demandUnit', title: "需求单位", valign:"middle", align:"center", colspan: 1 },
+                        { field: 'district', title: "区域", valign:"middle", align:"center", colspan: 1 },
+                        { field: 'projectGroup', title: "项目分组", valign:"middle", align:"center", colspan: 1 },
+                        { field: 'reserveBatches', title: "储备批次", valign:"middle", align:"center", colspan: 1 },
+                        { field: 'blockSupply', title: "供电区域", valign:"middle", align:"center", colspan: 1 },
+                        { field: 'gridNumber', title: "网格编号", valign:"middle", align:"center", colspan: 1 },
+                        { field: 'cellNumber', title: "单元格编号", valign:"middle", align:"center", colspan: 1 },
+                        { field: 'projectReserveId', title: "项目储备编号", valign:"middle", align:"center", colspan: 1,
+                            formatter:function(value, row , index){
+
+                                if(value == null || value ==""){
+                                    value = "-";
+                                }
+                            <c:choose>
+                                <c:when test="${fns:hasPermission('cg:reservemanagementcenter:reserveManage:view')}">
+                                return "<a href='javascript:view(\""+row.id+"\")'>"+value+"</a>";
+                            </c:when>
+                                <c:otherwise>
+                                return value;
+                            </c:otherwise>
+                                </c:choose>
+                            }},
+                        { field: 'projectName', title: "项目名称", valign:"middle", align:"center", colspan: 1,formatter:paramsMatter},
+                        { field: 'stateGridProjectCode', title: "国网项目编码", valign:"middle", align:"center", colspan: 1,formatter:paramsMatter},
+                        { field: 'stateGridProjectName', title: "国网项目名称", valign:"middle", align:"center", colspan: 1,formatter:paramsMatter},
+                        { field: 'constructionNecessityAndContent', title: "建设必要性及内容", valign:"middle", align:"center", colspan: 1,formatter:paramsMatter},
+                        { field: 'substationName', title: "变电站名称", valign:"middle", align:"center", colspan: 1 },
+                        { field: 'circuitName', title: "线路名称", valign:"middle", align:"center", colspan: 1 },
+                        { field: 'netRackProjectDivide', title: "网架项目划分", valign:"middle", align:"center", colspan: 1 },
+                        { field: 'requirementType', title: "需求类型", valign:"middle", align:"center", colspan: 1 },
+                        { field: 'projectType', title: "项目类型", valign:"middle", align:"center", colspan: 1 },
+                        { field: 'costEstimate', title: "费用估算", valign:"middle", align:"center", colspan: 1 },
+                        { field: 'basicRemarks', title: "备注", valign:"middle", align:"center", colspan: 1 ,formatter:paramsMatter},
+
+                        { field: 'reserveProgress', title: "储备进度", valign:"middle", align:"center", colspan: 1 },
+                        { field: 'implementReserve', title: "是否纳入储备", valign:"middle", align:"center", colspan: 1 },
+                        { field: 'implementBatch', title: "初定实施批次", valign:"middle", align:"center", colspan: 1 },
+
+                        { field: 'civilWorkload', title: "是否含土建工作量", valign:"middle", align:"center", colspan: 1 },
+                        { field: 'civilWorkloadStatistics', title: "土建工作量统计", valign:"middle", align:"center", colspan: 1 },
+                        { field: 'uprightPoleWorkload', title: "是否含立杆工作量", valign:"middle", align:"center", colspan: 1 },
+                        { field: 'uprightPoleWorkloadStatistics', title: "立杆工作量统计", valign:"middle", align:"center", colspan: 1 },
+                        { field: 'budgetIncludesTax', title: "预算（含税）", valign:"middle", align:"center", colspan: 1 },
+                        { field: 'budgetNotIncludesTax', title: "预算（不含税）", valign:"middle", align:"center", colspan: 1 },
+                        { field: 'constructCostExcludeTax', title: "施工费（不含税）", valign:"middle", align:"center", colspan: 1 },
+                        { field: 'projectQuantityRemarks', title: "备注", valign:"middle", align:"center", colspan: 1 ,formatter:paramsMatter},
+
+                        { field: 'comprehensiveProject', title: "项目综合可实施性", valign:"middle", align:"center", colspan: 1 },
+                        { field: 'officeDifficulty', title: "政处难度", valign:"middle", align:"center", colspan: 1 },
+                        { field: 'officeProgress', title: "政处描述", valign:"middle", align:"center", colspan: 1 ,formatter:paramsMatter},
+                        { field: 'powerFailureDifficulty', title: "停电难度", valign:"middle", align:"center", colspan: 1 },
+                        { field: 'powerFailureDescribe', title: "停电描述", valign:"middle", align:"center", colspan: 1 ,formatter:paramsMatter},
+                        { field: 'otherProblemDifficulty', title: "其他问题难度", valign:"middle", align:"center", colspan: 1 },
+                        { field: 'otherProblemDescribe', title: "其他问题描述", valign:"middle", align:"center", colspan: 1 ,formatter:paramsMatter},
+                        { field: 'runPlanRequire', title: "是否需重跑方案", valign:"middle", align:"center", colspan: 1 },
+                        { field: 'programChangeDescription', title: "方案变更说明", valign:"middle", align:"center", colspan: 1 ,formatter:paramsMatter},
+                        { field: 'discloseRemarks', title: "备注", valign:"middle", align:"center", colspan: 1 ,formatter:paramsMatter},
+
+                        { field: 'projectPromotion', title: "储备项目推进任务", valign:"middle", align:"center", colspan: 1 },
+                        { field: 'completeProgress', title: "完成进度", valign:"middle", align:"center", colspan: 1 },
+                        { field: 'fireAdministrativeDepartment', title: "是否启动政处", valign:"middle", align:"center", colspan: 1 },
+                        { field: 'administrativeProgress', title: "政处进度", valign:"middle", align:"center", colspan: 1 },
+                        { field: 'preliminaryWorkPreparationRemarks', title: "备注", valign:"middle", align:"center", colspan: 1 ,formatter:paramsMatter},
+
+                        { field: 'requirementUnitPriority', title: "需求单位优先级", valign:"middle", align:"center", colspan: 1 },
+                        { field: 'implementPlan', title: "是否纳入实施计划", valign:"middle", align:"center", colspan: 1 },
+                        { field: 'implementBatchScreen', title: "初定实施批次", valign:"middle", align:"center", colspan: 1 },
+                        { field: 'constructionUnit', title: "初定施工单位", valign:"middle", align:"center", colspan: 1 },
+                        { field: 'projectApprovalBatch', title: "实际立项批次", valign:"middle", align:"center", colspan: 1 },
+                        { field: 'realityConstructionUnit', title: "实际施工单位", valign:"middle", align:"center", colspan: 1 },
+                        { field: 'approvalDiagram', title: "是否需出规划报批图", valign:"middle", align:"center", colspan: 1 },
+                        { field: 'approvalDiagramTime', title: "要求移交规划报批图时间", valign:"middle", align:"center", colspan: 1 },
+                        { field: 'paperDrawing', title: "是否需出纸质图", valign:"middle", align:"center", colspan: 1 },
+                        { field: 'paperDrawingTime', title: "要求移交纸质图纸时间", valign:"middle", align:"center", colspan: 1 },
+                        { field: 'screenRemarks', title: "备注", valign:"middle", align:"center", colspan: 1 ,formatter:paramsMatter}
+
+                    ],
+
+        ]
+    });
+
+
+    if (navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)) {//如果是移动端
+        $('#projectTable').bootstrapTable("toggleView");
+    }
+
+    $('#projectTable').on('check.bs.table uncheck.bs.table load-success.bs.table ' +
+        'check-all.bs.table uncheck-all.bs.table', function () {
+        $('#remove').prop('disabled', !$('#projectTable').bootstrapTable('getSelections').length);
+        $('#view,#edit,#jlEdit').prop('disabled', $('#projectTable').bootstrapTable('getSelections').length != 1);
+    });
+
+    $("#btnImport").click(function () {
+        jp.open({
+            type: 2,
+            area: [500, 200],
+            auto: true,
+            title: "导入数据",
+            content: "${ctx}/tag/importExcel",
+            btn: ['确定', '关闭'],
+            btn1: function (index, layero) {
+                var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
+                iframeWin.contentWindow.importExcel('${ctx}/cg/reservemanagementcenter/projectScreen/import', function (data) {
+                    if (data.success) {
+                        jp.success(data.msg);
+                        refresh();
+                    } else {
+                        jp.error(data.msg);
+                    }
+                    jp.close(index);
+                });//调用保存事件
+                return false;
+            },
+            btn2: function (index) {
+                //  jp.close(index);
+            }
+        });
+    });
+
+    $("#jlImport").click(function () {
+        jp.open({
+            type: 2,
+            area: [500, 200],
+            auto: true,
+            title: "导入数据",
+            content: "${ctx}/tag/importExcel",
+            btn: ['确定', '关闭'],
+            btn1: function (index, layero) {
+                var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
+                iframeWin.contentWindow.importExcel('${ctx}/cg/reservemanagementcenter/summaryStatistics/jlImport', function (data) {
+                    if (data.success) {
+                        jp.success(data.msg);
+                        refresh();
+                    } else {
+                        jp.error(data.msg);
+                    }
+                    jp.close(index);
+                });//调用保存事件
+                return false;
+            },
+
+            btn2: function (index) {
+                //  jp.close(index);
+            }
+        });
+    });
+
+    $("#btnExport").click(function () {
+        var projectReserveId = $("#projectReserveId").val();
+        var projectName = $("#projectName").val();
+        jp.downloadFile('${ctx}/cg/reservemanagementcenter/projectScreen/export?projectReserveId=' + projectReserveId + '&projectName=' + projectName);
+    });
+
+    $("#search").click("click", function () {// 绑定查询按扭
+        $('#projectTable').bootstrapTable('refresh');
+    });
+
+    $("#reset").click("click", function () {// 绑定查询按扭
+        $("#searchForm  input").val("");
+        $("#searchForm  select").val("");
+        $("#searchForm  .select-item").html("");
+        $('#projectTable').bootstrapTable('refresh');
+    });
+
+    $('#beginBeginDate').datetimepicker({
+        format: "YYYY-MM-DD HH:mm:ss"
+    });
+    $('#endBeginDate').datetimepicker({
+        format: "YYYY-MM-DD HH:mm:ss"
+    });
+    $('#endDate').datetimepicker({
+        format: "YYYY-MM-DD HH:mm:ss"
+    });
+});
+
+//表格超出宽度鼠标悬停显示td内容
+function paramsMatter(value,row,index,field) {
+    var span = document.createElement('span');
+    span.setAttribute('title',value);
+    span.innerHTML = value;
+    return span.outerHTML;
+}
+
+function getIdSelections() {
+    return $.map($("#projectTable").bootstrapTable('getSelections'), function (row) {
+        return row.id
+    });
+}
+
+
+//刷新列表
+function refresh() {
+    $('#projectTable').bootstrapTable('refresh');
+}
+
+function add() {
+    jp.openSaveDialog('新增储备项目基本信息', "${ctx}/cg/reservemanagementcenter/summaryStatistics/form", '800px', '500px');
+}
+
+
+function edit(id) {//没有权限时，不显示确定按钮
+    if (id == undefined) {
+        id = getIdSelections();
+    }
+    jp.openSaveDialog('编辑省公司评审信息', "${ctx}/cg/reservemanagementcenter/projectScreen/form?id=" + id, '800px', '500px');
+}
+
+function jlEdit(id) {//没有权限时，不显示确定按钮
+    if (id == undefined) {
+        id = getIdSelections();
+    }
+    jp.openSaveDialog('编辑储备项目基本信息', "${ctx}/cg/reservemanagementcenter/summaryStatistics/jlEdit?id=" + id, '800px', '500px');
+}
+
+function view(id) {//没有权限时，不显示确定按钮
+    if (id == undefined) {
+        id = getIdSelections();
+    }
+    jp.openViewDialog('查看省公司评审信息', "${ctx}/cg/reservemanagementcenter/projectScreen/view?id=" + id, '800px', '500px');
+}
+
+function deleteAll(){
+
+    jp.confirm('确认要删除该储备项目基本信息吗？', function(){
+        jp.loading();
+        jp.get("${ctx}/cg/reservemanagementcenter/summaryStatistics/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/cg/reservemanagementcenter/reserveManage/projectScreen/projectScreenInfo.jsp

@@ -0,0 +1,107 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<%@ include file="/webpage/include/taglib.jsp"%>
+<html>
+<head>
+	<title>项目储备信息</title>
+	<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+	<meta name="decorator" content="ani"/>
+	<%@ include file="/webpage/include/bootstraptable.jsp"%>
+	<%@include file="/webpage/include/treeview.jsp" %>
+	<%@include file="projectScreenInfo.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;
+			white-space: nowrap;
+			overflow: hidden;
+			text-overflow: ellipsis;
+			word-wrap:break-word;
+		}
+		.bootstrap-table .table thead>tr>th {
+			padding: 0;
+			margin: 0;
+			width: 3000px;
+		}
+	</style>
+</head>
+<body>
+	<div class="wrapper wrapper-content">
+	<div class="panel panel-primary">
+	<div class="panel-heading">
+		<h3 class="panel-title">项目储备信息</h3>
+	</div>
+	<div class="panel-body">
+		<!-- 搜索 -->
+		<div id="search-collapse" class="collapse">
+			<div class="accordion-inner">
+				<form:form id="searchForm" modelAttribute="review" class="form form-horizontal well clearfix">
+					<div class="col-xs-12 col-sm-6 col-md-4">
+						<label class="label-item single-overflow pull-left" title="储备编码：">储备编码：</label>
+						<form:input path="projectReserveId" htmlEscape="false" maxlength="100"  class=" form-control"/>
+					</div>
+					<div class="col-xs-12 col-sm-6 col-md-4">
+						<label class="label-item single-overflow pull-left" title="项目名称：">项目名称：</label>
+						<form:input path="projectName" htmlEscape="false" maxlength="100"  class=" form-control"/>
+					</div>
+					<div class="col-xs-12 col-sm-6 col-md-4">
+						<div style="margin-top:26px">
+							<a  id="search" class="btn btn-primary btn-rounded  btn-bordered btn-sm"><i class="fa fa-search"></i> 查询</a>
+							<a  id="reset" class="btn btn-primary btn-rounded  btn-bordered btn-sm" ><i class="fa fa-refresh"></i> 重置</a>
+						</div>
+					</div>
+				</form:form>
+			</div>
+		</div>
+
+	<!-- 工具栏 -->
+	<div id="toolbar">
+<%--			<shiro:hasPermission name="cg:reservemanagementcenter:summaryStatistics:add">--%>
+<%--				<button id="add" class="btn btn-primary" onclick="add()">--%>
+<%--					<i class="glyphicon glyphicon-plus"></i> 新增--%>
+<%--				</button>--%>
+<%--			</shiro:hasPermission>--%>
+			<shiro:hasPermission name="cg:reservemanagementcenter:projectScreen: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:jlEdit">
+				<button id="jlEdit" class="btn btn-primary" onclick="jlEdit()">
+					<i class="glyphicon glyphicon-edit"></i> 修改 <!--经理修改-->
+				</button>
+			</shiro:hasPermission>--%>
+<%--			<shiro:hasPermission name="cg:reservemanagementcenter:summaryStatistics:del">--%>
+<%--				<button id="remove" class="btn btn-danger" onclick="deleteAll()">--%>
+<%--					<i class="glyphicon glyphicon-remove"></i> 删除--%>
+<%--				</button>--%>
+<%--			</shiro:hasPermission>--%>
+			<shiro:hasPermission name="cg:reservemanagementcenter:projectScreen:import">
+				<button id="btnImport" class="btn btn-info">
+					<i class="fa fa-folder-open-o"></i> 导入  <!--专职导入-->
+				</button>
+			</shiro:hasPermission>
+<%--			<shiro:hasPermission name="sg:managementcenter:reserveManagement:jlImport">
+				<button id="jlImport" class="btn btn-info">
+					<i class="fa fa-folder-open-o"></i> 导入  <!--经理导入-->
+				</button>
+			</shiro:hasPermission>--%>
+			<shiro:hasPermission name="cg:reservemanagementcenter:projectScreen:export">
+				<button id="btnExport" class="btn btn-warning">
+					<i class="fa fa-file-excel-o"></i> 导出
+				</button>
+			</shiro:hasPermission>
+		    </div>
+	<!-- 表格 -->
+	<table id="projectTable" style="table-layout:fixed" class="table" data-toolbar="#toolbar"></table>
+
+	</div>
+	</div>
+	</div>
+</body>
+</html>

src/main/webapp/webpage/modules/cg/reservemanagementcenter/reserveManage/projectScreen/projectScreenView.jsp

@@ -0,0 +1,361 @@
+<%@ 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="verificate" 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="projectManager" readonly="true" htmlEscape="false" class="form-control" />
+			</td>
+			<td class="width-15 active"><label class="">项目年份：</label></td>
+			<td class="width-35">
+				<form:input path="projectYear" readonly="true" htmlEscape="false" class="form-control" />
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">项目性质：</label></td>
+			<td class="width-35">
+				<form:input path="projectNature" htmlEscape="false"  readonly="true"  class="form-control" />
+			</td>
+			<td class="width-15 active"><label class="">需求单位：</label></td>
+			<td class="width-35">
+				<form:input path="demandUnit" htmlEscape="false"  readonly="true"  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"  readonly="true"  class="form-control" />
+			</td>
+			<td class="width-15 active"><label class="">项目分组：</label></td>
+			<td class="width-35">
+				<form:input path="projectGroup" htmlEscape="false"  readonly="true"  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" readonly="true"   class="form-control" />
+			</td>
+			<td class="width-15 active"><label class="">供电区域：</label></td>
+			<td class="width-35">
+				<form:input path="blockSupply" htmlEscape="false"  readonly="true"  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"  readonly="true"  class="form-control" />
+			</td>
+			<td class="width-15 active"><label class="">单元格编号：</label></td>
+			<td class="width-35">
+				<form:input path="cellNumber" htmlEscape="false"  readonly="true"  class="form-control" />
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">项目储备编号：</label></td>
+			<td class="width-35">
+				<form:input path="projectReserveId" htmlEscape="false"  readonly="true"  class="form-control required"/>
+			</td>
+			<td class="width-15 active"><label class="">储备项目名称：</label></td>
+			<td class="width-35">
+				<form:input path="projectName" htmlEscape="false"  readonly="true"  class="form-control required" />
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">国网项目编码：</label></td>
+			<td class="width-35">
+				<form:input path="stateGridProjectCode" htmlEscape="false"  readonly="true"  class="form-control" />
+			</td>
+			<td class="width-15 active"><label class="">国网项目名称：</label></td>
+			<td class="width-35">
+				<form:input path="stateGridProjectName" htmlEscape="false"  readonly="true"  class="form-control" />
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">建设必要性及内容：</label></td>
+			<td class="width-35">
+				<form:input path="constructionNecessityAndContent" htmlEscape="false"  readonly="true"  class="form-control" />
+			</td>
+			<td class="width-15 active"><label class="">变电站名称：</label></td>
+			<td class="width-35">
+				<form:input path="substationName" htmlEscape="false"  readonly="true"  class="form-control" />
+			</td>
+		</tr>
+
+		<tr>
+			<td class="width-15 active"><label class="">线路名称：</label></td>
+			<td class="width-35">
+				<form:input path="circuitName" htmlEscape="false" readonly="true" class="form-control" />
+			</td>
+			<td class="width-15 active"><label class="">网架项目划分：</label></td>
+			<td class="width-35">
+				<form:input path="netRackProjectDivide" htmlEscape="false"  readonly="true"  class="form-control" />
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">需求类型：</label></td>
+			<td class="width-35">
+				<form:input path="requirementType" htmlEscape="false" readonly="true" class="form-control" />
+			</td>
+			<td class="width-15 active"><label class="">项目类型：</label></td>
+			<td class="width-35">
+				<form:input path="projectType" htmlEscape="false" readonly="true" 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" readonly="true" class="form-control number money" />
+			</td>
+			<td class="width-15 active"><label class="">备注：</label></td>
+			<td class="width-35">
+				<form:textarea path="basicRemarks" htmlEscape="false" readonly="true" 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">
+				<form:input path="reserveProgress" htmlEscape="false" readonly="true" rows="3" maxlength="200" class="form-control" />
+			</td>
+			<td class="width-15 active"><label class="">是否纳入储备：</label></td>
+			<td class="width-35">
+				<form:input path="implementReserve" htmlEscape="false" readonly="true" rows="3" maxlength="200" 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" readonly="true" 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">
+				<form:input path="civilWorkload" htmlEscape="false" readonly="true" rows="3" maxlength="200" class="form-control" />
+			</td>
+			<td class="width-15 active"><label class="">土建工作量统计：</label></td>
+			<td class="width-35">
+				<form:input path="civilWorkloadStatistics" htmlEscape="false" readonly="true" rows="3" maxlength="200" class="form-control" />
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">是否含立杆工作量：</label></td>
+			<td class="width-35">
+				<form:input path="uprightPoleWorkload" htmlEscape="false" readonly="true" rows="3" maxlength="200" class="form-control" />
+			</td>
+			<td class="width-15 active"><label class="">立杆工作量统计：</label></td>
+			<td class="width-35">
+				<form:input path="uprightPoleWorkloadStatistics" htmlEscape="false" readonly="true" rows="3" maxlength="200" class="form-control" />
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">预算（含税）：</label></td>
+			<td class="width-35">
+				<form:input path="budgetIncludesTax" htmlEscape="false" readonly="true" rows="3" maxlength="200" class="form-control" />
+			</td>
+			<td class="width-15 active"><label class="">预算（不含税）：</label></td>
+			<td class="width-35">
+				<form:input path="budgetNotIncludesTax" htmlEscape="false" readonly="true" rows="3" maxlength="200" class="form-control" />
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">施工费（不含税）：</label></td>
+			<td class="width-35">
+				<form:input path="constructCostExcludeTax" htmlEscape="false" readonly="true" rows="3" maxlength="200" class="form-control" />
+			</td>
+			<td class="width-15 active"><label class="">备注：</label></td>
+			<td class="width-35">
+				<form:input path="projectQuantityRemarks" htmlEscape="false" readonly="true" 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">
+				<form:input path="comprehensiveProject" htmlEscape="false" readonly="true" rows="3" maxlength="200" class="form-control" />
+			</td>
+			<td class="width-15 active"><label class="">政处难度：</label></td>
+			<td class="width-35">
+				<form:input path="officeDifficulty" htmlEscape="false" readonly="true" rows="3" maxlength="200" class="form-control" />
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">政处描述：</label></td>
+			<td class="width-35">
+				<form:input path="officeProgress" htmlEscape="false" readonly="true" rows="3" maxlength="200" class="form-control" />
+			</td>
+			<td class="width-15 active"><label class="">停电难度：</label></td>
+			<td class="width-35">
+				<form:input path="powerFailureDifficulty" htmlEscape="false" readonly="true" rows="3" maxlength="200" class="form-control" />
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">停电描述：</label></td>
+			<td class="width-35">
+				<form:input path="powerFailureDescribe" htmlEscape="false" readonly="true" rows="3" maxlength="200" class="form-control" />
+			</td>
+			<td class="width-15 active"><label class="">其他问题难度：</label></td>
+			<td class="width-35">
+				<form:input path="otherProblemDifficulty" htmlEscape="false" readonly="true" rows="3" maxlength="200" class="form-control" />
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">其他问题描述：</label></td>
+			<td class="width-35">
+				<form:input path="otherProblemDescribe" htmlEscape="false" readonly="true" rows="3" maxlength="200" class="form-control" />
+			</td>
+			<td class="width-15 active"><label class="">是否需重跑方案：</label></td>
+			<td class="width-35">
+				<form:input path="runPlanRequire" htmlEscape="false" readonly="true" rows="3" maxlength="200" class="form-control" />
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">方案变更说明：</label></td>
+			<td class="width-35">
+				<form:input path="programChangeDescription" htmlEscape="false" readonly="true" rows="3" maxlength="200" class="form-control" />
+			</td>
+			<td class="width-15 active"><label class="">备注：</label></td>
+			<td class="width-35">
+				<form:input path="discloseRemarks" htmlEscape="false" readonly="true" 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">
+				<form:input path="projectPromotion" htmlEscape="false" readonly="true" rows="3" maxlength="200" class="form-control" />
+			</td>
+			<td class="width-15 active"><label class="">完成进度：</label></td>
+			<td class="width-35">
+				<form:input path="completeProgress" htmlEscape="false" readonly="true" rows="3" maxlength="200" class="form-control" />
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">是否启动政处：</label></td>
+			<td class="width-35">
+				<form:input path="fireAdministrativeDepartment" htmlEscape="false" readonly="true" rows="3" maxlength="200" class="form-control" />
+			</td>
+			<td class="width-15 active"><label class="">政处进度：</label></td>
+			<td class="width-35">
+				<form:input path="administrativeProgress" htmlEscape="false" readonly="true" rows="3" maxlength="200" class="form-control" />
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">备注：</label></td>
+			<td class="width-35">
+				<form:input path="preliminaryWorkPreparationRemarks" htmlEscape="false" readonly="true" 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">
+				<form:input path="requirementUnitPriority" htmlEscape="false" readonly="true" rows="3" maxlength="200" class="form-control" />
+			</td>
+			<td class="width-15 active"><label class="">是否纳入实施计划：</label></td>
+			<td class="width-35">
+				<form:input path="implementPlan" htmlEscape="false" readonly="true" rows="3" maxlength="200" class="form-control" />
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">初定实施批次：</label></td>
+			<td class="width-35">
+				<form:input path="implementBatchScreen" htmlEscape="false" readonly="true" rows="3" maxlength="200" class="form-control" />
+			</td>
+			<td class="width-15 active"><label class="">初定施工单位：</label></td>
+			<td class="width-35">
+				<form:input path="constructionUnit" htmlEscape="false" readonly="true" rows="3" maxlength="200" class="form-control" />
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">实际立项批次：</label></td>
+			<td class="width-35">
+				<form:input path="projectApprovalBatch" htmlEscape="false" readonly="true" rows="3" maxlength="200" class="form-control" />
+			</td>
+			<td class="width-15 active"><label class="">实际施工单位：</label></td>
+			<td class="width-35">
+				<form:input path="realityConstructionUnit" htmlEscape="false" readonly="true" rows="3" maxlength="200" class="form-control" />
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">是否需出规划报批图：</label></td>
+			<td class="width-35">
+				<form:input path="approvalDiagram" htmlEscape="false" readonly="true" rows="3" maxlength="200" class="form-control" />
+			</td>
+			<td class="width-15 active"><label class="">要求移交规划报批图时间：</label></td>
+			<td class="width-35">
+				<form:input path="approvalDiagramTime" htmlEscape="false" readonly="true" rows="3" maxlength="200" class="form-control" />
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">是否需出纸质图：</label></td>
+			<td class="width-35">
+				<form:input path="paperDrawing" htmlEscape="false" readonly="true" rows="3" maxlength="200" class="form-control" />
+			</td>
+			<td class="width-15 active"><label class="">要求移交纸质图纸时间：</label></td>
+			<td class="width-35">
+				<form:input path="paperDrawingTime" htmlEscape="false" readonly="true" rows="3" maxlength="200" class="form-control" />
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">备注：</label></td>
+			<td class="width-35">
+				<form:input path="screenRemarks" htmlEscape="false" readonly="true" rows="3" maxlength="200" class="form-control" />
+			</td>
+		</tr>
+		</tbody>
+	</table>
+</form:form>
+</body>
+</html>

src/main/webapp/webpage/modules/cg/reservemanagementcenter/reserveManage/projectTypeVerificate/projectTypeVerificateByzz.jsp

@@ -0,0 +1,271 @@
+<%@ 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 review = $("#passProvincialCompanyReview").val();
+			//
+			// if (null==review||""==review){
+			// 	jp.error("请填写是否通过省公司评审！");
+			// }
+
+			var isValidate = jp.validateForm('#inputForm');//校验表单
+			if(!isValidate){
+				return false;
+			}else{
+				jp.loading();
+				jp.post("${ctx}/cg/reservemanagementcenter/projectTypeVerificate/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="verificate" 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="projectManager" readonly="true" htmlEscape="false" class="form-control" />
+			</td>
+			<td class="width-15 active"><label class="">项目年份：</label></td>
+			<td class="width-35">
+				<form:input path="projectYear" readonly="true" htmlEscape="false" class="form-control" />
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">需求单位：</label></td>
+			<td class="width-35">
+				<form:input path="demandUnit" htmlEscape="false"  readonly="true"  class="form-control" />
+			</td>
+			<td class="width-15 active"><label class="">区域：</label></td>
+			<td class="width-35">
+				<form:input path="district" htmlEscape="false"  readonly="true"  class="form-control" />
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">项目分组：</label></td>
+			<td class="width-35">
+				<form:input path="projectGroup" htmlEscape="false"  readonly="true"  class="form-control" />
+			</td>
+			<td class="width-15 active"><label class="">储备批次：</label></td>
+			<td class="width-35">
+				<form:input path="reserveBatches" htmlEscape="false" readonly="true"   class="form-control" />
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">供电区域：</label></td>
+			<td class="width-35">
+				<form:input path="blockSupply" htmlEscape="false"  readonly="true"  class="form-control" />
+			</td>
+			<td class="width-15 active"><label class="">网格编号：</label></td>
+			<td class="width-35">
+				<form:input path="gridNumber" htmlEscape="false"  readonly="true"  class="form-control" />
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">单元格编号：</label></td>
+			<td class="width-35">
+				<form:input path="cellNumber" htmlEscape="false"  readonly="true"  class="form-control" />
+			</td>
+			<td class="width-15 active"><label class="">项目储备编号：</label></td>
+			<td class="width-35">
+				<form:input path="projectReserveId" htmlEscape="false"  readonly="true"  class="form-control required"/>
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">储备项目名称：</label></td>
+			<td class="width-35">
+				<form:input path="projectName" htmlEscape="false"  readonly="true"  class="form-control required" />
+			</td>
+			<td class="width-15 active"><label class="">国网项目编码：</label></td>
+			<td class="width-35">
+				<form:input path="stateGridProjectCode" htmlEscape="false"  readonly="true"  class="form-control" />
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">国网项目名称：</label></td>
+			<td class="width-35">
+				<form:input path="stateGridProjectName" htmlEscape="false"  readonly="true"  class="form-control" />
+			</td>
+			<td class="width-15 active"><label class="">建设必要性及内容：</label></td>
+			<td class="width-35">
+				<form:input path="constructionNecessityAndContent" htmlEscape="false"  readonly="true"  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"  readonly="true"  class="form-control" />
+			</td>
+			<td class="width-15 active"><label class="">线路名称：</label></td>
+			<td class="width-35">
+				<form:input path="circuitName" htmlEscape="false" readonly="true" 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"  readonly="true"  class="form-control" />
+			</td>
+			<td class="width-15 active"><label class="">需求类型：</label></td>
+			<td class="width-35">
+				<form:input path="requirementType" htmlEscape="false" readonly="true" 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" readonly="true" class="form-control number money" />
+			</td>
+			<td class="width-15 active"><label class="">备注：</label></td>
+			<td class="width-35">
+				<form:textarea path="basicRemarks" htmlEscape="false" readonly="true" 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">
+				<form:input path="reserveProgress" htmlEscape="false" readonly="true" rows="3" maxlength="200" class="form-control" />
+			</td>
+			<td class="width-15 active"><label class="">是否纳入实施计划：</label></td>
+			<td class="width-35">
+				<form:input path="implementPlan" htmlEscape="false" readonly="true" rows="3" maxlength="200" 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" readonly="true" 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">
+				<form:input path="projectNature" htmlEscape="false" rows="3" maxlength="200" class="form-control" />
+			</td>
+			<td class="width-15 active"><label class="">是否含变电站新出线：</label></td>
+			<td class="width-35">
+				<form:input path="newSubstation" htmlEscape="false" rows="3" maxlength="200" class="form-control" />
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">是否含资本设备：</label></td>
+			<td class="width-35">
+				<form:input path="includeCapitalEquipment" htmlEscape="false" readonly="true" rows="3" maxlength="200" class="form-control" />
+			</td>
+			<td class="width-15 active"><label class="">项目属性（系统判断）：</label></td>
+			<td class="width-35">
+				<form:input path="projectProperties" htmlEscape="false" readonly="true" rows="3" maxlength="200" class="form-control" />
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">项目性质（人工判断）：</label></td>
+			<td class="width-35">
+				<form:input path="projectNatureArtificial" 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">
+				<form:input path="projectType" htmlEscape="false" rows="3" maxlength="200" class="form-control" />
+			</td>
+			<td class="width-15 active"><label class="">是否含土建：</label></td>
+			<td class="width-35">
+				<form:input path="civilEngineer" htmlEscape="false" readonly="true" rows="3" maxlength="200" class="form-control" />
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">是否含电缆：</label></td>
+			<td class="width-35">
+				<form:input path="includeCables" htmlEscape="false" readonly="true" rows="3" maxlength="200" class="form-control" />
+			</td>
+			<td class="width-15 active"><label class="">是否含立杆工作量：</label></td>
+			<td class="width-35">
+				<form:input path="poleWorkload" htmlEscape="false" readonly="true" rows="3" maxlength="200" class="form-control" />
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">是否含架空线：</label></td>
+			<td class="width-35">
+				<form:input path="oldPoleWorkload" htmlEscape="false" readonly="true" rows="3" maxlength="200" class="form-control" />
+			</td>
+			<td class="width-15 active"><label class="">是否含环网柜：</label></td>
+			<td class="width-35">
+				<form:input path="ringNetworkCabinet" htmlEscape="false" readonly="true" rows="3" maxlength="200" class="form-control" />
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">是否含拆旧环网柜：</label></td>
+			<td class="width-35">
+				<form:input path="oldRingNetworkCabinet" htmlEscape="false" readonly="true" rows="3" maxlength="200" class="form-control" />
+			</td>
+			<td class="width-15 active"><label class="">是否含箱变：</label></td>
+			<td class="width-35">
+				<form:input path="boxTransformer" htmlEscape="false" readonly="true" rows="3" maxlength="200" class="form-control" />
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">是否含拆旧箱变：</label></td>
+			<td class="width-35">
+				<form:input path="oldBoxTransformer" htmlEscape="false" readonly="true" rows="3" maxlength="200" class="form-control" />
+			</td>
+			<td class="width-15 active"><label class="">是否含配变：</label></td>
+			<td class="width-35">
+				<form:input path="distributionTransformer" htmlEscape="false" readonly="true" rows="3" maxlength="200" class="form-control" />
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">是否含拆旧配变：</label></td>
+			<td class="width-35">
+				<form:input path="oldDistributionTransformer" htmlEscape="false" readonly="true" rows="3" maxlength="200" class="form-control" />
+			</td>
+			<td class="width-15 active"><label class="">项目类型（人工判断）：</label></td>
+			<td class="width-35">
+				<form:input path="includeCablesArtificial" htmlEscape="false" rows="3" maxlength="200" class="form-control" />
+			</td>
+		</tr>
+
+		</tbody>
+	</table>
+</form:form>
+</body>
+</html>

src/main/webapp/webpage/modules/cg/reservemanagementcenter/reserveManage/projectTypeVerificate/projectTypeVerificateForm.jsp

@@ -0,0 +1,273 @@
+<%@ 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 review = $("#passProvincialCompanyReview").val();
+
+			if (null==review||""==review){
+				jp.error("请填写是否通过省公司评审！");
+			}
+
+
+		    else {
+                var isValidate = jp.validateForm('#inputForm');//校验表单
+                if(!isValidate){
+                    return false;
+                }else{
+                    jp.loading();
+                    jp.post("${ctx}/cg/reservemanagementcenter/reservePreconstruct/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="verificate" 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="projectManager" readonly="true" htmlEscape="false" class="form-control" />
+			</td>
+			<td class="width-15 active"><label class="">项目年份：</label></td>
+			<td class="width-35">
+				<form:input path="projectYear" readonly="true" htmlEscape="false" class="form-control" />
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">需求单位：</label></td>
+			<td class="width-35">
+				<form:input path="demandUnit" htmlEscape="false"  readonly="true"  class="form-control" />
+			</td>
+			<td class="width-15 active"><label class="">区域：</label></td>
+			<td class="width-35">
+				<form:input path="district" htmlEscape="false"  readonly="true"  class="form-control" />
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">项目分组：</label></td>
+			<td class="width-35">
+				<form:input path="projectGroup" htmlEscape="false"  readonly="true"  class="form-control" />
+			</td>
+			<td class="width-15 active"><label class="">储备批次：</label></td>
+			<td class="width-35">
+				<form:input path="reserveBatches" htmlEscape="false" readonly="true"   class="form-control" />
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">供电区域：</label></td>
+			<td class="width-35">
+				<form:input path="blockSupply" htmlEscape="false"  readonly="true"  class="form-control" />
+			</td>
+			<td class="width-15 active"><label class="">网格编号：</label></td>
+			<td class="width-35">
+				<form:input path="gridNumber" htmlEscape="false"  readonly="true"  class="form-control" />
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">单元格编号：</label></td>
+			<td class="width-35">
+				<form:input path="cellNumber" htmlEscape="false"  readonly="true"  class="form-control" />
+			</td>
+			<td class="width-15 active"><label class="">项目储备编号：</label></td>
+			<td class="width-35">
+				<form:input path="projectReserveId" htmlEscape="false"  readonly="true"  class="form-control required"/>
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">储备项目名称：</label></td>
+			<td class="width-35">
+				<form:input path="projectName" htmlEscape="false"  readonly="true"  class="form-control required" />
+			</td>
+			<td class="width-15 active"><label class="">国网项目编码：</label></td>
+			<td class="width-35">
+				<form:input path="stateGridProjectCode" htmlEscape="false"  readonly="true"  class="form-control" />
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">国网项目名称：</label></td>
+			<td class="width-35">
+				<form:input path="stateGridProjectName" htmlEscape="false"  readonly="true"  class="form-control" />
+			</td>
+			<td class="width-15 active"><label class="">建设必要性及内容：</label></td>
+			<td class="width-35">
+				<form:input path="constructionNecessityAndContent" htmlEscape="false"  readonly="true"  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"  readonly="true"  class="form-control" />
+			</td>
+			<td class="width-15 active"><label class="">线路名称：</label></td>
+			<td class="width-35">
+				<form:input path="circuitName" htmlEscape="false" readonly="true" 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"  readonly="true"  class="form-control" />
+			</td>
+			<td class="width-15 active"><label class="">需求类型：</label></td>
+			<td class="width-35">
+				<form:input path="requirementType" htmlEscape="false" readonly="true" 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" readonly="true" class="form-control number money" />
+			</td>
+			<td class="width-15 active"><label class="">备注：</label></td>
+			<td class="width-35">
+				<form:textarea path="basicRemarks" htmlEscape="false" readonly="true" 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">
+				<form:input path="reserveProgress" htmlEscape="false" readonly="true" rows="3" maxlength="200" class="form-control" />
+			</td>
+			<td class="width-15 active"><label class="">是否纳入实施计划：</label></td>
+			<td class="width-35">
+				<form:input path="implementPlan" htmlEscape="false" readonly="true" rows="3" maxlength="200" 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" readonly="true" 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">
+				<form:input path="projectNature" htmlEscape="false" rows="3" maxlength="200" class="form-control" />
+			</td>
+			<td class="width-15 active"><label class="">是否含变电站新出线：</label></td>
+			<td class="width-35">
+				<form:input path="newSubstation" htmlEscape="false" rows="3" maxlength="200" class="form-control" />
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">是否含资本设备：</label></td>
+			<td class="width-35">
+				<form:input path="includeCapitalEquipment" htmlEscape="false" readonly="true" rows="3" maxlength="200" class="form-control" />
+			</td>
+			<td class="width-15 active"><label class="">项目属性（系统判断）：</label></td>
+			<td class="width-35">
+				<form:input path="projectProperties" htmlEscape="false" readonly="true" rows="3" maxlength="200" class="form-control" />
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">项目性质（人工判断）：</label></td>
+			<td class="width-35">
+				<form:input path="projectNatureArtificial" 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">
+				<form:input path="projectType" htmlEscape="false" rows="3" maxlength="200" class="form-control" />
+			</td>
+			<td class="width-15 active"><label class="">是否含土建：</label></td>
+			<td class="width-35">
+				<form:input path="civilEngineer" htmlEscape="false" readonly="true" rows="3" maxlength="200" class="form-control" />
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">是否含电缆：</label></td>
+			<td class="width-35">
+				<form:input path="includeCables" htmlEscape="false" readonly="true" rows="3" maxlength="200" class="form-control" />
+			</td>
+			<td class="width-15 active"><label class="">是否含立杆工作量：</label></td>
+			<td class="width-35">
+				<form:input path="poleWorkload" htmlEscape="false" readonly="true" rows="3" maxlength="200" class="form-control" />
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">是否含架空线：</label></td>
+			<td class="width-35">
+				<form:input path="oldPoleWorkload" htmlEscape="false" readonly="true" rows="3" maxlength="200" class="form-control" />
+			</td>
+			<td class="width-15 active"><label class="">是否含环网柜：</label></td>
+			<td class="width-35">
+				<form:input path="ringNetworkCabinet" htmlEscape="false" readonly="true" rows="3" maxlength="200" class="form-control" />
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">是否含拆旧环网柜：</label></td>
+			<td class="width-35">
+				<form:input path="oldRingNetworkCabinet" htmlEscape="false" readonly="true" rows="3" maxlength="200" class="form-control" />
+			</td>
+			<td class="width-15 active"><label class="">是否含箱变：</label></td>
+			<td class="width-35">
+				<form:input path="boxTransformer" htmlEscape="false" readonly="true" rows="3" maxlength="200" class="form-control" />
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">是否含拆旧箱变：</label></td>
+			<td class="width-35">
+				<form:input path="oldBoxTransformer" htmlEscape="false" readonly="true" rows="3" maxlength="200" class="form-control" />
+			</td>
+			<td class="width-15 active"><label class="">是否含配变：</label></td>
+			<td class="width-35">
+				<form:input path="distributionTransformer" htmlEscape="false" readonly="true" rows="3" maxlength="200" class="form-control" />
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">是否含拆旧配变：</label></td>
+			<td class="width-35">
+				<form:input path="oldDistributionTransformer" htmlEscape="false" readonly="true" rows="3" maxlength="200" class="form-control" />
+			</td>
+			<td class="width-15 active"><label class="">项目类型（人工判断）：</label></td>
+			<td class="width-35">
+				<form:input path="includeCablesArtificial" htmlEscape="false" rows="3" maxlength="200" class="form-control" />
+			</td>
+		</tr>
+
+		</tbody>
+	</table>
+</form:form>
+</body>
+</html>

src/main/webapp/webpage/modules/cg/reservemanagementcenter/reserveManage/projectTypeVerificate/projectTypeVerificateInfo.js

@@ -0,0 +1,325 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<script >
+$(document).ready(function () {
+    $('#projectTable').bootstrapTable({
+        //请求方法
+        method: 'post',
+        //类型json
+        dataType: "json",
+        contentType: "application/x-www-form-urlencoded",
+        //显示检索按钮
+        showSearch: true,
+        //显示刷新按钮
+        showRefresh: true,
+        //显示切换手机试图按钮
+        showToggle: true,
+        //显示 内容列下拉框
+        showColumns: true,
+        //显示到处按钮
+        showExport: true,
+        //显示切换分页按钮
+        showPaginationSwitch: true,
+        //最低显示2行
+        minimumCountColumns: 2,
+        //是否显示行间隔色
+        striped: true,
+        //是否使用缓存，默认为true，所以一般情况下需要设置一下这个属性（*）
+        cache: false,
+        //是否显示分页（*）
+        pagination: true,
+        //排序方式
+        sortOrder: "asc",
+        //初始化加载第一页，默认第一页
+        pageNumber: 1,
+        //每页的记录行数（*）
+        pageSize: 25,
+        //可供选择的每页的行数（*）
+        pageList: [5, 10, 25, 50, 100],
+        //这个接口需要处理bootstrap table传递的固定参数,并返回特定格式的json数据
+        url: "${ctx}/cg/reservemanagementcenter/projectTypeVerificate/list",
+        //默认值为 'limit',传给服务端的参数为：limit, offset, search, sort, order Else
+        //queryParamsType:'',
+        ////查询参数,每次调用是会带上这个参数，可自定义
+        queryParams: function (params) {
+            var searchParam = $("#searchForm").serializeJSON();
+            searchParam.pageNo = params.limit === undefined ? "1" : params.offset / params.limit + 1;
+            searchParam.pageSize = params.limit === undefined ? -1 : params.limit;
+            searchParam.orderBy = params.sort === undefined ? "" : params.sort + " " + params.order;
+            return searchParam;
+        },
+        //分页方式：client客户端分页，server服务端分页（*）
+        sidePagination: "server",
+        contextMenuTrigger: "right",//pc端 按右键弹出菜单
+        contextMenuTriggerMobile: "press",//手机端 弹出菜单，click：单击， press：长按。
+        contextMenu: '#context-menu',
+        onContextMenuItem: function (row, $el) {
+            if ($el.data("item") == "edit") {
+                edit(row.id);
+            } else if ($el.data("item") == "view") {
+                view(row.id);
+            } else if ($el.data("item") == "delete") {
+                jp.confirm('确认要删除该表单记录吗？', function () {
+                    jp.loading();
+                    jp.get("${ctx}/cg/reservemanagementcenter/project/delete?id=" + row.id, function (data) {
+                        if (data.success) {
+                            $('#projectTable').bootstrapTable('refresh');
+                            jp.success(data.msg);
+                        } else {
+                            jp.error(data.msg);
+                        }
+                    })
+                });
+            }
+        },
+
+        onClickRow: function (row, $el) {
+        },
+        onShowSearch: function () {
+            $("#search-collapse").slideToggle();
+        },
+        columns:
+            [
+                [
+                    {checkbox:true,width: 36},
+                    {"title":"储备项目基本信息","colspan":20,"halign":"center","align": "center",width: "4000px"},
+                    {"title":"储备进度","colspan":3,"halign":"center","align": "center",width: "600px"},
+                    {"title":"项目性质校核","colspan":5,"halign":"center","align": "center",width: "1000px"},
+                    {"title":"项目类型校核","colspan":12,"halign":"center","align": "center",width: "2400px"}
+                ],
+                    [
+                    {checkbox:true,width: 36},
+                        { field: 'projectManager', title: "项目储备经理", valign:"middle", align:"center", colspan: 1 },
+                        { field: 'projectYear', title: "项目年份", valign:"middle", align:"center", colspan: 1 },
+                        { field: 'demandUnit', title: "需求单位", valign:"middle", align:"center", colspan: 1 },
+                        { field: 'district', title: "区域", valign:"middle", align:"center", colspan: 1 },
+                        { field: 'projectGroup', title: "项目分组", valign:"middle", align:"center", colspan: 1 },
+                        { field: 'reserveBatches', title: "储备批次", valign:"middle", align:"center", colspan: 1 },
+                        { field: 'blockSupply', title: "供电区域", valign:"middle", align:"center", colspan: 1 },
+                        { field: 'gridNumber', title: "网格编号", valign:"middle", align:"center", colspan: 1 },
+                        { field: 'cellNumber', title: "单元格编号", valign:"middle", align:"center", colspan: 1 },
+                        { field: 'projectReserveId', title: "项目储备编号", valign:"middle", align:"center", colspan: 1,
+                            formatter:function(value, row , index){
+
+                                if(value == null || value ==""){
+                                    value = "-";
+                                }
+                            <c:choose>
+                                <c:when test="${fns:hasPermission('cg:reservemanagementcenter:reserveManage:view')}">
+                                return "<a href='javascript:view(\""+row.id+"\")'>"+value+"</a>";
+                            </c:when>
+                                <c:otherwise>
+                                return value;
+                            </c:otherwise>
+                                </c:choose>
+                            }},
+                        { field: 'projectName', title: "储备项目名称", valign:"middle", align:"center", colspan: 1,formatter:paramsMatter},
+                        { field: 'stateGridProjectCode', title: "国网项目编码", valign:"middle", align:"center", colspan: 1,formatter:paramsMatter},
+                        { field: 'stateGridProjectName', title: "国网项目名称", valign:"middle", align:"center", colspan: 1,formatter:paramsMatter},
+                        { field: 'constructionNecessityAndContent', title: "建设必要性及内容", valign:"middle", align:"center", colspan: 1,formatter:paramsMatter},
+                        { field: 'substationName', title: "变电站名称", valign:"middle", align:"center", colspan: 1 },
+                        { field: 'circuitName', title: "线路名称", valign:"middle", align:"center", colspan: 1 },
+                        { field: 'netRackProjectDivide', title: "网架项目划分", valign:"middle", align:"center", colspan: 1 },
+                        { field: 'requirementType', title: "需求类型", valign:"middle", align:"center", colspan: 1 },
+                        { field: 'costEstimate', title: "费用估算", valign:"middle", align:"center", colspan: 1 },
+                        { field: 'basicRemarks', title: "备注", valign:"middle", align:"center", colspan: 1 ,formatter:paramsMatter},
+
+                        { field: 'reserveProgress', title: "储备进度", valign:"middle", align:"center", colspan: 1 },
+                        { field: 'implementPlan', title: "是否纳入实施计划", valign:"middle", align:"center", colspan: 1 },
+                        { field: 'implementBatch', title: "初定实施批次", valign:"middle", align:"center", colspan: 1 },
+
+
+                        { field: 'projectNature', title: "项目性质（初定）", valign:"middle", align:"center", colspan: 1 },
+                        { field: 'newSubstation', title: "是否含变电站新出线", valign:"middle", align:"center", colspan: 1 },
+                        { field: 'includeCapitalEquipment', title: "是否含资本设备", valign:"middle", align:"center", colspan: 1 },
+                        { field: 'projectProperties', title: "项目属性（系统判断）", valign:"middle", align:"center", colspan: 1 },
+                        { field: 'projectNatureArtificial', title: "项目性质（人工判断）", valign:"middle", align:"center", colspan: 1 },
+
+                        { field: 'projectType', title: "项目类型（初定）", valign:"middle", align:"center", colspan: 1 },
+                        { field: 'civilEngineer', title: "是否含土建", valign:"middle", align:"center", colspan: 1 },
+                        { field: 'includeCables', title: "是否含电缆", valign:"middle", align:"center", colspan: 1 },
+                        { field: 'poleWorkload', title: "是否含立杆工作量", valign:"middle", align:"center", colspan: 1 },
+                        { field: 'oldPoleWorkload', title: "是否含架空线", valign:"middle", align:"center", colspan: 1 },
+                        { field: 'ringNetworkCabinet', title: "是否含环网柜", valign:"middle", align:"center", colspan: 1 },
+                        { field: 'oldRingNetworkCabinet', title: "是否含拆旧环网柜", valign:"middle", align:"center", colspan: 1 },
+                        { field: 'boxTransformer', title: "是否含箱变", valign:"middle", align:"center", colspan: 1 },
+                        { field: 'oldBoxTransformer', title: "是否含拆旧箱变", valign:"middle", align:"center", colspan: 1 },
+                        { field: 'distributionTransformer', title: "是否含配变", valign:"middle", align:"center", colspan: 1 },
+                        { field: 'oldDistributionTransformer', title: "是否含拆旧配变", valign:"middle", align:"center", colspan: 1 },
+                        { field: 'includeCablesArtificial', title: "项目类型（人工判断）", valign:"middle", align:"center", colspan: 1 },
+                    ],
+
+        ]
+    });
+
+
+    if (navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)) {//如果是移动端
+        $('#projectTable').bootstrapTable("toggleView");
+    }
+
+    $('#projectTable').on('check.bs.table uncheck.bs.table load-success.bs.table ' +
+        'check-all.bs.table uncheck-all.bs.table', function () {
+        $('#remove').prop('disabled', !$('#projectTable').bootstrapTable('getSelections').length);
+        $('#view,#edit,#jlEdit').prop('disabled', $('#projectTable').bootstrapTable('getSelections').length != 1);
+    });
+
+    $("#btnImport").click(function () {
+        jp.open({
+            type: 2,
+            area: [500, 200],
+            auto: true,
+            title: "导入数据",
+            content: "${ctx}/tag/importExcel",
+            btn: ['确定', '关闭'],
+            btn1: function (index, layero) {
+                var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
+                iframeWin.contentWindow.importExcel('${ctx}/cg/reservemanagementcenter/projectTypeVerificate/import', function (data) {
+                    if (data.success) {
+                        jp.success(data.msg);
+                        refresh();
+                    } else {
+                        jp.error(data.msg);
+                    }
+                    jp.close(index);
+                });//调用保存事件
+                return false;
+            },
+            btn2: function (index) {
+                //  jp.close(index);
+            }
+        });
+    });
+
+    $("#jlImport").click(function () {
+        jp.open({
+            type: 2,
+            area: [500, 200],
+            auto: true,
+            title: "导入数据",
+            content: "${ctx}/tag/importExcel",
+            btn: ['确定', '关闭'],
+            btn1: function (index, layero) {
+                var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
+                iframeWin.contentWindow.importExcel('${ctx}/cg/reservemanagementcenter/summaryStatistics/jlImport', function (data) {
+                    if (data.success) {
+                        jp.success(data.msg);
+                        refresh();
+                    } else {
+                        jp.error(data.msg);
+                    }
+                    jp.close(index);
+                });//调用保存事件
+                return false;
+            },
+
+            btn2: function (index) {
+                //  jp.close(index);
+            }
+        });
+    });
+
+    $("#btnExport").click(function () {
+        var projectReserveId = $("#projectReserveId").val();
+        var projectName = $("#projectName").val();
+        jp.downloadFile('${ctx}/cg/reservemanagementcenter/projectTypeVerificate/export?projectReserveId=' + projectReserveId + '&projectName=' + projectName);
+    });
+
+    $("#search").click("click", function () {// 绑定查询按扭
+        $('#projectTable').bootstrapTable('refresh');
+    });
+
+    $("#reset").click("click", function () {// 绑定查询按扭
+        $("#searchForm  input").val("");
+        $("#searchForm  select").val("");
+        $("#searchForm  .select-item").html("");
+        $('#projectTable').bootstrapTable('refresh');
+    });
+
+    $('#beginBeginDate').datetimepicker({
+        format: "YYYY-MM-DD HH:mm:ss"
+    });
+    $('#endBeginDate').datetimepicker({
+        format: "YYYY-MM-DD HH:mm:ss"
+    });
+    $('#endDate').datetimepicker({
+        format: "YYYY-MM-DD HH:mm:ss"
+    });
+});
+
+//表格超出宽度鼠标悬停显示td内容
+function paramsMatter(value,row,index,field) {
+    var span = document.createElement('span');
+    span.setAttribute('title',value);
+    span.innerHTML = value;
+    return span.outerHTML;
+}
+
+function getIdSelections() {
+    return $.map($("#projectTable").bootstrapTable('getSelections'), function (row) {
+        return row.id
+    });
+}
+
+
+//刷新列表
+function refresh() {
+    $('#projectTable').bootstrapTable('refresh');
+}
+
+function add() {
+    jp.openSaveDialog('新增储备项目基本信息', "${ctx}/cg/reservemanagementcenter/summaryStatistics/form", '800px', '500px');
+}
+
+
+function edit(id) {//没有权限时，不显示确定按钮
+    if (id == undefined) {
+        id = getIdSelections();
+    }
+    jp.openSaveDialog('编辑省公司评审信息', "${ctx}/cg/reservemanagementcenter/projectTypeVerificate/form?id=" + id, '800px', '500px');
+}
+
+function jlEdit(id) {//没有权限时，不显示确定按钮
+    if (id == undefined) {
+        id = getIdSelections();
+    }
+    jp.openSaveDialog('编辑储备项目基本信息', "${ctx}/cg/reservemanagementcenter/summaryStatistics/jlEdit?id=" + id, '800px', '500px');
+}
+
+function view(id) {//没有权限时，不显示确定按钮
+    if (id == undefined) {
+        id = getIdSelections();
+    }
+    jp.openViewDialog('查看省公司评审信息', "${ctx}/cg/reservemanagementcenter/projectTypeVerificate/view?id=" + id, '800px', '500px');
+}
+
+function deleteAll(){
+
+    jp.confirm('确认要删除该储备项目基本信息吗？', function(){
+        jp.loading();
+        jp.get("${ctx}/cg/reservemanagementcenter/summaryStatistics/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/cg/reservemanagementcenter/reserveManage/projectTypeVerificate/projectTypeVerificateInfo.jsp

@@ -0,0 +1,107 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<%@ include file="/webpage/include/taglib.jsp"%>
+<html>
+<head>
+	<title>项目储备信息</title>
+	<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+	<meta name="decorator" content="ani"/>
+	<%@ include file="/webpage/include/bootstraptable.jsp"%>
+	<%@include file="/webpage/include/treeview.jsp" %>
+	<%@include file="projectTypeVerificateInfo.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;
+			white-space: nowrap;
+			overflow: hidden;
+			text-overflow: ellipsis;
+			word-wrap:break-word;
+		}
+		.bootstrap-table .table thead>tr>th {
+			padding: 0;
+			margin: 0;
+			width: 3000px;
+		}
+	</style>
+</head>
+<body>
+	<div class="wrapper wrapper-content">
+	<div class="panel panel-primary">
+	<div class="panel-heading">
+		<h3 class="panel-title">项目储备信息</h3>
+	</div>
+	<div class="panel-body">
+		<!-- 搜索 -->
+		<div id="search-collapse" class="collapse">
+			<div class="accordion-inner">
+				<form:form id="searchForm" modelAttribute="review" class="form form-horizontal well clearfix">
+					<div class="col-xs-12 col-sm-6 col-md-4">
+						<label class="label-item single-overflow pull-left" title="储备编码：">储备编码：</label>
+						<form:input path="projectReserveId" htmlEscape="false" maxlength="100"  class=" form-control"/>
+					</div>
+					<div class="col-xs-12 col-sm-6 col-md-4">
+						<label class="label-item single-overflow pull-left" title="项目名称：">项目名称：</label>
+						<form:input path="projectName" htmlEscape="false" maxlength="100"  class=" form-control"/>
+					</div>
+					<div class="col-xs-12 col-sm-6 col-md-4">
+						<div style="margin-top:26px">
+							<a  id="search" class="btn btn-primary btn-rounded  btn-bordered btn-sm"><i class="fa fa-search"></i> 查询</a>
+							<a  id="reset" class="btn btn-primary btn-rounded  btn-bordered btn-sm" ><i class="fa fa-refresh"></i> 重置</a>
+						</div>
+					</div>
+				</form:form>
+			</div>
+		</div>
+
+	<!-- 工具栏 -->
+	<div id="toolbar">
+<%--			<shiro:hasPermission name="cg:reservemanagementcenter:summaryStatistics:add">--%>
+<%--				<button id="add" class="btn btn-primary" onclick="add()">--%>
+<%--					<i class="glyphicon glyphicon-plus"></i> 新增--%>
+<%--				</button>--%>
+<%--			</shiro:hasPermission>--%>
+			<shiro:hasPermission name="cg:reservemanagementcenter:projectTypeVerificate: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:jlEdit">
+				<button id="jlEdit" class="btn btn-primary" onclick="jlEdit()">
+					<i class="glyphicon glyphicon-edit"></i> 修改 <!--经理修改-->
+				</button>
+			</shiro:hasPermission>--%>
+<%--			<shiro:hasPermission name="cg:reservemanagementcenter:summaryStatistics:del">--%>
+<%--				<button id="remove" class="btn btn-danger" onclick="deleteAll()">--%>
+<%--					<i class="glyphicon glyphicon-remove"></i> 删除--%>
+<%--				</button>--%>
+<%--			</shiro:hasPermission>--%>
+			<shiro:hasPermission name="cg:reservemanagementcenter:projectTypeVerificate:import">
+				<button id="btnImport" class="btn btn-info">
+					<i class="fa fa-folder-open-o"></i> 导入  <!--专职导入-->
+				</button>
+			</shiro:hasPermission>
+<%--			<shiro:hasPermission name="sg:managementcenter:reserveManagement:jlImport">
+				<button id="jlImport" class="btn btn-info">
+					<i class="fa fa-folder-open-o"></i> 导入  <!--经理导入-->
+				</button>
+			</shiro:hasPermission>--%>
+			<shiro:hasPermission name="cg:reservemanagementcenter:projectTypeVerificate:export">
+				<button id="btnExport" class="btn btn-warning">
+					<i class="fa fa-file-excel-o"></i> 导出
+				</button>
+			</shiro:hasPermission>
+		    </div>
+	<!-- 表格 -->
+	<table id="projectTable" style="table-layout:fixed" class="table" data-toolbar="#toolbar"></table>
+
+	</div>
+	</div>
+	</div>
+</body>
+</html>

src/main/webapp/webpage/modules/cg/reservemanagementcenter/reserveManage/projectTypeVerificate/projectTypeVerificateView.jsp

@@ -0,0 +1,260 @@
+<%@ 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="verificate" 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="projectManager" readonly="true" htmlEscape="false" class="form-control" />
+			</td>
+			<td class="width-15 active"><label class="">项目年份：</label></td>
+			<td class="width-35">
+				<form:input path="projectYear" readonly="true" htmlEscape="false" class="form-control" />
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">需求单位：</label></td>
+			<td class="width-35">
+				<form:input path="demandUnit" htmlEscape="false"  readonly="true"  class="form-control" />
+			</td>
+			<td class="width-15 active"><label class="">区域：</label></td>
+			<td class="width-35">
+				<form:input path="district" htmlEscape="false"  readonly="true"  class="form-control" />
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">项目分组：</label></td>
+			<td class="width-35">
+				<form:input path="projectGroup" htmlEscape="false"  readonly="true"  class="form-control" />
+			</td>
+			<td class="width-15 active"><label class="">储备批次：</label></td>
+			<td class="width-35">
+				<form:input path="reserveBatches" htmlEscape="false" readonly="true"   class="form-control" />
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">供电区域：</label></td>
+			<td class="width-35">
+				<form:input path="blockSupply" htmlEscape="false"  readonly="true"  class="form-control" />
+			</td>
+			<td class="width-15 active"><label class="">网格编号：</label></td>
+			<td class="width-35">
+				<form:input path="gridNumber" htmlEscape="false"  readonly="true"  class="form-control" />
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">单元格编号：</label></td>
+			<td class="width-35">
+				<form:input path="cellNumber" htmlEscape="false"  readonly="true"  class="form-control" />
+			</td>
+			<td class="width-15 active"><label class="">项目储备编号：</label></td>
+			<td class="width-35">
+				<form:input path="projectReserveId" htmlEscape="false"  readonly="true"  class="form-control required"/>
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">储备项目名称：</label></td>
+			<td class="width-35">
+				<form:input path="projectName" htmlEscape="false"  readonly="true"  class="form-control required" />
+			</td>
+			<td class="width-15 active"><label class="">国网项目编码：</label></td>
+			<td class="width-35">
+				<form:input path="stateGridProjectCode" htmlEscape="false"  readonly="true"  class="form-control" />
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">国网项目名称：</label></td>
+			<td class="width-35">
+				<form:input path="stateGridProjectName" htmlEscape="false"  readonly="true"  class="form-control" />
+			</td>
+			<td class="width-15 active"><label class="">建设必要性及内容：</label></td>
+			<td class="width-35">
+				<form:input path="constructionNecessityAndContent" htmlEscape="false"  readonly="true"  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"  readonly="true"  class="form-control" />
+			</td>
+			<td class="width-15 active"><label class="">线路名称：</label></td>
+			<td class="width-35">
+				<form:input path="circuitName" htmlEscape="false" readonly="true" 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"  readonly="true"  class="form-control" />
+			</td>
+			<td class="width-15 active"><label class="">需求类型：</label></td>
+			<td class="width-35">
+				<form:input path="requirementType" htmlEscape="false" readonly="true" 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" readonly="true" class="form-control number money" />
+			</td>
+			<td class="width-15 active"><label class="">备注：</label></td>
+			<td class="width-35">
+				<form:textarea path="basicRemarks" htmlEscape="false" readonly="true" 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">
+				<form:input path="reserveProgress" htmlEscape="false" readonly="true" rows="3" maxlength="200" class="form-control" />
+			</td>
+			<td class="width-15 active"><label class="">是否纳入实施计划：</label></td>
+			<td class="width-35">
+				<form:input path="implementPlan" htmlEscape="false" readonly="true" rows="3" maxlength="200" 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" readonly="true" 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">
+				<form:input path="projectNature" htmlEscape="false" readonly="true" rows="3" maxlength="200" class="form-control" />
+			</td>
+			<td class="width-15 active"><label class="">是否含变电站新出线：</label></td>
+			<td class="width-35">
+				<form:input path="newSubstation" htmlEscape="false" readonly="true" rows="3" maxlength="200" class="form-control" />
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">是否含资本设备：</label></td>
+			<td class="width-35">
+				<form:input path="includeCapitalEquipment" htmlEscape="false" readonly="true" rows="3" maxlength="200" class="form-control" />
+			</td>
+			<td class="width-15 active"><label class="">项目属性（系统判断）：</label></td>
+			<td class="width-35">
+				<form:input path="projectProperties" htmlEscape="false" readonly="true" rows="3" maxlength="200" class="form-control" />
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">项目性质（人工判断）：</label></td>
+			<td class="width-35">
+				<form:input path="projectNatureArtificial" htmlEscape="false" readonly="true" 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">
+				<form:input path="projectType" htmlEscape="false" rows="3" readonly="true" maxlength="200" class="form-control" />
+			</td>
+			<td class="width-15 active"><label class="">是否含土建：</label></td>
+			<td class="width-35">
+				<form:input path="civilEngineer" htmlEscape="false" readonly="true" rows="3" maxlength="200" class="form-control" />
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">是否含电缆：</label></td>
+			<td class="width-35">
+				<form:input path="includeCables" htmlEscape="false" readonly="true" rows="3" maxlength="200" class="form-control" />
+			</td>
+			<td class="width-15 active"><label class="">是否含立杆工作量：</label></td>
+			<td class="width-35">
+				<form:input path="poleWorkload" htmlEscape="false" readonly="true" rows="3" maxlength="200" class="form-control" />
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">是否含架空线：</label></td>
+			<td class="width-35">
+				<form:input path="oldPoleWorkload" htmlEscape="false" readonly="true" rows="3" maxlength="200" class="form-control" />
+			</td>
+			<td class="width-15 active"><label class="">是否含环网柜：</label></td>
+			<td class="width-35">
+				<form:input path="ringNetworkCabinet" htmlEscape="false" readonly="true" rows="3" maxlength="200" class="form-control" />
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">是否含拆旧环网柜：</label></td>
+			<td class="width-35">
+				<form:input path="oldRingNetworkCabinet" htmlEscape="false" readonly="true" rows="3" maxlength="200" class="form-control" />
+			</td>
+			<td class="width-15 active"><label class="">是否含箱变：</label></td>
+			<td class="width-35">
+				<form:input path="boxTransformer" htmlEscape="false" readonly="true" rows="3" maxlength="200" class="form-control" />
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">是否含拆旧箱变：</label></td>
+			<td class="width-35">
+				<form:input path="oldBoxTransformer" htmlEscape="false" readonly="true" rows="3" maxlength="200" class="form-control" />
+			</td>
+			<td class="width-15 active"><label class="">是否含配变：</label></td>
+			<td class="width-35">
+				<form:input path="distributionTransformer" htmlEscape="false" readonly="true" rows="3" maxlength="200" class="form-control" />
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">是否含拆旧配变：</label></td>
+			<td class="width-35">
+				<form:input path="oldDistributionTransformer" htmlEscape="false" readonly="true" rows="3" maxlength="200" class="form-control" />
+			</td>
+			<td class="width-15 active"><label class="">项目类型（人工判断）：</label></td>
+			<td class="width-35">
+				<form:input path="includeCablesArtificial" htmlEscape="false" readonly="true" rows="3" maxlength="200" class="form-control" />
+			</td>
+		</tr>
+
+		</tbody>
+	</table>
+</form:form>
+</body>
+</html>

src/main/webapp/webpage/modules/cg/reservemanagementcenter/reserveManage/reserveElectricityWork/reserveManagementForm.jsp

@@ -95,16 +95,20 @@
 			<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>
+		</tr>
+		<tr>
 			<td class="width-15 active"><label class="">项目分组：</label></td>
 			<td class="width-35">
 				<form:input path="projectGroup" htmlEscape="false"    class="form-control"/>
 			</td>
+			<td class="width-15 active"><label class="">项目储备经理：</label></td>
+			<td class="width-35">
+				<form:input path="projectManager" htmlEscape="false"  readonly="true"  class="form-control"/>
+			</td>
 		</tr>
 		<tr>
 			<td class="width-15 active"><label class="">储备批次：</label></td>
@@ -131,50 +135,53 @@
 			<td class="width-35">
 				<form:input path="projectReserveId" htmlEscape="false"  readonly="true"  class="form-control required"/>
 			</td>
-		</tr>
-		<tr>
 			<td class="width-15 active"><label class=""><font color="red">*</font>项目名称：</label></td>
 			<td class="width-35">
 				<form:input path="projectName" htmlEscape="false"    class="form-control required"/>
 			</td>
-			<td class="width-15 active"><label class=""><font color="red">*</font>建设必要性及内容：</label></td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">国网项目编码：</label></td>
 			<td class="width-35">
-				<form:input path="constructionNecessityAndContent" htmlEscape="false"    class="form-control"/>
+				<form:input path="stateGridProjectCode" htmlEscape="false"  readonly="true"  class="form-control"/>
+			</td>
+			<td class="width-15 active"><label class="">国网项目名称：</label></td>
+			<td class="width-35">
+				<form:input path="stateGridProjectName" htmlEscape="false"  readonly="true"  class="form-control"/>
 			</td>
 		</tr>
 		<tr>
+			<td class="width-15 active"><label class=""><font color="red">*</font>建设必要性及内容：</label></td>
+			<td class="width-35">
+				<form:input path="constructionNecessityAndContent" htmlEscape="false"    class="form-control"/>
+			</td>
 			<td class="width-15 active"><label class="">变电站名称：</label></td>
 			<td class="width-35">
 				<form:input path="substationName" htmlEscape="false"    class="form-control"/>
 			</td>
+		</tr>
+		<tr>
 			<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>
+		</tr>
+		<tr>
 			<td class="width-15 active"><label class="">需求类型：</label></td>
 			<td class="width-35">
 				<form:input path="requirementType" 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">
-				<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>
+			<td colspan="4" class="width-15 active"><label class="">储备进度：</label></td>
 		</tr>
 		<tr>
 			<td class="width-15 active"><label class="">储备进度：</label></td>
@@ -191,71 +198,59 @@
 			<td class="width-35">
 				<form:input path="implementBatch" readonly="true" htmlEscape="false" class="form-control"/>
 			</td>
-			<td class="width-15 active"><label class="">是否变压器或打包项目：</label></td>
-			<td class="width-35">
-				<form:input path="teansFormerOrPackageProject" htmlEscape="false" class="form-control"/>
-			</td>
 		</tr>
 		<tr>
-			<td class="width-15 active"><label class="">是否打包项目：</label></td>
-			<td class="width-35">
-				<form:input path="packageProject" htmlEscape="false" class="form-control"/>
-			</td>
-			<td class="width-15 active"><label class="">打包项目设备数量：</label></td>
-			<td class="width-35">
-				<form:input path="packageItemQuantity" htmlEscape="false" class="form-control"/>
-			</td>
+			<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-15 active"><label class="">项目类型：</label></td>
 			<td class="width-35">
-				<form:input path="deviceName" htmlEscape="false" class="form-control"/>
+				<form:input path="projectType" htmlEscape="false" class="form-control"/>
 			</td>
-			<td class="width-15 active"><label class=""><font color="red">*</font>是否带电作业：</label></td>
+			<td class="width-15 active"><label class=""><font color="red">*</font>是否含带电作业：</label></td>
 			<td class="width-35">
 				<select id="workWithElectricity" name="workWithElectricity"  class="form-control">
 					<option value="">请选择</option>
 					<option value="是" <c:if test="${reserveManagement.workWithElectricity=='是'}">selected</c:if>>是</option>
 					<option value="否" <c:if test="${reserveManagement.workWithElectricity=='否'}">selected</c:if>>否</option>
 				</select>
-					<%--				<form:input path="workWithElectricity" htmlEscape="false" class="form-control"/>--%>
 			</td>
 		</tr>
 		<tr>
-			<td class="width-15 active"><label class="">带电作业类型编号：</label></td>
+			<td class="width-15 active"><label class="">用户分界开关数量：</label></td>
 			<td class="width-35">
-				<form:select path="electricityTypeNumber" class="form-control m-b">--%>
-					<form:option value="" label="请选择"/>
-					<form:options items="${fns:getDictList('electricityType')}" itemLabel="label" itemValue="value"
-								  htmlEscape="false"/>
-				</form:select>
+				<form:input path="boundarySwitchNum" htmlEscape="false" class="form-control"/>
 			</td>
-			<td class="width-15 active"><label class="">带电作业次数：</label></td>
+			<td class="width-15 active"><label class=""><font color="red">*</font>带电作业类型编号/次数：</label></td>
 			<td class="width-35">
-				<form:input path="electricityWorkNumber" htmlEscape="false" class="form-control"/>
+				<form:input path="hotLineWorkTypeNo" htmlEscape="false" class="form-control"/>
 			</td>
 		</tr>
 		<tr>
-			<td class="width-15 active"><label class="">不停电作业方案：</label></td>
+			<td class="width-15 active"><label class=""><font color="red">*</font>不停电作业方案：</label></td>
 			<td class="width-35">
 				<form:input path="noStopWorkPlan" htmlEscape="false" class="form-control"/>
 			</td>
-			<td class="width-15 active"><label class="">无法不停电作业原因：</label></td>
+			<td class="width-15 active"><label class=""><font color="red">*</font>节约停电时户数：</label></td>
 			<td class="width-35">
-				<form:input path="reasonsForNotWorkInterruption" htmlEscape="false" class="form-control"/>
+				<form:input path="powerFailureNum" htmlEscape="false" class="form-control"/>
 			</td>
 		</tr>
 		<tr>
+			<td class="width-15 active"><label class="">无法不停电作业原因：</label></td>
+			<td class="width-35">
+				<form:input path="reasonsForNotWorkInterruption" htmlEscape="false" class="form-control"/>
+			</td>
 			<td class="width-15 active"><label class="">停电作业方案：</label></td>
 			<td class="width-35">
 				<form:input path="powerOutagePlan" htmlEscape="false" class="form-control"/>
 			</td>
+		</tr>
+		<tr>
 			<td class="width-15 active"><label class=""><font color="red">*</font>方案编制人：</label></td>
 			<td class="width-35">
 				<form:input path="planner" htmlEscape="false" class="form-control"/>
 			</td>
-		</tr>
-		<tr>
 			<td class="width-15 active"><label class=""><font color="red">*</font>现场查勘人：</label></td>
 			<td class="width-35">
 				<form:input path="siteSurveyor" htmlEscape="false" class="form-control"/>

src/main/webapp/webpage/modules/cg/reservemanagementcenter/reserveManage/reserveElectricityWork/reserveManagementInformation.js

@@ -82,6 +82,7 @@ $(document).ready(function () {
                 [
                     {checkbox:true,width: 36},
                     {"title":"储备项目基本信息","colspan":21,width: "4200px"},
+                    {"title":"储备进度","colspan":3,width: "600px"},
                     {"title":"带电作业信息","colspan":10,width: "2000px"}
                 ],
                 [
@@ -91,6 +92,7 @@ $(document).ready(function () {
                     {field:'demandUnit',title: '需求单位',valign:"middle",align: "center"},
                     {field:'district',title: '区域',valign:"middle",align: "center"},
                     {field:'projectGroup',title: '项目分组',valign:"middle",align: "center"},
+                    {field:'projectManager',title: '项目经理',valign:"middle",align: "center"},
                     {field:'reserveBatches',title: '储备批次',valign:"middle",align: "center"},
                     {field:'blockSupply',title: '供电区域',valign:"middle",align: "center"},
                     {field:'gridNumber',title: '网格编号',valign:"middle",align: "center"},
@@ -111,14 +113,16 @@ $(document).ready(function () {
                             </c:choose>
                         }
                     },
-                    {field:'projectName',title: '项目名称',formatter:paramsMatter},
+                    {field:'projectName',title: '储备项目名称',formatter:paramsMatter},
+                    {field:'stateGridProjectCode',title: '国网项目编码'},
+                    {field:'stateGridProjectName',title: '国网项目名称',formatter:paramsMatter},
                     {field:'constructionNecessityAndContent',title: '建设必要性及内容',valign:"middle",align: "center",formatter:paramsMatter},
                     {field:'substationName',title: '变电站名称',valign:"middle",align: "center"},
                     {field:'circuitName',title: '线路名称',valign:"middle",align: "center"},
                     {field:'netRackProjectDivide',title: '网架项目划分',valign:"middle",align: "center"},
                     {field:'requirementType',title: '需求类型',valign:"middle",align: "center"},
+                    {field:'projectType',title: '项目类型',valign:"middle",align: "center"},
                     {field:'costEstimate',title: '费用估算',valign:"middle",align: "center"},
-                    {field:'basicRemarks',title: '备注',valign:"middle",align: "center",formatter:paramsMatter},
                     {field:'reserveProgress',title: '储备进度',valign:"middle",align: "center",formatter:paramsMatter},
                     {field:'implementPlan',title: '是否纳入实施计划',valign:"middle",align: "center"},
                     {field:'implementBatch',title: '初定实施批次',valign:"middle",align: "center",formatter:paramsMatter},

src/main/webapp/webpage/modules/cg/reservemanagementcenter/reserveManage/reserveElectricityWork/reserveManagementModifyByzz.jsp

@@ -97,71 +97,83 @@
 			<td class="width-35">
 				<form:input path="projectGroup" htmlEscape="false"    class="form-control" readonly="true"/>
 			</td>
-			<td class="width-15 active"><label class="">储备批次：</label></td>
+			<td class="width-15 active"><label class="">项目储备经理：</label></td>
 			<td class="width-35">
-				<form:input path="reserveBatches" htmlEscape="false"    class="form-control" readonly="true"/>
+				<form:input path="projectManager" htmlEscape="false"  readonly="true"  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" readonly="true"/>
+			</td>
 			<td class="width-15 active"><label class="">供电区域：</label></td>
 			<td class="width-35">
 				<form:input path="blockSupply" htmlEscape="false"    class="form-control" readonly="true"/>
 			</td>
+		</tr>
+		<tr>
 			<td class="width-15 active"><label class=""><font color="red">*</font>网格编号：</label></td>
 			<td class="width-35">
 				<form:input path="gridNumber" htmlEscape="false"    class="form-control" readonly="true"/>
 			</td>
-		</tr>
-		<tr>
 			<td class="width-15 active"><label class=""><font color="red">*</font>单元格编号：</label></td>
 			<td class="width-35">
 				<form:input path="cellNumber" htmlEscape="false"    class="form-control" readonly="true"/>
 			</td>
+		</tr>
+		<tr>
 			<td class="width-15 active"><label class=""><font color="red">*</font>项目储备编号：</label></td>
 			<td class="width-35">
 				<form:input path="projectReserveId" htmlEscape="false"  readonly="true"  class="form-control required"/>
 			</td>
-		</tr>
-
-		<tr>
 			<td class="width-15 active"><label class=""><font color="red">*</font>项目名称：</label></td>
 			<td class="width-35">
 				<form:input path="projectName" htmlEscape="false"    class="form-control required" readonly="true"/>
 			</td>
-			<td class="width-15 active"><label class=""><font color="red">*</font>建设必要性及内容：</label></td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">国网项目编码：</label></td>
 			<td class="width-35">
-				<form:input path="constructionNecessityAndContent" htmlEscape="false"    class="form-control" readonly="true"/>
+				<form:input path="stateGridProjectCode" htmlEscape="false"  readonly="true"  class="form-control"/>
+			</td>
+			<td class="width-15 active"><label class="">国网项目名称：</label></td>
+			<td class="width-35">
+				<form:input path="stateGridProjectName" htmlEscape="false"  readonly="true"  class="form-control"/>
 			</td>
 		</tr>
 		<tr>
+			<td class="width-15 active"><label class=""><font color="red">*</font>建设必要性及内容：</label></td>
+			<td class="width-35">
+				<form:input path="constructionNecessityAndContent" htmlEscape="false"    class="form-control" readonly="true"/>
+			</td>
 			<td class="width-15 active"><label class="">变电站名称：</label></td>
 			<td class="width-35">
 				<form:input path="substationName" htmlEscape="false"    class="form-control" readonly="true"/>
 			</td>
+		</tr>
+		<tr>
 			<td class="width-15 active"><label class="">线路名称：</label></td>
 			<td class="width-35">
 				<form:input path="circuitName" htmlEscape="false"    class="form-control" readonly="true"/>
 			</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" readonly="true"/>
 			</td>
+		</tr>
+		<tr>
 			<td class="width-15 active"><label class="">需求类型：</label></td>
 			<td class="width-35">
 				<form:input path="requirementType" htmlEscape="false"    class="form-control" readonly="true"/>
 			</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" readonly="true"/>
 			</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" readonly="true"/>
-			</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>

src/main/webapp/webpage/modules/cg/reservemanagementcenter/reserveManage/reserveElectricityWork/reserveManagementView.jsp

@@ -66,71 +66,84 @@
 			<td class="width-35">
 				<form:input path="projectGroup" htmlEscape="false" readonly="true" class="form-control"/>
 			</td>
-			<td class="width-15 active"><label class="">储备批次：</label></td>
+			<td class="width-15 active"><label class="">项目储备经理：</label></td>
 			<td class="width-35">
-				<form:input path="reserveBatches" htmlEscape="false"  readonly="true"  class="form-control"/>
+				<form:input path="projectManager" htmlEscape="false"  readonly="true"  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"  readonly="true"  class="form-control"/>
+			</td>
 			<td class="width-15 active"><label class="">供电区域：</label></td>
 			<td class="width-35">
 				<form:input path="blockSupply" htmlEscape="false"  readonly="true"  class="form-control"/>
 			</td>
+		</tr>
+		<tr>
 			<td class="width-15 active"><label class=""><font color="red">*</font>网格编号：</label></td>
 			<td class="width-35">
 				<form:input path="gridNumber" htmlEscape="false"  readonly="true"  class="form-control"/>
 			</td>
-		</tr>
-		<tr>
 			<td class="width-15 active"><label class=""><font color="red">*</font>单元格编号：</label></td>
 			<td class="width-35">
 				<form:input path="cellNumber" htmlEscape="false"  readonly="true"  class="form-control"/>
 			</td>
+		</tr>
+		<tr>
 			<td class="width-15 active"><label class=""><font color="red">*</font>项目储备编号：</label></td>
 			<td class="width-35">
 				<form:input path="projectReserveId" htmlEscape="false" readonly="true" class="form-control required"/>
 			</td>
+			<td class="width-15 active"><label class=""><font color="red">*</font>储备项目名称：</label></td>
+			<td class="width-35">
+				<form:input path="projectName" htmlEscape="false"  readonly="true"  class="form-control required"/>
+			</td>
 		</tr>
-
 		<tr>
-			<td class="width-15 active"><label class=""><font color="red">*</font>项目名称：</label></td>
+			<td class="width-15 active"><label class="">国网项目编码：</label></td>
 			<td class="width-35">
-				<form:input path="projectName" htmlEscape="false"  readonly="true"  class="form-control required"/>
+				<form:input path="stateGridProjectCode" htmlEscape="false"  readonly="true"  class="form-control"/>
 			</td>
-			<td class="width-15 active"><label class=""><font color="red">*</font>建设必要性及内容：</label></td>
+			<td class="width-15 active"><label class="">国网项目名称：</label></td>
 			<td class="width-35">
-				<form:input path="constructionNecessityAndContent" htmlEscape="false"  readonly="true"  class="form-control"/>
+				<form:input path="stateGridProjectName" htmlEscape="false"  readonly="true"  class="form-control"/>
 			</td>
 		</tr>
+
 		<tr>
+			<td class="width-15 active"><label class=""><font color="red">*</font>建设必要性及内容：</label></td>
+			<td class="width-35">
+				<form:input path="constructionNecessityAndContent" htmlEscape="false"  readonly="true"  class="form-control"/>
+			</td>
 			<td class="width-15 active"><label class="">变电站名称：</label></td>
 			<td class="width-35">
 				<form:input path="substationName" htmlEscape="false"  readonly="true"  class="form-control"/>
 			</td>
+		</tr>
+		<tr>
 			<td class="width-15 active"><label class="">线路名称：</label></td>
 			<td class="width-35">
 				<form:input path="circuitName" htmlEscape="false"  readonly="true"  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"  readonly="true"  class="form-control"/>
 			</td>
+		</tr>
+		<tr>
 			<td class="width-15 active"><label class="">需求类型：</label></td>
 			<td class="width-35">
 				<form:input path="requirementType" htmlEscape="false"  readonly="true"  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"  readonly="true"  class="form-control number money"/>
 			</td>
-			<td class="width-15 active"><label class="">备注：</label></td>
-			<td class="width-35">
-				<form:textarea path="basicRemarks" htmlEscape="false" readonly="true" 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>

src/main/webapp/webpage/modules/cg/reservemanagementcenter/reserveManage/reserveManage/reserveManagementForm.jsp

@@ -23,7 +23,6 @@
 		    var owner = $("#ownerReserveFullTime").val();
 		    var ownerDistribut = $("#ownerDistributionNerworkFullTime").val();
 		    var ownerResReoManager = $("#ownerReserveProjectManagre").val();
-		    var ownerProjectManager = $("#ownerProjectManager").val();
 			var materialSoleDuty = $("#materialSoleDuty").val();
 		    var technicalStaff = $("#technicalStaff").val();
 		    var operation = $("#operationAndMaintenancePersonnel").val();
@@ -43,8 +42,6 @@
 				jp.error("请填写业主配网专职")
 			}else if (null==ownerResReoManager||""==ownerResReoManager){
 				jp.error("请填写业主储备项目经理")
-			}else if (null==ownerProjectManager||""==ownerProjectManager){
-				jp.error("请填写业主项目经理")
 			}else if (null==technicalStaff||""==technicalStaff){
 				jp.error("请填写业主技经人员")
 			}else if (null==operation||""==operation){
@@ -93,7 +90,7 @@
 				</td>
 				<td class="width-15 active"><label class="">项目性质：</label></td>
 				<td class="width-35">
-					<form:input path="projectNature" htmlEscape="false" class="form-control"/>
+					<form:input path="projectNature" htmlEscape="false" readonly="true" class="form-control"/>
 				</td>
 
 			</tr>
@@ -144,6 +141,16 @@
 				<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="stateGridProjectCode" htmlEscape="false" readonly="true" class="form-control"/>
+				</td>
+			</tr>
+			<tr>
+				<td class="width-15 active"><label class="">国网项目名称：</label></td>
+				<td class="width-35">
+					<form:input path="stateGridProjectName" htmlEscape="false"  readonly="true"  class="form-control"/>
+				</td>
 				<td class="width-15 active"><label class=""><font color="red">*</font>建设必要性及内容：</label></td>
 				<td class="width-35">
 					<form:input path="constructionNecessityAndContent" htmlEscape="false"    class="form-control"/>
@@ -170,10 +177,16 @@
 				</td>
 			</tr>
 			<tr>
+				<td class="width-15 active"><label class="">项目类型：</label></td>
+				<td class="width-35">
+					<form:input path="projectType" htmlEscape="false"  readonly="true"  class="form-control"/>
+				</td>
 				<td class="width-15 active"><label class="">费用估算：</label></td>
 				<td class="width-35">
 					<form:input path="costEstimate" htmlEscape="false"    class="form-control number money"/>
 				</td>
+			</tr>
+			<tr>
 				<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"/>
@@ -204,10 +217,6 @@
 				</td>
 			</tr>
 			<tr>
-				<td class="width-15 active"><label class=""><font color="red">*</font>业主项目经理：</label></td>
-				<td class="width-35">
-					<form:input path="ownerProjectManager" 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="materialSoleDuty" htmlEscape="false" class="form-control"/>
@@ -239,19 +248,6 @@
 					<form:input path="uninterruptedWorkSurveyPersonnel" readonly="true" htmlEscape="false" 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:input path="clearOrNot" htmlEscape="false" class="form-control"/>
-				</td>
-				<td class="width-15 active"><label class="">是否启动设计交底流程：</label></td>
-				<td class="width-35">
-					<form:input path="noStartTheDesign" htmlEscape="false" class="form-control"/>
-				</td>
-			</tr>
 			</tbody>
 		</table>
 	</form:form>

src/main/webapp/webpage/modules/cg/reservemanagementcenter/reserveManage/reserveManage/reserveManagementInformation.js

@@ -81,10 +81,8 @@ $(document).ready(function () {
             [
                 [
                     {checkbox:true,width: 36},
-                    {"title":"储备项目基本信息","colspan":18,width: "3600px"},
+                    {"title":"储备项目基本信息","colspan":21,width: "4200px"},
                     {"title":"储备人员流转信息","colspan":10,width: "2000px"},
-                    {field:'clearOrNot',title: '是否取消',valign:"middle",align: "center", colspan: 1,rowspan: 2,width: "200px"},
-                    {field:'noStartTheDesign',title: '否启动设计交底流程',valign:"middle",align: "center", colspan: 1,rowspan: 2,width: "200px"}
                 ],
                 [
                     {checkbox:true,width: 36},
@@ -114,17 +112,20 @@ $(document).ready(function () {
                         }
                     },
                     {field:'projectName',title: '项目名称',formatter:paramsMatter},
+                    {field:'stateGridProjectCode',title: '国网项目编码',formatter:paramsMatter},
+                    {field:'stateGridProjectName',title: '国网项目名称',formatter:paramsMatter},
                     {field:'constructionNecessityAndContent',title: '建设必要性及内容',valign:"middle",align: "center",formatter:paramsMatter},
                     {field:'substationName',title: '变电站名称',valign:"middle",align: "center"},
                     {field:'circuitName',title: '线路名称',valign:"middle",align: "center"},
                     {field:'netRackProjectDivide',title: '网架项目划分',valign:"middle",align: "center"},
                     {field:'requirementType',title: '需求类型',valign:"middle",align: "center"},
+                    {field:'projectType',title: '项目类型',valign:"middle",align: "center"},
                     {field:'costEstimate',title: '费用估算',valign:"middle",align: "center"},
                     {field:'basicRemarks',title: '备注',valign:"middle",align: "center",formatter:paramsMatter},
                     {field:'requester',title: '需求提报人',valign:"middle",align: "center"},
                     {field:'ownerReserveFullTime',title: '业主储备专职',valign:"middle",align: "center"},
                     {field:'ownerDistributionNerworkFullTime',title: '业主配网专职',valign:"middle",align: "center"},
-                    {field:'ownerProjectManager',title: '业主项目经理',valign:"middle",align: "center"},
+                    {field:'ownerReserveProjectManagre',title: '业主储备项目经理',valign:"middle",align: "center"},
                     {field:'materialSoleDuty',title: '业主物资专职',valign:"middle",align: "center"},
                     {field:'technicalStaff',title: '业主技经人员',valign:"middle",align: "center"},
                     {field:'operationAndMaintenancePersonnel',title: '运维人员',valign:"middle",align: "center"},

src/main/webapp/webpage/modules/cg/reservemanagementcenter/reserveManage/reserveManage/reserveManagementModifyByzz.jsp

@@ -22,7 +22,6 @@
 			var requester = $("#requester").val();
 			var owner = $("#ownerReserveFullTime").val();
 			var ownerDistribut = $("#ownerDistributionNerworkFullTime").val();
-			var ownerProjectManager = $("#ownerProjectManager").val();
 			var materialSoleDuty = $("#materialSoleDuty").val();
 			var technicalStaff = $("#technicalStaff").val();
 			var operation = $("#operationAndMaintenancePersonnel").val();
@@ -40,8 +39,6 @@
 				jp.error("请填写业主储备专职")
 			}else if (null==ownerDistribut||""==ownerDistribut){
 				jp.error("请填写业主配网专职")
-			}else if (null==ownerProjectManager||""==ownerProjectManager){
-				jp.error("请填写业主项目经理")
 			}else if (null==technicalStaff||""==technicalStaff){
 				jp.error("请填写业主技经人员")
 			}else if (null==operation||""==operation){
@@ -90,7 +87,7 @@
 			</td>
 			<td class="width-15 active"><label class="">项目性质：</label></td>
 			<td class="width-35">
-				<form:input path="projectNature" htmlEscape="false" class="form-control"/>
+				<form:input path="projectNature" htmlEscape="false" readonly="true" class="form-control"/>
 			</td>
 
 		</tr>
@@ -141,9 +138,19 @@
 			<td class="width-35">
 				<form:input path="projectName" htmlEscape="false"  readonly="true"  class="form-control required"/>
 			</td>
+			<td class="width-15 active"><label class="">国网项目编码：</label></td>
+			<td class="width-35">
+				<form:input path="stateGridProjectCode" htmlEscape="false" readonly="true"   class="form-control"/>
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">国网项目名称：</label></td>
+			<td class="width-35">
+				<form:input path="stateGridProjectName" htmlEscape="false"  readonly="true"  class="form-control"/>
+			</td>
 			<td class="width-15 active"><label class=""><font color="red">*</font>建设必要性及内容：</label></td>
 			<td class="width-35">
-				<form:input path="constructionNecessityAndContent" htmlEscape="false"  readonly="true"  class="form-control"/>
+				<form:input path="constructionNecessityAndContent" htmlEscape="false"    class="form-control"/>
 			</td>
 		</tr>
 		<tr>
@@ -167,10 +174,16 @@
 			</td>
 		</tr>
 		<tr>
+			<td class="width-15 active"><label class="">项目类型：</label></td>
+			<td class="width-35">
+				<form:input path="projectType" htmlEscape="false"  readonly="true"  class="form-control"/>
+			</td>
 			<td class="width-15 active"><label class="">费用估算：</label></td>
 			<td class="width-35">
 				<form:input path="costEstimate" htmlEscape="false"    class="form-control number money"/>
 			</td>
+		</tr>
+		<tr>
 			<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"/>
@@ -201,10 +214,6 @@
 			</td>
 		</tr>
 		<tr>
-			<td class="width-15 active"><label class=""><font color="red">*</font>业主项目经理：</label></td>
-			<td class="width-35">
-				<form:input path="ownerProjectManager" 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="materialSoleDuty" htmlEscape="false" class="form-control"/>
@@ -236,19 +245,6 @@
 				<form:input path="uninterruptedWorkSurveyPersonnel" readonly="true" htmlEscape="false" 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:input path="clearOrNot" htmlEscape="false" class="form-control"/>
-			</td>
-			<td class="width-15 active"><label class="">是否启动设计交底流程：</label></td>
-			<td class="width-35">
-				<form:input path="noStartTheDesign" htmlEscape="false" class="form-control"/>
-			</td>
-		</tr>
 		</tbody>
 	</table>
 </form:form>

src/main/webapp/webpage/modules/cg/reservemanagementcenter/reserveManage/reserveManage/reserveManagementView.jsp

@@ -98,6 +98,16 @@
 			<td class="width-35">
 				<form:input path="projectName" htmlEscape="false"  readonly="true"  class="form-control required"/>
 			</td>
+			<td class="width-15 active"><label class="">国网项目编码：</label></td>
+			<td class="width-35">
+				<form:input path="stateGridProjectCode" htmlEscape="false"  readonly="true"  class="form-control"/>
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">国网项目名称：</label></td>
+			<td class="width-35">
+				<form:input path="stateGridProjectName" htmlEscape="false" readonly="true"   class="form-control"/>
+			</td>
 			<td class="width-15 active"><label class=""><font color="red">*</font>建设必要性及内容：</label></td>
 			<td class="width-35">
 				<form:input path="constructionNecessityAndContent" htmlEscape="false"  readonly="true"  class="form-control"/>
@@ -124,13 +134,19 @@
 			</td>
 		</tr>
 		<tr>
+			<td class="width-15 active"><label class="">项目类型：</label></td>
+			<td class="width-35">
+				<form:input path="projectType" htmlEscape="false"  readonly="true"  class="form-control"/>
+			</td>
 			<td class="width-15 active"><label class="">费用估算：</label></td>
 			<td class="width-35">
 				<form:input path="costEstimate" htmlEscape="false"  readonly="true"  class="form-control number money"/>
 			</td>
+		</tr>
+		<tr>
 			<td class="width-15 active"><label class="">备注：</label></td>
 			<td class="width-35">
-				<form:textarea path="basicRemarks" readonly="true" htmlEscape="false" rows="3" maxlength="200" class="form-control"/>
+				<form:textarea path="basicRemarks" htmlEscape="false" rows="3" readonly="true" maxlength="200" class="form-control"/>
 			</td>
 		</tr>
 
@@ -158,10 +174,6 @@
 			</td>
 		</tr>
 		<tr>
-			<td class="width-15 active"><label class=""><font color="red">*</font>业主项目经理：</label></td>
-			<td class="width-35">
-				<form:input path="ownerProjectManager" readonly="true" htmlEscape="false" class="form-control"/>
-			</td>
 			<td class="width-15 active"><label class=""><font color="red">*</font>业主物资专职：</label></td>
 			<td class="width-35">
 				<form:input path="materialSoleDuty" htmlEscape="false" readonly="true" class="form-control"/>
@@ -193,19 +205,6 @@
 				<form:input path="uninterruptedWorkSurveyPersonnel" readonly="true" htmlEscape="false" 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:input path="clearOrNot" readonly="true" htmlEscape="false" class="form-control"/>
-			</td>
-			<td class="width-15 active"><label class="">是否启动设计交底流程：</label></td>
-			<td class="width-35">
-				<form:input path="noStartTheDesign" readonly="true" htmlEscape="false" class="form-control"/>
-			</td>
-		</tr>
 		</tbody>
 	</table>
 </form:form>

src/main/webapp/webpage/modules/cg/reservemanagementcenter/reserveManage/reserveSafeDisclosure/reserveManagementForm.jsp

@@ -112,52 +112,75 @@
 			<td class="width-35">
 				<form:input path="projectReserveId" htmlEscape="false"  readonly="true"  class="form-control required"/>
 			</td>
+			<td class="width-15 active"><label class=""><font color="red">*</font>储备项目名称：</label></td>
+			<td class="width-35">
+				<form:input path="projectName" htmlEscape="false"    class="form-control required"/>
+			</td>
 		</tr>
 		<tr>
-			<td class="width-15 active"><label class=""><font color="red">*</font>项目名称：</label></td>
+			<td class="width-15 active"><label class="">国网项目编码：</label></td>
 			<td class="width-35">
-				<form:input path="projectName" htmlEscape="false"    class="form-control required"/>
+				<form:input path="stateGridProjectCode" htmlEscape="false"  readonly="true"  class="form-control"/>
 			</td>
-			<td class="width-15 active"><label class=""><font color="red">*</font>建设必要性及内容：</label></td>
+			<td class="width-15 active"><label class="">国网项目名称：</label></td>
 			<td class="width-35">
-				<form:input path="constructionNecessityAndContent" htmlEscape="false"    class="form-control"/>
+				<form:input path="stateGridProjectName" htmlEscape="false"  readonly="true"  class="form-control"/>
 			</td>
 		</tr>
 		<tr>
+			<td class="width-15 active"><label class=""><font color="red">*</font>建设必要性及内容：</label></td>
+			<td class="width-35">
+				<form:input path="constructionNecessityAndContent" htmlEscape="false"    class="form-control"/>
+			</td>
 			<td class="width-15 active"><label class="">变电站名称：</label></td>
 			<td class="width-35">
 				<form:input path="substationName" htmlEscape="false"    class="form-control"/>
 			</td>
+		</tr>
+		<tr>
 			<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>
+		</tr>
+		<tr>
 			<td class="width-15 active"><label class="">需求类型：</label></td>
 			<td class="width-35">
 				<form:input path="requirementType" 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"  readonly="true"  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">
-				<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">
-				<form:input path="reserveProgress" htmlEscape="false" class="form-control"/>
+				<form:input path="reserveProgress" htmlEscape="false" readonly="true" class="form-control"/>
+			</td>
+			<td class="width-15 active"><label class="">是否纳入实施计划：</label></td>
+			<td class="width-35">
+				<form:input path="implementPlan" htmlEscape="false" readonly="true" 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" readonly="true" class="form-control"/>
 			</td>
 		</tr>
 		<tr>

src/main/webapp/webpage/modules/cg/reservemanagementcenter/reserveManage/reserveSafeDisclosure/reserveManagementInformation.js

@@ -81,8 +81,9 @@ $(document).ready(function () {
             [
                 [
                     {checkbox:true,width: 36},
-                    {"title":"储备项目基本信息","colspan":19,"halign":"center","align": "center",width: "3800px"},
-                    {"title":"安全隐患排查","colspan":25,"halign":"center","align": "center",width: "5000px"}
+                    {"title":"储备项目基本信息","colspan":21,"halign":"center","align": "center",width: "4200px"},
+                    {"title":"储备进度","colspan":3,"halign":"center","align": "center",width: "600px"},
+                    {"title":"安全隐患排查","colspan":24,"halign":"center","align": "center",width: "4800px"}
                 ],
                 [
                     {checkbox:true,width: 36},
@@ -91,6 +92,7 @@ $(document).ready(function () {
                     { field: 'demandUnit', title: "需求单位", valign:"middle", align:"center", colspan: 1, rowspan: 2 },
                     { field: 'district', title: "区域", valign:"middle", align:"center", colspan: 1, rowspan: 2 },
                     { field: 'projectGroup', title: "项目分组", valign:"middle", align:"center", colspan: 1, rowspan: 2 },
+                    { field: 'projectManager', title: "项目经理", valign:"middle", align:"center", colspan: 1, rowspan: 2 },
                     { field: 'reserveBatches', title: "储备批次", valign:"middle", align:"center", colspan: 1, rowspan: 2 },
                     { field: 'blockSupply', title: "供电区域", valign:"middle", align:"center", colspan: 1, rowspan: 2 },
                     { field: 'gridNumber', title: "网格编号", valign:"middle", align:"center", colspan: 1, rowspan: 2 },
@@ -110,15 +112,19 @@ $(document).ready(function () {
                                     </c:otherwise>
                                         </c:choose>
                                     }},
-                    { field: 'projectName', title: "项目名称", valign:"middle", align:"center", colspan: 1, rowspan: 2 ,formatter:paramsMatter},
+                    { field: 'projectName', title: "储备项目名称", valign:"middle", align:"center", colspan: 1, rowspan: 2 ,formatter:paramsMatter},
+                    { field: 'stateGridProjectCode', title: "国网项目编码", valign:"middle", align:"center", colspan: 1, rowspan: 2 },
+                    { field: 'stateGridProjectName', title: "国网项目名称", valign:"middle", align:"center", colspan: 1, rowspan: 2 ,formatter:paramsMatter},
                     { field: 'constructionNecessityAndContent', title: "建设必要性及内容", valign:"middle", align:"center", colspan: 1, rowspan: 2 ,formatter:paramsMatter},
                     { field: 'substationName', title: "变电站名称", valign:"middle", align:"center", colspan: 1, rowspan: 2 },
                     { field: 'circuitName', title: "线路名称", valign:"middle", align:"center", colspan: 1, rowspan: 2 },
                     { field: 'netRackProjectDivide', title: "网架项目划分", valign:"middle", align:"center", colspan: 1, rowspan: 2 },
                     { field: 'requirementType', title: "需求类型", valign:"middle", align:"center", colspan: 1, rowspan: 2 },
+                    { field: 'projectType', title: "项目类型", valign:"middle", align:"center", colspan: 1, rowspan: 2 },
                     { field: 'costEstimate', title: "费用估算", valign:"middle", align:"center", colspan: 1, rowspan: 2 },
-                    { field: 'basicRemarks', title: "备注", valign:"middle", align:"center", colspan: 1, rowspan: 2 ,formatter:paramsMatter},
                     { field: 'reserveProgress', title: "储备进度", valign:"middle", align:"center", colspan: 1, rowspan: 2 },
+                    { field: 'implementPlan', title: "是否纳入实施计划", valign:"middle", align:"center", colspan: 1, rowspan: 2 },
+                    { field: 'implementBatch', title: "初定实施批次", valign:"middle", align:"center", colspan: 1, rowspan: 2 },
                     { title: "是否临近（交叉）输电线路作业（含土建）", valign:"middle", align:"center", colspan: 2, rowspan: 1 },
                     { title: "是否与输电线路同杆架设", valign:"middle", align:"center", colspan: 2, rowspan: 1 },
                     { title: "是否与输电线路共沟", valign:"middle", align:"center", colspan: 2, rowspan: 1 },

src/main/webapp/webpage/modules/cg/reservemanagementcenter/reserveManage/reserveSafeDisclosure/reserveManagementModifyByzz.jsp

@@ -172,53 +172,76 @@
 			<td class="width-35">
 				<form:input path="projectReserveId" htmlEscape="false"  readonly="true"  class="form-control required"/>
 			</td>
+			<td class="width-15 active"><label class=""><font color="red">*</font>储备项目名称：</label></td>
+			<td class="width-35">
+				<form:input path="projectName" htmlEscape="false"  readonly="true"  class="form-control required"/>
+			</td>
 		</tr>
 		<tr>
-			<td class="width-15 active"><label class=""><font color="red">*</font>项目名称：</label></td>
+			<td class="width-15 active"><label class="">国网项目编码：</label></td>
 			<td class="width-35">
-				<form:input path="projectName" htmlEscape="false"  readonly="true"  class="form-control required"/>
+				<form:input path="stateGridProjectCode" htmlEscape="false"  readonly="true"  class="form-control"/>
 			</td>
-			<td class="width-15 active"><label class=""><font color="red">*</font>建设必要性及内容：</label></td>
+			<td class="width-15 active"><label class="">国网项目名称：</label></td>
 			<td class="width-35">
-				<form:input path="constructionNecessityAndContent" htmlEscape="false"  readonly="true"  class="form-control"/>
+				<form:input path="stateGridProjectName" htmlEscape="false"  readonly="true"  class="form-control"/>
 			</td>
 		</tr>
 		<tr>
+			<td class="width-15 active"><label class=""><font color="red">*</font>建设必要性及内容：</label></td>
+			<td class="width-35">
+				<form:input path="constructionNecessityAndContent" htmlEscape="false"  readonly="true"  class="form-control"/>
+			</td>
 			<td class="width-15 active"><label class="">变电站名称：</label></td>
 			<td class="width-35">
 				<form:input path="substationName" htmlEscape="false"  readonly="true"  class="form-control"/>
 			</td>
+		</tr>
+		<tr>
 			<td class="width-15 active"><label class="">线路名称：</label></td>
 			<td class="width-35">
 				<form:input path="circuitName" htmlEscape="false"  readonly="true"  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"  readonly="true"  class="form-control"/>
 			</td>
+		</tr>
+		<tr>
 			<td class="width-15 active"><label class="">需求类型：</label></td>
 			<td class="width-35">
 				<form:input path="requirementType" htmlEscape="false"  readonly="true"  class="form-control"/>
 			</td>
+			<td class="width-15 active"><label class="">项目类型：</label></td>
+			<td class="width-35">
+				<form:input path="projectType" htmlEscape="false"  readonly="true"  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"  readonly="true"  class="form-control number money"/>
 			</td>
-			<td class="width-15 active"><label class="">备注：</label></td>
-			<td class="width-35">
-				<form:textarea path="basicRemarks" htmlEscape="false" rows="3" maxlength="200" readonly="true" 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:input path="reserveProgress" htmlEscape="false" readonly="true" class="form-control"/>
 			</td>
+			<td class="width-15 active"><label class="">是否纳入实施计划：</label></td>
+			<td class="width-35">
+				<form:input path="implementPlan" htmlEscape="false" readonly="true" 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" readonly="true" class="form-control"/>
+			</td>
 		</tr>
 		<tr>
 			<td colspan="4" class="width-15 active"><label class="">安全隐患排查：</label></td>

src/main/webapp/webpage/modules/cg/reservemanagementcenter/reserveManage/reserveSafeDisclosure/reserveManagementView.jsp

@@ -56,16 +56,20 @@
 			<td class="width-35">
 				<form:input path="demandUnit" htmlEscape="false"  readonly="true"  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"  readonly="true"  class="form-control"/>
 			</td>
+		</tr>
+		<tr>
 			<td class="width-15 active"><label class="">项目分组：</label></td>
 			<td class="width-35">
 				<form:input path="projectGroup" htmlEscape="false"  readonly="true"  class="form-control"/>
 			</td>
+			<td class="width-15 active"><label class="">项目经理：</label></td>
+			<td class="width-35">
+				<form:input path="projectManager" htmlEscape="false"  readonly="true"  class="form-control"/>
+			</td>
 		</tr>
 		<tr>
 			<td class="width-15 active"><label class="">储备批次：</label></td>
@@ -92,53 +96,76 @@
 			<td class="width-35">
 				<form:input path="projectReserveId" htmlEscape="false" readonly="true" class="form-control required"/>
 			</td>
+			<td class="width-15 active"><label class=""><font color="red">*</font>储备项目名称：</label></td>
+			<td class="width-35">
+				<form:input path="projectName" htmlEscape="false"  readonly="true"  class="form-control required"/>
+			</td>
 		</tr>
 		<tr>
-			<td class="width-15 active"><label class=""><font color="red">*</font>项目名称：</label></td>
+			<td class="width-15 active"><label class="">国网项目编码：</label></td>
 			<td class="width-35">
-				<form:input path="projectName" htmlEscape="false"  readonly="true"  class="form-control required"/>
+				<form:input path="stateGridProjectCode" htmlEscape="false"  readonly="true"  class="form-control"/>
 			</td>
-			<td class="width-15 active"><label class=""><font color="red">*</font>建设必要性及内容：</label></td>
+			<td class="width-15 active"><label class="">国网项目名称：</label></td>
 			<td class="width-35">
-				<form:input path="constructionNecessityAndContent" htmlEscape="false"  readonly="true"  class="form-control"/>
+				<form:input path="stateGridProjectName" htmlEscape="false"  readonly="true"  class="form-control"/>
 			</td>
 		</tr>
 		<tr>
+			<td class="width-15 active"><label class=""><font color="red">*</font>建设必要性及内容：</label></td>
+			<td class="width-35">
+				<form:input path="constructionNecessityAndContent" htmlEscape="false"  readonly="true"  class="form-control"/>
+			</td>
 			<td class="width-15 active"><label class="">变电站名称：</label></td>
 			<td class="width-35">
 				<form:input path="substationName" htmlEscape="false"  readonly="true"  class="form-control"/>
 			</td>
+		</tr>
+		<tr>
 			<td class="width-15 active"><label class="">线路名称：</label></td>
 			<td class="width-35">
 				<form:input path="circuitName" htmlEscape="false"  readonly="true"  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"  readonly="true"  class="form-control"/>
 			</td>
+		</tr>
+		<tr>
 			<td class="width-15 active"><label class="">需求类型：</label></td>
 			<td class="width-35">
 				<form:input path="requirementType" htmlEscape="false"  readonly="true"  class="form-control"/>
 			</td>
+			<td class="width-15 active"><label class="">项目类型：</label></td>
+			<td class="width-35">
+				<form:input path="projectType" htmlEscape="false"  readonly="true"  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"  readonly="true"  class="form-control number money"/>
 			</td>
-			<td class="width-15 active"><label class="">备注：</label></td>
-			<td class="width-35">
-				<form:textarea path="basicRemarks" htmlEscape="false" readonly="true" 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">
 				<form:input path="reserveProgress" htmlEscape="false" readonly="true" class="form-control"/>
 			</td>
+			<td class="width-15 active"><label class="">是否纳入实施计划：</label></td>
+			<td class="width-35">
+				<form:input path="implementPlan" htmlEscape="false" readonly="true" 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" readonly="true" class="form-control"/>
+			</td>
 		</tr>
 		<tr>
 			<td colspan="4" class="width-15 active"><label class="">安全隐患排查：</label></td>

src/main/webapp/webpage/modules/cg/reservemanagementcenter/reserveManage/summaryStatistics/budgetReview.jsp

@@ -159,70 +159,86 @@
                                 <td class="width-35">
                                     <form:input path="reserveSummary.projectGroup" htmlEscape="false"    readonly="true"  class="form-control"/>
                                 </td>
-                                <td class="width-15 active"><label class="">储备批次：</label></td>
+                                <td class="width-15 active"><label class="">储备项目经理：</label></td>
                                 <td class="width-35">
-                                    <form:input path="reserveSummary.reserveBatches" htmlEscape="false"    readonly="true"  class="form-control"/>
+                                    <form:input path="reserveSummary.projectManager" htmlEscape="false"    readonly="true"  class="form-control"/>
                                 </td>
                             </tr>
                             <tr>
+                                <td class="width-15 active"><label class="">储备批次：</label></td>
+                                <td class="width-35">
+                                    <form:input path="reserveSummary.reserveBatches" htmlEscape="false"    readonly="true"  class="form-control"/>
+                                </td>
                                 <td class="width-15 active"><label class="">供电区域：</label></td>
                                 <td class="width-35">
                                     <form:input path="reserveSummary.blockSupply" htmlEscape="false"    readonly="true"  class="form-control"/>
                                 </td>
+                            </tr>
+                            <tr>
                                 <td class="width-15 active"><label class="">网格编号：</label></td>
                                 <td class="width-35">
                                     <form:input path="reserveSummary.gridNumber" htmlEscape="false"    readonly="true"  class="form-control"/>
                                 </td>
-                            </tr>
-                            <tr>
                                 <td class="width-15 active"><label class="">单元格编号：</label></td>
                                 <td class="width-35">
                                     <form:input path="reserveSummary.cellNumber" htmlEscape="false"    readonly="true"  class="form-control"/>
                                 </td>
+                            </tr>
+                            <tr>
                                 <td class="width-15 active"><label class="">项目储备编号：</label></td>
                                 <td class="width-35">
                                     <form:input path="projectReserveId" htmlEscape="false"  readonly="true"  class="form-control"/>
                                 </td>
+                                <td class="width-15 active"><label class="">储备项目名称：</label></td>
+                                <td class="width-35">
+                                    <form:input path="projectName" htmlEscape="false"  readonly="true"  class="form-control"/>
+                                </td>
                             </tr>
                             <tr>
-                                <td class="width-15 active"><label class="">项目名称：</label></td>
+                                <td class="width-15 active"><label class="">国网项目编码：</label></td>
                                 <td class="width-35">
-                                    <form:input path="projectName" htmlEscape="false"  readonly="true"  class="form-control"/>
+                                    <form:input path="reserveSummary.stateGridProjectCode" htmlEscape="false"    readonly="true"  class="form-control"/>
                                 </td>
-                                <td class="width-15 active"><label class="">建设必要性及内容：</label></td>
+                                <td class="width-15 active"><label class="">国网项目名称：</label></td>
                                 <td class="width-35">
-                                    <form:input path="reserveSummary.constructionNecessityAndContent" htmlEscape="false"    readonly="true"  class="form-control"/>
+                                    <form:input path="reserveSummary.stateGridProjectName" htmlEscape="false"    readonly="true"  class="form-control"/>
                                 </td>
                             </tr>
                             <tr>
+                                <td class="width-15 active"><label class="">建设必要性及内容：</label></td>
+                                <td class="width-35">
+                                    <form:input path="reserveSummary.constructionNecessityAndContent" htmlEscape="false"    readonly="true"  class="form-control"/>
+                                </td>
                                 <td class="width-15 active"><label class="">变电站名称：</label></td>
                                 <td class="width-35">
                                     <form:input path="reserveSummary.substationName" htmlEscape="false"    readonly="true"  class="form-control"/>
                                 </td>
+                            </tr>
+                            <tr>
                                 <td class="width-15 active"><label class="">线路名称：</label></td>
                                 <td class="width-35">
                                     <form:input path="reserveSummary.circuitName" htmlEscape="false"    readonly="true"  class="form-control"/>
                                 </td>
-                            </tr>
-                            <tr>
                                 <td class="width-15 active"><label class="">网架项目划分：</label></td>
                                 <td class="width-35">
                                     <form:input path="reserveSummary.netRackProjectDivide" htmlEscape="false" readonly="true"    class="form-control number money"/>
                                 </td>
+                            </tr>
+                            <tr>
                                 <td class="width-15 active"><label class="">需求类型：</label></td>
                                 <td class="width-35">
                                     <form:input path="reserveSummary.requirementType" htmlEscape="false" readonly="true"    class="form-control number money"/>
                                 </td>
+                                <td class="width-15 active"><label class="">项目类型：</label></td>
+                                <td class="width-35">
+                                    <form:input path="reserveSummary.projectType" htmlEscape="false" readonly="true"    class="form-control number money"/>
+                                </td>
                             </tr>
                             <tr>
                                 <td class="width-15 active"><label class="">费用估算：</label></td>
                                 <td class="width-35">
                                     <form:input path="reserveSummary.costEstimate" htmlEscape="false" readonly="true"    class="form-control number money"/>
                                 </td>
-                                <td class="width-15 active"><label class="">备注：</label></td>
-                                <td class="width-35">
-                                    <form:input path="reserveSummary.basicRemarks" htmlEscape="false" readonly="true"    class="form-control number money"/>
-                                </td>
                             </tr>
                             <tr>
                                 <td colspan="4" class="width-15 active"><label class="">预算书审前审后数据：</label></td>

src/main/webapp/webpage/modules/cg/reservemanagementcenter/reserveManage/summaryStatistics/designUnit.jsp

@@ -160,6 +160,7 @@
 			});
 
 			$("#moreImport").click(function(){
+				var projectReserveId = $("#projectReserveId").val();
 				jp.open({
 					type: 2,
 					area: [800, 400],
@@ -169,7 +170,7 @@
 					btn: ['确定', '关闭'],
 					btn1: function(index, layero){
 						var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
-						iframeWin.contentWindow.importExcel('${ctx}/cg/reservemanagementcenter/process/importCGValidations', function (data) {
+						iframeWin.contentWindow.importExcel('${ctx}/cg/reservemanagementcenter/process/importCGValidations?projectReserveId=' + projectReserveId, function (data) {
 							if(data.success){
 								jp.success(data.msg);
 								jp.close(index);
@@ -268,70 +269,86 @@
 									<td class="width-35">
 										<form:input path="reserveSummary.projectGroup" htmlEscape="false"    readonly="true"  class="form-control"/>
 									</td>
-									<td class="width-15 active"><label class="">储备批次：</label></td>
+									<td class="width-15 active"><label class="">储备项目经理：</label></td>
 									<td class="width-35">
-										<form:input path="reserveSummary.reserveBatches" htmlEscape="false"    readonly="true"  class="form-control"/>
+										<form:input path="reserveSummary.projectManager" htmlEscape="false"    readonly="true"  class="form-control"/>
 									</td>
 								</tr>
 								<tr>
+									<td class="width-15 active"><label class="">储备批次：</label></td>
+									<td class="width-35">
+										<form:input path="reserveSummary.reserveBatches" htmlEscape="false"    readonly="true"  class="form-control"/>
+									</td>
 									<td class="width-15 active"><label class="">供电区域：</label></td>
 									<td class="width-35">
 										<form:input path="reserveSummary.blockSupply" htmlEscape="false"    readonly="true"  class="form-control"/>
 									</td>
+								</tr>
+								<tr>
 									<td class="width-15 active"><label class="">网格编号：</label></td>
 									<td class="width-35">
 										<form:input path="reserveSummary.gridNumber" htmlEscape="false"    readonly="true"  class="form-control"/>
 									</td>
-								</tr>
-								<tr>
 									<td class="width-15 active"><label class="">单元格编号：</label></td>
 									<td class="width-35">
 										<form:input path="reserveSummary.cellNumber" htmlEscape="false"    readonly="true"  class="form-control"/>
 									</td>
+								</tr>
+								<tr>
 									<td class="width-15 active"><label class="">项目储备编号：</label></td>
 									<td class="width-35">
 										<form:input path="projectReserveId" htmlEscape="false"  readonly="true"  class="form-control"/>
 									</td>
+									<td class="width-15 active"><label class="">储备项目名称：</label></td>
+									<td class="width-35">
+										<form:input path="projectName" htmlEscape="false"  readonly="true"  class="form-control"/>
+									</td>
 								</tr>
 								<tr>
-									<td class="width-15 active"><label class="">项目名称：</label></td>
+									<td class="width-15 active"><label class="">国网项目编码：</label></td>
 									<td class="width-35">
-										<form:input path="projectName" htmlEscape="false"  readonly="true"  class="form-control"/>
+										<form:input path="reserveSummary.stateGridProjectCode" htmlEscape="false"    readonly="true"  class="form-control"/>
 									</td>
-									<td class="width-15 active"><label class="">建设必要性及内容：</label></td>
+									<td class="width-15 active"><label class="">国网项目名称：</label></td>
 									<td class="width-35">
-										<form:input path="reserveSummary.constructionNecessityAndContent" htmlEscape="false"    readonly="true"  class="form-control"/>
+										<form:input path="reserveSummary.stateGridProjectName" htmlEscape="false"    readonly="true"  class="form-control"/>
 									</td>
 								</tr>
 								<tr>
+									<td class="width-15 active"><label class="">建设必要性及内容：</label></td>
+									<td class="width-35">
+										<form:input path="reserveSummary.constructionNecessityAndContent" htmlEscape="false"    readonly="true"  class="form-control"/>
+									</td>
 									<td class="width-15 active"><label class="">变电站名称：</label></td>
 									<td class="width-35">
 										<form:input path="reserveSummary.substationName" htmlEscape="false"    readonly="true"  class="form-control"/>
 									</td>
+								</tr>
+								<tr>
 									<td class="width-15 active"><label class="">线路名称：</label></td>
 									<td class="width-35">
 										<form:input path="reserveSummary.circuitName" htmlEscape="false"    readonly="true"  class="form-control"/>
 									</td>
-								</tr>
-								<tr>
 									<td class="width-15 active"><label class="">网架项目划分：</label></td>
 									<td class="width-35">
 										<form:input path="reserveSummary.netRackProjectDivide" htmlEscape="false" readonly="true"    class="form-control number money"/>
 									</td>
+								</tr>
+								<tr>
 									<td class="width-15 active"><label class="">需求类型：</label></td>
 									<td class="width-35">
 										<form:input path="reserveSummary.requirementType" htmlEscape="false" readonly="true"    class="form-control number money"/>
 									</td>
+									<td class="width-15 active"><label class="">项目类型：</label></td>
+									<td class="width-35">
+										<form:input path="reserveSummary.projectType" htmlEscape="false" readonly="true"    class="form-control number money"/>
+									</td>
 								</tr>
 								<tr>
 									<td class="width-15 active"><label class="">费用估算：</label></td>
 									<td class="width-35">
 										<form:input path="reserveSummary.costEstimate" htmlEscape="false" readonly="true"    class="form-control number money"/>
 									</td>
-									<td class="width-15 active"><label class="">备注：</label></td>
-									<td class="width-35">
-										<form:input path="reserveSummary.basicRemarks" htmlEscape="false" readonly="true"    class="form-control number money"/>
-									</td>
 								</tr>
 								<tr id="pro01">
 									<td colspan="4" class="width-15 active"><label class="">项目经理审图反馈：</label></td>

src/main/webapp/webpage/modules/cg/reservemanagementcenter/reserveManage/summaryStatistics/drawingReview.jsp

@@ -173,70 +173,86 @@
 									<td class="width-35">
 										<form:input path="reserveSummary.projectGroup" htmlEscape="false"    readonly="true"  class="form-control"/>
 									</td>
-									<td class="width-15 active"><label class="">储备批次：</label></td>
+									<td class="width-15 active"><label class="">储备项目经理：</label></td>
 									<td class="width-35">
-										<form:input path="reserveSummary.reserveBatches" htmlEscape="false"    readonly="true"  class="form-control"/>
+										<form:input path="reserveSummary.projectManager" htmlEscape="false"    readonly="true"  class="form-control"/>
 									</td>
 								</tr>
 								<tr>
+									<td class="width-15 active"><label class="">储备批次：</label></td>
+									<td class="width-35">
+										<form:input path="reserveSummary.reserveBatches" htmlEscape="false"    readonly="true"  class="form-control"/>
+									</td>
 									<td class="width-15 active"><label class="">供电区域：</label></td>
 									<td class="width-35">
 										<form:input path="reserveSummary.blockSupply" htmlEscape="false"    readonly="true"  class="form-control"/>
 									</td>
+								</tr>
+								<tr>
 									<td class="width-15 active"><label class="">网格编号：</label></td>
 									<td class="width-35">
 										<form:input path="reserveSummary.gridNumber" htmlEscape="false"    readonly="true"  class="form-control"/>
 									</td>
-								</tr>
-								<tr>
 									<td class="width-15 active"><label class="">单元格编号：</label></td>
 									<td class="width-35">
 										<form:input path="reserveSummary.cellNumber" htmlEscape="false"    readonly="true"  class="form-control"/>
 									</td>
+								</tr>
+								<tr>
 									<td class="width-15 active"><label class="">项目储备编号：</label></td>
 									<td class="width-35">
 										<form:input path="projectReserveId" htmlEscape="false"  readonly="true"  class="form-control"/>
 									</td>
+									<td class="width-15 active"><label class="">储备项目名称：</label></td>
+									<td class="width-35">
+										<form:input path="projectName" htmlEscape="false"  readonly="true"  class="form-control"/>
+									</td>
 								</tr>
 								<tr>
-									<td class="width-15 active"><label class="">项目名称：</label></td>
+									<td class="width-15 active"><label class="">国网项目编码：</label></td>
 									<td class="width-35">
-										<form:input path="projectName" htmlEscape="false"  readonly="true"  class="form-control"/>
+										<form:input path="reserveSummary.stateGridProjectCode" htmlEscape="false"    readonly="true"  class="form-control"/>
 									</td>
-									<td class="width-15 active"><label class="">建设必要性及内容：</label></td>
+									<td class="width-15 active"><label class="">国网项目名称：</label></td>
 									<td class="width-35">
-										<form:input path="reserveSummary.constructionNecessityAndContent" htmlEscape="false"    readonly="true"  class="form-control"/>
+										<form:input path="reserveSummary.stateGridProjectName" htmlEscape="false"    readonly="true"  class="form-control"/>
 									</td>
 								</tr>
 								<tr>
+									<td class="width-15 active"><label class="">建设必要性及内容：</label></td>
+									<td class="width-35">
+										<form:input path="reserveSummary.constructionNecessityAndContent" htmlEscape="false"    readonly="true"  class="form-control"/>
+									</td>
 									<td class="width-15 active"><label class="">变电站名称：</label></td>
 									<td class="width-35">
 										<form:input path="reserveSummary.substationName" htmlEscape="false"    readonly="true"  class="form-control"/>
 									</td>
+								</tr>
+								<tr>
 									<td class="width-15 active"><label class="">线路名称：</label></td>
 									<td class="width-35">
 										<form:input path="reserveSummary.circuitName" htmlEscape="false"    readonly="true"  class="form-control"/>
 									</td>
-								</tr>
-								<tr>
 									<td class="width-15 active"><label class="">网架项目划分：</label></td>
 									<td class="width-35">
 										<form:input path="reserveSummary.netRackProjectDivide" htmlEscape="false" readonly="true"    class="form-control number money"/>
 									</td>
+								</tr>
+								<tr>
 									<td class="width-15 active"><label class="">需求类型：</label></td>
 									<td class="width-35">
 										<form:input path="reserveSummary.requirementType" htmlEscape="false" readonly="true"    class="form-control number money"/>
 									</td>
+									<td class="width-15 active"><label class="">项目类型：</label></td>
+									<td class="width-35">
+										<form:input path="reserveSummary.projectType" htmlEscape="false" readonly="true"    class="form-control number money"/>
+									</td>
 								</tr>
 								<tr>
 									<td class="width-15 active"><label class="">费用估算：</label></td>
 									<td class="width-35">
 										<form:input path="reserveSummary.costEstimate" htmlEscape="false" readonly="true"    class="form-control number money"/>
 									</td>
-									<td class="width-15 active"><label class="">备注：</label></td>
-									<td class="width-35">
-										<form:input path="reserveSummary.basicRemarks" htmlEscape="false" readonly="true"    class="form-control number money"/>
-									</td>
 								</tr>
 								<tr>
 									<td colspan="4" class="width-15 active"><label class="">问题反馈记录：</label></td>

src/main/webapp/webpage/modules/cg/reservemanagementcenter/reserveManage/summaryStatistics/reserveManagementInformation.js

@@ -81,11 +81,9 @@ $(document).ready(function () {
             [
                 [
                     {checkbox:true,width: 36},
-                    {"title":"储备项目基本信息","colspan":19,"halign":"center","align": "center",width: "3800px"},
-                    {"title":"储备项目交底信息统计","colspan":10,"halign":"center","align": "center",width: "2600px"},
-                    {"title":"储备项目初步筛选","colspan":4,"halign":"center","align": "center",width: "800px"},
-                    // {"title":"储备项目推进计划","colspan":12,"halign":"center","align": "center",width: "2400px"},
-                    // {"title":"立项筛选","colspan":5,"halign":"center","align": "center",width: "1000px"}
+                    {"title":"储备项目基本信息","colspan":21,"halign":"center","align": "center",width: "4200px"},
+                    {"title":"设计筛选","colspan":4,"halign":"center","align": "center",width: "800px"},
+                    {"title":"储备项目交底信息统计","colspan":12,"halign":"center","align": "center",width: "2400px"},
                 ],
                     [
                     {checkbox:true,width: 36},
@@ -114,7 +112,9 @@ $(document).ready(function () {
                             </c:otherwise>
                                 </c:choose>
                             }},
-                        { field: 'projectName', title: "项目名称", valign:"middle", align:"center", colspan: 1,formatter:paramsMatter},
+                        { field: 'projectName', title: "储备项目名称", valign:"middle", align:"center", colspan: 1,formatter:paramsMatter},
+                        { field: 'stateGridProjectCode', title: "国网项目编码", valign:"middle", align:"center", colspan: 1,formatter:paramsMatter},
+                        { field: 'stateGridProjectName', title: "国网项目名称", valign:"middle", align:"center", colspan: 1,formatter:paramsMatter},
                         { field: 'constructionNecessityAndContent', title: "建设必要性及内容", valign:"middle", align:"center", colspan: 1,formatter:paramsMatter},
                         { field: 'substationName', title: "变电站名称", valign:"middle", align:"center", colspan: 1 },
                         { field: 'circuitName', title: "线路名称", valign:"middle", align:"center", colspan: 1 },
@@ -122,10 +122,14 @@ $(document).ready(function () {
                         { field: 'requirementType', title: "需求类型", valign:"middle", align:"center", colspan: 1 },
                         { field: 'projectType', title: "项目类型", valign:"middle", align:"center", colspan: 1 },
                         { field: 'costEstimate', title: "费用估算", valign:"middle", align:"center", colspan: 1 },
-                        // { field: 'budgetPreparationStatus', title: "预算编制状态", valign:"middle", align:"center", colspan: 1 },
-                        // { field: 'budgetIncludesTax', title: "预算(含税)", valign:"middle", align:"center", colspan: 1 },
-                        // { field: 'budgetNotIncludesTax', title: "预算(不含税)", valign:"middle", align:"center", colspan: 1 },
-                        // { field: 'basicRemarks', title: "备注", valign:"middle", align:"center", colspan: 1 ,formatter:paramsMatter},
+
+                        { field: 'reserveProgress', title: "储备进度", valign:"middle", align:"center", colspan: 1 },
+                        { field: 'includeReserve', title: "是否纳入储备", valign:"middle", align:"center", colspan: 1 },
+                        { field: 'reasonForCancel', title: "取消原因说明", valign:"middle", align:"center", colspan: 1 ,formatter:paramsMatter},
+                        { field: 'startDesignOrNot', title: "是否启动设计", valign:"middle", align:"center", colspan: 1 },
+
+                        { field: 'completeDisclose', title: "是否完成交底", valign:"middle", align:"center", colspan: 1 },
+                        { field: 'completeDiscloseTime', title: "交底完成时间", valign:"middle", align:"center", colspan: 1 },
                         { field: 'comprehensiveProject', title: "项目综合可实施性", valign:"middle", align:"center", colspan: 1 },
                         { field: 'officeDifficulty', title: "政处难度", valign:"middle", align:"center", colspan: 1 },
                         { field: 'officeProgress', title: "政处描述", valign:"middle", align:"center", colspan: 1 },
@@ -135,29 +139,7 @@ $(document).ready(function () {
                         { field: 'otherProblemDescribe', title: "其他问题描述", valign:"middle", align:"center", colspan: 1 ,formatter:paramsMatter},
                         { field: 'runPlanRequire', title: "是否需重跑方案", valign:"middle", align:"center", colspan: 1 },
                         { field: 'programChangeDescription', title: "方案变更说明", valign:"middle", align:"center", colspan: 1 ,formatter:paramsMatter},
-                        { field: 'discloseRemarks', title: "备注", valign:"middle", align:"center", colspan: 1 ,formatter:paramsMatter},
-                        { field: 'reserveProgress', title: "储备进度", valign:"middle", align:"center", colspan: 1 },
-                        { field: 'includeReserve', title: "是否纳入储备", valign:"middle", align:"center", colspan: 1 },
-                        { field: 'reasonForCancel', title: "取消原因说明", valign:"middle", align:"center", colspan: 1 ,formatter:paramsMatter},
-                        { field: 'startDesignOrNot', title: "是否启动设计", valign:"middle", align:"center", colspan: 1 },
-                        // { field: 'demandUnitPriority', title: "需求单位优先级", valign:"middle", align:"center", colspan: 1 },
-                        // { field: 'preliminaryArrangement', title: "立项初安排", valign:"middle", align:"center", colspan: 1 ,formatter:paramsMatter},
-                        // { field: 'initialImplementBatch', title: "初定实施批次", valign:"middle", align:"center", colspan: 1 },
-                        // { field: 'initialImplementUnit', title: "初定实施单位", valign:"middle", align:"center", colspan: 1 },
-                        // { field: 'projectManagementCenter', title: "储备项目推进计划", valign:"middle", align:"center", colspan: 1 ,formatter:paramsMatter},
-                        // { field: 'completeProgressUnit', title: "项目管理单位完成进度", valign:"middle", align:"center", colspan: 1 },
-                        // { field: 'projectReservePlan', title: "储备项目推进计划", valign:"middle", align:"center", colspan: 1 ,formatter:paramsMatter},
-                        // { field: 'demandUnitProgress', title: "需求单位完成进度", valign:"middle", align:"center", colspan: 1 },
-                        // { field: 'departmentPlan', title: "政处计划", valign:"middle", align:"center", colspan: 1 ,formatter:paramsMatter},
-                        // { field: 'administrativeProgress', title: "政处进度", valign:"middle", align:"center", colspan: 1 },
-                        // { field: 'drawMapPath', title: "是否出路径图", valign:"middle", align:"center", colspan: 1 },
-                        // { field: 'planRemarks', title: "备注", valign:"middle", align:"center", colspan: 1 ,formatter:paramsMatter},
-                        //
-                        // { field: 'arrangementProject', title: "立项安排", valign:"middle", align:"center", colspan: 1 ,formatter:paramsMatter},
-                        // { field: 'implementationBatch', title: "实施批次", valign:"middle", align:"center", colspan: 1 },
-                        // { field: 'constructionUnit', title: "施工单位", valign:"middle", align:"center", colspan: 1 },
-                        // { field: 'drawOfficeDrawn', title: "是否出正式图", valign:"middle", align:"center", colspan: 1 },
-                        // { field: 'projectInitiateRemarks', title: "备注", valign:"middle", align:"center", colspan: 1 ,formatter:paramsMatter},
+                        { field: 'discloseRemarks', title: "备注", valign:"middle", align:"center", colspan: 1 ,formatter:paramsMatter}
 
                     ],
 

src/main/webapp/webpage/modules/cg/reservemanagementcenter/reserveManage/summaryStatistics/reserveManagementModifyByzz.jsp

@@ -79,112 +79,145 @@
 			<td class="width-35">
 				<form:input path="demandUnit" htmlEscape="false"    class="form-control" readonly="true"/>
 			</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" readonly="true"/>
 			</td>
+		</tr>
+		<tr>
 			<td class="width-15 active"><label class="">项目分组：</label></td>
 			<td class="width-35">
 				<form:input path="projectGroup" htmlEscape="false"    class="form-control" readonly="true"/>
 			</td>
-		</tr>
-		<tr>
 			<td class="width-15 active"><label class="">项目经理：</label></td>
 			<td class="width-35">
 				<form:input path="projectManager" readonly="true" htmlEscape="false"    class="form-control"/>
 			</td>
+		</tr>
+		<tr>
 			<td class="width-15 active"><label class="">储备批次：</label></td>
 			<td class="width-35">
 				<form:input path="reserveBatches" htmlEscape="false"    class="form-control" readonly="true"/>
 			</td>
-		</tr>
-		<tr>
 			<td class="width-15 active"><label class="">供电区域：</label></td>
 			<td class="width-35">
 				<form:input path="blockSupply" htmlEscape="false"    class="form-control" readonly="true"/>
 			</td>
+		</tr>
+		<tr>
 			<td class="width-15 active"><label class=""><font color="red">*</font>网格编号：</label></td>
 			<td class="width-35">
 				<form:input path="gridNumber" htmlEscape="false"    class="form-control" readonly="true"/>
 			</td>
-		</tr>
-		<tr>
 			<td class="width-15 active"><label class=""><font color="red">*</font>单元格编号：</label></td>
 			<td class="width-35">
 				<form:input path="cellNumber" htmlEscape="false"    class="form-control" readonly="true"/>
 			</td>
+		</tr>
+		<tr>
 			<td class="width-15 active"><label class=""><font color="red">*</font>项目储备编号：</label></td>
 			<td class="width-35">
 				<form:input path="projectReserveId" htmlEscape="false"  readonly="true"  class="form-control required"/>
 			</td>
-		</tr>
-
-		<tr>
 			<td class="width-15 active"><label class=""><font color="red">*</font>项目名称：</label></td>
 			<td class="width-35">
 				<form:input path="projectName" htmlEscape="false"    class="form-control required" readonly="true"/>
 			</td>
-			<td class="width-15 active"><label class=""><font color="red">*</font>建设必要性及内容：</label></td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class=""><font color="red">*</font>国网项目编码：</label></td>
 			<td class="width-35">
-				<form:input path="constructionNecessityAndContent" htmlEscape="false"    class="form-control" readonly="true"/>
+				<form:input path="stateGridProjectCode" htmlEscape="false"  readonly="true"  class="form-control"/>
+			</td>
+			<td class="width-15 active"><label class=""><font color="red">*</font>国网项目名称：</label></td>
+			<td class="width-35">
+				<form:input path="stateGridProjectName" htmlEscape="false"  readonly="true"  class="form-control"/>
 			</td>
 		</tr>
 		<tr>
+			<td class="width-15 active"><label class=""><font color="red">*</font>建设必要性及内容：</label></td>
+			<td class="width-35">
+				<form:input path="constructionNecessityAndContent" htmlEscape="false"    class="form-control" readonly="true"/>
+			</td>
 			<td class="width-15 active"><label class="">变电站名称：</label></td>
 			<td class="width-35">
 				<form:input path="substationName" htmlEscape="false"    class="form-control" readonly="true"/>
 			</td>
+		</tr>
+		<tr>
 			<td class="width-15 active"><label class="">线路名称：</label></td>
 			<td class="width-35">
 				<form:input path="circuitName" htmlEscape="false" class="form-control" readonly="true"/>
 			</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" readonly="true"/>
 			</td>
+		</tr>
+		<tr>
 			<td class="width-15 active"><label class="">需求类型：</label></td>
 			<td class="width-35">
 				<form:input path="requirementType" htmlEscape="false" class="form-control" readonly="true"/>
 			</td>
-		</tr>
-		<tr>
 			<td class="width-15 active"><label class="">项目类型：</label></td>
 			<td class="width-35">
 				<form:input path="projectType" htmlEscape="false" class="form-control" readonly="true"/>
 			</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" readonly="true"/>
 			</td>
 		</tr>
-		<%--<tr>
-			<td class="width-15 active"><label class="">预算编制状态：</label></td>
+		<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="budgetPreparationStatus" htmlEscape="false" class="form-control number money" readonly="true"/>
+				<form:input path="reserveProgress" htmlEscape="false" class="form-control" readonly="true"/>
 			</td>
-			<td class="width-15 active"><label class="">预算含税：</label></td>
+			<td class="width-15 active"><label class="">是否纳入储备：</label></td>
 			<td class="width-35">
-				<form:input path="budgetIncludesTax" htmlEscape="false" class="form-control number money" readonly="true"/>
+				<select id="includeReserve" name="includeReserve"  class="form-control">
+					<option value="">请选择</option>
+					<option value="是" <c:if test="${reserveManagement.includeReserve=='是'}">selected</c:if>>是</option>
+					<option value="待定" <c:if test="${reserveManagement.includeReserve=='待定'}">selected</c:if>>待定</option>
+					<option value="取消" <c:if test="${reserveManagement.includeReserve=='取消'}">selected</c:if>>取消</option>
+				</select>
+
 			</td>
 		</tr>
 		<tr>
-			<td class="width-15 active"><label class="">预算不含税：</label></td>
+			<td class="width-15 active"><label class="">取消原因说明：</label></td>
 			<td class="width-35">
-				<form:input path="budgetNotIncludesTax" htmlEscape="false" class="form-control number money" readonly="true"/>
+				<form:input path="reasonForCancel" htmlEscape="false" class="form-control" readonly="true"/>
 			</td>
-			<td class="width-15 active"><label class="">备注：</label></td>
+			<td class="width-15 active"><label class="">是否启动设计：</label></td>
 			<td class="width-35">
-				<form:textarea path="basicRemarks" htmlEscape="false" rows="3" maxlength="200" class="form-control" readonly="true"/>
+<%--				<form:input path="startDesignOrNot" htmlEscape="false" class="form-control"/>--%>
+				<select id="startDesignOrNot" name="startDesignOrNot"  class="form-control">
+					<option value="">请选择</option>
+					<option value="是" <c:if test="${reserveManagement.startDesignOrNot=='是'}">selected</c:if>>是</option>
+					<option value="否" <c:if test="${reserveManagement.startDesignOrNot=='否'}">selected</c:if>>否</option>
+				</select>
 			</td>
-		</tr>--%>
+		</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="completeDisclose" htmlEscape="false" class="form-control"/>
+			</td>
+			<td class="width-15 active"><label class="">交底完成时间：</label></td>
+			<td class="width-35">
+				<form:input path="completeDiscloseTime" htmlEscape="false" class="form-control"/>
+			</td>
+		</tr>
+		<tr>
 			<td class="width-15 active"><label class="">项目综合可实施性：</label></td>
 			<td class="width-35">
 				<form:input path="comprehensiveProject" htmlEscape="false" class="form-control" readonly="true"/>
@@ -234,127 +267,6 @@
 				<form:input path="discloseRemarks" htmlEscape="false" 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:input path="demandUnitPriority" htmlEscape="false" class="form-control"/>
-			</td>
-			<td class="width-15 active"><label class="">立项初安排：</label></td>
-			<td class="width-35">
-				<form:input path="preliminaryArrangement" htmlEscape="false" class="form-control"/>
-			</td>
-		</tr>
-		<tr>
-			<td class="width-15 active"><label class="">初定实施批次：</label></td>
-			<td class="width-35">
-				<form:input path="initialImplementBatch" htmlEscape="false" class="form-control"/>
-			</td>
-			<td class="width-15 active"><label class="">初定实施单位：</label></td>
-			<td class="width-35">
-				<form:input path="initialImplementUnit" htmlEscape="false" class="form-control"/>
-			</td>
-		</tr>
-		<tr>
-			<td class="width-15 active"><label class="">储备项目推进计划（项目管理中心）：</label></td>
-			<td class="width-35">
-				<form:input path="projectManagementCenter" htmlEscape="false" class="form-control"/>
-			</td>
-			<td class="width-15 active"><label class="">项目管理单位完成进度：</label></td>
-			<td class="width-35">
-				<form:input path="completeProgressUnit" htmlEscape="false" class="form-control"/>
-			</td>
-		</tr>
-		<tr>
-			<td class="width-15 active"><label class="">储备项目推进计划（需求单位）：</label></td>
-			<td class="width-35">
-				<form:input path="projectReservePlan" htmlEscape="false" class="form-control"/>
-			</td>
-			<td class="width-15 active"><label class="">需求单位完成进度：</label></td>
-			<td class="width-35">
-				<form:input path="demandUnitProgress" htmlEscape="false" class="form-control"/>
-			</td>
-		</tr>
-		<tr>
-			<td class="width-15 active"><label class="">政处计划（政处单位）：</label></td>
-			<td class="width-35">
-				<form:input path="departmentPlan" htmlEscape="false" class="form-control"/>
-			</td>
-			<td class="width-15 active"><label class="">政处进度：</label></td>
-			<td class="width-35">
-				<form:input path="administrativeProgress" htmlEscape="false" class="form-control" readonly="true"/>
-			</td>
-		</tr>
-		<tr>
-			<td class="width-15 active"><label class="">是否出路径图：</label></td>
-			<td class="width-35">
-				<form:input path="drawMapPath" htmlEscape="false" class="form-control"/>
-			</td>
-			<td class="width-15 active"><label class="">备注：</label></td>
-			<td class="width-35">
-				<form:input path="planRemarks" htmlEscape="false" 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:input path="arrangementProject" htmlEscape="false" class="form-control"/>
-			</td>
-			<td class="width-15 active"><label class="">实施批次：</label></td>
-			<td class="width-35">
-				<form:input path="implementationBatch" htmlEscape="false" class="form-control"/>
-			</td>
-		</tr>
-		<tr>
-			<td class="width-15 active"><label class="">施工单位：</label></td>
-			<td class="width-35">
-				<form:input path="constructionUnit" htmlEscape="false" class="form-control"/>
-			</td>
-			<td class="width-15 active"><label class="">是否出正式图：</label></td>
-			<td class="width-35">
-				<form:input path="drawOfficeDrawn" htmlEscape="false" class="form-control"/>
-			</td>
-		</tr>
-		<tr>
-			<td class="width-15 active"><label class="">备注：</label></td>
-			<td class="width-35">
-				<form:input path="projectInitiateRemarks" htmlEscape="false" 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:input path="reserveProgress" htmlEscape="false" class="form-control" readonly="true"/>
-			</td>
-			<td class="width-15 active"><label class="">是否纳入储备：</label></td>
-			<td class="width-35">
-				<select id="includeReserve" name="includeReserve"  class="form-control">
-					<option value="">请选择</option>
-					<option value="是" <c:if test="${reserveManagement.includeReserve=='是'}">selected</c:if>>是</option>
-					<option value="待定" <c:if test="${reserveManagement.includeReserve=='待定'}">selected</c:if>>待定</option>
-					<option value="取消" <c:if test="${reserveManagement.includeReserve=='取消'}">selected</c:if>>取消</option>
-				</select>
-
-			</td>
-		</tr>
-		<tr>
-			<td class="width-15 active"><label class="">取消原因说明：</label></td>
-			<td class="width-35">
-				<form:input path="reasonForCancel" htmlEscape="false" class="form-control" readonly="true"/>
-			</td>
-			<td class="width-15 active"><label class="">是否启动设计：</label></td>
-			<td class="width-35">
-				<form:input path="startDesignOrNot" htmlEscape="false" class="form-control"/>
-			</td>
-		</tr>
 
 		</tbody>
 	</table>

src/main/webapp/webpage/modules/cg/reservemanagementcenter/reserveManage/summaryStatistics/reserveManagementView.jsp

@@ -49,99 +49,152 @@
 			<td class="width-35">
 				<form:input path="projectNature" htmlEscape="false" readonly="true" class="form-control"/>
 			</td>
-
 		</tr>
 		<tr>
 			<td class="width-15 active"><label class="">需求单位：</label></td>
 			<td class="width-35">
 				<form:input path="demandUnit" htmlEscape="false"  readonly="true"  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"  readonly="true"  class="form-control"/>
 			</td>
+		</tr>
+		<tr>
 			<td class="width-15 active"><label class="">项目分组：</label></td>
 			<td class="width-35">
 				<form:input path="projectGroup" htmlEscape="false"  readonly="true"  class="form-control"/>
 			</td>
-		</tr>
-		<tr>
 			<td class="width-15 active"><label class="">项目经理：</label></td>
 			<td class="width-35">
 				<form:input path="projectManager" readonly="true" htmlEscape="false"    class="form-control"/>
 			</td>
+		</tr>
+		<tr>
 			<td class="width-15 active"><label class="">储备批次：</label></td>
 			<td class="width-35">
 				<form:input path="reserveBatches" htmlEscape="false"  readonly="true"  class="form-control"/>
 			</td>
-		</tr>
-		<tr>
 			<td class="width-15 active"><label class="">供电区域：</label></td>
 			<td class="width-35">
 				<form:input path="blockSupply" htmlEscape="false"  readonly="true"  class="form-control"/>
 			</td>
+		</tr>
+		<tr>
 			<td class="width-15 active"><label class=""><font color="red">*</font>网格编号：</label></td>
 			<td class="width-35">
 				<form:input path="gridNumber" htmlEscape="false"  readonly="true"  class="form-control"/>
 			</td>
-		</tr>
-		<tr>
 			<td class="width-15 active"><label class=""><font color="red">*</font>单元格编号：</label></td>
 			<td class="width-35">
 				<form:input path="cellNumber" htmlEscape="false"  readonly="true"  class="form-control"/>
 			</td>
+		</tr>
+		<tr>
 			<td class="width-15 active"><label class=""><font color="red">*</font>项目储备编号：</label></td>
 			<td class="width-35">
 				<form:input path="projectReserveId" htmlEscape="false"  readonly="true"  class="form-control required"/>
 			</td>
+			<td class="width-15 active"><label class=""><font color="red">*</font>储备项目名称：</label></td>
+			<td class="width-35">
+				<form:input path="projectName" htmlEscape="false"  readonly="true"  class="form-control required"/>
+			</td>
 		</tr>
-
 		<tr>
-			<td class="width-15 active"><label class=""><font color="red">*</font>项目名称：</label></td>
+			<td class="width-15 active"><label class=""><font color="red">*</font>国网项目编码：</label></td>
 			<td class="width-35">
-				<form:input path="projectName" htmlEscape="false"  readonly="true"  class="form-control required"/>
+				<form:input path="stateGridProjectCode" htmlEscape="false"  readonly="true"  class="form-control"/>
 			</td>
-			<td class="width-15 active"><label class=""><font color="red">*</font>建设必要性及内容：</label></td>
+			<td class="width-15 active"><label class=""><font color="red">*</font>国网项目名称：</label></td>
 			<td class="width-35">
-				<form:input path="constructionNecessityAndContent" htmlEscape="false"  readonly="true"  class="form-control"/>
+				<form:input path="stateGridProjectName" htmlEscape="false"  readonly="true"  class="form-control"/>
 			</td>
 		</tr>
+
 		<tr>
+			<td class="width-15 active"><label class=""><font color="red">*</font>建设必要性及内容：</label></td>
+			<td class="width-35">
+				<form:input path="constructionNecessityAndContent" htmlEscape="false"  readonly="true"  class="form-control"/>
+			</td>
 			<td class="width-15 active"><label class="">变电站名称：</label></td>
 			<td class="width-35">
 				<form:input path="substationName" htmlEscape="false"  readonly="true"  class="form-control"/>
 			</td>
+		</tr>
+		<tr>
 			<td class="width-15 active"><label class="">线路名称：</label></td>
 			<td class="width-35">
 				<form:input path="circuitName" htmlEscape="false" readonly="true" 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"  readonly="true"  class="form-control"/>
 			</td>
+		</tr>
+		<tr>
 			<td class="width-15 active"><label class="">需求类型：</label></td>
 			<td class="width-35">
 				<form:input path="requirementType" htmlEscape="false" readonly="true" class="form-control"/>
 			</td>
-		</tr>
-		<tr>
 			<td class="width-15 active"><label class="">项目类型：</label></td>
 			<td class="width-35">
 				<form:input path="projectType" htmlEscape="false" readonly="true" 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" readonly="true" class="form-control number money"/>
 			</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="reserveProgress" htmlEscape="false" class="form-control" readonly="true"/>
+			</td>
+			<td class="width-15 active"><label class="">是否纳入储备：</label></td>
+			<td class="width-35">
+				<select id="includeReserve" name="includeReserve" readonly="true" disabled  class="form-control">
+					<option value="">请选择</option>
+					<option value="是" <c:if test="${reserveManagement.includeReserve=='是'}">selected</c:if>>是</option>
+					<option value="待定" <c:if test="${reserveManagement.includeReserve=='待定'}">selected</c:if>>待定</option>
+					<option value="取消" <c:if test="${reserveManagement.includeReserve=='取消'}">selected</c:if>>取消</option>
+				</select>
+
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">取消原因说明：</label></td>
+			<td class="width-35">
+				<form:input path="reasonForCancel" htmlEscape="false" class="form-control" readonly="true"/>
+			</td>
+			<td class="width-15 active"><label class="">是否启动设计：</label></td>
+			<td class="width-35">
+<%--				<form:input path="startDesignOrNot" htmlEscape="false"  readonly="true" class="form-control"/>--%>
+				<select id="startDesignOrNot" name="startDesignOrNot" readonly="true" disabled  class="form-control">
+					<option value="">请选择</option>
+					<option value="是" <c:if test="${reserveManagement.startDesignOrNot=='是'}">selected</c:if>>是</option>
+					<option value="否" <c:if test="${reserveManagement.startDesignOrNot=='取消'}">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="completeDisclose" htmlEscape="false" class="form-control" readonly="true"/>
+			</td>
+			<td class="width-15 active"><label class="">交底完成时间：</label></td>
+			<td class="width-35">
+				<form:input path="completeDiscloseTime" htmlEscape="false" class="form-control" readonly="true"/>
+			</td>
+		</tr>
+		<tr>
 			<td class="width-15 active"><label class="">项目综合可实施性：</label></td>
 			<td class="width-35">
 				<form:input path="comprehensiveProject" htmlEscape="false" class="form-control" readonly="true"/>
@@ -158,68 +211,40 @@
 			</td>
 			<td class="width-15 active"><label class="">停电难度：</label></td>
 			<td class="width-35">
-				<form:input path="powerFailureDifficulty" htmlEscape="false" class="form-control"/>
+				<form:input path="powerFailureDifficulty" htmlEscape="false"  readonly="true" class="form-control"/>
 			</td>
 		</tr>
 		<tr>
 			<td class="width-15 active"><label class="">停电描述：</label></td>
 			<td class="width-35">
-				<form:input path="powerFailureDescribe" htmlEscape="false" class="form-control"/>
+				<form:input path="powerFailureDescribe" htmlEscape="false"  readonly="true" class="form-control"/>
 			</td>
 			<td class="width-15 active"><label class="">其他问题难度：</label></td>
 			<td class="width-35">
-				<form:input path="otherProblemDifficulty" htmlEscape="false" class="form-control"/>
+				<form:input path="otherProblemDifficulty" htmlEscape="false"  readonly="true" class="form-control"/>
 			</td>
 		</tr>
 		<tr>
 			<td class="width-15 active"><label class="">其他问题描述：</label></td>
 			<td class="width-35">
-				<form:input path="otherProblemDescribe" htmlEscape="false" class="form-control"/>
+				<form:input path="otherProblemDescribe" htmlEscape="false"  readonly="true" class="form-control"/>
 			</td>
 			<td class="width-15 active"><label class="">是否需重跑方案：</label></td>
 			<td class="width-35">
-				<form:input path="runPlanRequire" htmlEscape="false" class="form-control"/>
+				<form:input path="runPlanRequire" htmlEscape="false"  readonly="true" class="form-control"/>
 			</td>
 		</tr>
 		<tr>
 			<td class="width-15 active"><label class="">方案变更说明：</label></td>
 			<td class="width-35">
-				<form:input path="programChangeDescription" htmlEscape="false" class="form-control"/>
+				<form:input path="programChangeDescription" htmlEscape="false"  readonly="true" class="form-control"/>
 			</td>
 			<td class="width-15 active"><label class="">备注：</label></td>
 			<td class="width-35">
-				<form:input path="discloseRemarks" htmlEscape="false" class="form-control"/>
+				<form:input path="discloseRemarks" htmlEscape="false" readonly="true" 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:input path="reserveProgress" htmlEscape="false" class="form-control" readonly="true"/>
-			</td>
-			<td class="width-15 active"><label class="">是否纳入储备：</label></td>
-			<td class="width-35">
-				<select id="includeReserve" name="includeReserve"  class="form-control">
-					<option value="">请选择</option>
-					<option value="是" <c:if test="${reserveManagement.includeReserve=='是'}">selected</c:if>>是</option>
-					<option value="待定" <c:if test="${reserveManagement.includeReserve=='待定'}">selected</c:if>>待定</option>
-					<option value="取消" <c:if test="${reserveManagement.includeReserve=='取消'}">selected</c:if>>取消</option>
-				</select>
 
-			</td>
-		</tr>
-		<tr>
-			<td class="width-15 active"><label class="">取消原因说明：</label></td>
-			<td class="width-35">
-				<form:input path="reasonForCancel" htmlEscape="false" class="form-control" readonly="true"/>
-			</td>
-			<td class="width-15 active"><label class="">是否启动设计：</label></td>
-			<td class="width-35">
-				<form:input path="startDesignOrNot" htmlEscape="false" class="form-control"/>
-			</td>
-		</tr>
 
 		</tbody>
 	</table>

src/main/webapp/webpage/modules/cg/reservemanagementcenter/reserveManage/summaryStatistics/test/drawingReviewTest.jsp

@@ -160,70 +160,86 @@
 									<td class="width-35">
 										<form:input path="reserveSummary.projectGroup" htmlEscape="false"    readonly="true"  class="form-control"/>
 									</td>
-									<td class="width-15 active"><label class="">储备批次：</label></td>
+									<td class="width-15 active"><label class="">储备项目经理：</label></td>
 									<td class="width-35">
-										<form:input path="reserveSummary.reserveBatches" htmlEscape="false"    readonly="true"  class="form-control"/>
+										<form:input path="reserveSummary.projectManager" htmlEscape="false"    readonly="true"  class="form-control"/>
 									</td>
 								</tr>
 								<tr>
+									<td class="width-15 active"><label class="">储备批次：</label></td>
+									<td class="width-35">
+										<form:input path="reserveSummary.reserveBatches" htmlEscape="false"    readonly="true"  class="form-control"/>
+									</td>
 									<td class="width-15 active"><label class="">供电区域：</label></td>
 									<td class="width-35">
 										<form:input path="reserveSummary.blockSupply" htmlEscape="false"    readonly="true"  class="form-control"/>
 									</td>
+								</tr>
+								<tr>
 									<td class="width-15 active"><label class="">网格编号：</label></td>
 									<td class="width-35">
 										<form:input path="reserveSummary.gridNumber" htmlEscape="false"    readonly="true"  class="form-control"/>
 									</td>
-								</tr>
-								<tr>
 									<td class="width-15 active"><label class="">单元格编号：</label></td>
 									<td class="width-35">
 										<form:input path="reserveSummary.cellNumber" htmlEscape="false"    readonly="true"  class="form-control"/>
 									</td>
+								</tr>
+								<tr>
 									<td class="width-15 active"><label class="">项目储备编号：</label></td>
 									<td class="width-35">
 										<form:input path="projectReserveId" htmlEscape="false"  readonly="true"  class="form-control"/>
 									</td>
+									<td class="width-15 active"><label class="">储备项目名称：</label></td>
+									<td class="width-35">
+										<form:input path="projectName" htmlEscape="false"  readonly="true"  class="form-control"/>
+									</td>
 								</tr>
 								<tr>
-									<td class="width-15 active"><label class="">项目名称：</label></td>
+									<td class="width-15 active"><label class="">国网项目编码：</label></td>
 									<td class="width-35">
-										<form:input path="projectName" htmlEscape="false"  readonly="true"  class="form-control"/>
+										<form:input path="reserveSummary.stateGridProjectCode" htmlEscape="false"    readonly="true"  class="form-control"/>
 									</td>
-									<td class="width-15 active"><label class="">建设必要性及内容：</label></td>
+									<td class="width-15 active"><label class="">国网项目名称：</label></td>
 									<td class="width-35">
-										<form:input path="reserveSummary.constructionNecessityAndContent" htmlEscape="false"    readonly="true"  class="form-control"/>
+										<form:input path="reserveSummary.stateGridProjectName" htmlEscape="false"    readonly="true"  class="form-control"/>
 									</td>
 								</tr>
 								<tr>
+									<td class="width-15 active"><label class="">建设必要性及内容：</label></td>
+									<td class="width-35">
+										<form:input path="reserveSummary.constructionNecessityAndContent" htmlEscape="false"    readonly="true"  class="form-control"/>
+									</td>
 									<td class="width-15 active"><label class="">变电站名称：</label></td>
 									<td class="width-35">
 										<form:input path="reserveSummary.substationName" htmlEscape="false"    readonly="true"  class="form-control"/>
 									</td>
+								</tr>
+								<tr>
 									<td class="width-15 active"><label class="">线路名称：</label></td>
 									<td class="width-35">
 										<form:input path="reserveSummary.circuitName" htmlEscape="false"    readonly="true"  class="form-control"/>
 									</td>
-								</tr>
-								<tr>
 									<td class="width-15 active"><label class="">网架项目划分：</label></td>
 									<td class="width-35">
 										<form:input path="reserveSummary.netRackProjectDivide" htmlEscape="false" readonly="true"    class="form-control number money"/>
 									</td>
+								</tr>
+								<tr>
 									<td class="width-15 active"><label class="">需求类型：</label></td>
 									<td class="width-35">
 										<form:input path="reserveSummary.requirementType" htmlEscape="false" readonly="true"    class="form-control number money"/>
 									</td>
+									<td class="width-15 active"><label class="">项目类型：</label></td>
+									<td class="width-35">
+										<form:input path="reserveSummary.projectType" htmlEscape="false" readonly="true"    class="form-control number money"/>
+									</td>
 								</tr>
 								<tr>
 									<td class="width-15 active"><label class="">费用估算：</label></td>
 									<td class="width-35">
 										<form:input path="reserveSummary.costEstimate" htmlEscape="false" readonly="true"    class="form-control number money"/>
 									</td>
-									<td class="width-15 active"><label class="">备注：</label></td>
-									<td class="width-35">
-										<form:input path="reserveSummary.basicRemarks" htmlEscape="false" readonly="true"    class="form-control number money"/>
-									</td>
 								</tr>
 								<tr>
 									<td colspan="4" class="width-15 active"><label class="">设计资料：</label></td>

src/main/webapp/webpage/modules/sg/progress/yearProgressEdit.jsp

@@ -70,10 +70,6 @@
             <td class="width-35">
                 <form:input path="constructionUnit" htmlEscape="false" class="form-control "/>
             </td>
-            <td class="width-15 active"><label class="">业主项目经理：</label></td>
-            <td class="width-35">
-                <form:input path="ownerProjectManager" htmlEscape="false" class="form-control"/>
-            </td>
         </tr>
         <tr>
             <td class="width-15 active"><label class="">施工项目经理：</label></td>
@@ -159,4 +155,4 @@
     </table>
 </form:form>
 </body>
-</html>
+</html>

src/main/webapp/webpage/modules/sg/progress/yearProgressForm.jsp

@@ -70,10 +70,6 @@
             <td class="width-35">
                 <form:input path="constructionUnit" htmlEscape="false" class="form-control "/>
             </td>
-            <td class="width-15 active"><label class="">业主项目经理：</label></td>
-            <td class="width-35">
-                <form:input path="ownerProjectManager" htmlEscape="false" class="form-control"/>
-            </td>
         </tr>
         <tr>
             <td class="width-15 active"><label class="">施工项目经理：</label></td>
@@ -159,4 +155,4 @@
     </table>
 </form:form>
 </body>
-</html>
+</html>