储备模块（新）bug调整

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

@@ -17,6 +17,13 @@ import java.util.List;
 public interface ReserveElectricityWorkMapper extends BaseMapper<ReserveElectricityWork> {
 
     /**
+     * 从历史表中查询最近的流程的流程节点名称
+     * @param procInsId
+     * @return
+     */
+    String getHistoryName(String procInsId);
+
+    /**
      * 根据项目储备编号删除带电作业信息
      * @param projectReserveId
      */

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

@@ -76,7 +76,14 @@ public interface ReserveSummaryProcessMapper extends BaseMapper<ReserveSummaryPr
      * @param proId
      * @return
      */
-    ActRunTaskTest getByProId(String proId);
+    ActRunTaskTest getByProId(@Param("proId")String proId);
+
+    /**
+     * 根据 项目储备编号  查出设计单位节点信息
+     * @param proId
+     * @return
+     */
+    String getInfoByProId(@Param("proId")String proId);
 
     /**
      * 将ActRunTaskTest  设计单位的节点信息 做持久化操作

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

@@ -25,6 +25,7 @@
 		a.netRackProjectDivide,
 		a.requirementType,
 		a.costEstimate,
+		a.ownerReserveProjectManagre as projectManager,
 		a.basicRemarks,
 		IFNULL(b.joinProvincialCompanyReview,"") as joinProvincialCompanyReview,
 		IFNULL(b.batchOfProvincialCompany,"") as batchOfProvincialCompany,
@@ -136,7 +137,7 @@
         on a.projectReserveId = b.projectReserveId
         left join cg_project_type_verificate tv on a.projectReserveId = tv.projectReserveId
         <where>
-            a.del_flag = 0
+            a.del_flag = 0 and a.projectYear like concat(#{projectYear}, '%')
             <if test="projectReserveId!=null and projectReserveId!=''">
                 and a.projectReserveId like concat('%', #{projectReserveId}, '%')
             </if>
@@ -191,7 +192,7 @@
         on a.projectReserveId = b.projectReserveId
         left join cg_project_type_verificate tv on a.projectReserveId = tv.projectReserveId
         <where>
-            a.del_flag = 0
+            a.del_flag = 0 and a.projectYear like concat(#{projectYear}, '%')
             <if test="projectReserveId!=null and projectReserveId!=''">
                 and a.projectReserveId like concat('%', #{projectReserveId}, '%')
             </if>

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

@@ -42,7 +42,7 @@
         b.approvalDiagramTime,
         b.paperDrawing,
         b.paperDrawingTime,
-        b.screenRemarks,
+        IFNULL(b.screenRemarks,"") as screenRemarks,
         IFNULL(c.comprehensiveProject,"") as comprehensiveProject,
         IFNULL(c.powerFailureDifficulty,"") as powerFailureDifficulty,
         IFNULL(c.powerFailureDescribe,"") as powerFailureDescribe,
@@ -88,7 +88,7 @@
         on a.projectReserveId = c.projectReserveId
         left join cg_project_type_verificate tv on a.projectReserveId = tv.projectReserveId
         <where>
-            a.del_flag = 0
+            a.del_flag = 0 and a.projectYear like concat(#{projectYear}, '%')
             <if test="projectReserveId!=null and projectReserveId!=''">
                 and a.projectReserveId like concat('%', #{projectReserveId}, '%')
             </if>
@@ -119,7 +119,7 @@
         on a.projectReserveId = c.projectReserveId
         left join cg_project_type_verificate tv on a.projectReserveId = tv.projectReserveId
         <where>
-            a.del_flag = 0
+            a.del_flag = 0 and a.projectYear like concat(#{projectYear}, '%')
             <if test="projectReserveId!=null and projectReserveId!=''">
                 and a.projectReserveId like concat('%', #{projectReserveId}, '%')
             </if>
@@ -150,10 +150,10 @@
     <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
+        WHERE PROC_INST_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 GROUP_CONCAT(NAME_ SEPARATOR ', ') as NAME_ FROM `act_ru_task` WHERE PROC_INST_ID_ = #{executeId}
     </select>
     <select id="getByProId"
             resultType="com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.entity.ProjectScreen">

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

@@ -71,7 +71,7 @@
         left join cg_project_screen c
         on a.projectReserveId = c.projectReserveId
         <where>
-            a.del_flag = 0
+            a.del_flag = 0 and a.projectYear like concat(#{projectYear}, '%')
             <if test="projectReserveId!=null and projectReserveId!=''">
                 and a.projectReserveId like concat('%', #{projectReserveId}, '%')
             </if>
@@ -101,7 +101,7 @@
         left join cg_project_screen c
         on a.projectReserveId = c.projectReserveId
         <where>
-            a.del_flag = 0
+            a.del_flag = 0 and a.projectYear like concat(#{projectYear}, '%')
             <if test="projectReserveId!=null and projectReserveId!=''">
                 and a.projectReserveId like concat('%', #{projectReserveId}, '%')
             </if>
@@ -112,6 +112,7 @@
                 ${dataScope}
             </if>
         </where>
+        ORDER BY a.update_date DESC
     </select>
     <select id="queryByProjectReserveId"
             resultType="com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.entity.ProjectTypeVerificate">
@@ -223,10 +224,10 @@
     <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
+        WHERE PROC_INST_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 GROUP_CONCAT(NAME_ SEPARATOR ', ') as NAME_ FROM `act_ru_task` WHERE PROC_INST_ID_ = #{executeId}
     </select>
 
     <select id="getMaterialName" resultType="java.lang.String">

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

@@ -190,7 +190,7 @@
         on b.projectReserveId = c.projectReserveId
         left join cg_project_type_verificate tv on a.projectReserveId = tv.projectReserveId
         <where>
-            a.del_flag = 0
+            a.del_flag = 0 and a.projectYear like concat(#{projectYear}, '%')
             <if test="projectReserveId!=null and projectReserveId!=''">
                 and a.projectReserveId like concat('%', #{projectReserveId}, '%')
             </if>
@@ -221,7 +221,7 @@
         on a.projectReserveId = c.projectReserveId
         left join cg_project_type_verificate tv on a.projectReserveId = tv.projectReserveId
         <where>
-            a.del_flag = 0
+            a.del_flag = 0 and a.projectYear like concat(#{projectYear}, '%')
             <if test="projectReserveId!=null and projectReserveId!=''">
                 and a.projectReserveId like concat('%', #{projectReserveId}, '%')
             </if>
@@ -252,10 +252,10 @@
     <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
+        WHERE PROC_INST_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 GROUP_CONCAT(NAME_ SEPARATOR ', ') as  NAME_ FROM `act_ru_task` WHERE PROC_INST_ID_ = #{executeId}
     </select>
     <select id="getAllProId" resultType="java.lang.String">
         select projectReserveId from cg_reserve_electricity_work_information
@@ -269,4 +269,9 @@
         <include refid="reserveManagementColumn"/>
         from cg_reserve_electricity_work_information a where a.projectReserveId = #{proId}
     </select>
+    <select id="getHistoryName" resultType="java.lang.String">
+        select ACT_NAME_ as name from act_hi_actinst
+        WHERE PROC_INST_ID_ = #{procInsId} and ACT_NAME_ is not null and END_TIME_ is not null ORDER BY END_TIME_ desc
+				LIMIT 1
+    </select>
 </mapper>

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

@@ -138,7 +138,7 @@
         on a.projectReserveId = c.projectReserveId
         left join cg_project_type_verificate tv on a.projectReserveId = tv.projectReserveId
         <where>
-            a.del_flag = 0
+            a.del_flag = 0 and a.projectYear like concat(#{projectYear}, '%')
             <if test="projectReserveId!=null and projectReserveId!=''">
                 and a.projectReserveId like concat('%', #{projectReserveId}, '%')
             </if>
@@ -169,7 +169,7 @@
         on a.projectReserveId = c.projectReserveId
         left join cg_project_type_verificate tv on a.projectReserveId = tv.projectReserveId
         <where>
-            a.del_flag = 0
+            a.del_flag = 0 and a.projectYear like concat(#{projectYear}, '%')
             <if test="projectReserveId!=null and projectReserveId!=''">
                 and a.projectReserveId like concat('%', #{projectReserveId}, '%')
             </if>
@@ -201,10 +201,10 @@
     <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
+        WHERE PROC_INST_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 GROUP_CONCAT(NAME_ SEPARATOR ', ') as NAME_ FROM `act_ru_task` WHERE PROC_INST_ID_ = #{executeId}
     </select>
     <select id="getAllProId" resultType="java.lang.String">
         select projectReserveId from cg_reserve_preconstruction_information

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

@@ -341,7 +341,7 @@
         on a.projectReserveId = b.projectReserveId
         left join cg_project_type_verificate tv on a.projectReserveId = tv.projectReserveId
         <where>
-            a.del_flag = 0
+            a.del_flag = 0 and a.projectYear like concat(#{projectYear}, '%')
             <if test="projectReserveId!=null and projectReserveId!=''">
                 and a.projectReserveId like concat('%', #{projectReserveId}, '%')
             </if>
@@ -470,7 +470,7 @@
         on a.projectReserveId = b.projectReserveId
         left join cg_project_type_verificate tv on a.projectReserveId = tv.projectReserveId
         <where>
-            a.del_flag = 0
+            a.del_flag = 0 and a.projectYear like concat(#{projectYear}, '%')
             <if test="projectReserveId!=null and projectReserveId!=''">
                 and a.projectReserveId like concat('%', #{projectReserveId}, '%')
             </if>

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

@@ -297,7 +297,7 @@
         on a.projectReserveId = c.projectReserveId
         left join cg_project_type_verificate tv on a.projectReserveId = tv.projectReserveId
         <where>
-            a.del_flag = 0
+            a.del_flag = 0 and a.projectYear like concat(#{projectYear}, '%')
             <if test="projectReserveId!=null and projectReserveId!=''">
                 and a.projectReserveId like concat('%', #{projectReserveId}, '%')
             </if>
@@ -328,7 +328,7 @@
         on a.projectReserveId = c.projectReserveId
         left join cg_project_type_verificate tv on a.projectReserveId = tv.projectReserveId
         <where>
-            a.del_flag = 0
+            a.del_flag = 0 and a.projectYear like concat(#{projectYear}, '%')
             <if test="projectReserveId!=null and projectReserveId!=''">
                 and a.projectReserveId like concat('%', #{projectReserveId}, '%')
             </if>
@@ -359,10 +359,10 @@
     <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
+        WHERE PROC_INST_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  GROUP_CONCAT(NAME_ SEPARATOR ', ') as  NAME_ FROM `act_ru_task` WHERE PROC_INST_ID_ = #{executeId}
     </select>
     <select id="getAllProId" resultType="java.lang.String">
         select projectReserveId from cg_reserve_safety_disclosure_information

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

@@ -364,4 +364,7 @@
         SELECT NAME_ FROM `act_hi_taskinst` WHERE
         PROC_INST_ID_ = #{instId} AND START_TIME_ = #{time}
     </select>
+    <select id="getInfoByProId" resultType="java.lang.String">
+         select proc_ins_id as procInsId from cg_personnel_activiti where projectReserveId = #{proId}
+    </select>
 </mapper>

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

@@ -188,7 +188,7 @@
         on cg.projectReserveId = a.projectReserveId
         left join cg_project_type_verificate tv on a.projectReserveId = tv.projectReserveId
         <where>
-            a.del_flag = 0
+            a.del_flag = 0 and a.projectYear like concat(#{projectYear}, '%')
             <if test="projectReserveId!=null and projectReserveId!=''">
                 and a.projectReserveId like concat('%', #{projectReserveId}, '%')
             </if>
@@ -221,7 +221,7 @@
         on cg.projectReserveId = a.projectReserveId
         left join cg_project_type_verificate tv on a.projectReserveId = tv.projectReserveId
         <where>
-            a.del_flag = 0
+            a.del_flag = 0 and a.projectYear like concat(#{projectYear}, '%')
             <if test="projectReserveId!=null and projectReserveId!=''">
                 and a.projectReserveId like concat('%', #{projectReserveId}, '%')
             </if>
@@ -254,10 +254,10 @@
     <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
+        WHERE PROC_INST_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 GROUP_CONCAT(NAME_ SEPARATOR ', ') as NAME_ FROM `act_ru_task` WHERE PROC_INST_ID_ = #{executeId}
     </select>
     <select id="getAllProId" resultType="java.lang.String">
         SELECT projectReserveId FROM cg_reserve_summary_statistics

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

@@ -1,5 +1,6 @@
 package com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.service;
 
+import com.jeeplus.common.utils.StringUtils;
 import com.jeeplus.core.persistence.Page;
 import com.jeeplus.core.service.CrudService;
 import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.entity.CompanyReview;
@@ -8,6 +9,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.time.LocalDate;
 import java.util.*;
 
 /**
@@ -54,6 +56,9 @@ public class CompanyReviewService extends CrudService<CompanyReviewMapper, Compa
     }
 
     public Page<CompanyReview> findPage(Page<CompanyReview> page, CompanyReview companyReview) {
+        if (StringUtils.isBlank(companyReview.getProjectYear())){
+            companyReview.setProjectYear(LocalDate.now().getYear()+"");
+        }
         Page<CompanyReview> pageList = super.findPage(page, companyReview);
         return pageList;
     }

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

@@ -1,5 +1,6 @@
 package com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.service;
 
+import com.jeeplus.common.utils.StringUtils;
 import com.jeeplus.core.persistence.Page;
 import com.jeeplus.core.service.CrudService;
 import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.entity.ProjectScreen;
@@ -9,6 +10,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.time.LocalDate;
 import java.util.*;
 
 /**
@@ -28,6 +30,9 @@ public class ProjectScreenService extends CrudService<ProjectScreenMapper, Proje
     }
 
     public Page<ProjectScreen> findPage(Page<ProjectScreen> page, ProjectScreen verificate) {
+        if (StringUtils.isBlank(verificate.getProjectYear())){
+            verificate.setProjectYear(LocalDate.now().getYear()+"");
+        }
         Page<ProjectScreen> pageList = super.findPage(page, verificate);
         return pageList;
     }

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

@@ -1,5 +1,6 @@
 package com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.service;
 
+import com.jeeplus.common.utils.StringUtils;
 import com.jeeplus.core.persistence.Page;
 import com.jeeplus.core.service.CrudService;
 import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.entity.ProjectTypeVerificate;
@@ -9,6 +10,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.time.LocalDate;
 import java.util.*;
 
 /**
@@ -27,6 +29,9 @@ public class ProjectTypeVerificateService extends CrudService<ProjectTypeVerific
     }
 
     public Page<ProjectTypeVerificate> findPage(Page<ProjectTypeVerificate> page, ProjectTypeVerificate verificate) {
+        if (StringUtils.isBlank(verificate.getProjectYear())){
+            verificate.setProjectYear(LocalDate.now().getYear()+"");
+        }
         Page<ProjectTypeVerificate> pageList = super.findPage(page, verificate);
         return pageList;
     }

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

@@ -1,5 +1,6 @@
 package com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.service;
 
+import com.jeeplus.common.utils.StringUtils;
 import com.jeeplus.core.persistence.Page;
 import com.jeeplus.core.service.CrudService;
 import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.entity.ReserveElectricityWork;
@@ -9,6 +10,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.time.LocalDate;
 import java.util.*;
 
 /**
@@ -110,6 +112,9 @@ public class ReserveElectricityWorkService extends CrudService<ReserveElectricit
     }
 
     public Page<ReserveElectricityWork> findPage(Page<ReserveElectricityWork> page, ReserveElectricityWork reserveManagement) {
+        if (StringUtils.isBlank(reserveManagement.getProjectYear())){
+            reserveManagement.setProjectYear(LocalDate.now().getYear()+"");
+        }
         Page<ReserveElectricityWork> pageList = super.findPage(page, reserveManagement);
         return pageList;
     }
@@ -147,4 +152,8 @@ public class ReserveElectricityWorkService extends CrudService<ReserveElectricit
     public String getByExecuteId(String executeId){
         return dao.getByExecuteId(executeId);
     }
+
+    public String getHistoryName(String procInsId){
+        return dao.getHistoryName(procInsId);
+    }
 }

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

@@ -1,5 +1,6 @@
 package com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.service;
 
+import com.jeeplus.common.utils.StringUtils;
 import com.jeeplus.core.persistence.Page;
 import com.jeeplus.core.service.CrudService;
 import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.entity.ReservePreconstruction;
@@ -9,6 +10,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.time.LocalDate;
 import java.util.*;
 
 /**
@@ -99,6 +101,9 @@ public class ReservePreconstructService extends CrudService<ReservePreconstructM
     }
 
     public Page<ReservePreconstruction> findPage(Page<ReservePreconstruction> page, ReservePreconstruction reserveManagement) {
+        if (StringUtils.isBlank(reserveManagement.getProjectYear())){
+            reserveManagement.setProjectYear(LocalDate.now().getYear()+"");
+        }
         Page<ReservePreconstruction> pageList = super.findPage(page, reserveManagement);
         return pageList;
     }

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

@@ -1,5 +1,6 @@
 package com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.service;
 
+import com.jeeplus.common.utils.StringUtils;
 import com.jeeplus.core.persistence.Page;
 import com.jeeplus.core.service.CrudService;
 import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.entity.ReserveProcessProject;
@@ -10,6 +11,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.text.SimpleDateFormat;
+import java.time.LocalDate;
 import java.util.*;
 
 /**
@@ -104,6 +106,9 @@ public class ReserveProcessProjectService extends CrudService<ReserveProcessProj
     }
 
     public Page<ReserveProcessProject> findPage(Page<ReserveProcessProject> page, ReserveProcessProject reserveManagement) {
+        if (StringUtils.isBlank(reserveManagement.getProjectYear())){
+            reserveManagement.setProjectYear(LocalDate.now().getYear()+"");
+        }
         Page<ReserveProcessProject> pageList = super.findPage(page, reserveManagement);
         return pageList;
     }
@@ -183,6 +188,9 @@ public class ReserveProcessProjectService extends CrudService<ReserveProcessProj
     }
 
     public List<ReserveProcessProject> exportFindList( ReserveProcessProject reserveManagement) {
+        if (StringUtils.isBlank(reserveManagement.getProjectYear())){
+            reserveManagement.setProjectYear(LocalDate.now().getYear()+"");
+        }
         List<ReserveProcessProject> pageList = dao.exportFindList(reserveManagement);
         return pageList;
     }

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

@@ -1,5 +1,6 @@
 package com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.service;
 
+import com.jeeplus.common.utils.StringUtils;
 import com.jeeplus.core.persistence.Page;
 import com.jeeplus.core.service.CrudService;
 import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.entity.ReserveSafety;
@@ -9,6 +10,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.time.LocalDate;
 import java.util.*;
 
 /**
@@ -101,6 +103,9 @@ public class ReserveSafeDisclosureService extends CrudService<ReserveSafeDisclos
     }
 
     public Page<ReserveSafety> findPage(Page<ReserveSafety> page, ReserveSafety reserveManagement) {
+        if (StringUtils.isBlank(reserveManagement.getProjectYear())){
+            reserveManagement.setProjectYear(LocalDate.now().getYear()+"");
+        }
         Page<ReserveSafety> pageList = super.findPage(page, reserveManagement);
         return pageList;
     }

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

@@ -429,7 +429,7 @@ public class ReserveSummaryProcessService extends CrudService<ReserveSummaryProc
             reserveSummary.setProjectReserveId(user.getProjectReserveId());
             ReserveSummary summary = statisticService.queryByProjectReserveId(reserveSummary);
             summary.setIncludeReserve("取消");
-
+            summary.setStartDesignOrNot("否");
             //修改 基本信息表的流程状态
             projectMapper.updateProcessStatus(user.getProjectReserveId(),3);
 
@@ -446,8 +446,8 @@ public class ReserveSummaryProcessService extends CrudService<ReserveSummaryProc
             summary.setReasonForCancel(message);
             statisticService.update(summary);
 
-            //取消流程   将流程表中的流程信息删除
-            mapper.deleteActivityByProId(user.getProjectReserveId());
+//            //取消流程   将流程表中的流程信息删除
+//            mapper.deleteActivityByProId(user.getProjectReserveId());
 
             ActRunTaskTest taskTest = mapper.getByProId(reserveProcess.getProjectReserveId());
 
@@ -471,7 +471,7 @@ public class ReserveSummaryProcessService extends CrudService<ReserveSummaryProc
             reserveSummary.setProjectReserveId(user.getProjectReserveId());
             ReserveSummary summary = statisticService.queryByProjectReserveId(reserveSummary);
             summary.setIncludeReserve("待定");
-
+            summary.setStartDesignOrNot("否");
             //修改 基本信息表的流程状态
             projectMapper.updateProcessStatus(user.getProjectReserveId(),4);
             //修改 汇总表的是否纳入储备为取消  并把取消原因获取到放到对应字段
@@ -483,8 +483,8 @@ public class ReserveSummaryProcessService extends CrudService<ReserveSummaryProc
             vars.put("no",false);
             vars.put("rural",true);
 
-            //取消流程   将流程表中的流程信息删除
-            mapper.deleteActivityByProId(user.getProjectReserveId());
+//            //取消流程   将流程表中的流程信息删除
+//            mapper.deleteActivityByProId(user.getProjectReserveId());
 
             ActRunTaskTest taskTest = mapper.getByProId(reserveProcess.getProjectReserveId());
             //删除掉act_ru_task表的联合审图 及 项目经理审图数据
@@ -578,6 +578,7 @@ public class ReserveSummaryProcessService extends CrudService<ReserveSummaryProc
             reserveSummary.setProjectReserveId(user.getProjectReserveId());
             ReserveSummary summary = statisticService.queryByProjectReserveId(reserveSummary);
             summary.setIncludeReserve("取消");
+            summary.setStartDesignOrNot("否");
             statisticService.update(summary);
             //修改 基本信息表的流程状态
             projectMapper.updateProcessStatus(user.getProjectReserveId(),3);
@@ -596,8 +597,8 @@ public class ReserveSummaryProcessService extends CrudService<ReserveSummaryProc
             summary.setReasonForCancel(message);
             statisticService.update(summary);
 
-            //取消流程   将流程表中的流程信息删除
-            mapper.deleteActivityByProId(user.getProjectReserveId());
+//            //取消流程   将流程表中的流程信息删除
+//            mapper.deleteActivityByProId(user.getProjectReserveId());
 
             ActRunTaskTest taskTest = mapper.getByProId(user.getProjectReserveId());
             //删除掉act_ru_task表的联合审图 及 项目经理审图数据
@@ -617,6 +618,7 @@ public class ReserveSummaryProcessService extends CrudService<ReserveSummaryProc
             reserveSummary.setProjectReserveId(user.getProjectReserveId());
             ReserveSummary summary = statisticService.queryByProjectReserveId(reserveSummary);
             summary.setIncludeReserve("待定");
+            summary.setStartDesignOrNot("否");
             statisticService.update(summary);
             //修改 基本信息表的流程状态
             projectMapper.updateProcessStatus(user.getProjectReserveId(),4);
@@ -635,8 +637,8 @@ public class ReserveSummaryProcessService extends CrudService<ReserveSummaryProc
             summary.setReasonForCancel(message);
             statisticService.update(summary);
 
-            //取消流程   将流程表中的流程信息删除
-            mapper.deleteActivityByProId(user.getProjectReserveId());
+//            //取消流程   将流程表中的流程信息删除
+//            mapper.deleteActivityByProId(user.getProjectReserveId());
 
             ActRunTaskTest taskTest = mapper.getByProId(user.getProjectReserveId());
             //删除掉act_ru_task表的联合审图 及 项目经理审图数据

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

@@ -1,5 +1,6 @@
 package com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.service;
 
+import com.jeeplus.common.utils.StringUtils;
 import com.jeeplus.core.persistence.Page;
 import com.jeeplus.core.service.CrudService;
 import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.entity.ReserveSummary;
@@ -9,6 +10,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.time.LocalDate;
 import java.util.*;
 
 /**
@@ -125,11 +127,17 @@ public class SummaryStatisticService extends CrudService<SummaryStatisticMapper,
     }
 
     public Page<ReserveSummary> findPage(Page<ReserveSummary> page, ReserveSummary reserveManagement) {
+        if (StringUtils.isBlank(reserveManagement.getProjectYear())){
+            reserveManagement.setProjectYear(LocalDate.now().getYear()+"");
+        }
         Page<ReserveSummary> pageList = super.findPage(page, reserveManagement);
         return pageList;
     }
 
     public List<ReserveSummary> exportFindList( ReserveSummary reserveManagement) {
+        if (StringUtils.isBlank(reserveManagement.getProjectYear())){
+            reserveManagement.setProjectYear(LocalDate.now().getYear()+"");
+        }
         List<ReserveSummary> pageList = dao.exportFindList(reserveManagement);
         return pageList;
     }

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

@@ -259,7 +259,7 @@ public class ReserveProcessProjectExportUtil {
             Sheet sheet = workbook.getSheetAt(0);
 
             String excelName = "";
-            if (reserveManagement.getHotLineWork().equals("是")){
+            if (reserveManagement.getHotLineWork().equals("否")){
                 Row nameRow = sheet.createRow(2);
                 Row gcRow = sheet.createRow(4);
                 Row btdyyRow = sheet.createRow(6);
@@ -808,7 +808,7 @@ public class ReserveProcessProjectExportUtil {
                 cell37.setCellValue(reserveManagement.getDiscloseRemarks());
             }
 
-            String str = URLEncoder.encode("储备项目交底信息汇总统计.xlsx", "UTF8");
+            String str = URLEncoder.encode("储备项目交底信息统计表.xlsx", "UTF8");
             response.setHeader("Content-Disposition", "attachment;filename="+str);
             response.setContentType("application/vnd.ms-excel;charset=UTF-8");
             OutputStream outputStream = response.getOutputStream();

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

@@ -136,7 +136,7 @@ public class CompanyReviewController extends BaseController {
 
                             //将act_ru_task表中的任务删除
 //                            ActRunTaskTest taskTest = summaryProcessService.getByProId(c.getProjectReserveId());
-//                            summaryProcessService.deleteByProcId(taskTest.getProcInsId(),"");
+                            summaryProcessService.deleteByProcId(taskTest.getProcInsId(),"");
                             //删除联合审图的并行任务
                             summaryProcessService.deleteExecution(taskTest.getProcInsId(),"sid-A0FF4858-9940-4B37-B14E-2DEA24AB37E5");
                             summaryProcessService.deleteExecution(taskTest.getProcInsId(),"sid-C92A1CEE-3775-4A11-AAD0-64FA836AC97C");
@@ -347,6 +347,7 @@ public class CompanyReviewController extends BaseController {
                 ReserveSummary summary1 = statisticService.queryByProjectReserveId(summary);
                 if (null != summary1) {
                     summary1.setStartDesignOrNot("否");
+                    summary1.setIncludeReserve("取消");
                     summary1.setReasonForCancel(companyReview.getReviewComments());
 
                     ActRunTaskTest taskTest = summaryProcessService.getByProId(companyReview.getProjectReserveId());
@@ -354,7 +355,7 @@ public class CompanyReviewController extends BaseController {
                     service.deleteActivityByProId(companyReview.getProjectReserveId());
                     //将act_ru_task表中的任务删除
 
-//                    summaryProcessService.deleteByProcId(taskTest.getProcInsId(),"");
+                    summaryProcessService.deleteByProcId(taskTest.getProcInsId(),"");
                     //删除联合审图的并行任务
                     String taskKey = summaryProcessService.selectTaskKey(taskTest.getProcInsId(), "联合审图");
                     String taskKey2 = summaryProcessService.selectTaskKey(taskTest.getProcInsId(), "项目经理审图");

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

@@ -7,6 +7,7 @@ import com.jeeplus.core.web.BaseController;
 import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.entity.ProjectScreen;
 import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.service.ProjectScreenService;
 import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.service.ProjectTypeVerificateService;
+import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.service.ReserveElectricityWorkService;
 import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.utils.ReserveProcessProjectExportUtil;
 import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.utils.ReserveProcessProjectProUtil;
 import com.jeeplus.modules.cg.reservemanagementcenter.statisticalTable.entity.History;
@@ -40,6 +41,9 @@ import java.util.Map;
 public class ProjectScreenController extends BaseController {
 
     @Autowired
+    private ReserveElectricityWorkService workService;
+
+    @Autowired
     private ProjectScreenService service;
 
     @Autowired
@@ -139,6 +143,7 @@ public class ProjectScreenController extends BaseController {
             //根据procInsId查出历史流程名称和时间
             if (StringUtils.isNotEmpty(procInsId)){
                 List<History> histories = service.getHistoryByExecuteId(procInsId);
+                String historyName = workService.getHistoryName(procInsId);
                 //当size>0时待办有历史流程，
                 if (histories.size()>0){
                     //根据proc_ins_id去运行时任务节点表（act_ru_task）中查出当前流程名称
@@ -147,7 +152,11 @@ public class ProjectScreenController extends BaseController {
                     if (StringUtils.isNotEmpty(name)){
                         work.setReserveProgress(name);
                     }else {
-                        work.setReserveProgress("");
+                        if (StringUtils.isNotBlank(historyName) && historyName.equals("技经人员审预算")){
+                            work.setReserveProgress("储备完成");
+                        } else {
+                            work.setReserveProgress("");
+                        }
                     }
                 }else {
                     work.setReserveProgress("");
@@ -169,6 +178,22 @@ public class ProjectScreenController extends BaseController {
                     }
                 });
             }
+            if (StringUtils.isBlank(work.getStateGridProjectCode())){
+                work.setStateGridProjectCode("");
+            }
+            if (StringUtils.isBlank(work.getStateGridProjectName())){
+                work.setStateGridProjectName("");
+            }
+            if (StringUtils.isBlank(work.getProjectQuantityRemarks())){
+                work.setProjectQuantityRemarks("");
+            }
+            if (StringUtils.isBlank(work.getOfficeProgress())){
+                work.setOfficeProgress("");
+            }
+            if (StringUtils.isBlank(work.getPreliminaryWorkPreparationRemarks())){
+                work.setPreliminaryWorkPreparationRemarks("");
+            }
+
 
             workList.add(work);
         }
@@ -204,6 +229,33 @@ public class ProjectScreenController extends BaseController {
             s.setId(String.valueOf(i));
             i++;
 
+            //根据projectReserveId查出流程表的proc_ins_id
+            String procInsId = service.getByProjectReserveId(s.getProjectReserveId());
+            //根据procInsId查出历史流程名称和时间
+            if (StringUtils.isNotEmpty(procInsId)){
+                List<History> histories = service.getHistoryByExecuteId(procInsId);
+                String historyName = workService.getHistoryName(procInsId);
+                //当size>0时待办有历史流程，
+                if (histories.size()>0){
+                    //根据proc_ins_id去运行时任务节点表（act_ru_task）中查出当前流程名称
+                    String name = service.getByExecuteId(procInsId);
+                    //设置项目进度
+                    if (StringUtils.isNotEmpty(name)){
+                        s.setReserveProgress(name);
+                    }else {
+                        if (StringUtils.isNotBlank(historyName) && historyName.equals("技经人员审预算")){
+                            s.setReserveProgress("储备完成");
+                        } else {
+                            s.setReserveProgress("");
+                        }
+                    }
+                }else {
+                    s.setReserveProgress("");
+                }
+            }else {
+                s.setReserveProgress("");
+            }
+
             //根据项目储备id去在线开甲供材表中查询物理信息
             List<String> materialNameList = verificateService.getMaterialName(s.getProjectName());
             if (null != nameList & null != materialNameList){

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

@@ -6,6 +6,7 @@ import com.jeeplus.core.persistence.Page;
 import com.jeeplus.core.web.BaseController;
 import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.entity.ProjectTypeVerificate;
 import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.service.ProjectTypeVerificateService;
+import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.service.ReserveElectricityWorkService;
 import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.utils.ReserveProcessProjectExportUtil;
 import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.utils.ReserveProcessProjectProUtil;
 import com.jeeplus.modules.cg.reservemanagementcenter.statisticalTable.entity.History;
@@ -44,6 +45,9 @@ public class ProjectTypeVerificateController extends BaseController {
     @Autowired
     private RaiseCapitalService raiseCapitalService;
 
+    @Autowired
+    private ReserveElectricityWorkService workService;
+
     @ModelAttribute
     public ProjectTypeVerificate get(@RequestParam(required = false) String id) {
         ProjectTypeVerificate entity = null;
@@ -132,6 +136,7 @@ public class ProjectTypeVerificateController extends BaseController {
         for (ProjectTypeVerificate work : list) {
             //根据projectReserveId查出流程表的proc_ins_id
             String procInsId = service.getByProjectReserveId(work.getProjectReserveId());
+            String historyName = workService.getHistoryName(procInsId);
             //根据procInsId查出历史流程名称和时间
             if (StringUtils.isNotEmpty(procInsId)){
                 List<History> histories = service.getHistoryByExecuteId(procInsId);
@@ -143,7 +148,11 @@ public class ProjectTypeVerificateController extends BaseController {
                     if (StringUtils.isNotEmpty(name)){
                         work.setReserveProgress(name);
                     }else {
-                        work.setReserveProgress("");
+                        if (StringUtils.isNotBlank(historyName) && historyName.equals("技经人员审预算")){
+                            work.setReserveProgress("储备完成");
+                        } else {
+                            work.setReserveProgress("");
+                        }
                     }
                 }else {
                     work.setReserveProgress("");
@@ -165,7 +174,12 @@ public class ProjectTypeVerificateController extends BaseController {
                     }
                 });
             }
-
+            if (StringUtils.isBlank(work.getStateGridProjectCode())){
+                work.setStateGridProjectCode("");
+            }
+            if (StringUtils.isBlank(work.getStateGridProjectName())){
+                work.setStateGridProjectName("");
+            }
             workList.add(work);
         }
         page.setList(workList);
@@ -199,6 +213,34 @@ public class ProjectTypeVerificateController extends BaseController {
         for (ProjectTypeVerificate s : list) {
             s.setId(String.valueOf(i));
             i++;
+
+            //根据projectReserveId查出流程表的proc_ins_id
+            String procInsId = service.getByProjectReserveId(s.getProjectReserveId());
+            String historyName = workService.getHistoryName(procInsId);
+            //根据procInsId查出历史流程名称和时间
+            if (StringUtils.isNotEmpty(procInsId)){
+                List<History> histories = service.getHistoryByExecuteId(procInsId);
+                //当size>0时待办有历史流程，
+                if (histories.size()>0){
+                    //根据proc_ins_id去运行时任务节点表（act_ru_task）中查出当前流程名称
+                    String name = service.getByExecuteId(procInsId);
+                    //设置项目进度
+                    if (StringUtils.isNotEmpty(name)){
+                        s.setReserveProgress(name);
+                    }else {
+                        if (StringUtils.isNotBlank(historyName) && historyName.equals("技经人员审预算")){
+                            s.setReserveProgress("储备完成");
+                        } else {
+                            s.setReserveProgress("");
+                        }
+                    }
+                }else {
+                    s.setReserveProgress("");
+                }
+            }else {
+                s.setReserveProgress("");
+            }
+
             //根据项目储备id去在线开甲供材表中查询物理信息
             List<String> materialNameList = service.getMaterialName(s.getProjectName());
             if (null != nameList & null != materialNameList){

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

@@ -115,6 +115,7 @@ public class ReserveElectricityWorkController extends BaseController {
             //根据procInsId查出历史流程名称和时间
             if (StringUtils.isNotEmpty(procInsId)){
                 List<History> histories = workService.getHistoryByExecuteId(procInsId);
+                String historyName = workService.getHistoryName(procInsId);
                 //当size>0时待办有历史流程，
                 if (histories.size()>0){
                     //根据proc_ins_id去运行时任务节点表（act_ru_task）中查出当前流程名称
@@ -123,7 +124,11 @@ public class ReserveElectricityWorkController extends BaseController {
                     if (StringUtils.isNotEmpty(name)){
                         work.setReserveProgress(name);
                     }else {
-                        work.setReserveProgress("");
+                        if (StringUtils.isNotBlank(historyName) && historyName.equals("技经人员审预算")){
+                            work.setReserveProgress("储备完成");
+                        } else {
+                            work.setReserveProgress("");
+                        }
                     }
                 }else {
                     work.setReserveProgress("");
@@ -145,7 +150,12 @@ public class ReserveElectricityWorkController extends BaseController {
                     }
                 });
             }
-
+            if (StringUtils.isBlank(work.getStateGridProjectCode())){
+                work.setStateGridProjectCode("");
+            }
+            if (StringUtils.isBlank(work.getStateGridProjectName())){
+                work.setStateGridProjectName("");
+            }
             workList.add(work);
         }
         page.setList(workList);
@@ -322,12 +332,21 @@ public class ReserveElectricityWorkController extends BaseController {
             String procInsId = workService.getByProjectReserveId(work.getProjectReserveId());
             //根据procInsId查出历史流程名称和时间
             List<History> histories = workService.getHistoryByExecuteId(procInsId);
+            String historyName = workService.getHistoryName(procInsId);
             //当size>0时待办有历史流程，
             if (histories.size()>0){
                 //根据proc_ins_id去运行时任务节点表（act_ru_task）中查出当前流程名称
                 String name = workService.getByExecuteId(procInsId);
                 //设置项目进度
-                work.setReserveProgress(name);
+                if (StringUtils.isNotEmpty(name)){
+                    work.setReserveProgress(name);
+                }else {
+                    if (StringUtils.isNotBlank(historyName) && historyName.equals("技经人员审预算")){
+                        work.setReserveProgress("储备完成");
+                    } else {
+                        work.setReserveProgress("");
+                    }
+                }
             }else {
                 work.setReserveProgress("");
             }

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

@@ -6,6 +6,7 @@ import com.jeeplus.core.persistence.Page;
 import com.jeeplus.core.web.BaseController;
 import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.entity.ReservePreconstruction;
 import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.service.ProjectTypeVerificateService;
+import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.service.ReserveElectricityWorkService;
 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;
@@ -43,6 +44,9 @@ import java.util.Map;
 public class ReservePreconstructController extends BaseController {
 
     @Autowired
+    private ReserveElectricityWorkService workService;
+
+    @Autowired
     private ReservePreconstructService structService;
 
     @Autowired
@@ -119,6 +123,7 @@ public class ReservePreconstructController extends BaseController {
             String procInsId = structService.getByProjectReserveId(pre.getProjectReserveId());
             //根据procInsId查出历史流程名称和时间
             List<History> histories = structService.getHistoryByExecuteId(procInsId);
+            String historyName = workService.getHistoryName(procInsId);
             //当size>0时待办有历史流程，
             if (histories.size()>0){
                 //根据proc_ins_id去运行时任务节点表（act_ru_task）中查出当前流程名称
@@ -126,7 +131,11 @@ public class ReservePreconstructController extends BaseController {
                 if (StringUtils.isNotEmpty(name)){
                     pre.setReserveProgress(name);
                 }else {
-                    pre.setReserveProgress("");
+                    if (StringUtils.isNotBlank(historyName) && historyName.equals("技经人员审预算")){
+                        pre.setReserveProgress("储备完成");
+                    } else {
+                        pre.setReserveProgress("");
+                    }
                 }
                 //设置项目进度
 //                pre.setReserveProgress(name);
@@ -513,11 +522,24 @@ public class ReservePreconstructController extends BaseController {
             //根据procInsId查出历史流程名称和时间
             List<History> histories = structService.getHistoryByExecuteId(procInsId);
             //当size>0时待办有历史流程，
+            String historyName = workService.getHistoryName(procInsId);
+            //当size>0时待办有历史流程，
             if (histories.size()>0){
                 //根据proc_ins_id去运行时任务节点表（act_ru_task）中查出当前流程名称
                 String name = structService.getByExecuteId(procInsId);
+                if (StringUtils.isNotEmpty(name)){
+                    pre.setReserveProgress(name);
+                }else {
+                    if (StringUtils.isNotBlank(historyName) && historyName.equals("技经人员审预算")){
+                        pre.setReserveProgress("储备完成");
+                    } else {
+                        pre.setReserveProgress("");
+                    }
+                }
                 //设置项目进度
-                pre.setReserveProgress(name);
+//                pre.setReserveProgress(name);
+            }else {
+                pre.setReserveProgress("");
             }
 
             //cg_material_data

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

@@ -158,6 +158,12 @@ public class ReserveProcessProjectController extends BaseController {
                     }
                 });
             }
+            if (StringUtils.isBlank(processProject.getStateGridProjectCode())){
+                processProject.setStateGridProjectCode("");
+            }
+            if (StringUtils.isBlank(processProject.getStateGridProjectName())){
+                processProject.setStateGridProjectName("");
+            }
             projects.add(processProject);
         }
         page.setList(projects);

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

@@ -6,6 +6,7 @@ import com.jeeplus.core.persistence.Page;
 import com.jeeplus.core.web.BaseController;
 import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.entity.ReserveSafety;
 import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.service.ProjectTypeVerificateService;
+import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.service.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;
@@ -52,6 +53,9 @@ public class ReserveSafeDisclosureController extends BaseController {
     @Autowired
     private ProjectTypeVerificateService verificateService;
 
+    @Autowired
+    private ReserveElectricityWorkService workService;
+
 
     @ModelAttribute
     public ReserveSafety get(@RequestParam(required = false) String id) {
@@ -117,12 +121,21 @@ public class ReserveSafeDisclosureController extends BaseController {
             String procInsId = safeService.getByProjectReserveId(safety.getProjectReserveId());
             //根据procInsId查出历史流程名称和时间
             List<History> histories = safeService.getHistoryByExecuteId(procInsId);
+            String historyName = workService.getHistoryName(procInsId);
             //当size>0时待办有历史流程，
             if (histories.size()>0){
                 //根据proc_ins_id去运行时任务节点表（act_ru_task）中查出当前流程名称
                 String name = safeService.getByExecuteId(procInsId);
                 //设置项目进度
-                safety.setReserveProgress(name);
+                if (StringUtils.isNotEmpty(name)){
+                    safety.setReserveProgress(name);
+                }else {
+                    if (StringUtils.isNotBlank(historyName) && historyName.equals("技经人员审预算")){
+                        safety.setReserveProgress("储备完成");
+                    } else {
+                        safety.setReserveProgress("");
+                    }
+                }
             }else {
                 safety.setReserveProgress("");
             }
@@ -140,7 +153,12 @@ public class ReserveSafeDisclosureController extends BaseController {
                     }
                 });
             }
-
+            if (StringUtils.isBlank(safety.getStateGridProjectCode())){
+                safety.setStateGridProjectCode("");
+            }
+            if (StringUtils.isBlank(safety.getStateGridProjectName())){
+                safety.setStateGridProjectName("");
+            }
             safetyList.add(safety);
         }
         return getBootstrapData(page);
@@ -336,12 +354,21 @@ public class ReserveSafeDisclosureController extends BaseController {
             String procInsId = safeService.getByProjectReserveId(safety.getProjectReserveId());
             //根据procInsId查出历史流程名称和时间
             List<History> histories = safeService.getHistoryByExecuteId(procInsId);
+            String historyName = workService.getHistoryName(procInsId);
             //当size>0时待办有历史流程，
             if (histories.size()>0){
                 //根据proc_ins_id去运行时任务节点表（act_ru_task）中查出当前流程名称
                 String name = safeService.getByExecuteId(procInsId);
                 //设置项目进度
-                safety.setReserveProgress(name);
+                if (StringUtils.isNotEmpty(name)){
+                    safety.setReserveProgress(name);
+                }else {
+                    if (StringUtils.isNotBlank(historyName) && historyName.equals("技经人员审预算")){
+                        safety.setReserveProgress("储备完成");
+                    } else {
+                        safety.setReserveProgress("");
+                    }
+                }
             }else {
                 safety.setReserveProgress("");
             }

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

@@ -56,6 +56,9 @@ import java.util.Map;
 public class SummaryStatisticController extends BaseController {
 
     @Autowired
+    private ReserveElectricityWorkService workService;
+
+    @Autowired
     private CompanyReviewService reviewService;
 
     @Autowired
@@ -168,12 +171,21 @@ public class SummaryStatisticController extends BaseController {
             String procInsId = statisticService.getByProjectReserveId(summary.getProjectReserveId());
             //根据procInsId查出历史流程名称和时间
             List<History> histories = statisticService.getHistoryByExecuteId(procInsId);
+            String historyName = workService.getHistoryName(procInsId);
             //当size>0时待办有历史流程，
             if (histories.size()>0){
                 //根据proc_ins_id去运行时任务节点表（act_ru_task）中查出当前流程名称
                 String name = statisticService.getByExecuteId(procInsId);
                 //设置项目进度
-                summary.setReserveProgress(name);
+                if (StringUtils.isNotEmpty(name)){
+                    summary.setReserveProgress(name);
+                }else {
+                    if (StringUtils.isNotBlank(historyName) && historyName.equals("技经人员审预算")){
+                        summary.setReserveProgress("储备完成");
+                    } else {
+                        summary.setReserveProgress(name);
+                    }
+                }
             }else {
                 summary.setReserveProgress("");
             }
@@ -191,7 +203,12 @@ public class SummaryStatisticController extends BaseController {
                     }
                 });
             }
-
+            if (StringUtils.isBlank(summary.getStateGridProjectCode())){
+                summary.setStateGridProjectCode("");
+            }
+            if (StringUtils.isBlank(summary.getStateGridProjectName())){
+                summary.setStateGridProjectName("");
+            }
             summaryList.add(summary);
         }
 
@@ -552,12 +569,21 @@ public class SummaryStatisticController extends BaseController {
             String procInsId = statisticService.getByProjectReserveId(summary.getProjectReserveId());
             //根据procInsId查出历史流程名称和时间
             List<History> histories = statisticService.getHistoryByExecuteId(procInsId);
+            String historyName = workService.getHistoryName(procInsId);
             //当size>0时待办有历史流程，
             if (histories.size()>0){
                 //根据proc_ins_id去运行时任务节点表（act_ru_task）中查出当前流程名称
                 String name = statisticService.getByExecuteId(procInsId);
                 //设置项目进度
-                summary.setReserveProgress(name);
+                if (StringUtils.isNotEmpty(name)){
+                    summary.setReserveProgress(name);
+                }else {
+                    if (StringUtils.isNotBlank(historyName) && historyName.equals("技经人员审预算")){
+                        summary.setReserveProgress("储备完成");
+                    } else {
+                        summary.setReserveProgress(name);
+                    }
+                }
             }else {
                 summary.setReserveProgress("");
             }
@@ -655,7 +681,7 @@ public class SummaryStatisticController extends BaseController {
      */
     //@RequiresPermissions(value={"test:raiseCapitalDesign:view","test:raiseCapitalDesign:add","test:raiseCapitalDesign:edit"},logical=Logical.OR)
     @RequestMapping(value = "aerialConductorForm")
-    public String aerialConductorForm(String uuid,String item, Model model,String projectName,String projectReserveId) {
+    public String aerialConductorForm(String uuid,String item, Model model,String projectName) {
         //将新增页数据保存到redis中（item）
         //raiseCapitalDesignService.disposeFormData(uuid,item);
         //查询10KV计算系数
@@ -675,7 +701,6 @@ public class SummaryStatisticController extends BaseController {
         model.addAttribute("highVoltageList", highVoltageList);
         model.addAttribute("lowVoltageList", lowVoltageList);
         model.addAttribute("projectName", projectName);
-        model.addAttribute("projectReserveId", projectReserveId);
         model.addAttribute("uuid", uuid);
         return "modules/cg/reservemanagementcenter/raiseCapital/aerialConductorForm";
     }

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

@@ -47,7 +47,7 @@
 		IFNULL(b.afterTrialDesignFee,"") as afterTrialDesignFee,
 		IFNULL(b.afterTrialSupervisionFee,"") as afterTrialSupervisionFee,
 		IFNULL(c.includeReserve,"") as implementPlan,
-		IFNULL(c.initialImplementBatch,"") as implementBatch,
+-- 		IFNULL(c.initialImplementBatch,"") as implementBatch,
 		tv.projectNatureArtificial AS projectNature
     </sql>
 

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

@@ -21,7 +21,7 @@
 		b.costEstimate,
 		b.basicRemarks,
 		IFNULL(c.includeReserve,"") as implementPlan,
-		IFNULL(c.initialImplementBatch,"") as implementBatch,
+-- 		IFNULL(c.initialImplementBatch,"") as implementBatch,
 		tv.projectNatureArtificial AS projectNature
     </sql>
 

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

@@ -21,7 +21,7 @@
 		a.costEstimate,
 		a.basicRemarks,
 		IFNULL(b.includeReserve,"") as implementPlan,
-		IFNULL(b.initialImplementBatch,"") as implementBatch,
+-- 		IFNULL(b.initialImplementBatch,"") as implementBatch,
 		IFNULL(c.budgetStatement,"") as budgetBook,
 		IFNULL(c.projectProposal,"") as projectProposal,
 		IFNULL(c.drawings,"") as blueprint,

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

@@ -37,9 +37,9 @@
 		IFNULL(b.drawingUnionRemarks,"") as drawingUnionRemarks,
 		IFNULL(b.drawingDate,"") as drawingDate,
         IFNULL(c.includeReserve,"") as implementPlan,
-        IFNULL(c.initialImplementBatch,"") as initialImplementBatch,
+--         IFNULL(c.initialImplementBatch,"") as initialImplementBatch,
         IFNULL(c.includeReserve,"") as includeReserve,
-        IFNULL(c.drawOfficeDrawn,"") as formalDrawing,
+--         IFNULL(c.drawOfficeDrawn,"") as formalDrawing,
         IFNULL(d.joinProvincialCompanyReview,"") as provincialCompanyReview,
         IFNULL(d.batchOfProvincialCompany,"") as provincialCompanyReviewBatch,
         IFNULL(d.passProvincialCompanyReview,"") as passProvincialCompanyReview,

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

@@ -21,7 +21,7 @@
 		b.costEstimate,
 		b.basicRemarks,
 		IFNULL(c.includeReserve,"") as implementPlan,
-		IFNULL(c.initialImplementBatch,"") as implementBatch,
+-- 		IFNULL(c.initialImplementBatch,"") as implementBatch,
 		IFNULL(d.numberOfBranchBoxFourWay,"") as numberOfBranchBoxFourWay,
 		IFNULL(d.numberOfBranchBoxFiveWay,"") as numberOfBranchBoxFiveWay,
 		IFNULL(d.numberOfBranchBoxSevenWay,"") as numberOfBranchBoxSevenWay,

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

@@ -442,6 +442,27 @@ public class RaiseCapitalDesignService extends CrudService<RaiseCapitalDesignMap
 	}
 
 	/**
+	 * 遍历查询结构 大类 中类 小类
+	 * 去除重复，记录大类
+	 * 根据大类查询它的中类放入list并记录
+	 */
+	public List<DisposeCableData> disposeFormCableDataList2(String projectReserveId) {
+		//创建通道，查询redis中数据
+		List<DisposeCableData> voltageDisposeDataList = Lists.newArrayList();
+		CacheChannel channel = J2Cache.getChannel();
+		RedisClient client = ((RedisCacheProvider)channel.getL2Provider()).getRedisClient();
+		BinaryJedisCommands binaryJedisCommands = client.get();
+		byte[] voltageDisposeBytes = binaryJedisCommands.get((projectReserveId+"cableDisposeData").getBytes());
+		String voltageDisposeItem = null;
+		if(null != voltageDisposeBytes){
+			voltageDisposeItem = new String(voltageDisposeBytes);
+			if(StringUtils.isNotBlank(voltageDisposeItem))
+				voltageDisposeDataList = JSON.parseArray(voltageDisposeItem,DisposeCableData.class);
+		}
+		return voltageDisposeDataList;
+	}
+
+	/**
 	 * 将页面数据保存到redis中
 	 * @param uuid
 	 * @param item

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

@@ -101,6 +101,17 @@ public class RaiseCapitalDesignController extends BaseController {
 		return map;
 	}
 
+	@RequestMapping(value = "disposeFormCableDataList2")
+	@ResponseBody
+	public Map disposeFormCableDataList2(String projectReserveId) {
+		Map<String,Object> map = new HashMap<>();
+		//将新增页数据保存到redis中（item）
+		List<DisposeCableData> voltageDisposeDataList = raiseCapitalDesignService.disposeFormCableDataList2(projectReserveId);
+		map.put("data",voltageDisposeDataList);
+		map.put("success",true);
+		return map;
+	}
+
 		/**
 	 * 提资表单列表数据
 	 */

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

@@ -11,10 +11,11 @@
 		function testSay() {
 			var uuid = $("#uid").val();
 			let projectName = this.$("#projectName").val();
+			let projectReserveId = this.$("#projectReserveId").val();
 			console.log('projectName', projectName)
-			jp.post("${ctx}/raiseCapitalDesign/disposeFormCableDataList",
+			jp.post("${ctx}/raiseCapitalDesign/disposeFormCableDataList2",
 					{
-						"uuid":uuid
+						"projectReserveId":projectReserveId
 					},
 					function (data) {
 						console.log('data', data)

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

@@ -200,7 +200,8 @@ $(document).ready(function () {
     $("#btnExport").click(function () {
         var projectReserveId = $("#projectReserveId").val();
         var projectName = $("#projectName").val();
-        jp.downloadFile('${ctx}/cg/reservemanagementcenter/companyReview/export?projectReserveId=' + projectReserveId + '&projectName=' + projectName);
+        var projectYear = $("#projectYear").val();
+        jp.downloadFile('${ctx}/cg/reservemanagementcenter/companyReview/export?projectReserveId=' + projectReserveId + '&projectName=' + projectName + '&projectYear=' + projectYear);
     });
 
     $("#search").click("click", function () {// 绑定查询按扭

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

@@ -1,3 +1,4 @@
+<%@ page import="java.time.LocalDate" %>
 <%@ page contentType="text/html;charset=UTF-8" %>
 <%@ include file="/webpage/include/taglib.jsp"%>
 <html>
@@ -41,15 +42,25 @@
 		<div id="search-collapse" class="collapse">
 			<div class="accordion-inner">
 				<form:form id="searchForm" modelAttribute="review" class="form form-horizontal well clearfix">
-					<div class="col-xs-12 col-sm-6 col-md-4">
+					<div class="col-xs-12 col-sm-6 col-md-3">
+						<label for="projectYear" class="label-item single-overflow pull-left">项目年份：</label>
+						<select name="projectYear" id="projectYear" class="form-control">
+							<%
+								int currentYear = LocalDate.now().getYear();
+								for (int i = 1997; i <= 2033; i++) { %>
+							<option value="<%= i %>" <% if (i == currentYear) { %>selected<% } %>><%= i %></option>
+							<% } %>
+						</select>
+					</div>
+					<div class="col-xs-12 col-sm-6 col-md-3">
 						<label class="label-item single-overflow pull-left" title="储备编码：">储备编码：</label>
 						<form:input path="projectReserveId" htmlEscape="false" maxlength="100"  class=" form-control"/>
 					</div>
-					<div class="col-xs-12 col-sm-6 col-md-4">
+					<div class="col-xs-12 col-sm-6 col-md-3">
 						<label class="label-item single-overflow pull-left" title="项目名称：">项目名称：</label>
 						<form:input path="projectName" htmlEscape="false" maxlength="100"  class=" form-control"/>
 					</div>
-					<div class="col-xs-12 col-sm-6 col-md-4">
+					<div class="col-xs-12 col-sm-6 col-md-3">
 						<div style="margin-top:26px">
 							<a  id="search" class="btn btn-primary btn-rounded  btn-bordered btn-sm"><i class="fa fa-search"></i> 查询</a>
 							<a  id="reset" class="btn btn-primary btn-rounded  btn-bordered btn-sm" ><i class="fa fa-refresh"></i> 重置</a>

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

@@ -243,7 +243,8 @@ $(document).ready(function () {
     $("#btnExport").click(function () {
         var projectReserveId = $("#projectReserveId").val();
         var projectName = $("#projectName").val();
-        jp.downloadFile('${ctx}/cg/reservemanagementcenter/projectScreen/export?projectReserveId=' + projectReserveId + '&projectName=' + projectName);
+        var projectYear = $("#projectYear").val();
+        jp.downloadFile('${ctx}/cg/reservemanagementcenter/projectScreen/export?projectReserveId=' + projectReserveId + '&projectName=' + projectName + '&projectYear=' + projectYear);
     });
 
     $("#search").click("click", function () {// 绑定查询按扭

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

@@ -1,3 +1,4 @@
+<%@ page import="java.time.LocalDate" %>
 <%@ page contentType="text/html;charset=UTF-8" %>
 <%@ include file="/webpage/include/taglib.jsp"%>
 <html>
@@ -41,15 +42,25 @@
 		<div id="search-collapse" class="collapse">
 			<div class="accordion-inner">
 				<form:form id="searchForm" modelAttribute="review" class="form form-horizontal well clearfix">
-					<div class="col-xs-12 col-sm-6 col-md-4">
+					<div class="col-xs-12 col-sm-6 col-md-3">
+						<label for="projectYear" class="label-item single-overflow pull-left">项目年份：</label>
+						<select name="projectYear" id="projectYear" class="form-control">
+							<%
+								int currentYear = LocalDate.now().getYear();
+								for (int i = 1997; i <= 2033; i++) { %>
+							<option value="<%= i %>" <% if (i == currentYear) { %>selected<% } %>><%= i %></option>
+							<% } %>
+						</select>
+					</div>
+					<div class="col-xs-12 col-sm-6 col-md-3">
 						<label class="label-item single-overflow pull-left" title="储备编码：">储备编码：</label>
 						<form:input path="projectReserveId" htmlEscape="false" maxlength="100"  class=" form-control"/>
 					</div>
-					<div class="col-xs-12 col-sm-6 col-md-4">
+					<div class="col-xs-12 col-sm-6 col-md-3">
 						<label class="label-item single-overflow pull-left" title="项目名称：">项目名称：</label>
 						<form:input path="projectName" htmlEscape="false" maxlength="100"  class=" form-control"/>
 					</div>
-					<div class="col-xs-12 col-sm-6 col-md-4">
+					<div class="col-xs-12 col-sm-6 col-md-3">
 						<div style="margin-top:26px">
 							<a  id="search" class="btn btn-primary btn-rounded  btn-bordered btn-sm"><i class="fa fa-search"></i> 查询</a>
 							<a  id="reset" class="btn btn-primary btn-rounded  btn-bordered btn-sm" ><i class="fa fa-refresh"></i> 重置</a>

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

@@ -220,7 +220,8 @@ $(document).ready(function () {
     $("#btnExport").click(function () {
         var projectReserveId = $("#projectReserveId").val();
         var projectName = $("#projectName").val();
-        jp.downloadFile('${ctx}/cg/reservemanagementcenter/projectTypeVerificate/export?projectReserveId=' + projectReserveId + '&projectName=' + projectName);
+        var projectYear = $("#projectYear").val();
+        jp.downloadFile('${ctx}/cg/reservemanagementcenter/projectTypeVerificate/export?projectReserveId=' + projectReserveId + '&projectName=' + projectName + '&projectYear=' + projectYear);
     });
 
     $("#search").click("click", function () {// 绑定查询按扭

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

@@ -1,3 +1,4 @@
+<%@ page import="java.time.LocalDate" %>
 <%@ page contentType="text/html;charset=UTF-8" %>
 <%@ include file="/webpage/include/taglib.jsp"%>
 <html>
@@ -41,15 +42,25 @@
 		<div id="search-collapse" class="collapse">
 			<div class="accordion-inner">
 				<form:form id="searchForm" modelAttribute="review" class="form form-horizontal well clearfix">
-					<div class="col-xs-12 col-sm-6 col-md-4">
+					<div class="col-xs-12 col-sm-6 col-md-3">
+						<label for="projectYear" class="label-item single-overflow pull-left">项目年份：</label>
+						<select name="projectYear" id="projectYear" class="form-control">
+							<%
+								int currentYear = LocalDate.now().getYear();
+								for (int i = 1997; i <= 2033; i++) { %>
+							<option value="<%= i %>" <% if (i == currentYear) { %>selected<% } %>><%= i %></option>
+							<% } %>
+						</select>
+					</div>
+					<div class="col-xs-12 col-sm-6 col-md-3">
 						<label class="label-item single-overflow pull-left" title="储备编码：">储备编码：</label>
 						<form:input path="projectReserveId" htmlEscape="false" maxlength="100"  class=" form-control"/>
 					</div>
-					<div class="col-xs-12 col-sm-6 col-md-4">
+					<div class="col-xs-12 col-sm-6 col-md-3">
 						<label class="label-item single-overflow pull-left" title="项目名称：">项目名称：</label>
 						<form:input path="projectName" htmlEscape="false" maxlength="100"  class=" form-control"/>
 					</div>
-					<div class="col-xs-12 col-sm-6 col-md-4">
+					<div class="col-xs-12 col-sm-6 col-md-3">
 						<div style="margin-top:26px">
 							<a  id="search" class="btn btn-primary btn-rounded  btn-bordered btn-sm"><i class="fa fa-search"></i> 查询</a>
 							<a  id="reset" class="btn btn-primary btn-rounded  btn-bordered btn-sm" ><i class="fa fa-refresh"></i> 重置</a>

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

@@ -209,7 +209,8 @@ $(document).ready(function () {
     $("#btnExport").click(function () {
         var projectReserveId = $("#projectReserveId").val();
         var projectName = $("#projectName").val();
-        jp.downloadFile('${ctx}/cg/reservemanagementcenter/reserveElectricityWork/export?projectReserveId=' + projectReserveId + '&projectName=' + projectName);
+        var projectYear = $("#projectYear").val();
+        jp.downloadFile('${ctx}/cg/reservemanagementcenter/reserveElectricityWork/export?projectReserveId=' + projectReserveId + '&projectName=' + projectName + '&projectYear=' + projectYear);
     });
 
     $("#search").click("click", function () {// 绑定查询按扭

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

@@ -1,3 +1,4 @@
+<%@ page import="java.time.LocalDate" %>
 <%@ page contentType="text/html;charset=UTF-8" %>
 <%@ include file="/webpage/include/taglib.jsp"%>
 <html>
@@ -41,15 +42,25 @@
 		<div id="search-collapse" class="collapse">
 			<div class="accordion-inner">
 				<form:form id="searchForm" modelAttribute="reserveManagement" class="form form-horizontal well clearfix">
-					<div class="col-xs-12 col-sm-6 col-md-4">
+					<div class="col-xs-12 col-sm-6 col-md-3">
+						<label for="projectYear" class="label-item single-overflow pull-left">项目年份：</label>
+						<select name="projectYear" id="projectYear" class="form-control">
+							<%
+								int currentYear = LocalDate.now().getYear();
+								for (int i = 1997; i <= 2033; i++) { %>
+							<option value="<%= i %>" <% if (i == currentYear) { %>selected<% } %>><%= i %></option>
+							<% } %>
+						</select>
+					</div>
+					<div class="col-xs-12 col-sm-6 col-md-3">
 						<label class="label-item single-overflow pull-left" title="储备编码：">储备编码：</label>
 						<form:input path="projectReserveId" htmlEscape="false" maxlength="100"  class=" form-control"/>
 					</div>
-					<div class="col-xs-12 col-sm-6 col-md-4">
+					<div class="col-xs-12 col-sm-6 col-md-3">
 						<label class="label-item single-overflow pull-left" title="项目名称：">项目名称：</label>
 						<form:input path="projectName" htmlEscape="false" maxlength="100"  class=" form-control"/>
 					</div>
-					<div class="col-xs-12 col-sm-6 col-md-4">
+					<div class="col-xs-12 col-sm-6 col-md-3">
 						<div style="margin-top:26px">
 							<a  id="search" class="btn btn-primary btn-rounded  btn-bordered btn-sm"><i class="fa fa-search"></i> 查询</a>
 							<a  id="reset" class="btn btn-primary btn-rounded  btn-bordered btn-sm" ><i class="fa fa-refresh"></i> 重置</a>

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

@@ -366,7 +366,8 @@ $(document).ready(function () {
     $("#btnExport").click(function () {
         var projectReserveId = $("#projectReserveId").val();
         var projectName = $("#projectName").val();
-        jp.downloadFile('${ctx}/cg/reservemanagementcenter/reserveManage/export?projectReserveId=' + projectReserveId + '&projectName=' + projectName);
+        var projectYear = $("#projectYear").val();
+        jp.downloadFile('${ctx}/cg/reservemanagementcenter/reserveManage/export?projectReserveId=' + projectReserveId + '&projectName=' + projectName + '&projectYear=' + projectYear);
     });
 
     $("#search").click("click", function () {// 绑定查询按扭

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

@@ -1,3 +1,5 @@
+<%@ page import="java.util.Date" %>
+<%@ page import="java.time.LocalDate" %>
 <%@ page contentType="text/html;charset=UTF-8" %>
 <%@ include file="/webpage/include/taglib.jsp"%>
 <html>
@@ -56,15 +58,25 @@
 		<div id="search-collapse" class="collapse">
 			<div class="accordion-inner">
 				<form:form id="searchForm" modelAttribute="reserveManagement" class="form form-horizontal well clearfix">
-					<div class="col-xs-12 col-sm-6 col-md-4">
+					<div class="col-xs-12 col-sm-6 col-md-3">
+						<label for="projectYear" class="label-item single-overflow pull-left">项目年份：</label>
+						<select name="projectYear" id="projectYear" class="form-control">
+							<%
+								int currentYear = LocalDate.now().getYear();
+								for (int i = 1997; i <= 2033; i++) { %>
+							<option value="<%= i %>" <% if (i == currentYear) { %>selected<% } %>><%= i %></option>
+							<% } %>
+						</select>
+					</div>
+					<div class="col-xs-12 col-sm-6 col-md-3">
 						<label class="label-item single-overflow pull-left" title="储备编码：">储备编码：</label>
 						<form:input path="projectReserveId" htmlEscape="false" maxlength="100"  class=" form-control"/>
 					</div>
-					<div class="col-xs-12 col-sm-6 col-md-4">
+					<div class="col-xs-12 col-sm-6 col-md-3">
 						<label class="label-item single-overflow pull-left" title="项目名称：">项目名称：</label>
 						<form:input path="projectName" htmlEscape="false" maxlength="100"  class=" form-control"/>
 					</div>
-					<div class="col-xs-12 col-sm-6 col-md-4">
+					<div class="col-xs-12 col-sm-6 col-md-3">
 						<div style="margin-top:26px">
 							<a  id="search" class="btn btn-primary btn-rounded  btn-bordered btn-sm"><i class="fa fa-search"></i> 查询</a>
 							<a  id="reset" class="btn btn-primary btn-rounded  btn-bordered btn-sm" ><i class="fa fa-refresh"></i> 重置</a>

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

@@ -203,7 +203,8 @@ $(document).ready(function () {
     $("#btnExport").click(function () {
         var projectReserveId = $("#projectReserveId").val();
         var projectName = $("#projectName").val();
-        jp.downloadFile('${ctx}/cg/reservemanagementcenter/reservePreconstruct/export?projectReserveId=' + projectReserveId + '&projectName=' + projectName);
+        var projectYear = $("#projectYear").val();
+        jp.downloadFile('${ctx}/cg/reservemanagementcenter/reservePreconstruct/export?projectReserveId=' + projectReserveId + '&projectName=' + projectName + '&projectYear=' + projectYear);
     });
 
     $("#search").click("click", function () {// 绑定查询按扭

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

@@ -1,3 +1,4 @@
+<%@ page import="java.time.LocalDate" %>
 <%@ page contentType="text/html;charset=UTF-8" %>
 <%@ include file="/webpage/include/taglib.jsp"%>
 <html>
@@ -45,15 +46,25 @@
 		<div id="search-collapse" class="collapse">
 			<div class="accordion-inner">
 				<form:form id="searchForm" modelAttribute="reserveManagement" class="form form-horizontal well clearfix">
-					<div class="col-xs-12 col-sm-6 col-md-4">
+					<div class="col-xs-12 col-sm-6 col-md-3">
+						<label for="projectYear" class="label-item single-overflow pull-left">项目年份：</label>
+						<select name="projectYear" id="projectYear" class="form-control">
+							<%
+								int currentYear = LocalDate.now().getYear();
+								for (int i = 1997; i <= 2033; i++) { %>
+							<option value="<%= i %>" <% if (i == currentYear) { %>selected<% } %>><%= i %></option>
+							<% } %>
+						</select>
+					</div>
+					<div class="col-xs-12 col-sm-6 col-md-3">
 						<label class="label-item single-overflow pull-left" title="储备编码：">储备编码：</label>
 						<form:input path="projectReserveId" htmlEscape="false" maxlength="100"  class=" form-control"/>
 					</div>
-					<div class="col-xs-12 col-sm-6 col-md-4">
+					<div class="col-xs-12 col-sm-6 col-md-3">
 						<label class="label-item single-overflow pull-left" title="项目名称：">项目名称：</label>
 						<form:input path="projectName" htmlEscape="false" maxlength="100"  class=" form-control"/>
 					</div>
-					<div class="col-xs-12 col-sm-6 col-md-4">
+					<div class="col-xs-12 col-sm-6 col-md-3">
 						<div style="margin-top:26px">
 							<a  id="search" class="btn btn-primary btn-rounded  btn-bordered btn-sm"><i class="fa fa-search"></i> 查询</a>
 							<a  id="reset" class="btn btn-primary btn-rounded  btn-bordered btn-sm" ><i class="fa fa-refresh"></i> 重置</a>

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

@@ -241,7 +241,8 @@ $(document).ready(function () {
     $("#btnExport").click(function () {
         var projectReserveId = $("#projectReserveId").val();
         var projectName = $("#projectName").val();
-        jp.downloadFile('${ctx}/cg/reservemanagementcenter/reserveSafeDisclosure/export?projectReserveId=' + projectReserveId + '&projectName=' + projectName);
+        var projectYear = $("#projectYear").val();
+        jp.downloadFile('${ctx}/cg/reservemanagementcenter/reserveSafeDisclosure/export?projectReserveId=' + projectReserveId + '&projectName=' + projectName + '&projectYear=' + projectYear);
     });
 
     $("#search").click("click", function () {// 绑定查询按扭

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

@@ -1,3 +1,4 @@
+<%@ page import="java.time.LocalDate" %>
 <%@ page contentType="text/html;charset=UTF-8" %>
 <%@ include file="/webpage/include/taglib.jsp"%>
 <html>
@@ -41,15 +42,25 @@
 		<div id="search-collapse" class="collapse">
 			<div class="accordion-inner">
 				<form:form id="searchForm" modelAttribute="reserveManagement" class="form form-horizontal well clearfix">
-					<div class="col-xs-12 col-sm-6 col-md-4">
+					<div class="col-xs-12 col-sm-6 col-md-3">
+						<label for="projectYear" class="label-item single-overflow pull-left">项目年份：</label>
+						<select name="projectYear" id="projectYear" class="form-control">
+							<%
+								int currentYear = LocalDate.now().getYear();
+								for (int i = 1997; i <= 2033; i++) { %>
+							<option value="<%= i %>" <% if (i == currentYear) { %>selected<% } %>><%= i %></option>
+							<% } %>
+						</select>
+					</div>
+					<div class="col-xs-12 col-sm-6 col-md-3">
 						<label class="label-item single-overflow pull-left" title="储备编码：">储备编码：</label>
 						<form:input path="projectReserveId" htmlEscape="false" maxlength="100"  class=" form-control"/>
 					</div>
-					<div class="col-xs-12 col-sm-6 col-md-4">
+					<div class="col-xs-12 col-sm-6 col-md-3">
 						<label class="label-item single-overflow pull-left" title="项目名称：">项目名称：</label>
 						<form:input path="projectName" htmlEscape="false" maxlength="100"  class=" form-control"/>
 					</div>
-					<div class="col-xs-12 col-sm-6 col-md-4">
+					<div class="col-xs-12 col-sm-6 col-md-3">
 						<div style="margin-top:26px">
 							<a  id="search" class="btn btn-primary btn-rounded  btn-bordered btn-sm"><i class="fa fa-search"></i> 查询</a>
 							<a  id="reset" class="btn btn-primary btn-rounded  btn-bordered btn-sm" ><i class="fa fa-refresh"></i> 重置</a>

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

@@ -215,7 +215,8 @@ $(document).ready(function () {
     $("#btnExport").click(function () {
         var projectReserveId = $("#projectReserveId").val();
         var projectName = $("#projectName").val();
-        jp.downloadFile('${ctx}/cg/reservemanagementcenter/summaryStatistics/export?projectReserveId=' + projectReserveId + '&projectName=' + projectName);
+        var projectYear = $("#projectYear").val();
+        jp.downloadFile('${ctx}/cg/reservemanagementcenter/summaryStatistics/export?projectReserveId=' + projectReserveId + '&projectName=' + projectName + '&projectYear=' + projectYear);
     });
 
     $("#search").click("click", function () {// 绑定查询按扭

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

@@ -1,3 +1,4 @@
+<%@ page import="java.time.LocalDate" %>
 <%@ page contentType="text/html;charset=UTF-8" %>
 <%@ include file="/webpage/include/taglib.jsp"%>
 <html>
@@ -41,15 +42,25 @@
 		<div id="search-collapse" class="collapse">
 			<div class="accordion-inner">
 				<form:form id="searchForm" modelAttribute="reserveManagement" class="form form-horizontal well clearfix">
-					<div class="col-xs-12 col-sm-6 col-md-4">
+					<div class="col-xs-12 col-sm-6 col-md-3">
+						<label for="projectYear" class="label-item single-overflow pull-left">项目年份：</label>
+						<select name="projectYear" id="projectYear" class="form-control">
+							<%
+								int currentYear = LocalDate.now().getYear();
+								for (int i = 1997; i <= 2033; i++) { %>
+							<option value="<%= i %>" <% if (i == currentYear) { %>selected<% } %>><%= i %></option>
+							<% } %>
+						</select>
+					</div>
+					<div class="col-xs-12 col-sm-6 col-md-3">
 						<label class="label-item single-overflow pull-left" title="储备编码：">储备编码：</label>
 						<form:input path="projectReserveId" htmlEscape="false" maxlength="100"  class=" form-control"/>
 					</div>
-					<div class="col-xs-12 col-sm-6 col-md-4">
+					<div class="col-xs-12 col-sm-6 col-md-3">
 						<label class="label-item single-overflow pull-left" title="项目名称：">项目名称：</label>
 						<form:input path="projectName" htmlEscape="false" maxlength="100"  class=" form-control"/>
 					</div>
-					<div class="col-xs-12 col-sm-6 col-md-4">
+					<div class="col-xs-12 col-sm-6 col-md-3">
 						<div style="margin-top:26px">
 							<a  id="search" class="btn btn-primary btn-rounded  btn-bordered btn-sm"><i class="fa fa-search"></i> 查询</a>
 							<a  id="reset" class="btn btn-primary btn-rounded  btn-bordered btn-sm" ><i class="fa fa-refresh"></i> 重置</a>