消息修改
This commit is contained in:
+56
-39
@@ -1,5 +1,6 @@
|
||||
package com.jero.project.service.impl;
|
||||
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
|
||||
@@ -159,7 +160,7 @@ public class PayWorkingGroupServiceImpl extends ServiceImpl<PayWorkingGroupMappe
|
||||
}
|
||||
|
||||
@Override
|
||||
@Transactional
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public void copy(PayWorkingGroup payWorkingGroup) {
|
||||
// 更新工作组
|
||||
PayWorkingGroup payWorkingGroupOld = payWorkingGroupService.getById(payWorkingGroup.getId());
|
||||
@@ -318,49 +319,65 @@ public class PayWorkingGroupServiceImpl extends ServiceImpl<PayWorkingGroupMappe
|
||||
});
|
||||
payWorkingGroupSubItemService.saveBatch(listPayWorkingGroupSubItem);
|
||||
listPayWorkingGroupSubItem.forEach(p->{
|
||||
// 项目的应收金额>0 发送缴费通知
|
||||
if(p.getReceivableAmount().compareTo(new BigDecimal("0")) > 0) {
|
||||
// 新建项目 给企业联系人1发送消息
|
||||
if (!StringUtils.isBlank(p.getContactsIdOne())) {
|
||||
PayContactsManagement payContactsManagement = payContactsManagementService.getById(p.getContactsIdOne());
|
||||
if (!Objects.isNull(payContactsManagement)) {
|
||||
PaySendContactsMessageDTO paySendContactsMessageDTO = new PaySendContactsMessageDTO();
|
||||
paySendContactsMessageDTO.setProjectName(payWorkingGroupOld.getWorkingGroupProject());
|
||||
paySendContactsMessageDTO.setProjectId(p.getId());
|
||||
paySendContactsMessageDTO.setEmail(payContactsManagement.getEmail());
|
||||
paySendContactsMessageDTO.setUserId(payWorkingGroupOld.getPrincipalIdA());
|
||||
paySendContactsMessageDTO.setPhone(payContactsManagement.getPhone());
|
||||
paySendContactsMessageDTO.setFlag(ProjectCommon.FLAG1);
|
||||
contractCreateProjectSendMessageService.createProjectSendMessageToContactsService(paySendContactsMessageDTO);
|
||||
JSONObject json = new JSONObject();
|
||||
json.put("type",ProjectCommon.PROJECT_TYPE2);
|
||||
json.put("id",p.getId());
|
||||
json.put("path","workTeam/WorkTeamDetail");
|
||||
// 新建项目 给企业联系人1发送消息
|
||||
if (!StringUtils.isBlank(p.getContactsIdOne())) {
|
||||
PayContactsManagement payContactsManagement = payContactsManagementService.getById(p.getContactsIdOne());
|
||||
if (!Objects.isNull(payContactsManagement)) {
|
||||
PaySendContactsMessageDTO paySendContactsMessageDTO = new PaySendContactsMessageDTO();
|
||||
paySendContactsMessageDTO.setProjectName(payWorkingGroupOld.getWorkingGroupProject());
|
||||
paySendContactsMessageDTO.setProjectId(p.getId());
|
||||
paySendContactsMessageDTO.setEmail(payContactsManagement.getEmail());
|
||||
paySendContactsMessageDTO.setUserId(payWorkingGroupOld.getPrincipalIdA());
|
||||
paySendContactsMessageDTO.setPhone(payContactsManagement.getPhone());
|
||||
paySendContactsMessageDTO.setFlag(ProjectCommon.FLAG0);
|
||||
// 项目的应收金额>0 发送缴费通知
|
||||
if(!Objects.isNull(p.getReceivableAmount()) && p.getReceivableAmount().compareTo(new BigDecimal("0")) > 0){
|
||||
paySendContactsMessageDTO.setFlag(ProjectCommon.FLAG0 + "," + ProjectCommon.FLAG1);
|
||||
}
|
||||
paySendContactsMessageDTO.setJson(json);
|
||||
contractCreateProjectSendMessageService.createProjectSendMessageToContactsService(paySendContactsMessageDTO);
|
||||
}
|
||||
// 新建项目 给企业联系人2发送消息
|
||||
if (!StringUtils.isBlank(p.getContactsIdTwo())) {
|
||||
PayContactsManagement payContactsManagement = payContactsManagementService.getById(p.getContactsIdTwo());
|
||||
if (!Objects.isNull(payContactsManagement)) {
|
||||
PaySendContactsMessageDTO paySendContactsMessageDTO = new PaySendContactsMessageDTO();
|
||||
paySendContactsMessageDTO.setProjectName(payWorkingGroupOld.getWorkingGroupProject());
|
||||
paySendContactsMessageDTO.setProjectId(p.getId());
|
||||
paySendContactsMessageDTO.setEmail(payContactsManagement.getEmail());
|
||||
paySendContactsMessageDTO.setUserId(payWorkingGroupOld.getPrincipalIdA());
|
||||
paySendContactsMessageDTO.setPhone(payContactsManagement.getPhone());
|
||||
paySendContactsMessageDTO.setFlag(ProjectCommon.FLAG1);
|
||||
contractCreateProjectSendMessageService.createProjectSendMessageToContactsService(paySendContactsMessageDTO);
|
||||
}
|
||||
// 新建项目 给企业联系人2发送消息
|
||||
if (!StringUtils.isBlank(p.getContactsIdTwo())) {
|
||||
PayContactsManagement payContactsManagement = payContactsManagementService.getById(p.getContactsIdTwo());
|
||||
if (!Objects.isNull(payContactsManagement)) {
|
||||
PaySendContactsMessageDTO paySendContactsMessageDTO = new PaySendContactsMessageDTO();
|
||||
paySendContactsMessageDTO.setProjectName(payWorkingGroupOld.getWorkingGroupProject());
|
||||
paySendContactsMessageDTO.setProjectId(p.getId());
|
||||
paySendContactsMessageDTO.setEmail(payContactsManagement.getEmail());
|
||||
paySendContactsMessageDTO.setUserId(payWorkingGroupOld.getPrincipalIdA());
|
||||
paySendContactsMessageDTO.setPhone(payContactsManagement.getPhone());
|
||||
paySendContactsMessageDTO.setFlag(ProjectCommon.FLAG0);
|
||||
// 项目的应收金额>0 发送缴费通知
|
||||
if(!Objects.isNull(p.getReceivableAmount()) && p.getReceivableAmount().compareTo(new BigDecimal("0")) > 0){
|
||||
paySendContactsMessageDTO.setFlag(ProjectCommon.FLAG0 + "," + ProjectCommon.FLAG1);
|
||||
}
|
||||
paySendContactsMessageDTO.setJson(json);
|
||||
contractCreateProjectSendMessageService.createProjectSendMessageToContactsService(paySendContactsMessageDTO);
|
||||
}
|
||||
// 新建项目 给企业联系人3发送消息
|
||||
if (!StringUtils.isBlank(p.getContactsIdThree())) {
|
||||
PayContactsManagement payContactsManagement = payContactsManagementService.getById(p.getContactsIdThree());
|
||||
if (!Objects.isNull(payContactsManagement)) {
|
||||
PaySendContactsMessageDTO paySendContactsMessageDTO = new PaySendContactsMessageDTO();
|
||||
paySendContactsMessageDTO.setProjectName(payWorkingGroupOld.getWorkingGroupProject());
|
||||
paySendContactsMessageDTO.setProjectId(p.getId());
|
||||
paySendContactsMessageDTO.setEmail(payContactsManagement.getEmail());
|
||||
paySendContactsMessageDTO.setUserId(payWorkingGroupOld.getPrincipalIdA());
|
||||
paySendContactsMessageDTO.setPhone(payContactsManagement.getPhone());
|
||||
paySendContactsMessageDTO.setFlag(ProjectCommon.FLAG1);
|
||||
contractCreateProjectSendMessageService.createProjectSendMessageToContactsService(paySendContactsMessageDTO);
|
||||
}
|
||||
// 新建项目 给企业联系人3发送消息
|
||||
if (!StringUtils.isBlank(p.getContactsIdThree())) {
|
||||
PayContactsManagement payContactsManagement = payContactsManagementService.getById(p.getContactsIdThree());
|
||||
if (!Objects.isNull(payContactsManagement)) {
|
||||
PaySendContactsMessageDTO paySendContactsMessageDTO = new PaySendContactsMessageDTO();
|
||||
paySendContactsMessageDTO.setProjectName(payWorkingGroupOld.getWorkingGroupProject());
|
||||
paySendContactsMessageDTO.setProjectId(p.getId());
|
||||
paySendContactsMessageDTO.setEmail(payContactsManagement.getEmail());
|
||||
paySendContactsMessageDTO.setUserId(payWorkingGroupOld.getPrincipalIdA());
|
||||
paySendContactsMessageDTO.setPhone(payContactsManagement.getPhone());
|
||||
paySendContactsMessageDTO.setFlag(ProjectCommon.FLAG0);
|
||||
// 项目的应收金额>0 发送缴费通知
|
||||
if(!Objects.isNull(p.getReceivableAmount()) && p.getReceivableAmount().compareTo(new BigDecimal("0")) > 0){
|
||||
paySendContactsMessageDTO.setFlag(ProjectCommon.FLAG0 + "," + ProjectCommon.FLAG1);
|
||||
}
|
||||
paySendContactsMessageDTO.setJson(json);
|
||||
contractCreateProjectSendMessageService.createProjectSendMessageToContactsService(paySendContactsMessageDTO);
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
+8
@@ -1,5 +1,6 @@
|
||||
package com.jero.project.service.impl;
|
||||
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
@@ -190,6 +191,10 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl<PayWorkingGro
|
||||
if(Objects.equals(ProjectCommon.FLAG,payWorkingGroupSubItem.getFlag())){
|
||||
contractCreateProjectSendMessageService.contractCreateProjectSendMessageService(payWorkingGroup.getWorkingGroupProject() + "的" + payWorkingGroupSubItem.getChargeCompanyTemporaryName(),payWorkingGroupSubItem.getId(),payWorkingGroup.getPrincipalIdA());
|
||||
}
|
||||
JSONObject json = new JSONObject();
|
||||
json.put("type",ProjectCommon.PROJECT_TYPE2);
|
||||
json.put("id",payWorkingGroupSubItem.getId());
|
||||
json.put("path","workTeam/WorkTeamDetail");
|
||||
// 新建项目 给企业联系人1发送消息
|
||||
if(!StringUtils.isBlank(payWorkingGroupSubItem.getContactsIdOne())){
|
||||
PayContactsManagement payContactsManagement = payContactsManagementService.getById(payWorkingGroupSubItem.getContactsIdOne());
|
||||
@@ -205,6 +210,7 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl<PayWorkingGro
|
||||
if(!Objects.isNull(payWorkingGroupSubItem.getReceivableAmount()) && payWorkingGroupSubItem.getReceivableAmount().compareTo(new BigDecimal("0")) > 0){
|
||||
paySendContactsMessageDTO.setFlag(ProjectCommon.FLAG0 + "," + ProjectCommon.FLAG1);
|
||||
}
|
||||
paySendContactsMessageDTO.setJson(json);
|
||||
contractCreateProjectSendMessageService.createProjectSendMessageToContactsService(paySendContactsMessageDTO);
|
||||
}
|
||||
}
|
||||
@@ -223,6 +229,7 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl<PayWorkingGro
|
||||
if(payWorkingGroupSubItem.getReceivableAmount().compareTo(new BigDecimal("0")) > 0){
|
||||
paySendContactsMessageDTO.setFlag(ProjectCommon.FLAG0 + "," + ProjectCommon.FLAG1);
|
||||
}
|
||||
paySendContactsMessageDTO.setJson(json);
|
||||
contractCreateProjectSendMessageService.createProjectSendMessageToContactsService(paySendContactsMessageDTO);
|
||||
}
|
||||
}
|
||||
@@ -241,6 +248,7 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl<PayWorkingGro
|
||||
if(payWorkingGroupSubItem.getReceivableAmount().compareTo(new BigDecimal("0")) > 0){
|
||||
paySendContactsMessageDTO.setFlag(ProjectCommon.FLAG0 + "," + ProjectCommon.FLAG1);
|
||||
}
|
||||
paySendContactsMessageDTO.setJson(json);
|
||||
contractCreateProjectSendMessageService.createProjectSendMessageToContactsService(paySendContactsMessageDTO);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user