消息修改
This commit is contained in:
+69
-43
@@ -306,6 +306,7 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
|
||||
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
||||
listPayIncomeContractAssociated.forEach(p->{
|
||||
String projectName = "";
|
||||
String principalId = "";
|
||||
ProjectOutput projectOutput = new ProjectOutput();
|
||||
StringBuilder msgPayIncomeContractAssociated = ValidUtil.validateAll(p);
|
||||
if(!StringUtils.isBlank(msgPayIncomeContractAssociated)){
|
||||
@@ -348,6 +349,7 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
|
||||
payPackCompanyProjectService.setPack(payCommonProject.getChargeCompanyId(),payCommonProject.getContactsId(),payIncomeContract.getPackYear(),payCommonProject.getId(),PayIncomeContractCommon.PROJECT_TYPE1,payIncomeContract.getPack());
|
||||
}
|
||||
}
|
||||
principalId = payCommonProject.getPrincipalId();
|
||||
projectName = payCommonProject.getChargeProject();
|
||||
// 更新项目id
|
||||
p.setProjectId(payCommonProject.getId());
|
||||
@@ -390,6 +392,7 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
|
||||
payPackCompanyProjectService.setPack(listPayWorkingGroupSubItem.get(0).getChargeCompanyId(),listPayWorkingGroupSubItem.get(0).getContactsIdOne(),payIncomeContract.getPackYear(),listPayWorkingGroupSubItem.get(0).getId(),PayIncomeContractCommon.PROJECT_TYPE2,payIncomeContract.getPack());
|
||||
}
|
||||
}
|
||||
principalId = payWorkingGroup.getPrincipalIdA();
|
||||
projectName = payWorkingGroup.getWorkingGroupProject();
|
||||
// 更新项目id
|
||||
p.setProjectId(listPayWorkingGroupSubItem.get(0).getId());
|
||||
@@ -419,6 +422,7 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
|
||||
}
|
||||
// 验证项目是否已被关联
|
||||
getIncomeContractAssociated(p.getContractId(),payMeetingSituation.getId());
|
||||
principalId = payMeeting.getDirectorId();
|
||||
projectName = payMeeting.getMeetingName();
|
||||
// 更新项目id
|
||||
p.setProjectId(payMeetingSituation.getId());
|
||||
@@ -460,6 +464,7 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
|
||||
payPackCompanyProjectService.setPack(listPayMemberProjectSubitem.get(0).getCompanyId(),listPayMemberProjectSubitem.get(0).getCompanyContactId(),payIncomeContract.getPackYear(),listPayMemberProjectSubitem.get(0).getId(),PayIncomeContractCommon.PROJECT_TYPE4,payIncomeContract.getPack());
|
||||
}
|
||||
}
|
||||
principalId = payMemberProject.getDirectorId();
|
||||
projectName = payMemberProject.getProjectName();
|
||||
p.setProjectId(listPayMemberProjectSubitem.get(0).getId());
|
||||
break;
|
||||
@@ -505,28 +510,32 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
|
||||
// 合同选择了打包
|
||||
if(Objects.equals(payIncomeContract.getPack(), PackCommon.PACKAGING1)){
|
||||
// 获取项目负责人,发送消息
|
||||
List<SysUser> list = sysUserService.getRolesUser(Arrays.asList(RoleCommon.XMFZR));
|
||||
if(!CollectionUtils.isEmpty(list)){
|
||||
String finalProjectName = projectName;
|
||||
list.forEach(item->{
|
||||
// 发送消息
|
||||
SendMessageDTO sendMessageDTO = new SendMessageDTO();
|
||||
if(!StringUtils.isBlank(item.getEmail())){
|
||||
sendMessageDTO.setEmail(PasswordUtil.decrypt(item.getEmail()));
|
||||
}
|
||||
HashMap<String,String> map = new HashMap<>();
|
||||
map.put("projectName", finalProjectName);
|
||||
sendMessageDTO.setFromUser(sysUser.getUsername());
|
||||
sendMessageDTO.setToUser(item.getUsername());
|
||||
sendMessageDTO.setTemplateCode(ManagementMessageEnums.MSG7.getCode());
|
||||
sendMessageDTO.setTemplateParam(map);
|
||||
sendMessageDTO.setBusType("M_OPEN_TYPE7");
|
||||
JSONObject json = new JSONObject();
|
||||
json.put("id",p.getProjectId());
|
||||
sendMessageDTO.setBusId(json.toJSONString());
|
||||
sendMessageService.SendMessageService(sendMessageDTO);
|
||||
});
|
||||
if(StringUtils.isEmpty(principalId)){
|
||||
return;
|
||||
}
|
||||
SysUser sysUserData = sysUserService.getById(principalId);
|
||||
if(Objects.isNull(sysUserData)){
|
||||
return;
|
||||
}
|
||||
// 发送消息
|
||||
SendMessageDTO sendMessageDTO = new SendMessageDTO();
|
||||
if(!StringUtils.isBlank(sysUserData.getEmail())){
|
||||
sendMessageDTO.setEmail(PasswordUtil.decrypt(sysUserData.getEmail()));
|
||||
}
|
||||
if(!StringUtils.isBlank(sysUserData.getPhone())){
|
||||
sendMessageDTO.setPhone(PasswordUtil.decrypt(sysUserData.getPhone()));
|
||||
}
|
||||
HashMap<String,String> map = new HashMap<>();
|
||||
map.put("projectName", projectName);
|
||||
sendMessageDTO.setFromUser(sysUser.getUsername());
|
||||
sendMessageDTO.setToUser(sysUserData.getUsername());
|
||||
sendMessageDTO.setTemplateCode(ManagementMessageEnums.MSG7.getCode());
|
||||
sendMessageDTO.setTemplateParam(map);
|
||||
sendMessageDTO.setBusType("M_OPEN_TYPE7");
|
||||
JSONObject json = new JSONObject();
|
||||
json.put("id",p.getProjectId());
|
||||
sendMessageDTO.setBusId(json.toJSONString());
|
||||
sendMessageService.SendMessageService(sendMessageDTO);
|
||||
}
|
||||
});
|
||||
}
|
||||
@@ -863,47 +872,64 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
|
||||
payMailContract.setLiaisonMan(payIncomeContractStatus.getContractName());
|
||||
payMailContractService.save(payMailContract);
|
||||
|
||||
String code = "";
|
||||
String role = "";
|
||||
String type = "";
|
||||
// 审核通过
|
||||
if(Objects.equals(payIncomeContractAudit.getContractStatus(),PayIncomeContractCommon.STATUS3)){
|
||||
code = ManagementMessageEnums.MSG3.getCode();
|
||||
type = "M_OPEN_TYPE3";
|
||||
role = RoleCommon.CWRY;
|
||||
// 获取项目负责人,发送消息
|
||||
List<SysUser> list = sysUserService.getRolesUser(Arrays.asList(RoleCommon.CWRY));
|
||||
if(!CollectionUtils.isEmpty(list)){
|
||||
list.forEach(p->{
|
||||
// 发送消息
|
||||
SendMessageDTO sendMessageDTO = new SendMessageDTO();
|
||||
if(!StringUtils.isBlank(p.getEmail())){
|
||||
sendMessageDTO.setEmail(PasswordUtil.decrypt(p.getEmail()));
|
||||
}
|
||||
if(!StringUtils.isBlank(p.getPhone())){
|
||||
sendMessageDTO.setPhone(PasswordUtil.decrypt(p.getPhone()));
|
||||
}
|
||||
HashMap<String,String> map = new HashMap<>();
|
||||
map.put("contractNum",payIncomeContractStatus.getContractNum());
|
||||
map.put("contractName",payIncomeContractStatus.getContractName());
|
||||
sendMessageDTO.setFromUser(sysUser.getUsername());
|
||||
sendMessageDTO.setToUser(p.getUsername());
|
||||
sendMessageDTO.setTemplateCode(ManagementMessageEnums.MSG3.getCode());
|
||||
sendMessageDTO.setTemplateParam(map);
|
||||
sendMessageDTO.setBusType("M_OPEN_TYPE3");
|
||||
JSONObject json = new JSONObject();
|
||||
json.put("revenueId",payIncomeContractStatus.getId());
|
||||
json.put("contractNum",payIncomeContractStatus.getContractNum());
|
||||
sendMessageDTO.setBusId(json.toJSONString());
|
||||
sendMessageService.SendMessageService(sendMessageDTO);
|
||||
});
|
||||
}
|
||||
}
|
||||
// 审核未通过
|
||||
if(Objects.equals(payIncomeContractAudit.getContractStatus(),PayIncomeContractCommon.STATUS4)){
|
||||
code = ManagementMessageEnums.MSG4.getCode();
|
||||
type = "M_OPEN_TYPE4";
|
||||
role = RoleCommon.HTFZR;
|
||||
}
|
||||
// 获取项目负责人,发送消息
|
||||
List<SysUser> list = sysUserService.getRolesUser(Arrays.asList(role));
|
||||
if(!CollectionUtils.isEmpty(list)){
|
||||
String finalType = type;
|
||||
String finalCode = code;
|
||||
list.forEach(p->{
|
||||
SysUser sysUserData = sysUserService.getById(payIncomeContractStatus.getPrincipalId());
|
||||
if(!Objects.isNull(sysUserData)){
|
||||
// 发送消息
|
||||
SendMessageDTO sendMessageDTO = new SendMessageDTO();
|
||||
if(!StringUtils.isBlank(p.getEmail())){
|
||||
sendMessageDTO.setEmail(PasswordUtil.decrypt(p.getEmail()));
|
||||
if(!StringUtils.isBlank(sysUserData.getEmail())){
|
||||
sendMessageDTO.setEmail(PasswordUtil.decrypt(sysUserData.getEmail()));
|
||||
}
|
||||
if(StringUtils.isEmpty(sysUserData.getPhone())){
|
||||
sendMessageDTO.setPhone(PasswordUtil.decrypt(sysUserData.getPhone()));
|
||||
}
|
||||
HashMap<String,String> map = new HashMap<>();
|
||||
map.put("contractNum",payIncomeContractStatus.getContractNum());
|
||||
map.put("contractName",payIncomeContractStatus.getContractName());
|
||||
sendMessageDTO.setFromUser(sysUser.getUsername());
|
||||
sendMessageDTO.setToUser(p.getUsername());
|
||||
sendMessageDTO.setTemplateCode(finalCode);
|
||||
sendMessageDTO.setToUser(sysUserData.getUsername());
|
||||
sendMessageDTO.setTemplateCode(ManagementMessageEnums.MSG4.getCode());
|
||||
sendMessageDTO.setTemplateParam(map);
|
||||
sendMessageDTO.setBusType(finalType);
|
||||
sendMessageDTO.setBusType("M_OPEN_TYPE4");
|
||||
JSONObject json = new JSONObject();
|
||||
json.put("revenueId",payIncomeContractStatus.getId());
|
||||
json.put("contractNum",payIncomeContractStatus.getContractNum());
|
||||
sendMessageDTO.setBusId(json.toJSONString());
|
||||
sendMessageService.SendMessageService(sendMessageDTO);
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
Reference in New Issue
Block a user