删除方法 只读修改

src/main/java/com/jeeplus/modules/workprojectnotify/service/WorkProjectNotifyService.java

@@ -242,6 +242,7 @@ public class WorkProjectNotifyService extends CrudService<WorkProjectNotifyDao,
 	/**
 	 * 删除流程表信息
 	 */
+	@Transactional(readOnly = false)
 	public void deleteActivityProcess(String processInstanceId){
 		dao.deleteActivityProcess(processInstanceId);
 	}
@@ -249,6 +250,7 @@ public class WorkProjectNotifyService extends CrudService<WorkProjectNotifyDao,
 	/**
 	 * 删除流程人员表信息
 	 */
+	@Transactional(readOnly = false)
 	public void deleteActivityProcessUser(String processInstanceId){
 		dao.deleteActivityProcessUser(processInstanceId);
 	}

src/main/java/com/jeeplus/modules/workprojectnotify/web/WorkProjectNotifyController.java

@@ -3360,14 +3360,14 @@ public class WorkProjectNotifyController extends BaseController {
 			OaNotify oaNotify = oaNotifyService.get(workProjectNotify.getNotifyId());
 			int status = Integer.parseInt(oaNotify.getStatus());
 			if(status== ProjectStatusEnum.TSTORE.getValue()||status== ProjectStatusEnum.REJECTED.getValue()||status== ProjectStatusEnum.RECALL.getValue()){
-				//删除公告信息
-				oaNotifyService.delete(oaNotify);
 				//删除流程表信息
 				workProjectNotifyService.deleteActivityProcess(oaNotify.getProcessInstanceId());
 				//删除流程人员表信息
 				workProjectNotifyService.deleteActivityProcessUser(oaNotify.getProcessInstanceId());
 				//删除流程待办信息
 				workProjectNotifyService.deleteByNotifyId(workProjectNotify);
+				//删除公告信息
+				oaNotifyService.delete(oaNotify);
 				map.put("code",1);
 				map.put("msg","公告信息删除成功");
 			}else{
@@ -3378,10 +3378,14 @@ public class WorkProjectNotifyController extends BaseController {
 			WorkInvoice workInvoice = workInvoiceService.get(workProjectNotify.getNotifyId());
 			int status = Integer.parseInt(workInvoice.getInvoiceState());
 			if(status== ProjectStatusEnum.TSTORE.getValue()||status== ProjectStatusEnum.REJECTED.getValue()||status== ProjectStatusEnum.RECALL.getValue()){
-				//删除发票信息
-				workInvoiceService.delete(workInvoice);
 				//删除流程待办信息
 				workProjectNotifyService.deleteByNotifyId(workProjectNotify);
+				//删除流程表信息
+				workProjectNotifyService.deleteActivityProcess(workInvoice.getProcessInstanceId());
+				//删除流程人员表信息
+				workProjectNotifyService.deleteActivityProcessUser(workInvoice.getProcessInstanceId());
+				//删除发票信息
+				workInvoiceService.delete(workInvoice);
 				map.put("code",1);
 				map.put("msg","发票信息删除成功");
 			}else{
@@ -3392,10 +3396,14 @@ public class WorkProjectNotifyController extends BaseController {
 			WorkReimbursement workReimbursement = workReimbursementService.get(workProjectNotify.getNotifyId());
 			int status = Integer.parseInt(workReimbursement.getStatus());
 			if(status== ProjectStatusEnum.TSTORE.getValue()||status== ProjectStatusEnum.REJECTED.getValue()||status== ProjectStatusEnum.RECALL.getValue()){
-				//删除报销信息
-				workReimbursementService.delete(workReimbursement);
 				//删除流程待办信息
 				workProjectNotifyService.deleteByNotifyId(workProjectNotify);
+				//删除流程表信息
+				workProjectNotifyService.deleteActivityProcess(workReimbursement.getProcessInstanceId());
+				//删除流程人员表信息
+				workProjectNotifyService.deleteActivityProcessUser(workReimbursement.getProcessInstanceId());
+				//删除报销信息
+				workReimbursementService.delete(workReimbursement);
 				map.put("code",1);
 				map.put("msg","报销信息删除成功");
 			}else{
@@ -3406,14 +3414,14 @@ public class WorkProjectNotifyController extends BaseController {
 			ProjectFollowReport followReport = projectImplementEarlyService.getFollowById(workProjectNotify.getNotifyId());
 			int status = followReport.getStatus();
 			if(status== ProjectStatusEnum.TSTORE.getValue()||status== ProjectStatusEnum.REJECTED.getValue()||status== ProjectStatusEnum.RECALL.getValue()){
-				//删除咨询成果
-				projectImplementEarlyService.deleteFollow(followReport);
 				//删除流程表信息
 				workProjectNotifyService.deleteActivityProcess(followReport.getProcessInstanceId());
 				//删除流程人员表信息
 				workProjectNotifyService.deleteActivityProcessUser(followReport.getProcessInstanceId());
 				//删除流程待办信息
 				workProjectNotifyService.deleteByNotifyId(workProjectNotify);
+				//删除咨询成果
+				projectImplementEarlyService.deleteFollow(followReport);
 				map.put("code",1);
 				map.put("msg","咨询成果信息删除成功");
 			}else{