合同管理-去掉审核流程，添加作废功能,添加消息功能
This commit is contained in:
liangqitao
@@ -155,5 +155,12 @@ public class ProjectCommon {
|
||||
* flag 1为会议审核来款，2为正常来款
|
||||
*/
|
||||
public final static Integer PAYMENT_FLAG2 = 2;
|
||||
|
||||
/**
|
||||
* 条件 0为发送创建通知，1为发送缴费通知
|
||||
*/
|
||||
public final static String FLAG0 = "0";
|
||||
/**
|
||||
* 条件 0为发送创建通知，1为发送缴费通知
|
||||
*/
|
||||
public final static String FLAG1 = "1";
|
||||
}
|
||||
|
||||
+33
@@ -0,0 +1,33 @@
|
||||
package com.jero.common.dto;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
@Data
|
||||
public class PaySendContactsMessageDTO implements Serializable {
|
||||
/**
|
||||
* 项目名称
|
||||
*/
|
||||
private String projectName;
|
||||
/**
|
||||
* 项目id
|
||||
*/
|
||||
private String projectId;
|
||||
/**
|
||||
* 负责人id
|
||||
*/
|
||||
private String userId;
|
||||
/**
|
||||
* 邮箱
|
||||
*/
|
||||
private String email;
|
||||
/**
|
||||
* 手机号
|
||||
*/
|
||||
private String phone;
|
||||
/**
|
||||
* 条件 0为发送创建通知，1为发送缴费通知
|
||||
*/
|
||||
private String flag;
|
||||
}
|
||||
+11
@@ -1,5 +1,7 @@
|
||||
package com.jero.common.service;
|
||||
|
||||
import com.jero.common.dto.PaySendContactsMessageDTO;
|
||||
|
||||
public interface ContractCreateProjectSendMessageService {
|
||||
/**
|
||||
* @Description 合同创建项目发送消息，通知项目负责人
|
||||
@@ -12,4 +14,13 @@ public interface ContractCreateProjectSendMessageService {
|
||||
* @Exception
|
||||
*/
|
||||
void ContractCreateProjectSendMessageService(String projectName,String projectId,String userId);
|
||||
/**
|
||||
* @Description 创建项目发送消息，通知企业联系人
|
||||
* @Author lqt
|
||||
* @Date 2021/9/24
|
||||
* @Param paySendContactsMessageDTO
|
||||
* @Return
|
||||
* @Exception
|
||||
*/
|
||||
void CreateProjectSendMessageToContactsService(PaySendContactsMessageDTO paySendContactsMessageDTO);
|
||||
}
|
||||
|
||||
+64
-10
@@ -1,7 +1,8 @@
|
||||
package com.jero.common.service.impl;
|
||||
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.jero.common.common.RoleCommon;
|
||||
import com.jero.common.common.ProjectCommon;
|
||||
import com.jero.common.dto.PaySendContactsMessageDTO;
|
||||
import com.jero.common.dto.SendMessageDTO;
|
||||
import com.jero.common.enums.CompanyMessageEnums;
|
||||
import com.jero.common.enums.ManagementMessageEnums;
|
||||
@@ -11,23 +12,19 @@ import com.jero.common.system.vo.LoginUser;
|
||||
import com.jero.common.util.PasswordUtil;
|
||||
import com.jero.modules.system.entity.SysUser;
|
||||
import com.jero.modules.system.service.ISysUserService;
|
||||
import org.apache.commons.collections.CollectionUtils;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
import org.apache.shiro.SecurityUtils;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.Arrays;
|
||||
import javax.annotation.Resource;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Objects;
|
||||
|
||||
@Service
|
||||
public class ContractCreateProjectSendMessageServiceImpl implements ContractCreateProjectSendMessageService {
|
||||
|
||||
@Autowired
|
||||
@Resource
|
||||
private ISysUserService sysUserService;
|
||||
@Autowired
|
||||
@Resource
|
||||
private SendMessageService sendMessageService;
|
||||
|
||||
@Override
|
||||
@@ -40,7 +37,6 @@ public class ContractCreateProjectSendMessageServiceImpl implements ContractCrea
|
||||
return;
|
||||
}
|
||||
// 获取项目负责人，发送消息
|
||||
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
||||
// 发送消息
|
||||
SendMessageDTO sendMessageDTO = new SendMessageDTO();
|
||||
if(!StringUtils.isBlank(sysUserDetail.getEmail())){
|
||||
@@ -51,7 +47,7 @@ public class ContractCreateProjectSendMessageServiceImpl implements ContractCrea
|
||||
}
|
||||
HashMap<String,String> map = new HashMap<>();
|
||||
map.put("projectName",projectName);
|
||||
sendMessageDTO.setFromUser(sysUser.getUsername());
|
||||
sendMessageDTO.setFromUser(sysUserDetail.getUsername());
|
||||
sendMessageDTO.setToUser(sysUserDetail.getUsername());
|
||||
sendMessageDTO.setTemplateCode(ManagementMessageEnums.MSG1.getCode());
|
||||
sendMessageDTO.setTemplateParam(map);
|
||||
@@ -61,4 +57,62 @@ public class ContractCreateProjectSendMessageServiceImpl implements ContractCrea
|
||||
sendMessageDTO.setBusId(json.toJSONString());
|
||||
sendMessageService.SendMessageService(sendMessageDTO);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void CreateProjectSendMessageToContactsService(PaySendContactsMessageDTO paySendContactsMessageDTO) {
|
||||
if(StringUtils.isBlank(paySendContactsMessageDTO.getFlag())){
|
||||
return;
|
||||
}
|
||||
if(StringUtils.isBlank(paySendContactsMessageDTO.getUserId())){
|
||||
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
||||
paySendContactsMessageDTO.setUserId(sysUser.getId());
|
||||
}
|
||||
SysUser sysUser = sysUserService.getById(paySendContactsMessageDTO.getUserId());
|
||||
if(Objects.isNull(sysUser)){
|
||||
return;
|
||||
}
|
||||
// 发送消息
|
||||
if(paySendContactsMessageDTO.getFlag().contains(ProjectCommon.FLAG0)){
|
||||
SendMessageDTO sendMessageDTO = new SendMessageDTO();
|
||||
if(!StringUtils.isBlank(paySendContactsMessageDTO.getEmail())){
|
||||
sendMessageDTO.setEmail(PasswordUtil.decrypt(paySendContactsMessageDTO.getEmail()));
|
||||
}
|
||||
if(!StringUtils.isEmpty(paySendContactsMessageDTO.getPhone())){
|
||||
sendMessageDTO.setPhone(PasswordUtil.decrypt(paySendContactsMessageDTO.getPhone()));
|
||||
sendMessageDTO.setToUser(PasswordUtil.decrypt(paySendContactsMessageDTO.getPhone()));
|
||||
}
|
||||
HashMap<String,String> map = new HashMap<>();
|
||||
map.put("projectName",paySendContactsMessageDTO.getProjectName());
|
||||
sendMessageDTO.setFromUser(sysUser.getUsername());
|
||||
sendMessageDTO.setTemplateCode(CompanyMessageEnums.MSG20.getCode());
|
||||
sendMessageDTO.setTemplateParam(map);
|
||||
sendMessageDTO.setBusType("C_OPEN_TYPE20");
|
||||
JSONObject json = new JSONObject();
|
||||
json.put("id",paySendContactsMessageDTO.getProjectId());
|
||||
sendMessageDTO.setBusId(json.toJSONString());
|
||||
sendMessageService.SendMessageService(sendMessageDTO);
|
||||
}
|
||||
// 发送缴费通知
|
||||
if(paySendContactsMessageDTO.getFlag().contains(ProjectCommon.FLAG1)){
|
||||
// 发送消息
|
||||
SendMessageDTO sendMessageDTO = new SendMessageDTO();
|
||||
if(!StringUtils.isBlank(paySendContactsMessageDTO.getEmail())){
|
||||
sendMessageDTO.setEmail(PasswordUtil.decrypt(paySendContactsMessageDTO.getEmail()));
|
||||
}
|
||||
if(!StringUtils.isEmpty(paySendContactsMessageDTO.getPhone())){
|
||||
sendMessageDTO.setPhone(PasswordUtil.decrypt(paySendContactsMessageDTO.getPhone()));
|
||||
sendMessageDTO.setToUser(PasswordUtil.decrypt(paySendContactsMessageDTO.getPhone()));
|
||||
}
|
||||
HashMap<String,String> map = new HashMap<>();
|
||||
map.put("projectName",paySendContactsMessageDTO.getProjectName());
|
||||
sendMessageDTO.setFromUser(sysUser.getUsername());
|
||||
sendMessageDTO.setTemplateCode(CompanyMessageEnums.MSG17.getCode());
|
||||
sendMessageDTO.setTemplateParam(map);
|
||||
sendMessageDTO.setBusType("C_OPEN_TYPE17");
|
||||
JSONObject json = new JSONObject();
|
||||
json.put("id",paySendContactsMessageDTO.getProjectId());
|
||||
sendMessageDTO.setBusId(json.toJSONString());
|
||||
sendMessageService.SendMessageService(sendMessageDTO);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user