2023-09-21 16:20

zhongzheng-system/src/main/java/com/zhongzheng/modules/dashBoard/mapper/DashBoardMapper.java

@@ -8,7 +8,7 @@ import java.util.Map;
 
 public interface DashBoardMapper extends BaseMapper<Order> {
 
-    Map getOrganDataM(@Param("paramMap") Map paramMap);
+    List<Map> getOrganDataM(@Param("paramMap") Map paramMap);
 
     Map getSumData(@Param("paramMap") Map paramMap);
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/dashBoard/service/impl/DashBoardServiceImpl.java

@@ -8,6 +8,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -34,21 +36,32 @@ public class DashBoardServiceImpl implements DashBoardService {
     @Override
     public List<DashBoardVo> getOrganList(Map<String, Object> maps) {
         //获取当前区段数据
-        Map thisData = dashBoardMapper.getOrganDataM(maps);
+        List<Map> thisData = dashBoardMapper.getOrganDataM(maps);
         //获取上个时间区段数据
         maps.put("startTime",maps.get("upTimeSta"));
         maps.put("endTime",maps.get("upTimeEnd"));
-        Map beforeMonthData = dashBoardMapper.getOrganDataM(maps);
+        List<Map> beforeMonthData = dashBoardMapper.getOrganDataM(maps);
         //获取去年这个时间段数据
         maps.put("startTime",maps.get("beTimeSta"));
         maps.put("endTime",maps.get("beTimeEnd"));
-        Map beforeYearData = dashBoardMapper.getOrganDataM(maps);
+        List<Map> beforeYearData = dashBoardMapper.getOrganDataM(maps);
         //获取当前时间区段总数据
         Map sumDatas = dashBoardMapper.getSumData(maps);
         //组装数据开始
-        /*thisData.entrySet().stream().filter((Map.Entry<String,Object> entry) ->{
+        List<DashBoardVo> list = new ArrayList<>();
+        thisData.stream().forEach(obj ->{
+            DashBoardVo vo = new DashBoardVo();
 
-        });*/
+            beforeMonthData.stream().filter(oj -> oj.get("organId")== obj.get("organId"));
+            System.out.println("长度:"+beforeMonthData.size());
+            if (null != beforeMonthData && beforeMonthData.size()>0)
+            {
+                Map mapB = beforeMonthData.get(0);
+
+            }
+
+
+        });
 
 
         return null;