From 4aaca7f7a2e5f57d829c4ea0f641abee7648707b Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 09 八月 2024 11:40:44 +0800
Subject: [PATCH] 检验任务保存优化
---
inspect-server/src/main/resources/mapper/InsSampleMapper.xml | 2 +-
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java | 23 +++++++++++++++++------
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java | 11 +++++++----
3 files changed, 25 insertions(+), 11 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 217085a..02be8fc 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
@@ -539,7 +539,7 @@
insProductResultMapper.deleteById(insProductResultss.get(i));
}
}
- InsProductResult insProductResult = insProductResultMapper.selectOne(Wrappers.<InsProductResult>lambdaQuery().eq(InsProductResult::getInsProductId, 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")));
@@ -769,7 +769,7 @@
auxiliaryOutputWorkingHours.setCheck(userId);//妫�娴嬩汉
}
try {
- if (ObjectUtils.isEmpty(insProductResult) && !result.getInsValue().equals("[]") || (ObjectUtils.isNotEmpty(insProductResult) && !insProductResult.getInsValue().equals(result.getInsValue()) && !insProductResult.getInsValue().equals("[]"))) {
+ if (CollectionUtils.isEmpty(insProductResultss) && !result.getInsValue().equals("[]") || (CollectionUtils.isNotEmpty(insProductResultss) && !insProductResultss.get(0).getInsValue().equals(result.getInsValue()) && !insProductResultss.get(0).getInsValue().equals("[]"))) {
auxiliaryOutputWorkingHoursMapper.insert(auxiliaryOutputWorkingHours);
}
}catch (Exception e){
@@ -786,9 +786,9 @@
Long l1 = insProductMapper.selectCount(Wrappers.<InsProduct>lambdaQuery()
.eq(InsProduct::getInsSampleId, insSample.getId())
.and(wrapper -> wrapper
- .isNull(InsProduct::getInsResult)
+ .isNotNull(InsProduct::getInsResult)
.or()
- .eq(InsProduct::getInsResult, 2)
+ .ne(InsProduct::getInsResult, 2)
));
if (l == l1) {
insSample.setInsState(2);
@@ -1139,8 +1139,19 @@
textRenderData.setText("鉁�");
break;
case 0:
- resultCh.set(resultCh.get() + "銆�" + p.getInspectionItem() + (p.getInspectionItemSubclass().equals("") ? "" : " " + p.getInspectionItemSubclass()));
- resultEn.set(resultEn.get() + "銆�" + p.getInspectionItemEn() + ((Objects.equals(p.getInspectionItemSubclassEn(), "") || Objects.equals(p.getInspectionItemSubclassEn(), null)) ? "" : " " + p.getInspectionItemSubclassEn()));
+ Set<String> uniqueItems1 = new HashSet<>();
+ Set<String> uniqueItems2 = new HashSet<>();
+
+ String item1 = p.getInspectionItem() + (p.getInspectionItemSubclass().equals("") ? "" : " " + p.getInspectionItemSubclass());
+ if (uniqueItems1.add(item1)) {
+ resultCh.set(resultCh.get() + "銆�" + item1);
+ }
+ //resultCh.set(resultCh.get() + "銆�" + p.getInspectionItem() + (p.getInspectionItemSubclass().equals("") ? "" : " " + p.getInspectionItemSubclass()));
+ String item2 = p.getInspectionItemEn() + ((Objects.equals(p.getInspectionItemSubclassEn(), "") || Objects.equals(p.getInspectionItemSubclassEn(), null)) ? "" : " " + p.getInspectionItemSubclassEn());
+ if (uniqueItems2.add(item2)) {
+ resultEn.set(resultEn.get() + "銆�" + item2);
+ }
+ //resultEn.set(resultEn.get() + "銆�" + );
textRenderData.setText("鉁�");
break;
default:
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 c4f3aa9..6a1dbcd 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
@@ -559,6 +559,8 @@
@Override
public int upInsOrderOfState(InsOrder insOrder) {
+ InsOrder order = insOrderMapper.selectById(insOrder.getId());
+ insOrder.setCompany(order.getCompany());
insOrder.setExamineTime(LocalDateTime.now());
if (insOrder.getState() == 1) {
//瀹℃牳閫氳繃鎵嶄細鐢熸垚濮旀墭缂栧彿
@@ -566,14 +568,15 @@
if (StringUtils.isEmpty(code)) {
code = "";
}
- Custom custom = customMapper.selectById(insOrder.getCompanyId());
+ Custom custom = customMapper.selectById(order.getCompanyId());
+ System.out.println("============="+custom.getCompany());
+ System.out.println("-------------"+order.getCompany());
String code2 = custom.getCode2();
- if (!custom.getCompany().equals(insOrder.getCompany())){
- Custom one = customMapper.selectOne(Wrappers.<Custom>lambdaQuery().eq(Custom::getCompany, insOrder.getCompany()));
+ if (!custom.getCompany().equals(order.getCompany())){
+ Custom one = customMapper.selectOne(Wrappers.<Custom>lambdaQuery().eq(Custom::getCompany, order.getCompany()));
insOrder.setCompanyId(one.getId());
code2=one.getCode2();
}
- //String code2 = customMapper.selectById(insOrder.getCompanyId()).getCode2();
insOrder.setEntrustCode(giveCode.giveCode2("JCZX/" + code + "-" + code2 + "-", insOrder.getCompanyId(), insOrder.getLaboratory(), "ins_order", "", "yyMM"));
}
return insOrderMapper.updateById(insOrder);
diff --git a/inspect-server/src/main/resources/mapper/InsSampleMapper.xml b/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
index 6b49f8c..0e0b515 100644
--- a/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
@@ -211,7 +211,7 @@
) isu2 on
isu2.ins_sample_id = a.id
where ins_state is not null
- <if test="laboratory != null and laboratory!=''">
+ <if test="laboratory != null and laboratory != ''">
and laboratory=#{laboratory}
</if>
ORDER BY
--
Gitblit v1.9.3