diff --git a/src/main/java/com/bonus/gzcar/business/backstage/controller/SupDispatchCarController.java b/src/main/java/com/bonus/gzcar/business/backstage/controller/SupDispatchCarController.java index b8cd5a1..366f747 100644 --- a/src/main/java/com/bonus/gzcar/business/backstage/controller/SupDispatchCarController.java +++ b/src/main/java/com/bonus/gzcar/business/backstage/controller/SupDispatchCarController.java @@ -150,7 +150,7 @@ public class SupDispatchCarController { * @return */ @GetMapping("getOutPageList") - @DecryptAndVerify(decryptedClass = CarPlanOutVo.class) + @DecryptAndVerify(decryptedClass = CarNeedPlanVo.class) public PageInfo getOutPageList(EncryptedReq dto) { String userId= Objects.requireNonNull(UserUtil.getLoginUser()).getUserId().toString(); dto.getData().setCreator(userId);dto.getData().setUserId(userId); diff --git a/src/main/resources/mappers/business/backstage/CarStatisticsMapper.xml b/src/main/resources/mappers/business/backstage/CarStatisticsMapper.xml index c7b68b3..a24141d 100644 --- a/src/main/resources/mappers/business/backstage/CarStatisticsMapper.xml +++ b/src/main/resources/mappers/business/backstage/CarStatisticsMapper.xml @@ -8,7 +8,11 @@ if(csp.id is null,'未付','已付') status,pro.name proName ,cs.name supName ,cpo.type, sum(cpo.money)-sum(IFNULL(csp.money,0)) noPayMoney,cpo.manager ,cpo.create_time jbTime ,csa.create_time fkTime from car_plan_out cpo - left join car_slt_plan csp on csp.plan_id=cpo.apply_id + LEFT JOIN ( + SELECT sum(money) money,csd.out_id id,csd.slt_id + from car_slt_details csd + GROUP BY csd.out_id + ) csp on csp.id=cpo.id left join car_slt_apply csa on csa.id=csp.slt_id left join car_plan_apply cpa on cpo.apply_id=cpa.id LEFT JOIN car_supplier cs on cpo.sup_id=cs.id @@ -60,14 +64,19 @@