额外费用统计

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<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<>();

src/main/resources/mappers/basis/HomeMapper.xml

@@ -28,11 +28,21 @@
 		select
 			teamName,sum(amount) as testCost
 		from (
-				 select tt.team_name as teamName,ts.id,teis.amount from tb_exper te
+				 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>
 	<select id="getCostRank" parameterType="com.bonus.aqgqj.basis.entity.vo.HomeVo" resultType="com.bonus.aqgqj.basis.entity.vo.HomeVo">