From c2c3e9043435937ccbb4cf3a11956e2e8d06878d Mon Sep 17 00:00:00 2001
From: whycxzp <perryhsu@163.com>
Date: 星期一, 22 八月 2022 11:27:52 +0800
Subject: [PATCH] 软件上传审批校验,审批完成转移
---
src/main/java/com/whyc/service/WorksheetMainService.java | 20 ++++++++++++++++++++
1 files changed, 20 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/whyc/service/WorksheetMainService.java b/src/main/java/com/whyc/service/WorksheetMainService.java
index f4ae2ec..a55321c 100644
--- a/src/main/java/com/whyc/service/WorksheetMainService.java
+++ b/src/main/java/com/whyc/service/WorksheetMainService.java
@@ -65,6 +65,9 @@
@Autowired
private ProductSoftwareApprovingService psaService;
+ @Autowired
+ private ProductSoftwareService productSoftwareService;
+
@Transactional
public boolean submit(WorksheetMain main, DocUser user) {
main.setType(1);
@@ -363,6 +366,23 @@
Response response = new Response();
WorksheetMain main = mainDTO.getMain();
ProductSoftwareApproving approving = mainDTO.getApproving();
+ //棣栧厛鏍￠獙鏂囦欢鍚嶆槸鍚﹀凡瀛樺湪
+ String filename = file.getOriginalFilename();
+ List<ProductSoftwareApproving> softwareApprovingList = psaService.getAll();
+ List<ProductSoftware> softwareList = productSoftwareService.getAll();
+ List<String> existApprovingList = softwareApprovingList.stream().map(ProductSoftwareApproving::getSoftwareName).collect(Collectors.toList());
+ List<String> existList = softwareList.stream().map(ProductSoftware::getSoftwareName).collect(Collectors.toList());
+
+ for (String existFilename:existList){
+ if(filename.equals(existFilename)){
+ return response.set(1,false,"杞欢鏂囦欢鍚嶅凡瀛樺湪");
+ }
+ }
+ for (String existFilename:existApprovingList){
+ if(filename.equals(existFilename)){
+ return response.set(1,false,"杞欢鏂囦欢鍚嶅湪瀹℃壒鍒楄〃涓凡瀛樺湪");
+ }
+ }
main.setType(1);
//鎻愪氦涓昏〃
--
Gitblit v1.9.1