From a265e62ac86c31a7e63ead82bf5f2300ebe5108f Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期日, 13 四月 2025 16:34:31 +0800
Subject: [PATCH] 不合格复测调整
---
inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java | 92 +++++++++-------------------------------------
1 files changed, 18 insertions(+), 74 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 b8bb4a0..de04143 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
@@ -258,16 +258,13 @@
List<InsProduct> insProducts = new ArrayList<>();
switch (dto.getType()) {
case 0:
- insProducts = insSampleMapper.getInsProduct1(dto.getId(), dto.getLaboratory(), dto.getCableTag(), dto.getRepetitionTag(), null);
- //鏍峰搧
- break;
case 4:
- //鐢电紗閰嶇疆
- insProducts = insSampleMapper.getInsProduct1(dto.getId(), dto.getLaboratory(), dto.getCableTag(), dto.getRepetitionTag(), null);
+ //濮旀墭
+ insProducts = insSampleMapper.getInsProduct1(dto.getId(), dto.getLaboratory(), dto.getCableTag(), dto.getRepetitionTag());
break;
case 5:
//鍘熸潗鏂欎笅鍗�
- insProducts = insSampleMapper.getInsProduct6(dto.getId(), dto.getLaboratory(), dto.getRawMaterialTag(), null);
+ insProducts = insSampleMapper.getInsProduct6(dto.getId(), dto.getLaboratory(), dto.getRawMaterialTag());
break;
}
if (BeanUtil.isEmpty(insProducts)) {
@@ -1322,36 +1319,14 @@
}
/**
- * 鑾峰彇涓嶅悎鏍兼暟鎹�
- * @return
- */
- @Override
- public List<InsProduct> getInsProductUnqualified(InsOrderPlanProductDto dto) {
- List<InsProduct> insProducts = new ArrayList<>();
- switch (dto.getType()) {
- case 0:
- //鏍峰搧
- insProducts = insSampleMapper.getInsProduct1(dto.getId(), dto.getLaboratory(), dto.getCableTag(), dto.getRepetitionTag(), "1");
- break;
- case 4:
- //鐢电紗閰嶇疆
- insProducts = insSampleMapper.getInsProduct1(dto.getId(), dto.getLaboratory(), dto.getCableTag(), dto.getRepetitionTag(), "1");
- break;
- case 5:
- //鍘熸潗鏂欎笅鍗�
- insProducts = insSampleMapper.getInsProduct6(dto.getId(), dto.getLaboratory(), dto.getRawMaterialTag(), "1");
- break;
- }
- return insProducts;
- }
-
- /**
* 鏂板涓嶅悎鏍煎娴嬪唴瀹�
* @param ids
* @return
*/
@Override
- public boolean addDisqualificationRetest(List<Integer> ids) {
+ public boolean addDisqualificationRetest(List<InsProduct> insProductsList) {
+ List<Integer> ids = insProductsList.stream().map(InsProduct::getId).collect(Collectors.toList());
+
// 鍒ゆ柇涔嬪墠鏄惁娣诲姞杩�
Long count = insUnqualifiedRetestProductMapper.selectCount(Wrappers.<InsUnqualifiedRetestProduct>lambdaQuery()
.in(InsUnqualifiedRetestProduct::getInsProductId, ids));
@@ -1372,38 +1347,29 @@
}
@Override
- public List<InsProduct> getInsProductUnqualifiedRetest(Integer id, Integer type, String laboratory, String cableTag, String rawMaterialTag, String retestTag) {
+ public List<InsProduct> getInsProductUnqualifiedRetest(InsOrderPlanProductDto dto) {
List<InsProduct> insProducts = new ArrayList<>();
- switch (type) {
+ switch (dto.getType()) {
case 0:
- //鏍峰搧
- insProducts = insUnqualifiedRetestProductMapper.getInsProductUnqualifiedRetest1(id, laboratory, retestTag);
- break;
case 4:
- //鐢电紗閰嶇疆
- insProducts = insUnqualifiedRetestProductMapper.getInsProductUnqualifiedRetest5(id, laboratory, cableTag, retestTag);
+ //濮旀墭
+ insProducts = insUnqualifiedRetestProductMapper.getInsProductUnqualifiedRetest1(dto.getId(), dto.getLaboratory(), dto.getCableTag(), dto.getRepetitionTag(), dto.getRetestTag());
break;
case 5:
//鍘熸潗鏂欎笅鍗�
- insProducts = insUnqualifiedRetestProductMapper.getInsProductUnqualifiedRetest6(id, laboratory, rawMaterialTag, retestTag);
+ insProducts = insUnqualifiedRetestProductMapper.getInsProductUnqualifiedRetest6(dto.getId(), dto.getLaboratory(), dto.getRawMaterialTag(), dto.getRetestTag());
break;
}
if (BeanUtil.isEmpty(insProducts)) {
return null;
}
- InsOrder order = insOrderMapper.selectFirstSubmit(id);
+ InsOrder order = insOrderMapper.selectFirstSubmit(dto.getId());
getTemplateThing(order, Collections.unmodifiableList(insProducts));
return insProducts;
}
- /**
- * 淇濆瓨涓嶅悎鏍煎娴嬫楠屽唴瀹�
- * @param currentTable
- * @param orderId
- * @param sonLaboratory
- */
@Override
@Transactional(rollbackFor = Exception.class)
public void saveUnqualifiedContext(Map<String, Object> insContext, Integer currentTable, Integer currentSampleId, Integer orderId, String sonLaboratory) {
@@ -1421,13 +1387,12 @@
BeanUtil.copyProperties(oldResults.get(0), newResult);
}
newResult.setRetestProductId(Integer.parseInt(k));
-
+ /*鏍￠獙涓�涓媟esult琛�*/
if (oldResults.size() > 1) {
for (int i = 1; i < oldResults.size(); i++) {
insUnqualifiedRetestResultMapper.deleteById(oldResults.get(i));
}
}
-
//妫�楠屽��
if (jo.get("insValue") != null) {
JSONArray jsonArray = JSON.parseArray(JSON.toJSONString(jo.get("insValue")));
@@ -1458,6 +1423,8 @@
for (Object o : jsonArray2) {
JSONObject comValue = JSON.parseObject(JSON.toJSONString(o));
Map<String, Object> map = new HashMap<>();
+ map.put("r", JSON.toJSONString(comValue.get("r")));
+ map.put("c", JSON.toJSONString(comValue.get("c")));
map.put("v", JSON.parseObject(JSON.toJSONString(comValue.get("v"))).get("v"));
cv.add(map);
}
@@ -1520,41 +1487,18 @@
insProductUserMapper.insert(new InsProductUser(null, userId, LocalDateTime.now(), insProduct.getId()));
- InsSample insSample = insSampleMapper.selectById(insProductMapper.selectById(insProduct.getId()).getInsSampleId());
- insSample.setInsState(1);
- Long l = insProductMapper.selectCount(Wrappers.<InsProduct>lambdaQuery()
- .eq(InsProduct::getInsSampleId, insSample.getId()));
- Long l1 = insProductMapper.selectCount(Wrappers.<InsProduct>lambdaQuery()
- .eq(InsProduct::getInsSampleId, insSample.getId())
- .and(wrapper -> wrapper
- .isNotNull(InsProduct::getInsResult)
- .or()
- .ne(InsProduct::getInsResult, 2)
- ));
- if (Objects.equals(l, l1)) {
- insSample.setInsState(2);
- }
- insSampleMapper.updateById(insSample);
/*鏍￠獙涓�涓媟esult琛�*/
List<InsUnqualifiedRetestResult> insProductResults = insUnqualifiedRetestResultMapper.selectList(Wrappers.<InsUnqualifiedRetestResult>lambdaQuery()
- .eq(InsUnqualifiedRetestResult::getRetestProductId, insProduct.getId()));
+ .eq(InsUnqualifiedRetestResult::getRetestProductId, product.getId()));
if (insProductResults.size() > 1) {
for (int i = 1; i < insProductResults.size(); i++) {
insUnqualifiedRetestResultMapper.deleteById(insProductResults.get(i));
}
}
+
}
});
- String sampleIdStr = insContext.keySet().stream().findFirst().orElse(null);
- if (sampleIdStr != null) {
- int count = insProductMapper.selectInsProductCountByOrderId(orderId);
- if (count == 0) {
- insOrderStateMapper.update(new InsOrderState(), Wrappers.<InsOrderState>lambdaUpdate()
- .eq(InsOrderState::getInsOrderId, orderId)
- .eq(InsOrderState::getLaboratory, sonLaboratory)
- .set(InsOrderState::getInsState, 2));
- }
- }
+
}
/**
--
Gitblit v1.9.3