From 8f63d5ce747106195b279e1c158fd12f9997a770 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期二, 18 三月 2025 19:08:40 +0800
Subject: [PATCH] 检验任务代码迁移&爱尚平台对接测试
---
inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderServiceImpl.java | 11 +++--------
1 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderServiceImpl.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderServiceImpl.java
index 08b58e1..2d1a5c8 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderServiceImpl.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderServiceImpl.java
@@ -1858,16 +1858,12 @@
@Override
- public Map<String, Object> costStatistics(IPage<CostStatisticsDto> page, CostStatisticsDto costStatisticsDto) {
+ public IPage<CostStatisticsDto> costStatistics(IPage<CostStatisticsDto> page, CostStatisticsDto costStatisticsDto) {
String dates = costStatisticsDto.getDates();
String[] split = dates.replaceAll("\\[", "").replaceAll("]", "").replaceAll("\"", "").split(",");
costStatisticsDto.setDates(null);
- Map<String, Object> map = new HashMap<>();
-// map.put("head", PrintChina.printChina(CostStatisticsDto.class));
- Map<String, Integer> map1 = new HashMap<>();
- if (map1.get("look") == 1) costStatisticsDto.setCreateUser(map1.get("userId"));
// 鑾峰彇褰撳墠浜烘墍鍦ㄥ疄楠屽
- Integer userId = 1;
+ Integer userId = Integer.parseInt(SecurityUtils.getLoginUser().getUser().getUserId().toString());
String departLimsId = userMapper.selectById(userId).getDepartLimsId();
String laboratory = "";
if (StringUtils.isNotBlank(departLimsId)) {
@@ -1894,8 +1890,7 @@
return dto;
}).collect(Collectors.toList());
dtoIPage.setRecords(collect);
- map.put("body", dtoIPage);
- return map;
+ return dtoIPage;
}
@Override
--
Gitblit v1.9.3