diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/money/controller/MoneyChangeDetailController.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/money/controller/MoneyChangeDetailController.java index 933b6c0..d099cc7 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/money/controller/MoneyChangeDetailController.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/money/controller/MoneyChangeDetailController.java @@ -16,6 +16,7 @@ import java.util.List; /** * 资金明细 + * @author ljw */ @Slf4j @RestController diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/money/pojo/entity/MoneyChangeDetailEntity.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/money/pojo/entity/MoneyChangeDetailEntity.java index 9cf4510..fb2873c 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/money/pojo/entity/MoneyChangeDetailEntity.java +++ b/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; + /** * 开始时间(用于时间范围查询) */ diff --git a/njzscloud-svr/src/main/resources/mapper/money/MoneyChangeDetailMapper.xml b/njzscloud-svr/src/main/resources/mapper/money/MoneyChangeDetailMapper.xml index 8aef7a3..1a2fb34 100644 --- a/njzscloud-svr/src/main/resources/mapper/money/MoneyChangeDetailMapper.xml +++ b/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 AND (u.nickname LIKE CONCAT('%', #{entity.nickname}, '%') or @@ -38,6 +40,12 @@ AND mcd.money_change_category = #{entity.moneyChangeCategory} + + AND bt.license_plate LIKE CONCAT('%', #{entity.licensePlate}, '%') + + + AND oi.sn LIKE CONCAT('%', #{entity.sn}, '%') + ORDER BY mcd.modify_time DESC @@ -92,4 +100,4 @@ ORDER BY mcd.create_time DESC - \ No newline at end of file +