合同管理-去掉审核流程,添加作废功能,添加消息功能

This commit is contained in:
liangqitao
2021-12-15 16:01:12 +08:00
parent 41c4908738
commit af401f3fea
11 changed files with 343 additions and 40 deletions
@@ -16,6 +16,8 @@ import com.jero.common.service.SendMessageService;
import com.jero.common.system.vo.LoginUser;
import com.jero.common.util.PasswordUtil;
import com.jero.common.util.ValidUtil;
import com.jero.company.entity.PayContactsManagement;
import com.jero.company.service.IPayContactsManagementService;
import com.jero.contract.common.PayIncomeContractCommon;
import com.jero.contract.entity.*;
import com.jero.contract.mapper.PayIncomeContractMapper;
@@ -115,6 +117,8 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
private IPayMailContractService payMailContractService;
@Resource
private IPayIncomeContractAssociatedCancellationService payIncomeContractAssociatedCancellationService;
@Resource
private IPayContactsManagementService payContactsManagementService;
@Override
public IPage<PayIncomeContract> queryPageList(Page<PayIncomeContract> page, PayIncomeContract payIncomeContract, String chargeStatus,String projectName, String startTime, String endTime) {
@@ -176,24 +180,27 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
// 校验金额
checkPayIncomeContractInstallment(listPayIncomeContractInstallment,payIncomeContract);
// 选择了打包,创建打包企业
// if(Objects.equals(payIncomeContract.getPack(),PayIncomeContractCommon.PACK1)){
// LambdaQueryWrapper<PayPackCompany> queryPayPackCompany = new LambdaQueryWrapper<>();
// queryPayPackCompany.eq(PayPackCompany::getCompanyId,payIncomeContract.getSignedCompanyId());
// queryPayPackCompany.eq(PayPackCompany::getPackYear,payIncomeContract.getPackYear());
// List<PayPackCompany> listPayPackCompany = payPackCompanyService.list(queryPayPackCompany);
// //不存在打包企业 添加打包企业
// if(CollectionUtils.isEmpty(listPayPackCompany)){
// PayPackCompany payPackCompanyData = new PayPackCompany();
// payPackCompanyData.setCompanyId(payIncomeContract.getSignedCompanyId());
// payPackCompanyData.setCompanyContactId(payIncomeContract.getSignedContactsId());
// payPackCompanyData.setPackYear(payIncomeContract.getPackYear());
// payPackCompanyData.setPackContactId(payIncomeContract.getSignedContactsId());
// payPackCompanyService.addPayPackCompany(payPackCompanyData);
// }
// }
// 新建项目 给企业联系人发送消息
PayContactsManagement payContactsManagement = payContactsManagementService.getById(payIncomeContract.getSignedContactsId());
// 合同负责人 发送消息给签订单位联系人
SysUser sysUser = sysUserService.getById(payIncomeContract.getPrincipalId());
// 发送消息
SendMessageDTO sendMessageDTO = new SendMessageDTO();
if(!StringUtils.isBlank(payContactsManagement.getEmail())){
sendMessageDTO.setEmail(PasswordUtil.decrypt(payContactsManagement.getEmail()));
}
if(!StringUtils.isBlank(sysUser.getPhone())){
sendMessageDTO.setPhone(PasswordUtil.decrypt(payContactsManagement.getPhone()));
sendMessageDTO.setToUser(PasswordUtil.decrypt(payContactsManagement.getPhone()));
}
HashMap<String,String> map = new HashMap<>();
map.put("contractNum", payIncomeContract.getContractNum());
map.put("contractName", payIncomeContract.getContractName());
sendMessageDTO.setFromUser(sysUser.getUsername());
sendMessageDTO.setTemplateCode(CompanyMessageEnums.MSG21.getCode());
sendMessageDTO.setTemplateParam(map);
sendMessageDTO.setBusType("C_OPEN_TYPE21");
sendMessageService.SendMessageService(sendMessageDTO);
return payIncomeContract;
}