From 7e8b117234ae693edf4fe4fd838282259e7c37f0 Mon Sep 17 00:00:00 2001
From: whycxzp <glperry@163.com>
Date: 星期二, 27 八月 2024 17:20:53 +0800
Subject: [PATCH] 测试问题修正
---
src/main/java/com/whyc/service/MaterialApprovingService.java | 21 ---------------------
1 files changed, 0 insertions(+), 21 deletions(-)
diff --git a/src/main/java/com/whyc/service/MaterialApprovingService.java b/src/main/java/com/whyc/service/MaterialApprovingService.java
index dd3f412..de8f606 100644
--- a/src/main/java/com/whyc/service/MaterialApprovingService.java
+++ b/src/main/java/com/whyc/service/MaterialApprovingService.java
@@ -3,11 +3,9 @@
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.MailDTO;
import com.whyc.dto.Response;
import com.whyc.mapper.MaterialApprovingMapper;
import com.whyc.pojo.DocUser;
-import com.whyc.pojo.MailUser;
import com.whyc.pojo.MaterialApproving;
import com.whyc.util.ActionUtil;
import com.whyc.util.CommonUtil;
@@ -27,7 +25,6 @@
import java.util.Date;
import java.util.LinkedList;
import java.util.List;
-import java.util.stream.Collectors;
@Service
public class MaterialApprovingService {
@@ -162,24 +159,6 @@
if(irregularList.size()>0){
return response.setII(1,false,irregularList,"鍚嶇О鎴栧瀷鍙峰懡鍚嶄笉瑙勮寖");
}*/
- /*0120寮�澶寸殑鐗╂枡涓婁紶鍚庯紝绯荤粺鑷姩鍙戦偖浠跺搴斾汉鍛橈細鍚存禋銆侀檲鍗撱�佺唺瀹舵澃銆侀挶闀滃厓銆佹柤濂�
- 0108銆�0109寮�澶寸殑鐗╂枡涓婁紶鍚庯紝绯荤粺鑷姩鍙戦偖浠跺搴斾汉鍛橈細鍠昏壋銆佽鎴愩�佺唺蹇楀钩銆佸彾鑳滆摑 */
- List<String> materialCodeList = list.stream().map(MaterialApproving::getSubCode).collect(Collectors.toList());
-
- MailDTO mailDTO = new MailDTO();
-
- mailDTO.setTitle("銆愮墿鏂欎笂浼犳彁閱掋��");
- if(materialCodeList.stream().anyMatch(b->b.startsWith("0120"))){
- List<MailUser> mailUserList = mailUserService.getMailUserList(5);
- mailDTO.setMailList(mailUserList.stream().map(MailUser::getMail).collect(Collectors.toList()));
- mailDTO.setContent(user.getName()+"鍦ㄦ枃妗ｇ鐞嗗钩鍙颁笂浼犱簡0120寮�澶寸殑鐗╂枡,璇风煡鏅�");
- mailService.sendMail(mailDTO);
- }else if (materialCodeList.stream().anyMatch(b->b.startsWith("0108")||b.startsWith("0109"))){
- List<MailUser> mailUserList = mailUserService.getMailUserList(6);
- mailDTO.setMailList(mailUserList.stream().map(MailUser::getMail).collect(Collectors.toList()));
- mailDTO.setContent(user.getName()+"鍦ㄦ枃妗ｇ鐞嗗钩鍙颁笂浼犱簡0108鎴�0109寮�澶寸殑鐗╂枡,璇风煡鏅�");
- mailService.sendMail(mailDTO);
- }
String nextTitle = originalFilename.substring(0,originalFilename.lastIndexOf("."));
return response.setIII(1,true,list,nextTitle,filePath);
}
--
Gitblit v1.9.1