From 7d5f9679128b3084c502b2bf6b076453a439cefc Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 25 三月 2025 10:07:01 +0800
Subject: [PATCH] 检验任务时间筛选
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java | 21 +++++++++++++++++++--
1 files changed, 19 insertions(+), 2 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 caaf65f..37fe4d5 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
@@ -361,8 +361,12 @@
} else if (ObjectUtils.isNotEmpty(sonLaboratory) && sonLaboratory.equals("鐢佃矾璇曢獙") && split[split.length - 1].equals("csv") && insOrder.getSampleType().equals("鏃犳簮鍣ㄤ欢")) {
dianLuUtils.readDianLuFile3(sampleId, insOrderFile);
}
+ // 鐢佃矾瀹為獙杩斿洖鏂囦欢鍚�
+ if(ObjectUtils.isNotEmpty(sonLaboratory) && sonLaboratory.equals("鐢佃矾璇曢獙")){
+ return pathName;
+ }
// 闇囧姩doc鏂囦欢瑙ｆ瀽
- if(filename.contains(".doc") && sonLaboratory.equals("鎸姩")){
+ if(filename.toLowerCase().contains(".doc") && sonLaboratory.equals("鎸姩")){
return docAnalysis(urlString,orderId,sampleId,file.getOriginalFilename());
}
} catch (Exception e) {
@@ -421,6 +425,7 @@
if (orderState.getInsState() == 6) {
orderState.setInsState(0);
orderState.setNum(orderState.getNum() + 1);//閫掑
+ orderState.setCreateTime(LocalDateTime.now());
insOrderStateMapper.updateById(orderState);
}
} else {
@@ -936,6 +941,9 @@
if(tableIndex == 0){
Table table = tableList.get(0);
for (int i = 0; i < table.numRows(); i++) {
+ if(table.getRow(i).numCells() < 2){
+ continue;
+ }
String columnText = ObjectUtils.isEmpty(table.getRow(i).getCell(0))? "" : table.getRow(i).getCell(0).text();
String columnValue = ObjectUtils.isEmpty(table.getRow(i).getCell(1))? "" : table.getRow(i).getCell(1).text();
if(columnValue.contains("\u0007")){
@@ -958,7 +966,7 @@
//鍙栫涓�涓〃鍗曡緭鍏ラ�氶亾鍙傛暟绗竴鏉℃暟鎹�
if(tableIndex == 1){
Table table = tableList.get(1);
- if(ObjectUtils.isNotEmpty(table)&& table.numRows() > 0){
+ if(ObjectUtils.isNotEmpty(table) && table.numRows() > 1 && table.getRow(1).numCells() >= 3){
String columnValue = ObjectUtils.isEmpty(table.getRow(1).getCell(2))? "" : table.getRow(1).getCell(2).text();
if(columnValue.contains("\u0007")){
columnValue = columnValue.replace("\u0007","");
@@ -970,6 +978,9 @@
if(tableIndex == tableList.size() - 1){
Table table = tableList.get(tableIndex);
for (int i = 0; i < table.numRows(); i++) {
+ if(table.getRow(i).numCells() < 2){
+ continue;
+ }
String columnText = ObjectUtils.isEmpty(table.getRow(i).getCell(0))? "" : table.getRow(i).getCell(0).text();
String columnValue = ObjectUtils.isEmpty(table.getRow(i).getCell(1))? "" : table.getRow(i).getCell(1).text();
if(columnValue.contains("\u0007")){
@@ -1200,6 +1211,9 @@
/*鐢熸垚瀵瑰簲鐨勬楠屾姤鍛�*/
List<InsReportDto1> insReportDto1s=insOrderUserMapper.selectInsReportDto1(insOrder.getId());
createReport(insOrder.getId(),insReportDto1s);
+ //璇ヨ鍗曢棴鐜�
+ insOrder.setState(4);
+ insOrderMapper.updateById(insOrder);
break;
}
}
@@ -1287,6 +1301,9 @@
/*鐢熸垚瀵瑰簲鐨勬楠屾姤鍛�*/
List<InsReportDto1> insReportDto1s=insOrderUserMapper.selectInsReportDto1(insOrder.getId());
createReport(insOrder.getId(),insReportDto1s);
+ //璁㈠崟闂幆
+ insOrder.setState(4);
+ insOrderMapper.updateById(insOrder);
break;
}
}
--
Gitblit v1.9.3