From 4331b459b1efdb0fe7ba06eb3da4a873b77ceefa Mon Sep 17 00:00:00 2001 From: haozq <1611483981@qq.com> Date: Wed, 31 Jul 2024 08:39:19 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A2=9D=E5=A4=96=E8=B4=B9=E7=94=A8=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basis/service/impl/HomeServiceImpl.java | 3 ++- .../resources/mappers/basis/HomeMapper.xml | 18 ++++++++++++++---- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/bonus/aqgqj/basis/service/impl/HomeServiceImpl.java b/src/main/java/com/bonus/aqgqj/basis/service/impl/HomeServiceImpl.java index 7e14bd1..b8ba17c 100644 --- a/src/main/java/com/bonus/aqgqj/basis/service/impl/HomeServiceImpl.java +++ b/src/main/java/com/bonus/aqgqj/basis/service/impl/HomeServiceImpl.java @@ -6,6 +6,7 @@ import com.bonus.aqgqj.basis.entity.dto.ToolsManageDto; import com.bonus.aqgqj.basis.entity.vo.HomeVo; import com.bonus.aqgqj.basis.service.HomeService; import com.bonus.aqgqj.utils.DateTimeHelper; +import com.bonus.aqgqj.utils.ListHelper; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -63,7 +64,7 @@ public class HomeServiceImpl implements HomeService { List listsalls=new ArrayList<>(); for(HomeVo teamvo:teamlist){ List list=dao.getATeamNumForEcharts(teamvo); - if(list==null||list.size()==0){ + if(ListHelper.isEmpty(list)){ continue; } lists=new ArrayList<>(); diff --git a/src/main/resources/mappers/basis/HomeMapper.xml b/src/main/resources/mappers/basis/HomeMapper.xml index 6cf64e3..5953658 100644 --- a/src/main/resources/mappers/basis/HomeMapper.xml +++ b/src/main/resources/mappers/basis/HomeMapper.xml @@ -28,10 +28,20 @@ select teamName,sum(amount) as testCost from ( - select tt.team_name as teamName,ts.id,teis.amount from tb_exper te - left join tb_sample ts on te.sample_id=ts.id - left join tb_team tt on ts.team_id=tt.id - left join tb_exper_items teis on te.id=teis.exper_id + select tt.team_name as teamName,ts.id,teis.amount + from tb_exper te + left join tb_sample ts on te.sample_id=ts.id + left join tb_team tt on ts.team_id=tt.id + left join tb_exper_items teis on te.id=teis.exper_id + where ts.del_flag='0' + union ALL + + -- 额外费用 + select tt.team_name as teamName,ts.id,ted.amount + from tb_exper te + left join tb_exper_dev ted on te.id=ted.exper_id + left join tb_sample ts on te.sample_id=ts.id + left join tb_team tt on ts.team_id=tt.id where ts.del_flag='0' ) aa group by teamName