From cb3c4874188ef564f444c6dc3b6040cd4266c8a2 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 16 七月 2024 20:17:39 +0800
Subject: [PATCH] 热循环新增与查询写完待联调+工时星期字段+费用统计的委托单位
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java | 64 +++++++++++++++++++++++++++++++-
1 files changed, 62 insertions(+), 2 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 952e942..a67a306 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
@@ -318,7 +318,67 @@
}
}
insProductService.saveBatch(insProductes);
- } else {
+ }
+ //鍒ゆ柇鐑惊鐜」鐩殑娣诲姞鍜屾俯鍗囪瘯楠岄」鐩殑娣诲姞
+ else if (product.getInspectionItem().equals("鐑惊鐜�") || product.getInspectionItem().equals("娓╁崌璇曢獙")) {
+ List<InsProduct> insProductess = new ArrayList<>();
+ insProductess.add(product);
+ List<InsProduct> insProductes = new ArrayList<>();
+ List<InsProduct> insProducts = new ArrayList<>();
+ String[] strings = product.getAsk().split(";");
+ //寰幆娆℃暟
+ int count = Integer.parseInt(strings[strings.length - 1]);
+ for (int i = 0; i < strings.length - 1; i++) {
+ String[] split = strings[i].split(",");
+ InsProduct insProduct = new InsProduct();
+ insProduct.setInspectionItem("1");//妫�楠岀埗椤�--寰幆娆℃暟
+ insProduct.setInspectionItemSubclass(split[0]);//妫�楠屽瓙椤�--鐜娓╁害/瀵肩嚎娓╁害/鑰愬紶娓╁害/鎺ョ画娓╁害
+ insProduct.setInspectionItemSubclassEn(split[1]);//妫�楠屽瓙椤硅嫳鏂�--鐜娓╁害/瀵肩嚎娓╁害/鑰愬紶娓╁害/鎺ョ画娓╁害
+ insProduct.setAsk(null);//妫�楠岃姹�
+ insProduct.setTell(null);//妫�楠屾弿杩�
+ insProduct.setInsSampleId(sampleId);
+ insProduct.setState(1);
+ insProduct.setFactory(product.getFactory());
+ insProduct.setLaboratory(product.getLaboratory());
+ insProduct.setSampleType(product.getSampleType());
+ insProduct.setSample(product.getSample());
+ insProduct.setModel(product.getModel());
+ insProduct.setSonLaboratory(product.getSonLaboratory());
+ insProduct.setUnit("鈩�");//鍗曚綅
+ insProduct.setManHourGroup(product.getManHourGroup());
+ insProduct.setInspectionItemType("0");
+ insProduct.setInspectionValueType("1");
+ insProducts.add(insProduct);
+ insProductes.add(insProduct);
+ insProductess.add(insProduct);
+ }
+ //鐑惊鐜墠鏈夊娆″惊鐜鏁�
+ if (product.getInspectionItem().equals("鐑惊鐜�")) {
+ //鐑惊鐜繕瑕佸姞涓婄洿娴佺數闃�
+ for (InsProduct insProduct : insProducts) {
+ InsProduct insProduct1 = new InsProduct();
+ BeanUtils.copyProperties(insProduct, insProduct1);
+ insProduct1.setInspectionItemClass("鐩存祦鐢甸樆");//妫�楠屽瓙瀛愰」--鐩存祦鐢甸樆
+ insProduct1.setInspectionItemClassEn("DC resistance");//妫�楠屽瓙瀛愰」鑻辨枃--鐩存祦鐢甸樆
+ insProduct1.setUnit("惟/km");//鍗曚綅
+ insProductes.add(insProduct1);
+ insProductess.add(insProduct1);
+ }
+ }
+ if (count > 1) {
+ //寰幆瓒呰繃1娆�
+ for (int j = 2; j <= count; j++) {
+ for (InsProduct insProduct : insProductes) {
+ InsProduct insProduct1 = new InsProduct();
+ BeanUtils.copyProperties(insProduct, insProduct1);
+ insProduct1.setInspectionItem(j + "");//寰幆娆℃暟
+ insProductess.add(insProduct1);
+ }
+ }
+ }
+ insProductService.saveBatch(insProductess);
+ }
+ else {
if (!is) {
switch (type) {
case 1:
@@ -414,7 +474,7 @@
.filter(dto -> dto.getPrice() != null) // 杩囨护鎺変环鏍间负 null 鐨勫璞�
.mapToDouble(value -> value.getPrice().doubleValue())
.sum();
- map.put("total",totalPrice);
+ map.put("total", totalPrice);
return map;
}
--
Gitblit v1.9.3