From 00c23dd7d4a8f229d5c7fbe3439c6ea230fa7f48 Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期三, 09 四月 2025 16:20:21 +0800
Subject: [PATCH] 成品检验查询功能开发
---
inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java | 39 +++++++++++++++------------------------
1 files changed, 15 insertions(+), 24 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 39879ab..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;
}
@@ -359,7 +350,7 @@
insContext.forEach((k, v) -> {
JSONObject jo = JSON.parseObject(JSON.toJSONString(v));
InsProduct insProduct = new InsProduct();
- insProduct.setId(Integer.parseInt(k));
+ insProduct.setId(Long.valueOf(Integer.parseInt(k)));
InsProduct product = insProductMapper.selectById(insProduct.getId());
if (currentTable.equals(product.getTemplateId()) && currentSampleId.equals(product.getInsSampleId())) {
List<InsProductResult> oldResults = insProductResultMapper.selectList(Wrappers.<InsProductResult>lambdaQuery()
@@ -466,7 +457,7 @@
insProduct.setUpdateUser(userId);
insProductMapper.updateById(insProduct);
- insProductUserMapper.insert(new InsProductUser(null, userId, LocalDateTime.now(), insProduct.getId()));
+ insProductUserMapper.insert(new InsProductUser(null, userId, LocalDateTime.now(), Math.toIntExact(insProduct.getId())));
insSample.setInsState(1);
Long l = insProductMapper.selectCount(Wrappers.<InsProduct>lambdaQuery()
@@ -823,8 +814,8 @@
// 7.鏍￠獙涓�涓媟esult琛�(閬垮厤鍑虹幇澶氫釜妫�楠岄」缁撴灉)
threadPoolTaskExecutor.execute(() -> {
- List<Integer> ips = insProducts.stream().map(InsProduct::getId).distinct().collect(Collectors.toList());
- for (Integer ip : ips) {
+ List<Long> ips = insProducts.stream().map(InsProduct::getId).distinct().collect(Collectors.toList());
+ for (Long ip : ips) {
List<InsProductResult> insProductResults = insProductResultMapper.selectList(Wrappers.<InsProductResult>lambdaQuery()
.eq(InsProductResult::getInsProductId, ip));
if (insProductResults.size() > 1) {
@@ -879,7 +870,7 @@
InsOrderRates insOrderRates = new InsOrderRates();
insOrderRates.setInsOrderId(orderId);
insOrderRates.setInsSampleId(insProduct.getInsSampleId());
- insOrderRates.setInsProductId(insProduct.getId());
+ insOrderRates.setInsProductId(Math.toIntExact(insProduct.getId()));
insOrderRates.setSampleCode(insProduct.getSampleCode());
insOrderRates.setEntrustCode(order.getEntrustCode());
insOrderRates.setInspectionItemClass(insProduct.getInspectionItemClass());
--
Gitblit v1.9.3