LK/income_payments_management
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

工作组变更

Browse Source
This commit is contained in:
梁琦涛
2021-09-17 09:07:44 +08:00
parent bedc4f6b2a
commit 4e1e113c8a
3 changed files with 65 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupDistributionRecordController.java
+1 -1
View File
@@ -133,7 +133,7 @@ public class PayWorkingGroupDistributionRecordController extends JeroController<
@PostMapping(value = "/add")
public Result<?> add(@RequestBody PayWorkingGroupDistributionRecord payWorkingGroupDistributionRecord) {
payWorkingGroupDistributionRecordService.add(payWorkingGroupDistributionRecord);
return Result.OK("添加成功！");
return Result.OK("分发成功！");
}
/**
jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java
+1
View File
@@ -175,6 +175,7 @@ public class PayWorkingGroupSubItemController extends JeroController<PayWorkingG
EmailSendMsgHandle emailHandle = new EmailSendMsgHandle();
emailHandle.SendMsg(PasswordUtil.decrypt(listContactsEmail.get(0).getEmail()), "", msg);
});
// todo 缺少发送消息
return Result.OK("添加成功！");
}
jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupDistributionRecordServiceImpl.java
+63 -11
View File
@@ -8,15 +8,19 @@ import com.jero.common.exception.JeroBootException;
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.impl.EmailSendMsgHandle;
import com.jero.modules.oss.entity.OSSFile;
import com.jero.modules.oss.service.IOSSFileService;
import com.jero.project.common.PayProjectCommon;
import com.jero.project.entity.PayWorkingGroup;
import com.jero.project.entity.PayWorkingGroupDataFile;
import com.jero.project.entity.PayWorkingGroupDistributionRecord;
import com.jero.project.mapper.PayWorkingGroupDistributionRecordMapper;
import com.jero.project.service.IPayWorkingGroupDataFileService;
import com.jero.project.service.IPayWorkingGroupDistributionRecordService;
import com.jero.project.service.IPayWorkingGroupService;
import com.jero.temporary.entity.PayContactsManagementTemporary;
import com.jero.temporary.service.IPayContactsManagementTemporaryService;
import org.apache.commons.collections.CollectionUtils;
@@ -46,6 +50,10 @@ public class PayWorkingGroupDistributionRecordServiceImpl extends ServiceImpl<Pa
private IPayContactsManagementService payContactsManagementService;
@Autowired
private IPayWorkingGroupDataFileService payWorkingGroupDataFileService;
@Autowired
private IPayWorkingGroupService payWorkingGroupService;
@Autowired
private IPayCaseCommitteeService payCaseCommitteeService;
@Resource
private IOSSFileService iossFileService;
@@ -74,36 +82,55 @@ public class PayWorkingGroupDistributionRecordServiceImpl extends ServiceImpl<Pa
List<String> listFile = new ArrayList<>();
listFile.add(fileName);
List<String> list = new ArrayList<>();
if(payWorkingGroupDistributionRecord.getProjectType() != PayProjectCommon.PROJECT_TYPE_FILE1){
String msg = "";
if(payWorkingGroupDistributionRecord.getProjectType() == PayProjectCommon.PROJECT_TYPE_FILE1){
LambdaQueryWrapper<PayContactsManagementTemporary> queryPayContactsManagementTemporary = new LambdaQueryWrapper<>();
queryPayContactsManagementTemporary.in(PayContactsManagementTemporary::getId, Arrays.asList(s));
List<PayContactsManagementTemporary> listContacts = payContactsManagementTemporaryService.list(queryPayContactsManagementTemporary);
if(!CollectionUtils.isEmpty(listContacts)){
list = listContacts.stream().map(PayContactsManagementTemporary::getEmail).collect(Collectors.toList());
}
}else if(payWorkingGroupDistributionRecord.getProjectType() != PayProjectCommon.PROJECT_TYPE_FILE2){
PayWorkingGroup payWorkingGroup = payWorkingGroupService.getById(payWorkingGroupDistributionRecord.getProjectId());
if(Objects.isNull(payWorkingGroup)){
throw new JeroBootException("工作组不存在!");
}
msg = payWorkingGroup.getWorkingGroupProject();
}else if(payWorkingGroupDistributionRecord.getProjectType() == PayProjectCommon.PROJECT_TYPE_FILE2){
LambdaQueryWrapper<PayContactsManagement> queryPayContactsManagement = new LambdaQueryWrapper<>();
queryPayContactsManagement.in(PayContactsManagement::getId, Arrays.asList(payWorkingGroupDistributionRecord.getContactsIds().split(",")));
List<PayContactsManagement> listContacts = payContactsManagementService.list(queryPayContactsManagement);
if(!CollectionUtils.isEmpty(listContacts)){
list = listContacts.stream().map(PayContactsManagement::getEmail).collect(Collectors.toList());
}
PayCaseCommittee payCaseCommittee = payCaseCommitteeService.getById(payWorkingGroupDistributionRecord.getProjectId());
if(Objects.isNull(payCaseCommittee)){
throw new JeroBootException("分标委不存在!");
}
msg = payCaseCommittee.getName();
}else{
throw new JeroBootException("项目状态不正确！");
}
if(CollectionUtils.isEmpty(list) || CollectionUtils.isEmpty(listFile)){
throw new JeroBootException("分发失败！");
}
StringBuilder str = new StringBuilder();
List<String> finalList = list;
list.forEach(p->{
if(StringUtils.isBlank(p)){
return;
}
p = PasswordUtil.decrypt(p);
str.append(PasswordUtil.decrypt(p));
if(finalList.indexOf(p) < finalList.size() - 1){
str.append(",");
}
});
String str = JSON.toJSONString(list);
if(StringUtils.isBlank(str)){
throw new JeroBootException("分发失败！");
}
String content = msg + "文件已发送到您的账号和邮箱，可通过手机号登录系统XXX（点击链接可进入系统）或微信小程序搜素XXX进入查看";
EmailSendMsgHandle emailHandle = new EmailSendMsgHandle();
emailHandle.SendMsgAndFile(str, "", "", listFile);
emailHandle.SendMsgAndFile(str.toString(), "", content, listFile);
// todo 缺少发送消息
}
@Override
@@ -138,22 +165,32 @@ public class PayWorkingGroupDistributionRecordServiceImpl extends ServiceImpl<Pa
String fileName = byId.getFileName();
listFile.add(fileName);
});
String msg = "";
List<String> list = new ArrayList<>();
if(payWorkingGroupDistributionRecord.getProjectType() != PayProjectCommon.PROJECT_TYPE_FILE1){
if(payWorkingGroupDistributionRecord.getProjectType() == PayProjectCommon.PROJECT_TYPE_FILE1){
LambdaQueryWrapper<PayContactsManagementTemporary> queryPayContactsManagementTemporary = new LambdaQueryWrapper<>();
queryPayContactsManagementTemporary.in(PayContactsManagementTemporary::getId, Arrays.asList(s));
List<PayContactsManagementTemporary> listContacts = payContactsManagementTemporaryService.list(queryPayContactsManagementTemporary);
if(!CollectionUtils.isEmpty(listContacts)){
list = listContacts.stream().map(PayContactsManagementTemporary::getEmail).collect(Collectors.toList());
}
}else if(payWorkingGroupDistributionRecord.getProjectType() != PayProjectCommon.PROJECT_TYPE_FILE2){
PayWorkingGroup payWorkingGroup = payWorkingGroupService.getById(payWorkingGroupDistributionRecord.getProjectId());
if(Objects.isNull(payWorkingGroup)){
throw new JeroBootException("工作组不存在!");
}
msg = payWorkingGroup.getWorkingGroupProject();
}else if(payWorkingGroupDistributionRecord.getProjectType() == PayProjectCommon.PROJECT_TYPE_FILE2){
LambdaQueryWrapper<PayContactsManagement> queryPayContactsManagement = new LambdaQueryWrapper<>();
queryPayContactsManagement.in(PayContactsManagement::getId, Arrays.asList(n));
List<PayContactsManagement> listContacts = payContactsManagementService.list(queryPayContactsManagement);
if(!CollectionUtils.isEmpty(listContacts)){
list = listContacts.stream().map(PayContactsManagement::getEmail).collect(Collectors.toList());
}
PayCaseCommittee payCaseCommittee = payCaseCommitteeService.getById(payWorkingGroupDistributionRecord.getProjectId());
if(Objects.isNull(payCaseCommittee)){
throw new JeroBootException("分标委不存在!");
}
msg = payCaseCommittee.getName();
}else{
throw new JeroBootException("项目状态不正确！");
}
@@ -166,8 +203,23 @@ public class PayWorkingGroupDistributionRecordServiceImpl extends ServiceImpl<Pa
}
p = PasswordUtil.decrypt(p);
});
String str = JSON.toJSONString(list);
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, "", "", listFile);
emailHandle.SendMsgAndFile(str.toString(), "", content, listFile);
// todo 缺少发送消息
}
}