From 8dbf8e346080a6cbe22f0bfad55005923b901c3a Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 28 六月 2024 17:44:34 +0800
Subject: [PATCH] 标准库导入提示+能力范围场所字段+检验任务新增接口+委托编号生成
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java
index 6e42544..253a563 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java
@@ -263,12 +263,15 @@
@Override
public int upInsOrderOfState(InsOrder insOrder) {
insOrder.setExamineTime(LocalDateTime.now());
- String code = baseMapper.selLaboratoryCode(insOrder.getLaboratory());
- if (StringUtils.isEmpty(code)) {
- code = "";
+ if (insOrder.getState() == 1) {
+ //瀹℃牳閫氳繃鎵嶄細鐢熸垚濮旀墭缂栧彿
+ String code = baseMapper.selLaboratoryCode(insOrder.getLaboratory());
+ if (StringUtils.isEmpty(code)) {
+ code = "";
+ }
+ String code2 = customMapper.selectById(insOrder.getCompanyId()).getCode2();
+ insOrder.setEntrustCode(giveCode.giveCode("JC/ZX" + code + "-" + code2 + "-", "ins_order", "", "yyMM"));
}
- String code2 = customMapper.selectById(insOrder.getCompanyId()).getCode2();
- insOrder.setEntrustCode(giveCode.giveCode("JC/ZX" + code + "-" + code2 + "-", "ins_order", "", "yyMM"));
return insOrderMapper.updateById(insOrder);
}
@@ -279,6 +282,9 @@
List<SampleProductDto> list = insSampleMapper.getInsOrderAndSample(id, laboratory);
map.put("insOrder", insOrder);
map.put("sampleProduct", list);
+ //鏌ヨ鎵�鏈夎褰曟ā鐗堝幓閲�
+ List<Map<Integer, Object>> list2 = insOrderMapper.selectReportModelByOrderId(id, laboratory);
+ map.put("reportModel", list2);
return map;
}
@@ -320,7 +326,7 @@
//鏍囩鎵撳嵃
@Override
- public List<SampleProductDto3> labelPrinting(String ids) {
+ public List<SampleProductDto3> labelPrinting(String ids) {
List<Integer> list = Arrays.stream(ids.split(",")).map(Integer::parseInt).collect(Collectors.toList());
List<SampleProductDto3> sampleProductDtos = insSampleMapper.selectSampleProductListByOrderId3(list);
Set<String> processedCodes = new HashSet<>();
--
Gitblit v1.9.3