储备项目新-工作流bug修改

src/main/java/com/jeeplus/modules/act/service/ActTaskService.java

@@ -391,47 +391,46 @@ public class ActTaskService extends BaseService {
             }*/
             if (end <= claimCount){
                 toClaimList = toClaimQuery.listPage(start, page.getMaxResults());
+                todoList = todoTaskQuery.listPage(start - (int) claimCount,page.getMaxResults());
             }else if (start < claimCount){
                 toClaimList = toClaimQuery.listPage(start, (int) claimCount - start);
+                todoList = todoTaskQuery.listPage(0, end - (int) claimCount);
             }else {
                 todoList = todoTaskQuery.listPage(start - (int) claimCount, page.getMaxResults());
             }
         }
-
-
-        for (Task task : todoList) {
+        for (Task task : toClaimList) {
             HashMap map = new HashMap();
             map.put("task.assignee", task.getAssignee());
             map.put("task.id", task.getId());
-            map.put("task.createTime", task.getCreateTime());
             map.put("task.name", task.getName());
+            map.put("task.createTime", task.getCreateTime());
             map.put("task.executionId", task.getExecutionId());
-            map.put("task.processDefinitionId", task.getProcessDefinitionId());
             map.put("task.processInstanceId", task.getProcessInstanceId());
+            map.put("task.processDefinitionId", task.getProcessDefinitionId());
             map.put("task.taskDefinitionKey", task.getTaskDefinitionKey());
             map.put("vars", task.getProcessVariables());
             map.put("procDef.name", ProcessDefCache.get(task.getProcessDefinitionId()).getName());
             map.put("procDef.version", ProcessDefCache.get(task.getProcessDefinitionId()).getVersion());
-            map.put("status", "todo");
+            map.put("status", "claim");
             map.put("title", task.getProcessVariables().get("title"));
             page.getList().add(map);
         }
 
-
-        for (Task task : toClaimList) {
+        for (Task task : todoList) {
             HashMap map = new HashMap();
             map.put("task.assignee", task.getAssignee());
             map.put("task.id", task.getId());
-            map.put("task.name", task.getName());
             map.put("task.createTime", task.getCreateTime());
+            map.put("task.name", task.getName());
             map.put("task.executionId", task.getExecutionId());
-            map.put("task.processInstanceId", task.getProcessInstanceId());
             map.put("task.processDefinitionId", task.getProcessDefinitionId());
+            map.put("task.processInstanceId", task.getProcessInstanceId());
             map.put("task.taskDefinitionKey", task.getTaskDefinitionKey());
             map.put("vars", task.getProcessVariables());
             map.put("procDef.name", ProcessDefCache.get(task.getProcessDefinitionId()).getName());
             map.put("procDef.version", ProcessDefCache.get(task.getProcessDefinitionId()).getVersion());
-            map.put("status", "claim");
+            map.put("status", "todo");
             map.put("title", task.getProcessVariables().get("title"));
             page.getList().add(map);
         }

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

@@ -49,16 +49,6 @@ public class ReserveSummary extends DataEntity<ReserveSummary> {
     private String preliminaryConstructionUnitProjectManager;    //初定施工单位项目经理
     private String handConstructionSketches; //是否移交施工草图
 
-    /*private String openProcessStatus;       //开启流程状态 0-未开启 1-开启
-
-    public String getOpenProcessStatus() {
-        return openProcessStatus;
-    }
-
-    public void setOpenProcessStatus(String openProcessStatus) {
-        this.openProcessStatus = openProcessStatus;
-    }*/
-
     public String getProjectYear() {
         return projectYear;
     }

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

@@ -3,6 +3,7 @@ package com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.mapper;
 import com.jeeplus.core.persistence.BaseMapper;
 import com.jeeplus.core.persistence.annotation.MyBatisMapper;
 import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.entity.ReservePolicyHand;
+import com.jeeplus.modules.cg.reservemanagementcenter.statisticalTable.entity.History;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -36,4 +37,25 @@ public interface PolicyHandingMapper extends BaseMapper<ReservePolicyHand> {
      * @return
      */
     List<ReservePolicyHand> exportFindList(ReservePolicyHand reserveManagement);
+
+    /**
+     * 根据projectReserveId查出proc_ins_id
+     * @param projectReserveId
+     * @return
+     */
+    String getByProjectReserveId(String projectReserveId);
+
+    /**
+     * 根据executeId查出历史节点信息
+     * @param executeId
+     * @return
+     */
+    List<History> getHistoryByExecuteId(String executeId);
+
+    /**
+     * 根据executeId查出当前节点的名称
+     * @param executeId
+     * @return
+     */
+    String getByExecuteId(String executeId);
 }

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

@@ -3,7 +3,7 @@ package com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.mapper;
 import com.jeeplus.core.persistence.BaseMapper;
 import com.jeeplus.core.persistence.annotation.MyBatisMapper;
 import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.entity.ReserveElectricityWork;
-import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.entity.ReserveProcessProject;
+import com.jeeplus.modules.cg.reservemanagementcenter.statisticalTable.entity.History;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -36,4 +36,25 @@ public interface ReserveElectricityWorkMapper extends BaseMapper<ReserveElectric
      * @return
      */
     List<ReserveElectricityWork> exportFindList(ReserveElectricityWork reserveManagement);
+
+    /**
+     * 根据projectReserveId查出proc_ins_id
+     * @param projectReserveId
+     * @return
+     */
+    String getByProjectReserveId(String projectReserveId);
+
+    /**
+     * 根据executeId查出历史节点信息
+     * @param executeId
+     * @return
+     */
+    List<History> getHistoryByExecuteId(String executeId);
+
+    /**
+     * 根据executeId查出当前节点的名称
+     * @param executeId
+     * @return
+     */
+    String getByExecuteId(String executeId);
 }

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

@@ -3,7 +3,7 @@ package com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.mapper;
 import com.jeeplus.core.persistence.BaseMapper;
 import com.jeeplus.core.persistence.annotation.MyBatisMapper;
 import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.entity.ReservePreconstruction;
-import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.entity.ReserveSafety;
+import com.jeeplus.modules.cg.reservemanagementcenter.statisticalTable.entity.History;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -36,4 +36,25 @@ public interface ReservePreconstructMapper extends BaseMapper<ReservePreconstruc
      * @return
      */
     List<ReservePreconstruction> exportFindList(ReservePreconstruction reserveManagement);
+
+    /**
+     * 根据projectReserveId查出proc_ins_id
+     * @param projectReserveId
+     * @return
+     */
+    String getByProjectReserveId(String projectReserveId);
+
+    /**
+     * 根据executeId查出历史节点信息
+     * @param executeId
+     * @return
+     */
+    List<History> getHistoryByExecuteId(String executeId);
+
+    /**
+     * 根据executeId查出当前节点的名称
+     * @param executeId
+     * @return
+     */
+    String getByExecuteId(String executeId);
 }

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

@@ -3,6 +3,7 @@ package com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.mapper;
 import com.jeeplus.core.persistence.BaseMapper;
 import com.jeeplus.core.persistence.annotation.MyBatisMapper;
 import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.entity.ReserveSafety;
+import com.jeeplus.modules.cg.reservemanagementcenter.statisticalTable.entity.History;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -35,4 +36,25 @@ public interface ReserveSafeDisclosureMapper extends BaseMapper<ReserveSafety> {
      * @return
      */
     List<ReserveSafety> exportFindList(ReserveSafety reserveManagement);
+
+    /**
+     * 根据projectReserveId查出proc_ins_id
+     * @param projectReserveId
+     * @return
+     */
+    String getByProjectReserveId(String projectReserveId);
+
+    /**
+     * 根据executeId查出历史节点信息
+     * @param executeId
+     * @return
+     */
+    List<History> getHistoryByExecuteId(String executeId);
+
+    /**
+     * 根据executeId查出当前节点的名称
+     * @param executeId
+     * @return
+     */
+    String getByExecuteId(String executeId);
 }

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

@@ -66,4 +66,6 @@ public interface ReserveSummaryProcessMapper extends BaseMapper<ReserveSummaryPr
      * @return
      */
     String getLoginNameByName(String name);
+
+
 }

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

@@ -3,6 +3,7 @@ package com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.mapper;
 import com.jeeplus.core.persistence.BaseMapper;
 import com.jeeplus.core.persistence.annotation.MyBatisMapper;
 import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.entity.ReserveSummary;
+import com.jeeplus.modules.cg.reservemanagementcenter.statisticalTable.entity.History;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -36,4 +37,25 @@ public interface SummaryStatisticMapper extends BaseMapper<ReserveSummary> {
      * @return
      */
     List<ReserveSummary> exportFindList(ReserveSummary reserveManagement);
+
+    /**
+     * 根据projectReserveId查出proc_ins_id
+     * @param projectReserveId
+     * @return
+     */
+    String getByProjectReserveId(String projectReserveId);
+
+    /**
+     * 根据executeId查出历史节点信息
+     * @param executeId
+     * @return
+     */
+    List<History> getHistoryByExecuteId(String executeId);
+
+    /**
+     * 根据executeId查出当前节点的名称
+     * @param executeId
+     * @return
+     */
+    String getByExecuteId(String executeId);
 }

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

@@ -9,25 +9,24 @@
 		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,
+		b.projectYear,
+		b.projectNature,
+		b.demandUnit,
+		b.district,
+		b.projectGroup,
+		b.reserveBatches,
+		b.blockSupply,
+		b.gridNumber,
+		b.cellNumber,
 		a.projectReserveId,
-		a.projectName,
-		a.constructionNecessityAndContent,
-		a.substationName,
-		a.circuitName,
-		a.netRackProjectDivide,
-		a.requirementType,
-		a.costEstimate,
-		a.basicRemarks,
-		a.reserveProgress,
+		b.projectName,
+		b.constructionNecessityAndContent,
+		b.substationName,
+		b.circuitName,
+		b.netRackProjectDivide,
+		b.requirementType,
+		b.costEstimate,
+		b.basicRemarks,
 		a.powerSupplyArea,
 		a.constructionSpot,
 		a.includeCivilWork,
@@ -52,9 +51,10 @@
 		a.electricApproach,
 		a.civilConstructionMaterialOpen,
 		a.electricalPickListOpen,
-		a.administrativeOfficeRemark
-
-
+		a.administrativeOfficeRemark,
+        c.implementPlan as 'implementPlan',
+        c.initialImplementBatch as 'intendBatch',
+        b.ownerProjectManager as 'projectManager'
 
     </sql>
 
@@ -66,25 +66,7 @@
         update_by,
         update_date,
         del_flag,
-        projectYear,
-        projectNature,
-        demandUnit,
-        district,
-        projectGroup,
-        reserveBatches,
-        blockSupply,
-        gridNumber,
-        cellNumber,
         projectReserveId,
-        projectName,
-        constructionNecessityAndContent,
-        substationName,
-        circuitName,
-        netRackProjectDivide,
-        requirementType,
-        costEstimate,
-        basicRemarks,
-        reserveProgress,
 		powerSupplyArea,
 		constructionSpot,
 		includeCivilWork,
@@ -119,25 +101,7 @@
             #{updateBy.id},
             #{updateDate},
             #{delFlag},
-            #{projectYear},
-            #{projectNature},
-            #{demandUnit},
-            #{district},
-            #{projectGroup},
-            #{reserveBatches},
-            #{blockSupply},
-            #{gridNumber},
-            #{cellNumber},
             #{projectReserveId},
-            #{projectName},
-            #{constructionNecessityAndContent},
-            #{substationName},
-            #{circuitName},
-            #{netRackProjectDivide},
-            #{requirementType},
-            #{costEstimate},
-            #{basicRemarks},
-            #{reserveProgress},
             #{powerSupplyArea},
             #{constructionSpot},
             #{includeCivilWork},
@@ -174,25 +138,7 @@
         update_by,
         update_date,
         del_flag,
-        projectYear,
-        projectNature,
-        demandUnit,
-        district,
-        projectGroup,
-        reserveBatches,
-        blockSupply,
-        gridNumber,
-        cellNumber,
         projectReserveId,
-        projectName,
-        constructionNecessityAndContent,
-        substationName,
-        circuitName,
-        netRackProjectDivide,
-        requirementType,
-        costEstimate,
-        basicRemarks,
-        reserveProgress,
         powerSupplyArea,
         constructionSpot,
         includeCivilWork,
@@ -228,25 +174,7 @@
             #{item.updateBy.id},
             #{item.updateDate},
             #{item.delFlag},
-            #{item.projectYear},
-            #{item.projectNature},
-            #{item.demandUnit},
-            #{item.district},
-            #{item.projectGroup},
-            #{item.reserveBatches},
-            #{item.blockSupply},
-            #{item.gridNumber},
-            #{item.cellNumber},
             #{item.projectReserveId},
-            #{item.projectName},
-            #{item.constructionNecessityAndContent},
-            #{item.substationName},
-            #{item.circuitName},
-            #{item.netRackProjectDivide},
-            #{item.requirementType},
-            #{item.costEstimate},
-            #{item.basicRemarks},
-            #{item.reserveProgress},
             #{item.powerSupplyArea},
             #{item.constructionSpot},
             #{item.includeCivilWork},
@@ -282,24 +210,6 @@
         set
         update_by = #{updateBy.id},
         update_date = #{updateDate},
-        projectYear = #{projectYear},
-        projectNature = #{projectNature},
-        demandUnit = #{demandUnit},
-        district = #{district},
-        projectGroup = #{projectGroup},
-        reserveBatches = #{reserveBatches},
-        blockSupply = #{blockSupply},
-        gridNumber = #{gridNumber},
-        cellNumber = #{cellNumber},
-        projectName = #{projectName},
-        constructionNecessityAndContent = #{constructionNecessityAndContent},
-        substationName = #{substationName},
-        circuitName = #{circuitName},
-        netRackProjectDivide = #{netRackProjectDivide},
-        requirementType = #{requirementType},
-        costEstimate = #{costEstimate},
-        basicRemarks = #{basicRemarks},
-        reserveProgress = #{reserveProgress},
         powerSupplyArea = #{powerSupplyArea},
         constructionSpot = #{constructionSpot},
         includeCivilWork = #{includeCivilWork},
@@ -334,6 +244,10 @@
         select
         <include refid="reserveManagementColumns"/>
         from cg_reserve_policy_handing_information a
+        left join cg_reserve_process b
+        on a.projectReserveId = b.projectReserveId
+        left join cg_reserve_summary_statistics c
+        on a.projectReserveId = c.projectReserveId
         where a.projectReserveId = #{projectReserveId}
     </select>
 
@@ -341,12 +255,10 @@
     <select id="findList" resultType="com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.entity.ReservePolicyHand">
         select
         <include refid="reserveManagementColumns"/>
-        ,b.implementPlan as 'implementPlan',b.initialImplementBatch as 'intendBatch',
-        c.ownerProjectManager as 'projectManager'
         from cg_reserve_policy_handing_information a
-        left join cg_reserve_summary_statistics b
+        left join cg_reserve_process b
         on a.projectReserveId = b.projectReserveId
-        left join cg_reserve_process c
+        left join cg_reserve_summary_statistics c
         on a.projectReserveId = c.projectReserveId
         <where>
             a.del_flag = 0
@@ -354,7 +266,7 @@
                 and a.projectReserveId like concat('%', #{projectReserveId}, '%')
             </if>
             <if test="projectName!=null and projectName!=''">
-                and a.projectName like concat('%', #{projectName}, '%')
+                and b.projectName like concat('%', #{projectName}, '%')
             </if>
             <if test="dataScope != null and dataScope != ''">
                 ${dataScope}
@@ -373,12 +285,10 @@
             resultType="com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.entity.ReservePolicyHand">
         select
         <include refid="reserveManagementColumns"/>
-        ,b.implementPlan as 'implementPlan',b.initialImplementBatch as 'intendBatch',
-        c.ownerProjectManager as 'projectManager'
         from cg_reserve_policy_handing_information a
-        left join cg_reserve_summary_statistics b
+        left join cg_reserve_process b
         on a.projectReserveId = b.projectReserveId
-        left join cg_reserve_process c
+        left join cg_reserve_summary_statistics c
         on a.projectReserveId = c.projectReserveId
         <where>
             a.del_flag = 0
@@ -386,7 +296,7 @@
                 and a.projectReserveId like concat('%', #{projectReserveId}, '%')
             </if>
             <if test="projectName!=null and projectName!=''">
-                and a.projectName like concat('%', #{projectName}, '%')
+                and b.projectName like concat('%', #{projectName}, '%')
             </if>
             <if test="dataScope != null and dataScope != ''">
                 ${dataScope}
@@ -398,13 +308,23 @@
     <select id="get" resultType="com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.entity.ReservePolicyHand">
         select
         <include refid="reserveManagementColumns"/>
-        ,b.implementPlan as 'implementPlan',b.initialImplementBatch as 'intendBatch',
-        c.ownerProjectManager as 'projectManager'
         from cg_reserve_policy_handing_information a
-        left join cg_reserve_summary_statistics b
+        left join cg_reserve_process b
         on a.projectReserveId = b.projectReserveId
-        left join cg_reserve_process c
+        left join cg_reserve_summary_statistics c
         on a.projectReserveId = c.projectReserveId
         where a.id = #{id}
     </select>
+
+    <select id="getByProjectReserveId" resultType="java.lang.String">
+        SELECT proc_ins_id from cg_personnel_activiti where projectReserveId = #{projectReserveId}
+    </select>
+    <select id="getHistoryByExecuteId"
+            resultType="com.jeeplus.modules.cg.reservemanagementcenter.statisticalTable.entity.History">
+        select ACT_NAME_ as name,START_TIME_ as startTime,END_TIME_ as endTime from act_hi_actinst
+        WHERE EXECUTION_ID_ = #{executeId} and ACT_NAME_ is not null ORDER BY startTime desc
+    </select>
+    <select id="getByExecuteId" resultType="java.lang.String">
+        SELECT NAME_ FROM `act_ru_task` WHERE EXECUTION_ID_ = #{executeId}
+    </select>
 </mapper>

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

@@ -2,32 +2,14 @@
 <!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.ReserveElectricityWorkMapper">
 
-    <sql id="reserveManagementColumns">
+    <sql id="reserveManagementColumn">
         a.id as "id",
         a.create_by AS "createBy.id",
 		a.create_date AS "createDate",
 		a.update_by AS "updateBy.id",
 		a.update_date AS "updateDate",
 		a.del_flag AS "delFlag",
-		a.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,
-		a.reserveProgress,
 		a.teansFormerOrPackageProject,
 		a.packageProject,
 		a.packageItemQuantity,
@@ -43,6 +25,48 @@
 
     </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",
+		b.projectYear,
+		b.projectNature,
+		b.demandUnit,
+		b.district,
+		b.projectGroup,
+		b.reserveBatches,
+		b.blockSupply,
+		b.gridNumber,
+		b.cellNumber,
+		a.projectReserveId,
+		b.projectName,
+		b.constructionNecessityAndContent,
+		b.substationName,
+		b.circuitName,
+		b.netRackProjectDivide,
+		b.requirementType,
+		b.costEstimate,
+		b.basicRemarks,
+		a.teansFormerOrPackageProject,
+		a.packageProject,
+		a.packageItemQuantity,
+		a.deviceName,
+		a.workWithElectricity,
+		a.electricityTypeNumber,
+		a.electricityWorkNumber,
+		a.noStopWorkPlan,
+		a.reasonsForNotWorkInterruption,
+		a.powerOutagePlan,
+		a.planner,
+		a.siteSurveyor,
+	    c.implementPlan,
+	    c.initialImplementBatch as implementBatch
+
+    </sql>
+
 	<insert id="insert">
         insert into cg_reserve_electricity_work_information (
         id,
@@ -51,25 +75,7 @@
         update_by,
         update_date,
         del_flag,
-        projectYear,
-        projectNature,
-        demandUnit,
-        district,
-        projectGroup,
-        reserveBatches,
-        blockSupply,
-        gridNumber,
-        cellNumber,
         projectReserveId,
-        projectName,
-        constructionNecessityAndContent,
-        substationName,
-        circuitName,
-        netRackProjectDivide,
-        requirementType,
-        costEstimate,
-        basicRemarks,
-        reserveProgress,
 		teansFormerOrPackageProject,
 		packageProject,
 		packageItemQuantity,
@@ -91,25 +97,7 @@
             #{updateBy.id},
             #{updateDate},
             #{delFlag},
-            #{projectYear},
-            #{projectNature},
-            #{demandUnit},
-            #{district},
-            #{projectGroup},
-            #{reserveBatches},
-            #{blockSupply},
-            #{gridNumber},
-            #{cellNumber},
             #{projectReserveId},
-            #{projectName},
-            #{constructionNecessityAndContent},
-            #{substationName},
-            #{circuitName},
-            #{netRackProjectDivide},
-            #{requirementType},
-            #{costEstimate},
-            #{basicRemarks},
-            #{reserveProgress},
             #{teansFormerOrPackageProject},
             #{packageProject},
             #{packageItemQuantity},
@@ -133,25 +121,7 @@
 		update_by,
 		update_date,
 		del_flag,
-		projectYear,
-		projectNature,
-		demandUnit,
-		district,
-		projectGroup,
-		reserveBatches,
-		blockSupply,
-		gridNumber,
-		cellNumber,
 		projectReserveId,
-		projectName,
-		constructionNecessityAndContent,
-		substationName,
-		circuitName,
-		netRackProjectDivide,
-		requirementType,
-		costEstimate,
-		basicRemarks,
-		reserveProgress,
 		teansFormerOrPackageProject,
 		packageProject,
 		packageItemQuantity,
@@ -174,25 +144,7 @@
 			#{item.updateBy.id},
 			#{item.updateDate},
 			#{item.delFlag},
-			#{item.projectYear},
-			#{item.projectNature},
-			#{item.demandUnit},
-			#{item.district},
-			#{item.projectGroup},
-			#{item.reserveBatches},
-			#{item.blockSupply},
-			#{item.gridNumber},
-			#{item.cellNumber},
 			#{item.projectReserveId},
-			#{item.projectName},
-			#{item.constructionNecessityAndContent},
-			#{item.substationName},
-			#{item.circuitName},
-			#{item.netRackProjectDivide},
-			#{item.requirementType},
-			#{item.costEstimate},
-			#{item.basicRemarks},
-			#{item.reserveProgress},
 			#{item.teansFormerOrPackageProject},
 			#{item.packageProject},
 			#{item.packageItemQuantity},
@@ -215,24 +167,6 @@
         set
         update_by = #{updateBy.id},
         update_date = #{updateDate},
-        projectYear = #{projectYear},
-        projectNature = #{projectNature},
-        demandUnit = #{demandUnit},
-        district = #{district},
-        projectGroup = #{projectGroup},
-        reserveBatches = #{reserveBatches},
-        blockSupply = #{blockSupply},
-        gridNumber = #{gridNumber},
-        cellNumber = #{cellNumber},
-        projectName = #{projectName},
-        constructionNecessityAndContent = #{constructionNecessityAndContent},
-        substationName = #{substationName},
-        circuitName = #{circuitName},
-        netRackProjectDivide = #{netRackProjectDivide},
-        requirementType = #{requirementType},
-        costEstimate = #{costEstimate},
-        basicRemarks = #{basicRemarks},
-        reserveProgress = #{reserveProgress},
         teansFormerOrPackageProject = #{teansFormerOrPackageProject},
         packageProject = #{packageProject},
         packageItemQuantity = #{packageItemQuantity},
@@ -251,7 +185,7 @@
     <select id="queryByProjectReserveId"
             resultType="com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.entity.ReserveElectricityWork">
         select
-        <include refid="reserveManagementColumns"/>
+        <include refid="reserveManagementColumn"/>
         from cg_reserve_electricity_work_information a
         where a.projectReserveId = #{projectReserveId}
     </select>
@@ -259,17 +193,18 @@
     <select id="findList" resultType="com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.entity.ReserveElectricityWork">
         select
         <include refid="reserveManagementColumns"/>
-        ,b.implementPlan as 'implementPlan',b.initialImplementBatch as 'implementBatch'
         from cg_reserve_electricity_work_information a
-        left join cg_reserve_summary_statistics b
+        left join cg_reserve_process b
         on a.projectReserveId = b.projectReserveId
+        left join cg_reserve_summary_statistics c
+        on a.projectReserveId = c.projectReserveId
         <where>
             a.del_flag = 0
             <if test="projectReserveId!=null and projectReserveId!=''">
                 and a.projectReserveId like concat('%', #{projectReserveId}, '%')
             </if>
             <if test="projectName!=null and projectName!=''">
-                and a.projectName like concat('%', #{projectName}, '%')
+                and b.projectName like concat('%', #{projectName}, '%')
             </if>
             <if test="dataScope != null and dataScope != ''">
                 ${dataScope}
@@ -288,17 +223,18 @@
             resultType="com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.entity.ReserveElectricityWork">
         select
         <include refid="reserveManagementColumns"/>
-        ,b.implementPlan as 'implementPlan',b.initialImplementBatch as 'implementBatch'
         from cg_reserve_electricity_work_information a
-        left join cg_reserve_summary_statistics b
+        left join cg_reserve_process b
         on a.projectReserveId = b.projectReserveId
+        left join cg_reserve_summary_statistics c
+        on a.projectReserveId = c.projectReserveId
         <where>
             a.del_flag = 0
             <if test="projectReserveId!=null and projectReserveId!=''">
                 and a.projectReserveId like concat('%', #{projectReserveId}, '%')
             </if>
             <if test="projectName!=null and projectName!=''">
-                and a.projectName like concat('%', #{projectName}, '%')
+                and b.projectName like concat('%', #{projectName}, '%')
             </if>
             <if test="dataScope != null and dataScope != ''">
                 ${dataScope}
@@ -311,6 +247,21 @@
         select
         <include refid="reserveManagementColumns"/>
         from cg_reserve_electricity_work_information a
+        left join cg_reserve_process b
+        on a.projectReserveId = b.projectReserveId
+        left join cg_reserve_summary_statistics c
+        on a.projectReserveId = c.projectReserveId
         where a.id = #{id}
     </select>
+    <select id="getByProjectReserveId" resultType="java.lang.String">
+        SELECT proc_ins_id from cg_personnel_activiti where projectReserveId = #{projectReserveId}
+    </select>
+    <select id="getHistoryByExecuteId"
+            resultType="com.jeeplus.modules.cg.reservemanagementcenter.statisticalTable.entity.History">
+        select ACT_NAME_ as name,START_TIME_ as startTime,END_TIME_ as endTime from act_hi_actinst
+        WHERE EXECUTION_ID_ = #{executeId} and ACT_NAME_ is not null ORDER BY startTime desc
+    </select>
+    <select id="getByExecuteId" resultType="java.lang.String">
+        SELECT NAME_ FROM `act_ru_task` WHERE EXECUTION_ID_ = #{executeId}
+    </select>
 </mapper>

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

@@ -9,32 +9,32 @@
 		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,
+		b.projectYear,
+		b.projectNature,
+		b.demandUnit,
+		b.district,
+		b.projectGroup,
+		b.reserveBatches,
+		b.blockSupply,
+		b.gridNumber,
+		b.cellNumber,
 		a.projectReserveId,
-		a.projectName,
-		a.constructionNecessityAndContent,
-		a.substationName,
-		a.circuitName,
-		a.netRackProjectDivide,
-		a.requirementType,
-		a.costEstimate,
-		a.basicRemarks,
-		a.reserveProgress,
+		b.projectName,
+		b.constructionNecessityAndContent,
+		b.substationName,
+		b.circuitName,
+		b.netRackProjectDivide,
+		b.requirementType,
+		b.costEstimate,
+		b.basicRemarks,
 		a.confessCivilFoundation,
 		a.confessPrefab,
 		a.confessPrefabDescription,
 		a.designCivilFoundation,
 		a.designPrefab,
-		a.designPrefabDescription
-
+		a.designPrefabDescription,
+        c.implementPlan as 'implementPlan',
+        c.initialImplementBatch as 'implementBatch'
 
     </sql>
 
@@ -46,25 +46,7 @@
         update_by,
         update_date,
         del_flag,
-        projectYear,
-        projectNature,
-        demandUnit,
-        district,
-        projectGroup,
-        reserveBatches,
-        blockSupply,
-        gridNumber,
-        cellNumber,
         projectReserveId,
-        projectName,
-        constructionNecessityAndContent,
-        substationName,
-        circuitName,
-        netRackProjectDivide,
-        requirementType,
-        costEstimate,
-        basicRemarks,
-        reserveProgress,
 		confessCivilFoundation,
 		confessPrefab,
 		confessPrefabDescription,
@@ -80,25 +62,7 @@
             #{updateBy.id},
             #{updateDate},
             #{delFlag},
-            #{projectYear},
-            #{projectNature},
-            #{demandUnit},
-            #{district},
-            #{projectGroup},
-            #{reserveBatches},
-            #{blockSupply},
-            #{gridNumber},
-            #{cellNumber},
             #{projectReserveId},
-            #{projectName},
-            #{constructionNecessityAndContent},
-            #{substationName},
-            #{circuitName},
-            #{netRackProjectDivide},
-            #{requirementType},
-            #{costEstimate},
-            #{basicRemarks},
-            #{reserveProgress},
             #{confessCivilFoundation},
             #{confessPrefab},
             #{confessPrefabDescription},
@@ -116,25 +80,7 @@
         update_by,
         update_date,
         del_flag,
-        projectYear,
-        projectNature,
-        demandUnit,
-        district,
-        projectGroup,
-        reserveBatches,
-        blockSupply,
-        gridNumber,
-        cellNumber,
         projectReserveId,
-        projectName,
-        constructionNecessityAndContent,
-        substationName,
-        circuitName,
-        netRackProjectDivide,
-        requirementType,
-        costEstimate,
-        basicRemarks,
-        reserveProgress,
         confessCivilFoundation,
         confessPrefab,
         confessPrefabDescription,
@@ -151,25 +97,7 @@
             #{item.updateBy.id},
             #{item.updateDate},
             #{item.delFlag},
-            #{item.projectYear},
-            #{item.projectNature},
-            #{item.demandUnit},
-            #{item.district},
-            #{item.projectGroup},
-            #{item.reserveBatches},
-            #{item.blockSupply},
-            #{item.gridNumber},
-            #{item.cellNumber},
             #{item.projectReserveId},
-            #{item.projectName},
-            #{item.constructionNecessityAndContent},
-            #{item.substationName},
-            #{item.circuitName},
-            #{item.netRackProjectDivide},
-            #{item.requirementType},
-            #{item.costEstimate},
-            #{item.basicRemarks},
-            #{item.reserveProgress},
             #{item.confessCivilFoundation},
             #{item.confessPrefab},
             #{item.confessPrefabDescription},
@@ -186,24 +114,6 @@
         set
         update_by = #{updateBy.id},
         update_date = #{updateDate},
-        projectYear = #{projectYear},
-        projectNature = #{projectNature},
-        demandUnit = #{demandUnit},
-        district = #{district},
-        projectGroup = #{projectGroup},
-        reserveBatches = #{reserveBatches},
-        blockSupply = #{blockSupply},
-        gridNumber = #{gridNumber},
-        cellNumber = #{cellNumber},
-        projectName = #{projectName},
-        constructionNecessityAndContent = #{constructionNecessityAndContent},
-        substationName = #{substationName},
-        circuitName = #{circuitName},
-        netRackProjectDivide = #{netRackProjectDivide},
-        requirementType = #{requirementType},
-        costEstimate = #{costEstimate},
-        basicRemarks = #{basicRemarks},
-        reserveProgress = #{reserveProgress},
         confessCivilFoundation = #{confessCivilFoundation},
         confessPrefab = #{confessPrefab},
         confessPrefabDescription = #{confessPrefabDescription},
@@ -219,23 +129,28 @@
         select
         <include refid="reserveManagementColumns"/>
         from cg_reserve_preconstruction_information a
+        left join cg_reserve_process b
+        on a.projectReserveId = b.projectReserveId
+        left join cg_reserve_summary_statistics c
+        on a.projectReserveId = c.projectReserveId
         where a.projectReserveId = #{projectReserveId}
     </select>
 
     <select id="findList" resultType="com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.entity.ReservePreconstruction">
         select
         <include refid="reserveManagementColumns"/>
-        ,b.implementPlan as 'implementPlan',b.initialImplementBatch as 'implementBatch'
         from cg_reserve_preconstruction_information a
-        left join cg_reserve_summary_statistics b
+        left join cg_reserve_process b
         on a.projectReserveId = b.projectReserveId
+        left join cg_reserve_summary_statistics c
+        on a.projectReserveId = c.projectReserveId
         <where>
             a.del_flag = 0
             <if test="projectReserveId!=null and projectReserveId!=''">
                 and a.projectReserveId like concat('%', #{projectReserveId}, '%')
             </if>
             <if test="projectName!=null and projectName!=''">
-                and a.projectName like concat('%', #{projectName}, '%')
+                and b.projectName like concat('%', #{projectName}, '%')
             </if>
             <if test="dataScope != null and dataScope != ''">
                 ${dataScope}
@@ -254,17 +169,18 @@
             resultType="com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.entity.ReservePreconstruction">
         select
         <include refid="reserveManagementColumns"/>
-        ,b.implementPlan as 'implementPlan',b.initialImplementBatch as 'implementBatch'
         from cg_reserve_preconstruction_information a
-        left join cg_reserve_summary_statistics b
+        left join cg_reserve_process b
         on a.projectReserveId = b.projectReserveId
+        left join cg_reserve_summary_statistics c
+        on a.projectReserveId = c.projectReserveId
         <where>
             a.del_flag = 0
             <if test="projectReserveId!=null and projectReserveId!=''">
                 and a.projectReserveId like concat('%', #{projectReserveId}, '%')
             </if>
             <if test="projectName!=null and projectName!=''">
-                and a.projectName like concat('%', #{projectName}, '%')
+                and b.projectName like concat('%', #{projectName}, '%')
             </if>
             <if test="dataScope != null and dataScope != ''">
                 ${dataScope}
@@ -276,10 +192,23 @@
     <select id="get" resultType="com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.entity.ReservePreconstruction">
         select
         <include refid="reserveManagementColumns"/>
-        ,b.implementPlan as 'implementPlan',b.initialImplementBatch as 'implementBatch'
         from cg_reserve_preconstruction_information a
-        left join cg_reserve_summary_statistics b
+        left join cg_reserve_process b
         on a.projectReserveId = b.projectReserveId
+        left join cg_reserve_summary_statistics c
+        on a.projectReserveId = c.projectReserveId
         where a.id = #{id}
     </select>
+
+    <select id="getByProjectReserveId" resultType="java.lang.String">
+        SELECT proc_ins_id from cg_personnel_activiti where projectReserveId = #{projectReserveId}
+    </select>
+    <select id="getHistoryByExecuteId"
+            resultType="com.jeeplus.modules.cg.reservemanagementcenter.statisticalTable.entity.History">
+        select ACT_NAME_ as name,START_TIME_ as startTime,END_TIME_ as endTime from act_hi_actinst
+        WHERE EXECUTION_ID_ = #{executeId} and ACT_NAME_ is not null ORDER BY startTime desc
+    </select>
+    <select id="getByExecuteId" resultType="java.lang.String">
+        SELECT NAME_ FROM `act_ru_task` WHERE EXECUTION_ID_ = #{executeId}
+    </select>
 </mapper>

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

@@ -9,25 +9,24 @@
 		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,
+		b.projectYear,
+		b.projectNature,
+		b.demandUnit,
+		b.district,
+		b.projectGroup,
+		b.reserveBatches,
+		b.blockSupply,
+		b.gridNumber,
+		b.cellNumber,
 		a.projectReserveId,
-		a.projectName,
-		a.constructionNecessityAndContent,
-		a.substationName,
-		a.circuitName,
-		a.netRackProjectDivide,
-		a.requirementType,
-		a.costEstimate,
-		a.basicRemarks,
-		a.reserveProgress,
+		b.projectName,
+		b.constructionNecessityAndContent,
+		b.substationName,
+		b.circuitName,
+		b.netRackProjectDivide,
+		b.requirementType,
+		b.costEstimate,
+		b.basicRemarks,
 		a.transmissionWork,
 		a.workDescribe,
 		a.transmissionErection,
@@ -54,7 +53,6 @@
 		a.measureDescribe,
 		a.jobRiskLevelPrediction
 
-
     </sql>
 
     <insert id="insert">
@@ -65,25 +63,7 @@
         update_by,
         update_date,
         del_flag,
-        projectYear,
-        projectNature,
-        demandUnit,
-        district,
-        projectGroup,
-        reserveBatches,
-        blockSupply,
-        gridNumber,
-        cellNumber,
         projectReserveId,
-        projectName,
-        constructionNecessityAndContent,
-        substationName,
-        circuitName,
-        netRackProjectDivide,
-        requirementType,
-        costEstimate,
-        basicRemarks,
-        reserveProgress,
 		transmissionWork,
 		workDescribe,
 		transmissionErection,
@@ -118,25 +98,7 @@
             #{updateBy.id},
             #{updateDate},
             #{delFlag},
-            #{projectYear},
-            #{projectNature},
-            #{demandUnit},
-            #{district},
-            #{projectGroup},
-            #{reserveBatches},
-            #{blockSupply},
-            #{gridNumber},
-            #{cellNumber},
             #{projectReserveId},
-            #{projectName},
-            #{constructionNecessityAndContent},
-            #{substationName},
-            #{circuitName},
-            #{netRackProjectDivide},
-            #{requirementType},
-            #{costEstimate},
-            #{basicRemarks},
-            #{reserveProgress},
 		    #{transmissionWork},
             #{workDescribe},
             #{transmissionErection},
@@ -173,25 +135,7 @@
         update_by,
         update_date,
         del_flag,
-        projectYear,
-        projectNature,
-        demandUnit,
-        district,
-        projectGroup,
-        reserveBatches,
-        blockSupply,
-        gridNumber,
-        cellNumber,
         projectReserveId,
-        projectName,
-        constructionNecessityAndContent,
-        substationName,
-        circuitName,
-        netRackProjectDivide,
-        requirementType,
-        costEstimate,
-        basicRemarks,
-        reserveProgress,
         transmissionWork,
         workDescribe,
         transmissionErection,
@@ -227,25 +171,7 @@
             #{item.updateBy.id},
             #{item.updateDate},
             #{item.delFlag},
-            #{item.projectYear},
-            #{item.projectNature},
-            #{item.demandUnit},
-            #{item.district},
-            #{item.projectGroup},
-            #{item.reserveBatches},
-            #{item.blockSupply},
-            #{item.gridNumber},
-            #{item.cellNumber},
             #{item.projectReserveId},
-            #{item.projectName},
-            #{item.constructionNecessityAndContent},
-            #{item.substationName},
-            #{item.circuitName},
-            #{item.netRackProjectDivide},
-            #{item.requirementType},
-            #{item.costEstimate},
-            #{item.basicRemarks},
-            #{item.reserveProgress},
             #{item.transmissionWork},
             #{item.workDescribe},
             #{item.transmissionErection},
@@ -281,24 +207,6 @@
         set
         update_by = #{updateBy.id},
         update_date = #{updateDate},
-        projectYear = #{projectYear},
-        projectNature = #{projectNature},
-        demandUnit = #{demandUnit},
-        district = #{district},
-        projectGroup = #{projectGroup},
-        reserveBatches = #{reserveBatches},
-        blockSupply = #{blockSupply},
-        gridNumber = #{gridNumber},
-        cellNumber = #{cellNumber},
-        projectName = #{projectName},
-        constructionNecessityAndContent = #{constructionNecessityAndContent},
-        substationName = #{substationName},
-        circuitName = #{circuitName},
-        netRackProjectDivide = #{netRackProjectDivide},
-        requirementType = #{requirementType},
-        costEstimate = #{costEstimate},
-        basicRemarks = #{basicRemarks},
-        reserveProgress = #{reserveProgress},
         transmissionWork = #{transmissionWork},
         workDescribe = #{workDescribe},
         transmissionErection = #{transmissionErection},
@@ -333,6 +241,8 @@
         select
         <include refid="reserveManagementColumns"/>
         from cg_reserve_safety_disclosure_information a
+        left join cg_reserve_process b
+        on a.projectReserveId = b.projectReserveId
         where a.projectReserveId = #{projectReserveId}
     </select>
 
@@ -341,13 +251,15 @@
         select
         <include refid="reserveManagementColumns"/>
         from cg_reserve_safety_disclosure_information a
+        left join cg_reserve_process b
+        on a.projectReserveId = b.projectReserveId
         <where>
-            del_flag = 0
+            a.del_flag = 0
             <if test="projectReserveId!=null and projectReserveId!=''">
                 and a.projectReserveId like concat('%', #{projectReserveId}, '%')
             </if>
             <if test="projectName!=null and projectName!=''">
-                and a.projectName like concat('%', #{projectName}, '%')
+                and b.projectName like concat('%', #{projectName}, '%')
             </if>
             <if test="dataScope != null and dataScope != ''">
                 ${dataScope}
@@ -367,13 +279,15 @@
         select
         <include refid="reserveManagementColumns"/>
         from cg_reserve_safety_disclosure_information a
+        left join cg_reserve_process b
+        on a.projectReserveId = b.projectReserveId
         <where>
-            del_flag = 0
+            a.del_flag = 0
             <if test="projectReserveId!=null and projectReserveId!=''">
                 and a.projectReserveId like concat('%', #{projectReserveId}, '%')
             </if>
             <if test="projectName!=null and projectName!=''">
-                and a.projectName like concat('%', #{projectName}, '%')
+                and b.projectName like concat('%', #{projectName}, '%')
             </if>
             <if test="dataScope != null and dataScope != ''">
                 ${dataScope}
@@ -386,6 +300,19 @@
         select
         <include refid="reserveManagementColumns"/>
         from cg_reserve_safety_disclosure_information a
+        left join cg_reserve_process b
+        on a.projectReserveId = b.projectReserveId
         where a.id = #{id}
     </select>
+    <select id="getByProjectReserveId" resultType="java.lang.String">
+        SELECT proc_ins_id from cg_personnel_activiti where projectReserveId = #{projectReserveId}
+    </select>
+    <select id="getHistoryByExecuteId"
+            resultType="com.jeeplus.modules.cg.reservemanagementcenter.statisticalTable.entity.History">
+        select ACT_NAME_ as name,START_TIME_ as startTime,END_TIME_ as endTime from act_hi_actinst
+        WHERE EXECUTION_ID_ = #{executeId} and ACT_NAME_ is not null ORDER BY startTime desc
+    </select>
+    <select id="getByExecuteId" resultType="java.lang.String">
+        SELECT NAME_ FROM `act_ru_task` WHERE EXECUTION_ID_ = #{executeId}
+    </select>
 </mapper>

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

@@ -10,26 +10,25 @@
 		a.update_date AS "updateDate",
 		a.del_flag AS "delFlag",
 		a.projectReserveId,
-        a.projectName,
-		a.projectYear as 'reserveSummary.projectYear',
-		a.projectNature as 'reserveSummary.projectNature',
-		a.demandUnit as 'reserveSummary.demandUnit',
-		a.district as 'reserveSummary.district',
-		a.projectGroup as 'reserveSummary.projectGroup',
-		a.reserveBatches as 'reserveSummary.reserveBatches',
-		a.blockSupply as 'reserveSummary.blockSupply',
-		a.gridNumber as 'reserveSummary.gridNumber',
-		a.cellNumber as 'reserveSummary.cellNumber',
+        b.projectName,
+		b.projectYear as 'reserveSummary.projectYear',
+		b.projectNature as 'reserveSummary.projectNature',
+		b.demandUnit as 'reserveSummary.demandUnit',
+		b.district as 'reserveSummary.district',
+		b.projectGroup as 'reserveSummary.projectGroup',
+		b.reserveBatches as 'reserveSummary.reserveBatches',
+		b.blockSupply as 'reserveSummary.blockSupply',
+		b.gridNumber as 'reserveSummary.gridNumber',
+		b.cellNumber as 'reserveSummary.cellNumber',
 		a.projectReserveId as 'reserveSummary.projectReserveId',
-		a.projectName as 'reserveSummary.projectName',
-		a.constructionNecessityAndContent as 'reserveSummary.constructionNecessityAndContent',
-		a.substationName as 'reserveSummary.substationName',
-		a.circuitName as 'reserveSummary.circuitName',
-		a.netRackProjectDivide as 'reserveSummary.netRackProjectDivide',
-		a.requirementType as 'reserveSummary.requirementType',
-		a.costEstimate as 'reserveSummary.costEstimate',
-		a.basicRemarks as 'reserveSummary.basicRemarks',
-		a.reserveProgress as 'reserveSummary.reserveProgress',
+		b.projectName as 'reserveSummary.projectName',
+		b.constructionNecessityAndContent as 'reserveSummary.constructionNecessityAndContent',
+		b.substationName as 'reserveSummary.substationName',
+		b.circuitName as 'reserveSummary.circuitName',
+		b.netRackProjectDivide as 'reserveSummary.netRackProjectDivide',
+		b.requirementType as 'reserveSummary.requirementType',
+		b.costEstimate as 'reserveSummary.costEstimate',
+		b.basicRemarks as 'reserveSummary.basicRemarks',
 		a.includeReserve as 'reserveSummary.includeReserve',
 		a.majorProblemClassification as 'reserveSummary.majorProblemClassification',
 		a.problemDescription as 'reserveSummary.problemDescription',
@@ -169,6 +168,7 @@
         from cg_reserve_summary_statistics a
         left join cg_personnel_activiti cpa on a.projectReserveId = cpa.projectReserveId
         left join cg_feedback_on_budget fe on a.projectReserveId = fe.projectReserveId
+        left join cg_reserve_process b on a.projectReserveId = b.projectReserveId
         where a.projectReserveId = #{projectReserveId}
     </select>
     <select id="findMaterialData" resultType="java.lang.Integer">
@@ -183,13 +183,14 @@
         select
         b.id,
         b.projectReserveId,
-        b.projectName,
+        c.projectName,
         a.budgetStatement,
         a.projectProposal,
         a.drawings,
         a.drawingSpecification
         from cg_personnel_activiti a
         left join cg_reserve_summary_statistics b on a.projectReserveId = b.projectReserveId
+        left join cg_reserve_process c on a.projectReserveId = c.projectReserveId
         <where>
             1=1
             <if test="projectReserveId!=null and projectReserveId !=''">

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

@@ -9,25 +9,24 @@
 		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,
+		b.projectYear,
+		b.projectNature,
+		b.demandUnit,
+		b.district,
+		b.projectGroup,
+		b.reserveBatches,
+		b.blockSupply,
+		b.gridNumber,
+		b.cellNumber,
 		a.projectReserveId,
-		a.projectName,
-		a.constructionNecessityAndContent,
-		a.substationName,
-		a.circuitName,
-		a.netRackProjectDivide,
-		a.requirementType,
-		a.costEstimate,
-		a.basicRemarks,
-		a.reserveProgress,
+		b.projectName,
+		b.constructionNecessityAndContent,
+		b.substationName,
+		b.circuitName,
+		b.netRackProjectDivide,
+		b.requirementType,
+		b.costEstimate,
+		b.basicRemarks,
 		a.includeReserve,
 		a.majorProblemClassification,
 		a.problemDescription,
@@ -40,8 +39,10 @@
 		a.initialImplementBatch,
 		a.preliminaryConstructionUnit,
 		a.preliminaryConstructionUnitProjectManager,
-		a.handConstructionSketches
-
+		a.handConstructionSketches,
+        b.ownerProjectManager as 'projectManager',
+        c.administrativeDifficulty as 'administrativeDifficulty',
+        c.officeProgress as 'officeProgress'
 
     </sql>
 
@@ -53,25 +54,7 @@
         update_by,
         update_date,
         del_flag,
-        projectYear,
-        projectNature,
-        demandUnit,
-        district,
-        projectGroup,
-        reserveBatches,
-        blockSupply,
-        gridNumber,
-        cellNumber,
         projectReserveId,
-        projectName,
-        constructionNecessityAndContent,
-        substationName,
-        circuitName,
-        netRackProjectDivide,
-        requirementType,
-        costEstimate,
-        basicRemarks,
-        reserveProgress,
 		includeReserve,
 		majorProblemClassification,
 		problemDescription,
@@ -94,25 +77,7 @@
             #{updateBy.id},
             #{updateDate},
             #{delFlag},
-            #{projectYear},
-            #{projectNature},
-            #{demandUnit},
-            #{district},
-            #{projectGroup},
-            #{reserveBatches},
-            #{blockSupply},
-            #{gridNumber},
-            #{cellNumber},
             #{projectReserveId},
-            #{projectName},
-            #{constructionNecessityAndContent},
-            #{substationName},
-            #{circuitName},
-            #{netRackProjectDivide},
-            #{requirementType},
-            #{costEstimate},
-            #{basicRemarks},
-            #{reserveProgress},
             #{includeReserve},
             #{majorProblemClassification},
             #{problemDescription},
@@ -137,25 +102,7 @@
         update_by,
         update_date,
         del_flag,
-        projectYear,
-        projectNature,
-        demandUnit,
-        district,
-        projectGroup,
-        reserveBatches,
-        blockSupply,
-        gridNumber,
-        cellNumber,
         projectReserveId,
-        projectName,
-        constructionNecessityAndContent,
-        substationName,
-        circuitName,
-        netRackProjectDivide,
-        requirementType,
-        costEstimate,
-        basicRemarks,
-        reserveProgress,
         includeReserve,
         majorProblemClassification,
         problemDescription,
@@ -179,25 +126,7 @@
             #{item.updateBy.id},
             #{item.updateDate},
             #{item.delFlag},
-            #{item.projectYear},
-            #{item.projectNature},
-            #{item.demandUnit},
-            #{item.district},
-            #{item.projectGroup},
-            #{item.reserveBatches},
-            #{item.blockSupply},
-            #{item.gridNumber},
-            #{item.cellNumber},
             #{item.projectReserveId},
-            #{item.projectName},
-            #{item.constructionNecessityAndContent},
-            #{item.substationName},
-            #{item.circuitName},
-            #{item.netRackProjectDivide},
-            #{item.requirementType},
-            #{item.costEstimate},
-            #{item.basicRemarks},
-            #{item.reserveProgress},
             #{item.includeReserve},
             #{item.majorProblemClassification},
             #{item.problemDescription},
@@ -221,24 +150,6 @@
         set
         update_by = #{updateBy.id},
         update_date = #{updateDate},
-        projectYear = #{projectYear},
-        projectNature = #{projectNature},
-        demandUnit = #{demandUnit},
-        district = #{district},
-        projectGroup = #{projectGroup},
-        reserveBatches = #{reserveBatches},
-        blockSupply = #{blockSupply},
-        gridNumber = #{gridNumber},
-        cellNumber = #{cellNumber},
-        projectName = #{projectName},
-        constructionNecessityAndContent = #{constructionNecessityAndContent},
-        substationName = #{substationName},
-        circuitName = #{circuitName},
-        netRackProjectDivide = #{netRackProjectDivide},
-        requirementType = #{requirementType},
-        costEstimate = #{costEstimate},
-        basicRemarks = #{basicRemarks},
-        reserveProgress = #{reserveProgress},
         includeReserve = #{includeReserve},
         majorProblemClassification = #{majorProblemClassification},
         problemDescription = #{problemDescription},
@@ -261,6 +172,10 @@
         select
         <include refid="reserveManagementColumns"/>
         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
         where a.projectReserveId = #{projectReserveId}
     </select>
 
@@ -268,11 +183,7 @@
     <select id="findList" resultType="com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.entity.ReserveSummary">
         select
         <include refid="reserveManagementColumns"/>
-        ,b.ownerProjectManager as 'projectManager',
-        c.administrativeDifficulty as 'administrativeDifficulty',
-        c.officeProgress as 'officeProgress'
         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
@@ -283,7 +194,7 @@
                 and a.projectReserveId like concat('%', #{projectReserveId}, '%')
             </if>
             <if test="projectName!=null and projectName!=''">
-                and a.projectName like concat('%', #{projectName}, '%')
+                and b.projectName like concat('%', #{projectName}, '%')
             </if>
             <if test="dataScope != null and dataScope != ''">
                 ${dataScope}
@@ -302,11 +213,7 @@
             resultType="com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.entity.ReserveSummary">
         select
         <include refid="reserveManagementColumns"/>
-        ,b.ownerProjectManager as 'projectManager',
-        c.administrativeDifficulty as 'administrativeDifficulty',
-        c.officeProgress as 'officeProgress'
         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
@@ -317,7 +224,7 @@
                 and a.projectReserveId like concat('%', #{projectReserveId}, '%')
             </if>
             <if test="projectName!=null and projectName!=''">
-                and a.projectName like concat('%', #{projectName}, '%')
+                and b.projectName like concat('%', #{projectName}, '%')
             </if>
             <if test="dataScope != null and dataScope != ''">
                 ${dataScope}
@@ -330,6 +237,21 @@
         select
         <include refid="reserveManagementColumns"/>
         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
         where a.id = #{id}
     </select>
+    <select id="getByProjectReserveId" resultType="java.lang.String">
+        SELECT proc_ins_id from cg_personnel_activiti where projectReserveId = #{projectReserveId}
+    </select>
+    <select id="getHistoryByExecuteId"
+            resultType="com.jeeplus.modules.cg.reservemanagementcenter.statisticalTable.entity.History">
+        select ACT_NAME_ as name,START_TIME_ as startTime,END_TIME_ as endTime from act_hi_actinst
+        WHERE EXECUTION_ID_ = #{executeId} and ACT_NAME_ is not null ORDER BY startTime desc
+    </select>
+    <select id="getByExecuteId" resultType="java.lang.String">
+        SELECT NAME_ FROM `act_ru_task` WHERE EXECUTION_ID_ = #{executeId}
+    </select>
 </mapper>

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

@@ -4,6 +4,7 @@ import com.jeeplus.core.persistence.Page;
 import com.jeeplus.core.service.CrudService;
 import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.entity.ReservePolicyHand;
 import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.mapper.PolicyHandingMapper;
+import com.jeeplus.modules.cg.reservemanagementcenter.statisticalTable.entity.History;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -95,4 +96,16 @@ public class PolicyHandingService extends CrudService<PolicyHandingMapper, Reser
             mapper.update(entity);
         }
     }
+
+    public String getByProjectReserveId(String projectReserveId){
+        return dao.getByProjectReserveId(projectReserveId);
+    }
+
+    public List<History> getHistoryByExecuteId(String executeId){
+        return dao.getHistoryByExecuteId(executeId);
+    }
+
+    public String getByExecuteId(String executeId){
+        return dao.getByExecuteId(executeId);
+    }
 }

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

@@ -3,14 +3,12 @@ package com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.service;
 import com.jeeplus.core.persistence.Page;
 import com.jeeplus.core.service.CrudService;
 import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.entity.ReserveElectricityWork;
-import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.entity.ReserveProcessProject;
 import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.mapper.ReserveElectricityWorkMapper;
-import com.jeeplus.modules.sg.managementcenter.reserveManagement.entity.ProgressSchedule;
+import com.jeeplus.modules.cg.reservemanagementcenter.statisticalTable.entity.History;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.text.SimpleDateFormat;
 import java.util.*;
 
 /**
@@ -99,4 +97,16 @@ public class ReserveElectricityWorkService extends CrudService<ReserveElectricit
             mapper.update(entity);
         }
     }
+
+    public String getByProjectReserveId(String projectReserveId){
+        return dao.getByProjectReserveId(projectReserveId);
+    }
+
+    public List<History> getHistoryByExecuteId(String executeId){
+        return dao.getHistoryByExecuteId(executeId);
+    }
+
+    public String getByExecuteId(String executeId){
+        return dao.getByExecuteId(executeId);
+    }
 }

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

@@ -4,6 +4,7 @@ import com.jeeplus.core.persistence.Page;
 import com.jeeplus.core.service.CrudService;
 import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.entity.ReservePreconstruction;
 import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.mapper.ReservePreconstructMapper;
+import com.jeeplus.modules.cg.reservemanagementcenter.statisticalTable.entity.History;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -94,4 +95,16 @@ public class ReservePreconstructService extends CrudService<ReservePreconstructM
             mapper.update(entity);
         }
     }
+
+    public String getByProjectReserveId(String projectReserveId){
+        return dao.getByProjectReserveId(projectReserveId);
+    }
+
+    public List<History> getHistoryByExecuteId(String executeId){
+        return dao.getHistoryByExecuteId(executeId);
+    }
+
+    public String getByExecuteId(String executeId){
+        return dao.getByExecuteId(executeId);
+    }
 }

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

@@ -4,6 +4,7 @@ import com.jeeplus.core.persistence.Page;
 import com.jeeplus.core.service.CrudService;
 import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.entity.ReserveSafety;
 import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.mapper.ReserveSafeDisclosureMapper;
+import com.jeeplus.modules.cg.reservemanagementcenter.statisticalTable.entity.History;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -96,4 +97,16 @@ public class ReserveSafeDisclosureService extends CrudService<ReserveSafeDisclos
             mapper.update(entity);
         }
     }
+
+    public String getByProjectReserveId(String projectReserveId){
+        return dao.getByProjectReserveId(projectReserveId);
+    }
+
+    public List<History> getHistoryByExecuteId(String executeId){
+        return dao.getHistoryByExecuteId(executeId);
+    }
+
+    public String getByExecuteId(String executeId){
+        return dao.getByExecuteId(executeId);
+    }
 }

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

@@ -1,6 +1,7 @@
 package com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.service;
 
 import com.google.common.collect.Maps;
+import com.jeeplus.common.utils.DateUtils;
 import com.jeeplus.common.utils.StringUtils;
 import com.jeeplus.common.utils.excel.ImportExcel;
 import com.jeeplus.core.persistence.Page;
@@ -89,18 +90,30 @@ public class ReserveSummaryProcessService extends CrudService<ReserveSummaryProc
         mapper.deleteMaterial(projectName);
         ImportExcel pick = new ImportExcel(file,7,"领料清单");
         List<MaterialInfo> materialInfos = MaterialInfoUtil.getCbData(pick,projectName);   //获取领料清单数据
-        List<MaterialInfo> list = MaterialInfoUtil.combineData(materialInfos);      //合并数据
+        List<MaterialInfo> materialInfoList = new ArrayList<>();
+        for (MaterialInfo materialInfo : materialInfos) {
+            if (materialInfo.getTotalCount()>0){
+                materialInfoList.add(materialInfo);
+            }
+        }
+        List<MaterialInfo> list = MaterialInfoUtil.combineData(materialInfoList);      //合并数据
         //通过甲供材信息比对物料规范获得项目建设规模
         saveList(list);
     }
 
     @Transactional(readOnly = false)
     public void saveList(List<MaterialInfo> list) {
+
         for(MaterialInfo maintainData : list){
             maintainData.preInsert();
+            mapper.deleteMaterial(maintainData.getProjectName());
         }
         mapper.insertList(list);
     }
+    @Transactional(readOnly = false)
+    public void deleteMaterial(String projectName){
+        mapper.deleteMaterial(projectName);
+    }
 
     private String returnKva(String materialDescription) {
         if (null != materialDescription && !"".equals(materialDescription)) {
@@ -150,7 +163,8 @@ public class ReserveSummaryProcessService extends CrudService<ReserveSummaryProc
         String xmjl = mapper.getLoginNameByName(user.getOwnerProjectManager());
         list.add(cbzz);
         list.add(xmjl);
-
+        String title = user.getCurrentUser().getName() + "在" + DateUtils.getDateTime() + "发起联合审图";
+        act.setTitle(title);
         vars.put("person",list);
 
         //指定代理人
@@ -235,6 +249,7 @@ public class ReserveSummaryProcessService extends CrudService<ReserveSummaryProc
             vars.put("no",false);
             vars.put("rural",false);
             vars.put("tg",false);
+            act.setTitle("设计单位上传预算书");
         } else if ("disagree".equals(flag)){
             //不通过-回到上一个流程
             vars.put("manager", loginNameByName);
@@ -242,7 +257,7 @@ public class ReserveSummaryProcessService extends CrudService<ReserveSummaryProc
             vars.put("tg",true);
             vars.put("no",false);
             vars.put("rural",false);
-
+            act.setTitle("设计单位上传施工图纸");
         } else if ("cancel".equals(flag)){
             //取消-项目取消，修改第六张表的状态
             //先把表的状态改为取消
@@ -331,6 +346,7 @@ public class ReserveSummaryProcessService extends CrudService<ReserveSummaryProc
 
             budgetService.deleteByProjectReserveId(budget.getProjectReserveId());
             budgetService.save(budget);
+            act.setTitle("设计单位上传施工图纸");
         }
 
         act.preUpdate();

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

@@ -4,7 +4,7 @@ import com.jeeplus.core.persistence.Page;
 import com.jeeplus.core.service.CrudService;
 import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.entity.ReserveSummary;
 import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.mapper.SummaryStatisticMapper;
-import com.jeeplus.modules.sg.managementcenter.reserveManagement.entity.ReserveProcess;
+import com.jeeplus.modules.cg.reservemanagementcenter.statisticalTable.entity.History;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -110,4 +110,16 @@ public class SummaryStatisticService extends CrudService<SummaryStatisticMapper,
     public void insert(ReserveSummary entity) {
         mapper.insert(entity);
     }
+
+    public String getByProjectReserveId(String projectReserveId){
+        return dao.getByProjectReserveId(projectReserveId);
+    }
+
+    public List<History> getHistoryByExecuteId(String executeId){
+        return dao.getHistoryByExecuteId(executeId);
+    }
+
+    public String getByExecuteId(String executeId){
+        return dao.getByExecuteId(executeId);
+    }
 }

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

@@ -0,0 +1,40 @@
+package com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.utils;
+
+import redis.clients.jedis.Jedis;
+
+import java.util.List;
+
+/**
+ * @author: 王强
+ * @create: 2022-08-26 10:49
+ **/
+public class DataList {
+
+    /*存储list集合*/
+    public static void setList(String key, List<?> value){
+        Jedis jedis = ReserveRedisUtils.getJedis();
+        try {
+            if (value == null || value.size() == 0){
+                jedis.set(key.getBytes(),"".getBytes());
+            }
+            jedis.set(key.getBytes(),SerializableUtilsList.serializeList(value));
+            /*存储过期时间*/
+            jedis.expire(key,60*30);
+        }catch (Exception e){
+            e.printStackTrace();
+        }finally {
+            jedis.close();
+        }
+    }
+
+    /*取出list集合*/
+    public static List<?> getList(String key){
+        Jedis jedis = ReserveRedisUtils.getJedis();
+        if (jedis == null || !jedis.exists(key)){
+            return null;
+        }
+        byte[] data = jedis.get(key.getBytes());
+        jedis.close();
+        return SerializableUtilsList.usSerializeList(data);
+    }
+}

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

@@ -1,8 +1,6 @@
 package com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.utils;
 
 import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.entity.*;
-import com.jeeplus.modules.sg.managementcenter.reserveManagement.entity.ExportScheme;
-import com.jeeplus.modules.sg.managementcenter.reserveManagement.entity.ReserveManagement;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.Row;
@@ -13,8 +11,6 @@ import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import javax.servlet.http.HttpServletResponse;
 import java.io.*;
 import java.net.URLEncoder;
-import java.text.SimpleDateFormat;
-import java.util.Date;
 import java.util.List;
 
 public class ReserveProcessProjectExportUtil {
@@ -145,7 +141,7 @@ public class ReserveProcessProjectExportUtil {
     public void exportElectricityWork(HttpServletResponse response, XSSFWorkbook workbook, List<ReserveElectricityWork> list){
         try {
             int index = 1;//第一列序号
-            int rowNum = 3;//数据起始列
+            int rowNum = 2;//数据起始列
             Sheet sheet = workbook.getSheetAt(0);
             for(int i=0;i<list.size();i++){
                 Row row = sheet.createRow(rowNum+i);

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

@@ -6,9 +6,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.ss.usermodel.Row;
 
 import java.text.ParseException;
-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 
 public class ReserveProcessProjectProUtil {
@@ -22,10 +20,7 @@ public class ReserveProcessProjectProUtil {
     public static List<ReserveProcessProject> getProjectUtil(ImportUtil importUtil) throws ParseException {
         int lastRow = importUtil.getLastDataRowNum();
         List<ReserveProcessProject> list = new ArrayList<ReserveProcessProject>();
-        //网格编号唯一性判断
-//        List<String> wgList = new ArrayList<>();
-        //单元格编号唯一性判断
-//        List<String> dygList = new ArrayList<>();
+
         //项目储备编号唯一性判断
         List<String> cbbhList = new ArrayList<>();
         //项目名称唯一性判断
@@ -38,7 +33,7 @@ public class ReserveProcessProjectProUtil {
             Row row = importUtil.getRow(i);
             //储备人员流转信息
             Row cbRow = importUtil.getRow(3);
-            String reserveProjectName = (String) importUtil.getCellValue(row,0);
+            String reserveProjectName = (String) importUtil.getCellValue(row,11);
             //获取项目储备编号
             String projectReserveId = (String) importUtil.getCellValue(row, 10);
             if(StringUtils.isNotBlank(reserveProjectName) ) {
@@ -118,10 +113,6 @@ public class ReserveProcessProjectProUtil {
     public static List<ReserveElectricityWork> getChargeProjectUtil(ImportUtil importUtil) throws ParseException {
         int lastRow = importUtil.getLastDataRowNum();
         List<ReserveElectricityWork> list = new ArrayList<ReserveElectricityWork>();
-        //网格编号唯一性判断
-//        List<String> wgList = new ArrayList<>();
-        //单元格编号唯一性判断
-//        List<String> dygList = new ArrayList<>();
         //项目储备编号唯一性判断
         List<String> cbbhList = new ArrayList<>();
         //项目名称唯一性判断
@@ -133,86 +124,36 @@ public class ReserveProcessProjectProUtil {
             reserveManagement = new ReserveElectricityWork();
             Row row = importUtil.getRow(i);
             //储备人员流转信息
-            Row cbRow = importUtil.getRow(3);
-            String reserveProjectName = (String) importUtil.getCellValue(row,0);
             //获取项目储备编号
             String projectReserveId = (String) importUtil.getCellValue(row, 10);
-            if(StringUtils.isNotBlank(reserveProjectName) ) {
-                if(StringUtils.isNotBlank(projectReserveId)){
-
-                    reserveManagement.setProjectYear((String) importUtil.getCellValue(row,1));
-                    reserveManagement.setProjectNature((String) importUtil.getCellValue(row,2));
-                    reserveManagement.setDemandUnit((String) importUtil.getCellValue(row,3));
-                    reserveManagement.setDistrict((String) importUtil.getCellValue(row,4));
-                    reserveManagement.setProjectGroup((String) importUtil.getCellValue(row,5));
-                    reserveManagement.setReserveBatches((String) importUtil.getCellValue(row,6));
-                    reserveManagement.setBlockSupply((String) importUtil.getCellValue(row,7));
-                    reserveManagement.setGridNumber((String) importUtil.getCellValue(row,8));
-
-                    reserveManagement.setCellNumber((String) importUtil.getCellValue(row,9));
-
-                    reserveManagement.setProjectReserveId((String) importUtil.getCellValue(row,10));
-
-                    reserveManagement.setProjectName((String) importUtil.getCellValue(row,11));
-
-                    reserveManagement.setConstructionNecessityAndContent((String) importUtil.getCellValue(row,12));
-
-                    reserveManagement.setSubstationName((String) importUtil.getCellValue(row,13));
-                    reserveManagement.setCircuitName((String) importUtil.getCellValue(row,14));
-                    reserveManagement.setNetRackProjectDivide((String) importUtil.getCellValue(row,15));
-                    reserveManagement.setRequirementType((String) importUtil.getCellValue(row,16));
-
-                    String costEstimateStr = importUtil.getCellValue(row,17).toString();
-                    if(StringUtils.isNotBlank(costEstimateStr)){
-                        reserveManagement.setCostEstimate(costEstimateStr);
-                    }
-                    reserveManagement.setBasicRemarks((String) importUtil.getCellValue(row,18));
-                    reserveManagement.setReserveProgress((String) importUtil.getCellValue(row,19));
-                    /*reserveManagement.setImplementPlan((String) importUtil.getCellValue(row,20));
-                    reserveManagement.setImplementBatch((String) importUtil.getCellValue(row,21));*/
-                    reserveManagement.setTeansFormerOrPackageProject((String) importUtil.getCellValue(row,22));
-                    reserveManagement.setPackageProject((String) importUtil.getCellValue(row,23));
-                    reserveManagement.setPackageItemQuantity((String) importUtil.getCellValue(row,24));
-                    reserveManagement.setDeviceName((String) importUtil.getCellValue(row,25));
-                    reserveManagement.setWorkWithElectricity((String) importUtil.getCellValue(row,26));
-                    reserveManagement.setElectricityTypeNumber((String) importUtil.getCellValue(row,27));
-                    reserveManagement.setElectricityWorkNumber((String) importUtil.getCellValue(row,28));
-                    reserveManagement.setNoStopWorkPlan((String) importUtil.getCellValue(row,29));
-                    reserveManagement.setReasonsForNotWorkInterruption((String) importUtil.getCellValue(row,30));
-                    reserveManagement.setPowerOutagePlan((String) importUtil.getCellValue(row,31));
-                    reserveManagement.setPlanner((String) importUtil.getCellValue(row,32));
-                    reserveManagement.setSiteSurveyor((String) importUtil.getCellValue(row,33));
-
-                    /*int num = Integer.valueOf(reserveManagement.getPackageItemQuantity());
-                    if (num>0){
-                        reserveManagement.setPackageProject("是");
-                    }else if (num == 0){
-                        reserveManagement.setPackageProject("否");
-                    }*/
-
-                    if (list.size() == 0){
+            if(StringUtils.isNotBlank(projectReserveId)){
+
+                reserveManagement.setProjectReserveId((String) importUtil.getCellValue(row,10));
+
+                reserveManagement.setTeansFormerOrPackageProject((String) importUtil.getCellValue(row,22));
+                reserveManagement.setPackageProject((String) importUtil.getCellValue(row,23));
+                reserveManagement.setPackageItemQuantity((String) importUtil.getCellValue(row,24));
+                reserveManagement.setDeviceName((String) importUtil.getCellValue(row,25));
+                reserveManagement.setWorkWithElectricity((String) importUtil.getCellValue(row,26));
+                reserveManagement.setElectricityTypeNumber((String) importUtil.getCellValue(row,27));
+                reserveManagement.setElectricityWorkNumber((String) importUtil.getCellValue(row,28));
+                reserveManagement.setNoStopWorkPlan((String) importUtil.getCellValue(row,29));
+                reserveManagement.setReasonsForNotWorkInterruption((String) importUtil.getCellValue(row,30));
+                reserveManagement.setPowerOutagePlan((String) importUtil.getCellValue(row,31));
+                reserveManagement.setPlanner((String) importUtil.getCellValue(row,32));
+                reserveManagement.setSiteSurveyor((String) importUtil.getCellValue(row,33));
+
+                if (list.size() == 0){
+                    list.add(reserveManagement);
+
+                    cbbhList.add(reserveManagement.getProjectReserveId());
+                }else {
+                    if (!cbbhList.contains(reserveManagement.getProjectReserveId())){
                         list.add(reserveManagement);
-                        /*wgList.add(reserveManagement.getGridNumber());
-                        dygList.add(reserveManagement.getCellNumber());*/
                         cbbhList.add(reserveManagement.getProjectReserveId());
-                        nameList.add(reserveManagement.getProjectName());
-                        jsList.add(reserveManagement.getConstructionNecessityAndContent());
-                    }else {
-                        if (/*!wgList.contains(reserveManagement.getGridNumber())
-                                & !dygList.contains(reserveManagement.getCellNumber())
-                                &*/ !cbbhList.contains(reserveManagement.getProjectReserveId())
-                                & !nameList.contains(reserveManagement.getProjectName())
-                                & ! jsList.contains(reserveManagement.getConstructionNecessityAndContent())){
-                            list.add(reserveManagement);
-                            /*wgList.add(reserveManagement.getGridNumber());
-                            dygList.add(reserveManagement.getCellNumber());*/
-                            cbbhList.add(reserveManagement.getProjectReserveId());
-                            nameList.add(reserveManagement.getProjectName());
-                            jsList.add(reserveManagement.getConstructionNecessityAndContent());
-                        }
                     }
-
                 }
+
             }
         }
         return list;
@@ -226,108 +167,62 @@ public class ReserveProcessProjectProUtil {
     public static List<ReserveSafety> getSafetyProjectUtil(ImportUtil importUtil) throws ParseException {
         int lastRow = importUtil.getLastDataRowNum();
         List<ReserveSafety> list = new ArrayList<ReserveSafety>();
-        //网格编号唯一性判断
-//        List<String> wgList = new ArrayList<>();
-        //单元格编号唯一性判断
-//        List<String> dygList = new ArrayList<>();
+
         //项目储备编号唯一性判断
         List<String> cbbhList = new ArrayList<>();
-        //项目名称唯一性判断
-        List<String> nameList = new ArrayList<>();
+
         //建设必要性及内容
         List<String> jsList = new ArrayList<>();
         ReserveSafety reserveManagement = null;
         for(int i=3; i<=lastRow;i++){
             reserveManagement = new ReserveSafety();
             Row row = importUtil.getRow(i);
-            //储备人员流转信息
-            Row cbRow = importUtil.getRow(3);
-            String reserveProjectName = (String) importUtil.getCellValue(row,0);
             //获取项目储备编号
             String projectReserveId = (String) importUtil.getCellValue(row, 10);
-            if(StringUtils.isNotBlank(reserveProjectName) ) {
-                if(StringUtils.isNotBlank(projectReserveId)){
-
-                    reserveManagement.setProjectYear((String) importUtil.getCellValue(row,1));
-                    reserveManagement.setProjectNature((String) importUtil.getCellValue(row,2));
-                    reserveManagement.setDemandUnit((String) importUtil.getCellValue(row,3));
-                    reserveManagement.setDistrict((String) importUtil.getCellValue(row,4));
-                    reserveManagement.setProjectGroup((String) importUtil.getCellValue(row,5));
-                    reserveManagement.setReserveBatches((String) importUtil.getCellValue(row,6));
-                    reserveManagement.setBlockSupply((String) importUtil.getCellValue(row,7));
-                    reserveManagement.setGridNumber((String) importUtil.getCellValue(row,8));
-
-                    reserveManagement.setCellNumber((String) importUtil.getCellValue(row,9));
-
-                    reserveManagement.setProjectReserveId((String) importUtil.getCellValue(row,10));
-
-                    reserveManagement.setProjectName((String) importUtil.getCellValue(row,11));
-
-                    reserveManagement.setConstructionNecessityAndContent((String) importUtil.getCellValue(row,12));
-
-                    reserveManagement.setSubstationName((String) importUtil.getCellValue(row,13));
-                    reserveManagement.setCircuitName((String) importUtil.getCellValue(row,14));
-                    reserveManagement.setNetRackProjectDivide((String) importUtil.getCellValue(row,15));
-                    reserveManagement.setRequirementType((String) importUtil.getCellValue(row,16));
-
-                    String costEstimateStr = importUtil.getCellValue(row,17).toString();
-                    if(StringUtils.isNotBlank(costEstimateStr)){
-                        reserveManagement.setCostEstimate(costEstimateStr);
-                    }
-                    reserveManagement.setBasicRemarks((String) importUtil.getCellValue(row,18));
-                    reserveManagement.setReserveProgress((String) importUtil.getCellValue(row,19));
-                    reserveManagement.setTransmissionWork((String) importUtil.getCellValue(row,20));
-                    reserveManagement.setWorkDescribe((String) importUtil.getCellValue(row,21));
-                    reserveManagement.setTransmissionErection((String) importUtil.getCellValue(row,22));
-                    reserveManagement.setErecteDescribe((String) importUtil.getCellValue(row,23));
-                    reserveManagement.setTransmissionCommonTrench((String) importUtil.getCellValue(row,24));
-                    reserveManagement.setTrenchDescribe((String) importUtil.getCellValue(row,25));
-                    reserveManagement.setMediumVoltageWork((String) importUtil.getCellValue(row,26));
-                    reserveManagement.setVoltageWorkDescribe((String) importUtil.getCellValue(row,27));
-                    reserveManagement.setConfineSpaceWork((String) importUtil.getCellValue(row,28));
-                    reserveManagement.setSpaceDescribe((String) importUtil.getCellValue(row,29));
-                    reserveManagement.setSubStationCableBonding((String) importUtil.getCellValue(row,30));
-                    reserveManagement.setCableDescribe((String) importUtil.getCellValue(row,31));
-                    reserveManagement.setRoadRailwaysAndWaterwaysWork((String) importUtil.getCellValue(row,32));
-                    reserveManagement.setWaterDescribe((String) importUtil.getCellValue(row,33));
-                    reserveManagement.setHotWork((String) importUtil.getCellValue(row,34));
-                    reserveManagement.setHotWorkDescribe((String) importUtil.getCellValue(row,35));
-                    reserveManagement.setBlackoutLineFour((String) importUtil.getCellValue(row,36));
-                    reserveManagement.setLineFourDescribe((String) importUtil.getCellValue(row,37));
-                    reserveManagement.setLineLoadRedirectionThree((String) importUtil.getCellValue(row,38));
-                    reserveManagement.setThreeRedirectDescribe((String) importUtil.getCellValue(row,39));
-                    reserveManagement.setLargeScaleMultiTeamWork((String) importUtil.getCellValue(row,40));
-                    reserveManagement.setTeamWorkDescribe((String) importUtil.getCellValue(row,41));
-                    reserveManagement.setPrepareThreeMeasures((String) importUtil.getCellValue(row,42));
-                    reserveManagement.setMeasureDescribe((String) importUtil.getCellValue(row,43));
-                    reserveManagement.setJobRiskLevelPrediction((String) importUtil.getCellValue(row,44));
-
-
-
-
-                    if (list.size() == 0){
+            if(StringUtils.isNotBlank(projectReserveId)){
+
+                reserveManagement.setProjectReserveId((String) importUtil.getCellValue(row,10));
+
+                reserveManagement.setTransmissionWork((String) importUtil.getCellValue(row,20));
+                reserveManagement.setWorkDescribe((String) importUtil.getCellValue(row,21));
+                reserveManagement.setTransmissionErection((String) importUtil.getCellValue(row,22));
+                reserveManagement.setErecteDescribe((String) importUtil.getCellValue(row,23));
+                reserveManagement.setTransmissionCommonTrench((String) importUtil.getCellValue(row,24));
+                reserveManagement.setTrenchDescribe((String) importUtil.getCellValue(row,25));
+                reserveManagement.setMediumVoltageWork((String) importUtil.getCellValue(row,26));
+                reserveManagement.setVoltageWorkDescribe((String) importUtil.getCellValue(row,27));
+                reserveManagement.setConfineSpaceWork((String) importUtil.getCellValue(row,28));
+                reserveManagement.setSpaceDescribe((String) importUtil.getCellValue(row,29));
+                reserveManagement.setSubStationCableBonding((String) importUtil.getCellValue(row,30));
+                reserveManagement.setCableDescribe((String) importUtil.getCellValue(row,31));
+                reserveManagement.setRoadRailwaysAndWaterwaysWork((String) importUtil.getCellValue(row,32));
+                reserveManagement.setWaterDescribe((String) importUtil.getCellValue(row,33));
+                reserveManagement.setHotWork((String) importUtil.getCellValue(row,34));
+                reserveManagement.setHotWorkDescribe((String) importUtil.getCellValue(row,35));
+                reserveManagement.setBlackoutLineFour((String) importUtil.getCellValue(row,36));
+                reserveManagement.setLineFourDescribe((String) importUtil.getCellValue(row,37));
+                reserveManagement.setLineLoadRedirectionThree((String) importUtil.getCellValue(row,38));
+                reserveManagement.setThreeRedirectDescribe((String) importUtil.getCellValue(row,39));
+                reserveManagement.setLargeScaleMultiTeamWork((String) importUtil.getCellValue(row,40));
+                reserveManagement.setTeamWorkDescribe((String) importUtil.getCellValue(row,41));
+                reserveManagement.setPrepareThreeMeasures((String) importUtil.getCellValue(row,42));
+                reserveManagement.setMeasureDescribe((String) importUtil.getCellValue(row,43));
+                reserveManagement.setJobRiskLevelPrediction((String) importUtil.getCellValue(row,44));
+
+
+
+
+                if (list.size() == 0){
+                    list.add(reserveManagement);
+                    cbbhList.add(reserveManagement.getProjectReserveId());
+                }else {
+                    if (!cbbhList.contains(reserveManagement.getProjectReserveId())){
                         list.add(reserveManagement);
-                        /*wgList.add(reserveManagement.getGridNumber());
-                        dygList.add(reserveManagement.getCellNumber());*/
                         cbbhList.add(reserveManagement.getProjectReserveId());
-                        nameList.add(reserveManagement.getProjectName());
                         jsList.add(reserveManagement.getConstructionNecessityAndContent());
-                    }else {
-                        if (/*!wgList.contains(reserveManagement.getGridNumber())
-                                & !dygList.contains(reserveManagement.getCellNumber())
-                                &*/ !cbbhList.contains(reserveManagement.getProjectReserveId())
-                                & !nameList.contains(reserveManagement.getProjectName())
-                                & ! jsList.contains(reserveManagement.getConstructionNecessityAndContent())){
-                            list.add(reserveManagement);
-                            /*wgList.add(reserveManagement.getGridNumber());
-                            dygList.add(reserveManagement.getCellNumber());*/
-                            cbbhList.add(reserveManagement.getProjectReserveId());
-                            nameList.add(reserveManagement.getProjectName());
-                            jsList.add(reserveManagement.getConstructionNecessityAndContent());
-                        }
                     }
-
                 }
+
             }
         }
         return list;
@@ -341,89 +236,39 @@ public class ReserveProcessProjectProUtil {
     public static List<ReservePreconstruction> getPreconstUtil(ImportUtil importUtil) throws ParseException {
         int lastRow = importUtil.getLastDataRowNum();
         List<ReservePreconstruction> list = new ArrayList<ReservePreconstruction>();
-        //网格编号唯一性判断
-//        List<String> wgList = new ArrayList<>();
-        //单元格编号唯一性判断
-//        List<String> dygList = new ArrayList<>();
         //项目储备编号唯一性判断
         List<String> cbbhList = new ArrayList<>();
-        //项目名称唯一性判断
-        List<String> nameList = new ArrayList<>();
-        //建设必要性及内容
-        List<String> jsList = new ArrayList<>();
         ReservePreconstruction reserveManagement = null;
         for(int i=3; i<=lastRow;i++){
             reserveManagement = new ReservePreconstruction();
             Row row = importUtil.getRow(i);
             //储备人员流转信息
             Row cbRow = importUtil.getRow(3);
-            String reserveProjectName = (String) importUtil.getCellValue(row,0);
             //获取项目储备编号
             String projectReserveId = (String) importUtil.getCellValue(row, 10);
-            if(StringUtils.isNotBlank(reserveProjectName) ) {
-                if(StringUtils.isNotBlank(projectReserveId)){
-
-                    reserveManagement.setProjectYear((String) importUtil.getCellValue(row,1));
-                    reserveManagement.setProjectNature((String) importUtil.getCellValue(row,2));
-                    reserveManagement.setDemandUnit((String) importUtil.getCellValue(row,3));
-                    reserveManagement.setDistrict((String) importUtil.getCellValue(row,4));
-                    reserveManagement.setProjectGroup((String) importUtil.getCellValue(row,5));
-                    reserveManagement.setReserveBatches((String) importUtil.getCellValue(row,6));
-                    reserveManagement.setBlockSupply((String) importUtil.getCellValue(row,7));
-                    reserveManagement.setGridNumber((String) importUtil.getCellValue(row,8));
-
-                    reserveManagement.setCellNumber((String) importUtil.getCellValue(row,9));
+            if(StringUtils.isNotBlank(projectReserveId)){
 
-                    reserveManagement.setProjectReserveId((String) importUtil.getCellValue(row,10));
+                reserveManagement.setProjectReserveId((String) importUtil.getCellValue(row,10));
 
-                    reserveManagement.setProjectName((String) importUtil.getCellValue(row,11));
 
-                    reserveManagement.setConstructionNecessityAndContent((String) importUtil.getCellValue(row,12));
+                reserveManagement.setConfessCivilFoundation((String) importUtil.getCellValue(row,22));
+                reserveManagement.setConfessPrefab((String) importUtil.getCellValue(row,23));
+                reserveManagement.setConfessPrefabDescription((String) importUtil.getCellValue(row,24));
+                reserveManagement.setDesignCivilFoundation((String) importUtil.getCellValue(row,25));
+                reserveManagement.setDesignPrefab((String) importUtil.getCellValue(row,26));
+                reserveManagement.setDesignPrefabDescription((String) importUtil.getCellValue(row,27));
 
-                    reserveManagement.setSubstationName((String) importUtil.getCellValue(row,13));
-                    reserveManagement.setCircuitName((String) importUtil.getCellValue(row,14));
-                    reserveManagement.setNetRackProjectDivide((String) importUtil.getCellValue(row,15));
-                    reserveManagement.setRequirementType((String) importUtil.getCellValue(row,16));
 
-                    String costEstimateStr = importUtil.getCellValue(row,17).toString();
-                    if(StringUtils.isNotBlank(costEstimateStr)){
-                        reserveManagement.setCostEstimate(costEstimateStr);
-                    }
-                    reserveManagement.setBasicRemarks((String) importUtil.getCellValue(row,18));
-                    reserveManagement.setReserveProgress((String) importUtil.getCellValue(row,19));
-                    /*reserveManagement.setImplementPlan((String) importUtil.getCellValue(row,20));
-                    reserveManagement.setImplementBatch((String) importUtil.getCellValue(row,21));*/
-                    reserveManagement.setConfessCivilFoundation((String) importUtil.getCellValue(row,22));
-                    reserveManagement.setConfessPrefab((String) importUtil.getCellValue(row,23));
-                    reserveManagement.setConfessPrefabDescription((String) importUtil.getCellValue(row,24));
-                    reserveManagement.setDesignCivilFoundation((String) importUtil.getCellValue(row,25));
-                    reserveManagement.setDesignPrefab((String) importUtil.getCellValue(row,26));
-                    reserveManagement.setDesignPrefabDescription((String) importUtil.getCellValue(row,27));
-
-
-                    if (list.size() == 0){
+                if (list.size() == 0){
+                    list.add(reserveManagement);
+                    cbbhList.add(reserveManagement.getProjectReserveId());
+                }else {
+                    if (!cbbhList.contains(reserveManagement.getProjectReserveId())){
                         list.add(reserveManagement);
-                       /* wgList.add(reserveManagement.getGridNumber());
-                        dygList.add(reserveManagement.getCellNumber());*/
                         cbbhList.add(reserveManagement.getProjectReserveId());
-                        nameList.add(reserveManagement.getProjectName());
-                        jsList.add(reserveManagement.getConstructionNecessityAndContent());
-                    }else {
-                        if (/*!wgList.contains(reserveManagement.getGridNumber())
-                                & !dygList.contains(reserveManagement.getCellNumber())
-                                &*/ !cbbhList.contains(reserveManagement.getProjectReserveId())
-                                & !nameList.contains(reserveManagement.getProjectName())
-                                & ! jsList.contains(reserveManagement.getConstructionNecessityAndContent())){
-                            list.add(reserveManagement);
-                            /*wgList.add(reserveManagement.getGridNumber());
-                            dygList.add(reserveManagement.getCellNumber());*/
-                            cbbhList.add(reserveManagement.getProjectReserveId());
-                            nameList.add(reserveManagement.getProjectName());
-                            jsList.add(reserveManagement.getConstructionNecessityAndContent());
-                        }
                     }
-
                 }
+
             }
         }
         return list;
@@ -437,111 +282,58 @@ public class ReserveProcessProjectProUtil {
     public static List<ReservePolicyHand> getPolicyUtil(ImportUtil importUtil) throws ParseException {
         int lastRow = importUtil.getLastDataRowNum();
         List<ReservePolicyHand> list = new ArrayList<ReservePolicyHand>();
-        //网格编号唯一性判断
-//        List<String> wgList = new ArrayList<>();
-        //单元格编号唯一性判断
-//        List<String> dygList = new ArrayList<>();
         //项目储备编号唯一性判断
         List<String> cbbhList = new ArrayList<>();
-        //项目名称唯一性判断
-        List<String> nameList = new ArrayList<>();
-        //建设必要性及内容
-        List<String> jsList = new ArrayList<>();
+
         ReservePolicyHand reserveManagement = null;
         for(int i=2; i<=lastRow;i++){
             reserveManagement = new ReservePolicyHand();
             Row row = importUtil.getRow(i);
-            //储备人员流转信息
-            Row cbRow = importUtil.getRow(3);
-            String reserveProjectName = (String) importUtil.getCellValue(row,0);
+
             //获取项目储备编号
             String projectReserveId = (String) importUtil.getCellValue(row, 10);
-            if(StringUtils.isNotBlank(reserveProjectName) ) {
-                if(StringUtils.isNotBlank(projectReserveId)){
-
-                    reserveManagement.setProjectYear((String) importUtil.getCellValue(row,1));
-                    reserveManagement.setProjectNature((String) importUtil.getCellValue(row,2));
-                    reserveManagement.setDemandUnit((String) importUtil.getCellValue(row,3));
-                    reserveManagement.setDistrict((String) importUtil.getCellValue(row,4));
-                    reserveManagement.setProjectGroup((String) importUtil.getCellValue(row,5));
-                    reserveManagement.setReserveBatches((String) importUtil.getCellValue(row,6));
-                    reserveManagement.setBlockSupply((String) importUtil.getCellValue(row,7));
-                    reserveManagement.setGridNumber((String) importUtil.getCellValue(row,8));
-
-                    reserveManagement.setCellNumber((String) importUtil.getCellValue(row,9));
-
-                    reserveManagement.setProjectReserveId((String) importUtil.getCellValue(row,10));
-
-                    reserveManagement.setProjectName((String) importUtil.getCellValue(row,11));
-
-                    reserveManagement.setConstructionNecessityAndContent((String) importUtil.getCellValue(row,12));
-
-                    reserveManagement.setSubstationName((String) importUtil.getCellValue(row,13));
-                    reserveManagement.setCircuitName((String) importUtil.getCellValue(row,14));
-                    reserveManagement.setNetRackProjectDivide((String) importUtil.getCellValue(row,15));
-                    reserveManagement.setRequirementType((String) importUtil.getCellValue(row,16));
-
-                    String costEstimateStr = importUtil.getCellValue(row,17).toString();
-                    if(StringUtils.isNotBlank(costEstimateStr)){
-                        reserveManagement.setCostEstimate(costEstimateStr);
-                    }
-                    reserveManagement.setBasicRemarks((String) importUtil.getCellValue(row,18));
-                    reserveManagement.setReserveProgress((String) importUtil.getCellValue(row,19));
-                    reserveManagement.setPowerSupplyArea((String) importUtil.getCellValue(row,22));
-                    reserveManagement.setConstructionSpot((String) importUtil.getCellValue(row,23));
-                    reserveManagement.setIncludeCivilWork((String) importUtil.getCellValue(row,24));
-                    reserveManagement.setPoleWorkload((String) importUtil.getCellValue(row,25));
-                    reserveManagement.setProposedConstructionUnit((String) importUtil.getCellValue(row,27));
-                    reserveManagement.setOverToGovernment((String) importUtil.getCellValue(row,28));
-                    reserveManagement.setGovernmentOffice((String) importUtil.getCellValue(row,29));
-                    reserveManagement.setOfficeDescription((String) importUtil.getCellValue(row,30));
-                    reserveManagement.setAdministrativeDifficulty((String) importUtil.getCellValue(row,31));
-                    reserveManagement.setAdministrativeObjectNumber((String) importUtil.getCellValue(row,32));
-                    reserveManagement.setPropertyUnitOfficeDescription((String) importUtil.getCellValue(row,33));
-                    reserveManagement.setOfficeType((String) importUtil.getCellValue(row,34));
-                    //启动政处时间
-                    Date date = new Date();
-                    SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
-                    String dateTime = format.format(date);
-                    System.out.println("dateTime: " + dateTime);
-                    reserveManagement.setStartOfficeTime(dateTime);
-                    reserveManagement.setPlanApprovalRequire((String) importUtil.getCellValue(row,36));
-                    reserveManagement.setPlanApprovalCompletion((String) importUtil.getCellValue(row,37));
-                    reserveManagement.setSafetyReview((String) importUtil.getCellValue(row,38));
-                    reserveManagement.setSafetyReviewCompletion((String) importUtil.getCellValue(row,39));
-                    reserveManagement.setOfficeAmount((String) importUtil.getCellValue(row,40));
-                    reserveManagement.setPaymentCompleted((String) importUtil.getCellValue(row,41));
-                    reserveManagement.setOfficeProgress((String) importUtil.getCellValue(row,42));
-                    reserveManagement.setCivilEngineeringApproach((String) importUtil.getCellValue(row,43));
-                    reserveManagement.setElectricApproach((String) importUtil.getCellValue(row,44));
-                    reserveManagement.setCivilConstructionMaterialOpen((String) importUtil.getCellValue(row,45));
-                    reserveManagement.setElectricalPickListOpen((String) importUtil.getCellValue(row,46));
-                    reserveManagement.setAdministrativeOfficeRemark((String) importUtil.getCellValue(row,47));
-
-
-                    if (list.size() == 0){
+            if(StringUtils.isNotBlank(projectReserveId)){
+
+                reserveManagement.setProjectReserveId((String) importUtil.getCellValue(row,10));
+
+                reserveManagement.setPowerSupplyArea((String) importUtil.getCellValue(row,22));
+                reserveManagement.setConstructionSpot((String) importUtil.getCellValue(row,23));
+                reserveManagement.setIncludeCivilWork((String) importUtil.getCellValue(row,24));
+                reserveManagement.setPoleWorkload((String) importUtil.getCellValue(row,25));
+                reserveManagement.setProposedConstructionUnit((String) importUtil.getCellValue(row,27));
+                reserveManagement.setOverToGovernment((String) importUtil.getCellValue(row,28));
+                reserveManagement.setGovernmentOffice((String) importUtil.getCellValue(row,29));
+                reserveManagement.setOfficeDescription((String) importUtil.getCellValue(row,30));
+                reserveManagement.setAdministrativeDifficulty((String) importUtil.getCellValue(row,31));
+                reserveManagement.setAdministrativeObjectNumber((String) importUtil.getCellValue(row,32));
+                reserveManagement.setPropertyUnitOfficeDescription((String) importUtil.getCellValue(row,33));
+                reserveManagement.setOfficeType((String) importUtil.getCellValue(row,34));
+
+                reserveManagement.setStartOfficeTime((String) importUtil.getCellValue(row, 35));
+                reserveManagement.setPlanApprovalRequire((String) importUtil.getCellValue(row,36));
+                reserveManagement.setPlanApprovalCompletion((String) importUtil.getCellValue(row,37));
+                reserveManagement.setSafetyReview((String) importUtil.getCellValue(row,38));
+                reserveManagement.setSafetyReviewCompletion((String) importUtil.getCellValue(row,39));
+                reserveManagement.setOfficeAmount((String) importUtil.getCellValue(row,40));
+                reserveManagement.setPaymentCompleted((String) importUtil.getCellValue(row,41));
+                reserveManagement.setOfficeProgress((String) importUtil.getCellValue(row,42));
+                reserveManagement.setCivilEngineeringApproach((String) importUtil.getCellValue(row,43));
+                reserveManagement.setElectricApproach((String) importUtil.getCellValue(row,44));
+                reserveManagement.setCivilConstructionMaterialOpen((String) importUtil.getCellValue(row,45));
+                reserveManagement.setElectricalPickListOpen((String) importUtil.getCellValue(row,46));
+                reserveManagement.setAdministrativeOfficeRemark((String) importUtil.getCellValue(row,47));
+
+
+                if (list.size() == 0){
+                    list.add(reserveManagement);
+                    cbbhList.add(reserveManagement.getProjectReserveId());
+                }else {
+                    if (!cbbhList.contains(reserveManagement.getProjectReserveId())){
                         list.add(reserveManagement);
-                        /*wgList.add(reserveManagement.getGridNumber());
-                        dygList.add(reserveManagement.getCellNumber());*/
                         cbbhList.add(reserveManagement.getProjectReserveId());
-                        nameList.add(reserveManagement.getProjectName());
-                        jsList.add(reserveManagement.getConstructionNecessityAndContent());
-                    }else {
-                        if (/*!wgList.contains(reserveManagement.getGridNumber())
-                                & !dygList.contains(reserveManagement.getCellNumber())
-                                &*/ !cbbhList.contains(reserveManagement.getProjectReserveId())
-                                & !nameList.contains(reserveManagement.getProjectName())
-                                & ! jsList.contains(reserveManagement.getConstructionNecessityAndContent())){
-                            list.add(reserveManagement);
-                            /*wgList.add(reserveManagement.getGridNumber());
-                            dygList.add(reserveManagement.getCellNumber());*/
-                            cbbhList.add(reserveManagement.getProjectReserveId());
-                            nameList.add(reserveManagement.getProjectName());
-                            jsList.add(reserveManagement.getConstructionNecessityAndContent());
-                        }
                     }
-
                 }
+
             }
         }
         return list;
@@ -555,103 +347,45 @@ public class ReserveProcessProjectProUtil {
     public static List<ReserveSummary> getSummaryUtil(ImportUtil importUtil) throws ParseException {
         int lastRow = importUtil.getLastDataRowNum();
         List<ReserveSummary> list = new ArrayList<ReserveSummary>();
-        //网格编号唯一性判断
-//        List<String> wgList = new ArrayList<>();
-        //单元格编号唯一性判断
-//        List<String> dygList = new ArrayList<>();
+
         //项目储备编号唯一性判断
         List<String> cbbhList = new ArrayList<>();
-        //项目名称唯一性判断
-        List<String> nameList = new ArrayList<>();
-        //建设必要性及内容
-        List<String> jsList = new ArrayList<>();
+
         ReserveSummary reserveManagement = null;
         for(int i=2; i<=lastRow;i++){
             reserveManagement = new ReserveSummary();
             Row row = importUtil.getRow(i);
-            //储备人员流转信息
-            Row cbRow = importUtil.getRow(3);
-            String reserveProjectName = (String) importUtil.getCellValue(row,0);
+
             //获取项目储备编号
             String projectReserveId = (String) importUtil.getCellValue(row, 10);
-            if(StringUtils.isNotBlank(reserveProjectName) ) {
-                if(StringUtils.isNotBlank(projectReserveId)){
-
-                    reserveManagement.setProjectYear((String) importUtil.getCellValue(row,1));
-                    reserveManagement.setProjectNature((String) importUtil.getCellValue(row,2));
-                    reserveManagement.setDemandUnit((String) importUtil.getCellValue(row,3));
-                    reserveManagement.setDistrict((String) importUtil.getCellValue(row,4));
-                    reserveManagement.setProjectGroup((String) importUtil.getCellValue(row,5));
-                    reserveManagement.setReserveBatches((String) importUtil.getCellValue(row,7));
-                    reserveManagement.setBlockSupply((String) importUtil.getCellValue(row,8));
-                    reserveManagement.setGridNumber((String) importUtil.getCellValue(row,9));
-
-                    reserveManagement.setCellNumber((String) importUtil.getCellValue(row,10));
-
-                    reserveManagement.setProjectReserveId((String) importUtil.getCellValue(row,11));
-
-                    reserveManagement.setProjectName((String) importUtil.getCellValue(row,12));
-
-                    reserveManagement.setConstructionNecessityAndContent((String) importUtil.getCellValue(row,13));
-
-                    reserveManagement.setSubstationName((String) importUtil.getCellValue(row,14));
-                    reserveManagement.setCircuitName((String) importUtil.getCellValue(row,15));
-                    reserveManagement.setNetRackProjectDivide((String) importUtil.getCellValue(row,16));
-                    reserveManagement.setRequirementType((String) importUtil.getCellValue(row,17));
-
-                    String costEstimateStr = importUtil.getCellValue(row,19).toString();
-                    if(StringUtils.isNotBlank(costEstimateStr)){
-                        reserveManagement.setCostEstimate(costEstimateStr);
-                    }
-                    reserveManagement.setBasicRemarks((String) importUtil.getCellValue(row,23));
-                    reserveManagement.setReserveProgress((String) importUtil.getCellValue(row,24));
-                    reserveManagement.setIncludeReserve((String) importUtil.getCellValue(row,25));
-                    reserveManagement.setMajorProblemClassification((String) importUtil.getCellValue(row,26));
-                    reserveManagement.setProblemDescription((String) importUtil.getCellValue(row,27));
-                    reserveManagement.setChangePlan((String) importUtil.getCellValue(row,28));
-                    reserveManagement.setProgramChangeDescription((String) importUtil.getCellValue(row,29));
-                    reserveManagement.setCancelConfirmationDepartment((String) importUtil.getCellValue(row,32));
-                    reserveManagement.setTruthRemark((String) importUtil.getCellValue(row,33));
-                    reserveManagement.setDemandUnitPriority((String) importUtil.getCellValue(row,34));
-                    reserveManagement.setImplementPlan((String) importUtil.getCellValue(row,35));
-                    reserveManagement.setInitialImplementBatch((String) importUtil.getCellValue(row,36));
-                    reserveManagement.setPreliminaryConstructionUnit((String) importUtil.getCellValue(row,37));
-                    reserveManagement.setPreliminaryConstructionUnitProjectManager((String) importUtil.getCellValue(row,38));
-                    reserveManagement.setHandConstructionSketches((String) importUtil.getCellValue(row,39));
-
-                    /*if (list.size() == 0){
+            if(StringUtils.isNotBlank(projectReserveId)){
+
+                reserveManagement.setProjectReserveId((String) importUtil.getCellValue(row,11));
+
+                reserveManagement.setIncludeReserve((String) importUtil.getCellValue(row,25));
+                reserveManagement.setMajorProblemClassification((String) importUtil.getCellValue(row,26));
+                reserveManagement.setProblemDescription((String) importUtil.getCellValue(row,27));
+                reserveManagement.setChangePlan((String) importUtil.getCellValue(row,28));
+                reserveManagement.setProgramChangeDescription((String) importUtil.getCellValue(row,29));
+                reserveManagement.setCancelConfirmationDepartment((String) importUtil.getCellValue(row,32));
+                reserveManagement.setTruthRemark((String) importUtil.getCellValue(row,33));
+                reserveManagement.setDemandUnitPriority((String) importUtil.getCellValue(row,34));
+                reserveManagement.setImplementPlan((String) importUtil.getCellValue(row,35));
+                reserveManagement.setInitialImplementBatch((String) importUtil.getCellValue(row,36));
+                reserveManagement.setPreliminaryConstructionUnit((String) importUtil.getCellValue(row,37));
+                reserveManagement.setPreliminaryConstructionUnitProjectManager((String) importUtil.getCellValue(row,38));
+                reserveManagement.setHandConstructionSketches((String) importUtil.getCellValue(row,39));
+
+                if (list.size() == 0){
+                    list.add(reserveManagement);
+                    cbbhList.add(reserveManagement.getProjectReserveId());
+                }else {
+                    if (!cbbhList.contains(reserveManagement.getProjectReserveId())){
                         list.add(reserveManagement);
                         cbbhList.add(reserveManagement.getProjectReserveId());
-                    }else {
-                        if (!cbbhList.contains(reserveManagement.getProjectReserveId())){
-                            list.add(reserveManagement);
-                            cbbhList.add(reserveManagement.getProjectReserveId());
-                        }
-                    }*/
-
-                    if (list.size() == 0){
-                        list.add(reserveManagement);
-                        /*wgList.add(reserveManagement.getGridNumber());
-                        dygList.add(reserveManagement.getCellNumber());*/
-                        cbbhList.add(reserveManagement.getProjectReserveId());
-                        nameList.add(reserveManagement.getProjectName());
-                        jsList.add(reserveManagement.getConstructionNecessityAndContent());
-                    }else {
-                        if (/*!wgList.contains(reserveManagement.getGridNumber())
-                                & !dygList.contains(reserveManagement.getCellNumber())
-                                &*/ !cbbhList.contains(reserveManagement.getProjectReserveId())
-                                & !nameList.contains(reserveManagement.getProjectName())
-                                & ! jsList.contains(reserveManagement.getConstructionNecessityAndContent())){
-                            list.add(reserveManagement);
-                            /*wgList.add(reserveManagement.getGridNumber());
-                            dygList.add(reserveManagement.getCellNumber());*/
-                            cbbhList.add(reserveManagement.getProjectReserveId());
-                            nameList.add(reserveManagement.getProjectName());
-                            jsList.add(reserveManagement.getConstructionNecessityAndContent());
-                        }
                     }
-
                 }
+
             }
         }
         return list;

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

@@ -0,0 +1,51 @@
+package com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.utils;
+
+import org.springframework.stereotype.Component;
+import redis.clients.jedis.Jedis;
+import redis.clients.jedis.JedisPool;
+import redis.clients.jedis.JedisPoolConfig;
+
+/**
+ * redis工具类
+ * @author: 王强
+ * @create: 2022-08-26 10:05
+ **/
+@Component
+public class ReserveRedisUtils {
+
+    private static String ip = "localhost";
+    private static int port = 6379;
+    private static int timeout = 10000;
+    private static JedisPool pool = null;
+
+    static {
+        JedisPoolConfig config = new JedisPoolConfig();
+        //设置最大空闲数
+        config.setMaxIdle(200);
+        //设置最大连接数
+        config.setMaxTotal(1024);
+        //等待池连接最长时间
+        config.setMaxWaitMillis(10000);
+        //是否提前validate操作
+        config.setTestOnBorrow(true);
+
+
+        pool = new JedisPool(config,ip,port,timeout);
+    }
+
+    //得到redis连接
+    public static Jedis getJedis(){
+        if (pool == null){
+            return null;
+        }
+        return pool.getResource();
+    }
+
+    //关闭redis连接
+    public static void close(Jedis redis){
+        if (redis != null){
+            redis.close();
+        }
+    }
+
+}

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

@@ -0,0 +1,70 @@
+package com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.utils;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.util.ArrayList;
+import java.util.List;
+
+
+import static com.alibaba.fastjson.util.IOUtils.close;
+/**
+ * list序=序列化工具类
+ * @author: 王强
+ * @create: 2022-08-26 10:22
+ **/
+public class SerializableUtilsList {
+
+    /*序列化list集合*/
+    public static byte[] serializeList(List<?> list){
+        if (list == null || list.size() == 0){
+            return null;
+        }
+        ObjectOutputStream oos = null;
+        ByteArrayOutputStream baos = null;
+        byte[] bytes = null;
+        try {
+            baos = new ByteArrayOutputStream();
+            oos = new ObjectOutputStream(baos);
+            for (Object o : list) {
+                oos.writeObject(o);
+            }
+            bytes = baos.toByteArray();
+        }catch (Exception e){
+            e.printStackTrace();
+        }finally {
+            close(oos);
+            close(baos);
+        }
+        return bytes;
+    }
+
+    /*反序列化list集合*/
+    public static List<?> usSerializeList(byte[] bytes){
+        if (bytes == null) {
+            return null;
+        }
+        List<Object> list = new ArrayList<>();
+        ByteArrayInputStream bais = null;
+        ObjectInputStream ois = null;
+        try {
+            bais = new ByteArrayInputStream(bytes);
+            ois = new ObjectInputStream(bais);
+            /*剩余可读字节数*/
+            while (bais.available() >0){
+                Object object = ois.readObject();
+                if (object == null) {
+                    break;
+                }
+                list.add(object);
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+        }finally {
+            close(bais);
+            close(ois);
+        }
+        return list;
+    }
+}

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

@@ -4,12 +4,11 @@ import com.jeeplus.common.json.AjaxJson;
 import com.jeeplus.common.utils.StringUtils;
 import com.jeeplus.core.persistence.Page;
 import com.jeeplus.core.web.BaseController;
-
 import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.entity.ReservePolicyHand;
 import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.service.PolicyHandingService;
-import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.service.ReservePreconstructService;
 import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.utils.ReserveProcessProjectExportUtil;
 import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.utils.ReserveProcessProjectProUtil;
+import com.jeeplus.modules.cg.reservemanagementcenter.statisticalTable.entity.History;
 import com.jeeplus.modules.sg.managementcenter.materialproject.util.ImportUtil;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.apache.shiro.authz.annotation.Logical;
@@ -25,6 +24,7 @@ import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -82,6 +82,26 @@ public class PolicyHandingController extends BaseController {
     public Map<String, Object> basicData(ReservePolicyHand reserveManagement, HttpServletRequest request, HttpServletResponse response, Model model) {
 
         Page<ReservePolicyHand> page = handingService.findPage(new Page<ReservePolicyHand>(request, response), reserveManagement);
+        List<ReservePolicyHand> list = page.getList();
+        List<ReservePolicyHand> handList = new ArrayList<>();
+
+        for (ReservePolicyHand hand : list) {
+            //根据projectReserveId查出流程表的proc_ins_id
+            String procInsId = handingService.getByProjectReserveId(hand.getProjectReserveId());
+            //根据procInsId查出历史流程名称和时间
+            List<History> histories = handingService.getHistoryByExecuteId(procInsId);
+            //当size>0时待办有历史流程，
+            if (histories.size()>0){
+                //根据proc_ins_id去运行时任务节点表（act_ru_task）中查出当前流程名称
+                String name = handingService.getByExecuteId(procInsId);
+                //设置项目进度
+                hand.setReserveProgress(name);
+            }else {
+                hand.setReserveProgress("");
+            }
+            handList.add(hand);
+        }
+
         return getBootstrapData(page);
     }
 
@@ -197,16 +217,36 @@ public class PolicyHandingController extends BaseController {
     @RequestMapping(value = "export")
     public void exportExcel(ReservePolicyHand reserveManagement, HttpServletRequest request, HttpServletResponse response) {
         List<ReservePolicyHand> list = handingService.exportFindList(reserveManagement);
+
+        List<ReservePolicyHand> handList = new ArrayList<>();
+
+        for (ReservePolicyHand hand : list) {
+            //根据projectReserveId查出流程表的proc_ins_id
+            String procInsId = handingService.getByProjectReserveId(hand.getProjectReserveId());
+            //根据procInsId查出历史流程名称和时间
+            List<History> histories = handingService.getHistoryByExecuteId(procInsId);
+            //当size>0时待办有历史流程，
+            if (histories.size()>0){
+                //根据proc_ins_id去运行时任务节点表（act_ru_task）中查出当前流程名称
+                String name = handingService.getByExecuteId(procInsId);
+                //设置项目进度
+                hand.setReserveProgress(name);
+            }else {
+                hand.setReserveProgress("");
+            }
+            handList.add(hand);
+        }
+
         //生成序列号
         int i = 1;
-        for (ReservePolicyHand s : list) {
+        for (ReservePolicyHand s : handList) {
             s.setId(String.valueOf(i));
             i++;
         }
 
         ReserveProcessProjectExportUtil util = ReserveProcessProjectExportUtil.getOne();
         XSSFWorkbook workbook = util.getWorkbook("policyHanding");
-        util.exportPolicy(response,workbook,list);
+        util.exportPolicy(response,workbook,handList);
     }
 
 
@@ -219,6 +259,19 @@ public class PolicyHandingController extends BaseController {
     @RequiresPermissions(value={"cg:reservemanagementcenter:policyHanding:add","cg:reservemanagementcenter:policyHanding:edit"},logical= Logical.OR)
     @RequestMapping(value = "form")
     public String form(ReservePolicyHand reserveManagement, Model model) {
+        //根据projectReserveId查出流程表的proc_ins_id
+        String procInsId = handingService.getByProjectReserveId(reserveManagement.getProjectReserveId());
+        //根据procInsId查出历史流程名称和时间
+        List<History> histories = handingService.getHistoryByExecuteId(procInsId);
+        //当size>0时待办有历史流程，
+        if (histories.size()>0){
+            //根据proc_ins_id去运行时任务节点表（act_ru_task）中查出当前流程名称
+            String name = handingService.getByExecuteId(procInsId);
+            //设置项目进度
+            reserveManagement.setReserveProgress(name);
+        }else {
+            reserveManagement.setReserveProgress("");
+        }
         model.addAttribute("reserveManagement", reserveManagement);
         //判断id是否为空 如果未空则为新增 否则为修改
         if(StringUtils.isBlank(reserveManagement.getId())){

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

@@ -9,22 +9,26 @@ import com.jeeplus.core.persistence.Page;
 import com.jeeplus.core.web.BaseController;
 import com.jeeplus.modules.act.entity.Act;
 import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.entity.Demolite;
-import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.entity.MaterialSupply;
 import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.entity.ReserveSummaryProcess;
 import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.service.DemoliteService;
 import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.service.FeedBackBudgetService;
 import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.service.MaterialSupplyService;
 import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.service.ReserveSummaryProcessService;
+import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.utils.DataList;
 import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.utils.ReserveProcessProjectProUtil;
 import com.jeeplus.modules.sg.managementcenter.materialinfo.entity.MaterialInfo;
 import com.jeeplus.modules.sg.managementcenter.materialproject.util.ImportUtil;
 import com.jeeplus.modules.sg.managementcenter.reserveManagement.entity.ReserveProcess;
+import com.jeeplus.modules.sg.picking.activiti.entity.ShowList;
 import com.jeeplus.modules.sg.raiseCapital.service.RaiseCapitalService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.mock.web.MockMultipartFile;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
@@ -34,6 +38,7 @@ import java.io.FileInputStream;
 import java.io.InputStream;
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -155,7 +160,7 @@ public class ProcessController extends BaseController {
      * */
     @ResponseBody
     @RequestMapping(value = "actDesignUnit")
-    public AjaxJson actDesignUnit(Act act, ReserveSummaryProcess reserveProcess) throws Exception {
+    public AjaxJson actDesignUnit(Act act, ReserveSummaryProcess reserveProcess,String material,String drjgc) throws Exception {
         AjaxJson j = new AjaxJson();
         if (reserveProcess.getDemolition() != null) {
             //在将拆旧清册数据存入数据库前先查出库中有没有这个project ReserveId的相关数据
@@ -177,18 +182,44 @@ public class ProcessController extends BaseController {
             //将数据存入数据库
             demoliteService.insertList(reserveManagementList);
         }
+
         String flag = act.getFlag();
         try {
             String comment = URLDecoder.decode(act.getComment(), "UTF-8");
             act.setComment(comment);
             if ("yes".equals(flag)) {
-                //通过流程流程定义号查询项目编码，查询是否存在甲供材信息
-                Integer materialData = reserveProcessService.findMaterialData(act.getProcInsId());
-                if (materialData <= 0) {
+
+                //从redis中查看是否有在线开甲供材数据
+                List<?> list = DataList.getList(reserveProcess.getProjectReserveId());
+                List<MaterialInfo> infoList = new ArrayList<>();
+                ShowList showList = null;
+                MaterialInfo info = null;
+                if ("".equals(drjgc) & "".equals(material)) {
                     j.setMsg("该项目没有甲供材清册");
                     j.setSuccess(false);
                     return j;
-                } else {
+                }else if ("".equals(drjgc) & !"".equals(material)){
+                    //将redis中的数据存入数据库   cg_material_data
+                    for (int i=0;i<list.size();i++){
+                        showList = (ShowList) list.get(i);
+                        info = new MaterialInfo();
+                        info.setProjectName(showList.getProjectName());
+                        info.setMaterialCode(showList.getMaterialCode());
+                        info.setMaterialName(showList.getMaterialDescription());
+                        info.setExtendDescription(showList.getExtensionDescription());
+                        info.setUnit(showList.getMdUnits());
+                        info.setTotalCount(showList.getMdTotalAmount());
+                        info.setWeightKg(showList.getMdSingleWeight());
+                        info.setWeightTon(showList.getMdTotalWeight());
+                        info.setSupplyType(showList.getMdTheParty());
+                        info.setNote(showList.getMdText());
+                        infoList.add(info);
+                    }
+                    reserveProcessService.saveList(infoList);
+                    //修改项目设计单位上传文件部分
+                    reserveProcessService.updateDesign(reserveProcess);
+                    reserveProcessService.actDesignUnit(act, reserveProcess);
+                }else {
                     //修改项目设计单位上传文件部分
                     reserveProcessService.updateDesign(reserveProcess);
                     reserveProcessService.actDesignUnit(act, reserveProcess);
@@ -326,7 +357,13 @@ public class ProcessController extends BaseController {
 
     @ResponseBody
     @RequestMapping(value = "saveJgc")
-    public void saveJgc(@RequestBody List<MaterialSupply> materialSupplyList){
-        materialSupplyService.insertList(materialSupplyList);
+    public void saveJgc(){
+        System.out.println("测试");
+    }
+
+    @ResponseBody
+    @RequestMapping(value = "getJgcOnLine")
+    public void getJgcOnLine(String projectName){
+        System.out.println("测试");
     }
 }

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

@@ -5,13 +5,11 @@ import com.jeeplus.common.utils.StringUtils;
 import com.jeeplus.core.persistence.Page;
 import com.jeeplus.core.web.BaseController;
 import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.entity.ReserveElectricityWork;
-import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.entity.ReserveProcessProject;
 import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.service.ReserveElectricityWorkService;
-import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.service.ReserveProcessProjectService;
 import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.utils.ReserveProcessProjectExportUtil;
 import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.utils.ReserveProcessProjectProUtil;
+import com.jeeplus.modules.cg.reservemanagementcenter.statisticalTable.entity.History;
 import com.jeeplus.modules.sg.managementcenter.materialproject.util.ImportUtil;
-import com.jeeplus.modules.sg.managementcenter.reserveManagement.service.ReserveManagementService;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.apache.shiro.authz.annotation.Logical;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -26,6 +24,7 @@ import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -83,6 +82,25 @@ public class ReserveElectricityWorkController extends BaseController {
     public Map<String, Object> basicData(ReserveElectricityWork reserveManagement, HttpServletRequest request, HttpServletResponse response, Model model) {
 
         Page<ReserveElectricityWork> page = workService.findPage(new Page<ReserveElectricityWork>(request, response), reserveManagement);
+        List<ReserveElectricityWork> list = page.getList();
+        List<ReserveElectricityWork> workList = new ArrayList<>();
+        for (ReserveElectricityWork work : list) {
+            //根据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);
+            }else {
+                work.setReserveProgress("");
+            }
+            workList.add(work);
+        }
+        page.setList(workList);
         return getBootstrapData(page);
     }
 
@@ -198,16 +216,35 @@ public class ReserveElectricityWorkController extends BaseController {
     @RequestMapping(value = "export")
     public void exportExcel(ReserveElectricityWork reserveManagement, HttpServletRequest request, HttpServletResponse response) {
         List<ReserveElectricityWork> list = workService.exportFindList(reserveManagement);
+
+        List<ReserveElectricityWork> workList = new ArrayList<>();
+        for (ReserveElectricityWork work : list) {
+            //根据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);
+            }else {
+                work.setReserveProgress("");
+            }
+            workList.add(work);
+        }
+
         //生成序列号
         int i = 1;
-        for (ReserveElectricityWork s : list) {
+        for (ReserveElectricityWork s : workList) {
             s.setId(String.valueOf(i));
             i++;
         }
 
         ReserveProcessProjectExportUtil util = ReserveProcessProjectExportUtil.getOne();
         XSSFWorkbook workbook = util.getWorkbook("electricityWork");
-        util.exportElectricityWork(response,workbook,list);
+        util.exportElectricityWork(response,workbook,workList);
     }
 
 
@@ -220,6 +257,19 @@ public class ReserveElectricityWorkController extends BaseController {
     @RequiresPermissions(value={"cg:reservemanagementcenter:reserveElectricityWork:add","cg:reservemanagementcenter:reserveElectricityWork:edit"},logical= Logical.OR)
     @RequestMapping(value = "form")
     public String form(ReserveElectricityWork reserveManagement, Model model) {
+        //根据projectReserveId查出流程表的proc_ins_id
+        String procInsId = workService.getByProjectReserveId(reserveManagement.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);
+            //设置项目进度
+            reserveManagement.setReserveProgress(name);
+        }else {
+            reserveManagement.setReserveProgress("");
+        }
         model.addAttribute("reserveManagement", reserveManagement);
         //判断id是否为空 如果未空则为新增 否则为修改
         if(StringUtils.isBlank(reserveManagement.getId())){

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

@@ -8,6 +8,7 @@ import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.entity.Reser
 import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.service.ReservePreconstructService;
 import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.utils.ReserveProcessProjectExportUtil;
 import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.utils.ReserveProcessProjectProUtil;
+import com.jeeplus.modules.cg.reservemanagementcenter.statisticalTable.entity.History;
 import com.jeeplus.modules.sg.managementcenter.materialproject.util.ImportUtil;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.apache.shiro.authz.annotation.Logical;
@@ -23,6 +24,7 @@ import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -80,6 +82,24 @@ public class ReservePreconstructController extends BaseController {
     public Map<String, Object> basicData(ReservePreconstruction reserveManagement, HttpServletRequest request, HttpServletResponse response, Model model) {
 
         Page<ReservePreconstruction> page = structService.findPage(new Page<ReservePreconstruction>(request, response), reserveManagement);
+        List<ReservePreconstruction> list = page.getList();
+        List<ReservePreconstruction> preList = new ArrayList<>();
+        for (ReservePreconstruction pre : list) {
+
+            //根据projectReserveId查出流程表的proc_ins_id
+            String procInsId = structService.getByProjectReserveId(pre.getProjectReserveId());
+            //根据procInsId查出历史流程名称和时间
+            List<History> histories = structService.getHistoryByExecuteId(procInsId);
+            //当size>0时待办有历史流程，
+            if (histories.size()>0){
+                //根据proc_ins_id去运行时任务节点表（act_ru_task）中查出当前流程名称
+                String name = structService.getByExecuteId(procInsId);
+                //设置项目进度
+                pre.setReserveProgress(name);
+            }
+            preList.add(pre);
+        }
+
         return getBootstrapData(page);
     }
 
@@ -195,16 +215,36 @@ public class ReservePreconstructController extends BaseController {
     @RequestMapping(value = "export")
     public void exportExcel(ReservePreconstruction reserveManagement, HttpServletRequest request, HttpServletResponse response) {
         List<ReservePreconstruction> list = structService.exportFindList(reserveManagement);
+
+        List<ReservePreconstruction> preList = new ArrayList<>();
+        for (ReservePreconstruction pre : list) {
+
+            //根据projectReserveId查出流程表的proc_ins_id
+            String procInsId = structService.getByProjectReserveId(pre.getProjectReserveId());
+            //根据procInsId查出历史流程名称和时间
+            List<History> histories = structService.getHistoryByExecuteId(procInsId);
+            //当size>0时待办有历史流程，
+            if (histories.size()>0){
+                //根据proc_ins_id去运行时任务节点表（act_ru_task）中查出当前流程名称
+                String name = structService.getByExecuteId(procInsId);
+                //设置项目进度
+                pre.setReserveProgress(name);
+            }else {
+                pre.setReserveProgress("");
+            }
+            preList.add(pre);
+        }
+
         //生成序列号
         int i = 1;
-        for (ReservePreconstruction s : list) {
+        for (ReservePreconstruction s : preList) {
             s.setId(String.valueOf(i));
             i++;
         }
 
         ReserveProcessProjectExportUtil util = ReserveProcessProjectExportUtil.getOne();
         XSSFWorkbook workbook = util.getWorkbook("preconstruct");
-        util.exportPrecons(response,workbook,list);
+        util.exportPrecons(response,workbook,preList);
     }
 
 
@@ -217,6 +257,19 @@ public class ReservePreconstructController extends BaseController {
     @RequiresPermissions(value={"cg:reservemanagementcenter:reservePreconstruct:add","cg:reservemanagementcenter:reservePreconstruct:edit"},logical= Logical.OR)
     @RequestMapping(value = "form")
     public String form(ReservePreconstruction reserveManagement, Model model) {
+        //根据projectReserveId查出流程表的proc_ins_id
+        String procInsId = structService.getByProjectReserveId(reserveManagement.getProjectReserveId());
+        //根据procInsId查出历史流程名称和时间
+        List<History> histories = structService.getHistoryByExecuteId(procInsId);
+        //当size>0时待办有历史流程，
+        if (histories.size()>0){
+            //根据proc_ins_id去运行时任务节点表（act_ru_task）中查出当前流程名称
+            String name = structService.getByExecuteId(procInsId);
+            //设置项目进度
+            reserveManagement.setReserveProgress(name);
+        }else {
+            reserveManagement.setReserveProgress("");
+        }
         model.addAttribute("reserveManagement", reserveManagement);
         //判断id是否为空 如果未空则为新增 否则为修改
         if(StringUtils.isBlank(reserveManagement.getId())){

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

@@ -5,10 +5,10 @@ import com.jeeplus.common.utils.StringUtils;
 import com.jeeplus.core.persistence.Page;
 import com.jeeplus.core.web.BaseController;
 import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.entity.ReserveSafety;
-import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.service.ReserveElectricityWorkService;
 import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.service.ReserveSafeDisclosureService;
 import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.utils.ReserveProcessProjectExportUtil;
 import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.utils.ReserveProcessProjectProUtil;
+import com.jeeplus.modules.cg.reservemanagementcenter.statisticalTable.entity.History;
 import com.jeeplus.modules.sg.managementcenter.materialproject.util.ImportUtil;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.apache.shiro.authz.annotation.Logical;
@@ -24,6 +24,7 @@ import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -84,6 +85,24 @@ public class ReserveSafeDisclosureController extends BaseController {
     public Map<String, Object> basicData(ReserveSafety reserveManagement, HttpServletRequest request, HttpServletResponse response, Model model) {
 
         Page<ReserveSafety> page = safeService.findPage(new Page<ReserveSafety>(request, response), reserveManagement);
+        List<ReserveSafety> list = page.getList();
+        List<ReserveSafety> safetyList = new ArrayList<>();
+        for (ReserveSafety safety : list){
+            //根据projectReserveId查出流程表的proc_ins_id
+            String procInsId = safeService.getByProjectReserveId(safety.getProjectReserveId());
+            //根据procInsId查出历史流程名称和时间
+            List<History> histories = safeService.getHistoryByExecuteId(procInsId);
+            //当size>0时待办有历史流程，
+            if (histories.size()>0){
+                //根据proc_ins_id去运行时任务节点表（act_ru_task）中查出当前流程名称
+                String name = safeService.getByExecuteId(procInsId);
+                //设置项目进度
+                safety.setReserveProgress(name);
+            }else {
+                safety.setReserveProgress("");
+            }
+            safetyList.add(safety);
+        }
         return getBootstrapData(page);
     }
 
@@ -199,16 +218,35 @@ public class ReserveSafeDisclosureController extends BaseController {
     @RequestMapping(value = "export")
     public void exportExcel(ReserveSafety reserveManagement, HttpServletRequest request, HttpServletResponse response) {
         List<ReserveSafety> list = safeService.exportFindList(reserveManagement);
+
+        List<ReserveSafety> safetyList = new ArrayList<>();
+        for (ReserveSafety safety : list){
+            //根据projectReserveId查出流程表的proc_ins_id
+            String procInsId = safeService.getByProjectReserveId(safety.getProjectReserveId());
+            //根据procInsId查出历史流程名称和时间
+            List<History> histories = safeService.getHistoryByExecuteId(procInsId);
+            //当size>0时待办有历史流程，
+            if (histories.size()>0){
+                //根据proc_ins_id去运行时任务节点表（act_ru_task）中查出当前流程名称
+                String name = safeService.getByExecuteId(procInsId);
+                //设置项目进度
+                safety.setReserveProgress(name);
+            }else {
+                safety.setReserveProgress("");
+            }
+            safetyList.add(safety);
+        }
+
         //生成序列号
         int i = 1;
-        for (ReserveSafety s : list) {
+        for (ReserveSafety s : safetyList) {
             s.setId(String.valueOf(i));
             i++;
         }
 
         ReserveProcessProjectExportUtil util = ReserveProcessProjectExportUtil.getOne();
         XSSFWorkbook workbook = util.getWorkbook("reserveSafety");
-        util.exportSafety(response,workbook,list);
+        util.exportSafety(response,workbook,safetyList);
     }
 
 
@@ -221,6 +259,19 @@ public class ReserveSafeDisclosureController extends BaseController {
     @RequiresPermissions(value={"cg:reservemanagementcenter:reserveSafeDisclosure:add","cg:reservemanagementcenter:reserveSafeDisclosure:edit"},logical= Logical.OR)
     @RequestMapping(value = "form")
     public String form(ReserveSafety reserveManagement, Model model) {
+        //根据projectReserveId查出流程表的proc_ins_id
+        String procInsId = safeService.getByProjectReserveId(reserveManagement.getProjectReserveId());
+        //根据procInsId查出历史流程名称和时间
+        List<History> histories = safeService.getHistoryByExecuteId(procInsId);
+        //当size>0时待办有历史流程，
+        if (histories.size()>0){
+            //根据proc_ins_id去运行时任务节点表（act_ru_task）中查出当前流程名称
+            String name = safeService.getByExecuteId(procInsId);
+            //设置项目进度
+            reserveManagement.setReserveProgress(name);
+        }else {
+            reserveManagement.setReserveProgress("");
+        }
         model.addAttribute("reserveManagement", reserveManagement);
         //判断id是否为空 如果未空则为新增 否则为修改
         if(StringUtils.isBlank(reserveManagement.getId())){

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

@@ -16,6 +16,7 @@ import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.service.Rese
 import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.service.SummaryStatisticService;
 import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.utils.ReserveProcessProjectExportUtil;
 import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.utils.ReserveProcessProjectProUtil;
+import com.jeeplus.modules.cg.reservemanagementcenter.statisticalTable.entity.History;
 import com.jeeplus.modules.cg.reservemanagementcenter.statisticalTable.service.BudgetStatsService;
 import com.jeeplus.modules.sg.managementcenter.materialproject.util.ImportUtil;
 import com.jeeplus.modules.sg.managementcenter.reserveManagement.service.PersonnelTurnoverService;
@@ -35,6 +36,7 @@ import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -110,6 +112,28 @@ public class SummaryStatisticController extends BaseController {
     public Map<String, Object> basicData(ReserveSummary reserveManagement, HttpServletRequest request, HttpServletResponse response, Model model) {
 
         Page<ReserveSummary> page = statisticService.findPage(new Page<ReserveSummary>(request, response), reserveManagement);
+        List<ReserveSummary> list = page.getList();
+        List<ReserveSummary> summaryList = new ArrayList<>();
+        for (ReserveSummary summary : list) {
+
+            //根据projectReserveId查出流程表的proc_ins_id
+            String procInsId = statisticService.getByProjectReserveId(summary.getProjectReserveId());
+            //根据procInsId查出历史流程名称和时间
+            List<History> histories = statisticService.getHistoryByExecuteId(procInsId);
+            //当size>0时待办有历史流程，
+            if (histories.size()>0){
+                //根据proc_ins_id去运行时任务节点表（act_ru_task）中查出当前流程名称
+                String name = statisticService.getByExecuteId(procInsId);
+                //设置项目进度
+                summary.setReserveProgress(name);
+            }else {
+                summary.setReserveProgress("");
+            }
+
+            summaryList.add(summary);
+        }
+
+
         return getBootstrapData(page);
     }
 
@@ -261,10 +285,8 @@ public class SummaryStatisticController extends BaseController {
                         ProcessDefinition p = actProcessService.getProcessDefinition(procDefId);
                         String title = s.getCurrentUser().getName() + "在" + DateUtils.getDateTime() + "发起" + p.getName();
                         actTaskService.startProcess(p.getKey(), "cg_personnel_activiti", reserveProcess.getId(), title, vars);
-                        /*int count = statsService.selectCount(reserveProcess.getProjectReserveId());
-                        if (count>0){
-                            statsService.updateStats("设计单位在线开甲供材",null,null,reserveProcess.getProjectReserveId());
-                        }*/
+                        //删除之前的甲供材数据
+                        reserveProcessService.deleteMaterial(processProject.getProjectName());
                     }
                 }
             }
@@ -290,6 +312,8 @@ public class SummaryStatisticController extends BaseController {
                         ProcessDefinition p = actProcessService.getProcessDefinition(procDefId);
                         String title = reserveManagement.getCurrentUser().getName() + "在" + DateUtils.getDateTime() + "发起" + p.getName();
                         actTaskService.startProcessNew(p.getKey(), "cg_personnel_activiti", reserveProcess.getId(), title, vars);
+                        //删除之前的甲供材数据
+                        reserveProcessService.deleteMaterial(processProject.getProjectName());
                     }
                 }
             }
@@ -310,16 +334,37 @@ public class SummaryStatisticController extends BaseController {
     @RequestMapping(value = "export")
     public void exportExcel(ReserveSummary reserveManagement, HttpServletRequest request, HttpServletResponse response) {
         List<ReserveSummary> list = statisticService.exportFindList(reserveManagement);
+
+        List<ReserveSummary> summaryList = new ArrayList<>();
+        for (ReserveSummary summary : list) {
+
+            //根据projectReserveId查出流程表的proc_ins_id
+            String procInsId = statisticService.getByProjectReserveId(summary.getProjectReserveId());
+            //根据procInsId查出历史流程名称和时间
+            List<History> histories = statisticService.getHistoryByExecuteId(procInsId);
+            //当size>0时待办有历史流程，
+            if (histories.size()>0){
+                //根据proc_ins_id去运行时任务节点表（act_ru_task）中查出当前流程名称
+                String name = statisticService.getByExecuteId(procInsId);
+                //设置项目进度
+                summary.setReserveProgress(name);
+            }else {
+                summary.setReserveProgress("");
+            }
+
+            summaryList.add(summary);
+        }
+
         //生成序列号
         int i = 1;
-        for (ReserveSummary s : list) {
+        for (ReserveSummary s : summaryList) {
             s.setId(String.valueOf(i));
             i++;
         }
 
         ReserveProcessProjectExportUtil util = ReserveProcessProjectExportUtil.getOne();
         XSSFWorkbook workbook = util.getWorkbook("summaryStatistics");
-        util.exportSummary(response,workbook,list);
+        util.exportSummary(response,workbook,summaryList);
     }
 
 
@@ -332,6 +377,20 @@ public class SummaryStatisticController extends BaseController {
     @RequiresPermissions(value={"cg:reservemanagementcenter:summaryStatistics:add","cg:reservemanagementcenter:summaryStatistics:edit"},logical= Logical.OR)
     @RequestMapping(value = "form")
     public String form(ReserveSummary reserveManagement, Model model) {
+
+        //根据projectReserveId查出流程表的proc_ins_id
+        String procInsId = statisticService.getByProjectReserveId(reserveManagement.getProjectReserveId());
+        //根据procInsId查出历史流程名称和时间
+        List<History> histories = statisticService.getHistoryByExecuteId(procInsId);
+        //当size>0时待办有历史流程，
+        if (histories.size()>0){
+            //根据proc_ins_id去运行时任务节点表（act_ru_task）中查出当前流程名称
+            String name = statisticService.getByExecuteId(procInsId);
+            //设置项目进度
+            reserveManagement.setReserveProgress(name);
+        }else {
+            reserveManagement.setReserveProgress("");
+        }
         model.addAttribute("reserveManagement", reserveManagement);
         //判断id是否为空 如果未空则为新增 否则为修改
         if(StringUtils.isBlank(reserveManagement.getId())){

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

@@ -1,27 +0,0 @@
-package com.jeeplus.modules.cg.reservemanagementcenter.statisticalTable.web;
-
-import com.jeeplus.modules.cg.reservemanagementcenter.statisticalTable.entity.NormativeAudit;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-/**
- * @author: 王强
- * @create: 2022-08-23 16:20
- **/
-@Controller
-@RequestMapping("/test")
-public class TestController {
-
-    /**
-     * 储备项目规范性审核记录表页面
-     * @param normativeAudit
-     * @param model
-     * @return
-     */
-    @RequestMapping(value = "normativeList")
-    public String normativeList(NormativeAudit normativeAudit, Model model) {
-//        model.addAttribute("normativeAudit", normativeAudit);
-        return "modules/cg/test01";
-    }
-}

src/main/java/com/jeeplus/modules/sg/managementcenter/materialinfo/entity/MaterialInfo.java

@@ -23,6 +23,11 @@ public class MaterialInfo extends DataEntity<MaterialInfo> {
     private String note;      //备注
     private String state;     //状态，与标准比对，1：相同 0：不相同
 
+    public MaterialInfo(){}
+    public MaterialInfo(String projectName,String materialCode,String materialName,String extendDescription,
+                        String unit,Double totalCount,Double weightKg,Double weightTon,String supplyType,
+                        String note){}
+
     public String[] getProjectNames() {
         return projectNames;
     }

src/main/java/com/jeeplus/modules/sg/picking/activiti/web/ShowListController.java

@@ -3,12 +3,9 @@ package com.jeeplus.modules.sg.picking.activiti.web;
 import com.jeeplus.common.json.AjaxJson;
 import com.jeeplus.core.persistence.Page;
 import com.jeeplus.core.web.BaseController;
-import com.jeeplus.modules.sg.picking.activiti.entity.PickIng;
-import com.jeeplus.modules.sg.picking.activiti.entity.PickList;
+import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.utils.DataList;
 import com.jeeplus.modules.sg.picking.activiti.entity.ShowList;
-import com.jeeplus.modules.sg.picking.activiti.service.PickIngService;
 import com.jeeplus.modules.sg.picking.activiti.service.ShowListService;
-import net.sf.ehcache.util.SetAsList;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
@@ -18,7 +15,10 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.math.BigDecimal;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
 
 @Controller
 @RequestMapping(value = "${adminPath}/picking/showlist")
@@ -242,6 +242,122 @@ public class ShowListController extends BaseController {
             showListService.trunCate(projectName);
             //将数据存入提资领料表
             showListService.replaceData(finalList);
+
+        }
+        j.setSuccess(true);
+        return j;
+    }
+
+    /**
+     * 将模块清单的数据获取计算，保存入库
+     */
+    @ResponseBody
+    @RequestMapping(value = "saveJgcData")
+    public AjaxJson saveJgcData(ShowList showList, String item,String projectName,String projectReserveId, Model model) throws Exception {
+        ArrayList<String> objects = new ArrayList<>();
+        ArrayList<String> findList = new ArrayList<>();
+        AjaxJson j = new AjaxJson();
+        //返回给页面的list
+        List<ShowList> myList = new ArrayList<>();
+        if (item != null && !"".equals(item)) {
+            String[] split = item.split(";");
+            //回显list
+            List<ShowList> returnList = new ArrayList<>();
+            for (int i = 0; i < split.length; i++) {
+                objects.add(split[i]);
+            }
+            for (String s : objects) {
+                String[] split1 = s.split(":");
+                ShowList myShow = new ShowList();
+                myShow.setId(split1[0]);
+                String s1 = split1[1];
+                myShow.setNumber(Double.parseDouble(s1));
+                findList.add(split1[0]);
+                myList.add(myShow);
+            }
+            showList.setFindList(findList);
+            //查询出来所有的模块清单数据
+            List<ShowList> list = showListService.findList(showList);
+            //前端传来选择的模块与数量
+            for (ShowList my : myList) {
+                //循环遍历
+                for (ShowList showList1 : list) {
+                    //选择的模块与查出来的一致
+                    if (my.getId().equals(showList1.getBlockId())) {
+                        Double mdSingleWeight = showList1.getMdSingleWeight();
+                        Double number = my.getNumber();
+                        Double mdCount = showList1.getMdCount();
+                        Double i = mdSingleWeight * number;
+                        BigDecimal b1 = new BigDecimal(Double.toString(number));
+                        BigDecimal b2 = new BigDecimal(Double.toString(mdCount));
+                        double v = b1.multiply(b2).doubleValue();
+                        ShowList newShowList = new ShowList();
+                        newShowList.setMaterialCode(showList1.getMaterialCode());
+                        newShowList.setMaterialDescription(showList1.getMaterialDescription());
+                        newShowList.setExtensionDescription(showList1.getExtensionDescription());
+                        newShowList.setMdUnits(showList1.getMdUnits());
+                        newShowList.setMdTheParty(showList1.getMdTheParty());
+                        newShowList.setMdText(showList1.getMdText());
+                        newShowList.setMdTotalAmount(v);
+                        newShowList.setMdSingleWeight(showList1.getMdSingleWeight());
+                        BigDecimal b = new BigDecimal(i);
+                        BigDecimal a = new BigDecimal(1000);
+                        BigDecimal divide = b.divide(a, 4, BigDecimal.ROUND_HALF_UP);
+                        newShowList.setMdTotalWeight(Double.valueOf(divide.toString()));
+                        newShowList.setBlockId(showList1.getBlockId());
+                        returnList.add(newShowList);
+                    }
+                }
+            }
+            List<ShowList> finalList = new ArrayList<>();
+            boolean flag;
+            for (ShowList turn : returnList) {
+                flag = true;
+                for (ShowList list1 : finalList) {
+                    if (turn.getMaterialCode().equals(list1.getMaterialCode()) && turn.getMaterialDescription().equals(list1.getMaterialDescription()) && turn.getExtensionDescription().equals(list1.getExtensionDescription())) {
+                        Double mdTotalAmount = list1.getMdTotalAmount();
+                        Double mdTotalAmount1 = turn.getMdTotalAmount();
+                        BigDecimal b1 = new BigDecimal(Double.toString(mdTotalAmount));
+                        BigDecimal b2 = new BigDecimal(Double.toString(mdTotalAmount1));
+                        double v = b1.add(b2).doubleValue();
+                        Double mdTotalWeight = list1.getMdTotalWeight();
+                        Double mdTotalWeight1 = turn.getMdTotalWeight();
+                        BigDecimal a1 = new BigDecimal(Double.toString(mdTotalWeight));
+                        BigDecimal a2 = new BigDecimal(Double.toString(mdTotalWeight1));
+                        double b = a1.add(a2).doubleValue();
+                        list1.setMdTotalAmount(v);
+                        list1.setMdTotalWeight(b);
+                        flag = false;
+                        break;
+                    }
+                }
+                if (flag) {
+                    showList = new ShowList();
+                    showList.setMaterialCode(turn.getMaterialCode());
+                    showList.setMaterialDescription(turn.getMaterialDescription());
+                    showList.setExtensionDescription(turn.getExtensionDescription());
+                    showList.setMdUnits(turn.getMdUnits());
+                    showList.setMdTheParty(turn.getMdTheParty());
+                    showList.setMdText(turn.getMdText());
+                    showList.setMdTotalAmount(turn.getMdTotalAmount());
+                    showList.setMdSingleWeight(turn.getMdSingleWeight());
+                    showList.setMdTotalWeight(turn.getMdTotalWeight());
+                    showList.setBlockId(turn.getBlockId());
+                    finalList.add(showList);
+                }
+            }
+            for (ShowList l :
+                    finalList) {
+                l.setProjectName(projectName);
+            }
+            showListService.trunCate(projectName);
+            //将数据存入提资领料表
+            showListService.replaceData(finalList);
+            //将数据放入redis
+            if (projectReserveId != null){
+                DataList.setList(projectReserveId,finalList);
+            }
+
         }
         j.setSuccess(true);
         return j;

src/main/java/com/jeeplus/modules/sg/raiseCapital/web/RaiseCapitalController.java

@@ -3,10 +3,8 @@
  */
 package com.jeeplus.modules.sg.raiseCapital.web;
 
-import com.alibaba.fastjson.JSON;
 import com.google.common.collect.Lists;
 import com.jeeplus.common.json.AjaxJson;
-import com.jeeplus.common.utils.DateUtils;
 import com.jeeplus.common.utils.StringUtils;
 import com.jeeplus.common.utils.excel.ExportExcel;
 import com.jeeplus.common.utils.excel.ImportExcel;
@@ -14,7 +12,6 @@ import com.jeeplus.core.persistence.Page;
 import com.jeeplus.core.web.BaseController;
 import com.jeeplus.modules.sg.financial.erpcredit.util.Result;
 import com.jeeplus.modules.sg.financial.erpcredit.util.SerializeUtil;
-import com.jeeplus.modules.sg.picking.activiti.entity.PickIng;
 import com.jeeplus.modules.sg.picking.activiti.entity.PickList;
 import com.jeeplus.modules.sg.picking.activiti.entity.ShowList;
 import com.jeeplus.modules.sg.picking.activiti.service.PickIngService;
@@ -26,7 +23,6 @@ import net.oschina.j2cache.CacheChannel;
 import net.oschina.j2cache.J2Cache;
 import net.oschina.j2cache.redis.RedisCacheProvider;
 import net.oschina.j2cache.redis.RedisClient;
-import net.oschina.j2cache.redis.RedisUtils;
 import org.apache.shiro.authz.annotation.Logical;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -37,15 +33,14 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.multipart.MultipartFile;
-import redis.clients.jedis.Jedis;
 
-import javax.json.Json;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
 import javax.validation.ConstraintViolationException;
-import java.math.BigDecimal;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 提资模块Controller
@@ -100,6 +95,7 @@ public class RaiseCapitalController extends BaseController {
 		model.addAttribute("pickListList", pickListList);
 		model.addAttribute("raiseCapital", raiseCapital);
 		model.addAttribute("projectName", projectName);
+		model.addAttribute("projectReserveId", projectReserveId);
 		return "modules/cg/reservemanagementcenter/raiseCapital/raiseCapital";
 	}
 

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

@@ -268,6 +268,8 @@
         });
         $("#qd").click("click", function () {
             let projectName = $("#projectName").val();
+            let projectReserveId = $("#projectReserveId").val();
+
             var item = "";
             $('input[name="need"]').each(function () {
                 var val = $(this).val();
@@ -284,10 +286,11 @@
                 $("#div1").attr("style", "display:none;");
                 $("#div2").attr("style", "display:block;");
                 $("#div3").attr("style", "display:none;");
-                jp.post("${ctx}/picking/showlist/saveData",
+                jp.post("${ctx}/picking/showlist/saveJgcData",
                     {
                         "item": item,
-                        "projectName": projectName
+                        "projectName": projectName,
+                        "projectReserveId": projectReserveId,
                     },
                     function (data) {
                         // console.log(projectName);

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

@@ -47,7 +47,9 @@
 			</div>
 			<!-- 表格 -->
 			<div id="div1">
-				<input type="hidden" id="projectName" value="${projectName}}">
+				<input type="hidden" id="projectName" value="${projectName}">
+				<input type="hidden" id="projectReserveId" value="${projectReserveId}">
+
 				<%--<table class="table table-bordered">
 					<tbody>
 					<tr>

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

@@ -77,48 +77,48 @@
 		<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" htmlEscape="false"  readonly="true" 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" htmlEscape="false"  readonly="true" class="form-control"/>
 			</td>
 
 		</tr>
 		<tr>
 			<td class="width-15 active"><label class="">需求单位：</label></td>
 			<td class="width-35">
-				<form:input path="demandUnit" htmlEscape="false"    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>
@@ -130,41 +130,41 @@
 		<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" rows="3" maxlength="200" readonly="true" class="form-control"/>
 			</td>
 		</tr>
 		<tr>
@@ -173,17 +173,17 @@
 		<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="intendBatch" htmlEscape="false" class="form-control"/>
+				<form:input path="intendBatch" htmlEscape="false" readonly="true" class="form-control"/>
 			</td>
 		</tr>
 		<tr>

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

@@ -81,48 +81,48 @@
 		<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" htmlEscape="false" readonly="true" 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" htmlEscape="false" readonly="true" class="form-control"/>
 			</td>
 
 		</tr>
 		<tr>
 			<td class="width-15 active"><label class="">需求单位：</label></td>
 			<td class="width-35">
-				<form:input path="demandUnit" htmlEscape="false"    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>
@@ -134,82 +134,83 @@
 		<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" rows="3" maxlength="200"  readonly="true"  class="form-control"/>
 			</td>
 		</tr>
-
-		<tr>
-			<td colspan="4" class="width-15 active"><label class="">带电作业信息：</label></td>
-		</tr>
 		<tr>
 			<td class="width-15 active"><label class="">储备进度：</label></td>
 			<td class="width-35">
-				<form:input path="reserveProgress" htmlEscape="false" 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" readonly="true" htmlEscape="false" class="form-control"/>
 			</td>
 		</tr>
+		<td class="width-15 active"><label class="">初定实施批次：</label></td>
+		<td class="width-35">
+			<form:input path="implementBatch" readonly="true" htmlEscape="false" class="form-control"/>
+		</td>
+
+		<tr>
+			<td colspan="4" class="width-15 active"><label class="">带电作业信息：</label></td>
+		</tr>
+
 		<tr>
-			<td class="width-15 active"><label class="">初定实施批次：</label></td>
-			<td class="width-35">
-				<form:input path="implementBatch" readonly="true" htmlEscape="false" class="form-control"/>
-			</td>
 			<td class="width-15 active"><label class="">是否变压器或打包项目：</label></td>
 			<td class="width-35">
 				<form:input path="teansFormerOrPackageProject" htmlEscape="false" class="form-control"/>
 			</td>
-		</tr>
-		<tr>
 			<td class="width-15 active"><label class="">是否打包项目：</label></td>
 			<td class="width-35">
 				<form:input path="packageProject" htmlEscape="false" class="form-control"/>
 			</td>
+		</tr>
+		<tr>
 			<td class="width-15 active"><label class="">打包项目设备数量：</label></td>
 			<td class="width-35">
 				<form:input path="packageItemQuantity" htmlEscape="false" class="form-control"/>
 			</td>
-		</tr>
-		<tr>
 			<td class="width-15 active"><label class="">设备名称：</label></td>
 			<td class="width-35">
 				<form:input path="deviceName" htmlEscape="false" class="form-control"/>
 			</td>
+		</tr>
+		<tr>
 			<td class="width-15 active"><label class=""><font color="red">*</font>是否带电作业：</label></td>
 			<td class="width-35">
 				<select id="workWithElectricity" name="workWithElectricity"  class="form-control">
@@ -219,8 +220,6 @@
 				</select>
 <%--				<form:input path="workWithElectricity" htmlEscape="false" class="form-control"/>--%>
 			</td>
-		</tr>
-		<tr>
 			<td class="width-15 active"><label class="">带电作业类型编号：</label></td>
 			<td class="width-35">
 				<form:select path="electricityTypeNumber" class="form-control m-b">--%>
@@ -229,32 +228,32 @@
 								  htmlEscape="false"/>
 				</form:select>
 			</td>
+		</tr>
+		<tr>
 			<td class="width-15 active"><label class="">带电作业次数：</label></td>
 			<td class="width-35">
 				<form:input path="electricityWorkNumber" htmlEscape="false" class="form-control"/>
 			</td>
-		</tr>
-		<tr>
 			<td class="width-15 active"><label class="">不停电作业方案：</label></td>
 			<td class="width-35">
 				<form:input path="noStopWorkPlan" htmlEscape="false" class="form-control"/>
 			</td>
+		</tr>
+		<tr>
 			<td class="width-15 active"><label class="">无法不停电作业原因：</label></td>
 			<td class="width-35">
 				<form:input path="reasonsForNotWorkInterruption" htmlEscape="false" class="form-control"/>
 			</td>
-		</tr>
-		<tr>
 			<td class="width-15 active"><label class="">停电作业方案：</label></td>
 			<td class="width-35">
 				<form:input path="powerOutagePlan" htmlEscape="false" class="form-control"/>
 			</td>
+		</tr>
+		<tr>
 			<td class="width-15 active"><label class=""><font color="red">*</font>方案编制人：</label></td>
 			<td class="width-35">
 				<form:input path="planner" htmlEscape="false" class="form-control"/>
 			</td>
-		</tr>
-		<tr>
 			<td class="width-15 active"><label class=""><font color="red">*</font>现场查勘人：</label></td>
 			<td class="width-35">
 				<form:input path="siteSurveyor" htmlEscape="false" class="form-control"/>

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

@@ -71,48 +71,48 @@
 		<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" htmlEscape="false" readonly="true" 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" htmlEscape="false" readonly="true" class="form-control"/>
 			</td>
 
 		</tr>
 		<tr>
 			<td class="width-15 active"><label class="">需求单位：</label></td>
 			<td class="width-35">
-				<form:input path="demandUnit" htmlEscape="false"    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>
@@ -124,48 +124,48 @@
 		<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" rows="3" maxlength="200"  readonly="true"  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">

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

@@ -199,41 +199,87 @@ $(document).ready(function () {
                     title: '是否临近（交叉）</br>输电线路作业</br>（含土建）',
 
                 },{
+                    field: 'workDescribe',
+                    width:120,
+                    title: '输电线路作业</br>（含土建）-描述',
+
+                },
+                {
                     field: 'transmissionErection',
                     width:100,
                     title: '是否与</br>输电线路</br>同杆架设',
 
                 },
+                {
+                    field: 'erecteDescribe',
+                    width:120,
+                    title: '输电线路</br>同杆架设-描述',
 
+                },
                 {
                     field: 'transmissionCommonTrench',
                     width:80,
                     title: '是否与</br>输电线</br>路共沟',
 
                 },{
+                    field: 'trenchDescribe',
+                    width:120,
+                    title: '输电线路共沟-描述',
+
+                },
+                {
                     field: 'mediumVoltageWork',
                     width:80,
                     title: '是否临近</br>带电中压</br>线路作业',
 
                 },{
+                    field: 'voltageWorkDescribe',
+                    width:120,
+                    title: '带电中压</br>线路作业-描述',
+
+                },
+                {
                     field: 'confineSpaceWork',
                     width:80,
                     title: '是否有</br>限空间</br>作业',
 
                 },{
+                    field: 'spaceDescribe',
+                    width:120,
+                    title: '有限空间</br>作业-描述',
+
+                },
+                {
                     field: 'subStationCableBonding',
                     width:80,
                     title: '是否存在</br>变电站</br>出线电缆</br>搭接-是',
 
                 },{
+                    field: 'cableDescribe',
+                    width:120,
+                    title: '变电站</br>出线电缆</br>搭接-描述',
+
+                },
+                {
                     field: 'roadRailwaysAndWaterwaysWork',
                     width:80,
                     title: '是否存在</br>跨越公路、</br>铁路、航道</br>作业',
                 },
                 {
+                    field: 'waterDescribe',
+                    width:120,
+                    title: '跨越公路</br>铁路、航道</br>作业-描述',
+
+                },
+                {
                     field: 'hotWork',
                     width:80,
                     title: '是否存在</br>动火作业',
+                },{
+                    field: 'hotWorkDescribe',
+                    width:120,
+                    title: '动火作业-描述',
+
                 },
                 {
                     field: 'blackoutLineFour',
@@ -241,19 +287,42 @@ $(document).ready(function () {
                     title: '是否需</br>停电四条</br>以上线路',
                 },
                 {
+                    field: 'lineFourDescribe',
+                    width:120,
+                    title: '需停电四条</br>以上线路-描述',
+
+                },
+                {
                     field: 'lineLoadRedirectionThree',
                     width:80,
                     title: '是否</br>三条以上</br>线路</br>负荷改接',
                 },
                 {
+                    field: 'threeRedirectDescribe',
+                    width:120,
+                    title: '三条以上线路</br>负荷改接-描述',
+
+                },
+                {
                     field: 'largeScaleMultiTeamWork',
                     width:80,
                     title: '是否</br>多专业、</br>多班组</br>大型作业',
                 },
                 {
+                    field: 'teamWorkDescribe',
+                    width:120,
+                    title: '多专业、多班组</br>大型作业-描述',
+
+                },
+                {
                     field: 'prepareThreeMeasures',
                     width:80,
                     title: '是否需</br>编制三措',
+                },{
+                    field: 'measureDescribe',
+                    width:120,
+                    title: '需编制三措</br>大型作业-描述',
+
                 },
                 {
                     field: 'jobRiskLevelPrediction',

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

@@ -123,48 +123,48 @@
 		<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" htmlEscape="false" readonly="true" 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" htmlEscape="false" readonly="true" class="form-control"/>
 			</td>
 
 		</tr>
 		<tr>
 			<td class="width-15 active"><label class="">需求单位：</label></td>
 			<td class="width-35">
-				<form:input path="demandUnit" htmlEscape="false"    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>
@@ -176,48 +176,48 @@
 		<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" rows="3" maxlength="200" readonly="true" 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>
 		</tr>
 		<tr>

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

@@ -6,7 +6,7 @@
 	<meta name="decorator" content="ani"/>
 <%--	<%@include file="/webpage/modules/bpm/task/history/taskHistoricList.js" %>--%>
 	<script type="text/javascript">
-
+	var subVar;
 		$(document).ready(function() {
 			$('#disclosureFinishDate').datetimepicker({
 				format: "YYYY-MM-DD"
@@ -24,11 +24,17 @@
 					// console.log(projectProposal)
 					console.log(drawings)
 					// console.log(drawingSpecification)
+					var material = $("#material").val()
+					var drjgc = $("#drjgc").val()
+					console.log(material)
+					console.log(drjgc)
 
 					if (drawings == ""
 							|| drawings == undefined
 							|| drawings == 'undefined') {
-						jp.error("不能为空");
+						jp.error("施工图纸不能为空");
+					}else if (material == "" & drjgc =="" ){
+						jp.error("甲供材信息不能为空");
 					} else {
 						jp.post("${ctx}/cg/reservemanagementcenter/process/actDesignUnit",
 								{
@@ -41,6 +47,8 @@
 									"projectReserveId":projectReserveId,
 									"projectName":projectName,
 									"drawings":drawings,
+									"material":material,
+									"drjgc":drjgc,
 									"comment": window.encodeURI(message)
 								},
 								function (data) {
@@ -97,6 +105,7 @@
 							}else{
 								jp.error(data.msg);
 							}
+							document.getElementById("drjgc").value = "cs"
 						});//调用保存事件
 						return false;
 					},
@@ -117,16 +126,10 @@
 					content: "${ctx}/raiseCapital/jgcList?projectReserveId=" + projectReserveId +"&projectName=" + projectName ,
 					btn: ['确定', '关闭'],
 					btn1: function(index, layero){
+						//当确定的时候将数据查出来
 						var body = top.layer.getChildFrame('body', index);
-						var materialCode = body.find('#projectName');
-
-
-						jp.post("${ctx}/cg/reservemanagementcenter/process/saveJgc?materialCode=" + materialCode,informationTable.serialize(),function(data){
-							alert(data.msg);
-							console.log("测试")
-						});
-						console.log(informationTable)
-						// var inputForm = body.find('#inputForm');
+						var materialCode = body.find('#projectName').val();
+						document.getElementById("material").value = materialCode
 						jp.close(index);
 					},
 
@@ -136,11 +139,12 @@
 					}
 				});
 			});
-
 		});
 	</script>
 </head>
 <body class="bg-white">
+	<input id="material" type="hidden">
+	<input id="drjgc" type="hidden">
 	<div class="wrapper wrapper-content">
 		<div class="row">
 			<div class="col-md-12">

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

@@ -24,21 +24,21 @@
 
 					if (drawings == ""
 							|| drawings == undefined
-							|| drawings == 'undefined'
-							|| budgetStatement == ""
-							|| budgetStatement == undefined
-							|| budgetStatement == 'undefined'
-							|| projectProposal == ""
+							|| drawings == 'undefined'){
+						jp.error("施工图纸不能为空");
+					}else if (projectProposal == ""
 							|| projectProposal == undefined
-							|| projectProposal == 'undefined'
-							|| demolition == ""
+							|| projectProposal == 'undefined'){
+						jp.error("项目建议书不能为空");
+					}else if (demolition == ""
 							|| demolition == undefined
-							|| demolition == 'undefined'
-							|| drawingSpecification == ""
+							|| demolition == 'undefined'){
+						jp.error("拆旧清册不能为空");
+					}else if (drawingSpecification == ""
 							|| drawingSpecification == undefined
-							|| drawingSpecification == 'undefined') {
-						jp.error("不能为空");
-					} else {
+							|| drawingSpecification == 'undefined'){
+						jp.error("施工图设计说明书不能为空");
+					}else {
 						jp.post("${ctx}/cg/reservemanagementcenter/process/actDesignUnit",
 								{
 									"taskId": "${reserveProcess.act.taskId}",

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

@@ -24,20 +24,20 @@
 
 					if (drawings == ""
 							|| drawings == undefined
-							|| drawings == 'undefined'
-							|| budgetStatement == ""
-							|| budgetStatement == undefined
-							|| budgetStatement == 'undefined'
-							|| projectProposal == ""
+							|| drawings == 'undefined'){
+						jp.error("施工图纸不能为空");
+					}else if (projectProposal == ""
 							|| projectProposal == undefined
-							|| projectProposal == 'undefined'
-							|| demolition == ""
+							|| projectProposal == 'undefined'){
+						jp.error("项目建议书不能为空");
+					}else if (demolition == ""
 							|| demolition == undefined
-							|| demolition == 'undefined'
-							|| drawingSpecification == ""
+							|| demolition == 'undefined'){
+						jp.error("拆旧清册不能为空");
+					}else if (drawingSpecification == ""
 							|| drawingSpecification == undefined
-							|| drawingSpecification == 'undefined') {
-						jp.error("不能为空");
+							|| drawingSpecification == 'undefined'){
+						jp.error("施工图设计说明书不能为空");
 					} else {
 						jp.post("${ctx}/cg/reservemanagementcenter/process/actDesignUnit",
 								{

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

@@ -201,12 +201,12 @@ $(document).ready(function() {
 			$("#search-collapse").slideToggle();
 		},
 		columns: [
-			{
+			/*{
 				field: 'projectName',
 				width:230,
 				title: '项目名称'
-			}
-			,{
+			}*/
+			{
 				field: 'materialCode',
 				width:100,
 				title: '物料编码'

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

@@ -66,54 +66,54 @@
 		<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" htmlEscape="false" readonly="true" 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" htmlEscape="false" readonly="true" class="form-control"/>
 			</td>
 
 		</tr>
 		<tr>
 			<td class="width-15 active"><label class="">需求单位：</label></td>
 			<td class="width-35">
-				<form:input path="demandUnit" htmlEscape="false"    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="projectManager" readonly="true" htmlEscape="false"    class="form-control"/>
+				<form:input path="projectManager" readonly="true" htmlEscape="false"  class="form-control"/>
 			</td>
 			<td class="width-15 active"><label class="">储备批次：</label></td>
 			<td class="width-35">
-				<form:input path="reserveBatches" htmlEscape="false"    class="form-control"/>
+				<form:input path="reserveBatches" htmlEscape="false"  readonly="true"  class="form-control"/>
 			</td>
 		</tr>
 		<tr>
 			<td class="width-15 active"><label class="">供电区域：</label></td>
 			<td class="width-35">
-				<form:input path="blockSupply" htmlEscape="false"    class="form-control"/>
+				<form:input path="blockSupply" 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="gridNumber" htmlEscape="false"    class="form-control"/>
+				<form:input path="gridNumber" htmlEscape="false"  readonly="true"  class="form-control"/>
 			</td>
 		</tr>
 		<tr>
 			<td class="width-15 active"><label class=""><font color="red">*</font>单元格编号：</label></td>
 			<td class="width-35">
-				<form:input path="cellNumber" htmlEscape="false"    class="form-control"/>
+				<form:input path="cellNumber" 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">
@@ -124,61 +124,61 @@
 		<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="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-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>
 		</tr>
 		<tr>
 			<td class="width-15 active"><label class="">预算编制状态：</label></td>
 			<td class="width-35">
-				<form:input path="budgetPreparationStatus" htmlEscape="false" class="form-control number money"/>
+				<form:input path="budgetPreparationStatus" htmlEscape="false" readonly="true" class="form-control number money"/>
 			</td>
 			<td class="width-15 active"><label class="">预算含税：</label></td>
 			<td class="width-35">
-				<form:input path="budgetIncludesTax" htmlEscape="false" class="form-control number money"/>
+				<form:input path="budgetIncludesTax" htmlEscape="false" readonly="true" class="form-control number money"/>
 			</td>
 		</tr>
 		<tr>
 			<td class="width-15 active"><label class="">预算不含税：</label></td>
 			<td class="width-35">
-				<form:input path="budgetNotIncludesTax" htmlEscape="false" class="form-control number money"/>
+				<form:input path="budgetNotIncludesTax" 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>
@@ -187,7 +187,7 @@
 		<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">