diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PaySpendingContractMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PaySpendingContractMapper.xml index b4d9ff95..c6e3508d 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PaySpendingContractMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PaySpendingContractMapper.xml @@ -89,6 +89,9 @@ department_name, contract_amount, rate, + phone, + address, + post_code, no_tax_amount, contract_date, termination_date, diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailContractController.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailContractController.java index 87b2b711..4e35ff0c 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailContractController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailContractController.java @@ -200,55 +200,57 @@ public class PayMailContractController extends JeroController map = new HashMap<>(); - map.put("contractName",payIncomeContract.getContractName()); - map.put("contractNum",payIncomeContract.getContractNum()); - sendMessageDTO.setFromUser(sysUser.getUsername()); - sendMessageDTO.setToUser(sysUserInfo.getUsername()); - sendMessageDTO.setTemplateCode(ManagementMessageEnums.MSG14.getCode()); - sendMessageDTO.setTemplateParam(map); - sendMessageDTO.setBusType("M_OPEN_TYPE14"); - JSONObject json = new JSONObject(); - json.put("id",payMailContract.getPostNo()); - sendMessageDTO.setBusId(json.toJSONString()); - sendMessageService.SendMessageService(sendMessageDTO); + if(payMailContract.getContractType()== PayIncomeContractCommon.CONTRACT_TYPE2) { + if (!Objects.isNull(payMailContract)) { + PayIncomeContract payIncomeContract = payIncomeContractService.getById(payMailContractData.getContractId()); + if (Objects.isNull(payIncomeContract)) { + throw new JeroBootException("合同不存在!"); + } + // 发给 合同负责人 + SysUser sysUserInfo = sysUserService.getById(payIncomeContract.getPrincipalId()); + // 发送消息 + SendMessageDTO sendMessageDTO = new SendMessageDTO(); + if (!org.apache.commons.lang3.StringUtils.isBlank(sysUserInfo.getEmail())) { + sendMessageDTO.setEmail(PasswordUtil.decrypt(sysUserInfo.getEmail())); + } + if (!org.apache.commons.lang3.StringUtils.isEmpty(sysUserInfo.getPhone())) { + sendMessageDTO.setPhone(PasswordUtil.decrypt(sysUserInfo.getPhone())); + } + HashMap map = new HashMap<>(); + map.put("contractName", payIncomeContract.getContractName()); + map.put("contractNum", payIncomeContract.getContractNum()); + sendMessageDTO.setFromUser(sysUser.getUsername()); + sendMessageDTO.setToUser(sysUserInfo.getUsername()); + sendMessageDTO.setTemplateCode(ManagementMessageEnums.MSG14.getCode()); + sendMessageDTO.setTemplateParam(map); + sendMessageDTO.setBusType("M_OPEN_TYPE14"); + JSONObject json = new JSONObject(); + json.put("id", payMailContract.getPostNo()); + sendMessageDTO.setBusId(json.toJSONString()); + sendMessageService.SendMessageService(sendMessageDTO); - // 发给合同的签订单位合同联系人 - SendMessageDTO sendMessageDTO1 = new SendMessageDTO(); - if (!StringUtils.isBlank(payMailContractData.getEmail())) { - sendMessageDTO1.setEmail(PasswordUtil.decrypt(payMailContractData.getEmail())); + // 发给合同的签订单位合同联系人 + SendMessageDTO sendMessageDTO1 = new SendMessageDTO(); + if (!StringUtils.isBlank(payMailContractData.getEmail())) { + sendMessageDTO1.setEmail(PasswordUtil.decrypt(payMailContractData.getEmail())); + } + if (!StringUtils.isBlank(payMailContractData.getMobile())) { + sendMessageDTO1.setToUser(PasswordUtil.decrypt(payMailContractData.getMobile())); + sendMessageDTO1.setPhone(PasswordUtil.decrypt(payMailContractData.getMobile())); + } + HashMap map1 = new HashMap<>(); + if (!Objects.isNull(payIncomeContract)) { + map1.put("contractName", payIncomeContract.getContractName()); + } + sendMessageDTO1.setFromUser(sysUser.getUsername()); + sendMessageDTO1.setTemplateCode(CompanyMessageEnums.MSG10.getCode()); + sendMessageDTO1.setTemplateParam(map1); + JSONObject jsonObject = new JSONObject(); + jsonObject.put("id", payMailContract.getPostNo()); + sendMessageDTO1.setBusId(jsonObject.toJSONString()); + sendMessageDTO1.setBusType("C_OPEN_TYPE10"); + sendMessageService.SendMessageService(sendMessageDTO1); } - if (!StringUtils.isBlank(payMailContractData.getMobile())) { - sendMessageDTO1.setToUser(PasswordUtil.decrypt(payMailContractData.getMobile())); - sendMessageDTO1.setPhone(PasswordUtil.decrypt(payMailContractData.getMobile())); - } - HashMap map1 = new HashMap<>(); - if (!Objects.isNull(payIncomeContract)) { - map1.put("contractName", payIncomeContract.getContractName()); - } - sendMessageDTO1.setFromUser(sysUser.getUsername()); - sendMessageDTO1.setTemplateCode(CompanyMessageEnums.MSG10.getCode()); - sendMessageDTO1.setTemplateParam(map1); - JSONObject jsonObject = new JSONObject(); - jsonObject.put("id",payMailContract.getPostNo()); - sendMessageDTO1.setBusId(jsonObject.toJSONString()); - sendMessageDTO1.setBusType("C_OPEN_TYPE10"); - sendMessageService.SendMessageService(sendMessageDTO1); } return Result.OK("操作成功!"); }