xda 2 лет назад
Родитель
Сommit
9ec788ac6d

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

@@ -426,14 +426,15 @@ public class RepalBillServiceImpl extends ServiceImpl<RepalBillMapper, RepalBill
                 billMoneyChange.setName(t.getOperUserName());
                 billMoneyChange.setChangeAmt(t.getTransMoney().setScale(2).toString());
                 billMoneyChange.setRepalChangeRecordId(t.getId());
-                StringBuilder desc = new StringBuilder(t.getOperUserName());
+                StringBuilder desc = new StringBuilder();
                 String repalBillTypeDesc = RepalBillTypeEnum.RECEIVABLE.getCode().equals(repalBill.getRepalBillType()) ? "回" : "付";
                 if (DeletedStatusEnum.NORMAL.getCode().equals(t.getDeleted())) {
                     desc.append(Objects.isNull(t.getTimeModified()) ? "增加" : "编辑").append(repalBillTypeDesc);
                 } else {
                     desc.append("删除").append(repalBillTypeDesc);
+                    billMoneyChange.setRepalChangeRecordId(null);
                 }
-                billMoneyChange.setOperTypeDesc(desc.toString());
+                billMoneyChange.setOperTypeDesc(desc.append("款").toString());
                 return billMoneyChange;
             }).collect(Collectors.toList()));
         } else {

+ 4 - 3
src/main/java/com/winhc/repal/service/impl/RepalCustomerServiceImpl.java

@@ -485,8 +485,8 @@ public class RepalCustomerServiceImpl extends ServiceImpl<RepalCustomerMapper, R
                     billMoneyChange.setName(t.getOperUserName());
                     billMoneyChange.setChangeAmt(t.getTransMoney().setScale(2).toString());
                     billMoneyChange.setRepalChangeRecordId(t.getId());
-                    StringBuilder desc = new StringBuilder(t.getOperUserName());
-                    String repalBillTypeDesc = "";
+                    StringBuilder desc = new StringBuilder();
+                    String repalBillTypeDesc;
                     if (repalBillTypeMap.containsKey(t.getRepalBillId())) {
                         repalBillTypeDesc = RepalBillTypeEnum.RECEIVABLE.getCode().equals(repalBillTypeMap.get(t.getRepalBillId())) ? "回" : "付";
                     } else {
@@ -497,8 +497,9 @@ public class RepalCustomerServiceImpl extends ServiceImpl<RepalCustomerMapper, R
                         desc.append(Objects.isNull(t.getTimeModified()) ? "增加" : "编辑").append(repalBillTypeDesc);
                     } else {
                         desc.append("删除").append(repalBillTypeDesc);
+                        billMoneyChange.setRepalChangeRecordId(null);
                     }
-                    billMoneyChange.setOperTypeDesc(desc.toString());
+                    billMoneyChange.setOperTypeDesc(desc.append("款").toString());
                     return billMoneyChange;
                 }).collect(Collectors.toList()));
             }