储备项目新-流程相关内容修改

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

@@ -69,6 +69,15 @@ public class ReserveSummary extends DataEntity<ReserveSummary> {
     private String afterTrialEstimateAmount;  //概算信息（审后）- 总概算金额（含税）
     private String afterTrialEstimateAmountExcludeTax;  //概算信息（审后）- 总概算金额（不含税）
 
+    private String processStatus;       //流程状态
+
+    public String getProcessStatus() {
+        return processStatus;
+    }
+
+    public void setProcessStatus(String processStatus) {
+        this.processStatus = processStatus;
+    }
 
     public String getProjectYear() {
         return projectYear;

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

@@ -17,13 +17,6 @@ import java.util.List;
 public interface ReservePreconstructMapper extends BaseMapper<ReservePreconstruction> {
 
     /**
-     * 修改设计预制化信息
-     */
-    void updateMetion(@Param("designCivilFoundation") String designCivilFoundation,
-                      @Param("castInPlaceList") String castInPlaceList,
-                      @Param("designList") String designList);
-
-    /**
      * 获取所有的  项目储备编号
      * @return
      */

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

@@ -17,6 +17,30 @@ import java.util.List;
 public interface ReserveSummaryProcessMapper extends BaseMapper<ReserveSummaryProcess> {
 
     /**
+     * 根据结束时间查下一个节点信息
+     * @param instId
+     * @param time
+     * @return
+     */
+    String selectNameByTime(@Param("instId") String instId,@Param("time") String time);
+
+    /**
+     * 根据查出来的endTime来查下一个节点
+     * @param instId
+     * @param name
+     * @return
+     */
+    String selectTimeByName(@Param("instId") String instId,@Param("name") String name);
+
+    /**
+     * 根据   proc_def_id,和节点名称找到 taskKey
+     * @param procId
+     * @param name
+     * @return
+     */
+    String selectTaskKey(@Param("procId") String procId,@Param("name") String name);
+
+    /**
      * 根据项目储备id删除对应的流程信息
      * @param priId
      */

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

@@ -18,7 +18,7 @@
 		b.blockSupply,
 		b.gridNumber,
 		b.cellNumber,
-		a.projectReserveId,
+		b.projectReserveId,
 		b.projectName,
 		b.constructionNecessityAndContent,
 		b.substationName,
@@ -127,13 +127,13 @@
     <select id="findList" resultType="com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.entity.CompanyReview">
         select
         <include refid="companyReviewColumns"/>
-        from cg_reserve_company_review a
-        left join cg_reserve_process b
+        from cg_reserve_process b
+        left join cg_reserve_company_review a
         on a.projectReserveId = b.projectReserveId
         <where>
-            a.del_flag = 0
+            b.del_flag = 0
             <if test="projectReserveId!=null and projectReserveId!=''">
-                and a.projectReserveId like concat('%', #{projectReserveId}, '%')
+                and b.projectReserveId like concat('%', #{projectReserveId}, '%')
             </if>
             <if test="projectName!=null and projectName!=''">
                 and b.projectName like concat('%', #{projectName}, '%')
@@ -147,7 +147,7 @@
                 ORDER BY ${page.orderBy}
             </when>
             <otherwise>
-                ORDER BY a.update_date DESC
+                ORDER BY b.update_date DESC
             </otherwise>
         </choose>
     </select>
@@ -181,13 +181,13 @@
             resultType="com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.entity.CompanyReview">
         select
         <include refid="companyReviewColumns"/>
-        from cg_reserve_company_review a
-        left join cg_reserve_process b
+        from cg_reserve_process b
+        left join cg_reserve_company_review a
         on a.projectReserveId = b.projectReserveId
         <where>
-            a.del_flag = 0
+            b.del_flag = 0
             <if test="projectReserveId!=null and projectReserveId!=''">
-                and a.projectReserveId like concat('%', #{projectReserveId}, '%')
+                and b.projectReserveId like concat('%', #{projectReserveId}, '%')
             </if>
             <if test="projectName!=null and projectName!=''">
                 and b.projectName like concat('%', #{projectName}, '%')

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

@@ -38,7 +38,7 @@
 		b.blockSupply,
 		b.gridNumber,
 		b.cellNumber,
-		a.projectReserveId,
+		b.projectReserveId,
 		b.projectName,
 		b.constructionNecessityAndContent,
 		b.substationName,
@@ -178,15 +178,15 @@
     <select id="findList" resultType="com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.entity.ReserveElectricityWork">
         select
         <include refid="reserveManagementColumns"/>
-        from cg_reserve_electricity_work_information a
-        left join cg_reserve_process b
+        from cg_reserve_process b
+        left join cg_reserve_electricity_work_information a
         on a.projectReserveId = b.projectReserveId
         left join cg_reserve_summary_statistics c
-        on a.projectReserveId = c.projectReserveId
+        on b.projectReserveId = c.projectReserveId
         <where>
-            a.del_flag = 0
+            b.del_flag = 0
             <if test="projectReserveId!=null and projectReserveId!=''">
-                and a.projectReserveId like concat('%', #{projectReserveId}, '%')
+                and b.projectReserveId like concat('%', #{projectReserveId}, '%')
             </if>
             <if test="projectName!=null and projectName!=''">
                 and b.projectName like concat('%', #{projectName}, '%')
@@ -200,7 +200,7 @@
                 ORDER BY ${page.orderBy}
             </when>
             <otherwise>
-                ORDER BY a.update_date DESC
+                ORDER BY b.update_date DESC
             </otherwise>
         </choose>
     </select>
@@ -208,15 +208,15 @@
             resultType="com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.entity.ReserveElectricityWork">
         select
         <include refid="reserveManagementColumns"/>
-        from cg_reserve_electricity_work_information a
-        left join cg_reserve_process b
+        from cg_reserve_process b
+        left join cg_reserve_electricity_work_information a
         on a.projectReserveId = b.projectReserveId
         left join cg_reserve_summary_statistics c
-        on a.projectReserveId = c.projectReserveId
+        on b.projectReserveId = c.projectReserveId
         <where>
-            a.del_flag = 0
+            b.del_flag = 0
             <if test="projectReserveId!=null and projectReserveId!=''">
-                and a.projectReserveId like concat('%', #{projectReserveId}, '%')
+                and b.projectReserveId like concat('%', #{projectReserveId}, '%')
             </if>
             <if test="projectName!=null and projectName!=''">
                 and b.projectName like concat('%', #{projectName}, '%')
@@ -225,17 +225,17 @@
                 ${dataScope}
             </if>
         </where>
-        ORDER BY a.update_date DESC
+        ORDER BY b.update_date DESC
     </select>
 
     <select id="get" resultType="com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.entity.ReserveElectricityWork">
         select
         <include refid="reserveManagementColumns"/>
-        from cg_reserve_electricity_work_information a
-        left join cg_reserve_process b
+        from cg_reserve_process b
+        left join cg_reserve_electricity_work_information a
         on a.projectReserveId = b.projectReserveId
         left join cg_reserve_summary_statistics c
-        on a.projectReserveId = c.projectReserveId
+        on b.projectReserveId = c.projectReserveId
         where a.id = #{id}
     </select>
     <select id="getByProjectReserveId" resultType="java.lang.String">

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

@@ -18,7 +18,7 @@
 		b.blockSupply,
 		b.gridNumber,
 		b.cellNumber,
-		a.projectReserveId,
+		b.projectReserveId,
 		b.projectName,
 		b.constructionNecessityAndContent,
 		b.substationName,
@@ -30,9 +30,6 @@
 		a.confessCivilFoundation,
 		a.confessPrefab,
 		a.confessPrefabDescription,
-		a.designCivilFoundation,
-		a.castInPlaceList,
-		a.designList,
         c.includeReserve as 'implementPlan',
         c.initialImplementBatch as 'implementBatch'
 
@@ -49,10 +46,7 @@
         projectReserveId,
 		confessCivilFoundation,
 		confessPrefab,
-		confessPrefabDescription,
-		designCivilFoundation,
-		castInPlaceList,
-		designList
+		confessPrefabDescription
         )
         values
             (
@@ -65,10 +59,7 @@
             #{projectReserveId},
             #{confessCivilFoundation},
             #{confessPrefab},
-            #{confessPrefabDescription},
-            #{designCivilFoundation},
-            #{castInPlaceList},
-            #{designList}
+            #{confessPrefabDescription}
             )
     </insert>
 
@@ -83,10 +74,7 @@
         projectReserveId,
         confessCivilFoundation,
         confessPrefab,
-        confessPrefabDescription,
-        designCivilFoundation,
-        castInPlaceList,
-        designList
+        confessPrefabDescription
         )
         values
         <foreach collection="list" item="item" index="index" separator="," >
@@ -100,10 +88,7 @@
             #{item.projectReserveId},
             #{item.confessCivilFoundation},
             #{item.confessPrefab},
-            #{item.confessPrefabDescription},
-            #{item.designCivilFoundation},
-            #{item.castInPlaceList},
-            #{item.designList}
+            #{item.confessPrefabDescription}
             )
         </foreach>
     </insert>
@@ -116,46 +101,35 @@
         update_date = #{updateDate},
         confessCivilFoundation = #{confessCivilFoundation},
         confessPrefab = #{confessPrefab},
-        confessPrefabDescription = #{confessPrefabDescription},
-        designCivilFoundation = #{designCivilFoundation},
-        castInPlaceList = #{castInPlaceList},
-        designList = #{designList}
+        confessPrefabDescription = #{confessPrefabDescription}
 
         where id = #{id}
 	</update>
-    <update id="updateMetion">
-        update
-        cg_reserve_preconstruction_information
-        set
-        designCivilFoundation = #{designCivilFoundation},
-        castInPlaceList = #{castInPlaceList},
-        designList = #{designList}
-    </update>
 
     <select id="queryByProjectReserveId"
             resultType="com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.entity.ReservePreconstruction">
         select
         <include refid="reserveManagementColumns"/>
-        from cg_reserve_preconstruction_information a
-        left join cg_reserve_process b
+        from cg_reserve_process b
+        left join cg_reserve_preconstruction_information a
         on a.projectReserveId = b.projectReserveId
         left join cg_reserve_summary_statistics c
-        on a.projectReserveId = c.projectReserveId
-        where a.projectReserveId = #{projectReserveId}
+        on b.projectReserveId = c.projectReserveId
+        where b.projectReserveId = #{projectReserveId}
     </select>
 
     <select id="findList" resultType="com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.entity.ReservePreconstruction">
         select
         <include refid="reserveManagementColumns"/>
-        from cg_reserve_preconstruction_information a
-        left join cg_reserve_process b
+        from cg_reserve_process b
+        left join cg_reserve_preconstruction_information a
         on a.projectReserveId = b.projectReserveId
         left join cg_reserve_summary_statistics c
-        on a.projectReserveId = c.projectReserveId
+        on b.projectReserveId = c.projectReserveId
         <where>
-            a.del_flag = 0
+            b.del_flag = 0
             <if test="projectReserveId!=null and projectReserveId!=''">
-                and a.projectReserveId like concat('%', #{projectReserveId}, '%')
+                and b.projectReserveId like concat('%', #{projectReserveId}, '%')
             </if>
             <if test="projectName!=null and projectName!=''">
                 and b.projectName like concat('%', #{projectName}, '%')
@@ -169,7 +143,7 @@
                 ORDER BY ${page.orderBy}
             </when>
             <otherwise>
-                ORDER BY a.update_date DESC
+                ORDER BY b.update_date DESC
             </otherwise>
         </choose>
     </select>
@@ -177,15 +151,15 @@
             resultType="com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.entity.ReservePreconstruction">
         select
         <include refid="reserveManagementColumns"/>
-        from cg_reserve_preconstruction_information a
-        left join cg_reserve_process b
+        from cg_reserve_process b
+        left join cg_reserve_preconstruction_information a
         on a.projectReserveId = b.projectReserveId
         left join cg_reserve_summary_statistics c
-        on a.projectReserveId = c.projectReserveId
+        on b.projectReserveId = c.projectReserveId
         <where>
-            a.del_flag = 0
+            b.del_flag = 0
             <if test="projectReserveId!=null and projectReserveId!=''">
-                and a.projectReserveId like concat('%', #{projectReserveId}, '%')
+                and b.projectReserveId like concat('%', #{projectReserveId}, '%')
             </if>
             <if test="projectName!=null and projectName!=''">
                 and b.projectName like concat('%', #{projectName}, '%')
@@ -194,17 +168,17 @@
                 ${dataScope}
             </if>
         </where>
-        ORDER BY a.update_date DESC
+        ORDER BY b.update_date DESC
     </select>
 
     <select id="get" resultType="com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.entity.ReservePreconstruction">
         select
         <include refid="reserveManagementColumns"/>
-        from cg_reserve_preconstruction_information a
-        left join cg_reserve_process b
+        from cg_reserve_process b
+        left join cg_reserve_preconstruction_information a
         on a.projectReserveId = b.projectReserveId
         left join cg_reserve_summary_statistics c
-        on a.projectReserveId = c.projectReserveId
+        on b.projectReserveId = c.projectReserveId
         where a.id = #{id}
     </select>
 

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

@@ -18,7 +18,7 @@
 		b.blockSupply,
 		b.gridNumber,
 		b.cellNumber,
-		a.projectReserveId,
+		b.projectReserveId,
 		b.projectName,
 		b.constructionNecessityAndContent,
 		b.substationName,
@@ -250,13 +250,13 @@
     <select id="findList" resultType="com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.entity.ReserveSafety">
         select
         <include refid="reserveManagementColumns"/>
-        from cg_reserve_safety_disclosure_information a
-        left join cg_reserve_process b
+        from cg_reserve_process b
+        left join cg_reserve_safety_disclosure_information a
         on a.projectReserveId = b.projectReserveId
         <where>
-            a.del_flag = 0
+            b.del_flag = 0
             <if test="projectReserveId!=null and projectReserveId!=''">
-                and a.projectReserveId like concat('%', #{projectReserveId}, '%')
+                and b.projectReserveId like concat('%', #{projectReserveId}, '%')
             </if>
             <if test="projectName!=null and projectName!=''">
                 and b.projectName like concat('%', #{projectName}, '%')
@@ -270,7 +270,7 @@
                 ORDER BY ${page.orderBy}
             </when>
             <otherwise>
-                ORDER BY a.update_date DESC
+                ORDER BY b.update_date DESC
             </otherwise>
         </choose>
     </select>
@@ -278,13 +278,13 @@
             resultType="com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.entity.ReserveSafety">
         select
         <include refid="reserveManagementColumns"/>
-        from cg_reserve_safety_disclosure_information a
-        left join cg_reserve_process b
+        from cg_reserve_process b
+        left join cg_reserve_safety_disclosure_information a
         on a.projectReserveId = b.projectReserveId
         <where>
-            a.del_flag = 0
+            b.del_flag = 0
             <if test="projectReserveId!=null and projectReserveId!=''">
-                and a.projectReserveId like concat('%', #{projectReserveId}, '%')
+                and b.projectReserveId like concat('%', #{projectReserveId}, '%')
             </if>
             <if test="projectName!=null and projectName!=''">
                 and b.projectName like concat('%', #{projectName}, '%')
@@ -293,14 +293,14 @@
                 ${dataScope}
             </if>
         </where>
-        ORDER BY a.update_date DESC
+        ORDER BY b.update_date DESC
     </select>
 
     <select id="get" resultType="com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.entity.ReserveSafety">
         select
         <include refid="reserveManagementColumns"/>
-        from cg_reserve_safety_disclosure_information a
-        left join cg_reserve_process b
+        from cg_reserve_process b
+        left join cg_reserve_safety_disclosure_information a
         on a.projectReserveId = b.projectReserveId
         where a.id = #{id}
     </select>

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

@@ -121,35 +121,7 @@
             )
         </foreach>
     </insert>
-<!--    <insert id="insertIntoTask">-->
-<!--        insert into act_ru_task(-->
-<!--        ID_,REV_,EXECUTION_ID_,PROC_INST_ID_,PROC_DEF_ID_,NAME_,-->
-<!--        PARENT_TASK_ID_,DESCRIPTION_,TASK_DEF_KEY_,OWNER_,-->
-<!--        ASSIGNEE_,DELEGATION_,PRIORITY_,CREATE_TIME_,DUE_DATE_,CATEGORY_,-->
-<!--        SUSPENSION_STATE_,TENANT_ID_,FORM_KEY_-->
-<!--        )-->
-<!--        values (-->
-<!--        #{id},-->
-<!--        #{rev},-->
-<!--        #{executionId},-->
-<!--        #{procInsId},-->
-<!--        #{procDefId},-->
-<!--        #{name},-->
-<!--        #{parentTaskId},-->
-<!--        #{description},-->
-<!--        #{taskDefKey},-->
-<!--        #{owner},-->
-<!--        #{assignee},-->
-<!--        #{delegation},-->
-<!--        #{priority},-->
-<!--        #{createTime},-->
-<!--        #{dueDate},-->
-<!--        #{category},-->
-<!--        #{suspension},-->
-<!--        #{tenantId},-->
-<!--        #{formKey}-->
-<!--        )-->
-<!--    </insert>-->
+
     <insert id="insertIntoActRunTask">
         insert into cg_act_run_task(
             id,
@@ -224,12 +196,12 @@
         where projectReserveId = #{projectReserveId}
     </delete>
     <delete id="deleteExecution">
-        delete from act_ru_execution where PROC_DEF_ID_ = #{procId} and ACT_ID_ = #{taskKey}
+        delete from act_ru_execution where PROC_INST_ID_ = #{procId} and ACT_ID_ = #{taskKey}
     </delete>
     <delete id="deleteByProcId">
         delete from act_ru_task
         <where>
-            PROC_DEF_ID_ = #{procId}
+            PROC_INST_ID_ = #{procId}
             <if test="name!=null and name !=''">
                 and NAME_ = #{name}
             </if>
@@ -399,4 +371,16 @@
     <select id="getMessage" resultType="java.lang.String">
         SELECT MESSAGE_ FROM `act_hi_comment` ORDER BY TIME_ DESC LIMIT 1
     </select>
+    <select id="selectTaskKey" resultType="java.lang.String">
+        select TASK_DEF_KEY_ from act_ru_task where PROC_INST_ID_=#{procId} AND NAME_ = #{name}
+    </select>
+    <select id="selectTimeByName" resultType="java.lang.String">
+        SELECT END_TIME_ FROM `act_hi_taskinst` WHERE
+        PROC_INST_ID_ = #{instId} AND NAME_ = #{name}
+        ORDER BY START_TIME_ DESC limit 1
+    </select>
+    <select id="selectNameByTime" resultType="java.lang.String">
+        SELECT NAME_ FROM `act_hi_taskinst` WHERE
+        PROC_INST_ID_ = #{instId} AND START_TIME_ = #{time}
+    </select>
 </mapper>

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

@@ -18,7 +18,7 @@
 		b.blockSupply,
 		b.gridNumber,
 		b.cellNumber,
-		a.projectReserveId,
+		b.projectReserveId,
 		b.projectName,
 		b.constructionNecessityAndContent,
 		b.substationName,
@@ -268,20 +268,20 @@
     <select id="findList" resultType="com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.entity.ReserveSummary">
         select
         <include refid="reserveManagementColumns"/>
-        from cg_reserve_summary_statistics a
-        left join cg_reserve_process b
+        from cg_reserve_process b
+        left join cg_reserve_summary_statistics a
         on a.projectReserveId = b.projectReserveId
         left join cg_reserve_policy_handing_information c
-        on a.projectReserveId = c.projectReserveId
+        on b.projectReserveId = c.projectReserveId
         left join cg_budget_stats cg
-        on cg.projectReserveId = a.projectReserveId
+        on cg.projectReserveId = b.projectReserveId
         <where>
-            a.del_flag = 0
+            b.del_flag = 0
             <if test="projectReserveId!=null and projectReserveId!=''">
-                and a.projectReserveId like concat('%', #{projectReserveId}, '%')
+                and b.projectReserveId like concat('%', #{projectReserveId}, '%')
             </if>
             <if test="projectName!=null and projectName!=''">
-                and b.projectName like concat('%', #{projectName}, '%')
+                and a.projectName like concat('%', #{projectName}, '%')
             </if>
             <if test="dataScope != null and dataScope != ''">
                 ${dataScope}
@@ -292,7 +292,7 @@
                 ORDER BY ${page.orderBy}
             </when>
             <otherwise>
-                ORDER BY a.update_date DESC
+                ORDER BY b.update_date DESC
             </otherwise>
         </choose>
     </select>
@@ -300,17 +300,17 @@
             resultType="com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.entity.ReserveSummary">
         select
         <include refid="reserveManagementColumns"/>
-        from cg_reserve_summary_statistics a
-        left join cg_reserve_process b
+        from cg_reserve_process b
+        left join cg_reserve_summary_statistics a
         on a.projectReserveId = b.projectReserveId
         left join cg_reserve_policy_handing_information c
-        on a.projectReserveId = c.projectReserveId
+        on b.projectReserveId = c.projectReserveId
         left join cg_budget_stats cg
-        on cg.projectReserveId = a.projectReserveId
+        on cg.projectReserveId = b.projectReserveId
         <where>
-            a.del_flag = 0
+            b.del_flag = 0
             <if test="projectReserveId!=null and projectReserveId!=''">
-                and a.projectReserveId like concat('%', #{projectReserveId}, '%')
+                and b.projectReserveId like concat('%', #{projectReserveId}, '%')
             </if>
             <if test="projectName!=null and projectName!=''">
                 and b.projectName like concat('%', #{projectName}, '%')
@@ -319,19 +319,19 @@
                 ${dataScope}
             </if>
         </where>
-        ORDER BY a.update_date DESC
+        ORDER BY b.update_date DESC
     </select>
 
     <select id="get" resultType="com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.entity.ReserveSummary">
         select
         <include refid="reserveManagementColumns"/>
-        from cg_reserve_summary_statistics a
-        left join cg_reserve_process b
+        from cg_reserve_process b
+        left join cg_reserve_summary_statistics a
         on a.projectReserveId = b.projectReserveId
         left join cg_reserve_policy_handing_information c
-        on a.projectReserveId = c.projectReserveId
+        on b.projectReserveId = c.projectReserveId
         left join cg_budget_stats cg
-        on cg.projectReserveId = a.projectReserveId
+        on cg.projectReserveId = b.projectReserveId
         where a.id = #{id}
     </select>
     <select id="getByProjectReserveId" resultType="java.lang.String">
@@ -353,6 +353,7 @@
     </select>
     <select id="getAllCode"
             resultType="com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.entity.ReserveSummary">
-        select projectReserveId,includeReserve from cg_reserve_summary_statistics
+        select a.projectReserveId,includeReserve,processStatus from cg_reserve_summary_statistics a
+        left join cg_reserve_process b on a.projectReserveId = b.projectReserveId
     </select>
 </mapper>

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

@@ -23,14 +23,6 @@ public class ReservePreconstructService extends CrudService<ReservePreconstructM
     @Autowired
     private ReservePreconstructMapper dao;
 
-    /**
-     * 修改设计预制化信息
-     */
-    @Transactional(readOnly = false)
-    public void updateMetion(String designCivilFoundation,String castInPlaceList,String designList){
-        dao.updateMetion(designCivilFoundation, castInPlaceList, designList);
-    }
-
 
     /**
      * 获取所有的  项目储备编号

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

@@ -71,6 +71,16 @@ public class ReserveSummaryProcessService extends CrudService<ReserveSummaryProc
     }
 
     /**
+     * 根据   proc_def_id,和节点名称找到 taskKey
+     * @param procId
+     * @param name
+     * @return
+     */
+    public String selectTaskKey(String procId,String name){
+        return mapper.selectTaskKey(procId, name);
+    }
+
+    /**
      * 根据   proc_def_id,和节点名称 删除 表 act_ru_task 的  项目经理审图 和 联合审图 相关数据
      * @param procId
      */
@@ -306,7 +316,7 @@ public class ReserveSummaryProcessService extends CrudService<ReserveSummaryProc
             vars.put("no",false);
             vars.put("rural",false);
             vars.put("tg",false);
-            act.setTitle("设计单位上传预算书");
+            act.setTitle("技经人员审预算");
         } else if ("disagree".equals(flag)){
             //将项目经理审图的问题反馈保存到数据库
             FeedBackBudget budget = new FeedBackBudget(reserveProcess.getProjectReserveId(),
@@ -327,7 +337,6 @@ public class ReserveSummaryProcessService extends CrudService<ReserveSummaryProc
                 budgetService.updateInFoByProId(budget);
             }
 
-
             //不通过-回到上一个流程
             vars.put("manager", loginNameByName);
             vars.put("pass",false);
@@ -337,9 +346,10 @@ public class ReserveSummaryProcessService extends CrudService<ReserveSummaryProc
             act.setTitle("设计单位上传施工图纸");
             ActRunTaskTest taskTest = mapper.getByProId(reserveProcess.getProjectReserveId());
             //删除掉act_ru_task表的联合审图 及 项目经理审图数据
-            mapper.deleteByProcId(taskTest.getProcDefId(),"联合审图");
+            mapper.deleteByProcId(taskTest.getProcInsId(),"联合审图");
             //删除联合审图的并行任务
-            mapper.deleteExecution(taskTest.getProcDefId(),"sid-A0FF4858-9940-4B37-B14E-2DEA24AB37E5");
+            String taskKey = mapper.selectTaskKey(taskTest.getProcInsId(), "联合审图");
+            mapper.deleteExecution(taskTest.getProcInsId(),taskKey);
 
         } else if ("cancel".equals(flag)){
             //取消-项目取消，修改第六张表的状态
@@ -359,9 +369,7 @@ public class ReserveSummaryProcessService extends CrudService<ReserveSummaryProc
             vars.put("no",true);
             vars.put("rural",false);
 
-            act.preUpdate();
-            // 提交流程任务
-            complete(act.getTaskId(), act.getProcInsId(), act.getComment(), vars);
+
             //修改 汇总表的是否纳入储备为取消  并把取消原因获取到放到对应字段
             String message = mapper.getMessage();
             summary.setReasonForCancel(message);
@@ -371,11 +379,19 @@ public class ReserveSummaryProcessService extends CrudService<ReserveSummaryProc
             mapper.deleteActivityByProId(user.getProjectReserveId());
 
             ActRunTaskTest taskTest = mapper.getByProId(reserveProcess.getProjectReserveId());
+
             //删除掉act_ru_task表的联合审图 及 项目经理审图数据
-            mapper.deleteByProcId(taskTest.getProcDefId(),"联合审图");
+            mapper.deleteByProcId(taskTest.getProcInsId(),"联合审图");
+            mapper.deleteByProcId(taskTest.getProcInsId(),"项目经理审图");
             //删除联合审图的并行任务
-            mapper.deleteExecution(taskTest.getProcDefId(),"sid-A0FF4858-9940-4B37-B14E-2DEA24AB37E5");
+            String taskKey = mapper.selectTaskKey(taskTest.getProcInsId(), "联合审图");
+            String taskKey2 = mapper.selectTaskKey(taskTest.getProcInsId(), "项目经理审图");
+            mapper.deleteExecution(taskTest.getProcInsId(),taskKey);
+            mapper.deleteExecution(taskTest.getProcInsId(),taskKey2);
 
+            act.preUpdate();
+            // 提交流程任务
+            complete(act.getTaskId(), act.getProcInsId(), act.getComment(), vars);
             return;
         } else if ("pending".equals(flag)){
             //待定 修改第六张表的状态
@@ -400,9 +416,13 @@ public class ReserveSummaryProcessService extends CrudService<ReserveSummaryProc
 
             ActRunTaskTest taskTest = mapper.getByProId(reserveProcess.getProjectReserveId());
             //删除掉act_ru_task表的联合审图 及 项目经理审图数据
-            mapper.deleteByProcId(taskTest.getProcDefId(),"联合审图");
+            mapper.deleteByProcId(taskTest.getProcInsId(),"联合审图");
+            mapper.deleteByProcId(taskTest.getProcInsId(),"项目经理审图");
             //删除联合审图的并行任务
-            mapper.deleteExecution(taskTest.getProcDefId(),"sid-A0FF4858-9940-4B37-B14E-2DEA24AB37E5");
+            String taskKey = mapper.selectTaskKey(taskTest.getProcInsId(), "联合审图");
+            String taskKey2 = mapper.selectTaskKey(taskTest.getProcInsId(), "项目经理审图");
+            mapper.deleteExecution(taskTest.getProcInsId(),taskKey);
+            mapper.deleteExecution(taskTest.getProcInsId(),taskKey2);
 
             act.preUpdate();
             // 提交流程任务
@@ -437,14 +457,27 @@ public class ReserveSummaryProcessService extends CrudService<ReserveSummaryProc
 
         if ("yes".equals(flag)) {
             //通过流程到-技经人员审预算
-            vars.put("manager", loginNameByName);
+//            vars.put("manager", loginNameByName);
             vars.put("pass",true);
             vars.put("no",false);
             vars.put("rural",false);
             vars.put("tg",false);
 //            act.setTitle("设计单位上传预算书");
-            //修改 基本信息表的流程状态
-            projectMapper.updateProcessStatus(user.getProjectReserveId(),2);
+            ActRunTaskTest taskTest = mapper.getByProId(user.getProjectReserveId());
+            //修改 基本信息表的流程状态         查看是否通过了概预算审核
+            //从ACT_HI_TASKINST历史表中查看  概预算审核信息（根据时间排序取最近的一个），根据查出来的endTime来查下一个节点是否是设计单位上传文件
+            String time = mapper.selectTimeByName(taskTest.getProcInsId(), "技经人员审预算");
+            if (StringUtils.isEmpty(time)){
+                //说明审预算节点未结束
+            }else {
+                //根据结束时间来查是否有下一个节点
+                String name = mapper.selectNameByTime(taskTest.getProcInsId(), time);
+                if (StringUtils.isEmpty(name)){
+                    //说明还在流程中
+                    projectMapper.updateProcessStatus(user.getProjectReserveId(),2);
+                }
+            }
+
         } else if ("disagree".equals(flag)){
             //不通过-回到上一个流程
             loginNameByName = mapper.getLoginNameByName(user.getDesigner());
@@ -457,9 +490,10 @@ public class ReserveSummaryProcessService extends CrudService<ReserveSummaryProc
 
             ActRunTaskTest taskTest = mapper.getByProId(process.getProjectReserveId());
             //删除掉act_ru_task表的联合审图 及 项目经理审图数据
-            mapper.deleteByProcId(taskTest.getProcDefId(),"项目经理审图");
-            //删除新增的两个数据act_ru_execution表的相关字段  删除项目经理的并行任务
-            mapper.deleteExecution(taskTest.getProcDefId(),"sid-C92A1CEE-3775-4A11-AAD0-64FA836AC97C");
+            mapper.deleteByProcId(taskTest.getProcInsId(),"项目经理审图");
+            //删除联合审图的并行任务
+            String taskKey = mapper.selectTaskKey(taskTest.getProcInsId(), "项目经理审图");
+            mapper.deleteExecution(taskTest.getProcDefId(),taskKey);
 
         } else if ("cancel".equals(flag)){
             //取消-项目取消，修改第六张表的状态
@@ -489,11 +523,15 @@ public class ReserveSummaryProcessService extends CrudService<ReserveSummaryProc
             //取消流程   将流程表中的流程信息删除
             mapper.deleteActivityByProId(user.getProjectReserveId());
 
-            ActRunTaskTest taskTest = mapper.getByProId(process.getProjectReserveId());
+            ActRunTaskTest taskTest = mapper.getByProId(user.getProjectReserveId());
             //删除掉act_ru_task表的联合审图 及 项目经理审图数据
-            mapper.deleteByProcId(taskTest.getProcDefId(),"项目经理审图");
-            //删除新增的两个数据act_ru_execution表的相关字段  删除项目经理的并行任务
-            mapper.deleteExecution(taskTest.getProcDefId(),"sid-C92A1CEE-3775-4A11-AAD0-64FA836AC97C");
+            mapper.deleteByProcId(taskTest.getProcInsId(),"联合审图");
+            mapper.deleteByProcId(taskTest.getProcInsId(),"项目经理审图");
+            //删除联合审图的并行任务
+            String taskKey = mapper.selectTaskKey(taskTest.getProcInsId(), "联合审图");
+            String taskKey2 = mapper.selectTaskKey(taskTest.getProcInsId(), "项目经理审图");
+            mapper.deleteExecution(taskTest.getProcInsId(),taskKey);
+            mapper.deleteExecution(taskTest.getProcInsId(),taskKey2);
             return;
 
         } else if ("pending".equals(flag)){
@@ -523,11 +561,15 @@ public class ReserveSummaryProcessService extends CrudService<ReserveSummaryProc
             //取消流程   将流程表中的流程信息删除
             mapper.deleteActivityByProId(user.getProjectReserveId());
 
-            ActRunTaskTest taskTest = mapper.getByProId(process.getProjectReserveId());
+            ActRunTaskTest taskTest = mapper.getByProId(user.getProjectReserveId());
             //删除掉act_ru_task表的联合审图 及 项目经理审图数据
-            mapper.deleteByProcId(taskTest.getProcDefId(),"项目经理审图");
-            //删除新增的两个数据act_ru_execution表的相关字段  删除项目经理的并行任务
-            mapper.deleteExecution(taskTest.getProcDefId(),"sid-C92A1CEE-3775-4A11-AAD0-64FA836AC97C");
+            mapper.deleteByProcId(taskTest.getProcInsId(),"联合审图");
+            mapper.deleteByProcId(taskTest.getProcInsId(),"项目经理审图");
+            //删除联合审图的并行任务
+            String taskKey = mapper.selectTaskKey(taskTest.getProcInsId(), "联合审图");
+            String taskKey2 = mapper.selectTaskKey(taskTest.getProcInsId(), "项目经理审图");
+            mapper.deleteExecution(taskTest.getProcInsId(),taskKey);
+            mapper.deleteExecution(taskTest.getProcInsId(),taskKey2);
             return;
         }
 
@@ -569,8 +611,20 @@ public class ReserveSummaryProcessService extends CrudService<ReserveSummaryProc
             //插入
             budgetBookService.save(budgetBook);
 
-            //修改 基本信息表的流程状态
-            projectMapper.updateProcessStatus(user.getProjectReserveId(),2);
+            ActRunTaskTest taskTest = mapper.getByProId(user.getProjectReserveId());
+            //修改 基本信息表的流程状态         查看是否通过了概预算审核
+            //从ACT_HI_TASKINST历史表中查看  概预算审核信息（根据时间排序取最近的一个），根据查出来的endTime来查下一个节点是否是设计单位上传文件
+            String time = mapper.selectTimeByName(taskTest.getProcInsId(), "联合审图");
+            if (StringUtils.isEmpty(time)){
+                //说明审预算节点未结束
+            }else {
+                //根据结束时间来查是否有下一个节点
+                String name = mapper.selectNameByTime(taskTest.getProcInsId(), time);
+                if (StringUtils.isEmpty(name)){
+                    //说明没有下一个节点
+                    projectMapper.updateProcessStatus(user.getProjectReserveId(),2);
+                }
+            }
 
         } else if ("no".equals(flag)){
             //不通过-回到上一个流程
@@ -592,6 +646,14 @@ public class ReserveSummaryProcessService extends CrudService<ReserveSummaryProc
 
 
 //            budgetService.deleteByProjectReserveId(budget.getProjectReserveId());
+
+            ActRunTaskTest taskTest = mapper.getByProId(reserveProcess.getProjectReserveId());
+            //删除掉act_ru_task表的联合审图 及 项目经理审图数据
+            mapper.deleteByProcId(taskTest.getProcInsId(),"联合审图");
+            //删除联合审图的并行任务
+            String taskKey = mapper.selectTaskKey(taskTest.getProcInsId(), "联合审图");
+            mapper.deleteExecution(taskTest.getProcInsId(),taskKey);
+
             FeedBackBudget infoByProId = budgetService.getInfoByProId(reserveProcess.getProjectReserveId());
             if (infoByProId == null){
                 budgetService.save(budget);

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

@@ -82,9 +82,9 @@ public class ReserveProcessProjectExportUtil {
                 Cell cell26 = crateCell(workbook,row,26); //不停电作业方案
                 Cell cell27 = crateCell(workbook,row,27); //节约停电时户数
                 Cell cell28 = crateCell(workbook,row,28); //无法不停电作业原因
-                Cell cell29 = crateCell(workbook,row,28); //停电作业方案
-                Cell cell30 = crateCell(workbook,row,29); //方案编制人
-                Cell cell31 = crateCell(workbook,row,30); //现场查勘人
+                Cell cell29 = crateCell(workbook,row,29); //停电作业方案
+                Cell cell30 = crateCell(workbook,row,30); //方案编制人
+                Cell cell31 = crateCell(workbook,row,31); //现场查勘人
 
 
                 ReserveElectricityWork reserveManagement = list.get(i);
@@ -174,6 +174,7 @@ public class ReserveProcessProjectExportUtil {
                 Cell cell16 = crateCell(workbook,row,16); //需求类型
                 Cell cell17 = crateCell(workbook,row,17); //费用估算
                 Cell cell18 = crateCell(workbook,row,18); //备注
+
                 Cell cell19 = crateCell(workbook,row,19); //需求提报人
                 Cell cell20 = crateCell(workbook,row,20); //业主储备专职
                 Cell cell21 = crateCell(workbook,row,21); //业主配网专职
@@ -181,9 +182,10 @@ public class ReserveProcessProjectExportUtil {
                 Cell cell23 = crateCell(workbook,row,23); //业主物资专职
                 Cell cell24 = crateCell(workbook,row,24); //技经人员
                 Cell cell25 = crateCell(workbook,row,25); //运维人员
+
                 Cell cell26 = crateCell(workbook,row,26); //设计人员
-                Cell cell27 = crateCell(workbook,row,26); //概算编制人员
-                Cell cell28 = crateCell(workbook,row,27); //不停电作业查勘人
+                Cell cell27 = crateCell(workbook,row,27); //概算编制人员
+                Cell cell28 = crateCell(workbook,row,28); //不停电作业查勘人
 
                 ReserveProcessProject reserveManagement = list.get(i);
 
@@ -210,6 +212,7 @@ public class ReserveProcessProjectExportUtil {
                     cell17.setCellValue(Double.parseDouble(costEstimateStr));
                 }
                 cell18.setCellValue(reserveManagement.getBasicRemarks());
+
                 cell19.setCellValue(reserveManagement.getRequester());
                 cell20.setCellValue(reserveManagement.getOwnerReserveFullTime());
                 cell21.setCellValue(reserveManagement.getOwnerDistributionNerworkFullTime());
@@ -502,8 +505,6 @@ public class ReserveProcessProjectExportUtil {
                 Cell cell27 = crateCell(workbook,row,27); //设计预制化信息-预制化描述
 
 
-
-
                 ReservePreconstruction reserveManagement = list.get(i);
 
                 cell0.setCellValue(String.valueOf(index++));
@@ -695,7 +696,7 @@ public class ReserveProcessProjectExportUtil {
     public void exportSummary(HttpServletResponse response, XSSFWorkbook workbook, List<ReserveSummary> 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

@@ -283,9 +283,9 @@ public class ReserveProcessProjectProUtil {
                 reserveManagement.setConfessCivilFoundation((String) importUtil.getCellValue(row,22));
                 reserveManagement.setConfessPrefab((String) importUtil.getCellValue(row,23));
                 reserveManagement.setConfessPrefabDescription((String) importUtil.getCellValue(row,24));
-                reserveManagement.setDesignCivilFoundation("");
-                reserveManagement.setCastInPlaceList("");
-                reserveManagement.setDesignList("");
+//                reserveManagement.setDesignCivilFoundation("");
+//                reserveManagement.setCastInPlaceList("");
+//                reserveManagement.setDesignList("");
 
 
                 if (list.size() == 0){

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

@@ -13,6 +13,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.service.BudgetStatsService;
 import com.jeeplus.modules.sg.managementcenter.materialproject.util.ImportUtil;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.apache.shiro.authz.annotation.Logical;
@@ -52,6 +53,9 @@ public class CompanyReviewController extends BaseController {
     @Autowired
     private ReserveSummaryProcessService summaryProcessService;
 
+    @Autowired
+    private BudgetStatsService statsService;
+
     @ModelAttribute
     public CompanyReview get(@RequestParam(required = false) String id) {
         CompanyReview entity = null;
@@ -107,7 +111,7 @@ public class CompanyReviewController extends BaseController {
                     }else if (c.getPassProvincialCompanyReview().equals("取消") & a.getProjectReserveId().equals(c.getProjectReserveId())){
                         //取消的状态
                         //流程开始的状态
-                        if (a.getIncludeReserve().equals("是")){
+                        if (a.getIncludeReserve().equals("是") & !a.getProcessStatus().equals("2")){
                             //修改基础表的流程字段为取消，修改汇总表的是否纳入储备为取消，将取消原因放入到汇总表的取消原因说明字段 结束流程
                             projectService.updateProcessStatus(a.getProjectReserveId(),3);
 
@@ -124,10 +128,10 @@ public class CompanyReviewController extends BaseController {
 
                             //将act_ru_task表中的任务删除
                             ActRunTaskTest taskTest = summaryProcessService.getByProId(c.getProjectReserveId());
-                            summaryProcessService.deleteByProcId(taskTest.getProcDefId(),"");
+                            summaryProcessService.deleteByProcId(taskTest.getProcInsId(),"");
                             //删除联合审图的并行任务
-                            summaryProcessService.deleteExecution(taskTest.getProcDefId(),"sid-A0FF4858-9940-4B37-B14E-2DEA24AB37E5");
-                            summaryProcessService.deleteExecution(taskTest.getProcDefId(),"sid-C92A1CEE-3775-4A11-AAD0-64FA836AC97C");
+                            summaryProcessService.deleteExecution(taskTest.getProcInsId(),"sid-A0FF4858-9940-4B37-B14E-2DEA24AB37E5");
+                            summaryProcessService.deleteExecution(taskTest.getProcInsId(),"sid-C92A1CEE-3775-4A11-AAD0-64FA836AC97C");
 
                         }
                     }
@@ -234,35 +238,53 @@ public class CompanyReviewController extends BaseController {
             j.setSuccess(false);
             j.setMsg(errMsg);
             return j;
+
         }
+        //获取汇总表中的数据  物料编码 和 是否纳入储备字段
+        List<ReserveSummary> allCode = statisticService.getAllCode();
+
         //修改时的两种情况
         //1、在流程进行中修改(修改基础表的流程字段为取消，修改汇总表的是否纳入储备为取消，将取消原因放入到汇总表的取消原因说明字段 结束流程)
         //2、流程未开始修改（正常操作不进行其他处理）
-        if (companyReview.getPassProvincialCompanyReview().equals("取消")){
-            projectService.updateProcessStatus(companyReview.getProjectReserveId(),3);
-
-            ReserveSummary summary = new ReserveSummary();
-            summary.setProjectReserveId(companyReview.getProjectReserveId());
-            ReserveSummary summary1 = statisticService.queryByProjectReserveId(summary);
-            summary1.setIncludeReserve("取消");
-            summary1.setReasonForCancel(companyReview.getReviewComments());
-            statisticService.update(summary1);
-
-            //取消流程   将流程表中的流程信息删除
-            service.deleteActivityByProId(companyReview.getProjectReserveId());
-            //将act_ru_task表中的任务删除
-            ActRunTaskTest taskTest = summaryProcessService.getByProId(companyReview.getProjectReserveId());
-            summaryProcessService.deleteByProcId(taskTest.getProcDefId(),"");
-            //删除联合审图的并行任务
-            summaryProcessService.deleteExecution(taskTest.getProcDefId(),"sid-A0FF4858-9940-4B37-B14E-2DEA24AB37E5");
-            summaryProcessService.deleteExecution(taskTest.getProcDefId(),"sid-C92A1CEE-3775-4A11-AAD0-64FA836AC97C");
-
-        }
-        //新增或编辑表单保存
-        service.update(companyReview);
+        allCode.forEach(a->{
+            if (companyReview.getPassProvincialCompanyReview().equals("取消") &a.getIncludeReserve().equals("是") & !a.getProcessStatus().equals("2")){
+
+                ReserveSummary summary = new ReserveSummary();
+                summary.setProjectReserveId(companyReview.getProjectReserveId());
+                ReserveSummary summary1 = statisticService.queryByProjectReserveId(summary);
+                summary1.setIncludeReserve("取消");
+                summary1.setReasonForCancel(companyReview.getReviewComments());
+
+
+                //取消流程   将流程表中的流程信息删除
+                service.deleteActivityByProId(companyReview.getProjectReserveId());
+                //将act_ru_task表中的任务删除
+                ActRunTaskTest taskTest = summaryProcessService.getByProId(companyReview.getProjectReserveId());
+                summaryProcessService.deleteByProcId(taskTest.getProcInsId(),"");
+                //删除联合审图的并行任务
+                String taskKey = summaryProcessService.selectTaskKey(taskTest.getProcInsId(), "联合审图");
+                String taskKey2 = summaryProcessService.selectTaskKey(taskTest.getProcInsId(), "项目经理审图");
+                String taskKey3 = summaryProcessService.selectTaskKey(taskTest.getProcInsId(), "技经人员审预算");
+                summaryProcessService.deleteExecution(taskTest.getProcInsId(),taskKey);
+                summaryProcessService.deleteExecution(taskTest.getProcInsId(),taskKey2);
+                summaryProcessService.deleteExecution(taskTest.getProcInsId(),taskKey3);
+
+                projectService.updateProcessStatus(companyReview.getProjectReserveId(),3);
+                statisticService.update(summary1);
+                //新增或编辑表单保存
+                service.update(companyReview);
+
+                j.setSuccess(true);
+                j.setMsg("修改省公司评审信息成功");
+            }else {
+                //新增或编辑表单保存
+                service.update(companyReview);
+
+                j.setSuccess(true);
+                j.setMsg("修改省公司评审信息成功");
+            }
+        });
 
-        j.setSuccess(true);
-        j.setMsg("修改储备项目基本信息成功");
         return j;
     }
 

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

@@ -16,7 +16,6 @@ import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.entity.Reser
 import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.service.*;
 import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.utils.DataList;
 import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.utils.ReserveProcessProjectProUtil;
-import com.jeeplus.modules.cg.reservemanagementcenter.statisticalTable.entity.MaterialData;
 import com.jeeplus.modules.cg.reservemanagementcenter.statisticalTable.service.EnginnerQueryService;
 import com.jeeplus.modules.sg.managementcenter.materialinfo.entity.MaterialInfo;
 import com.jeeplus.modules.sg.managementcenter.materialproject.util.ImportUtil;
@@ -292,229 +291,185 @@ public class ProcessController extends BaseController {
                         }
                         double divide = jcSum/bfSum;
 
-                        //获取所有的 物料编码，扩展描述，总量信息
-                        List<MaterialData> materialData = queryService.findAllCount();
-
-                        //现场浇筑清单
-                        Double decimal1 = 0.0;
-                        Double decimal2 = 0.0;
-                        Double decimal3 = 0.0;
-                        Double decimal4 = 0.0;
-                        Double decimal5 = 0.0;
-                        Double decimal6 = 0.0;
-
-                        //预制化清单
-                        Double decimal7 = 0.0;
-                        Double decimal8 = 0.0;
-                        Double decimal9 = 0.0;
-                        Double decimal10 = 0.0;
-                        Double decimal11 = 0.0;
-                        Double decimal12 = 0.0;
-                        Double decimal13 = 0.0;
-                        Double decimal14 = 0.0;
-                        Double decimal15 = 0.0;
-                        Double decimal16 = 0.0;
-                        Double decimal17 = 0.0;
-                        Double decimal18 = 0.0;
-                        Double decimal19 = 0.0;
-                        for (int i=0;i<materialData.size();i++){
-                            if (materialData.get(i).getMaterialCode().equals("乙供")){
-                                //现场浇筑清单
-                                if (materialData.get(i).getExtendDescription().equals("配农网用,整套杆,GNH31-13-B")
-                                        & StringUtils.isNotEmpty(materialData.get(i).getTotalCount())){
-                                    decimal1 = decimal1 + Double.valueOf(materialData.get(i).getTotalCount());
-                                }
-                                if (materialData.get(i).getExtendDescription().equals("GNH35-13；灌注桩")
-                                        & StringUtils.isNotEmpty(materialData.get(i).getTotalCount())){
-                                    decimal2 = decimal2 + Double.valueOf(materialData.get(i).getTotalCount());
-                                }
-                                if (materialData.get(i).getExtendDescription().equals("GNH39-13；灌注桩")
-                                        & StringUtils.isNotEmpty(materialData.get(i).getTotalCount())){
-                                    decimal3 = decimal3 + Double.valueOf(materialData.get(i).getTotalCount());
-                                }
-                                if (materialData.get(i).getExtendDescription().equals("GNH31-13；台阶式基础")
-                                        & StringUtils.isNotEmpty(materialData.get(i).getTotalCount())){
-                                    decimal4 = decimal4 + Double.valueOf(materialData.get(i).getTotalCount());
-                                }
-                                if (materialData.get(i).getExtendDescription().equals("GNH35-13；台阶式基础")
-                                        & StringUtils.isNotEmpty(materialData.get(i).getTotalCount())){
-                                    decimal5 = decimal5 + Double.valueOf(materialData.get(i).getTotalCount());
-                                }
-                                if (materialData.get(i).getExtendDescription().equals("GNH39-13；台阶式基础")
-                                        & StringUtils.isNotEmpty(materialData.get(i).getTotalCount())){
-                                    decimal6 = decimal6 + Double.valueOf(materialData.get(i).getTotalCount());
-                                }
-
-                                //预制化清单
-                                if (materialData.get(i).getExtendDescription().equals("预制化排管，2×3（5+1），≤100kN")
-                                        & StringUtils.isNotEmpty(materialData.get(i).getTotalCount())){
-                                    decimal7 = decimal7 + Double.valueOf(materialData.get(i).getTotalCount());
-                                }
-                                if (materialData.get(i).getExtendDescription().equals("预制化排管，2×4（7+1），≤100kN")
-                                        & StringUtils.isNotEmpty(materialData.get(i).getTotalCount())){
-                                    decimal8 = decimal8 + Double.valueOf(materialData.get(i).getTotalCount());
-                                }
-                                if (materialData.get(i).getExtendDescription().equals("预制化排管，3×4（11+1），≤100kN")
-                                        & StringUtils.isNotEmpty(materialData.get(i).getTotalCount())){
-                                    decimal9 = decimal9 + Double.valueOf(materialData.get(i).getTotalCount());
-                                }
-                                if (materialData.get(i).getExtendDescription().equals("预制化排管，4×3（11+1），≤100kN")
-                                        & StringUtils.isNotEmpty(materialData.get(i).getTotalCount())){
-                                    decimal10 = decimal10 + Double.valueOf(materialData.get(i).getTotalCount());
-                                }
-                                if (materialData.get(i).getExtendDescription().equals("预制化排管，4×4（15+1），≤100kN")
-                                        & StringUtils.isNotEmpty(materialData.get(i).getTotalCount())){
-                                    decimal11 = decimal11 + Double.valueOf(materialData.get(i).getTotalCount());
-                                }
-                                if (materialData.get(i).getExtendDescription().equals("预制化排管，4×5（19+1），≤100kN")
-                                        & StringUtils.isNotEmpty(materialData.get(i).getTotalCount())){
-                                    decimal12 = decimal12 + Double.valueOf(materialData.get(i).getTotalCount());
-                                }
-                                if (materialData.get(i).getExtendDescription().equals("预制化直线井，3×2.0×1.9，人孔")
-                                        & StringUtils.isNotEmpty(materialData.get(i).getTotalCount())){
-                                    decimal13 = decimal13 + Double.valueOf(materialData.get(i).getTotalCount());
-                                }
-                                if (materialData.get(i).getExtendDescription().equals("预制化三通井，3×2.8×1.9，人孔")
-                                        & StringUtils.isNotEmpty(materialData.get(i).getTotalCount())){
-                                    decimal14 = decimal14 + Double.valueOf(materialData.get(i).getTotalCount());
-                                }
-                                if (materialData.get(i).getExtendDescription().equals("预制化八角井，4.0×4.0×1.9，人孔")
-                                        & StringUtils.isNotEmpty(materialData.get(i).getTotalCount())){
-                                    decimal15 = decimal15 + Double.valueOf(materialData.get(i).getTotalCount());
-                                }
-                                if (materialData.get(i).getExtendDescription().equals("两进两出环网箱基础预制，3.2×1.15×1.6")
-                                        & StringUtils.isNotEmpty(materialData.get(i).getTotalCount())){
-                                    decimal16 = decimal16 + Double.valueOf(materialData.get(i).getTotalCount());
-                                }
-                                if (materialData.get(i).getExtendDescription().equals("两进四出环网箱基础预制，4.0×1.15×1.6")
-                                        & StringUtils.isNotEmpty(materialData.get(i).getTotalCount())){
-                                    decimal17 = decimal17 + Double.valueOf(materialData.get(i).getTotalCount());
-                                }
-                                if (materialData.get(i).getExtendDescription().equals("紧凑型箱变基础预制，2.45×1.15×1.6")
-                                        & StringUtils.isNotEmpty(materialData.get(i).getTotalCount())){
-                                    decimal18 = decimal18 + Double.valueOf(materialData.get(i).getTotalCount());
-                                }
-                                if (materialData.get(i).getExtendDescription().equals("标准型箱变基础预制，3.3×2.2×1.6")
-                                        & StringUtils.isNotEmpty(materialData.get(i).getTotalCount())){
-                                    decimal19 = decimal19 + Double.valueOf(materialData.get(i).getTotalCount());
-                                }
-
-                            }
-
-                        }
-                    /*materialData.forEach(da ->{
-                        if (da.getMaterialCode().equals("500128790")){
-                            String extendDescription = da.getExtendDescription();
-                            //使用switch
-                            switch (extendDescription){
-                                case "配农网用,整套杆,GNH31-13-B":
-                                    if (StringUtils.isNotEmpty(da.getTotalCount())){
-                                        decimal1.add(BigDecimal.valueOf(Double.valueOf(da.getTotalCount())));
-                                        break;
-                                    }
-                                    break;
-                                case "GNH35-13；灌注桩":
-                                    if (da.getTotalCount() != null){
-                                        decimal2.add(BigDecimal.valueOf(Double.valueOf(da.getTotalCount())));
-                                    }
-                                    break;
-                                case "GNH39-13；灌注桩":
-                                    if (da.getTotalCount() != null){
-                                        decimal3.add(BigDecimal.valueOf(Double.valueOf(da.getTotalCount())));
-                                    }
-                                    break;
-                                case "GNH31-13；台阶式基础":
-                                    if (da.getTotalCount() != null){
-                                        decimal4.add(BigDecimal.valueOf(Double.valueOf(da.getTotalCount())));
-                                    }
-                                    break;
-                                case "GNH35-13；台阶式基础":
-                                    if (da.getTotalCount() != null){
-                                        decimal5.add(BigDecimal.valueOf(Double.valueOf(da.getTotalCount())));
-                                    }
-                                    break;
-                                case "GNH39-13；台阶式基础":
-                                    if (da.getTotalCount() != null){
-                                        decimal6.add(BigDecimal.valueOf(Double.valueOf(da.getTotalCount())));
-                                    }
-                                    break;
-                            }
-                            if (extendDescription.equals("配农网用,整套杆,GNH31-13-B") & StringUtils.isNotEmpty(da.getTotalCount())){
-                                decimal1 = new BigDecimal(Double.valueOf(da.getTotalCount());
-                                decimal1.add(BigDecimal.valueOf(Double.valueOf(da.getTotalCount())));
-                            }
-
-                        }
-                    });*/
-
-                        //设置    现场浇筑清单数据
-                        String castInPlaceList = "";
-                        if (StringUtils.isNotEmpty(decimal1.toString()) & decimal1 != 0.0){
-                            castInPlaceList = decimal1.toString() + "基" + "配农网用,整套杆,GNH31-13-B";
-                        }
-                        if (StringUtils.isNotEmpty(decimal2.toString()) & decimal2 != 0.0){
-                            castInPlaceList = castInPlaceList + ";" + decimal2.toString() + "基" + "GNH35-13；灌注桩";
-                        }
-                        if (StringUtils.isNotEmpty(decimal3.toString()) & decimal3 != 0.0){
-                            castInPlaceList = castInPlaceList + ";" + decimal3.toString() + "基" + "GNH39-13；灌注桩";
-                        }
-                        if (StringUtils.isNotEmpty(decimal4.toString()) & decimal4 != 0.0){
-                            castInPlaceList = castInPlaceList + ";" + decimal4.toString() + "基" + "GNH31-13；台阶式基础";
-                        }
-                        if (StringUtils.isNotEmpty(decimal5.toString()) & decimal5 != 0.0){
-                            castInPlaceList = castInPlaceList + ";" + decimal5.toString() + "基" + "GNH35-13；台阶式基础";
-                        }
-                        if (StringUtils.isNotEmpty(decimal6.toString()) & decimal6 != 0.0){
-                            castInPlaceList = castInPlaceList + ";" + decimal6.toString() + "基" + "GNH39-13；台阶式基础";
-                        }
-
-                        String designList = "";
-                        if (StringUtils.isNotEmpty(decimal7.toString()) & decimal7 != 0.0){
-                            designList = decimal7.toString() + "米" + "预制化排管，2×3（5+1），≤100kN";
-                        }
-                        if (StringUtils.isNotEmpty(decimal8.toString()) & decimal8 != 0.0){
-                            designList = designList + ";" + decimal8.toString() + "米" + "预制化排管，2×4（7+1），≤100kN";
-                        }
-                        if (StringUtils.isNotEmpty(decimal9.toString()) & decimal9 != 0.0){
-                            designList = designList + ";" + decimal9.toString() + "米" + "预制化排管，3×4（11+1），≤100kN";
-                        }
-                        if (StringUtils.isNotEmpty(decimal10.toString()) & decimal10 != 0.0){
-                            designList = designList + ";" + decimal10.toString() + "米" + "预制化排管，4×3（11+1），≤100kN";
-                        }
-                        if (StringUtils.isNotEmpty(decimal11.toString()) & decimal11 != 0.0){
-                            designList = designList + ";" + decimal11.toString() + "米" + "预制化排管，4×4（15+1），≤100kN";
-                        }
-                        if (StringUtils.isNotEmpty(decimal12.toString()) & decimal12 != 0.0){
-                            designList = designList + ";" + decimal12.toString() + "米" + "预制化排管，4×5（19+1），≤100kN";
-                        }
-                        if (StringUtils.isNotEmpty(decimal13.toString()) & decimal13 != 0.0){
-                            designList = designList + ";" + decimal13.toString() + "座" + "预制化直线井，3×2.0×1.9，人孔";
-                        }
-                        if (StringUtils.isNotEmpty(decimal14.toString()) & decimal14 != 0.0){
-                            designList = designList + ";" + decimal14.toString() + "座" + "预制化三通井，3×2.8×1.9，人孔";
-                        }
-                        if (StringUtils.isNotEmpty(decimal15.toString()) & decimal15 != 0.0){
-                            designList = designList + ";" + decimal15.toString() + "座" + "预制化八角井，4.0×4.0×1.9，人孔";
-                        }
-                        if (StringUtils.isNotEmpty(decimal16.toString()) & decimal16 != 0.0){
-                            designList = designList + ";" + decimal16.toString() + "座" + "两进两出环网箱基础预制，3.2×1.15×1.6";
-                        }
-                        if (StringUtils.isNotEmpty(decimal17.toString()) & decimal17 != 0.0){
-                            designList = designList + ";" + decimal17.toString() + "座" + "两进四出环网箱基础预制，4.0×1.15×1.6";
-                        }
-                        if (StringUtils.isNotEmpty(decimal18.toString()) & decimal18 != 0.0){
-                            designList = designList + ";" + decimal18.toString() + "座" + "紧凑型箱变基础预制，2.45×1.15×1.6";
-                        }
-                        if (StringUtils.isNotEmpty(decimal19.toString()) & decimal19 != 0.0){
-                            designList = designList + ";" + decimal19.toString() + "座" + "标准型箱变基础预制，3.3×2.2×1.6";
-                        }
-
-                        if (divide >0 ){
-                            //修改  是否含新建土建基础/包封 为是
-                            preconstructService.updateMetion("是",castInPlaceList,designList);
-                        }else {
-                            preconstructService.updateMetion("否",castInPlaceList,designList);
-                        }
+//                        //获取所有的 物料编码，扩展描述，总量信息
+//                        List<MaterialData> materialData = queryService.findAllCount();
+//
+//                        //现场浇筑清单
+//                        Double decimal1 = 0.0;
+//                        Double decimal2 = 0.0;
+//                        Double decimal3 = 0.0;
+//                        Double decimal4 = 0.0;
+//                        Double decimal5 = 0.0;
+//                        Double decimal6 = 0.0;
+//
+//                        //预制化清单
+//                        Double decimal7 = 0.0;
+//                        Double decimal8 = 0.0;
+//                        Double decimal9 = 0.0;
+//                        Double decimal10 = 0.0;
+//                        Double decimal11 = 0.0;
+//                        Double decimal12 = 0.0;
+//                        Double decimal13 = 0.0;
+//                        Double decimal14 = 0.0;
+//                        Double decimal15 = 0.0;
+//                        Double decimal16 = 0.0;
+//                        Double decimal17 = 0.0;
+//                        Double decimal18 = 0.0;
+//                        Double decimal19 = 0.0;
+//                        for (int i=0;i<materialData.size();i++){
+//                            if (materialData.get(i).getMaterialCode().equals("乙供")){
+//                                //现场浇筑清单
+//                                if (materialData.get(i).getExtendDescription().equals("配农网用,整套杆,GNH31-13-B")
+//                                        & StringUtils.isNotEmpty(materialData.get(i).getTotalCount())){
+//                                    decimal1 = decimal1 + Double.valueOf(materialData.get(i).getTotalCount());
+//                                }
+//                                if (materialData.get(i).getExtendDescription().equals("GNH35-13；灌注桩")
+//                                        & StringUtils.isNotEmpty(materialData.get(i).getTotalCount())){
+//                                    decimal2 = decimal2 + Double.valueOf(materialData.get(i).getTotalCount());
+//                                }
+//                                if (materialData.get(i).getExtendDescription().equals("GNH39-13；灌注桩")
+//                                        & StringUtils.isNotEmpty(materialData.get(i).getTotalCount())){
+//                                    decimal3 = decimal3 + Double.valueOf(materialData.get(i).getTotalCount());
+//                                }
+//                                if (materialData.get(i).getExtendDescription().equals("GNH31-13；台阶式基础")
+//                                        & StringUtils.isNotEmpty(materialData.get(i).getTotalCount())){
+//                                    decimal4 = decimal4 + Double.valueOf(materialData.get(i).getTotalCount());
+//                                }
+//                                if (materialData.get(i).getExtendDescription().equals("GNH35-13；台阶式基础")
+//                                        & StringUtils.isNotEmpty(materialData.get(i).getTotalCount())){
+//                                    decimal5 = decimal5 + Double.valueOf(materialData.get(i).getTotalCount());
+//                                }
+//                                if (materialData.get(i).getExtendDescription().equals("GNH39-13；台阶式基础")
+//                                        & StringUtils.isNotEmpty(materialData.get(i).getTotalCount())){
+//                                    decimal6 = decimal6 + Double.valueOf(materialData.get(i).getTotalCount());
+//                                }
+//
+//                                //预制化清单
+//                                if (materialData.get(i).getExtendDescription().equals("预制化排管，2×3（5+1），≤100kN")
+//                                        & StringUtils.isNotEmpty(materialData.get(i).getTotalCount())){
+//                                    decimal7 = decimal7 + Double.valueOf(materialData.get(i).getTotalCount());
+//                                }
+//                                if (materialData.get(i).getExtendDescription().equals("预制化排管，2×4（7+1），≤100kN")
+//                                        & StringUtils.isNotEmpty(materialData.get(i).getTotalCount())){
+//                                    decimal8 = decimal8 + Double.valueOf(materialData.get(i).getTotalCount());
+//                                }
+//                                if (materialData.get(i).getExtendDescription().equals("预制化排管，3×4（11+1），≤100kN")
+//                                        & StringUtils.isNotEmpty(materialData.get(i).getTotalCount())){
+//                                    decimal9 = decimal9 + Double.valueOf(materialData.get(i).getTotalCount());
+//                                }
+//                                if (materialData.get(i).getExtendDescription().equals("预制化排管，4×3（11+1），≤100kN")
+//                                        & StringUtils.isNotEmpty(materialData.get(i).getTotalCount())){
+//                                    decimal10 = decimal10 + Double.valueOf(materialData.get(i).getTotalCount());
+//                                }
+//                                if (materialData.get(i).getExtendDescription().equals("预制化排管，4×4（15+1），≤100kN")
+//                                        & StringUtils.isNotEmpty(materialData.get(i).getTotalCount())){
+//                                    decimal11 = decimal11 + Double.valueOf(materialData.get(i).getTotalCount());
+//                                }
+//                                if (materialData.get(i).getExtendDescription().equals("预制化排管，4×5（19+1），≤100kN")
+//                                        & StringUtils.isNotEmpty(materialData.get(i).getTotalCount())){
+//                                    decimal12 = decimal12 + Double.valueOf(materialData.get(i).getTotalCount());
+//                                }
+//                                if (materialData.get(i).getExtendDescription().equals("预制化直线井，3×2.0×1.9，人孔")
+//                                        & StringUtils.isNotEmpty(materialData.get(i).getTotalCount())){
+//                                    decimal13 = decimal13 + Double.valueOf(materialData.get(i).getTotalCount());
+//                                }
+//                                if (materialData.get(i).getExtendDescription().equals("预制化三通井，3×2.8×1.9，人孔")
+//                                        & StringUtils.isNotEmpty(materialData.get(i).getTotalCount())){
+//                                    decimal14 = decimal14 + Double.valueOf(materialData.get(i).getTotalCount());
+//                                }
+//                                if (materialData.get(i).getExtendDescription().equals("预制化八角井，4.0×4.0×1.9，人孔")
+//                                        & StringUtils.isNotEmpty(materialData.get(i).getTotalCount())){
+//                                    decimal15 = decimal15 + Double.valueOf(materialData.get(i).getTotalCount());
+//                                }
+//                                if (materialData.get(i).getExtendDescription().equals("两进两出环网箱基础预制，3.2×1.15×1.6")
+//                                        & StringUtils.isNotEmpty(materialData.get(i).getTotalCount())){
+//                                    decimal16 = decimal16 + Double.valueOf(materialData.get(i).getTotalCount());
+//                                }
+//                                if (materialData.get(i).getExtendDescription().equals("两进四出环网箱基础预制，4.0×1.15×1.6")
+//                                        & StringUtils.isNotEmpty(materialData.get(i).getTotalCount())){
+//                                    decimal17 = decimal17 + Double.valueOf(materialData.get(i).getTotalCount());
+//                                }
+//                                if (materialData.get(i).getExtendDescription().equals("紧凑型箱变基础预制，2.45×1.15×1.6")
+//                                        & StringUtils.isNotEmpty(materialData.get(i).getTotalCount())){
+//                                    decimal18 = decimal18 + Double.valueOf(materialData.get(i).getTotalCount());
+//                                }
+//                                if (materialData.get(i).getExtendDescription().equals("标准型箱变基础预制，3.3×2.2×1.6")
+//                                        & StringUtils.isNotEmpty(materialData.get(i).getTotalCount())){
+//                                    decimal19 = decimal19 + Double.valueOf(materialData.get(i).getTotalCount());
+//                                }
+//
+//                            }
+//
+//                        }
+//
+//                        //设置    现场浇筑清单数据
+//                        String castInPlaceList = "";
+//                        if (StringUtils.isNotEmpty(decimal1.toString()) & decimal1 != 0.0){
+//                            castInPlaceList = decimal1.toString() + "基" + "配农网用,整套杆,GNH31-13-B";
+//                        }
+//                        if (StringUtils.isNotEmpty(decimal2.toString()) & decimal2 != 0.0){
+//                            castInPlaceList = castInPlaceList + ";" + decimal2.toString() + "基" + "GNH35-13；灌注桩";
+//                        }
+//                        if (StringUtils.isNotEmpty(decimal3.toString()) & decimal3 != 0.0){
+//                            castInPlaceList = castInPlaceList + ";" + decimal3.toString() + "基" + "GNH39-13；灌注桩";
+//                        }
+//                        if (StringUtils.isNotEmpty(decimal4.toString()) & decimal4 != 0.0){
+//                            castInPlaceList = castInPlaceList + ";" + decimal4.toString() + "基" + "GNH31-13；台阶式基础";
+//                        }
+//                        if (StringUtils.isNotEmpty(decimal5.toString()) & decimal5 != 0.0){
+//                            castInPlaceList = castInPlaceList + ";" + decimal5.toString() + "基" + "GNH35-13；台阶式基础";
+//                        }
+//                        if (StringUtils.isNotEmpty(decimal6.toString()) & decimal6 != 0.0){
+//                            castInPlaceList = castInPlaceList + ";" + decimal6.toString() + "基" + "GNH39-13；台阶式基础";
+//                        }
+//
+//                        String designList = "";
+//                        if (StringUtils.isNotEmpty(decimal7.toString()) & decimal7 != 0.0){
+//                            designList = decimal7.toString() + "米" + "预制化排管，2×3（5+1），≤100kN";
+//                        }
+//                        if (StringUtils.isNotEmpty(decimal8.toString()) & decimal8 != 0.0){
+//                            designList = designList + ";" + decimal8.toString() + "米" + "预制化排管，2×4（7+1），≤100kN";
+//                        }
+//                        if (StringUtils.isNotEmpty(decimal9.toString()) & decimal9 != 0.0){
+//                            designList = designList + ";" + decimal9.toString() + "米" + "预制化排管，3×4（11+1），≤100kN";
+//                        }
+//                        if (StringUtils.isNotEmpty(decimal10.toString()) & decimal10 != 0.0){
+//                            designList = designList + ";" + decimal10.toString() + "米" + "预制化排管，4×3（11+1），≤100kN";
+//                        }
+//                        if (StringUtils.isNotEmpty(decimal11.toString()) & decimal11 != 0.0){
+//                            designList = designList + ";" + decimal11.toString() + "米" + "预制化排管，4×4（15+1），≤100kN";
+//                        }
+//                        if (StringUtils.isNotEmpty(decimal12.toString()) & decimal12 != 0.0){
+//                            designList = designList + ";" + decimal12.toString() + "米" + "预制化排管，4×5（19+1），≤100kN";
+//                        }
+//                        if (StringUtils.isNotEmpty(decimal13.toString()) & decimal13 != 0.0){
+//                            designList = designList + ";" + decimal13.toString() + "座" + "预制化直线井，3×2.0×1.9，人孔";
+//                        }
+//                        if (StringUtils.isNotEmpty(decimal14.toString()) & decimal14 != 0.0){
+//                            designList = designList + ";" + decimal14.toString() + "座" + "预制化三通井，3×2.8×1.9，人孔";
+//                        }
+//                        if (StringUtils.isNotEmpty(decimal15.toString()) & decimal15 != 0.0){
+//                            designList = designList + ";" + decimal15.toString() + "座" + "预制化八角井，4.0×4.0×1.9，人孔";
+//                        }
+//                        if (StringUtils.isNotEmpty(decimal16.toString()) & decimal16 != 0.0){
+//                            designList = designList + ";" + decimal16.toString() + "座" + "两进两出环网箱基础预制，3.2×1.15×1.6";
+//                        }
+//                        if (StringUtils.isNotEmpty(decimal17.toString()) & decimal17 != 0.0){
+//                            designList = designList + ";" + decimal17.toString() + "座" + "两进四出环网箱基础预制，4.0×1.15×1.6";
+//                        }
+//                        if (StringUtils.isNotEmpty(decimal18.toString()) & decimal18 != 0.0){
+//                            designList = designList + ";" + decimal18.toString() + "座" + "紧凑型箱变基础预制，2.45×1.15×1.6";
+//                        }
+//                        if (StringUtils.isNotEmpty(decimal19.toString()) & decimal19 != 0.0){
+//                            designList = designList + ";" + decimal19.toString() + "座" + "标准型箱变基础预制，3.3×2.2×1.6";
+//                        }
+//
+//                        if (divide >0 ){
+//                            //修改  是否含新建土建基础/包封 为是
+//                            preconstructService.updateMetion("是",castInPlaceList,designList);
+//                        }else {
+//                            preconstructService.updateMetion("否",castInPlaceList,designList);
+//                        }
 
                     }else {
                         //修改项目设计单位上传文件部分
@@ -616,243 +571,243 @@ public class ProcessController extends BaseController {
                     Double allNum = reserveProcessService.getAllNum("500138348");
                     workService.updateSwitchNum(allNum == null ? "" : allNum + "");
 
-                    //获取新建土建包封数据总和
-                    double bfSum = 0.0;
-                    if (queryService.getTJBFData() != null){
-                        bfSum = bfSum + queryService.getTJBFData();
-
-                    }
-                    //获取新建土建基础数据总和
-                    double jcSum = 0.0;
-                    if (queryService.getTJJCData() != null){
-                        jcSum = jcSum + queryService.getTJJCData();
-
-                    }
-                    double divide = jcSum/bfSum;
-
-                    //获取所有的 物料编码，扩展描述，总量信息
-                    List<MaterialData> materialData = queryService.findAllCount();
-
-                    //现场浇筑清单
-                    Double decimal1 = 0.0;
-                    Double decimal2 = 0.0;
-                    Double decimal3 = 0.0;
-                    Double decimal4 = 0.0;
-                    Double decimal5 = 0.0;
-                    Double decimal6 = 0.0;
-
-                    //预制化清单
-                    Double decimal7 = 0.0;
-                    Double decimal8 = 0.0;
-                    Double decimal9 = 0.0;
-                    Double decimal10 = 0.0;
-                    Double decimal11 = 0.0;
-                    Double decimal12 = 0.0;
-                    Double decimal13 = 0.0;
-                    Double decimal14 = 0.0;
-                    Double decimal15 = 0.0;
-                    Double decimal16 = 0.0;
-                    Double decimal17 = 0.0;
-                    Double decimal18 = 0.0;
-                    Double decimal19 = 0.0;
-                    for (int i=0;i<materialData.size();i++){
-                        if (materialData.get(i).getMaterialCode().equals("乙供")){
-                            //现场浇筑清单
-                            if (materialData.get(i).getExtendDescription().equals("配农网用,整套杆,GNH31-13-B")
-                                    & StringUtils.isNotEmpty(materialData.get(i).getTotalCount())){
-                                decimal1 = decimal1 + Double.valueOf(materialData.get(i).getTotalCount());
-                            }
-                            if (materialData.get(i).getExtendDescription().equals("GNH35-13；灌注桩")
-                                    & StringUtils.isNotEmpty(materialData.get(i).getTotalCount())){
-                                decimal2 = decimal2 + Double.valueOf(materialData.get(i).getTotalCount());
-                            }
-                            if (materialData.get(i).getExtendDescription().equals("GNH39-13；灌注桩")
-                                    & StringUtils.isNotEmpty(materialData.get(i).getTotalCount())){
-                                decimal3 = decimal3 + Double.valueOf(materialData.get(i).getTotalCount());
-                            }
-                            if (materialData.get(i).getExtendDescription().equals("GNH31-13；台阶式基础")
-                                    & StringUtils.isNotEmpty(materialData.get(i).getTotalCount())){
-                                decimal4 = decimal4 + Double.valueOf(materialData.get(i).getTotalCount());
-                            }
-                            if (materialData.get(i).getExtendDescription().equals("GNH35-13；台阶式基础")
-                                    & StringUtils.isNotEmpty(materialData.get(i).getTotalCount())){
-                                decimal5 = decimal5 + Double.valueOf(materialData.get(i).getTotalCount());
-                            }
-                            if (materialData.get(i).getExtendDescription().equals("GNH39-13；台阶式基础")
-                                    & StringUtils.isNotEmpty(materialData.get(i).getTotalCount())){
-                                decimal6 = decimal6 + Double.valueOf(materialData.get(i).getTotalCount());
-                            }
-
-                            //预制化清单
-                            if (materialData.get(i).getExtendDescription().equals("预制化排管，2×3（5+1），≤100kN")
-                                    & StringUtils.isNotEmpty(materialData.get(i).getTotalCount())){
-                                decimal7 = decimal7 + Double.valueOf(materialData.get(i).getTotalCount());
-                            }
-                            if (materialData.get(i).getExtendDescription().equals("预制化排管，2×4（7+1），≤100kN")
-                                    & StringUtils.isNotEmpty(materialData.get(i).getTotalCount())){
-                                decimal8 = decimal8 + Double.valueOf(materialData.get(i).getTotalCount());
-                            }
-                            if (materialData.get(i).getExtendDescription().equals("预制化排管，3×4（11+1），≤100kN")
-                                    & StringUtils.isNotEmpty(materialData.get(i).getTotalCount())){
-                                decimal9 = decimal9 + Double.valueOf(materialData.get(i).getTotalCount());
-                            }
-                            if (materialData.get(i).getExtendDescription().equals("预制化排管，4×3（11+1），≤100kN")
-                                    & StringUtils.isNotEmpty(materialData.get(i).getTotalCount())){
-                                decimal10 = decimal10 + Double.valueOf(materialData.get(i).getTotalCount());
-                            }
-                            if (materialData.get(i).getExtendDescription().equals("预制化排管，4×4（15+1），≤100kN")
-                                    & StringUtils.isNotEmpty(materialData.get(i).getTotalCount())){
-                                decimal11 = decimal11 + Double.valueOf(materialData.get(i).getTotalCount());
-                            }
-                            if (materialData.get(i).getExtendDescription().equals("预制化排管，4×5（19+1），≤100kN")
-                                    & StringUtils.isNotEmpty(materialData.get(i).getTotalCount())){
-                                decimal12 = decimal12 + Double.valueOf(materialData.get(i).getTotalCount());
-                            }
-                            if (materialData.get(i).getExtendDescription().equals("预制化直线井，3×2.0×1.9，人孔")
-                                    & StringUtils.isNotEmpty(materialData.get(i).getTotalCount())){
-                                decimal13 = decimal13 + Double.valueOf(materialData.get(i).getTotalCount());
-                            }
-                            if (materialData.get(i).getExtendDescription().equals("预制化三通井，3×2.8×1.9，人孔")
-                                    & StringUtils.isNotEmpty(materialData.get(i).getTotalCount())){
-                                decimal14 = decimal14 + Double.valueOf(materialData.get(i).getTotalCount());
-                            }
-                            if (materialData.get(i).getExtendDescription().equals("预制化八角井，4.0×4.0×1.9，人孔")
-                                    & StringUtils.isNotEmpty(materialData.get(i).getTotalCount())){
-                                decimal15 = decimal15 + Double.valueOf(materialData.get(i).getTotalCount());
-                            }
-                            if (materialData.get(i).getExtendDescription().equals("两进两出环网箱基础预制，3.2×1.15×1.6")
-                                    & StringUtils.isNotEmpty(materialData.get(i).getTotalCount())){
-                                decimal16 = decimal16 + Double.valueOf(materialData.get(i).getTotalCount());
-                            }
-                            if (materialData.get(i).getExtendDescription().equals("两进四出环网箱基础预制，4.0×1.15×1.6")
-                                    & StringUtils.isNotEmpty(materialData.get(i).getTotalCount())){
-                                decimal17 = decimal17 + Double.valueOf(materialData.get(i).getTotalCount());
-                            }
-                            if (materialData.get(i).getExtendDescription().equals("紧凑型箱变基础预制，2.45×1.15×1.6")
-                                    & StringUtils.isNotEmpty(materialData.get(i).getTotalCount())){
-                                decimal18 = decimal18 + Double.valueOf(materialData.get(i).getTotalCount());
-                            }
-                            if (materialData.get(i).getExtendDescription().equals("标准型箱变基础预制，3.3×2.2×1.6")
-                                    & StringUtils.isNotEmpty(materialData.get(i).getTotalCount())){
-                                decimal19 = decimal19 + Double.valueOf(materialData.get(i).getTotalCount());
-                            }
-
-                        }
-
-                    }
-                    /*materialData.forEach(da ->{
-                        if (da.getMaterialCode().equals("500128790")){
-                            String extendDescription = da.getExtendDescription();
-                            //使用switch
-                            switch (extendDescription){
-                                case "配农网用,整套杆,GNH31-13-B":
-                                    if (StringUtils.isNotEmpty(da.getTotalCount())){
-                                        decimal1.add(BigDecimal.valueOf(Double.valueOf(da.getTotalCount())));
-                                        break;
-                                    }
-                                    break;
-                                case "GNH35-13；灌注桩":
-                                    if (da.getTotalCount() != null){
-                                        decimal2.add(BigDecimal.valueOf(Double.valueOf(da.getTotalCount())));
-                                    }
-                                    break;
-                                case "GNH39-13；灌注桩":
-                                    if (da.getTotalCount() != null){
-                                        decimal3.add(BigDecimal.valueOf(Double.valueOf(da.getTotalCount())));
-                                    }
-                                    break;
-                                case "GNH31-13；台阶式基础":
-                                    if (da.getTotalCount() != null){
-                                        decimal4.add(BigDecimal.valueOf(Double.valueOf(da.getTotalCount())));
-                                    }
-                                    break;
-                                case "GNH35-13；台阶式基础":
-                                    if (da.getTotalCount() != null){
-                                        decimal5.add(BigDecimal.valueOf(Double.valueOf(da.getTotalCount())));
-                                    }
-                                    break;
-                                case "GNH39-13；台阶式基础":
-                                    if (da.getTotalCount() != null){
-                                        decimal6.add(BigDecimal.valueOf(Double.valueOf(da.getTotalCount())));
-                                    }
-                                    break;
-                            }
-                            if (extendDescription.equals("配农网用,整套杆,GNH31-13-B") & StringUtils.isNotEmpty(da.getTotalCount())){
-                                decimal1 = new BigDecimal(Double.valueOf(da.getTotalCount());
-                                decimal1.add(BigDecimal.valueOf(Double.valueOf(da.getTotalCount())));
-                            }
-
-                        }
-                    });*/
-
-                    //设置    现场浇筑清单数据
-                    String castInPlaceList = "";
-                    if (StringUtils.isNotEmpty(decimal1.toString()) & decimal1 != 0.0){
-                        castInPlaceList = decimal1.toString() + "基" + "配农网用,整套杆,GNH31-13-B";
-                    }
-                    if (StringUtils.isNotEmpty(decimal2.toString()) & decimal2 != 0.0){
-                        castInPlaceList = castInPlaceList + ";" + decimal2.toString() + "基" + "GNH35-13；灌注桩";
-                    }
-                    if (StringUtils.isNotEmpty(decimal3.toString()) & decimal3 != 0.0){
-                        castInPlaceList = castInPlaceList + ";" + decimal3.toString() + "基" + "GNH39-13；灌注桩";
-                    }
-                    if (StringUtils.isNotEmpty(decimal4.toString()) & decimal4 != 0.0){
-                        castInPlaceList = castInPlaceList + ";" + decimal4.toString() + "基" + "GNH31-13；台阶式基础";
-                    }
-                    if (StringUtils.isNotEmpty(decimal5.toString()) & decimal5 != 0.0){
-                        castInPlaceList = castInPlaceList + ";" + decimal5.toString() + "基" + "GNH35-13；台阶式基础";
-                    }
-                    if (StringUtils.isNotEmpty(decimal6.toString()) & decimal6 != 0.0){
-                        castInPlaceList = castInPlaceList + ";" + decimal6.toString() + "基" + "GNH39-13；台阶式基础";
-                    }
-
-                    String designList = "";
-                    if (StringUtils.isNotEmpty(decimal7.toString()) & decimal7 != 0.0){
-                        designList = decimal7.toString() + "米" + "预制化排管，2×3（5+1），≤100kN";
-                    }
-                    if (StringUtils.isNotEmpty(decimal8.toString()) & decimal8 != 0.0){
-                        designList = designList + ";" + decimal8.toString() + "米" + "预制化排管，2×4（7+1），≤100kN";
-                    }
-                    if (StringUtils.isNotEmpty(decimal9.toString()) & decimal9 != 0.0){
-                        designList = designList + ";" + decimal9.toString() + "米" + "预制化排管，3×4（11+1），≤100kN";
-                    }
-                    if (StringUtils.isNotEmpty(decimal10.toString()) & decimal10 != 0.0){
-                        designList = designList + ";" + decimal10.toString() + "米" + "预制化排管，4×3（11+1），≤100kN";
-                    }
-                    if (StringUtils.isNotEmpty(decimal11.toString()) & decimal11 != 0.0){
-                        designList = designList + ";" + decimal11.toString() + "米" + "预制化排管，4×4（15+1），≤100kN";
-                    }
-                    if (StringUtils.isNotEmpty(decimal12.toString()) & decimal12 != 0.0){
-                        designList = designList + ";" + decimal12.toString() + "米" + "预制化排管，4×5（19+1），≤100kN";
-                    }
-                    if (StringUtils.isNotEmpty(decimal13.toString()) & decimal13 != 0.0){
-                        designList = designList + ";" + decimal13.toString() + "座" + "预制化直线井，3×2.0×1.9，人孔";
-                    }
-                    if (StringUtils.isNotEmpty(decimal14.toString()) & decimal14 != 0.0){
-                        designList = designList + ";" + decimal14.toString() + "座" + "预制化三通井，3×2.8×1.9，人孔";
-                    }
-                    if (StringUtils.isNotEmpty(decimal15.toString()) & decimal15 != 0.0){
-                        designList = designList + ";" + decimal15.toString() + "座" + "预制化八角井，4.0×4.0×1.9，人孔";
-                    }
-                    if (StringUtils.isNotEmpty(decimal16.toString()) & decimal16 != 0.0){
-                        designList = designList + ";" + decimal16.toString() + "座" + "两进两出环网箱基础预制，3.2×1.15×1.6";
-                    }
-                    if (StringUtils.isNotEmpty(decimal17.toString()) & decimal17 != 0.0){
-                        designList = designList + ";" + decimal17.toString() + "座" + "两进四出环网箱基础预制，4.0×1.15×1.6";
-                    }
-                    if (StringUtils.isNotEmpty(decimal18.toString()) & decimal18 != 0.0){
-                        designList = designList + ";" + decimal18.toString() + "座" + "紧凑型箱变基础预制，2.45×1.15×1.6";
-                    }
-                    if (StringUtils.isNotEmpty(decimal19.toString()) & decimal19 != 0.0){
-                        designList = designList + ";" + decimal19.toString() + "座" + "标准型箱变基础预制，3.3×2.2×1.6";
-                    }
-
-                    if (divide >0 ){
-                        //修改  是否含新建土建基础/包封 为是
-                        preconstructService.updateMetion("是",castInPlaceList,designList);
-                    }else {
-                        preconstructService.updateMetion("否",castInPlaceList,designList);
-                    }
+//                    //获取新建土建包封数据总和
+//                    double bfSum = 0.0;
+//                    if (queryService.getTJBFData() != null){
+//                        bfSum = bfSum + queryService.getTJBFData();
+//
+//                    }
+//                    //获取新建土建基础数据总和
+//                    double jcSum = 0.0;
+//                    if (queryService.getTJJCData() != null){
+//                        jcSum = jcSum + queryService.getTJJCData();
+//
+//                    }
+//                    double divide = jcSum/bfSum;
+//
+//                    //获取所有的 物料编码，扩展描述，总量信息
+//                    List<MaterialData> materialData = queryService.findAllCount();
+//
+//                    //现场浇筑清单
+//                    Double decimal1 = 0.0;
+//                    Double decimal2 = 0.0;
+//                    Double decimal3 = 0.0;
+//                    Double decimal4 = 0.0;
+//                    Double decimal5 = 0.0;
+//                    Double decimal6 = 0.0;
+//
+//                    //预制化清单
+//                    Double decimal7 = 0.0;
+//                    Double decimal8 = 0.0;
+//                    Double decimal9 = 0.0;
+//                    Double decimal10 = 0.0;
+//                    Double decimal11 = 0.0;
+//                    Double decimal12 = 0.0;
+//                    Double decimal13 = 0.0;
+//                    Double decimal14 = 0.0;
+//                    Double decimal15 = 0.0;
+//                    Double decimal16 = 0.0;
+//                    Double decimal17 = 0.0;
+//                    Double decimal18 = 0.0;
+//                    Double decimal19 = 0.0;
+//                    for (int i=0;i<materialData.size();i++){
+//                        if (materialData.get(i).getMaterialCode().equals("乙供")){
+//                            //现场浇筑清单
+//                            if (materialData.get(i).getExtendDescription().equals("配农网用,整套杆,GNH31-13-B")
+//                                    & StringUtils.isNotEmpty(materialData.get(i).getTotalCount())){
+//                                decimal1 = decimal1 + Double.valueOf(materialData.get(i).getTotalCount());
+//                            }
+//                            if (materialData.get(i).getExtendDescription().equals("GNH35-13；灌注桩")
+//                                    & StringUtils.isNotEmpty(materialData.get(i).getTotalCount())){
+//                                decimal2 = decimal2 + Double.valueOf(materialData.get(i).getTotalCount());
+//                            }
+//                            if (materialData.get(i).getExtendDescription().equals("GNH39-13；灌注桩")
+//                                    & StringUtils.isNotEmpty(materialData.get(i).getTotalCount())){
+//                                decimal3 = decimal3 + Double.valueOf(materialData.get(i).getTotalCount());
+//                            }
+//                            if (materialData.get(i).getExtendDescription().equals("GNH31-13；台阶式基础")
+//                                    & StringUtils.isNotEmpty(materialData.get(i).getTotalCount())){
+//                                decimal4 = decimal4 + Double.valueOf(materialData.get(i).getTotalCount());
+//                            }
+//                            if (materialData.get(i).getExtendDescription().equals("GNH35-13；台阶式基础")
+//                                    & StringUtils.isNotEmpty(materialData.get(i).getTotalCount())){
+//                                decimal5 = decimal5 + Double.valueOf(materialData.get(i).getTotalCount());
+//                            }
+//                            if (materialData.get(i).getExtendDescription().equals("GNH39-13；台阶式基础")
+//                                    & StringUtils.isNotEmpty(materialData.get(i).getTotalCount())){
+//                                decimal6 = decimal6 + Double.valueOf(materialData.get(i).getTotalCount());
+//                            }
+//
+//                            //预制化清单
+//                            if (materialData.get(i).getExtendDescription().equals("预制化排管，2×3（5+1），≤100kN")
+//                                    & StringUtils.isNotEmpty(materialData.get(i).getTotalCount())){
+//                                decimal7 = decimal7 + Double.valueOf(materialData.get(i).getTotalCount());
+//                            }
+//                            if (materialData.get(i).getExtendDescription().equals("预制化排管，2×4（7+1），≤100kN")
+//                                    & StringUtils.isNotEmpty(materialData.get(i).getTotalCount())){
+//                                decimal8 = decimal8 + Double.valueOf(materialData.get(i).getTotalCount());
+//                            }
+//                            if (materialData.get(i).getExtendDescription().equals("预制化排管，3×4（11+1），≤100kN")
+//                                    & StringUtils.isNotEmpty(materialData.get(i).getTotalCount())){
+//                                decimal9 = decimal9 + Double.valueOf(materialData.get(i).getTotalCount());
+//                            }
+//                            if (materialData.get(i).getExtendDescription().equals("预制化排管，4×3（11+1），≤100kN")
+//                                    & StringUtils.isNotEmpty(materialData.get(i).getTotalCount())){
+//                                decimal10 = decimal10 + Double.valueOf(materialData.get(i).getTotalCount());
+//                            }
+//                            if (materialData.get(i).getExtendDescription().equals("预制化排管，4×4（15+1），≤100kN")
+//                                    & StringUtils.isNotEmpty(materialData.get(i).getTotalCount())){
+//                                decimal11 = decimal11 + Double.valueOf(materialData.get(i).getTotalCount());
+//                            }
+//                            if (materialData.get(i).getExtendDescription().equals("预制化排管，4×5（19+1），≤100kN")
+//                                    & StringUtils.isNotEmpty(materialData.get(i).getTotalCount())){
+//                                decimal12 = decimal12 + Double.valueOf(materialData.get(i).getTotalCount());
+//                            }
+//                            if (materialData.get(i).getExtendDescription().equals("预制化直线井，3×2.0×1.9，人孔")
+//                                    & StringUtils.isNotEmpty(materialData.get(i).getTotalCount())){
+//                                decimal13 = decimal13 + Double.valueOf(materialData.get(i).getTotalCount());
+//                            }
+//                            if (materialData.get(i).getExtendDescription().equals("预制化三通井，3×2.8×1.9，人孔")
+//                                    & StringUtils.isNotEmpty(materialData.get(i).getTotalCount())){
+//                                decimal14 = decimal14 + Double.valueOf(materialData.get(i).getTotalCount());
+//                            }
+//                            if (materialData.get(i).getExtendDescription().equals("预制化八角井，4.0×4.0×1.9，人孔")
+//                                    & StringUtils.isNotEmpty(materialData.get(i).getTotalCount())){
+//                                decimal15 = decimal15 + Double.valueOf(materialData.get(i).getTotalCount());
+//                            }
+//                            if (materialData.get(i).getExtendDescription().equals("两进两出环网箱基础预制，3.2×1.15×1.6")
+//                                    & StringUtils.isNotEmpty(materialData.get(i).getTotalCount())){
+//                                decimal16 = decimal16 + Double.valueOf(materialData.get(i).getTotalCount());
+//                            }
+//                            if (materialData.get(i).getExtendDescription().equals("两进四出环网箱基础预制，4.0×1.15×1.6")
+//                                    & StringUtils.isNotEmpty(materialData.get(i).getTotalCount())){
+//                                decimal17 = decimal17 + Double.valueOf(materialData.get(i).getTotalCount());
+//                            }
+//                            if (materialData.get(i).getExtendDescription().equals("紧凑型箱变基础预制，2.45×1.15×1.6")
+//                                    & StringUtils.isNotEmpty(materialData.get(i).getTotalCount())){
+//                                decimal18 = decimal18 + Double.valueOf(materialData.get(i).getTotalCount());
+//                            }
+//                            if (materialData.get(i).getExtendDescription().equals("标准型箱变基础预制，3.3×2.2×1.6")
+//                                    & StringUtils.isNotEmpty(materialData.get(i).getTotalCount())){
+//                                decimal19 = decimal19 + Double.valueOf(materialData.get(i).getTotalCount());
+//                            }
+//
+//                        }
+//
+//                    }
+//                    /*materialData.forEach(da ->{
+//                        if (da.getMaterialCode().equals("500128790")){
+//                            String extendDescription = da.getExtendDescription();
+//                            //使用switch
+//                            switch (extendDescription){
+//                                case "配农网用,整套杆,GNH31-13-B":
+//                                    if (StringUtils.isNotEmpty(da.getTotalCount())){
+//                                        decimal1.add(BigDecimal.valueOf(Double.valueOf(da.getTotalCount())));
+//                                        break;
+//                                    }
+//                                    break;
+//                                case "GNH35-13；灌注桩":
+//                                    if (da.getTotalCount() != null){
+//                                        decimal2.add(BigDecimal.valueOf(Double.valueOf(da.getTotalCount())));
+//                                    }
+//                                    break;
+//                                case "GNH39-13；灌注桩":
+//                                    if (da.getTotalCount() != null){
+//                                        decimal3.add(BigDecimal.valueOf(Double.valueOf(da.getTotalCount())));
+//                                    }
+//                                    break;
+//                                case "GNH31-13；台阶式基础":
+//                                    if (da.getTotalCount() != null){
+//                                        decimal4.add(BigDecimal.valueOf(Double.valueOf(da.getTotalCount())));
+//                                    }
+//                                    break;
+//                                case "GNH35-13；台阶式基础":
+//                                    if (da.getTotalCount() != null){
+//                                        decimal5.add(BigDecimal.valueOf(Double.valueOf(da.getTotalCount())));
+//                                    }
+//                                    break;
+//                                case "GNH39-13；台阶式基础":
+//                                    if (da.getTotalCount() != null){
+//                                        decimal6.add(BigDecimal.valueOf(Double.valueOf(da.getTotalCount())));
+//                                    }
+//                                    break;
+//                            }
+//                            if (extendDescription.equals("配农网用,整套杆,GNH31-13-B") & StringUtils.isNotEmpty(da.getTotalCount())){
+//                                decimal1 = new BigDecimal(Double.valueOf(da.getTotalCount());
+//                                decimal1.add(BigDecimal.valueOf(Double.valueOf(da.getTotalCount())));
+//                            }
+//
+//                        }
+//                    });*/
+//
+//                    //设置    现场浇筑清单数据
+//                    String castInPlaceList = "";
+//                    if (StringUtils.isNotEmpty(decimal1.toString()) & decimal1 != 0.0){
+//                        castInPlaceList = decimal1.toString() + "基" + "配农网用,整套杆,GNH31-13-B";
+//                    }
+//                    if (StringUtils.isNotEmpty(decimal2.toString()) & decimal2 != 0.0){
+//                        castInPlaceList = castInPlaceList + ";" + decimal2.toString() + "基" + "GNH35-13；灌注桩";
+//                    }
+//                    if (StringUtils.isNotEmpty(decimal3.toString()) & decimal3 != 0.0){
+//                        castInPlaceList = castInPlaceList + ";" + decimal3.toString() + "基" + "GNH39-13；灌注桩";
+//                    }
+//                    if (StringUtils.isNotEmpty(decimal4.toString()) & decimal4 != 0.0){
+//                        castInPlaceList = castInPlaceList + ";" + decimal4.toString() + "基" + "GNH31-13；台阶式基础";
+//                    }
+//                    if (StringUtils.isNotEmpty(decimal5.toString()) & decimal5 != 0.0){
+//                        castInPlaceList = castInPlaceList + ";" + decimal5.toString() + "基" + "GNH35-13；台阶式基础";
+//                    }
+//                    if (StringUtils.isNotEmpty(decimal6.toString()) & decimal6 != 0.0){
+//                        castInPlaceList = castInPlaceList + ";" + decimal6.toString() + "基" + "GNH39-13；台阶式基础";
+//                    }
+//
+//                    String designList = "";
+//                    if (StringUtils.isNotEmpty(decimal7.toString()) & decimal7 != 0.0){
+//                        designList = decimal7.toString() + "米" + "预制化排管，2×3（5+1），≤100kN";
+//                    }
+//                    if (StringUtils.isNotEmpty(decimal8.toString()) & decimal8 != 0.0){
+//                        designList = designList + ";" + decimal8.toString() + "米" + "预制化排管，2×4（7+1），≤100kN";
+//                    }
+//                    if (StringUtils.isNotEmpty(decimal9.toString()) & decimal9 != 0.0){
+//                        designList = designList + ";" + decimal9.toString() + "米" + "预制化排管，3×4（11+1），≤100kN";
+//                    }
+//                    if (StringUtils.isNotEmpty(decimal10.toString()) & decimal10 != 0.0){
+//                        designList = designList + ";" + decimal10.toString() + "米" + "预制化排管，4×3（11+1），≤100kN";
+//                    }
+//                    if (StringUtils.isNotEmpty(decimal11.toString()) & decimal11 != 0.0){
+//                        designList = designList + ";" + decimal11.toString() + "米" + "预制化排管，4×4（15+1），≤100kN";
+//                    }
+//                    if (StringUtils.isNotEmpty(decimal12.toString()) & decimal12 != 0.0){
+//                        designList = designList + ";" + decimal12.toString() + "米" + "预制化排管，4×5（19+1），≤100kN";
+//                    }
+//                    if (StringUtils.isNotEmpty(decimal13.toString()) & decimal13 != 0.0){
+//                        designList = designList + ";" + decimal13.toString() + "座" + "预制化直线井，3×2.0×1.9，人孔";
+//                    }
+//                    if (StringUtils.isNotEmpty(decimal14.toString()) & decimal14 != 0.0){
+//                        designList = designList + ";" + decimal14.toString() + "座" + "预制化三通井，3×2.8×1.9，人孔";
+//                    }
+//                    if (StringUtils.isNotEmpty(decimal15.toString()) & decimal15 != 0.0){
+//                        designList = designList + ";" + decimal15.toString() + "座" + "预制化八角井，4.0×4.0×1.9，人孔";
+//                    }
+//                    if (StringUtils.isNotEmpty(decimal16.toString()) & decimal16 != 0.0){
+//                        designList = designList + ";" + decimal16.toString() + "座" + "两进两出环网箱基础预制，3.2×1.15×1.6";
+//                    }
+//                    if (StringUtils.isNotEmpty(decimal17.toString()) & decimal17 != 0.0){
+//                        designList = designList + ";" + decimal17.toString() + "座" + "两进四出环网箱基础预制，4.0×1.15×1.6";
+//                    }
+//                    if (StringUtils.isNotEmpty(decimal18.toString()) & decimal18 != 0.0){
+//                        designList = designList + ";" + decimal18.toString() + "座" + "紧凑型箱变基础预制，2.45×1.15×1.6";
+//                    }
+//                    if (StringUtils.isNotEmpty(decimal19.toString()) & decimal19 != 0.0){
+//                        designList = designList + ";" + decimal19.toString() + "座" + "标准型箱变基础预制，3.3×2.2×1.6";
+//                    }
+//
+//                    if (divide >0 ){
+//                        //修改  是否含新建土建基础/包封 为是
+//                        preconstructService.updateMetion("是",castInPlaceList,designList);
+//                    }else {
+//                        preconstructService.updateMetion("否",castInPlaceList,designList);
+//                    }
 
                 }else {
                     //修改项目设计单位上传文件部分

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

@@ -9,6 +9,8 @@ import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.service.Rese
 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.entity.MaterialData;
+import com.jeeplus.modules.cg.reservemanagementcenter.statisticalTable.service.EnginnerQueryService;
 import com.jeeplus.modules.sg.managementcenter.materialproject.util.ImportUtil;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.apache.shiro.authz.annotation.Logical;
@@ -40,6 +42,8 @@ public class ReservePreconstructController extends BaseController {
     @Autowired
     private ReservePreconstructService structService;
 
+    @Autowired
+    private EnginnerQueryService queryService;
 
     @ModelAttribute
     public ReservePreconstruction get(@RequestParam(required = false) String id) {
@@ -97,6 +101,207 @@ public class ReservePreconstructController extends BaseController {
                 //设置项目进度
                 pre.setReserveProgress(name);
             }
+
+            //cg_material_data
+            //从甲供材数据表中查出所有的数据
+            //获取所有的 物料编码，扩展描述，总量信息
+            List<MaterialData> materialData = queryService.findAllCount();
+
+            //获取新建土建包封数据总和
+            double bfSum = 0.0;
+            if (queryService.getTJBFData() != null){
+                bfSum = bfSum + queryService.getTJBFData();
+
+            }
+            //获取新建土建基础数据总和
+            double jcSum = 0.0;
+            if (queryService.getTJJCData() != null){
+                jcSum = jcSum + queryService.getTJJCData();
+
+            }
+            double divide = jcSum/bfSum;
+
+            //现场浇筑清单
+            Double decimal1 = 0.0;
+            Double decimal2 = 0.0;
+            Double decimal3 = 0.0;
+            Double decimal4 = 0.0;
+            Double decimal5 = 0.0;
+            Double decimal6 = 0.0;
+
+            //预制化清单
+            Double decimal7 = 0.0;
+            Double decimal8 = 0.0;
+            Double decimal9 = 0.0;
+            Double decimal10 = 0.0;
+            Double decimal11 = 0.0;
+            Double decimal12 = 0.0;
+            Double decimal13 = 0.0;
+            Double decimal14 = 0.0;
+            Double decimal15 = 0.0;
+            Double decimal16 = 0.0;
+            Double decimal17 = 0.0;
+            Double decimal18 = 0.0;
+            Double decimal19 = 0.0;
+            for (int i=0;i<materialData.size();i++){
+                if (materialData.get(i).getMaterialCode().equals("乙供")){
+                    //现场浇筑清单
+                    if (materialData.get(i).getExtendDescription().equals("配农网用,整套杆,GNH31-13-B")
+                            & StringUtils.isNotEmpty(materialData.get(i).getTotalCount())){
+                        decimal1 = decimal1 + Double.valueOf(materialData.get(i).getTotalCount());
+                    }
+                    if (materialData.get(i).getExtendDescription().equals("GNH35-13；灌注桩")
+                            & StringUtils.isNotEmpty(materialData.get(i).getTotalCount())){
+                        decimal2 = decimal2 + Double.valueOf(materialData.get(i).getTotalCount());
+                    }
+                    if (materialData.get(i).getExtendDescription().equals("GNH39-13；灌注桩")
+                            & StringUtils.isNotEmpty(materialData.get(i).getTotalCount())){
+                        decimal3 = decimal3 + Double.valueOf(materialData.get(i).getTotalCount());
+                    }
+                    if (materialData.get(i).getExtendDescription().equals("GNH31-13；台阶式基础")
+                            & StringUtils.isNotEmpty(materialData.get(i).getTotalCount())){
+                        decimal4 = decimal4 + Double.valueOf(materialData.get(i).getTotalCount());
+                    }
+                    if (materialData.get(i).getExtendDescription().equals("GNH35-13；台阶式基础")
+                            & StringUtils.isNotEmpty(materialData.get(i).getTotalCount())){
+                        decimal5 = decimal5 + Double.valueOf(materialData.get(i).getTotalCount());
+                    }
+                    if (materialData.get(i).getExtendDescription().equals("GNH39-13；台阶式基础")
+                            & StringUtils.isNotEmpty(materialData.get(i).getTotalCount())){
+                        decimal6 = decimal6 + Double.valueOf(materialData.get(i).getTotalCount());
+                    }
+
+                    //预制化清单
+                    if (materialData.get(i).getExtendDescription().equals("预制化排管，2×3（5+1），≤100kN")
+                            & StringUtils.isNotEmpty(materialData.get(i).getTotalCount())){
+                        decimal7 = decimal7 + Double.valueOf(materialData.get(i).getTotalCount());
+                    }
+                    if (materialData.get(i).getExtendDescription().equals("预制化排管，2×4（7+1），≤100kN")
+                            & StringUtils.isNotEmpty(materialData.get(i).getTotalCount())){
+                        decimal8 = decimal8 + Double.valueOf(materialData.get(i).getTotalCount());
+                    }
+                    if (materialData.get(i).getExtendDescription().equals("预制化排管，3×4（11+1），≤100kN")
+                            & StringUtils.isNotEmpty(materialData.get(i).getTotalCount())){
+                        decimal9 = decimal9 + Double.valueOf(materialData.get(i).getTotalCount());
+                    }
+                    if (materialData.get(i).getExtendDescription().equals("预制化排管，4×3（11+1），≤100kN")
+                            & StringUtils.isNotEmpty(materialData.get(i).getTotalCount())){
+                        decimal10 = decimal10 + Double.valueOf(materialData.get(i).getTotalCount());
+                    }
+                    if (materialData.get(i).getExtendDescription().equals("预制化排管，4×4（15+1），≤100kN")
+                            & StringUtils.isNotEmpty(materialData.get(i).getTotalCount())){
+                        decimal11 = decimal11 + Double.valueOf(materialData.get(i).getTotalCount());
+                    }
+                    if (materialData.get(i).getExtendDescription().equals("预制化排管，4×5（19+1），≤100kN")
+                            & StringUtils.isNotEmpty(materialData.get(i).getTotalCount())){
+                        decimal12 = decimal12 + Double.valueOf(materialData.get(i).getTotalCount());
+                    }
+                    if (materialData.get(i).getExtendDescription().equals("预制化直线井，3×2.0×1.9，人孔")
+                            & StringUtils.isNotEmpty(materialData.get(i).getTotalCount())){
+                        decimal13 = decimal13 + Double.valueOf(materialData.get(i).getTotalCount());
+                    }
+                    if (materialData.get(i).getExtendDescription().equals("预制化三通井，3×2.8×1.9，人孔")
+                            & StringUtils.isNotEmpty(materialData.get(i).getTotalCount())){
+                        decimal14 = decimal14 + Double.valueOf(materialData.get(i).getTotalCount());
+                    }
+                    if (materialData.get(i).getExtendDescription().equals("预制化八角井，4.0×4.0×1.9，人孔")
+                            & StringUtils.isNotEmpty(materialData.get(i).getTotalCount())){
+                        decimal15 = decimal15 + Double.valueOf(materialData.get(i).getTotalCount());
+                    }
+                    if (materialData.get(i).getExtendDescription().equals("两进两出环网箱基础预制，3.2×1.15×1.6")
+                            & StringUtils.isNotEmpty(materialData.get(i).getTotalCount())){
+                        decimal16 = decimal16 + Double.valueOf(materialData.get(i).getTotalCount());
+                    }
+                    if (materialData.get(i).getExtendDescription().equals("两进四出环网箱基础预制，4.0×1.15×1.6")
+                            & StringUtils.isNotEmpty(materialData.get(i).getTotalCount())){
+                        decimal17 = decimal17 + Double.valueOf(materialData.get(i).getTotalCount());
+                    }
+                    if (materialData.get(i).getExtendDescription().equals("紧凑型箱变基础预制，2.45×1.15×1.6")
+                            & StringUtils.isNotEmpty(materialData.get(i).getTotalCount())){
+                        decimal18 = decimal18 + Double.valueOf(materialData.get(i).getTotalCount());
+                    }
+                    if (materialData.get(i).getExtendDescription().equals("标准型箱变基础预制，3.3×2.2×1.6")
+                            & StringUtils.isNotEmpty(materialData.get(i).getTotalCount())){
+                        decimal19 = decimal19 + Double.valueOf(materialData.get(i).getTotalCount());
+                    }
+
+                }
+
+            }
+
+            //设置    现场浇筑清单数据
+            String castInPlaceList = "";
+            if (StringUtils.isNotEmpty(decimal1.toString()) & decimal1 != 0.0){
+                castInPlaceList = decimal1.toString() + "基" + "配农网用,整套杆,GNH31-13-B";
+            }
+            if (StringUtils.isNotEmpty(decimal2.toString()) & decimal2 != 0.0){
+                castInPlaceList = castInPlaceList + ";" + decimal2.toString() + "基" + "GNH35-13；灌注桩";
+            }
+            if (StringUtils.isNotEmpty(decimal3.toString()) & decimal3 != 0.0){
+                castInPlaceList = castInPlaceList + ";" + decimal3.toString() + "基" + "GNH39-13；灌注桩";
+            }
+            if (StringUtils.isNotEmpty(decimal4.toString()) & decimal4 != 0.0){
+                castInPlaceList = castInPlaceList + ";" + decimal4.toString() + "基" + "GNH31-13；台阶式基础";
+            }
+            if (StringUtils.isNotEmpty(decimal5.toString()) & decimal5 != 0.0){
+                castInPlaceList = castInPlaceList + ";" + decimal5.toString() + "基" + "GNH35-13；台阶式基础";
+            }
+            if (StringUtils.isNotEmpty(decimal6.toString()) & decimal6 != 0.0){
+                castInPlaceList = castInPlaceList + ";" + decimal6.toString() + "基" + "GNH39-13；台阶式基础";
+            }
+
+            String designList = "";
+            if (StringUtils.isNotEmpty(decimal7.toString()) & decimal7 != 0.0){
+                designList = decimal7.toString() + "米" + "预制化排管，2×3（5+1），≤100kN";
+            }
+            if (StringUtils.isNotEmpty(decimal8.toString()) & decimal8 != 0.0){
+                designList = designList + ";" + decimal8.toString() + "米" + "预制化排管，2×4（7+1），≤100kN";
+            }
+            if (StringUtils.isNotEmpty(decimal9.toString()) & decimal9 != 0.0){
+                designList = designList + ";" + decimal9.toString() + "米" + "预制化排管，3×4（11+1），≤100kN";
+            }
+            if (StringUtils.isNotEmpty(decimal10.toString()) & decimal10 != 0.0){
+                designList = designList + ";" + decimal10.toString() + "米" + "预制化排管，4×3（11+1），≤100kN";
+            }
+            if (StringUtils.isNotEmpty(decimal11.toString()) & decimal11 != 0.0){
+                designList = designList + ";" + decimal11.toString() + "米" + "预制化排管，4×4（15+1），≤100kN";
+            }
+            if (StringUtils.isNotEmpty(decimal12.toString()) & decimal12 != 0.0){
+                designList = designList + ";" + decimal12.toString() + "米" + "预制化排管，4×5（19+1），≤100kN";
+            }
+            if (StringUtils.isNotEmpty(decimal13.toString()) & decimal13 != 0.0){
+                designList = designList + ";" + decimal13.toString() + "座" + "预制化直线井，3×2.0×1.9，人孔";
+            }
+            if (StringUtils.isNotEmpty(decimal14.toString()) & decimal14 != 0.0){
+                designList = designList + ";" + decimal14.toString() + "座" + "预制化三通井，3×2.8×1.9，人孔";
+            }
+            if (StringUtils.isNotEmpty(decimal15.toString()) & decimal15 != 0.0){
+                designList = designList + ";" + decimal15.toString() + "座" + "预制化八角井，4.0×4.0×1.9，人孔";
+            }
+            if (StringUtils.isNotEmpty(decimal16.toString()) & decimal16 != 0.0){
+                designList = designList + ";" + decimal16.toString() + "座" + "两进两出环网箱基础预制，3.2×1.15×1.6";
+            }
+            if (StringUtils.isNotEmpty(decimal17.toString()) & decimal17 != 0.0){
+                designList = designList + ";" + decimal17.toString() + "座" + "两进四出环网箱基础预制，4.0×1.15×1.6";
+            }
+            if (StringUtils.isNotEmpty(decimal18.toString()) & decimal18 != 0.0){
+                designList = designList + ";" + decimal18.toString() + "座" + "紧凑型箱变基础预制，2.45×1.15×1.6";
+            }
+            if (StringUtils.isNotEmpty(decimal19.toString()) & decimal19 != 0.0){
+                designList = designList + ";" + decimal19.toString() + "座" + "标准型箱变基础预制，3.3×2.2×1.6";
+            }
+
+            if (divide >0 ){
+                //修改  是否含新建土建基础/包封 为是
+                pre.setDesignCivilFoundation("是");
+                pre.setCastInPlaceList(castInPlaceList);
+                pre.setDesignList(designList);
+            }else {
+                pre.setDesignCivilFoundation("否");
+                pre.setCastInPlaceList(castInPlaceList);
+                pre.setDesignList(designList);
+            }
+
             preList.add(pre);
         }
 
@@ -236,9 +441,209 @@ public class ReservePreconstructController extends BaseController {
                 String name = structService.getByExecuteId(procInsId);
                 //设置项目进度
                 pre.setReserveProgress(name);
+            }
+
+            //cg_material_data
+            //从甲供材数据表中查出所有的数据
+            //获取所有的 物料编码，扩展描述，总量信息
+            List<MaterialData> materialData = queryService.findAllCount();
+
+            //获取新建土建包封数据总和
+            double bfSum = 0.0;
+            if (queryService.getTJBFData() != null){
+                bfSum = bfSum + queryService.getTJBFData();
+
+            }
+            //获取新建土建基础数据总和
+            double jcSum = 0.0;
+            if (queryService.getTJJCData() != null){
+                jcSum = jcSum + queryService.getTJJCData();
+
+            }
+            double divide = jcSum/bfSum;
+
+            //现场浇筑清单
+            Double decimal1 = 0.0;
+            Double decimal2 = 0.0;
+            Double decimal3 = 0.0;
+            Double decimal4 = 0.0;
+            Double decimal5 = 0.0;
+            Double decimal6 = 0.0;
+
+            //预制化清单
+            Double decimal7 = 0.0;
+            Double decimal8 = 0.0;
+            Double decimal9 = 0.0;
+            Double decimal10 = 0.0;
+            Double decimal11 = 0.0;
+            Double decimal12 = 0.0;
+            Double decimal13 = 0.0;
+            Double decimal14 = 0.0;
+            Double decimal15 = 0.0;
+            Double decimal16 = 0.0;
+            Double decimal17 = 0.0;
+            Double decimal18 = 0.0;
+            Double decimal19 = 0.0;
+            for (int i=0;i<materialData.size();i++){
+                if (materialData.get(i).getMaterialCode().equals("乙供")){
+                    //现场浇筑清单
+                    if (materialData.get(i).getExtendDescription().equals("配农网用,整套杆,GNH31-13-B")
+                            & StringUtils.isNotEmpty(materialData.get(i).getTotalCount())){
+                        decimal1 = decimal1 + Double.valueOf(materialData.get(i).getTotalCount());
+                    }
+                    if (materialData.get(i).getExtendDescription().equals("GNH35-13；灌注桩")
+                            & StringUtils.isNotEmpty(materialData.get(i).getTotalCount())){
+                        decimal2 = decimal2 + Double.valueOf(materialData.get(i).getTotalCount());
+                    }
+                    if (materialData.get(i).getExtendDescription().equals("GNH39-13；灌注桩")
+                            & StringUtils.isNotEmpty(materialData.get(i).getTotalCount())){
+                        decimal3 = decimal3 + Double.valueOf(materialData.get(i).getTotalCount());
+                    }
+                    if (materialData.get(i).getExtendDescription().equals("GNH31-13；台阶式基础")
+                            & StringUtils.isNotEmpty(materialData.get(i).getTotalCount())){
+                        decimal4 = decimal4 + Double.valueOf(materialData.get(i).getTotalCount());
+                    }
+                    if (materialData.get(i).getExtendDescription().equals("GNH35-13；台阶式基础")
+                            & StringUtils.isNotEmpty(materialData.get(i).getTotalCount())){
+                        decimal5 = decimal5 + Double.valueOf(materialData.get(i).getTotalCount());
+                    }
+                    if (materialData.get(i).getExtendDescription().equals("GNH39-13；台阶式基础")
+                            & StringUtils.isNotEmpty(materialData.get(i).getTotalCount())){
+                        decimal6 = decimal6 + Double.valueOf(materialData.get(i).getTotalCount());
+                    }
+
+                    //预制化清单
+                    if (materialData.get(i).getExtendDescription().equals("预制化排管，2×3（5+1），≤100kN")
+                            & StringUtils.isNotEmpty(materialData.get(i).getTotalCount())){
+                        decimal7 = decimal7 + Double.valueOf(materialData.get(i).getTotalCount());
+                    }
+                    if (materialData.get(i).getExtendDescription().equals("预制化排管，2×4（7+1），≤100kN")
+                            & StringUtils.isNotEmpty(materialData.get(i).getTotalCount())){
+                        decimal8 = decimal8 + Double.valueOf(materialData.get(i).getTotalCount());
+                    }
+                    if (materialData.get(i).getExtendDescription().equals("预制化排管，3×4（11+1），≤100kN")
+                            & StringUtils.isNotEmpty(materialData.get(i).getTotalCount())){
+                        decimal9 = decimal9 + Double.valueOf(materialData.get(i).getTotalCount());
+                    }
+                    if (materialData.get(i).getExtendDescription().equals("预制化排管，4×3（11+1），≤100kN")
+                            & StringUtils.isNotEmpty(materialData.get(i).getTotalCount())){
+                        decimal10 = decimal10 + Double.valueOf(materialData.get(i).getTotalCount());
+                    }
+                    if (materialData.get(i).getExtendDescription().equals("预制化排管，4×4（15+1），≤100kN")
+                            & StringUtils.isNotEmpty(materialData.get(i).getTotalCount())){
+                        decimal11 = decimal11 + Double.valueOf(materialData.get(i).getTotalCount());
+                    }
+                    if (materialData.get(i).getExtendDescription().equals("预制化排管，4×5（19+1），≤100kN")
+                            & StringUtils.isNotEmpty(materialData.get(i).getTotalCount())){
+                        decimal12 = decimal12 + Double.valueOf(materialData.get(i).getTotalCount());
+                    }
+                    if (materialData.get(i).getExtendDescription().equals("预制化直线井，3×2.0×1.9，人孔")
+                            & StringUtils.isNotEmpty(materialData.get(i).getTotalCount())){
+                        decimal13 = decimal13 + Double.valueOf(materialData.get(i).getTotalCount());
+                    }
+                    if (materialData.get(i).getExtendDescription().equals("预制化三通井，3×2.8×1.9，人孔")
+                            & StringUtils.isNotEmpty(materialData.get(i).getTotalCount())){
+                        decimal14 = decimal14 + Double.valueOf(materialData.get(i).getTotalCount());
+                    }
+                    if (materialData.get(i).getExtendDescription().equals("预制化八角井，4.0×4.0×1.9，人孔")
+                            & StringUtils.isNotEmpty(materialData.get(i).getTotalCount())){
+                        decimal15 = decimal15 + Double.valueOf(materialData.get(i).getTotalCount());
+                    }
+                    if (materialData.get(i).getExtendDescription().equals("两进两出环网箱基础预制，3.2×1.15×1.6")
+                            & StringUtils.isNotEmpty(materialData.get(i).getTotalCount())){
+                        decimal16 = decimal16 + Double.valueOf(materialData.get(i).getTotalCount());
+                    }
+                    if (materialData.get(i).getExtendDescription().equals("两进四出环网箱基础预制，4.0×1.15×1.6")
+                            & StringUtils.isNotEmpty(materialData.get(i).getTotalCount())){
+                        decimal17 = decimal17 + Double.valueOf(materialData.get(i).getTotalCount());
+                    }
+                    if (materialData.get(i).getExtendDescription().equals("紧凑型箱变基础预制，2.45×1.15×1.6")
+                            & StringUtils.isNotEmpty(materialData.get(i).getTotalCount())){
+                        decimal18 = decimal18 + Double.valueOf(materialData.get(i).getTotalCount());
+                    }
+                    if (materialData.get(i).getExtendDescription().equals("标准型箱变基础预制，3.3×2.2×1.6")
+                            & StringUtils.isNotEmpty(materialData.get(i).getTotalCount())){
+                        decimal19 = decimal19 + Double.valueOf(materialData.get(i).getTotalCount());
+                    }
+
+                }
+
+            }
+
+            //设置    现场浇筑清单数据
+            String castInPlaceList = "";
+            if (StringUtils.isNotEmpty(decimal1.toString()) & decimal1 != 0.0){
+                castInPlaceList = decimal1.toString() + "基" + "配农网用,整套杆,GNH31-13-B";
+            }
+            if (StringUtils.isNotEmpty(decimal2.toString()) & decimal2 != 0.0){
+                castInPlaceList = castInPlaceList + ";" + decimal2.toString() + "基" + "GNH35-13；灌注桩";
+            }
+            if (StringUtils.isNotEmpty(decimal3.toString()) & decimal3 != 0.0){
+                castInPlaceList = castInPlaceList + ";" + decimal3.toString() + "基" + "GNH39-13；灌注桩";
+            }
+            if (StringUtils.isNotEmpty(decimal4.toString()) & decimal4 != 0.0){
+                castInPlaceList = castInPlaceList + ";" + decimal4.toString() + "基" + "GNH31-13；台阶式基础";
+            }
+            if (StringUtils.isNotEmpty(decimal5.toString()) & decimal5 != 0.0){
+                castInPlaceList = castInPlaceList + ";" + decimal5.toString() + "基" + "GNH35-13；台阶式基础";
+            }
+            if (StringUtils.isNotEmpty(decimal6.toString()) & decimal6 != 0.0){
+                castInPlaceList = castInPlaceList + ";" + decimal6.toString() + "基" + "GNH39-13；台阶式基础";
+            }
+
+            String designList = "";
+            if (StringUtils.isNotEmpty(decimal7.toString()) & decimal7 != 0.0){
+                designList = decimal7.toString() + "米" + "预制化排管，2×3（5+1），≤100kN";
+            }
+            if (StringUtils.isNotEmpty(decimal8.toString()) & decimal8 != 0.0){
+                designList = designList + ";" + decimal8.toString() + "米" + "预制化排管，2×4（7+1），≤100kN";
+            }
+            if (StringUtils.isNotEmpty(decimal9.toString()) & decimal9 != 0.0){
+                designList = designList + ";" + decimal9.toString() + "米" + "预制化排管，3×4（11+1），≤100kN";
+            }
+            if (StringUtils.isNotEmpty(decimal10.toString()) & decimal10 != 0.0){
+                designList = designList + ";" + decimal10.toString() + "米" + "预制化排管，4×3（11+1），≤100kN";
+            }
+            if (StringUtils.isNotEmpty(decimal11.toString()) & decimal11 != 0.0){
+                designList = designList + ";" + decimal11.toString() + "米" + "预制化排管，4×4（15+1），≤100kN";
+            }
+            if (StringUtils.isNotEmpty(decimal12.toString()) & decimal12 != 0.0){
+                designList = designList + ";" + decimal12.toString() + "米" + "预制化排管，4×5（19+1），≤100kN";
+            }
+            if (StringUtils.isNotEmpty(decimal13.toString()) & decimal13 != 0.0){
+                designList = designList + ";" + decimal13.toString() + "座" + "预制化直线井，3×2.0×1.9，人孔";
+            }
+            if (StringUtils.isNotEmpty(decimal14.toString()) & decimal14 != 0.0){
+                designList = designList + ";" + decimal14.toString() + "座" + "预制化三通井，3×2.8×1.9，人孔";
+            }
+            if (StringUtils.isNotEmpty(decimal15.toString()) & decimal15 != 0.0){
+                designList = designList + ";" + decimal15.toString() + "座" + "预制化八角井，4.0×4.0×1.9，人孔";
+            }
+            if (StringUtils.isNotEmpty(decimal16.toString()) & decimal16 != 0.0){
+                designList = designList + ";" + decimal16.toString() + "座" + "两进两出环网箱基础预制，3.2×1.15×1.6";
+            }
+            if (StringUtils.isNotEmpty(decimal17.toString()) & decimal17 != 0.0){
+                designList = designList + ";" + decimal17.toString() + "座" + "两进四出环网箱基础预制，4.0×1.15×1.6";
+            }
+            if (StringUtils.isNotEmpty(decimal18.toString()) & decimal18 != 0.0){
+                designList = designList + ";" + decimal18.toString() + "座" + "紧凑型箱变基础预制，2.45×1.15×1.6";
+            }
+            if (StringUtils.isNotEmpty(decimal19.toString()) & decimal19 != 0.0){
+                designList = designList + ";" + decimal19.toString() + "座" + "标准型箱变基础预制，3.3×2.2×1.6";
+            }
+
+            if (divide >0 ){
+                //修改  是否含新建土建基础/包封 为是
+                pre.setDesignCivilFoundation("是");
+                pre.setCastInPlaceList(castInPlaceList);
+                pre.setDesignList(designList);
             }else {
-                pre.setReserveProgress("");
+                pre.setDesignCivilFoundation("否");
+                pre.setCastInPlaceList(castInPlaceList);
+                pre.setDesignList(designList);
             }
+
+
             preList.add(pre);
         }
 

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

@@ -212,21 +212,17 @@
 		<tr>
 			<td class="width-15 active"><label class="">是否含新建土建基础/包封：</label></td>
 			<td class="width-35">
-				<select id="designCivilFoundation" name="designCivilFoundation"  class="form-control">
-					<option value="">请选择</option>
-					<option value="是" <c:if test="${reserveManagement.designCivilFoundation=='是'}">selected</c:if>>是</option>
-					<option value="否" <c:if test="${reserveManagement.designCivilFoundation=='否'}">selected</c:if>>否</option>
-				</select>
+				<form:input path="designCivilFoundation" htmlEscape="false" class="form-control" readonly="true"/>
 			</td>
 			<td class="width-15 active"><label class="">现场浇筑清单：</label></td>
 			<td class="width-35">
-				<form:input path="castInPlaceList" htmlEscape="false" class="form-control"/>
+				<form:input path="castInPlaceList" htmlEscape="false" class="form-control" readonly="true"/>
 			</td>
 		</tr>
 		<tr>
 			<td class="width-15 active"><label class="">预制化清单：</label></td>
 			<td class="width-35">
-				<form:input path="designList" htmlEscape="false" class="form-control"/>
+				<form:input path="designList" htmlEscape="false" class="form-control" readonly="true"/>
 			</td>
 		</tr>
 

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

@@ -184,21 +184,17 @@
 		<tr>
 			<td class="width-15 active"><label class="">是否含新建土建基础/包封：</label></td>
 			<td class="width-35">
-				<select id="designCivilFoundation" name="designCivilFoundation"  class="form-control">
-					<option value="">请选择</option>
-					<option value="是" <c:if test="${reserveManagement.designCivilFoundation=='是'}">selected</c:if>>是</option>
-					<option value="否" <c:if test="${reserveManagement.designCivilFoundation=='否'}">selected</c:if>>否</option>
-				</select>
+				<form:input path="designCivilFoundation" htmlEscape="false" class="form-control" readonly="true"/>
 			</td>
 			<td class="width-15 active"><label class="">现场浇筑清单：</label></td>
 			<td class="width-35">
-				<form:input path="castInPlaceList" htmlEscape="false" class="form-control"/>
+				<form:input path="castInPlaceList" htmlEscape="false" class="form-control" readonly="true"/>
 			</td>
 		</tr>
 		<tr>
 			<td class="width-15 active"><label class="">预制化清单：</label></td>
 			<td class="width-35">
-				<form:input path="designList" htmlEscape="false" class="form-control"/>
+				<form:input path="designList" htmlEscape="false" class="form-control" readonly="true"/>
 			</td>
 		</tr>