储备项目新-流程修改

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

@@ -17,16 +17,6 @@ import java.util.List;
 public interface SummaryStatisticMapper extends BaseMapper<ReserveSummary> {
 
     /**
-     * 根据 项目储备编号  修改是否纳入储备字段 和 取消原因说明字段
-     * @param proId
-     * @param includeReserve
-     * @param reasonForCancel
-     */
-    void updateReserveSummary(@Param("proId") String proId,
-                              @Param("includeReserve") String includeReserve,
-                              @Param("reasonForCancel") String reasonForCancel);
-
-    /**
      * 查出所有的  项目编码 及 是否纳入储备字段
      * @return
      */

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

@@ -52,7 +52,7 @@
 		a.civilConstructionMaterialOpen,
 		a.electricalPickListOpen,
 		a.administrativeOfficeRemark,
+        c.includeReserve as 'implementPlan',
         c.initialImplementBatch as 'intendBatch',
         b.ownerProjectManager as 'projectManager'
 

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

@@ -56,7 +56,7 @@
 		a.powerOutagePlan,
 		a.planner,
 		a.siteSurveyor,
+	    c.includeReserve as 'implementPlan',
 	    c.initialImplementBatch as implementBatch
 
     </sql>

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

@@ -33,7 +33,7 @@
 		a.designCivilFoundation,
 		a.castInPlaceList,
 		a.designList,
+        c.includeReserve as 'implementPlan',
         c.initialImplementBatch as 'implementBatch'
 
     </sql>

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

@@ -227,7 +227,13 @@
         delete from act_ru_execution where PROC_DEF_ID_ = #{procId} and ACT_ID_ = #{taskKey}
     </delete>
     <delete id="deleteByProcId">
-        delete from act_ru_task where PROC_DEF_ID_ = #{procId} and NAME_ = #{name}
+        delete from act_ru_task
+        <where>
+            PROC_DEF_ID_ = #{procId}
+            <if test="name!=null and name !=''">
+                and NAME_ = #{name}
+            </if>
+        </where>
     </delete>
     <delete id="deleteIntoActRunTaskByProId">
         delete from cg_act_run_task where projectReserveId = #{proId}

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

@@ -249,17 +249,6 @@
         where id = #{id}
 	</update>
 
-    <update id="updateReserveSummary">
-        update
-        cg_reserve_summary_statistics
-        set
-        update_by = #{updateBy.id},
-        update_date = #{updateDate},
-        includeReserve = #{includeReserve},
-        reasonForCancel = #{reasonForCancel}
-        where proId = #{proId}
-    </update>
-
     <select id="queryByProjectReserveId"
             resultType="com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.entity.ReserveSummary">
         select

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

@@ -35,6 +35,7 @@ public class CompanyReviewService extends CrudService<CompanyReviewMapper, Compa
      * 根据 项目储备编号删除对应的流程信息
      * @param proId
      */
+    @Transactional(readOnly = false)
     public void deleteActivityByProId(String proId){
         dao.deleteActivityByProId(proId);
     }

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

@@ -62,6 +62,34 @@ public class ReserveSummaryProcessService extends CrudService<ReserveSummaryProc
     private FeedBackBudgetMapper feedMapper;
 
     /**
+     * 根据 项目储备编号  查出设计单位节点信息
+     * @param proId
+     * @return
+     */
+    public ActRunTaskTest getByProId(String proId){
+        return mapper.getByProId(proId);
+    }
+
+    /**
+     * 根据   proc_def_id,和节点名称 删除 表 act_ru_task 的  项目经理审图 和 联合审图 相关数据
+     * @param procId
+     */
+    @Transactional(readOnly = false)
+    public void deleteByProcId(String procId, String name){
+        mapper.deleteByProcId(procId, name);
+    }
+    /**
+     * 根据 proc_def_id 和 task_def_key_来删除表act_ru_execution的相关数据
+     * @param procId
+     * @param taskKey
+     */
+    @Transactional(readOnly = false)
+    public void deleteExecution(String procId, String taskKey){
+        mapper.deleteExecution(procId, taskKey);
+    }
+
+
+    /**
      * 根据 项目名称 查看甲供材信息
      * @param projectName
      * @return

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

@@ -24,16 +24,6 @@ public class SummaryStatisticService extends CrudService<SummaryStatisticMapper,
     private SummaryStatisticMapper dao;
 
     /**
-     * 根据 项目储备编号  修改是否纳入储备字段 和 取消原因说明字段
-     * @param proId
-     * @param includeReserve
-     * @param reasonForCancel
-     */
-    public void updateReserveSummary(String proId, String includeReserve, String reasonForCancel){
-        dao.updateReserveSummary(proId, includeReserve, reasonForCancel);
-    }
-
-    /**
      * 查出所有的  项目编码 及 是否纳入储备字段
      * @return
      */

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

@@ -4,10 +4,12 @@ import com.jeeplus.common.json.AjaxJson;
 import com.jeeplus.common.utils.StringUtils;
 import com.jeeplus.core.persistence.Page;
 import com.jeeplus.core.web.BaseController;
+import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.entity.ActRunTaskTest;
 import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.entity.CompanyReview;
 import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.entity.ReserveSummary;
 import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.service.CompanyReviewService;
 import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.service.ReserveProcessProjectService;
+import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.service.ReserveSummaryProcessService;
 import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.service.SummaryStatisticService;
 import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.utils.ReserveProcessProjectExportUtil;
 import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.utils.ReserveProcessProjectProUtil;
@@ -47,6 +49,9 @@ public class CompanyReviewController extends BaseController {
     @Autowired
     private ReserveProcessProjectService projectService;
 
+    @Autowired
+    private ReserveSummaryProcessService summaryProcessService;
+
     @ModelAttribute
     public CompanyReview get(@RequestParam(required = false) String id) {
         CompanyReview entity = null;
@@ -105,9 +110,25 @@ public class CompanyReviewController extends BaseController {
                         if (a.getIncludeReserve().equals("是")){
                             //修改基础表的流程字段为取消，修改汇总表的是否纳入储备为取消，将取消原因放入到汇总表的取消原因说明字段 结束流程
                             projectService.updateProcessStatus(a.getProjectReserveId(),3);
-                            statisticService.updateReserveSummary(a.getProjectReserveId(),"取消",c.getReviewComments());
+
+                            ReserveSummary summary = new ReserveSummary();
+                            summary.setProjectReserveId(a.getProjectReserveId());
+                            ReserveSummary summary1 = statisticService.queryByProjectReserveId(summary);
+                            summary1.setIncludeReserve("取消");
+                            summary1.setReasonForCancel(c.getReviewComments());
+                            statisticService.update(summary1);
+
+//                            statisticService.updateReserveSummary(a.getProjectReserveId(),"取消",c.getReviewComments());
                             //取消流程   将流程表中的流程信息删除
                             service.deleteActivityByProId(a.getProjectReserveId());
+
+                            //将act_ru_task表中的任务删除
+                            ActRunTaskTest taskTest = summaryProcessService.getByProId(c.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");
+
                         }
                     }
                 });
@@ -219,9 +240,23 @@ public class CompanyReviewController extends BaseController {
         //2、流程未开始修改（正常操作不进行其他处理）
         if (companyReview.getPassProvincialCompanyReview().equals("取消")){
             projectService.updateProcessStatus(companyReview.getProjectReserveId(),3);
-            statisticService.updateReserveSummary(companyReview.getProjectReserveId(),"取消",companyReview.getReviewComments());
+
+            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);

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

@@ -161,7 +161,12 @@
 		<tr>
 			<td class="width-15 active"><label class=""><font color="red">*</font>是否通过省公司评审：</label></td>
 			<td class="width-35">
-				<form:input path="passProvincialCompanyReview" htmlEscape="false" class="form-control"/>
+				<select id="companyReview" name="companyReview"  class="form-control">
+					<option value="">请选择</option>
+					<option value="通过" <c:if test="${companyReview.passProvincialCompanyReview=='通过'}">selected</c:if>>通过</option>
+					<option value="取消" <c:if test="${companyReview.passProvincialCompanyReview=='取消'}">selected</c:if>>取消</option>
+				</select>
+<%--				<form:input path="passProvincialCompanyReview" htmlEscape="false" class="form-control"/>--%>
 			</td>
 			<td class="width-15 active"><label class="">评审意见：</label></td>
 			<td class="width-35">

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

@@ -5,6 +5,9 @@
 	<title>设计单位上传施工图</title>
 	<meta name="decorator" content="ani"/>
 <%--	<%@include file="/webpage/modules/bpm/task/history/taskHistoricList.js" %>--%>
+	<%@ include file="/webpage/include/bootstraptable.jsp"%>
+	<%@ include file="/webpage/include/treeview.jsp" %>
+	<%@ include file="budgetReview.js"%>
 	<script type="text/javascript">
 	var subVar;
 		$(document).ready(function() {
@@ -484,6 +487,14 @@
 							</table>
 						</form:form>
 
+						<table id="testPicTable"   data-toolbar="#toolbar"></table>
+						<div id="toolbar">
+							<button id="export" class="btn btn-warning">
+								<i class="fa fa-file-excel-o"></i> 导出甲供材清册
+							</button>
+						</div>
+						<table id="dataTable"   data-toolbar="#toolbar"></table>
+
 						<div class="row">
 							<div class="col-sm-3"></div>
 							<div class="col-sm-6">