账单部分调整

src/main/java/com/winhc/repal/service/impl/RepalBillServiceImpl.java

@@ -148,6 +148,7 @@ public class RepalBillServiceImpl extends ServiceImpl<RepalBillMapper, RepalBill
         BeanUtils.copyProperties(dto, billPageBO);
         billPageBO.setUserId(userId);
         billPageBO.setAllFlag(allFlag);
+        billPageBO.setRepalGroupId(groupId);
         // 对应1-4到期时间
         if (Objects.nonNull(dto.getOverdueType())) {
             switch (dto.getOverdueType()) {
@@ -419,7 +420,7 @@ public class RepalBillServiceImpl extends ServiceImpl<RepalBillMapper, RepalBill
         RepalChangeRecord changeRecord = new RepalChangeRecord();
         changeRecord.setRepalBookId(repalBill.getRepalBookId());
         changeRecord.setRepalBillId(repalBill.getId());
-        changeRecord.setAfterMoney(repalBill.getTotalMoney().subtract(repalBill.getReceipt()));
+        changeRecord.setAfterMoney(repalBill.getReceivable().subtract(dto.getMoney()));
         changeRecord.setPreMoney(repalBill.getReceivable());
         changeRecord.setTransMoney(dto.getMoney());
         changeRecord.setOperUserId(userId);

src/main/resources/mapper/RepalBillMapper.xml

@@ -114,11 +114,8 @@
     <select id="getTotalMoneyByGroup" resultType="com.winhc.repal.model.bo.TotalMoneyBO">
         SELECT COUNT(*) AS totalCount, IFNULL(SUM(RECEIVABLE),0) AS totalMoney FROM REPAL_BILL
         WHERE REPAL_GROUP_ID = #{repalGroupId}
-        <if test="repalBillStatus == 1">
-            AND REPAL_BILL_STATUS = 1
-        </if>
-        <if test="repalBillStatus == 2">
-            AND REPAL_BILL_STATUS IN (1,2)
+        <if test="repalBillStatus != null">
+            AND REPAL_BILL_STATUS = #{repalBillStatus}
         </if>
         AND REPAL_BILL_TYPE = #{repalGroupType}
         AND REPAL_BOOK_ID = #{repalBookId}
@@ -128,11 +125,8 @@
         SELECT COUNT(*) AS totalCount, IFNULL(SUM(bill.RECEIVABLE), 0) AS totalMoney  FROM REPAL_RESPONSIBLE_PERSON AS person
         LEFT JOIN REPAL_BILL AS bill ON person.REPAL_BILL_ID = bill.ID
         WHERE person.USER_ID = #{userId} AND person.DELETED = 0
-        <if test="repalBillStatus == 1">
-            AND bill.REPAL_BILL_STATUS = 1
-        </if>
-        <if test="repalBillStatus == 2">
-            AND bill.REPAL_BILL_STATUS IN (1,2)
+        <if test="repalBillStatus != null">
+            AND bill.REPAL_BILL_STATUS = #{repalBillStatus}
         </if>
         AND bill.REPAL_GROUP_ID = #{repalGroupId}
         AND bill.REPAL_BOOK_ID = #{repalBookId}