工作组变更
This commit is contained in:
+20
-39
@@ -1,15 +1,15 @@
|
||||
package com.jero.project.service.impl;
|
||||
|
||||
import com.alibaba.fastjson.JSON;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.jero.common.api.vo.Result;
|
||||
import com.jero.common.exception.JeroBootException;
|
||||
import com.jero.common.system.api.ISysBaseAPI;
|
||||
import com.jero.common.util.PasswordUtil;
|
||||
import com.jero.company.entity.PayContactsManagement;
|
||||
import com.jero.company.service.IPayContactsManagementService;
|
||||
import com.jero.data.entity.PayCaseCommittee;
|
||||
import com.jero.data.service.IPayCaseCommitteeService;
|
||||
import com.jero.modules.message.handle.ISendMsgHandle;
|
||||
import com.jero.modules.message.handle.impl.EmailSendMsgHandle;
|
||||
import com.jero.modules.oss.entity.OSSFile;
|
||||
import com.jero.modules.oss.service.IOSSFileService;
|
||||
@@ -26,9 +26,11 @@ import com.jero.temporary.service.IPayContactsManagementTemporaryService;
|
||||
import org.apache.commons.collections.CollectionUtils;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.core.env.Environment;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.io.File;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
@@ -54,9 +56,12 @@ public class PayWorkingGroupDistributionRecordServiceImpl extends ServiceImpl<Pa
|
||||
private IPayWorkingGroupService payWorkingGroupService;
|
||||
@Autowired
|
||||
private IPayCaseCommitteeService payCaseCommitteeService;
|
||||
|
||||
@Autowired
|
||||
private Environment env;
|
||||
@Resource
|
||||
private IOSSFileService iossFileService;
|
||||
@Autowired
|
||||
private ISysBaseAPI sysBaseAPI;
|
||||
|
||||
@Override
|
||||
public void add(PayWorkingGroupDistributionRecord payWorkingGroupDistributionRecord) {
|
||||
@@ -79,8 +84,9 @@ public class PayWorkingGroupDistributionRecordServiceImpl extends ServiceImpl<Pa
|
||||
OSSFile byId = iossFileService.getById(payWorkingGroupDataFile.getFileId());
|
||||
// 文件名称
|
||||
String fileName = byId.getFileName();
|
||||
String path = env.getProperty("jero.path.upload") + File.separator;
|
||||
List<String> listFile = new ArrayList<>();
|
||||
listFile.add(fileName);
|
||||
listFile.add(path + fileName);
|
||||
List<String> list = new ArrayList<>();
|
||||
String msg = "";
|
||||
if(payWorkingGroupDistributionRecord.getProjectType() == PayProjectCommon.PROJECT_TYPE_FILE1){
|
||||
@@ -113,23 +119,13 @@ public class PayWorkingGroupDistributionRecordServiceImpl extends ServiceImpl<Pa
|
||||
if(CollectionUtils.isEmpty(list) || CollectionUtils.isEmpty(listFile)){
|
||||
throw new JeroBootException("分发失败!");
|
||||
}
|
||||
StringBuilder str = new StringBuilder();
|
||||
List<String> finalList = list;
|
||||
String content = msg + "文件已发送到您的账号和邮箱,可通过手机号登录系统XXX(点击链接可进入系统)或微信小程序搜素XXX进入查看";
|
||||
list.forEach(p->{
|
||||
if(StringUtils.isBlank(p)){
|
||||
return;
|
||||
}
|
||||
str.append(PasswordUtil.decrypt(p));
|
||||
if(finalList.indexOf(p) < finalList.size() - 1){
|
||||
str.append(",");
|
||||
}
|
||||
sysBaseAPI.sendEmailMsgAndFile(PasswordUtil.decrypt(p), "", content, listFile);
|
||||
});
|
||||
if(StringUtils.isBlank(str)){
|
||||
throw new JeroBootException("分发失败!");
|
||||
}
|
||||
String content = msg + "文件已发送到您的账号和邮箱,可通过手机号登录系统XXX(点击链接可进入系统)或微信小程序搜素XXX进入查看";
|
||||
EmailSendMsgHandle emailHandle = new EmailSendMsgHandle();
|
||||
emailHandle.SendMsgAndFile(str.toString(), "", content, listFile);
|
||||
// todo 缺少发送消息
|
||||
}
|
||||
|
||||
@@ -158,12 +154,13 @@ public class PayWorkingGroupDistributionRecordServiceImpl extends ServiceImpl<Pa
|
||||
if(CollectionUtils.isEmpty(listPayWorkingGroupDataFile)){
|
||||
throw new JeroBootException("没有找到文件!");
|
||||
}
|
||||
String path = env.getProperty("jero.path.upload") + File.separator;
|
||||
List<String> listFile = new ArrayList<>();
|
||||
listPayWorkingGroupDataFile.forEach(p->{
|
||||
OSSFile byId = iossFileService.getById(p.getFileId());
|
||||
// 文件名称
|
||||
String fileName = byId.getFileName();
|
||||
listFile.add(fileName);
|
||||
listFile.add(path + fileName);
|
||||
});
|
||||
String msg = "";
|
||||
List<String> list = new ArrayList<>();
|
||||
@@ -197,29 +194,13 @@ public class PayWorkingGroupDistributionRecordServiceImpl extends ServiceImpl<Pa
|
||||
if(CollectionUtils.isEmpty(list) || CollectionUtils.isEmpty(listFile)){
|
||||
throw new JeroBootException("分发失败!");
|
||||
}
|
||||
list.forEach(p->{
|
||||
if(StringUtils.isBlank(p)){
|
||||
return;
|
||||
}
|
||||
p = PasswordUtil.decrypt(p);
|
||||
});
|
||||
StringBuilder str = new StringBuilder();
|
||||
List<String> finalList = list;
|
||||
list.forEach(p->{
|
||||
if(StringUtils.isBlank(p)){
|
||||
return;
|
||||
}
|
||||
str.append(PasswordUtil.decrypt(p));
|
||||
if(finalList.indexOf(p) < finalList.size() - 1){
|
||||
str.append(",");
|
||||
}
|
||||
});
|
||||
if(StringUtils.isBlank(str)){
|
||||
throw new JeroBootException("分发失败!");
|
||||
}
|
||||
String content = msg + "文件已发送到您的账号和邮箱,可通过手机号登录系统XXX(点击链接可进入系统)或微信小程序搜素XXX进入查看";
|
||||
EmailSendMsgHandle emailHandle = new EmailSendMsgHandle();
|
||||
emailHandle.SendMsgAndFile(str.toString(), "", content, listFile);
|
||||
list.forEach(p->{
|
||||
if(StringUtils.isBlank(p)){
|
||||
return;
|
||||
}
|
||||
sysBaseAPI.sendEmailMsgAndFile(PasswordUtil.decrypt(p), "", content, listFile);
|
||||
});
|
||||
// todo 缺少发送消息
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user