From cf28a43edb9efe86addfd4e3dc4175ac327a3e4f Mon Sep 17 00:00:00 2001
From: lxw <810412026@qq.com>
Date: 星期二, 04 七月 2023 10:51:07 +0800
Subject: [PATCH] sop通用非通用修改
---
src/main/java/com/whyc/service/SOPService.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/whyc/service/SOPService.java b/src/main/java/com/whyc/service/SOPService.java
index ae389ed..1a0a9e7 100644
--- a/src/main/java/com/whyc/service/SOPService.java
+++ b/src/main/java/com/whyc/service/SOPService.java
@@ -259,6 +259,7 @@
sop.setReleaseNotes(releaseNotes);
//绗�10琛屽紑濮�,鍊掓暟绗�2琛屾埅姝�
+ int currentFlag=0; //閫氱敤琛ㄧず(0:闈為�氱敤,1:閫氱敤)
for (int i = fileSuitableProductIndex+1; i < lastRowNum; i++) {
SOPProduct product = new SOPProduct();
//鍙栫3鍒�,绗�5鍒�
@@ -279,12 +280,12 @@
}else{
product.setModel(model);
}
- if((code.equals("") && model.equals(""))){
- sop.setCurrentFlag(1);//閫氱敤
+ if((!code.equals("") && !model.equals(""))){
+ currentFlag+=1;
}
sopProductList.add(product);
}
-
+ sop.setCurrentFlag(currentFlag>0?0:1);//閫氱敤
//瀛樺偍excel鏂囦欢,/sop_submit/xxx_202306250506.xlsx(鏀癸紝涓嶅瓨绮梕xcel浜�)
/*String originalFilename = multipartFile.getOriginalFilename();
String[] fileNameSplit = originalFilename.split("\\.");
--
Gitblit v1.9.1