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/InsOrderPlanServiceImpl.java | 44 ++++++++++++++++++++++++++++++++++++++------
1 files changed, 38 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 f9a82a1..8db8b06 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
@@ -25,6 +25,7 @@
import com.deepoove.poi.xwpf.WidthScalePattern;
import com.yuanchu.mom.common.GetLook;
import com.yuanchu.mom.common.PrintChina;
+import com.yuanchu.mom.dto.BushingDto;
import com.yuanchu.mom.dto.ExcelDto;
import com.yuanchu.mom.dto.InsOrderPlanDTO;
import com.yuanchu.mom.dto.SampleProductDto;
@@ -118,7 +119,13 @@
private InsBushingService insBushingService;
@Resource
+ private InsBushingMapper insBushingMapper;
+
+ @Resource
private InsFiberMapper insFiberMapper;
+
+ @Resource
+ private InsFibersMapper insFibersMapper;
@Resource
private InsOrderFileMapper insOrderFileMapper;
@@ -175,11 +182,8 @@
Map<String, Object> map = insOrderService.getInsOrderAndSample(id, laboratory);
List<SampleProductDto> list = JSON.parseArray(JSON.toJSONString(map.get("sampleProduct")), SampleProductDto.class);
for (SampleProductDto samples : list) {
-// Set<Integer> set = new HashSet<>();
-// Map<Integer, String> map2 = new HashMap<>();
if (BeanUtil.isEmpty(samples.getInsProduct())) continue;
samples.setBushing(insBushingService.selectBushingBySampleId(samples.getId()));
-// getTemplateThing(set, map2, samples.getInsProduct());
}
map.put("sampleProduct", list);
return map;
@@ -265,6 +269,34 @@
}
}
+ //鍒囨崲璁板綍妯＄増鏌ヨ妫�楠屽唴瀹�
+ @Override
+ public Map<String, Object> getReportModel(Integer orderId) {
+ Map<String, Object> map = new HashMap<>();
+ List<Integer> insSampleIds = insSampleMapper.selectList(Wrappers.<InsSample>lambdaQuery().eq(InsSample::getInsOrderId, orderId)).stream().map(InsSample::getId).collect(Collectors.toList());
+ //鍏堟煡鍑哄绠�
+ List<InsBushing> insBushings = insBushingMapper.selectList(Wrappers.<InsBushing>lambdaQuery().in(InsBushing::getInsSampleId, insSampleIds));
+ List<InsFibers> fibers = new ArrayList<>();
+ List<InsFiber> fiber = new ArrayList<>();
+ for (InsBushing insBushing : insBushings) {
+ //鍐嶆煡璇㈠嚭鎵�鏈夌殑鍏夌氦甯�
+ List<InsFibers> insFibers = insFibersMapper.selectList(Wrappers.<InsFibers>lambdaQuery().eq(InsFibers::getInsBushingId, insBushing.getId()));
+ if (CollectionUtils.isNotEmpty(insFibers)) {
+ fibers.addAll(insFibers);
+ //鏌ュ嚭鍏夌氦甯︿笅鎵�鏈夌殑鍏夌氦
+ List<InsFiber> fiberList = insFiberMapper.selectList(Wrappers.<InsFiber>lambdaQuery().in(InsFiber::getInsFibersId, insFibers.stream().map(InsFibers::getId).collect(Collectors.toList())));
+ fiber.addAll(fiberList);
+ } else {
+ //濡傛灉濂楃涓嬫病鏈夊厜绾ゅ甫灏卞彧鏈夊厜绾や簡
+ List<InsFiber> insFiberList = insFiberMapper.selectList(Wrappers.<InsFiber>lambdaQuery().eq(InsFiber::getInsBushingId, insBushing.getId()));
+ fiber.addAll(insFiberList);
+ }
+ }
+ map.put("鍏夌氦甯�",fibers);
+ map.put("鍏夌氦",fiber);
+ return map;
+ }
+
@Override
public void saveInsContext(Map<String, Object> insContext) {
Integer userId = getLook.selectPowerByMethodAndUserId(null).get("userId");
@@ -276,9 +308,9 @@
List<InsProductResult> results = insProductResultMapper.selectList(Wrappers.<InsProductResult>lambdaQuery().eq(InsProductResult::getInsProductId, insProduct.getId()));
InsProductResult result;
if (CollectionUtils.isEmpty(results)) {
- result = new InsProductResult();
+ result = new InsProductResult();
} else {
- result = results.get(0);
+ result = results.get(0);
}
result.setInsProductId(Integer.parseInt(k));
if (jo.get("insValue") != null) {
@@ -639,7 +671,7 @@
break;
}
} else if (value.equals("搴忓彿")) {
- if(itemSet.add(p.getInspectionItem())){
+ if (itemSet.add(p.getInspectionItem())) {
index.getAndIncrement();
}
textRenderData.setText(index + "");
--
Gitblit v1.9.3