From 69a9145abc3c754e1621613fde2cd94f4e97938e Mon Sep 17 00:00:00 2001
From: whycxzp <perryhsu@163.com>
Date: 星期一, 05 六月 2023 15:47:54 +0800
Subject: [PATCH] 更新物料上传命名校验
---
src/main/java/com/whyc/service/MaterialService.java | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/whyc/service/MaterialService.java b/src/main/java/com/whyc/service/MaterialService.java
index 685da8f..a9c202e 100644
--- a/src/main/java/com/whyc/service/MaterialService.java
+++ b/src/main/java/com/whyc/service/MaterialService.java
@@ -5,6 +5,7 @@
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.whyc.dto.FileDirPath;
+import com.whyc.dto.MaterialCheckDTO;
import com.whyc.dto.Response;
import com.whyc.mapper.MaterialMapper;
import com.whyc.pojo.DocUser;
@@ -308,6 +309,19 @@
return response.set(1,false,"鎷掔粷瑙ｆ瀽,excel鏂囦欢涓褰曞寘鍚悕绉颁负绌虹殑璁板綍");
}
}
+ //杩藉姞鐗╂枡瑙勮寖鏍￠獙
+ List<MaterialCheckDTO> checkList = list.stream().map(material -> {
+ MaterialCheckDTO dto = new MaterialCheckDTO();
+ dto.setNum(material.getId());
+ dto.setSubCode(material.getSubCode());
+ dto.setSubName(material.getSubName());
+ dto.setSubModel(material.getSubModel());
+ return dto;
+ }).collect(Collectors.toList());
+ List<MaterialCheckDTO> irregularList = CommonUtil.checkFormat(checkList);
+ if(irregularList.size()>0){
+ return new Response().setII(1,false,irregularList,"鍚嶇О鎴栧瀷鍙峰懡鍚嶄笉瑙勮寖");
+ }
return response.setII(1,true,list,filePath);
}
//鏍规嵁鐗╂枡id鏌ヨ杩斿洖闄勪欢鏂囦欢澶逛笅鎵�鏈夌殑鏂囦欢鍒楄〃
--
Gitblit v1.9.1