1

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/RepaymentInfo.java

@@ -48,11 +48,11 @@ public class RepaymentInfo extends BaseModel<RepaymentInfo> {
      */
     private String freightId;
     /**
-     * 运费
+     * 运费（垫付金额）元
      */
     private Double freight;
     /**
-     * 超期费
+     * 超期费（元）
      */
     private Double overdueFee;
     /**
@@ -60,19 +60,19 @@ public class RepaymentInfo extends BaseModel<RepaymentInfo> {
      */
     private Double interestRate;
     /**
-     * 工本费
+     * 工本费（元）
      */
     private Double serviceCharge;
     /**
-     * 合计应还
+     * 合计应还（元）
      */
     private Double totalRepayable;
     /**
-     * 已还
+     * 已还（元）
      */
     private Double alreadyRepaid;
     /**
-     * 未还
+     * 未还（元）
      */
     private Double notRepaid;
     /**

winsea-haixin-plugin-wangluohuoyun/src/main/resources/mapper/RepaymentInfoMapper.xml

@@ -25,11 +25,11 @@
             </if>
         </if>
         <if test="startDate != null and startDate != ''">
-            AND (DATE_FORMAT(r.repayment_date,"%Y%m%d") >=
+            AND (DATE_FORMAT(o.create_date,"%Y%m%d") >=
             DATE_FORMAT(#{startDate},"%Y%m%d"))
         </if>
         <if test="endDate != null and endDate != ''">
-            AND (DATE_FORMAT(r.repayment_date,"%Y%m%d") &lt;=
+            AND (DATE_FORMAT(o.create_date,"%Y%m%d") &lt;=
             DATE_FORMAT(#{endDate},"%Y%m%d"))
         </if>
     </select>
@@ -74,14 +74,14 @@
             </if>
         </if>
         <if test="startDate != null and startDate != ''">
-            AND (DATE_FORMAT(r.repayment_date,"%Y%m%d") >=
+            AND (DATE_FORMAT(o.create_date,"%Y%m%d") >=
             DATE_FORMAT(#{startDate},"%Y%m%d"))
         </if>
         <if test="endDate != null and endDate != ''">
-            AND (DATE_FORMAT(r.repayment_date,"%Y%m%d") &lt;=
+            AND (DATE_FORMAT(o.create_date,"%Y%m%d") &lt;=
             DATE_FORMAT(#{endDate},"%Y%m%d"))
         </if>
-        ORDER BY r.status_key ASC,r.repayment_date DESC
+        ORDER BY r.status_key ASC,r.create_date DESC
         <if test="currentPage != null and currentPage != ''">
             LIMIT ${startRecord}, ${pageSize}
         </if>