From 3a77c500a010d12e913ff2b9e4cf27b1115c8224 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期三, 09 四月 2025 17:26:52 +0800
Subject: [PATCH] 检验任务，进货检验车间文件选择
---
inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java | 29 ++++++++++-------------------
1 files changed, 10 insertions(+), 19 deletions(-)
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java
index 7168206..28effb2 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java
@@ -55,6 +55,7 @@
import com.ruoyi.system.service.InformationNotificationService;
import org.apache.commons.lang3.StringUtils;
import org.apache.poi.xwpf.usermodel.*;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.core.io.ClassPathResource;
import org.springframework.mock.web.MockMultipartFile;
@@ -154,28 +155,18 @@
@Override
public IPage<InsOrderPlanVO> selectInsOrderPlanList(Page page, InsOrderPlanDTO insOrderPlanDTO) {
- // todo: 浠呯湅鑷繁鎴栬�呭疄楠屽
- //鑾峰彇褰撳墠浜烘墍灞炲疄楠屽id
-
- String laboratory = null;
-
- String userName = null;
- Integer userId = null;
- if (ObjectUtil.isNotEmpty(insOrderPlanDTO.getUserId())) {
- userId = SecurityUtils.getUserId().intValue();
- userName = userMapper.selectById(userId).getName();
+ // 妫�娴嬬鐞嗕汉鍛樺叏鏌ワ紝闈炴娴嬬鐞嗕汉鍛樺彧鏌ョ湅鑷繁鐨�
+ InsOrderPlanQueryDto insOrderPlanQueryDto = new InsOrderPlanQueryDto();
+ insOrderPlanQueryDto.setCheckUserFlag(SecurityUtils.hasRole("inspector"));
+ insOrderPlanQueryDto.setTestAdminFlag(SecurityUtils.hasRole("testadmin"));
+ // 鍒ゆ柇鏄惁瑙﹀彂鍙煡鐪嬭嚜宸�
+ if(null != insOrderPlanDTO.getUserId()){
+ insOrderPlanQueryDto.setViewMySelfFlag(true);
insOrderPlanDTO.setUserId(null);
}
- Integer isCheck = insOrderPlanDTO.getIsCheck();
- insOrderPlanDTO.setIsCheck(null);
- String sonLaboratory = insOrderPlanDTO.getSonLaboratory();//璇曢獙瀹�
+ insOrderPlanQueryDto.setUserId(SecurityUtils.getUserId().intValue());
IPage<InsOrderPlanVO> insOrderPage = insSampleMapper.findInsSampleAndOrder(page,
- QueryWrappers.queryWrappers(insOrderPlanDTO),
- userName,
- userId,
- sonLaboratory,
- laboratory,
- isCheck);
+ QueryWrappers.queryWrappers(insOrderPlanDTO),insOrderPlanQueryDto);
return insOrderPage;
}
--
Gitblit v1.9.3