From b0b1e641a31a0494262187f97034807fc53515dd Mon Sep 17 00:00:00 2001
From: xusd <hugeinfo123>
Date: Mon, 28 Oct 2024 15:49:39 +0800
Subject: [PATCH] Merge branch 'gzdyh_test' into gzdyh_grid
---
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseTaskService.java | 25 +++++++++++++++++++------
1 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseTaskService.java b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseTaskService.java
index 510d94f..e6ab0b6 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseTaskService.java
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseTaskService.java
@@ -3319,6 +3319,19 @@
}
}
+ /**
+ * 根据编号物理删除
+ * @param caseId
+ */
+ public void deleteByCaseId(String caseId){
+ try{
+ mapper.deleteByCaseId(caseId);
+ }catch (Exception e){
+ log.error("[CaseTaskService.deleteByCaseId]调用失败，异常信息："+e, e);
+ throw new ServiceException("CaseTaskService.deleteByCaseId", e);
+ }
+ }
+
public void deleteGridTodo(CaseTask caseTask) {
try {
//删除网格待办任务
@@ -3336,7 +3349,7 @@
SimpleDateFormat outputFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
//添加网格待办
GridToDoBacthVo gridToDoBacthVo = new GridToDoBacthVo();
- gridToDoBacthVo.setObjId(caseTask.getId());
+ gridToDoBacthVo.setObjId(caseInfo.getId());
gridToDoBacthVo.setObjType(gridObjType);
gridToDoBacthVo.setSysContent("");
gridToDoBacthVo.setYzyContent("");
@@ -3345,7 +3358,7 @@
gridToDoBacthVo.setTodoType(GridEnum.GRID_TODO_TYPE_5.getIndex());
gridToDoBacthVo.setTitle(noticeTypeName + caseInfo.getPlaintiffs() + "和" + caseInfo.getDefendants()+"的"+caseInfo.getCaseTypeName()+"事件");
gridToDoBacthVo.setLimitTime(outputFormat.format(caseTask.getExpireTime()));
- gridToDoBacthVo.setCaseId(caseInfo.getId());
+ gridToDoBacthVo.setCaseTaskId(caseTask.getId());
sysClient.createTaskToDo(gridToDoBacthVo, caseTask.getCandeUnitId());
} catch (Exception e) {
log.error("添加网格待办失败");
@@ -3357,7 +3370,7 @@
try {
//添加网格待办
GridToDoVo gridToDoVo = new GridToDoVo();
- gridToDoVo.setObjId(caseTask.getId());
+ gridToDoVo.setObjId(caseInfo.getId());
gridToDoVo.setObjType(gridObjType);
gridToDoVo.setSysContent("");
gridToDoVo.setYzyContent("");
@@ -3366,7 +3379,7 @@
gridToDoVo.setTodoType(GridEnum.GRID_TODO_TYPE_5.getIndex());
gridToDoVo.setTitle(noticeTypeName + caseInfo.getPlaintiffs() + "和" + caseInfo.getDefendants() + "的" + caseInfo.getCaseTypeName() + "事件");
gridToDoVo.setLimitTime(String.valueOf(caseTask.getExpireTime()));
- gridToDoVo.setCaseId(caseInfo.getId());
+ gridToDoVo.setCaseTaskId(caseTask.getId());
sysClient.updateTaskTodo(gridToDoVo, previousTaskId);
} catch (Exception e) {
log.error("修改网格待办失败");
@@ -3384,7 +3397,7 @@
sysClient.deleteTaskTodo(gridTaskVo);
//添加网格待办
GridToDoBacthVo gridToDoBacthVo = new GridToDoBacthVo();
- gridToDoBacthVo.setObjId(caseTask.getId());
+ gridToDoBacthVo.setObjId(caseInfo.getId());
gridToDoBacthVo.setObjType(gridObjType);
gridToDoBacthVo.setSysContent("");
gridToDoBacthVo.setYzyContent("");
@@ -3397,7 +3410,7 @@
}else{
gridToDoBacthVo.setLimitTime(outputFormat.format(DateUtils.addHour(DateUtils.getNowDate(), 12)));
}
- gridToDoBacthVo.setCaseId(caseInfo.getId());
+ gridToDoBacthVo.setCaseTaskId(caseTask.getId());
sysClient.createTaskToDo(gridToDoBacthVo, caseTask.getCandeUnitId());
} catch (Exception e) {
log.error("修改网格待办流程失败");
--
Gitblit v1.8.0