diff --git a/pom.xml b/pom.xml index af6f29f..3d33b09 100644 --- a/pom.xml +++ b/pom.xml @@ -346,6 +346,7 @@ + gz_car_info org.springframework.boot diff --git a/src/main/java/com/bonus/gzcar/business/backstage/mapper/SupDispatchCarMapper.java b/src/main/java/com/bonus/gzcar/business/backstage/mapper/SupDispatchCarMapper.java index 952ed79..20056d8 100644 --- a/src/main/java/com/bonus/gzcar/business/backstage/mapper/SupDispatchCarMapper.java +++ b/src/main/java/com/bonus/gzcar/business/backstage/mapper/SupDispatchCarMapper.java @@ -256,4 +256,29 @@ public interface SupDispatchCarMapper { * @return */ int updateOutFileStatus(String params); + + /** + * 查询派车记录信息 + * @return + */ + List getOutPlanList(); + + /** + * 查询派车详情 + * @param listVo + * @return + */ + List getOutDetailsList(CarPlanOutVo listVo); + + /** + * 修改派车金额 + * @param listVo + */ + void updateMoney(CarPlanOutVo listVo); + + /** + * 修改结算数据 + * @param vo + */ + void updatePlanOutDetails(CarSltApplyDetailsVo vo); } diff --git a/src/main/resources/mappers/business/backstage/SupDispatchCarMapper.xml b/src/main/resources/mappers/business/backstage/SupDispatchCarMapper.xml index 785ec06..4686da0 100644 --- a/src/main/resources/mappers/business/backstage/SupDispatchCarMapper.xml +++ b/src/main/resources/mappers/business/backstage/SupDispatchCarMapper.xml @@ -107,6 +107,17 @@ update car_plan_out set file_status=0 WHERE id= #{id} + + update car_plan_out set money=#{money} where id=#{id} + + + + update car_plan_out_details set remark=#{remark},es_cost=#{cost}, + day_or_m=#{isDayOrMonth},day_price=#{dayPrice},month_price=#{monthPrice}, + gls_price=#{glsPrice},price_id=#{priceId},gls_money=#{glsMoney}, + yg_money=#{cost} + where id=#{id} + delete @@ -155,7 +166,7 @@ cpa.need_time needTime, cpa.creator,DATE_FORMAT(cpa.create_time,'%Y-%m-%d') appLyTime,pro.name proName, bpt.`NAME` as proType, cpa.remark, cpa.updater, cpa.update_time updateTime,cpa.dispatch_day dispatchDay , if(cpa.type=1,'车辆','吊车') typeName ,cpas.sup_id supId ,cs.name supName, - need_num needNum, dispatch_num dispatchNum,need_num-dispatch_num-IFNULL(outData.num,0) noDispatchNum, + need_num needNum, dispatch_num dispatchNum,if(need_num-dispatch_num>0,need_num-dispatch_num,0) noDispatchNum, cpa.apply_type applyType, cpa.status_type statusType,cpa.user_name userName, if(cpa.dispatch_num>0,'已派车',if(cpa.dispatch_status=0,'待审核','待派车')) statusName, if(cpa.dispatch_status=0,'待审核', if(cpa.dispatch_status=5,'待派车',if(cpa.dispatch_status=2,'已通过','已驳回') ) ) auditStatus @@ -171,7 +182,7 @@ WHERE (`status` = 0 OR `status` = 1 ) GROUP BY apply_id ) outData on outData.apply_id=cpa.id - where cpa.status_type=1 + where cpa.status_type=1 AND cpas.apply_id is not null AND csu.user_id=#{userId} @@ -388,5 +399,19 @@ WHERE cpod.out_id = #{id} + + \ No newline at end of file