浏览代码

账单部分调整

xda 3 年之前
父节点
当前提交
4150a8288c
共有 1 个文件被更改,包括 9 次插入3 次删除
  1. 9 3
      src/main/java/com/winhc/repal/service/impl/RepalBillServiceImpl.java

+ 9 - 3
src/main/java/com/winhc/repal/service/impl/RepalBillServiceImpl.java

@@ -199,7 +199,9 @@ public class RepalBillServiceImpl extends ServiceImpl<RepalBillMapper, RepalBill
             RepalBillPageVO vo = new RepalBillPageVO();
             BeanUtils.copyProperties(repalBill, vo);
             vo.setRepalBillId(repalBill.getId());
-            vo.setResponsiblePersonNames(String.join("、", nameMap.get(repalBill.getId())));
+            if (nameMap.containsKey(repalBill.getId())) {
+                vo.setResponsiblePersonNames(String.join("、", nameMap.get(repalBill.getId())));
+            }
             vo.setRepalOverdueStatus(repalBill.getRepalBillStatus() > 1 ? repalBill.getRepalBillStatus() + 1 : repalBill.getRepalBillStatus());
             if (RepalBillStatusEnum.PROGRESSING.getCode().equals(vo.getRepalOverdueStatus()) && LocalDate.now().plusDays(3).equals(vo.getEndDate())) {
                 vo.setRepalOverdueStatus(2);
@@ -268,7 +270,9 @@ public class RepalBillServiceImpl extends ServiceImpl<RepalBillMapper, RepalBill
             RepalBillPageVO vo = new RepalBillPageVO();
             BeanUtils.copyProperties(repalBill, vo);
             vo.setRepalBillId(repalBill.getId());
-            vo.setResponsiblePersonNames(String.join("、", nameMap.get(repalBill.getId())));
+            if (nameMap.containsKey(repalBill.getId())) {
+                vo.setResponsiblePersonNames(String.join("、", nameMap.get(repalBill.getId())));
+            }
             vo.setRepalOverdueStatus(repalBill.getRepalBillStatus() > 1 ? repalBill.getRepalBillStatus() + 1 : repalBill.getRepalBillStatus());
             vo.setCustName(repalBill.getCustomerName());
             vo.setCustProperty(custMap.get(repalBill.getCustomerId()));
@@ -309,7 +313,9 @@ public class RepalBillServiceImpl extends ServiceImpl<RepalBillMapper, RepalBill
         vo.setCompanyId(repalCustomer.getCompanyId());
         vo.setCustProperty(repalCustomer.getCustProperty());
         List<String> nameList = repalResponsiblePersonService.getResponsiblePersonName(vo.getRepalBillId());
-        vo.setResponsiblePersonNames(CollUtil.isEmpty(nameList) ? "" : String.join("、", nameList));
+        if (CollUtil.isNotEmpty(nameList)) {
+            vo.setResponsiblePersonNames(CollUtil.isEmpty(nameList) ? "" : String.join("、", nameList));
+        }
         vo.setTotalMoneyStr(repalBill.getTotalMoney().stripTrailingZeros().toPlainString());
         vo.setReceiptStr(repalBill.getReceipt().stripTrailingZeros().toPlainString());
         vo.setReceivableStr(repalBill.getReceivable().stripTrailingZeros().toPlainString());