From 5c5491cb9eaafa7324fbfc5a546f1e7dc0a97b62 Mon Sep 17 00:00:00 2001
From: whycxzp <perryhsu@163.com>
Date: 星期四, 08 六月 2023 15:24:17 +0800
Subject: [PATCH] 注释物料正则校验
---
src/main/java/com/whyc/service/MaterialApprovingService.java | 10 ++++------
1 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/whyc/service/MaterialApprovingService.java b/src/main/java/com/whyc/service/MaterialApprovingService.java
index 3e48ef2..90b500d 100644
--- a/src/main/java/com/whyc/service/MaterialApprovingService.java
+++ b/src/main/java/com/whyc/service/MaterialApprovingService.java
@@ -3,11 +3,10 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.whyc.dto.MaterialCheckDTO;
import com.whyc.dto.Response;
import com.whyc.mapper.MaterialApprovingMapper;
-import com.whyc.pojo.MaterialApproving;
import com.whyc.pojo.DocUser;
+import com.whyc.pojo.MaterialApproving;
import com.whyc.util.ActionUtil;
import com.whyc.util.CommonUtil;
import com.whyc.util.FileUtil;
@@ -25,7 +24,6 @@
import java.util.Date;
import java.util.LinkedList;
import java.util.List;
-import java.util.stream.Collectors;
@Service
public class MaterialApprovingService {
@@ -138,8 +136,8 @@
return response.set(1,false,"鎷掔粷瑙ｆ瀽,excel鏂囦欢涓褰曞寘鍚悕绉颁负绌虹殑璁板綍");
}
}
- //杩藉姞鐗╂枡瑙勮寖鏍￠獙
- List<MaterialCheckDTO> checkList = list.stream().map(bom->{
+ //杩藉姞鐗╂枡瑙勮寖鏍￠獙 鏆傛椂鍘婚櫎鏍￠獙
+ /*List<MaterialCheckDTO> checkList = list.stream().map(bom->{
MaterialCheckDTO dto = new MaterialCheckDTO();
dto.setNum(bom.getId());
dto.setSubCode(bom.getSubCode());
@@ -150,7 +148,7 @@
List<MaterialCheckDTO> irregularList = CommonUtil.checkFormat(checkList);
if(irregularList.size()>0){
return response.setII(1,false,irregularList,"鍚嶇О鎴栧瀷鍙峰懡鍚嶄笉瑙勮寖");
- }
+ }*/
String nextTitle = originalFilename.substring(0,originalFilename.lastIndexOf("."));
return response.setIII(1,true,list,nextTitle,filePath);
}
--
Gitblit v1.9.1