6张基本数据表的修改

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

@@ -27,7 +27,7 @@ public class ReserveProcessProject extends DataEntity<ReserveProcessProject> {
     private String circuitName;              //线路名称
     private String netRackProjectDivide;     //网架项目划分
     private String requirementType;          //需求类型
-    private String costEstimate;             //费用估算
+    private double costEstimate;             //费用估算
     private String basicRemarks;             //备注
     private String requester;                //需求提报人
     private String ownerReserveFullTime;     //业主储备专职
@@ -41,14 +41,6 @@ public class ReserveProcessProject extends DataEntity<ReserveProcessProject> {
     private int processStatus;           //流程状态 (0：未开始，1：进行中，2：完成，3：取消，4：待定 )
     private String uninterruptedWorkSurveyPersonnel;           //不停电作业查勘人员
 
-    public String getMaterialSoleDuty() {
-        return materialSoleDuty;
-    }
-
-    public void setMaterialSoleDuty(String materialSoleDuty) {
-        this.materialSoleDuty = materialSoleDuty;
-    }
-
     @ExcelField(title="项目年份", align=2, sort=1)
     public String getProjectYear() {
         return projectYear;
@@ -181,11 +173,11 @@ public class ReserveProcessProject extends DataEntity<ReserveProcessProject> {
         this.requirementType = requirementType;
     }
     @ExcelField(title="费用估算", align=2, sort=17)
-    public String getCostEstimate() {
+    public double getCostEstimate() {
         return costEstimate;
     }
 
-    public void setCostEstimate(String costEstimate) {
+    public void setCostEstimate(double costEstimate) {
         this.costEstimate = costEstimate;
     }
     @ExcelField(title="备注", align=2, sort=18)
@@ -228,7 +220,16 @@ public class ReserveProcessProject extends DataEntity<ReserveProcessProject> {
     public void setOwnerProjectManager(String ownerProjectManager) {
         this.ownerProjectManager = ownerProjectManager;
     }
-    @ExcelField(title="技经人员", align=2, sort=23)
+    @ExcelField(title="业主物资专职", align=2, sort=23)
+    public String getMaterialSoleDuty() {
+        return materialSoleDuty;
+    }
+
+    public void setMaterialSoleDuty(String materialSoleDuty) {
+        this.materialSoleDuty = materialSoleDuty;
+    }
+
+    @ExcelField(title="技经人员", align=2, sort=24)
     public String getTechnicalStaff() {
         return technicalStaff;
     }
@@ -236,7 +237,7 @@ public class ReserveProcessProject extends DataEntity<ReserveProcessProject> {
     public void setTechnicalStaff(String technicalStaff) {
         this.technicalStaff = technicalStaff;
     }
-    @ExcelField(title="运维人员", align=2, sort=24)
+    @ExcelField(title="运维人员", align=2, sort=25)
     public String getOperationAndMaintenancePersonnel() {
         return operationAndMaintenancePersonnel;
     }
@@ -244,7 +245,7 @@ public class ReserveProcessProject extends DataEntity<ReserveProcessProject> {
     public void setOperationAndMaintenancePersonnel(String operationAndMaintenancePersonnel) {
         this.operationAndMaintenancePersonnel = operationAndMaintenancePersonnel;
     }
-    @ExcelField(title="设计人员", align=2, sort=25)
+    @ExcelField(title="设计人员", align=2, sort=26)
     public String getDesigner() {
         return designer;
     }
@@ -252,7 +253,7 @@ public class ReserveProcessProject extends DataEntity<ReserveProcessProject> {
     public void setDesigner(String designer) {
         this.designer = designer;
     }
-    @ExcelField(title="概算编制人员", align=2, sort=26)
+    @ExcelField(title="概算编制人员", align=2, sort=27)
     public String getBudgetPreparer() {
         return budgetPreparer;
     }
@@ -269,7 +270,7 @@ public class ReserveProcessProject extends DataEntity<ReserveProcessProject> {
         this.processStatus = processStatus;
     }
 
-    @ExcelField(title="不停电作业查勘人", align=2, sort=27)
+    @ExcelField(title="不停电作业查勘人", align=2, sort=28)
     public String getUninterruptedWorkSurveyPersonnel() {
         return uninterruptedWorkSurveyPersonnel;
     }

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

@@ -71,6 +71,9 @@ public class ReserveSummary extends DataEntity<ReserveSummary> {
 
     private String processStatus;       //流程状态
 
+    public ReserveSummary() {
+    }
+
     public String getProcessStatus() {
         return processStatus;
     }

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

@@ -16,6 +16,12 @@ import java.util.List;
 public interface CompanyReviewMapper extends BaseMapper<CompanyReview> {
 
     /**
+     * 根据项目储备编号删除省公司评审信息
+     * @param projectReserveId
+     */
+    void deleteByProjectReserveId(String projectReserveId);
+
+    /**
      * 根据 项目储备编号删除对应的流程信息
      * @param proId
      */
@@ -53,4 +59,11 @@ public interface CompanyReviewMapper extends BaseMapper<CompanyReview> {
      * @return
      */
     List<CompanyReview> exportFindList(CompanyReview companyReview);
+
+    /**
+     * 估计项目储备编号查数据
+     * @param proId
+     * @return
+     */
+    CompanyReview getByProId(String proId);
 }

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

@@ -17,6 +17,12 @@ import java.util.List;
 public interface ReserveElectricityWorkMapper extends BaseMapper<ReserveElectricityWork> {
 
     /**
+     * 根据项目储备编号删除带电作业信息
+     * @param projectReserveId
+     */
+    void deleteByProjectReserveId(String projectReserveId);
+
+    /**
      * 修改用户分界开关数量
      * @param allNum
      */
@@ -75,4 +81,11 @@ public interface ReserveElectricityWorkMapper extends BaseMapper<ReserveElectric
      * @return
      */
     String getByExecuteId(String executeId);
+
+    /**
+     * 根据项目储备编号查看是否有该数据
+     * @param proId
+     * @return
+     */
+    ReserveElectricityWork getByProId(String proId);
 }

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

@@ -17,6 +17,12 @@ import java.util.List;
 public interface ReservePreconstructMapper extends BaseMapper<ReservePreconstruction> {
 
     /**
+     * 根据项目储备编号删除预土建制化信息
+     * @param projectReserveId
+     */
+    void deleteByProjectReserveId(String projectReserveId);
+
+    /**
      * 获取所有的  项目储备编号
      * @return
      */
@@ -69,4 +75,11 @@ public interface ReservePreconstructMapper extends BaseMapper<ReservePreconstruc
      * @return
      */
     String getByExecuteId(String executeId);
+
+    /**
+     * 根据项目储备编号查数据
+     * @param reserveId
+     * @return
+     */
+    ReservePreconstruction getByReserveId(String reserveId);
 }

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

@@ -17,6 +17,19 @@ import java.util.List;
 public interface ReserveSafeDisclosureMapper extends BaseMapper<ReserveSafety> {
 
     /**
+     *
+     * @param id
+     * @return
+     */
+    ReserveSafety getById(String id);
+
+    /**
+     * 根据项目储备编号删除安全交底信息
+     * @param projectReserveId
+     */
+    void deleteByProjectReserveId(String projectReserveId);
+
+    /**
      * 获取所有的  项目储备编号
      * @return
      */
@@ -69,4 +82,11 @@ public interface ReserveSafeDisclosureMapper extends BaseMapper<ReserveSafety> {
      * @return
      */
     String getByExecuteId(String executeId);
+
+    /**
+     * 根据项目储备编号查数据
+     * @param reserveId
+     * @return
+     */
+    ReserveSafety getByReserveId(String reserveId);
 }

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

@@ -17,6 +17,12 @@ import java.util.List;
 public interface SummaryStatisticMapper extends BaseMapper<ReserveSummary> {
 
     /**
+     * 根据项目储备编号删除交底信息汇总信息
+     * @param projectReserveId
+     */
+    void deleteByProjectReserveId(String projectReserveId);
+
+    /**
      * 查出所有的  项目编码 及 是否纳入储备字段
      * @return
      */
@@ -76,4 +82,11 @@ public interface SummaryStatisticMapper extends BaseMapper<ReserveSummary> {
      * @return
      */
     String getByExecuteId(String executeId);
+
+    /**
+     * 根据项目储备id查数据
+     * @param proId
+     * @return
+     */
+    ReserveSummary getByProId(String proId);
 }

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

@@ -9,30 +9,30 @@
 		a.update_by AS "updateBy.id",
 		a.update_date AS "updateDate",
 		a.del_flag AS "delFlag",
-		b.projectYear,
-		b.projectNature,
-		b.demandUnit,
-		b.district,
-		b.projectGroup,
-		b.reserveBatches,
-		b.blockSupply,
-		b.gridNumber,
-		b.cellNumber,
-		b.projectReserveId,
-		b.projectName,
-		b.constructionNecessityAndContent,
-		b.substationName,
-		b.circuitName,
-		b.netRackProjectDivide,
-		b.requirementType,
-		b.costEstimate,
-		b.basicRemarks,
-		a.joinProvincialCompanyReview,
-		a.batchOfProvincialCompany,
-		a.passProvincialCompanyReview,
-		a.reviewComments,
-		a.designChangeRequired,
-		a.companyRemarks
+		a.projectYear,
+		a.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,
+		a.costEstimate,
+		a.basicRemarks,
+		IFNULL(b.joinProvincialCompanyReview,"") as joinProvincialCompanyReview,
+		IFNULL(b.batchOfProvincialCompany,"") as batchOfProvincialCompany,
+		IFNULL(b.passProvincialCompanyReview,"") as passProvincialCompanyReview,
+		IFNULL(b.reviewComments,"") as reviewComments,
+		IFNULL(b.designChangeRequired,"") as designChangeRequired,
+		IFNULL(b.companyRemarks,"") as companyRemarks
     </sql>
 
     <insert id="insert">
@@ -123,20 +123,23 @@
     <delete id="deleteActivityByProId">
         delete from cg_personnel_activiti where projectReserveId = #{proId}
     </delete>
+    <delete id="deleteByProjectReserveId">
+        delete from cg_reserve_company_review where projectReserveId = #{projectReserveId}
+    </delete>
 
     <select id="findList" resultType="com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.entity.CompanyReview">
         select
         <include refid="companyReviewColumns"/>
-        from cg_reserve_process b
-        left join cg_reserve_company_review a
+        from cg_reserve_process a
+        left join cg_reserve_company_review b
         on a.projectReserveId = b.projectReserveId
         <where>
-            b.del_flag = 0
+            a.del_flag = 0
             <if test="projectReserveId!=null and projectReserveId!=''">
-                and b.projectReserveId like concat('%', #{projectReserveId}, '%')
+                and a.projectReserveId like concat('%', #{projectReserveId}, '%')
             </if>
             <if test="projectName!=null and projectName!=''">
-                and b.projectName like concat('%', #{projectName}, '%')
+                and a.projectName like concat('%', #{projectName}, '%')
             </if>
             <if test="dataScope != null and dataScope != ''">
                 ${dataScope}
@@ -147,7 +150,7 @@
                 ORDER BY ${page.orderBy}
             </when>
             <otherwise>
-                ORDER BY b.update_date DESC
+                ORDER BY a.update_date DESC
             </otherwise>
         </choose>
     </select>
@@ -156,8 +159,8 @@
     <select id="get" resultType="com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.entity.CompanyReview">
         select
         <include refid="companyReviewColumns"/>
-        from cg_reserve_company_review a
-        left join cg_reserve_process b
+        from cg_reserve_process a
+        left join cg_reserve_company_review b
         on a.projectReserveId = b.projectReserveId
         where a.id = #{id}
     </select>
@@ -168,10 +171,9 @@
     <select id="queryByProjectReserveId"
             resultType="com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.entity.CompanyReview">
         select
-        <include refid="companyReviewColumns"/>
-        from cg_reserve_company_review a
-        left join cg_reserve_process b
-        on a.projectReserveId = b.projectReserveId
+        *
+        from
+        cg_reserve_company_review a
         where a.projectReserveId = #{projectReserveId}
     </select>
     <select id="getAllProId2" resultType="java.lang.String">
@@ -181,20 +183,24 @@
             resultType="com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.entity.CompanyReview">
         select
         <include refid="companyReviewColumns"/>
-        from cg_reserve_process b
-        left join cg_reserve_company_review a
+        from cg_reserve_process a
+        left join cg_reserve_company_review b
         on a.projectReserveId = b.projectReserveId
         <where>
-            b.del_flag = 0
+            a.del_flag = 0
             <if test="projectReserveId!=null and projectReserveId!=''">
-                and b.projectReserveId like concat('%', #{projectReserveId}, '%')
+                and a.projectReserveId like concat('%', #{projectReserveId}, '%')
             </if>
             <if test="projectName!=null and projectName!=''">
-                and b.projectName like concat('%', #{projectName}, '%')
+                and a.projectName like concat('%', #{projectName}, '%')
             </if>
             <if test="dataScope != null and dataScope != ''">
                 ${dataScope}
             </if>
         </where>
     </select>
+    <select id="getByProId"
+            resultType="com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.entity.CompanyReview">
+        select * from cg_reserve_company_review where projectReserveId = #{proId}
+    </select>
 </mapper>

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

@@ -24,40 +24,40 @@
 
     <sql id="reserveManagementColumns">
         a.id as "id",
-        a.create_by AS "createBy.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",
-		b.projectYear,
-		b.projectNature,
-		b.demandUnit,
-		b.district,
-		b.projectGroup,
-		b.reserveBatches,
-		b.blockSupply,
-		b.gridNumber,
-		b.cellNumber,
-		b.projectReserveId,
-		b.projectName,
-		b.constructionNecessityAndContent,
-		b.substationName,
-		b.circuitName,
-		b.netRackProjectDivide,
-		b.requirementType,
-		b.costEstimate,
-		b.basicRemarks,
-		a.hotLineWork,
-		a.boundarySwitchNum,
-		a.hotLineWorkTypeNo,
-		a.noStopWorkPlan,
-		a.powerFailureNum,
-		a.reasonsForNotWorkInterruption,
-		a.powerOutagePlan,
-		a.planner,
-		a.siteSurveyor,
-	    c.includeReserve as 'implementPlan',
-	    c.initialImplementBatch as implementBatch
+		a.projectYear,
+		a.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,
+		a.costEstimate,
+		a.basicRemarks,
+		IFNULL(b.hotLineWork,"") as hotLineWork,
+		IFNULL(b.boundarySwitchNum,"") as boundarySwitchNum,
+		IFNULL(b.hotLineWorkTypeNo,"") as hotLineWorkTypeNo,
+		IFNULL(b.noStopWorkPlan,"") as noStopWorkPlan,
+		IFNULL(b.powerFailureNum,"") as powerFailureNum,
+		IFNULL(b.reasonsForNotWorkInterruption,"") as reasonsForNotWorkInterruption,
+		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
 
     </sql>
 
@@ -166,6 +166,9 @@
         set
         boundarySwitchNum = #{allNum}
     </update>
+    <delete id="deleteByProjectReserveId">
+        delete from cg_reserve_electricity_work_information where projectReserveId = #{projectReserveId}
+    </delete>
 
     <select id="queryByProjectReserveId"
             resultType="com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.entity.ReserveElectricityWork">
@@ -178,18 +181,18 @@
     <select id="findList" resultType="com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.entity.ReserveElectricityWork">
         select
         <include refid="reserveManagementColumns"/>
-        from cg_reserve_process b
-        left join cg_reserve_electricity_work_information a
+        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
         on b.projectReserveId = c.projectReserveId
         <where>
-            b.del_flag = 0
+            a.del_flag = 0
             <if test="projectReserveId!=null and projectReserveId!=''">
-                and b.projectReserveId like concat('%', #{projectReserveId}, '%')
+                and a.projectReserveId like concat('%', #{projectReserveId}, '%')
             </if>
             <if test="projectName!=null and projectName!=''">
-                and b.projectName like concat('%', #{projectName}, '%')
+                and a.projectName like concat('%', #{projectName}, '%')
             </if>
             <if test="dataScope != null and dataScope != ''">
                 ${dataScope}
@@ -200,7 +203,7 @@
                 ORDER BY ${page.orderBy}
             </when>
             <otherwise>
-                ORDER BY b.update_date DESC
+                ORDER BY a.update_date DESC
             </otherwise>
         </choose>
     </select>
@@ -208,34 +211,34 @@
             resultType="com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.entity.ReserveElectricityWork">
         select
         <include refid="reserveManagementColumns"/>
-        from cg_reserve_process b
-        left join cg_reserve_electricity_work_information a
+        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
-        on b.projectReserveId = c.projectReserveId
+        on a.projectReserveId = c.projectReserveId
         <where>
-            b.del_flag = 0
+            a.del_flag = 0
             <if test="projectReserveId!=null and projectReserveId!=''">
-                and b.projectReserveId like concat('%', #{projectReserveId}, '%')
+                and a.projectReserveId like concat('%', #{projectReserveId}, '%')
             </if>
             <if test="projectName!=null and projectName!=''">
-                and b.projectName like concat('%', #{projectName}, '%')
+                and a.projectName like concat('%', #{projectName}, '%')
             </if>
             <if test="dataScope != null and dataScope != ''">
                 ${dataScope}
             </if>
         </where>
-        ORDER BY b.update_date DESC
+        ORDER BY a.update_date DESC
     </select>
 
     <select id="get" resultType="com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.entity.ReserveElectricityWork">
         select
         <include refid="reserveManagementColumns"/>
-        from cg_reserve_process b
-        left join cg_reserve_electricity_work_information a
+        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
-        on b.projectReserveId = c.projectReserveId
+        on a.projectReserveId = c.projectReserveId
         where a.id = #{id}
     </select>
     <select id="getByProjectReserveId" resultType="java.lang.String">
@@ -255,4 +258,10 @@
     <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.ReserveElectricityWork">
+        select
+        <include refid="reserveManagementColumn"/>
+        from cg_reserve_electricity_work_information a where a.projectReserveId = #{proId}
+    </select>
 </mapper>

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

@@ -2,36 +2,48 @@
 <!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.ReservePreconstructMapper">
 
-    <sql id="reserveManagementColumns">
+    <sql id="preconstructColumns">
         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",
-		b.projectYear,
-		b.projectNature,
-		b.demandUnit,
-		b.district,
-		b.projectGroup,
-		b.reserveBatches,
-		b.blockSupply,
-		b.gridNumber,
-		b.cellNumber,
-		b.projectReserveId,
-		b.projectName,
-		b.constructionNecessityAndContent,
-		b.substationName,
-		b.circuitName,
-		b.netRackProjectDivide,
-		b.requirementType,
-		b.costEstimate,
-		b.basicRemarks,
 		a.confessCivilFoundation,
 		a.confessPrefab,
-		a.confessPrefabDescription,
-        c.includeReserve as 'implementPlan',
-        c.initialImplementBatch as 'implementBatch'
+		a.confessPrefabDescription
+    </sql>
+
+    <sql id="reserveManagementColumns">
+        a.id as "id",
+        a.create_by AS "createBy.id",
+		a.create_date AS "createDate",
+		a.update_by AS "updateBy.id",
+		a.update_date AS "updateDate",
+		a.del_flag AS "delFlag",
+		a.projectYear,
+		a.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,
+		a.costEstimate,
+		a.basicRemarks,
+		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
 
     </sql>
 
@@ -105,34 +117,33 @@
 
         where id = #{id}
 	</update>
+    <delete id="deleteByProjectReserveId">
+        delete from cg_reserve_preconstruction_information where projectReserveId = #{projectReserveId}
+    </delete>
 
     <select id="queryByProjectReserveId"
             resultType="com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.entity.ReservePreconstruction">
         select
-        <include refid="reserveManagementColumns"/>
-        from cg_reserve_process b
-        left join cg_reserve_preconstruction_information a
-        on a.projectReserveId = b.projectReserveId
-        left join cg_reserve_summary_statistics c
-        on b.projectReserveId = c.projectReserveId
-        where b.projectReserveId = #{projectReserveId}
+        <include refid="preconstructColumns"/>
+        from cg_reserve_preconstruction_information a
+        where a.projectReserveId = #{projectReserveId}
     </select>
 
     <select id="findList" resultType="com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.entity.ReservePreconstruction">
         select
         <include refid="reserveManagementColumns"/>
-        from cg_reserve_process b
-        left join cg_reserve_preconstruction_information a
+        from cg_reserve_process a
+        left join cg_reserve_preconstruction_information b
         on a.projectReserveId = b.projectReserveId
         left join cg_reserve_summary_statistics c
-        on b.projectReserveId = c.projectReserveId
+        on a.projectReserveId = c.projectReserveId
         <where>
-            b.del_flag = 0
+            a.del_flag = 0
             <if test="projectReserveId!=null and projectReserveId!=''">
-                and b.projectReserveId like concat('%', #{projectReserveId}, '%')
+                and a.projectReserveId like concat('%', #{projectReserveId}, '%')
             </if>
             <if test="projectName!=null and projectName!=''">
-                and b.projectName like concat('%', #{projectName}, '%')
+                and a.projectName like concat('%', #{projectName}, '%')
             </if>
             <if test="dataScope != null and dataScope != ''">
                 ${dataScope}
@@ -143,7 +154,7 @@
                 ORDER BY ${page.orderBy}
             </when>
             <otherwise>
-                ORDER BY b.update_date DESC
+                ORDER BY a.update_date DESC
             </otherwise>
         </choose>
     </select>
@@ -151,34 +162,34 @@
             resultType="com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.entity.ReservePreconstruction">
         select
         <include refid="reserveManagementColumns"/>
-        from cg_reserve_process b
-        left join cg_reserve_preconstruction_information a
+        from cg_reserve_process a
+        left join cg_reserve_preconstruction_information b
         on a.projectReserveId = b.projectReserveId
         left join cg_reserve_summary_statistics c
-        on b.projectReserveId = c.projectReserveId
+        on a.projectReserveId = c.projectReserveId
         <where>
-            b.del_flag = 0
+            a.del_flag = 0
             <if test="projectReserveId!=null and projectReserveId!=''">
-                and b.projectReserveId like concat('%', #{projectReserveId}, '%')
+                and a.projectReserveId like concat('%', #{projectReserveId}, '%')
             </if>
             <if test="projectName!=null and projectName!=''">
-                and b.projectName like concat('%', #{projectName}, '%')
+                and a.projectName like concat('%', #{projectName}, '%')
             </if>
             <if test="dataScope != null and dataScope != ''">
                 ${dataScope}
             </if>
         </where>
-        ORDER BY b.update_date DESC
+        ORDER BY a.update_date DESC
     </select>
 
     <select id="get" resultType="com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.entity.ReservePreconstruction">
         select
         <include refid="reserveManagementColumns"/>
-        from cg_reserve_process b
-        left join cg_reserve_preconstruction_information a
+        from cg_reserve_process a
+        left join cg_reserve_preconstruction_information b
         on a.projectReserveId = b.projectReserveId
         left join cg_reserve_summary_statistics c
-        on b.projectReserveId = c.projectReserveId
+        on a.projectReserveId = c.projectReserveId
         where a.id = #{id}
     </select>
 
@@ -199,4 +210,10 @@
     <select id="getAllProId2" resultType="java.lang.String">
         select projectReserveId from cg_reserve_process
     </select>
+    <select id="getByReserveId"
+            resultType="com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.entity.ReservePreconstruction">
+        select
+        <include refid="preconstructColumns"/>
+        from cg_reserve_preconstruction_information a where a.projectReserveId = #{reserveId}
+    </select>
 </mapper>

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

@@ -528,7 +528,7 @@
          WHERE proc_ins_id = #{procInsId})
     </select>
     <select id="getAllProId" resultType="java.lang.String">
-        SELECT projectReserveId FROM cg_reserve_process
+        SELECT projectReserveId FROM cg_reserve_process where processStatus in ('1','5')
     </select>
     <select id="getProcessStatus" resultType="java.lang.Integer">
         SELECT processStatus FROM cg_reserve_process WHERE projectReserveId = #{proId}

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

@@ -2,31 +2,13 @@
 <!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.ReserveSafeDisclosureMapper">
 
-    <sql id="reserveManagementColumns">
+    <sql id="safeColumns">
         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",
-		b.projectYear,
-		b.projectNature,
-		b.demandUnit,
-		b.district,
-		b.projectGroup,
-		b.reserveBatches,
-		b.blockSupply,
-		b.gridNumber,
-		b.cellNumber,
-		b.projectReserveId,
-		b.projectName,
-		b.constructionNecessityAndContent,
-		b.substationName,
-		b.circuitName,
-		b.netRackProjectDivide,
-		b.requirementType,
-		b.costEstimate,
-		b.basicRemarks,
 		a.transmissionWork,
 		a.workDescribe,
 		a.transmissionErection,
@@ -55,6 +37,59 @@
 
     </sql>
 
+    <sql id="reserveManagementColumns">
+        a.id as "id",
+        a.create_by AS "createBy.id",
+		a.create_date AS "createDate",
+		a.update_by AS "updateBy.id",
+		a.update_date AS "updateDate",
+		a.del_flag AS "delFlag",
+		a.projectYear,
+		a.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,
+		a.costEstimate,
+		a.basicRemarks,
+		IFNULL(b.transmissionWork,"") as transmissionWork,
+		IFNULL(b.workDescribe,"") as workDescribe,
+		IFNULL(b.transmissionErection,"") as transmissionErection,
+		IFNULL(b.erecteDescribe,"") as erecteDescribe,
+		IFNULL(b.transmissionCommonTrench,"") as transmissionCommonTrench,
+		IFNULL(b.trenchDescribe,"") as trenchDescribe,
+		IFNULL(b.mediumVoltageWork,"") as mediumVoltageWork,
+		IFNULL(b.voltageWorkDescribe,"") as voltageWorkDescribe,
+		IFNULL(b.confineSpaceWork,"") as confineSpaceWork,
+		IFNULL(b.spaceDescribe,"") as spaceDescribe,
+		IFNULL(b.subStationCableBonding,"") as subStationCableBonding,
+		IFNULL(b.cableDescribe,"") as cableDescribe,
+		IFNULL(b.roadRailwaysAndWaterwaysWork,"") as roadRailwaysAndWaterwaysWork,
+		IFNULL(b.waterDescribe,"") as waterDescribe,
+		IFNULL(b.hotWork,"") as hotWork,
+		IFNULL(b.hotWorkDescribe,"") as hotWorkDescribe,
+		IFNULL(b.blackoutLineFour,"") as blackoutLineFour,
+		IFNULL(b.lineFourDescribe,"") as lineFourDescribe,
+		IFNULL(b.lineLoadRedirectionThree,"") as lineLoadRedirectionThree,
+		IFNULL(b.threeRedirectDescribe,"") as threeRedirectDescribe,
+		IFNULL(b.largeScaleMultiTeamWork,"") as largeScaleMultiTeamWork,
+		IFNULL(b.teamWorkDescribe,"") as teamWorkDescribe,
+		IFNULL(b.prepareThreeMeasures,"") as prepareThreeMeasures,
+		IFNULL(b.measureDescribe,"") as measureDescribe,
+		IFNULL(b.jobRiskLevelPrediction,"") as jobRiskLevelPrediction
+
+    </sql>
+
     <insert id="insert">
         insert into cg_reserve_safety_disclosure_information (
         id,
@@ -235,14 +270,15 @@
 
         where id = #{id}
 	</update>
+    <delete id="deleteByProjectReserveId">
+        delete from cg_reserve_safety_disclosure_information where projectReserveId = #{projectReserveId}
+    </delete>
 
     <select id="queryByProjectReserveId"
             resultType="com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.entity.ReserveSafety">
         select
-        <include refid="reserveManagementColumns"/>
+        <include refid="safeColumns"/>
         from cg_reserve_safety_disclosure_information a
-        left join cg_reserve_process b
-        on a.projectReserveId = b.projectReserveId
         where a.projectReserveId = #{projectReserveId}
     </select>
 
@@ -250,16 +286,16 @@
     <select id="findList" resultType="com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.entity.ReserveSafety">
         select
         <include refid="reserveManagementColumns"/>
-        from cg_reserve_process b
-        left join cg_reserve_safety_disclosure_information a
+        from cg_reserve_process a
+        left join cg_reserve_safety_disclosure_information b
         on a.projectReserveId = b.projectReserveId
         <where>
-            b.del_flag = 0
+            a.del_flag = 0
             <if test="projectReserveId!=null and projectReserveId!=''">
-                and b.projectReserveId like concat('%', #{projectReserveId}, '%')
+                and a.projectReserveId like concat('%', #{projectReserveId}, '%')
             </if>
             <if test="projectName!=null and projectName!=''">
-                and b.projectName like concat('%', #{projectName}, '%')
+                and a.projectName like concat('%', #{projectName}, '%')
             </if>
             <if test="dataScope != null and dataScope != ''">
                 ${dataScope}
@@ -270,7 +306,7 @@
                 ORDER BY ${page.orderBy}
             </when>
             <otherwise>
-                ORDER BY b.update_date DESC
+                ORDER BY a.update_date DESC
             </otherwise>
         </choose>
     </select>
@@ -278,29 +314,29 @@
             resultType="com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.entity.ReserveSafety">
         select
         <include refid="reserveManagementColumns"/>
-        from cg_reserve_process b
-        left join cg_reserve_safety_disclosure_information a
+        from cg_reserve_process a
+        left join cg_reserve_safety_disclosure_information b
         on a.projectReserveId = b.projectReserveId
         <where>
-            b.del_flag = 0
+            a.del_flag = 0
             <if test="projectReserveId!=null and projectReserveId!=''">
-                and b.projectReserveId like concat('%', #{projectReserveId}, '%')
+                and a.projectReserveId like concat('%', #{projectReserveId}, '%')
             </if>
             <if test="projectName!=null and projectName!=''">
-                and b.projectName like concat('%', #{projectName}, '%')
+                and a.projectName like concat('%', #{projectName}, '%')
             </if>
             <if test="dataScope != null and dataScope != ''">
                 ${dataScope}
             </if>
         </where>
-        ORDER BY b.update_date DESC
+        ORDER BY a.update_date DESC
     </select>
 
     <select id="get" resultType="com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.entity.ReserveSafety">
         select
         <include refid="reserveManagementColumns"/>
-        from cg_reserve_process b
-        left join cg_reserve_safety_disclosure_information a
+        from cg_reserve_process a
+        left join cg_reserve_safety_disclosure_information b
         on a.projectReserveId = b.projectReserveId
         where a.id = #{id}
     </select>
@@ -321,4 +357,10 @@
     <select id="getAllProId2" resultType="java.lang.String">
         select projectReserveId from cg_reserve_process
     </select>
+    <select id="getByReserveId"
+            resultType="com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.entity.ReserveSafety">
+        select
+        <include refid="safeColumns"/>
+        from cg_reserve_safety_disclosure_information a where a.projectReserveId = #{reserveId}
+    </select>
 </mapper>

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

@@ -9,57 +9,57 @@
 		a.update_by AS "updateBy.id",
 		a.update_date AS "updateDate",
 		a.del_flag AS "delFlag",
-		b.projectYear,
-		b.projectNature,
-		b.demandUnit,
-		b.district,
-		b.projectGroup,
-		b.reserveBatches,
-		b.blockSupply,
-		b.gridNumber,
-		b.cellNumber,
-		b.projectReserveId,
-		b.projectName,
-		b.constructionNecessityAndContent,
-		b.substationName,
-		b.circuitName,
-		b.netRackProjectDivide,
-		b.requirementType,
-		b.costEstimate,
-		b.basicRemarks,
-		a.includeReserve,
-		a.reasonForCancel,
-		a.comprehensiveProject,
-		a.powerFailureDifficulty,
-		a.powerFailureDescribe,
-		a.otherProblemDifficulty,
-		a.otherProblemDescribe,
-		a.runPlanRequire,
-		a.programChangeDescription,
-		a.discloseRemarks,
-		a.demandUnitPriority,
-		a.preliminaryArrangement,
-		a.initialImplementBatch,
-		a.initialImplementUnit,
-		a.projectManagementCenter,
-		a.completeProgressUnit,
-		a.projectReservePlan,
-		a.demandUnitProgress,
-		a.departmentPlan,
-		a.drawMapPath,
-		a.planRemarks,
-		a.arrangementProject,
-		a.implementationBatch,
-		a.constructionUnit,
-		a.drawOfficeDrawn,
-		a.projectInitiateRemarks,
-        b.ownerProjectManager as 'projectManager',
-        c.administrativeDifficulty as 'administrativeDifficulty',
-        c.officeProgress as 'officeProgress',
-        cg.pretrialEstimateAmount,
-        cg.pretrialEstimateAmountExcludeTax,
-        cg.afterTrialEstimateAmount,
-        cg.afterTrialEstimateAmountExcludeTax
+		a.projectYear,
+		a.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,
+		a.costEstimate,
+		a.basicRemarks,
+		IFNULL(b.includeReserve,"") as includeReserve,
+		IFNULL(b.reasonForCancel,"") as reasonForCancel,
+		IFNULL(b.comprehensiveProject,"") as comprehensiveProject,
+		IFNULL(b.powerFailureDifficulty,"") as powerFailureDifficulty,
+		IFNULL(b.powerFailureDescribe,"") as powerFailureDescribe,
+		IFNULL(b.otherProblemDifficulty,"") as otherProblemDifficulty,
+		IFNULL(b.otherProblemDescribe,"") as otherProblemDescribe,
+		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',
+        IFNULL(c.administrativeDifficulty,"") as administrativeDifficulty,
+        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
 
     </sql>
 
@@ -248,37 +248,30 @@
 
         where id = #{id}
 	</update>
+    <delete id="deleteByProjectReserveId">
+        delete from cg_reserve_summary_statistics where projectReserveId = #{projectReserveId}
+    </delete>
 
     <select id="queryByProjectReserveId"
             resultType="com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.entity.ReserveSummary">
-        select
-        <include refid="reserveManagementColumns"/>
-        ,count(DISTINCT a.projectReserveId)
-        from cg_reserve_summary_statistics a
-        left join cg_reserve_process b
-        on a.projectReserveId = b.projectReserveId
-        left join cg_reserve_policy_handing_information c
-        on a.projectReserveId = c.projectReserveId
-        left join cg_budget_stats cg
-        on cg.projectReserveId = a.projectReserveId
-        where a.projectReserveId = #{projectReserveId}
+        select * from cg_reserve_summary_statistics where projectReserveId = #{projectReserveId}
     </select>
 
 
     <select id="findList" resultType="com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.entity.ReserveSummary">
         select
         <include refid="reserveManagementColumns"/>
-        from cg_reserve_process b
-        left join cg_reserve_summary_statistics a
+        from cg_reserve_process a
+        left join cg_reserve_summary_statistics b
         on a.projectReserveId = b.projectReserveId
         left join cg_reserve_policy_handing_information c
-        on b.projectReserveId = c.projectReserveId
+        on a.projectReserveId = c.projectReserveId
         left join cg_budget_stats cg
-        on cg.projectReserveId = b.projectReserveId
+        on cg.projectReserveId = a.projectReserveId
         <where>
-            b.del_flag = 0
+            a.del_flag = 0
             <if test="projectReserveId!=null and projectReserveId!=''">
-                and b.projectReserveId like concat('%', #{projectReserveId}, '%')
+                and a.projectReserveId like concat('%', #{projectReserveId}, '%')
             </if>
             <if test="projectName!=null and projectName!=''">
                 and a.projectName like concat('%', #{projectName}, '%')
@@ -292,7 +285,7 @@
                 ORDER BY ${page.orderBy}
             </when>
             <otherwise>
-                ORDER BY b.update_date DESC
+                ORDER BY a.update_date DESC
             </otherwise>
         </choose>
     </select>
@@ -300,38 +293,38 @@
             resultType="com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.entity.ReserveSummary">
         select
         <include refid="reserveManagementColumns"/>
-        from cg_reserve_process b
-        left join cg_reserve_summary_statistics a
+        from cg_reserve_process a
+        left join cg_reserve_summary_statistics b
         on a.projectReserveId = b.projectReserveId
         left join cg_reserve_policy_handing_information c
-        on b.projectReserveId = c.projectReserveId
+        on a.projectReserveId = c.projectReserveId
         left join cg_budget_stats cg
-        on cg.projectReserveId = b.projectReserveId
+        on cg.projectReserveId = a.projectReserveId
         <where>
-            b.del_flag = 0
+            a.del_flag = 0
             <if test="projectReserveId!=null and projectReserveId!=''">
-                and b.projectReserveId like concat('%', #{projectReserveId}, '%')
+                and a.projectReserveId like concat('%', #{projectReserveId}, '%')
             </if>
             <if test="projectName!=null and projectName!=''">
-                and b.projectName like concat('%', #{projectName}, '%')
+                and a.projectName like concat('%', #{projectName}, '%')
             </if>
             <if test="dataScope != null and dataScope != ''">
                 ${dataScope}
             </if>
         </where>
-        ORDER BY b.update_date DESC
+        ORDER BY a.update_date DESC
     </select>
 
     <select id="get" resultType="com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.entity.ReserveSummary">
         select
         <include refid="reserveManagementColumns"/>
-        from cg_reserve_process b
-        left join cg_reserve_summary_statistics a
+        from cg_reserve_process a
+        left join cg_reserve_summary_statistics b
         on a.projectReserveId = b.projectReserveId
         left join cg_reserve_policy_handing_information c
-        on b.projectReserveId = c.projectReserveId
+        on a.projectReserveId = c.projectReserveId
         left join cg_budget_stats cg
-        on cg.projectReserveId = b.projectReserveId
+        on cg.projectReserveId = a.projectReserveId
         where a.id = #{id}
     </select>
     <select id="getByProjectReserveId" resultType="java.lang.String">
@@ -356,4 +349,8 @@
         select a.projectReserveId,includeReserve,processStatus 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>
 </mapper>

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

@@ -22,6 +22,19 @@ public class CompanyReviewService extends CrudService<CompanyReviewMapper, Compa
     @Autowired
     private CompanyReviewMapper dao;
 
+    public CompanyReview getByProId(String proId){
+           return dao.getByProId(proId);
+    }
+
+    /**
+     * 根据项目储备编号删除省公司评审信息
+     * @param projectReserveId
+     */
+    @Transactional(readOnly = false)
+    public void deleteByProjectReserveId(String projectReserveId){
+        dao.deleteActivityByProId(projectReserveId);
+    }
+
     /**
      * 根据项目储备id查询项目信息
      * @param companyReview

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

@@ -24,6 +24,15 @@ public class ReserveElectricityWorkService extends CrudService<ReserveElectricit
     private ReserveElectricityWorkMapper dao;
 
     /**
+     * 根据项目储备编号删除带电作业信息
+     * @param projectReserveId
+     */
+    @Transactional(readOnly = false)
+    public void deleteByProjectReserveId(String projectReserveId){
+        dao.deleteByProjectReserveId(projectReserveId);
+    }
+
+    /**
      * 修改用户分界开关数量
      * @param allNum
      */
@@ -48,6 +57,10 @@ public class ReserveElectricityWorkService extends CrudService<ReserveElectricit
         return dao.getAllProId2();
     }
 
+    public ReserveElectricityWork getByProId(String proId){
+        return dao.getByProId(proId);
+    }
+
     /**
      * 查询已有的参数数据 并分类返回已存在数据和未存在数据
      * @param reserveManagement

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

@@ -23,6 +23,18 @@ public class ReservePreconstructService extends CrudService<ReservePreconstructM
     @Autowired
     private ReservePreconstructMapper dao;
 
+    public ReservePreconstruction getByReserveId(String reserveId){
+        return dao.getByReserveId(reserveId);
+    }
+
+    /**
+     * 根据项目储备编号删除预土建制化信息
+     * @param projectReserveId
+     */
+    @Transactional(readOnly = false)
+    public void deleteByProjectReserveId(String projectReserveId){
+        dao.deleteByProjectReserveId(projectReserveId);
+    }
 
     /**
      * 获取所有的  项目储备编号

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

@@ -23,6 +23,10 @@ public class ReserveSafeDisclosureService extends CrudService<ReserveSafeDisclos
     @Autowired
     private ReserveSafeDisclosureMapper dao;
 
+    public ReserveSafety getByReserveId(String reserveId){
+        return dao.getByReserveId(reserveId);
+    }
+
     /**
      * 获取所有的  项目储备编号
      * @return
@@ -40,6 +44,15 @@ public class ReserveSafeDisclosureService extends CrudService<ReserveSafeDisclos
     }
 
     /**
+     * 根据项目储备编号删除安全交底信息
+     * @param projectReserveId
+     */
+    @Transactional(readOnly = false)
+    public void deleteByProjectReserveId(String projectReserveId){
+        dao.deleteByProjectReserveId(projectReserveId);
+    }
+
+    /**
      * 查询已有的参数数据 并分类返回已存在数据和未存在数据
      * @param reserveManagement
      * @return

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

@@ -23,6 +23,19 @@ public class SummaryStatisticService extends CrudService<SummaryStatisticMapper,
     @Autowired
     private SummaryStatisticMapper dao;
 
+    public ReserveSummary getByProId(String proId){
+        return dao.getByProId(proId);
+    }
+
+    /**
+     * 根据项目储备编号删除交底信息汇总信息
+     * @param projectReserveId
+     */
+    @Transactional(readOnly = false)
+    public void deleteByProjectReserveId(String projectReserveId){
+        dao.deleteByProjectReserveId(projectReserveId);
+    }
+
     /**
      * 查出所有的  项目编码 及 是否纳入储备字段
      * @return

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

@@ -207,7 +207,7 @@ public class ReserveProcessProjectExportUtil {
                 cell15.setCellValue(reserveManagement.getNetRackProjectDivide());
                 cell16.setCellValue(reserveManagement.getRequirementType());
 
-                String costEstimateStr= reserveManagement.getCostEstimate().toString();
+                String costEstimateStr= reserveManagement.getCostEstimate() + "";
                 if(StringUtils.isNotBlank(costEstimateStr)){
                     cell17.setCellValue(Double.parseDouble(costEstimateStr));
                 }

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

@@ -67,7 +67,7 @@ public class ReserveProcessProjectProUtil {
 
                     String costEstimateStr = importUtil.getCellValue(row,17).toString();
                     if(StringUtils.isNotBlank(costEstimateStr)){
-                        reserveManagement.setCostEstimate(costEstimateStr);
+                        reserveManagement.setCostEstimate(Double.parseDouble(costEstimateStr));
                     }
                     reserveManagement.setBasicRemarks((String) importUtil.getCellValue(row,18));
                     reserveManagement.setRequester((String) importUtil.getCellValue(row,19));
@@ -79,7 +79,7 @@ public class ReserveProcessProjectProUtil {
                     reserveManagement.setOperationAndMaintenancePersonnel((String) importUtil.getCellValue(row,25));
                     reserveManagement.setDesigner((String) importUtil.getCellValue(row,26));
                     reserveManagement.setBudgetPreparer((String) importUtil.getCellValue(row,27));
-                    reserveManagement.setUninterruptedWorkSurveyPersonnel((String) importUtil.getCellValue(row,28));
+//                    reserveManagement.setUninterruptedWorkSurveyPersonnel((String) importUtil.getCellValue(row,28));
                     reserveManagement.setProcessStatus(0);
 //                    reserveManagement.setUninterruptedWorkSurveyPersonnel((String) importUtil.getCellValue(row,27));
 
@@ -136,8 +136,7 @@ public class ReserveProcessProjectProUtil {
             if(StringUtils.isNotBlank(projectReserveId)){
 
                 reserveManagement.setProjectReserveId((String) importUtil.getCellValue(row,10));
-                //判断库中是否有重复数据
-                getBmList(proIdList,reserveManagement.getProjectReserveId());
+
                 //和基本信息表比对，是否有对应的数据
                 getBmList2(proIdList2,reserveManagement.getProjectReserveId());
 
@@ -201,9 +200,6 @@ public class ReserveProcessProjectProUtil {
 
                 reserveManagement.setProjectReserveId((String) importUtil.getCellValue(row,10));
 
-                //判断库中是否有重复数据
-                getBmList(proIdList,reserveManagement.getProjectReserveId());
-
                 //和基本信息表比对，是否有对应的数据
                 getBmList2(proIdList2,reserveManagement.getProjectReserveId());
 
@@ -274,9 +270,6 @@ public class ReserveProcessProjectProUtil {
 
                 reserveManagement.setProjectReserveId((String) importUtil.getCellValue(row,10));
 
-                //判断库中是否有重复数据
-                getBmList(proIdList,reserveManagement.getProjectReserveId());
-
                 //和基本信息表比对，是否有对应的数据
                 getBmList2(proIdList2,reserveManagement.getProjectReserveId());
 
@@ -369,7 +362,7 @@ public class ReserveProcessProjectProUtil {
     }
 
     /**
-     * 获取储备项目政策处理信息表格数据
+     * 获取储备项目交底汇总表格数据
      * @param importUtil
      * @return List<ReserveManagementMapper> 导入表格数据
      */
@@ -391,8 +384,6 @@ public class ReserveProcessProjectProUtil {
             if(StringUtils.isNotBlank(projectReserveId)){
 
                 reserveManagement.setProjectReserveId((String) importUtil.getCellValue(row,11));
-                //和库中的 项目储备编号对比，看是否有重复的
-                getBmList(proIdList,reserveManagement.getProjectReserveId());
                 //和基本信息表对比      是否无对应数据
                 getBmList2(proIdList2,reserveManagement.getProjectReserveId());
 
@@ -485,8 +476,6 @@ public class ReserveProcessProjectProUtil {
 
                 companyReview.setProjectReserveId(projectReserveId);
 
-                //去数据库中判断是否有重复的数据
-                getBmList(proIdList,companyReview.getProjectReserveId());
                 //去汇总表中查看是否有对应数据
                 getBmList3(proIdList2,companyReview.getProjectReserveId());
 
@@ -504,7 +493,7 @@ public class ReserveProcessProjectProUtil {
 
     public static void getBmList(List<String> sjkList, String proId) throws Exception {
         if (sjkList.contains(proId)){
-            throw new Exception(proId + "等项目已存在，不对数据进行保存！");
+            throw new Exception( "项目编号为" + proId + "的项目在流程中或已完成，不对数据进行保存操作！");
         }
     }
 

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

@@ -238,52 +238,74 @@ public class CompanyReviewController extends BaseController {
             j.setSuccess(false);
             j.setMsg(errMsg);
             return j;
+        }
+        //估计项目储备编号查数据
+        CompanyReview proId = service.getByProId(companyReview.getProjectReserveId());
+        if (null == proId){
+            proId = new CompanyReview();
+            proId.setProjectReserveId(companyReview.getProjectReserveId());
+            proId.setJoinProvincialCompanyReview(companyReview.getJoinProvincialCompanyReview());
+            proId.setBatchOfProvincialCompany(companyReview.getBatchOfProvincialCompany());
+            proId.setPassProvincialCompanyReview(companyReview.getPassProvincialCompanyReview());
+            proId.setReviewComments(companyReview.getReviewComments());
+            proId.setDesignChangeRequired(companyReview.getDesignChangeRequired());
+            proId.setCompanyRemarks(companyReview.getCompanyRemarks());
+            service.save(proId);
+
+        }else {
+            proId.setProjectReserveId(companyReview.getProjectReserveId());
+            proId.setJoinProvincialCompanyReview(companyReview.getJoinProvincialCompanyReview());
+            proId.setBatchOfProvincialCompany(companyReview.getBatchOfProvincialCompany());
+            proId.setPassProvincialCompanyReview(companyReview.getPassProvincialCompanyReview());
+            proId.setReviewComments(companyReview.getReviewComments());
+            proId.setDesignChangeRequired(companyReview.getDesignChangeRequired());
+            proId.setCompanyRemarks(companyReview.getCompanyRemarks());
+            //获取汇总表中的数据  物料编码 和 是否纳入储备字段
+            List<ReserveSummary> allCode = statisticService.getAllCode();
 
+            //修改时的两种情况
+            //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());
+
+
+                    //取消流程   将流程表中的流程信息删除
+                    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);
+
+                    j.setSuccess(true);
+                    j.setMsg("修改省公司评审信息成功");
+                }else {
+                    //新增或编辑表单保存
+                    service.update(finalProId);
+
+                    j.setSuccess(true);
+                    j.setMsg("修改省公司评审信息成功");
+                }
+            });
         }
-        //获取汇总表中的数据  物料编码 和 是否纳入储备字段
-        List<ReserveSummary> allCode = statisticService.getAllCode();
-
-        //修改时的两种情况
-        //1、在流程进行中修改(修改基础表的流程字段为取消，修改汇总表的是否纳入储备为取消，将取消原因放入到汇总表的取消原因说明字段 结束流程)
-        //2、流程未开始修改（正常操作不进行其他处理）
-        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());
-
-
-                //取消流程   将流程表中的流程信息删除
-                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(companyReview);
-
-                j.setSuccess(true);
-                j.setMsg("修改省公司评审信息成功");
-            }else {
-                //新增或编辑表单保存
-                service.update(companyReview);
-
-                j.setSuccess(true);
-                j.setMsg("修改省公司评审信息成功");
-            }
-        });
 
         return j;
     }

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

@@ -88,13 +88,21 @@ public class ReserveElectricityWorkController extends BaseController {
             //根据projectReserveId查出流程表的proc_ins_id
             String procInsId = workService.getByProjectReserveId(work.getProjectReserveId());
             //根据procInsId查出历史流程名称和时间
-            List<History> histories = workService.getHistoryByExecuteId(procInsId);
-            //当size>0时待办有历史流程，
-            if (histories.size()>0){
-                //根据proc_ins_id去运行时任务节点表（act_ru_task）中查出当前流程名称
-                String name = workService.getByExecuteId(procInsId);
-                //设置项目进度
-                work.setReserveProgress(name);
+            if (StringUtils.isNotEmpty(procInsId)){
+                List<History> histories = workService.getHistoryByExecuteId(procInsId);
+                //当size>0时待办有历史流程，
+                if (histories.size()>0){
+                    //根据proc_ins_id去运行时任务节点表（act_ru_task）中查出当前流程名称
+                    String name = workService.getByExecuteId(procInsId);
+                    //设置项目进度
+                    if (StringUtils.isNotEmpty(name)){
+                        work.setReserveProgress(name);
+                    }else {
+                        work.setReserveProgress("");
+                    }
+                }else {
+                    work.setReserveProgress("");
+                }
             }else {
                 work.setReserveProgress("");
             }
@@ -153,6 +161,7 @@ public class ReserveElectricityWorkController extends BaseController {
     @RequestMapping(value = "update")
     public AjaxJson update(ReserveElectricityWork reserveManagement){
         AjaxJson j = new AjaxJson();
+
         /**
          * 后台hibernate-validation插件校验
          */
@@ -162,8 +171,36 @@ public class ReserveElectricityWorkController extends BaseController {
             j.setMsg(errMsg);
             return j;
         }
-        //新增或编辑表单保存
-        workService.update(reserveManagement);
+
+        //根据id去带电作业表中查是否有这个数据
+        ReserveElectricityWork cityWork = workService.getByProId(reserveManagement.getProjectReserveId());
+        if (null == cityWork){
+            //进行保存操作
+            cityWork = new ReserveElectricityWork();
+            cityWork.setProjectReserveId(reserveManagement.getProjectReserveId());
+            cityWork.setHotLineWork(reserveManagement.getHotLineWork());
+            cityWork.setBoundarySwitchNum(reserveManagement.getBoundarySwitchNum());
+            cityWork.setHotLineWorkTypeNo(reserveManagement.getHotLineWorkTypeNo());
+            cityWork.setNoStopWorkPlan(reserveManagement.getNoStopWorkPlan());
+            cityWork.setPowerFailureNum(reserveManagement.getPowerFailureNum());
+            cityWork.setReasonsForNotWorkInterruption(reserveManagement.getReasonsForNotWorkInterruption());
+            cityWork.setPowerOutagePlan(reserveManagement.getPowerOutagePlan());
+            cityWork.setPlanner(reserveManagement.getPlanner());
+            cityWork.setSiteSurveyor(reserveManagement.getSiteSurveyor());
+            workService.save(cityWork);
+        }else {
+            //新增或编辑表单保存
+            cityWork.setHotLineWork(reserveManagement.getHotLineWork());
+            cityWork.setBoundarySwitchNum(reserveManagement.getBoundarySwitchNum());
+            cityWork.setHotLineWorkTypeNo(reserveManagement.getHotLineWorkTypeNo());
+            cityWork.setNoStopWorkPlan(reserveManagement.getNoStopWorkPlan());
+            cityWork.setPowerFailureNum(reserveManagement.getPowerFailureNum());
+            cityWork.setReasonsForNotWorkInterruption(reserveManagement.getReasonsForNotWorkInterruption());
+            cityWork.setPowerOutagePlan(reserveManagement.getPowerOutagePlan());
+            cityWork.setPlanner(reserveManagement.getPlanner());
+            cityWork.setSiteSurveyor(reserveManagement.getSiteSurveyor());
+            workService.update(cityWork);
+        }
         j.setSuccess(true);
         j.setMsg("修改储备项目基本信息成功");
         return j;

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

@@ -98,8 +98,15 @@ public class ReservePreconstructController extends BaseController {
             if (histories.size()>0){
                 //根据proc_ins_id去运行时任务节点表（act_ru_task）中查出当前流程名称
                 String name = structService.getByExecuteId(procInsId);
+                if (StringUtils.isNotEmpty(name)){
+                    pre.setReserveProgress(name);
+                }else {
+                    pre.setReserveProgress("");
+                }
                 //设置项目进度
-                pre.setReserveProgress(name);
+//                pre.setReserveProgress(name);
+            }else {
+                pre.setReserveProgress("");
             }
 
             //cg_material_data
@@ -366,8 +373,23 @@ public class ReservePreconstructController extends BaseController {
             j.setMsg(errMsg);
             return j;
         }
-        //新增或编辑表单保存
-        structService.update(reserveManagement);
+        //根据项目储备编号查数据
+        ReservePreconstruction pre = structService.getByReserveId(reserveManagement.getProjectReserveId());
+        if (null == pre){
+            pre = new ReservePreconstruction();
+            pre.setProjectReserveId(reserveManagement.getProjectReserveId());
+            pre.setConfessCivilFoundation(reserveManagement.getConfessCivilFoundation());
+            pre.setConfessPrefab(reserveManagement.getConfessPrefab());
+            pre.setConfessPrefabDescription(reserveManagement.getConfessPrefabDescription());
+            structService.save(pre);
+        }else {
+            //新增或编辑表单保存
+            pre.setConfessCivilFoundation(reserveManagement.getConfessCivilFoundation());
+            pre.setConfessPrefab(reserveManagement.getConfessPrefab());
+            pre.setConfessPrefabDescription(reserveManagement.getConfessPrefabDescription());
+            structService.update(pre);
+        }
+
         j.setSuccess(true);
         j.setMsg("修改储备项目基本信息成功");
         return j;

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

@@ -7,7 +7,7 @@ import com.jeeplus.common.utils.excel.ExportExcel;
 import com.jeeplus.core.persistence.Page;
 import com.jeeplus.core.web.BaseController;
 import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.entity.ReserveProcessProject;
-import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.service.ReserveProcessProjectService;
+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.filing.basicInformation.entity.BasicInformation;
@@ -46,6 +46,21 @@ public class ReserveProcessProjectController extends BaseController {
     @Autowired
     private ReserveProcessProjectService projectService;
 
+    @Autowired
+    private ReserveSafeDisclosureService safeService;
+
+    @Autowired
+    private ReserveElectricityWorkService workService;
+
+    @Autowired
+    private SummaryStatisticService statisticService;
+
+    @Autowired
+    private ReservePreconstructService structService;
+
+    @Autowired
+    private CompanyReviewService reviewService;
+
     @ModelAttribute
     public ReserveProcessProject get(@RequestParam(required = false) String id) {
         ReserveProcessProject entity = null;
@@ -261,10 +276,29 @@ public class ReserveProcessProjectController extends BaseController {
         String idArray[] =ids.split(",");
         for(String id : idArray){
             try {
-                projectService.delete(projectService.get(id));
+                //删除前判断该项目是否在流程中
+                ReserveProcessProject processProject = projectService.get(id);
+                if (processProject.getProcessStatus() == 1 || processProject.getProcessStatus() == 2){
+                    j.setSuccess(false);
+                    j.setMsg("该项目在流程中或已完成，无法删除");
+                    return j;
+                }else {
+                    //先删除关联表的信息
+                    //删除安全交底对应数据
+                    safeService.deleteByProjectReserveId(processProject.getProjectReserveId());
+                    //删除带电作业信息
+                    workService.deleteByProjectReserveId(processProject.getProjectReserveId());
+                    //删除汇总信息
+                    statisticService.deleteByProjectReserveId(processProject.getProjectReserveId());
+                    //删除预土建制化信息
+                    structService.deleteByProjectReserveId(processProject.getProjectReserveId());
+                    //删除省公司评审信息
+                    reviewService.deleteByProjectReserveId(processProject.getProjectReserveId());
+                    projectService.delete(processProject);
+                }
             }catch (Exception e){
                 j.setSuccess(false);
-                j.setMsg("存在关联数据，无法删除！");
+                j.setMsg("存在关联数据，无法删除！" + e);
                 return j;
             }
 

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

@@ -164,8 +164,56 @@ public class ReserveSafeDisclosureController extends BaseController {
             j.setMsg(errMsg);
             return j;
         }
-        //新增或编辑表单保存
-        safeService.update(reserveManagement);
+        //根据项目储备编号查是否有改数据
+        ReserveSafety safety = safeService.getByReserveId(reserveManagement.getProjectReserveId());
+        if (null == safety){
+            safety = new ReserveSafety(
+                    reserveManagement.getProjectReserveId(),reserveManagement.getTransmissionWork(),
+                    reserveManagement.getWorkDescribe(),reserveManagement.getTransmissionErection(),
+                    reserveManagement.getErecteDescribe(),reserveManagement.getTransmissionCommonTrench(),
+                    reserveManagement.getTrenchDescribe(),reserveManagement.getMediumVoltageWork(),
+                    reserveManagement.getVoltageWorkDescribe(),reserveManagement.getConfineSpaceWork(),
+                    reserveManagement.getSpaceDescribe(),reserveManagement.getSubStationCableBonding(),
+                    reserveManagement.getCableDescribe(),reserveManagement.getRoadRailwaysAndWaterwaysWork(),
+                    reserveManagement.getWaterDescribe(),reserveManagement.getHotWork(),
+                    reserveManagement.getHotWorkDescribe(),reserveManagement.getBlackoutLineFour(),
+                    reserveManagement.getLineFourDescribe(),reserveManagement.getLineLoadRedirectionThree(),
+                    reserveManagement.getThreeRedirectDescribe(),reserveManagement.getLargeScaleMultiTeamWork(),
+                    reserveManagement.getTeamWorkDescribe(),reserveManagement.getPrepareThreeMeasures(),
+                    reserveManagement.getMeasureDescribe(),reserveManagement.getJobRiskLevelPrediction()
+            );
+            safeService.save(safety);
+        }else {
+            safety.setTransmissionWork(reserveManagement.getTransmissionWork());
+            safety.setWorkDescribe(reserveManagement.getWorkDescribe());
+            safety.setTransmissionErection(reserveManagement.getTransmissionErection());
+            safety.setErecteDescribe(reserveManagement.getErecteDescribe());
+            safety.setTransmissionCommonTrench(reserveManagement.getTransmissionCommonTrench());
+            safety.setTrenchDescribe(reserveManagement.getTrenchDescribe());
+            safety.setMediumVoltageWork(reserveManagement.getMediumVoltageWork());
+            safety.setVoltageWorkDescribe(reserveManagement.getVoltageWorkDescribe());
+            safety.setConfineSpaceWork(reserveManagement.getConfineSpaceWork());
+            safety.setSpaceDescribe(reserveManagement.getSpaceDescribe());
+            safety.setSubStationCableBonding(reserveManagement.getSubStationCableBonding());
+            safety.setCableDescribe(reserveManagement.getCableDescribe());
+            safety.setRoadRailwaysAndWaterwaysWork(reserveManagement.getRoadRailwaysAndWaterwaysWork());
+            safety.setWaterDescribe(reserveManagement.getWaterDescribe());
+            safety.setHotWork(reserveManagement.getHotWork());
+            safety.setHotWorkDescribe(reserveManagement.getHotWorkDescribe());
+            safety.setBlackoutLineFour(reserveManagement.getBlackoutLineFour());
+            safety.setLineFourDescribe(reserveManagement.getLineFourDescribe());
+            safety.setLineLoadRedirectionThree(reserveManagement.getLineLoadRedirectionThree());
+            safety.setThreeRedirectDescribe(reserveManagement.getThreeRedirectDescribe());
+            safety.setLargeScaleMultiTeamWork(reserveManagement.getLargeScaleMultiTeamWork());
+            safety.setTeamWorkDescribe(reserveManagement.getTeamWorkDescribe());
+            safety.setPrepareThreeMeasures(reserveManagement.getPrepareThreeMeasures());
+            safety.setMeasureDescribe(reserveManagement.getMeasureDescribe());
+            safety.setJobRiskLevelPrediction(reserveManagement.getJobRiskLevelPrediction());
+
+            //新增或编辑表单保存
+            safeService.update(safety);
+        }
+
         j.setSuccess(true);
         j.setMsg("修改储备项目基本信息成功");
         return j;

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

@@ -122,14 +122,18 @@ public class SummaryStatisticController extends BaseController {
             //设置  预算（含税）    预算（不含税）
             if (StringUtils.isNotEmpty(summary.getAfterTrialEstimateAmount())){
                 summary.setBudgetIncludesTax(summary.getAfterTrialEstimateAmount());
-            }else {
+            }else if (StringUtils.isNotEmpty(summary.getPretrialEstimateAmount())){
                 summary.setBudgetIncludesTax(summary.getPretrialEstimateAmount());
+            }else {
+                summary.setBudgetIncludesTax("");
             }
 
             if (StringUtils.isNotEmpty(summary.getAfterTrialEstimateAmountExcludeTax())){
-                summary.setBudgetIncludesTax(summary.getAfterTrialEstimateAmountExcludeTax());
+                summary.setBudgetNotIncludesTax(summary.getAfterTrialEstimateAmountExcludeTax());
+            }else if (StringUtils.isNotEmpty(summary.getPretrialEstimateAmountExcludeTax())){
+                summary.setBudgetNotIncludesTax(summary.getPretrialEstimateAmountExcludeTax());
             }else {
-                summary.setBudgetIncludesTax(summary.getPretrialEstimateAmountExcludeTax());
+                summary.setBudgetNotIncludesTax("");
             }
 
             //根据projectReserveId查出流程表的proc_ins_id
@@ -211,88 +215,150 @@ public class SummaryStatisticController extends BaseController {
             j.setMsg(errMsg);
             return j;
         }
-        //修改时需要从  省公司评审表中查看是否可以发起流程
-        CompanyReview review = new CompanyReview();
-        review.setProjectReserveId(reserveManagement.getProjectReserveId());
-        CompanyReview companyReview = reviewService.queryByProjectReserveId(review);
-        if (companyReview == null){
-            //如果 流程状态是 进行中 还是 完成
-            int status = projectService.getProcessStatus(reserveManagement.getProjectReserveId());
-            if (status == 1 || status == 2){
-                j.setSuccess(false);
-                j.setMsg(reserveManagement.getProjectReserveId() + "项目流程正在进行中或已完成，无法修改！");
-                return j;
-            }
-            //去掉之前的流程，重新开始流程
-            reserveProcessService.deleteAct(reserveManagement.getProjectReserveId());
-
-            if (reserveManagement.getIncludeReserve().equals("是")){
-                //发起流程
-                ReserveSummaryProcess reserveProcess = new ReserveSummaryProcess();
-                reserveProcess.preInsert();
-                reserveProcess.setProjectReserveId(reserveManagement.getProjectReserveId());
-                //更新
-                reserveProcessService.insert(reserveProcess);
-                //发送流程，更改项目状态
-                Map<String, Object> vars = Maps.newHashMap();
-
-                ReserveProcessProject processProject = projectService.queryByProjectId(reserveManagement.getProjectReserveId());
-                //审核代理人
-                vars.put("manager", UserUtils.getByUserName(processProject.getDesigner()).getLoginName());
+
+        //根据项目储备id查数据
+        ReserveSummary proId = statisticService.getByProId(reserveManagement.getProjectReserveId());
+        if (null == proId){
+            proId = new ReserveSummary();
+            proId.setProjectReserveId(reserveManagement.getProjectReserveId());
+            proId.setIncludeReserve(reserveManagement.getIncludeReserve());
+            proId.setReasonForCancel(reserveManagement.getReasonForCancel());
+            proId.setComprehensiveProject(reserveManagement.getComprehensiveProject());
+            proId.setPowerFailureDifficulty(reserveManagement.getPowerFailureDifficulty());
+            proId.setPowerFailureDescribe(reserveManagement.getPowerFailureDescribe());
+            proId.setOtherProblemDifficulty(reserveManagement.getOtherProblemDifficulty());
+            proId.setOtherProblemDescribe(reserveManagement.getOtherProblemDescribe());
+            proId.setRunPlanRequire(reserveManagement.getRunPlanRequire());
+            proId.setRunPlanRequire(reserveManagement.getRunPlanRequire());
+            proId.setProgramChangeDescription(reserveManagement.getProgramChangeDescription());
+            proId.setDiscloseRemarks(reserveManagement.getDiscloseRemarks());
+            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());
+            statisticService.save(proId);
+        }else {
+            proId.setIncludeReserve(reserveManagement.getIncludeReserve());
+            proId.setReasonForCancel(reserveManagement.getReasonForCancel());
+            proId.setComprehensiveProject(reserveManagement.getComprehensiveProject());
+            proId.setPowerFailureDifficulty(reserveManagement.getPowerFailureDifficulty());
+            proId.setPowerFailureDescribe(reserveManagement.getPowerFailureDescribe());
+            proId.setOtherProblemDifficulty(reserveManagement.getOtherProblemDifficulty());
+            proId.setOtherProblemDescribe(reserveManagement.getOtherProblemDescribe());
+            proId.setRunPlanRequire(reserveManagement.getRunPlanRequire());
+            proId.setRunPlanRequire(reserveManagement.getRunPlanRequire());
+            proId.setProgramChangeDescription(reserveManagement.getProgramChangeDescription());
+            proId.setDiscloseRemarks(reserveManagement.getDiscloseRemarks());
+            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());
+            //修改时需要从  省公司评审表中查看是否可以发起流程
+            CompanyReview review = new CompanyReview();
+            review.setProjectReserveId(reserveManagement.getProjectReserveId());
+            CompanyReview companyReview = reviewService.queryByProjectReserveId(review);
+            if (companyReview == null){
+                //如果 流程状态是 进行中 还是 完成
+                int status = projectService.getProcessStatus(reserveManagement.getProjectReserveId());
+                if (status == 1 || status == 2){
+                    j.setSuccess(false);
+                    j.setMsg(reserveManagement.getProjectReserveId() + "项目流程正在进行中或已完成，无法修改！");
+                    return j;
+                }
+                //去掉之前的流程，重新开始流程
+                reserveProcessService.deleteAct(reserveManagement.getProjectReserveId());
+
+                if (reserveManagement.getIncludeReserve().equals("是")){
+                    //发起流程
+                    ReserveSummaryProcess reserveProcess = new ReserveSummaryProcess();
+                    reserveProcess.preInsert();
+                    reserveProcess.setProjectReserveId(reserveManagement.getProjectReserveId());
+                    //更新
+                    reserveProcessService.insert(reserveProcess);
+                    //发送流程，更改项目状态
+                    Map<String, Object> vars = Maps.newHashMap();
+
+                    ReserveProcessProject processProject = projectService.queryByProjectId(reserveManagement.getProjectReserveId());
+                    //审核代理人
+                    vars.put("manager", UserUtils.getByUserName(processProject.getDesigner()).getLoginName());
 //                String procDefId = projectService.findDefId("cblc");
-                String procDefId = projectService.findDefId("cblcNew");
-                ProcessDefinition p = actProcessService.getProcessDefinition(procDefId);
-                String title = reserveManagement.getCurrentUser().getName() + "在" + DateUtils.getDateTime() + "发起" + p.getName();
-                actTaskService.startProcess(p.getKey(), "cg_personnel_activiti", reserveProcess.getId(), title, vars);
-                //删除之前的甲供材数据
+                    String procDefId = projectService.findDefId("cblcNew");
+                    ProcessDefinition p = actProcessService.getProcessDefinition(procDefId);
+                    String title = reserveManagement.getCurrentUser().getName() + "在" + DateUtils.getDateTime() + "发起" + p.getName();
+                    actTaskService.startProcess(p.getKey(), "cg_personnel_activiti", reserveProcess.getId(), title, vars);
+                    //删除之前的甲供材数据
 //                reserveProcessService.deleteMaterial(processProject.getProjectName());
-                //修改基本信息表的 流程状态
-                projectService.updateProcessStatus(reserveManagement.getProjectReserveId(),1);
-            }
-            //新增或编辑表单保存
-            statisticService.update(reserveManagement);
-        }else if (companyReview.getPassProvincialCompanyReview().equals("取消") & reserveManagement.getIncludeReserve().equals("是")){
-            j.setSuccess(false);
-            j.setMsg(reserveManagement.getProjectReserveId() + "项目未通过省公司评审，无法发起流程！");
-            return j;
-        }else {
-            //如果 流程状态是 进行中 还是 完成
-            int status = projectService.getProcessStatus(reserveManagement.getProjectReserveId());
-            if (status == 1 || status == 2){
+                    //修改基本信息表的 流程状态
+                    projectService.updateProcessStatus(reserveManagement.getProjectReserveId(),1);
+                }
+                //新增或编辑表单保存
+                statisticService.update(proId);
+            }else if (companyReview.getPassProvincialCompanyReview().equals("取消") & reserveManagement.getIncludeReserve().equals("是")){
                 j.setSuccess(false);
-                j.setMsg(reserveManagement.getProjectReserveId() + "项目流程正在进行中或已完成，无法修改！");
+                j.setMsg(reserveManagement.getProjectReserveId() + "项目未通过省公司评审，无法发起流程！");
                 return j;
-            }
-            //去掉之前的流程，重新开始流程
-            reserveProcessService.deleteAct(reserveManagement.getProjectReserveId());
-
-            if (reserveManagement.getIncludeReserve().equals("是")){
-                //发起流程
-                ReserveSummaryProcess reserveProcess = new ReserveSummaryProcess();
-                reserveProcess.preInsert();
-                reserveProcess.setProjectReserveId(reserveManagement.getProjectReserveId());
-                //更新
-                reserveProcessService.insert(reserveProcess);
-                //发送流程，更改项目状态
-                Map<String, Object> vars = Maps.newHashMap();
-
-                ReserveProcessProject processProject = projectService.queryByProjectId(reserveManagement.getProjectReserveId());
-                //审核代理人
-                vars.put("manager", UserUtils.getByUserName(processProject.getDesigner()).getLoginName());
+            }else {
+                //如果 流程状态是 进行中 还是 完成
+                int status = projectService.getProcessStatus(reserveManagement.getProjectReserveId());
+                if (status == 1 || status == 2){
+                    j.setSuccess(false);
+                    j.setMsg(reserveManagement.getProjectReserveId() + "项目流程正在进行中或已完成，无法修改！");
+                    return j;
+                }
+                //去掉之前的流程，重新开始流程
+                reserveProcessService.deleteAct(reserveManagement.getProjectReserveId());
+
+                if (reserveManagement.getIncludeReserve().equals("是")){
+                    //发起流程
+                    ReserveSummaryProcess reserveProcess = new ReserveSummaryProcess();
+                    reserveProcess.preInsert();
+                    reserveProcess.setProjectReserveId(reserveManagement.getProjectReserveId());
+                    //更新
+                    reserveProcessService.insert(reserveProcess);
+                    //发送流程，更改项目状态
+                    Map<String, Object> vars = Maps.newHashMap();
+
+                    ReserveProcessProject processProject = projectService.queryByProjectId(reserveManagement.getProjectReserveId());
+                    //审核代理人
+                    vars.put("manager", UserUtils.getByUserName(processProject.getDesigner()).getLoginName());
 //                String procDefId = projectService.findDefId("cblc");
-                String procDefId = projectService.findDefId("cblcNew");
-                ProcessDefinition p = actProcessService.getProcessDefinition(procDefId);
-                String title = reserveManagement.getCurrentUser().getName() + "在" + DateUtils.getDateTime() + "发起" + p.getName();
-                actTaskService.startProcess(p.getKey(), "cg_personnel_activiti", reserveProcess.getId(), title, vars);
-                //删除之前的甲供材数据
+                    String procDefId = projectService.findDefId("cblcNew");
+                    ProcessDefinition p = actProcessService.getProcessDefinition(procDefId);
+                    String title = reserveManagement.getCurrentUser().getName() + "在" + DateUtils.getDateTime() + "发起" + p.getName();
+                    actTaskService.startProcess(p.getKey(), "cg_personnel_activiti", reserveProcess.getId(), title, vars);
+                    //删除之前的甲供材数据
 //                reserveProcessService.deleteMaterial(processProject.getProjectName());
-                //修改基本信息表的 流程状态
-                projectService.updateProcessStatus(reserveManagement.getProjectReserveId(),1);
+                    //修改基本信息表的 流程状态
+                    projectService.updateProcessStatus(reserveManagement.getProjectReserveId(),1);
+                }
             }
             //新增或编辑表单保存
             statisticService.update(reserveManagement);
         }
-
         j.setSuccess(true);
         j.setMsg("修改储备项目基本信息成功");
         return j;
@@ -390,7 +456,7 @@ public class SummaryStatisticController extends BaseController {
 //                        reserveProcessService.deleteMaterial(processProject.getProjectName());
 
                         //将历史的问题清空
-
+                        statisticService.save(s);
                     }
                 }
             }

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

@@ -186,9 +186,9 @@
 		<tr>
 			<td class="width-15 active"><label class="">项目类型：</label></td>
 			<td class="width-35">
-				<form:input path="projectType" htmlEscape="false" class="form-control"/>
+				<form:input path="projectType" htmlEscape="false" readonly="true" 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">
 				<select id="hotLineWork" name="hotLineWork"  class="form-control">
 					<option value="">请选择</option>
@@ -202,17 +202,17 @@
 			<td class="width-35">
 				<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="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="powerFailureNum" htmlEscape="false" class="form-control"/>
 			</td>

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

@@ -43,111 +43,111 @@
 		<tr>
 			<td class="width-15 active"><label class="">项目年份：</label></td>
 			<td class="width-35">
-				<form:input path="projectYear" htmlEscape="false" class="form-control"/>
+				<form:input path="projectYear" readonly="true" htmlEscape="false" class="form-control"/>
 			</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" 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"    class="form-control"/>
+				<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"    class="form-control"/>
+				<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"    class="form-control"/>
+				<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"    class="form-control"/>
+				<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"    class="form-control"/>
+				<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"    class="form-control"/>
+				<form:input path="gridNumber" 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="cellNumber" htmlEscape="false"    class="form-control"/>
+				<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" class="form-control required"/>
+				<form:input path="projectReserveId" readonly="true" htmlEscape="false" class="form-control required"/>
 			</td>
 		</tr>
 		<tr>
 			<td class="width-15 active"><label class=""><font color="red">*</font>项目名称：</label></td>
 			<td class="width-35">
-				<form:input path="projectName" htmlEscape="false"    class="form-control required"/>
+				<form:input path="projectName" 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="constructionNecessityAndContent" htmlEscape="false"    class="form-control"/>
+				<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"    class="form-control"/>
+				<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"    class="form-control"/>
+				<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"    class="form-control"/>
+				<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"    class="form-control"/>
+				<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"    class="form-control number money"/>
+				<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" class="form-control"/>
+				<form:textarea path="basicRemarks" 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="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" class="form-control"/>
+				<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" class="form-control"/>
+				<form:input path="implementBatch" htmlEscape="false" readonly="true" class="form-control"/>
 			</td>
 		</tr>
 		<tr>
@@ -156,7 +156,7 @@
 		<tr>
 			<td class="width-15 active"><label class="">是否含新建土建基础/包封：</label></td>
 			<td class="width-35">
-				<select id="confessCivilFoundation" name="confessCivilFoundation"  class="form-control">
+				<select id="confessCivilFoundation" readonly="true" name="confessCivilFoundation"  class="form-control">
 					<option value="">请选择</option>
 					<option value="是" <c:if test="${reserveManagement.confessCivilFoundation=='是'}">selected</c:if>>是</option>
 					<option value="否" <c:if test="${reserveManagement.confessCivilFoundation=='否'}">selected</c:if>>否</option>
@@ -166,7 +166,7 @@
 		<tr>
 			<td class="width-15 active"><label class="">是否预制化：</label></td>
 			<td class="width-35">
-				<select id="confessPrefab" name="confessPrefab"  class="form-control">
+				<select id="confessPrefab" readonly="true" name="confessPrefab"  class="form-control">
 					<option value="">请选择</option>
 					<option value="是" <c:if test="${reserveManagement.confessPrefab=='是'}">selected</c:if>>是</option>
 					<option value="否" <c:if test="${reserveManagement.confessPrefab=='否'}">selected</c:if>>否</option>
@@ -175,7 +175,7 @@
 			</td>
 			<td class="width-15 active"><label class="">预制化描述：</label></td>
 			<td class="width-35">
-				<form:input path="confessPrefabDescription" htmlEscape="false" class="form-control"/>
+				<form:input path="confessPrefabDescription" readonly="true" htmlEscape="false" class="form-control"/>
 			</td>
 		</tr>
 		<tr>