haozq
/
ah_sz_gqj
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

额外费用统计

This commit is contained in:
haozq 2024-07-31 08:39:19 +08:00
parent 9b4ae160ab
commit 4331b459b1
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/bonus/aqgqj/basis/service/impl/HomeServiceImpl.java
View File

@ -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<HomeVo> listsalls=new ArrayList<>();
for(HomeVo teamvo:teamlist){
List<HomeVo> list=dao.getATeamNumForEcharts(teamvo);
if(list==null||list.size()==0){
if(ListHelper.isEmpty(list)){
continue;
}
lists=new ArrayList<>();

18
src/main/resources/mappers/basis/HomeMapper.xml
View File

@ -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
</select>