From 1214b18558c19b09c02161b1dbbef342ad2c1e8f Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期六, 12 十月 2024 17:14:46 +0800
Subject: [PATCH] 试验前后样品检查+开始结束时间
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java | 63 ++++++++++++++++++-------------
1 files changed, 36 insertions(+), 27 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 7a7057f..6f76b2e 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
@@ -15,12 +15,6 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.deepoove.poi.XWPFTemplate;
-import com.deepoove.poi.config.Configure;
-import com.deepoove.poi.config.ConfigureBuilder;
-import com.deepoove.poi.data.*;
-import com.deepoove.poi.data.style.*;
-import com.deepoove.poi.util.TableTools;
import com.yuanchu.mom.common.GetLook;
import com.yuanchu.mom.common.PrintChina;
import com.yuanchu.mom.dto.InsOrderPlanDTO;
@@ -32,25 +26,16 @@
import com.yuanchu.mom.service.*;
import com.yuanchu.mom.utils.*;
import com.yuanchu.mom.vo.*;
-import org.apache.commons.io.IOUtils;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Workbook;
import org.apache.poi.xssf.usermodel.XSSFSheet;
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import org.apache.poi.xwpf.usermodel.*;
import org.springframework.beans.factory.annotation.Value;
-import org.springframework.mock.web.MockMultipartFile;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;
-
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.io.*;
import java.nio.file.Files;
-import java.nio.file.Paths;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.time.LocalDateTime;
@@ -58,8 +43,6 @@
import java.time.format.DateTimeFormatter;
import java.util.*;
import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.concurrent.atomic.AtomicReference;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
@@ -199,7 +182,11 @@
if (BeanUtil.isEmpty(order.getInsTime())) {
insOrder.setInsTime(LocalDateTime.now());
insOrderMapper.updateById(insOrder);
- insOrderStateMapper.update(null, Wrappers.<InsOrderState>lambdaUpdate().eq(InsOrderState::getInsOrderId, id).eq(InsOrderState::getLaboratory, laboratory).set(InsOrderState::getInsTime, LocalDateTime.now()).set(InsOrderState::getInsState, 1));
+ insOrderStateMapper.update(null, Wrappers.<InsOrderState>lambdaUpdate()
+ .eq(InsOrderState::getInsOrderId, id)
+ .eq(InsOrderState::getLaboratory, laboratory)
+ .set(InsOrderState::getInsTime, LocalDateTime.now())
+ .set(InsOrderState::getInsState, 1));
}
Map<String, Object> map = insOrderService.getInsOrderAndSample(id, laboratory);
List<SampleProductDto> list = JSON.parseArray(JSON.toJSONString(map.get("sampleProduct")), SampleProductDto.class);
@@ -538,6 +525,26 @@
} catch (Exception e) {
insProduct.setLastValue("");//''
}
+ //璇曢獙鍓嶆牱鍝佹鏌�
+ try {
+ JSONObject resValue = JSON.parseObject(JSON.toJSONString(jo.get("beforeCheck")));
+ if (resValue.get("v") != null) {
+ Object o = JSON.parseObject(JSON.toJSONString(resValue.get("v"))).get("v");
+ result.setBeforeCheck(o.equals("") ? null : (o.toString()));
+ }
+ } catch (Exception e) {
+ result.setBeforeCheck("");//''
+ }
+ //璇曢獙鍚庢牱鍝佹鏌�
+ try {
+ JSONObject resValue = JSON.parseObject(JSON.toJSONString(jo.get("afterCheck")));
+ if (resValue.get("v") != null) {
+ Object o = JSON.parseObject(JSON.toJSONString(resValue.get("v"))).get("v");
+ result.setAfterCheck(o.equals("") ? null : (o.toString()));
+ }
+ } catch (Exception e) {
+ result.setAfterCheck("");//''
+ }
//璁惧缂栧彿
if (jo.get("equipValue") != null) {
JSONArray jsonArray2 = JSON.parseArray(JSON.toJSONString(jo.get("equipValue")));
@@ -752,10 +759,11 @@
if (insProduct.getAsk().equals("/")) {
ressult = 3; //涓嶅垽瀹�
}
- if (!isValueValid(valueStr, new String[]{insProduct.getAsk()})) {
+ else if (!isValueValid(valueStr, new String[]{insProduct.getAsk()})) {
ressult = 0; //涓嶅悎鏍�
}
- } else {
+ }
+ else {
// 濡傛灉瑕佹眰鍊兼槸(2掳鈮�20,7掳鈮�25,12掳鈮�25)杩欑鎯呭喌
String[] askParts = insProduct.getAsk().split(",");
String[] angles = insProductResult2.getAngle().split(",");
@@ -1021,7 +1029,6 @@
insOrderStateMapper.update(null, Wrappers.<InsOrderState>lambdaUpdate()
.eq(InsOrderState::getInsOrderId, orderId)
.eq(InsOrderState::getLaboratory, laboratory)
- .set(InsOrderState::getInsTime, now)
.set(InsOrderState::getInsState, 6)
.set(InsOrderState::getVerifyTell, tell)
.set(InsOrderState::getVerifyUser, userId));
@@ -1031,7 +1038,6 @@
insOrderStateMapper.update(null, Wrappers.<InsOrderState>lambdaUpdate()
.eq(InsOrderState::getInsOrderId, orderId)
.eq(InsOrderState::getLaboratory, laboratory)
- .set(InsOrderState::getInsTime, now)
.set(InsOrderState::getInsState, 5)
.set(InsOrderState::getVerifyTell, tell)
.set(InsOrderState::getVerifyUser, userId));
@@ -1133,7 +1139,6 @@
insOrderStateMapper.update(null, Wrappers.<InsOrderState>lambdaUpdate()
.eq(InsOrderState::getInsOrderId, orderId)
.eq(InsOrderState::getLaboratory, laboratory)
- .set(InsOrderState::getInsTime, LocalDateTime.now())
.set(InsOrderState::getInsState, 3)
.set(InsOrderState::getVerifyUser, verifyUser));
/*杩欎釜鎯呭喌鍏堝叧闂�----濡傛灉鏄疌绫昏鍗曚笖鏄笅鍙戝埌璐ㄩ噺閮�,鍒欑洿鎺ュ鏍搁�氳繃(缁撴潫璇曢獙)*/
@@ -1196,10 +1201,14 @@
return null;
});
/*鐢熸垚鐢佃矾璇曢獙鐨勭珯鐐规姤鍛婂苟涓婁紶鍒伴檮浠朵腑*/
- /*if (laboratory.equals("鐢佃矾璇曢獙")) {
- MultipartFile file = wordUtils.generateWord(note, term, orderState);
- uploadFile(orderId,file);
- }*/
+ if (laboratory.equals("鐢佃矾璇曢獙")) {
+ wordUtils.generateWord(note, term, orderState);
+// try {
+// wordUtils.generateWord(note, term, orderState);
+// }catch (Exception e){
+// throw new ErrorException("鐢佃矾璇曢獙鐨勭珯鐐规姤鍛婄敓鎴愭湁璇�,璇疯仈绯诲紑鍙戜汉鍛樿皟鏁�!");
+// }
+ }
// 鍒犻櫎鏁伴噰閲囬泦娆℃暟
String key = "frequency" + ":" + entrustCode + ":*";
RedisUtil.delsLike(key);
--
Gitblit v1.9.3