财务实收款排序和条件查询

dao/src/main/resources/mapper/FinanceRealFundMapper.xml

@@ -46,6 +46,9 @@
                 LEFT JOIN ( SELECT real_fund_id, sum(ifnull(claim_amount,0)) ca FROM finance_claim WHERE deleted = 0 GROUP BY real_fund_id ) t ON t.real_fund_id = frf.id
         WHERE
             frf.deleted = 0
+        <if test="vo!=null and vo.notFinished">
+            and  ifnull(t.ca,0) &lt; frf.amount
+        </if>
         <if test="keyword!=null and keyword!='' ">
             and (
             frf.payer like concat ('%',#{keyword},'%')
@@ -69,7 +72,7 @@
             and frf.created &lt;= #{vo.xEndDate}
         </if>
         ORDER BY
-            frf.created DESC
+        ifnull(t.ca,0) ASC ,frf.created DESC
     </select>
 
     <select id="getNotClaimAmount" parameterType="java.lang.Long" resultType="java.math.BigDecimal">

domain/src/main/java/com/dayou/entity/FinanceRealFund.java

@@ -94,5 +94,7 @@ public class FinanceRealFund extends BaseEntity {
     private String xStartDate;
     @TableField(exist = false)
     private String xEndDate;
+    @TableField(exist = false)
+    private Boolean notFinished;
 
 }