Просмотр исходного кода

修改bug:
平台应收 筛选未结算时,未结算金额是0的没有显示;选全部结算时,显示空白

jiakai 2 месяцев назад
Родитель
Сommit
f805dfdbc3

+ 13 - 0
commons/src/main/java/com/jzg/commons/entity/finance/vo/PlatformCompanyFeeVO.java

@@ -1,4 +1,17 @@
 package com.jzg.commons.entity.finance.vo;
 
+import lombok.Data;
+
 public class PlatformCompanyFeeVO extends FollowCompanyFeeVO{
+
+    // 结算状态
+    private String status;
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
 }

+ 10 - 0
tenant/organization/src/main/java/com/jzg/organization/service/impl/ReceivableServiceImpl.java

@@ -1109,6 +1109,16 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
             //platformCompanyFeeVo.setTotalUnSettlementAmount(BigDecimalUtil.subtract(BigDecimalUtil.subtract(platformCompanyFeeVo.getTotalReceivable(),platformCompanyFeeVo.getTotalSettlementAmount()), platformCompanyFeeVo.getTotalPaymentDifference()));
             platformCompanyFeeVo.setTotalUnSettlementAmount(BigDecimalUtil.subtract(platformCompanyFeeVo.getTotalReceivable(),platformCompanyFeeVo.getTotalSettlementAmount()));
         }
+        if (StrUtil.isNotBlank(settlementReportQueryVo.getStatus())){
+            if ("1".equals(settlementReportQueryVo.getStatus())){
+                // 过滤结算状态
+                platformCompanyFeeVos = platformCompanyFeeVos.stream().filter(plat -> null != plat.getTotalSettlementAmount() && BigDecimal.ZERO.compareTo(plat.getTotalSettlementAmount()) != 0).toList();
+            }else if ("0".equals(settlementReportQueryVo.getStatus())){
+                // 过滤结算状态
+                platformCompanyFeeVos = platformCompanyFeeVos.stream().filter(plat -> null == plat.getTotalSettlementAmount() || BigDecimal.ZERO.compareTo(plat.getTotalSettlementAmount()) == 0).toList();
+            }
+        }
+
         return platformCompanyFeeVos;
     }
 

+ 1 - 5
tenant/organization/src/main/resources/mapper/ReceivableMapper.xml

@@ -2115,11 +2115,7 @@
             </if>
             -- 跟单订单创建时间范围
             <if test="query.startTime != null and query.startTime != '' and query.endTime != null and query.endTime != ''">
-                AND ipii.create_time BETWEEN #{query.startTime} AND #{query.endTime}
-            </if>
-            -- 发票状态筛选
-            <if test="query.status != null">
-                AND ipii.status = #{query.status}
+                AND ipi.create_time BETWEEN #{query.startTime} AND #{query.endTime}
             </if>
             -- 开票时间范围
             <if test="query.invoiceStartTime != null and query.invoiceStartTime != '' and query.invoiceEndTime != null and query.invoiceEndTime != ''">