forked from gzzfw/backEnd/gz-dyh
blame | history | patch | commit | commitdiff | ignore whitespace
liyj
2024-09-22 54f92e2eb235a59827d2cb49e61398c02551d5de 
 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);