From dc4ade8c4a6062ea9a9c7856516327d9ea2aba4b Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 07 八月 2024 11:26:46 +0800
Subject: [PATCH] 调试+添加注解
---
inspect-server/src/main/resources/mapper/InsSampleMapper.xml | 3 +
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java | 7 +++
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java | 52 +++++++++++++-------------
3 files changed, 34 insertions(+), 28 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 05d37ca..cc68793 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
@@ -524,6 +524,7 @@
}
result.setInsProductId(Integer.parseInt(k));
InsProductResult insProductResult = insProductResultMapper.selectOne(Wrappers.<InsProductResult>lambdaQuery().eq(InsProductResult::getInsProductId, Integer.parseInt(k)));
+ //妫�楠屽��
if (jo.get("insValue") != null) {
JSONArray jsonArray = JSON.parseArray(JSON.toJSONString(jo.get("insValue")));
List<Map<String, Object>> iv = new ArrayList<>();
@@ -546,6 +547,7 @@
}
result.setInsValue(JSON.toJSONString(iv));
}
+ //璁＄畻鍊�
if (jo.get("comValue") != null && !Objects.equals(jo.get("comValue"), "")) {
JSONArray jsonArray2 = JSON.parseArray(JSON.toJSONString(jo.get("comValue")));
List<Map<String, Object>> cv = new ArrayList<>();
@@ -557,6 +559,7 @@
}
result.setComValue(JSON.toJSONString(cv));
}
+ //鏈�缁堝��
try {
JSONObject resValue = JSON.parseObject(JSON.toJSONString(jo.get("resValue")));
if (resValue.get("v") != null) {
@@ -566,6 +569,7 @@
} catch (Exception e) {
insProduct.setLastValue("");//''
}
+ //璁惧缂栧彿
if (jo.get("equipValue") != null) {
JSONArray jsonArray2 = JSON.parseArray(JSON.toJSONString(jo.get("equipValue")));
List<Map<String, Object>> ev = new ArrayList<>();
@@ -577,6 +581,7 @@
}
result.setEquipValue(JSON.toJSONString(ev));
}
+ //璁惧鍚嶇О
if (jo.get("equipName") != null) {
JSONArray jsonArray2 = JSON.parseArray(JSON.toJSONString(jo.get("equipName")));
List<Map<String, Object>> ev = new ArrayList<>();
@@ -588,6 +593,7 @@
}
result.setEquipName(JSON.toJSONString(ev));
}
+ //缁撹
try {
JSONObject insResult = JSON.parseObject(JSON.toJSONString(jo.get("insResult")));
String ir = JSON.parseObject(JSON.toJSONString(insResult.get("v"))).get("v") + "";
@@ -608,7 +614,6 @@
/*濡傛灉鏄涓�娆￠�夋嫨璁惧淇℃伅,涓旇繕鏈夊叾浣欐牱鍝佷篃鏈夊悓涓�涓粡楠岄」鐩�,閭ｄ箞鎵�鏈夋牱鍝佺殑璇ラ」鐩兘鐢ㄨ繖涓澶囦俊鎭�*/
//鍏堟煡璇㈡槸鍚﹁繕鏈夊叾浣欐牱鍝�
InsProduct product = insProductMapper.selectById(insProduct.getId());
-
Integer insSampleId = product.getInsSampleId();
List<InsSample> insSamples = insSampleMapper.selectList(Wrappers.<InsSample>lambdaQuery().eq(InsSample::getInsOrderId, insSampleMapper.selectById(insSampleId).getInsOrderId()));
if (insSamples.size() > 1 && !product.getInspectionItemType().equals("1")) {
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 649278d..b90e55d 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
@@ -235,28 +235,28 @@
}
}
//閮戒负绌� 鍙厤缃簡濂楃 杩欑鎯呭喌鍙檺浜庨」鐩槸鍚湁鏉惧绠＄殑
- else {
- String collect = a.getInsProduct().stream().map(InsProduct::getInspectionItem).distinct().collect(Collectors.joining(","));
- if (collect.contains("鏉惧绠�")){
- //鑾峰彇妫�楠岄」鐩腑鍖呭惈鏉惧绠＄殑妫�楠岄」鐩�
- List<InsProduct> products = a.getInsProduct().stream().filter(insProduct -> insProduct.getInspectionItem().contains("鏉惧绠�")).collect(Collectors.toList());
- for (InsProduct product : products) {
- product.setInsBushId(bushingDto.getId());
- product.setId(null);
- product.setCreateTime(null);
- product.setUpdateTime(null);
- product.setUpdateTime(null);
- product.setUpdateUser(null);
- product.setInsSampleId(a.getId());
- if (product.getInspectionItemSubclass() == null) {
- product.setInspectionItemSubclass("");
- }
- insProductMapper.insert(product);
- }
- }else {
- throw new ErrorException("鏍峰搧鐨勫厜绾ら厤缃俊鎭噷闈㈡病鏈夐厤缃厜绾ゅ甫淇℃伅涔熸病鏈夊厜绾や俊鎭�,璇烽噸鏂伴厤缃繚瀛樺啀鎻愪氦涓嬪崟!!!");
- }
- }
+// else {
+// String collect = a.getInsProduct().stream().map(InsProduct::getInspectionItem).distinct().collect(Collectors.joining(","));
+// if (collect.contains("鏉惧绠�")){
+// //鑾峰彇妫�楠岄」鐩腑鍖呭惈鏉惧绠＄殑妫�楠岄」鐩�
+// List<InsProduct> products = a.getInsProduct().stream().filter(insProduct -> insProduct.getInspectionItem().contains("鏉惧绠�")).collect(Collectors.toList());
+// for (InsProduct product : products) {
+// product.setInsBushId(bushingDto.getId());
+// product.setId(null);
+// product.setCreateTime(null);
+// product.setCreateUser(null);
+// product.setUpdateTime(null);
+// product.setUpdateUser(null);
+// product.setInsSampleId(a.getId());
+// if (product.getInspectionItemSubclass() == null) {
+// product.setInspectionItemSubclass("");
+// }
+// insProductMapper.insert(product);
+// }
+// }else {
+// throw new ErrorException("鏍峰搧鐨勫厜绾ら厤缃俊鎭噷闈㈡病鏈夐厤缃厜绾ゅ甫淇℃伅涔熸病鏈夊厜绾や俊鎭�,璇烽噸鏂伴厤缃繚瀛樺啀鎻愪氦涓嬪崟!!!");
+// }
+// }
}
}
}
@@ -340,9 +340,9 @@
InsOrder insOrder = insOrderMapper.selectById(insSampleMapper.selectById(sampleId).getInsOrderId());
String name = insSampleMapper.selMethodById(sampleId);
for (InsProduct product : productList) {
- if (product.getInspectionItem().contains("鏉惧绠�")){
- continue;
- }
+// if (product.getInspectionItem().contains("鏉惧绠�")){
+// continue;
+// }
if (product.getState() == 1 && !product.getInspectionItem().equals("鍏夌氦鎺ュご鎹熻��")) {
//鍒ゆ柇鍏夌紗鐨勬俯搴﹀惊鐜」鐩坊鍔�
if (insOrder.getSampleType().equals("鍏夌紗") && product.getInspectionItem().equals("娓╁害寰幆") && type != 0) {
@@ -468,7 +468,7 @@
}
product.setId(null);
product.setCreateTime(null);
- product.setUpdateTime(null);
+ product.setCreateUser(null);
product.setUpdateTime(null);
product.setUpdateUser(null);
product.setInsSampleId(sampleId);
diff --git a/inspect-server/src/main/resources/mapper/InsSampleMapper.xml b/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
index c48f143..9e80068 100644
--- a/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
@@ -271,7 +271,8 @@
and state = 1
and ins_fiber_id is null
and ins_fibers_id is null
- and isa.sample_code NOT REGEXP '/'
+ and <!--isa.sample_code NOT REGEXP '/'-->
+ isa.id in(select id1 from (select is2.id id1 ,ip.id from ins_sample is2 left join ins_product ip on is2.id = ip.ins_sample_id where ip.id is not null)s )
</select>
<select id="getInsOrderAndSample" resultMap="sampleDto">
select isa.*,
--
Gitblit v1.9.3