diff --git a/src/main/java/com/bonus/gzcar/business/backstage/controller/CarBalanceController.java b/src/main/java/com/bonus/gzcar/business/backstage/controller/CarBalanceController.java index f7aa630..1daaf29 100644 --- a/src/main/java/com/bonus/gzcar/business/backstage/controller/CarBalanceController.java +++ b/src/main/java/com/bonus/gzcar/business/backstage/controller/CarBalanceController.java @@ -74,7 +74,6 @@ public class CarBalanceController { public PageInfo getPayCarPlanList(EncryptedReq dto) { PageHelper.startPage(dto.getPageNum(), dto.getPageSize()); List list = service.getPayCarPlanList(dto.getData()); - ; return new PageInfo<>(list); } diff --git a/src/main/resources/mappers/business/backstage/CarBalanceMapper.xml b/src/main/resources/mappers/business/backstage/CarBalanceMapper.xml index d365694..2b3d471 100644 --- a/src/main/resources/mappers/business/backstage/CarBalanceMapper.xml +++ b/src/main/resources/mappers/business/backstage/CarBalanceMapper.xml @@ -39,9 +39,12 @@ select cpa.id,cpa.`code`,cpa.pro_id proId,pro.`name` proName ,cpa.dispatch_num dispatchNum, - cpa.need_num needNum ,cpa.type ,cs.`name` supName ,sum(cpo.money) money,cpa.remark, + cpa.need_num needNum ,cpa.type ,cs.`name` supName , + CAST(SUM(IFNULL(CAST(cpo.money AS DECIMAL(18,2)), 0)) AS DECIMAL(18,2)) money, + cpa.remark, cpa.dispatch_day lastDay,cpa.user_name userName FROM car_plan_apply cpa LEFT JOIN car_slt_plan csp on csp.plan_id=cpa.id - left join car_plan_out cpo on cpa.id=cpo.apply_id AND cpo.status=1 + left join car_plan_out cpo on cpa.id=cpo.apply_id AND cpo.status=2 left join car_plan_apply_sup cpas on cpas.apply_id=cpa.id left join car_supplier cs on cpas.sup_id=cs.id left join bm_project pro on pro.id=cpa.pro_id @@ -121,7 +126,7 @@ left join car_plan_apply cpa on cpo.apply_id=cpa.id LEFT JOIN car_supplier cs on cpo.sup_id=cs.id left join bm_project pro on pro.id=cpa.pro_id - where cpo.sup_id=#{supId} and cpo.status=1 + where cpo.sup_id=#{supId} and cpo.status=2 and ( cpa.`code` like concat('%',#{keyWord},'%') or @@ -164,7 +169,7 @@ diff --git a/src/main/resources/mappers/business/backstage/CarStatisticsMapper.xml b/src/main/resources/mappers/business/backstage/CarStatisticsMapper.xml index 474cf2d..6fcf411 100644 --- a/src/main/resources/mappers/business/backstage/CarStatisticsMapper.xml +++ b/src/main/resources/mappers/business/backstage/CarStatisticsMapper.xml @@ -4,38 +4,59 @@ SELECT IFNULL(SUM(money),0) money FROM car_plan_out - where status=1 + where status=2 UNION all SELECT IFNULL(SUM(money),0) FROM car_slt_plan csp select pu.id,pu.`LOGIN_NAME` title,pu.`NAME` as nikeName,concat('org-', pu.COMPANY_ID) parentId from car_supplier_user csu - left join pm_user pu on csu.user_id=.pu.id + left join pm_user pu on csu.user_id=pu.id where pu.IS_ACTIVE=1 and csu.sup_id=#{supId} diff --git a/src/main/resources/mappers/business/backstage/DispatchCarMapper.xml b/src/main/resources/mappers/business/backstage/DispatchCarMapper.xml index aaa13ee..14b1979 100644 --- a/src/main/resources/mappers/business/backstage/DispatchCarMapper.xml +++ b/src/main/resources/mappers/business/backstage/DispatchCarMapper.xml @@ -121,7 +121,7 @@