Merge remote-tracking branch 'origin/master'

# Conflicts:
#	sk-module-biz/src/main/java/com/skua/modules/algorithm/service/impl/ReportItemvService.java

@@ -1680,4 +1680,24 @@ public class ScreenDataController {
         }
         return resList;
     }
+
+    @AutoLog(value = "设备相关组件")
+    @ApiOperation(value = "设备相关组件", notes = "设备相关组件")
+    @PostMapping(value = "/getEquipData")
+    public Result<Map<String, Object>> getEquipData(@RequestBody StatisticsParams statisticsParams) {
+        Result<Map<String, Object>> result = new Result<>();
+        Map<String, Object> map = screenDataService.getEquipData(statisticsParams);
+        result.setResult(map);
+        return result;
+    }
+
+    @AutoLog(value = "招采组件")
+    @ApiOperation(value = "招采组件", notes = "招采组件")
+    @PostMapping(value = "/getErpData")
+    public Result<Map<String, Object>> getErpData(@RequestBody StatisticsParams statisticsParams) {
+        Result<Map<String, Object>> result = new Result<>();
+        Map<String, Object> map = screenDataService.getErpData(statisticsParams);
+        result.setResult(map);
+        return result;
+    }
 }

@@ -34,4 +34,8 @@ public interface IScreenDataService{
      * @return
      */
     List<Map<String, Object>> factoryDesign(QueryWrapper<Object> queryWrapper);
+
+    Map<String, Object> getEquipData(StatisticsParams statisticsParams);
+
+    Map<String, Object> getErpData(StatisticsParams statisticsParams);
 }

@@ -355,6 +355,32 @@ public class ScreenDataServiceImpl implements IScreenDataService {
         return screenMapper.factoryDesign(queryWrapper);
     }
 
+    @Override
+    public Map<String, Object> getEquipData(StatisticsParams statisticsParams) {
+        Map<String, Object> map = new HashMap<>();
+        List<Map<String, Object>> list = new ArrayList<>();
+        Map<String, Object> equip1 = new HashMap<>();
+        equip1.put("departName","0.00");
+        equip1.put("equipName","0.00");
+        equip1.put("gzqk","0.00");
+        equip1.put("clcs","0.00");
+        list.add(equip1);
+        map.put("ywhfy","0.00");
+        map.put("list",list);
+        return map;
+    }
+
+    @Override
+    public Map<String, Object> getErpData(StatisticsParams statisticsParams) {
+        Map<String, Object> map = new HashMap<>();
+        map.put("yjrkl","0.00");
+        map.put("cgze","0.00");
+        map.put("fxze","0.00");
+        map.put("gysjsje","0.00");
+        map.put("swgsjsje","0.00");
+        return map;
+    }
+
     public static void main(String[] args) {
         String startTime = "2024-01-01";//
         String endTime = "2024-12-31";