From c16a867c943e25a25d64f02fb95e755ef1a7c9f9 Mon Sep 17 00:00:00 2001
From: liyj <15602261488@163.com>
Date: Mon, 30 Sep 2024 18:03:25 +0800
Subject: [PATCH] 1、审核过程中申请记录的申请时间和申请人无法查看 2、审核联合处置申请在申请部门已办结后会报错,且无法继续审核 3、案件不予受理后在已办中无记录 4、上报的案件上级部门回退后下级部门接收不到 5、广州市综治中心纠纷依然可以选择上报,且点击上报后报错

---
 dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseReturnService.java |    7 ++-----
 1 files changed, 2 insertions(+), 5 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..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,7 +4,6 @@
 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;
@@ -14,13 +13,11 @@
 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;
@@ -155,10 +152,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