From b311ca2f01e9602c1bf8caab04b4d641b314e341 Mon Sep 17 00:00:00 2001
From: liyj <15602261488@163.com>
Date: Sun, 29 Sep 2024 12:48:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/gzdyh_test' into gzdyh_test
---
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseReturnService.java | 25 ++++++++++++++++++++++---
1 files changed, 22 insertions(+), 3 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 6aee2aa..44dbb21 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
@@ -4,22 +4,20 @@
import cn.huge.base.common.utils.DateUtils;
import cn.huge.base.common.utils.IdUtils;
import cn.huge.module.cases.domain.dto.FrontPageListDTO;
-import cn.huge.module.cases.domain.po.CaseWindupApply;
import cn.huge.module.client.api.impl.UtilsClientImpl;
import cn.huge.module.cases.dao.mapper.CaseReturnMapper;
import cn.huge.module.cases.domain.po.CaseReturn;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.apache.commons.collections.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageImpl;
import org.springframework.data.domain.PageRequest;
import org.springframework.transaction.annotation.Transactional;
-import javax.annotation.PostConstruct;
import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -150,6 +148,27 @@
}
/**
+ * 根据纠纷编号查询最新的一条
+ * @param caseId 纠纷编号
+ * @return
+ */
+ public CaseReturn getNewByCaseId(String caseId, int caseTaskType){
+ try{
+ QueryWrapper<CaseReturn> caseReturnQueryWrapper = new QueryWrapper<>();
+ 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);
+ }else {
+ return null;
+ }
+ }catch (Exception e){
+ log.error("[CaseReturnService.getByCaseId]调用失败，异常信息："+e, e);
+ throw new ServiceException("CaseReturnService.getByCaseId", e);
+ }
+ }
+
+ /**
* 首页查询
* @param auditUnitId 审核组织编号
* @return long
--
Gitblit v1.8.0