From 10d6587ec3f5c4779f40bcc1afe54d441db68711 Mon Sep 17 00:00:00 2001
From: lxp <1928192722@qq.com>
Date: 星期三, 12 三月 2025 15:35:30 +0800
Subject: [PATCH] 报告编制修改
---
inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderServiceImpl.java | 37 +++++++++++++++++--------------------
1 files changed, 17 insertions(+), 20 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 3f1c275..272479d 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
@@ -49,6 +49,7 @@
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.core.Authentication;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Isolation;
import org.springframework.transaction.annotation.Transactional;
@@ -114,7 +115,7 @@
//鑾峰彇妫�楠屼笅鍗曟暟鎹�
@Override
- public Map<String, Object> selectInsOrderParameter(Page<InsOrder> page, SampleOrderDto sampleOrderDto) {
+ public IPage<SampleOrderDto> selectInsOrderParameter(Page<InsOrder> page, SampleOrderDto sampleOrderDto) {
page.setOptimizeCountSql(false);
List<String> startAndEndTime = sampleOrderDto.getStartAndEndTime();
String startTime = "";
@@ -123,25 +124,23 @@
startTime = startAndEndTime.get(0) + " 00:00:00";
endTime = startAndEndTime.get(1) + " 23:59:59";
}
-
- Map<String, Object> map = new HashMap<>();
//// map.put("head", PrintChina.printChina(SampleOrderDto.class));
// //鍒ゆ柇鍏ㄩ儴,涓汉,缁勭粐鐨勬潈闄�
// Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId("selectInsOrderParameter");
-// User user = userMapper.selectById(map1.get("userId"));//褰撳墠鐧诲綍鐨勪汉
-// Integer roleId = user.getRoleId();
+ User user = userMapper.selectById(SecurityUtils.getUserId());;//褰撳墠鐧诲綍鐨勪汉
// //鑾峰彇褰撳墠浜烘墍灞炲疄楠屽id
-// String departLimsId = user.getDepartLimsId();
- String laboratory = null;
-// if (ObjectUtils.isNotEmpty(departLimsId) && !departLimsId.isEmpty()) {
-// String[] split = departLimsId.split(",");
-// //鏌ヨ瀵瑰簲鏋舵瀯鍚嶇О(閫氫俊瀹為獙瀹�,鐢靛姏瀹為獙瀹�,妫�娴嬪姙)
-// String departLims = baseMapper.seldepLimsId(Integer.parseInt(split[split.length - 1]));
-// if (departLims.contains("瀹為獙瀹�")) {
-// laboratory = departLims;
-// }
-// }
+ String departLimsId = user.getDepartLimsId();
+ String laboratory = "";
+ if (ObjectUtils.isNotEmpty(departLimsId) && !departLimsId.isEmpty()) {
+ String[] split = departLimsId.split(",");
+ //鏌ヨ瀵瑰簲鏋舵瀯鍚嶇О(閫氫俊瀹為獙瀹�,鐢靛姏瀹為獙瀹�,妫�娴嬪姙)
+ String departLims = baseMapper.seldepLimsId(Integer.parseInt(split[split.length - 1]));
+ if (departLims.contains("瀹為獙瀹�")) {
+ laboratory = departLims;
+ }
+ }
// //鍒ゆ柇鏄惁鏄叏閮ㄦ潈闄�
+// SecurityUtils.hasPermi("");
// Power power = powerMapper.selectOne(Wrappers.<Power>lambdaQuery().eq(Power::getRoleId, roleId).eq(Power::getMenuMethod, "selectAllInsOrderParameter"));
// if (ObjectUtils.isEmpty(power)) {
// if (map1.get("look") == 1) {
@@ -174,8 +173,7 @@
i.setSampleCode(split[0]);
}
});
- map.put("body", sampleOrderDtoIPage);
- return map;
+ return sampleOrderDtoIPage;
}
@Override
@@ -1200,8 +1198,7 @@
@Override
public void exportChecked(Map<String, Object> data, HttpServletResponse response) {
// Integer userId = getLook.selectPowerByMethodAndUserId(null).get("userId");
- Integer userId = Integer.valueOf(String.valueOf(SecurityUtils.getLoginUser().getUserId()));
- User user = userMapper.selectById(userId);
+ User user = userMapper.selectById(SecurityUtils.getLoginUser().getUserId());
List<String> names = null;
String startTime = "";
String endTime = "";
@@ -1710,7 +1707,7 @@
}
temperatureCyclingList = temperatureCyclingList.stream().distinct().collect(Collectors.toList());
//鏌ヨ鍏ㄨ壊璋憋紝杩囨护鑹叉爣骞舵帓搴�
- List<String> colorList = dictTypeService.selectDictDataByType("color_type").stream()
+ List<String> colorList = dictTypeService.selectDictDataByType("fiber_color_type").stream()
.sorted(Comparator.comparing(SysDictData::getDictSort))
.map(SysDictData::getDictLabel)
.collect(Collectors.toList());
--
Gitblit v1.9.3