资金明细表单增加车牌号，查询条件增加订单号及车牌号查询

njzscloud-svr/src/main/java/com/njzscloud/supervisory/money/controller/MoneyChangeDetailController.java

@@ -16,6 +16,7 @@ import java.util.List;
 
 /**
  * 资金明细
+ * @author ljw
  */
 @Slf4j
 @RestController

njzscloud-svr/src/main/java/com/njzscloud/supervisory/money/pojo/entity/MoneyChangeDetailEntity.java

@@ -12,6 +12,7 @@ import java.time.LocalDateTime;
 
 /**
  * 资金变动明细
+ * @author ljw
  */
 @Getter
 @Setter
@@ -112,6 +113,9 @@ public class MoneyChangeDetailEntity {
     @TableField(exist = false)
     private String sn;
 
+    @TableField(exist = false)
+    private String licensePlate;
+
     /**
      * 开始时间（用于时间范围查询）
      */

njzscloud-svr/src/main/resources/mapper/money/MoneyChangeDetailMapper.xml

@@ -21,6 +21,7 @@
         mcd.modify_time,
         mcd.deleted,
         oi.sn,
+        bt.license_plate,
         CASE
         WHEN mcd.user_id IS NOT NULL THEN u.nickname
         WHEN mcd.company_id IS NOT NULL THEN bc.company_name
@@ -30,6 +31,7 @@
         LEFT JOIN sys_user u ON mcd.user_id = u.id
         LEFT JOIN biz_company bc ON mcd.company_id = bc.id
         LEFT JOIN order_info oi on oi.id = mcd.order_id
+        LEFT JOIN biz_truck bt ON bt.id = oi.truck_id
         <where>
             <if test="entity.nickname != null and entity.nickname != ''">
                 AND (u.nickname LIKE CONCAT('%', #{entity.nickname}, '%') or
@@ -38,6 +40,12 @@
             <if test="entity.moneyChangeCategory != null">
                 AND mcd.money_change_category = #{entity.moneyChangeCategory}
             </if>
+            <if test="entity.licensePlate != null">
+                AND bt.license_plate LIKE CONCAT('%', #{entity.licensePlate}, '%')
+            </if>
+            <if test="entity.sn != null">
+                AND oi.sn LIKE CONCAT('%', #{entity.sn}, '%')
+            </if>
         </where>
         ORDER BY mcd.modify_time DESC
     </select>
@@ -92,4 +100,4 @@
         ORDER BY
         mcd.create_time DESC
     </select>
-</mapper>
+</mapper>