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

fix bug

Browse Source
This commit is contained in:
zhangqinlin
2021-10-15 18:56:40 +08:00
parent aa05d36849
commit 8ead58a44e
15 changed files with 1097 additions and 215 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
+19 -35
View File
@@ -135,17 +135,7 @@ public class PayMailBillController extends JeroController<PayMailBill, IPayMailB
}
IPage<PayMailBill> pageList = payMailBillService.pageList(page, queryWrapper);
if (!CollectionUtils.isEmpty(pageList.getRecords())) {
try {
pageList.getRecords().forEach(p -> {
if (!org.apache.commons.lang3.StringUtils.isBlank(p.getContactMobile())) {
p.setContactMobile(PasswordUtil.decrypt(p.getContactMobile()));
}
});
} catch (Exception e) {
log.error("手机号解密异常！", e);
}
}
getMobile(pageList.getRecords());
return Result.OK(pageList);
}
@@ -343,26 +333,16 @@ public class PayMailBillController extends JeroController<PayMailBill, IPayMailB
queryWrapper.le("send_date", calendar.getTime());
}
if (ObjectUtil.isNotEmpty(payMailBillSearch.getChargeCompanyName())){
queryWrapper.like("charge_company_name",oConvertUtils.replaceAllPercent(payMailBillSearch.getChargeCompanyName()));
queryWrapper.like("charge_company_name",payMailBillSearch.getChargeCompanyName());
}
if (ObjectUtil.isNotEmpty(payMailBillSearch.getPrincipalId())){
queryWrapper.eq("principal_id",payMailBillSearch.getPrincipalId());
}
if (ObjectUtil.isNotEmpty(payMailBillSearch.getProjectName())){
queryWrapper.like("project_name",oConvertUtils.replaceAllPercent(payMailBillSearch.getProjectName()));
queryWrapper.like("project_name",payMailBillSearch.getProjectName());
}
List<PayMailBill> pageList = payMailBillService.list(queryWrapper);
if (!CollectionUtils.isEmpty(pageList)) {
try {
pageList.forEach(p -> {
if (!org.apache.commons.lang3.StringUtils.isBlank(p.getContactMobile())) {
p.setContactMobile(PasswordUtil.decrypt(p.getContactMobile()));
}
});
} catch (Exception e) {
log.error("手机号解密异常！", e);
}
}
getMobile(pageList);
return AmountUtil.exportListXls(pageList,PayMailBill.class,"邮寄票据");
}else {
ArrayList<String> strings = new ArrayList<>(Arrays.asList(ids.split(",")));
@@ -370,17 +350,7 @@ public class PayMailBillController extends JeroController<PayMailBill, IPayMailB
List<PayMailBill> list = payMailBillService.listByIds(strings);
if (!CollectionUtils.isEmpty(list)) {
try {
list.forEach(p -> {
if (!org.apache.commons.lang3.StringUtils.isBlank(p.getContactMobile())) {
p.setContactMobile(PasswordUtil.decrypt(p.getContactMobile()));
}
});
} catch (Exception e) {
log.error("手机号解密异常！", e);
}
}
getMobile(list);
return AmountUtil.exportListXls(list,PayMailBill.class,"邮寄票据");
}
@@ -388,5 +358,19 @@ public class PayMailBillController extends JeroController<PayMailBill, IPayMailB
}
private void getMobile(List<PayMailBill> list) {
if (!CollectionUtils.isEmpty(list)) {
try {
list.forEach(p -> {
if (!org.apache.commons.lang3.StringUtils.isBlank(p.getContactMobile())) {
p.setContactMobile(PasswordUtil.decrypt(p.getContactMobile()));
}
});
} catch (Exception e) {
log.error("手机号解密异常！", e);
}
}
}
}