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

fixbug:41006

Browse Source
This commit is contained in:
zhangqinlin
2021-11-02 11:07:29 +08:00
parent 8a05016519
commit e606cea567
3 changed files with 118 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailBillController.java
+24 -22
View File
@@ -180,7 +180,8 @@ public class PayMailBillController extends JeroController<PayMailBill, IPayMailB
//变更5种项目的邮寄状态 //变更5种项目的邮寄状态
LambdaQueryWrapper<PayMailBillProject> queryPayMailBillProject = new LambdaQueryWrapper<>(); LambdaQueryWrapper<PayMailBillProject> queryPayMailBillProject = new LambdaQueryWrapper<>();
queryPayMailBillProject.eq(PayMailBillProject::getBillId,payMailBill.getId()); queryPayMailBillProject.eq(PayMailBillProject::getBillId,payMailBill.getId());
PayMailBillProject one = payMailBillProjectService.getOne(queryPayMailBillProject,false); List<PayMailBillProject> list1 = payMailBillProjectService.list(queryPayMailBillProject);
for(PayMailBillProject one:list1) {
if (ObjectUtils.isNotEmpty(one)) { if (ObjectUtils.isNotEmpty(one)) {
LambdaQueryWrapper<PayMailBillProject> queryPayMailBillProjectTwo = new LambdaQueryWrapper<>(); LambdaQueryWrapper<PayMailBillProject> queryPayMailBillProjectTwo = new LambdaQueryWrapper<>();
queryPayMailBillProjectTwo.eq(PayMailBillProject::getProjectId, one.getProjectId()); queryPayMailBillProjectTwo.eq(PayMailBillProject::getProjectId, one.getProjectId());
@@ -270,27 +271,28 @@ public class PayMailBillController extends JeroController<PayMailBill, IPayMailB
payMailBillService.pushSendToStandards(payMailBill, one.getProjectId()); payMailBillService.pushSendToStandards(payMailBill, one.getProjectId());
} }
} }
PayMailBill payMailBillData = payMailBillService.getById(payMailBill.getId()); // PayMailBill payMailBillData = payMailBillService.getById(payMailBill.getId());
if(!Objects.isNull(payMailBillData)){ // if (!Objects.isNull(payMailBillData)) {
// 发送消息 // // 发送消息
SendMessageDTO sendMessageDTO = new SendMessageDTO(); // SendMessageDTO sendMessageDTO = new SendMessageDTO();
if(!StringUtils.isBlank(payMailBillData.getEmail())){ // if (!StringUtils.isBlank(payMailBillData.getEmail())) {
sendMessageDTO.setEmail(PasswordUtil.decrypt(payMailBillData.getEmail())); // sendMessageDTO.setEmail(PasswordUtil.decrypt(payMailBillData.getEmail()));
} // }
if(!StringUtils.isBlank(payMailBillData.getContactMobile())){ // if (!StringUtils.isBlank(payMailBillData.getContactMobile())) {
sendMessageDTO.setToUser(PasswordUtil.decrypt(payMailBillData.getContactMobile())); // sendMessageDTO.setToUser(PasswordUtil.decrypt(payMailBillData.getContactMobile()));
sendMessageDTO.setPhone(PasswordUtil.decrypt(payMailBillData.getContactMobile())); // sendMessageDTO.setPhone(PasswordUtil.decrypt(payMailBillData.getContactMobile()));
} // }
HashMap<String,String> map = new HashMap<>(); // HashMap<String, String> map = new HashMap<>();
map.put("projectName",payMailBillData.getProjectName()); // map.put("projectName", payMailBillData.getProjectName());
sendMessageDTO.setFromUser(sysUser.getUsername()); // sendMessageDTO.setFromUser(sysUser.getUsername());
sendMessageDTO.setTemplateCode(CompanyMessageEnums.MSG9.getCode()); // sendMessageDTO.setTemplateCode(CompanyMessageEnums.MSG9.getCode());
sendMessageDTO.setTemplateParam(map); // sendMessageDTO.setTemplateParam(map);
sendMessageDTO.setBusType("C_OPEN_TYPE9"); // sendMessageDTO.setBusType("C_OPEN_TYPE9");
JSONObject jsonObject = new JSONObject(); // JSONObject jsonObject = new JSONObject();
jsonObject.put("id",payMailBill.getPostNo()); // jsonObject.put("id", payMailBill.getPostNo());
sendMessageDTO.setBusId(jsonObject.toJSONString()); // sendMessageDTO.setBusId(jsonObject.toJSONString());
sendMessageService.SendMessageService(sendMessageDTO); // sendMessageService.SendMessageService(sendMessageDTO);
// }
} }
return Result.OK("编辑成功!"); return Result.OK("编辑成功!");
} }
jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailContractController.java
+14 -14
View File
@@ -158,20 +158,20 @@ public class PayMailContractController extends JeroController<PayMailContract, I
return Result.OK("操作成功!"); return Result.OK("操作成功!");
} }
//
/** // /**
* 票据邮寄打印 // * 票据邮寄打印
* // *
*/ // */
@ApiOperation(value="合同邮寄打印", notes="合同邮寄打印") // @ApiOperation(value="合同邮寄打印", notes="合同邮寄打印")
@Transactional // @Transactional
@PostMapping(value = "/print") // @PostMapping(value = "/print")
public Result<?> print(@RequestParam(name="id") String id) { // public Result<?> print(@RequestParam(name="id") String id) {
PayMailContract payMailContract = payMailContractService.getById(id); // PayMailContract payMailContract = payMailContractService.getById(id);
HashMap<String, PayMailContract> hashMap = new HashMap<>(); // HashMap<String, PayMailContract> hashMap = new HashMap<>();
hashMap.put("payMailBill",payMailContract); // hashMap.put("payMailBill",payMailContract);
return Result.OK(hashMap); // return Result.OK(hashMap);
} // }
/** /**
* 导出excel * 导出excel
*/ */
jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml
+3 -3
View File
@@ -434,7 +434,7 @@
SELECT SELECT
pms.id, pms.id,
pm.meeting_name AS projectName, pm.meeting_name AS projectName,
pm.director_name as principalName, su.realname as principalName,
pms.company_name AS chargeCompanyTemporaryName, pms.company_name AS chargeCompanyTemporaryName,
pms.amount_receivable as allMoney, pms.amount_receivable as allMoney,
pms.paid_amount as comeAllMoney, pms.paid_amount as comeAllMoney,
@@ -784,7 +784,7 @@
SELECT SELECT
pms.id, pms.id,
pm.meeting_name AS projectName, pm.meeting_name AS projectName,
pm.director_name as principalName, su.realname as principalName,
pms.company_name AS chargeCompanyTemporaryName, pms.company_name AS chargeCompanyTemporaryName,
pms.amount_receivable as allMoney, pms.amount_receivable as allMoney,
pms.paid_amount as comeAllMoney, pms.paid_amount as comeAllMoney,
@@ -2210,7 +2210,7 @@
</where> </where>
union all union all
SELECT SELECT
tmps.create_time as createTime, tmps.create_time as createTime，
tmps.id AS projectId, tmps.id AS projectId,
tmp.project_name AS projectName, tmp.project_name AS projectName,
tmps.amount_receivable as allMoney, tmps.amount_receivable as allMoney,