From c06b2f5b2aa6d8910664b30ab4f74ff3895ebbeb Mon Sep 17 00:00:00 2001
From: liyj <15602261488@163.com>
Date: Fri, 20 Sep 2024 10:27:45 +0800
Subject: [PATCH] Merge branch 'master' into gzdyh_test
---
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseReturnService.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseReturnService.java b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseReturnService.java
index 13d6d23..68b5d8d 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseReturnService.java
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseReturnService.java
@@ -155,10 +155,10 @@
* @param caseId 纠纷编号
* @return
*/
- public CaseReturn getNewByCaseId(String caseId){
+ public CaseReturn getNewByCaseId(String caseId, int caseTaskType){
try{
QueryWrapper<CaseReturn> caseReturnQueryWrapper = new QueryWrapper<>();
- caseReturnQueryWrapper.eq("case_id", caseId).orderByDesc("return_time");
+ caseReturnQueryWrapper.eq("case_id", caseId).eq("case_task_type", caseTaskType).orderByDesc("return_time");
List<CaseReturn> caseReturnList = mapper.selectList(caseReturnQueryWrapper);
if (CollectionUtils.isNotEmpty(caseReturnList)) {
return caseReturnList.get(0);
--
Gitblit v1.8.0