From 0ed3d6d60ece4effae6072556165a0aad9fe8f9f Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 15 八月 2025 13:21:43 +0800
Subject: [PATCH] 如果其他检验不检也可以生成报告结束试验跳过
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java | 26 ++++++++++++++++++++------
1 files changed, 20 insertions(+), 6 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java
index bf5c26f..0a53a10 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java
@@ -139,16 +139,21 @@
map.put("head", PrintChina.printChina(InsOrderPlanVO.class));
Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId(null);
String laboratory = null;
- String userName = null;
+ String myName = null;
if (ObjectUtil.isNotEmpty(insOrderPlanDTO.getUserId())) {
- userName = userMapper.selectById(map1.get("userId")).getName();
+ myName = userMapper.selectById(map1.get("userId")).getName();
insOrderPlanDTO.setUserId(null);
+ }
+ //妫�楠屼汉
+ if (ObjectUtil.isNotEmpty(insOrderPlanDTO.getUserName())){
+ myName=(ObjectUtils.isNotNull(myName)?myName+",":"")+insOrderPlanDTO.getUserName();
+ insOrderPlanDTO.setUserName(null);
}
String sonLaboratory = insOrderPlanDTO.getSonLaboratory();//璇曢獙瀹�
insOrderPlanDTO.setSonLaboratory(null);
String sampleCode = insOrderPlanDTO.getSampleCode();
insOrderPlanDTO.setSampleCode(null);
- IPage<InsOrderPlanVO> insOrderPage = insSampleMapper.findInsSampleAndOrder(page, QueryWrappers.queryWrappers(insOrderPlanDTO), userName, sonLaboratory, laboratory,sampleCode);
+ IPage<InsOrderPlanVO> insOrderPage = insSampleMapper.findInsSampleAndOrder(page, QueryWrappers.queryWrappers(insOrderPlanDTO), myName, sonLaboratory, laboratory,sampleCode);
map.put("body", insOrderPage);
return map;
}
@@ -928,6 +933,15 @@
return 1;
}
+ //鏍峰搧缂栧彿鏇存敼
+ @Override
+ public int changeSampleCode(Integer sampleId, String sampleCode) {
+ InsSample insSample = new InsSample();
+ insSample.setId(sampleId);
+ insSample.setSampleCode(sampleCode);
+ return insSampleMapper.updateById(insSample);
+ }
+
/**
* 闇囧姩doc鏂囦欢瑙ｆ瀽
* @param urlString
@@ -1106,7 +1120,7 @@
if (ObjectUtils.isEmpty(s)) {
continue;
}
- double numericValue = Math.abs(Double.parseDouble(s));
+ double numericValue = Double.parseDouble(s);
boolean valid = Arrays.stream(valuesToCheck)
.allMatch(v -> getResult(numericValue, v));
if (!valid) {
@@ -1225,7 +1239,7 @@
.set(InsOrderState::getVerifyTell, tell)
.set(InsOrderState::getVerifyUser, userId));
/*鐢熸垚瀵瑰簲鐨勬楠屾姤鍛�*/
- List<InsReportDto1> insReportDto1s=insOrderUserMapper.selectInsReportDto1(insOrder.getId());
+ List<InsReportDto1> insReportDto1s=insOrderUserMapper.selectInsReportDto1(insOrder.getId(),null);
createReport(insOrder.getId(),insReportDto1s);
break;
}
@@ -1325,7 +1339,7 @@
.set(InsOrderState::getVerifyUser, userId));
}
/*鐢熸垚瀵瑰簲鐨勬楠屾姤鍛�*/
- List<InsReportDto1> insReportDto1s=insOrderUserMapper.selectInsReportDto1(insOrder.getId());
+ List<InsReportDto1> insReportDto1s=insOrderUserMapper.selectInsReportDto1(insOrder.getId(),sampleId);
createReport(insOrder.getId(),insReportDto1s);
break;
}
--
Gitblit v1.9.3