From 68c8a3070b6ece42e11bac807237278a4ab5855e Mon Sep 17 00:00:00 2001
From: whycxzp <glperry@163.com>
Date: 星期二, 27 八月 2024 17:26:56 +0800
Subject: [PATCH] 更新
---
src/main/java/com/whyc/service/MaterialService.java | 27 ++++++++++++++-------------
1 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/whyc/service/MaterialService.java b/src/main/java/com/whyc/service/MaterialService.java
index cd5f34e..717aa35 100644
--- a/src/main/java/com/whyc/service/MaterialService.java
+++ b/src/main/java/com/whyc/service/MaterialService.java
@@ -453,11 +453,11 @@
public Response addAttachment(List<MultipartFile> multipartFileList, Material material) throws IOException {
List<String> currentFileList = new LinkedList<>();
List<String> uploadingFileList = new LinkedList<>();
-
+ String subCode = material.getSubCode();
String subModel = material.getSubModel();
subModel = MaterialSpecialCharUtil.transfer(subModel);
- String dirPathDB = "doc_file" + File.separator + "material" + File.separator + material.getId() + "-"+ material.getSubCode() + "-" + subModel;
- String dirPath = CommonUtil.getRootFile() + "material" + File.separator + material.getId() + "-"+ material.getSubCode() + "-" + subModel;
+ String dirPathDB = "doc_file" + File.separator + "material" + File.separator + material.getId() + "-"+ subCode + "-" + subModel;
+ String dirPath = CommonUtil.getRootFile() + "material" + File.separator + material.getId() + "-"+ subCode + "-" + subModel;
File dirFile = new File(dirPath);
Date now = new Date();
@@ -521,15 +521,15 @@
MailDTO mailDTO = new MailDTO();
DocUser user = ActionUtil.getUser();
mailDTO.setTitle("銆愰檮浠舵洿鏂版彁閱掋��");
- if(material.getSubCode().startsWith("0120")){
+ if(subCode.startsWith("0120")){
List<MailUser> mailUserList = mailUserService.getMailUserList(5);
mailDTO.setMailList(mailUserList.stream().map(MailUser::getMail).collect(Collectors.toList()));
- mailDTO.setContent(user.getName()+"鍦ㄦ枃妗ｇ鐞嗗钩鍙颁笂浼犱簡0120寮�澶寸殑鐗╂枡鐨勯檮浠�,璇风煡鏅�");
+ mailDTO.setContent(user.getName()+"鍦ㄦ枃妗ｇ鐞嗗钩鍙颁笂浼犱簡"+subCode+"鐗╂枡鐨勯檮浠�,璇风煡鏅�");
mailService.sendMail(mailDTO);
- }else if (material.getSubCode().startsWith("0108")||material.getSubCode().startsWith("0109")){
+ }else if (subCode.startsWith("0108")|| subCode.startsWith("0109")){
List<MailUser> mailUserList = mailUserService.getMailUserList(6);
mailDTO.setMailList(mailUserList.stream().map(MailUser::getMail).collect(Collectors.toList()));
- mailDTO.setContent(user.getName()+"鍦ㄦ枃妗ｇ鐞嗗钩鍙颁笂浼犱簡0108鎴�0109寮�澶寸殑鐗╂枡鐨勯檮浠�,璇风煡鏅�");
+ mailDTO.setContent(user.getName()+"鍦ㄦ枃妗ｇ鐞嗗钩鍙颁笂浼犱簡"+subCode+"鐗╂枡鐨勯檮浠�,璇风煡鏅�");
mailService.sendMail(mailDTO);
}
return new Response().set(1,true,"涓婁紶瀹屾垚");
@@ -576,10 +576,11 @@
public Response updatePicOrDwg(MultipartFile multipartFile, Material material) throws IOException {
List<String> currentFileList = new LinkedList<>();
List<String> uploadingFileList = new LinkedList<>();
+ String subCode = material.getSubCode();
String subModel = material.getSubModel();
subModel = MaterialSpecialCharUtil.transfer(subModel);
- String dirPathDB = "doc_file" + File.separator + "material" + File.separator + material.getSubCode() + "-" + subModel;
- String dirPath = CommonUtil.getRootFile() + "material" + File.separator + material.getSubCode() + "-" + subModel;
+ String dirPathDB = "doc_file" + File.separator + "material" + File.separator + subCode + "-" + subModel;
+ String dirPath = CommonUtil.getRootFile() + "material" + File.separator + subCode + "-" + subModel;
File dirFile = new File(dirPath);
Date now = new Date();
@@ -622,15 +623,15 @@
MailDTO mailDTO = new MailDTO();
DocUser user = ActionUtil.getUser();
mailDTO.setTitle("銆愬浘绾稿浘鐗囨洿鏂版彁閱掋��");
- if(material.getSubCode().startsWith("0120")){
+ if(subCode.startsWith("0120")){
List<MailUser> mailUserList = mailUserService.getMailUserList(5);
mailDTO.setMailList(mailUserList.stream().map(MailUser::getMail).collect(Collectors.toList()));
- mailDTO.setContent(user.getName()+"鍦ㄦ枃妗ｇ鐞嗗钩鍙颁笂浼犱簡0120寮�澶寸殑鐗╂枡鐨勫浘绾告垨鍥剧墖,璇风煡鏅�");
+ mailDTO.setContent(user.getName()+"鍦ㄦ枃妗ｇ鐞嗗钩鍙颁笂浼犱簡"+subCode+"鐗╂枡鐨勫浘绾告垨鍥剧墖,璇风煡鏅�");
mailService.sendMail(mailDTO);
- }else if (material.getSubCode().startsWith("0108")||material.getSubCode().startsWith("0109")){
+ }else if (subCode.startsWith("0108")|| subCode.startsWith("0109")){
List<MailUser> mailUserList = mailUserService.getMailUserList(6);
mailDTO.setMailList(mailUserList.stream().map(MailUser::getMail).collect(Collectors.toList()));
- mailDTO.setContent(user.getName()+"鍦ㄦ枃妗ｇ鐞嗗钩鍙颁笂浼犱簡0108鎴�0109寮�澶寸殑鐗╂枡鐨勫浘绾告垨鍥剧墖,璇风煡鏅�");
+ mailDTO.setContent(user.getName()+"鍦ㄦ枃妗ｇ鐞嗗钩鍙颁笂浼犱簡"+subCode+"鐗╂枡鐨勫浘绾告垨鍥剧墖,璇风煡鏅�");
mailService.sendMail(mailDTO);
}
return new Response().set(1, true, "涓婁紶瀹屾垚");
--
Gitblit v1.9.1