LK/income_payments_management
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add：变更

Browse Source
This commit is contained in:
zhangqinlin
2022-04-07 18:20:59 +08:00
parent e9710d989a
commit d34c0012fa
2 changed files with 52 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PaySpendingContractMapper.xml
+3
View File
@@ -89,6 +89,9 @@
department_name, department_name,
contract_amount, contract_amount,
rate, rate,
phone,
address,
post_code,
no_tax_amount, no_tax_amount,
contract_date, contract_date,
termination_date, termination_date,
jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailContractController.java
+49 -47
View File
@@ -200,55 +200,57 @@ public class PayMailContractController extends JeroController<PayMailContract, I
payMailContract.setPostStatus(1); payMailContract.setPostStatus(1);
payMailContract.setMobile(PasswordUtil.encrypt(payMailContract.getMobile())); payMailContract.setMobile(PasswordUtil.encrypt(payMailContract.getMobile()));
payMailContractService.updateById(payMailContract); payMailContractService.updateById(payMailContract);
if (!Objects.isNull(payMailContract)) { if(payMailContract.getContractType()== PayIncomeContractCommon.CONTRACT_TYPE2) {
PayIncomeContract payIncomeContract = payIncomeContractService.getById(payMailContractData.getContractId()); if (!Objects.isNull(payMailContract)) {
if(Objects.isNull(payIncomeContract)){ PayIncomeContract payIncomeContract = payIncomeContractService.getById(payMailContractData.getContractId());
throw new JeroBootException("合同不存在！"); if (Objects.isNull(payIncomeContract)) {
} throw new JeroBootException("合同不存在！");
// 发给 合同负责人 }
SysUser sysUserInfo = sysUserService.getById(payIncomeContract.getPrincipalId()); // 发给 合同负责人
// 发送消息 SysUser sysUserInfo = sysUserService.getById(payIncomeContract.getPrincipalId());
SendMessageDTO sendMessageDTO = new SendMessageDTO(); // 发送消息
if(!org.apache.commons.lang3.StringUtils.isBlank(sysUserInfo.getEmail())){ SendMessageDTO sendMessageDTO = new SendMessageDTO();
sendMessageDTO.setEmail(PasswordUtil.decrypt(sysUserInfo.getEmail())); 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())); if (!org.apache.commons.lang3.StringUtils.isEmpty(sysUserInfo.getPhone())) {
} sendMessageDTO.setPhone(PasswordUtil.decrypt(sysUserInfo.getPhone()));
HashMap<String,String> map = new HashMap<>(); }
map.put("contractName",payIncomeContract.getContractName()); HashMap<String, String> map = new HashMap<>();
map.put("contractNum",payIncomeContract.getContractNum()); map.put("contractName", payIncomeContract.getContractName());
sendMessageDTO.setFromUser(sysUser.getUsername()); map.put("contractNum", payIncomeContract.getContractNum());
sendMessageDTO.setToUser(sysUserInfo.getUsername()); sendMessageDTO.setFromUser(sysUser.getUsername());
sendMessageDTO.setTemplateCode(ManagementMessageEnums.MSG14.getCode()); sendMessageDTO.setToUser(sysUserInfo.getUsername());
sendMessageDTO.setTemplateParam(map); sendMessageDTO.setTemplateCode(ManagementMessageEnums.MSG14.getCode());
sendMessageDTO.setBusType("M_OPEN_TYPE14"); sendMessageDTO.setTemplateParam(map);
JSONObject json = new JSONObject(); sendMessageDTO.setBusType("M_OPEN_TYPE14");
json.put("id",payMailContract.getPostNo()); JSONObject json = new JSONObject();
sendMessageDTO.setBusId(json.toJSONString()); json.put("id", payMailContract.getPostNo());
sendMessageService.SendMessageService(sendMessageDTO); sendMessageDTO.setBusId(json.toJSONString());
sendMessageService.SendMessageService(sendMessageDTO);
// 发给合同的签订单位合同联系人 // 发给合同的签订单位合同联系人
SendMessageDTO sendMessageDTO1 = new SendMessageDTO(); SendMessageDTO sendMessageDTO1 = new SendMessageDTO();
if (!StringUtils.isBlank(payMailContractData.getEmail())) { if (!StringUtils.isBlank(payMailContractData.getEmail())) {
sendMessageDTO1.setEmail(PasswordUtil.decrypt(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<String, String> 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<String, String> 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("操作成功!"); return Result.OK("操作成功!");
} }