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/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 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 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);
--
Gitblit v1.9.3