储备项目新-流程修改

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

@@ -17,6 +17,12 @@ import java.util.List;
 public interface ReserveSummaryProcessMapper extends BaseMapper<ReserveSummaryProcess> {
 
     /**
+     * 根据项目储备id删除对应的流程信息
+     * @param priId
+     */
+    void deleteActivityByProId(String priId);
+
+    /**
      * 获取act_hi_comment表中的原因
      * @return
      */

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

@@ -238,6 +238,9 @@
     <delete id="deleteIntoActRunTaskByProId">
         delete from cg_act_run_task where projectReserveId = #{proId}
     </delete>
+    <delete id="deleteActivityByProId">
+        delete from cg_personnel_activiti where projectReserveId = #{proId}
+    </delete>
     <select id="findProjectId" resultType="java.lang.String">
         select projectReserveId from cg_personnel_activiti where id = #{id};
     </select>

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

@@ -367,6 +367,9 @@ public class ReserveSummaryProcessService extends CrudService<ReserveSummaryProc
             summary.setReasonForCancel(message);
             statisticService.update(summary);
 
+            //取消流程   将流程表中的流程信息删除
+            mapper.deleteActivityByProId(user.getProjectReserveId());
+
             ActRunTaskTest taskTest = mapper.getByProId(reserveProcess.getProjectReserveId());
             //删除掉act_ru_task表的联合审图 及 项目经理审图数据
             mapper.deleteByProcId(taskTest.getProcDefId(),"联合审图");
@@ -392,6 +395,9 @@ public class ReserveSummaryProcessService extends CrudService<ReserveSummaryProc
             vars.put("no",false);
             vars.put("rural",true);
 
+            //取消流程   将流程表中的流程信息删除
+            mapper.deleteActivityByProId(user.getProjectReserveId());
+
             ActRunTaskTest taskTest = mapper.getByProId(reserveProcess.getProjectReserveId());
             //删除掉act_ru_task表的联合审图 及 项目经理审图数据
             mapper.deleteByProcId(taskTest.getProcDefId(),"联合审图");
@@ -478,6 +484,9 @@ public class ReserveSummaryProcessService extends CrudService<ReserveSummaryProc
             summary.setReasonForCancel(message);
             statisticService.update(summary);
 
+            //取消流程   将流程表中的流程信息删除
+            mapper.deleteActivityByProId(user.getProjectReserveId());
+
             ActRunTaskTest taskTest = mapper.getByProId(process.getProjectReserveId());
             //删除掉act_ru_task表的联合审图 及 项目经理审图数据
             mapper.deleteByProcId(taskTest.getProcDefId(),"项目经理审图");
@@ -509,6 +518,9 @@ public class ReserveSummaryProcessService extends CrudService<ReserveSummaryProc
             summary.setReasonForCancel(message);
             statisticService.update(summary);
 
+            //取消流程   将流程表中的流程信息删除
+            mapper.deleteActivityByProId(user.getProjectReserveId());
+
             ActRunTaskTest taskTest = mapper.getByProId(process.getProjectReserveId());
             //删除掉act_ru_task表的联合审图 及 项目经理审图数据
             mapper.deleteByProcId(taskTest.getProcDefId(),"项目经理审图");

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

@@ -161,7 +161,7 @@
 		<tr>
 			<td class="width-15 active"><label class=""><font color="red">*</font>是否通过省公司评审：</label></td>
 			<td class="width-35">
-				<select id="companyReview" name="companyReview"  class="form-control">
+				<select id="passProvincialCompanyReview" name="passProvincialCompanyReview"  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>