From be76631e84862d84c23654ce39a81960516b2607 Mon Sep 17 00:00:00 2001 From: wxyclub Date: Wed, 6 Dec 2023 17:35:32 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E7=9B=91=E6=8E=A7=E6=B5=81=E7=A8=8B-?= =?UTF-8?q?=E4=BC=81=E6=A0=87=E5=88=B6=E4=BF=AE=E8=AE=A2-=E6=B1=87?= =?UTF-8?q?=E6=80=BB=E6=B5=81=E7=A8=8B=E8=AF=84=E5=88=86=E4=BB=85=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E6=9C=80=E6=96=B0=E7=9A=84=E5=88=86=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusProcessEvaluationHisServiceImpl.java | 40 +++++++++++++++++-- 1 file changed, 36 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/BusProcessEvaluationHisServiceImpl.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/BusProcessEvaluationHisServiceImpl.java index 7f32880b..b7bb3fa1 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/BusProcessEvaluationHisServiceImpl.java +++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/BusProcessEvaluationHisServiceImpl.java @@ -2,6 +2,7 @@ package com.ydw.bat.wkflow.business_main.datas.service.impl; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ydw.bat.wkflow.business_auth.LawsUserInfoService; @@ -122,9 +123,40 @@ public class BusProcessEvaluationHisServiceImpl extends ServiceImpl evaluationHisList(String pid){ - QueryWrapper wrapper = new QueryWrapper(); - wrapper.eq("P_ID",pid); - wrapper.orderByDesc("CREATE_TIME","TASK_INFO"); - return this.baseMapper.selectList(wrapper); + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(BusProcessEvaluationHis::getPId,pid); + wrapper.orderByDesc(BusProcessEvaluationHis::getCreateTime,BusProcessEvaluationHis::getTaskInfo); + List busProcessEvaluationHis = this.baseMapper.selectList(wrapper); + if(busProcessEvaluationHis.isEmpty()){ + return null; + } + Optional fushen = busProcessEvaluationHis.stream() + .filter(each -> "标准化复审".equals(each.getTaskInfo())) + .max(Comparator.comparing(BusProcessEvaluationHis::getCreateTime)); + Optional chongxinpinshen = busProcessEvaluationHis.stream() + .filter(each -> "重新技术委员会评审、评审意见修改".equals(each.getTaskInfo())) + .max(Comparator.comparing(BusProcessEvaluationHis::getCreateTime)); + Optional pinshen = busProcessEvaluationHis.stream() + .filter(each -> "技术委员会评审、评审意见修改".equals(each.getTaskInfo())) + .max(Comparator.comparing(BusProcessEvaluationHis::getCreateTime)); + Optional jinlishenhe = busProcessEvaluationHis.stream() + .filter(each -> "标准法规部高级经理审核".equals(each.getTaskInfo())) + .max(Comparator.comparing(BusProcessEvaluationHis::getCreateTime)); + List zhengqiuyijian = busProcessEvaluationHis.stream() + .filter(each -> "征求意见".equals(each.getTaskInfo())) + .collect(Collectors.toList()); + List finalEvaluationList = new ArrayList<>(); + if (chongxinpinshen.isPresent()) { + fushen.ifPresent(finalEvaluationList::add); + chongxinpinshen.ifPresent(finalEvaluationList::add); + jinlishenhe.ifPresent(finalEvaluationList::add); + finalEvaluationList.addAll(zhengqiuyijian); + } else { + fushen.ifPresent(finalEvaluationList::add); + pinshen.ifPresent(finalEvaluationList::add); + jinlishenhe.ifPresent(finalEvaluationList::add); + finalEvaluationList.addAll(zhengqiuyijian); + } + return finalEvaluationList; } }