From e8b1bb6ea745ada4b4e14ffde4fa82df02e4e406 Mon Sep 17 00:00:00 2001 From: haozq <1611483981@qq.com> Date: Tue, 21 Jan 2025 18:43:26 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E7=8A=B6=E6=80=81=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../business/backstage/mapper/DispatchCarMapper.java | 2 +- .../backstage/service/DispatchCarServiceImpl.java | 10 +++++----- .../backstage/service/SupDispatchCarServiceImpl.java | 10 ++++------ .../business/backstage/SupDispatchCarMapper.xml | 6 +++--- 4 files changed, 13 insertions(+), 15 deletions(-) diff --git a/src/main/java/com/bonus/gzcar/business/backstage/mapper/DispatchCarMapper.java b/src/main/java/com/bonus/gzcar/business/backstage/mapper/DispatchCarMapper.java index 17ce6d8..d74a36d 100644 --- a/src/main/java/com/bonus/gzcar/business/backstage/mapper/DispatchCarMapper.java +++ b/src/main/java/com/bonus/gzcar/business/backstage/mapper/DispatchCarMapper.java @@ -99,7 +99,7 @@ public interface DispatchCarMapper { */ void updateCarPlanInfo(CarNeedPlanVo carNeedPlanVo); - void updatePlanInfo(CarPlanOutVo data); + void updatePlanInfo(CarNeedPlanVo data); /** * 查询批次修改记录数据 diff --git a/src/main/java/com/bonus/gzcar/business/backstage/service/DispatchCarServiceImpl.java b/src/main/java/com/bonus/gzcar/business/backstage/service/DispatchCarServiceImpl.java index 413050e..c7932dc 100644 --- a/src/main/java/com/bonus/gzcar/business/backstage/service/DispatchCarServiceImpl.java +++ b/src/main/java/com/bonus/gzcar/business/backstage/service/DispatchCarServiceImpl.java @@ -236,12 +236,12 @@ public class DispatchCarServiceImpl implements DispatchCarService{ if(num>0){ List list=mapper.getAuditList(data); if(ListHelpUtil.isEmpty(list)){ - carNeedPlanVo.setStatus(3); + carNeedPlanVo.setStatus(2); }else{ - carNeedPlanVo.setStatus(1); + carNeedPlanVo.setStatus(0); } //更新计划状态 - mapper.updatePlanInfo(data); + mapper.updatePlanInfo(carNeedPlanVo); } }else{ int num= mapper.updateDispatchData(data); @@ -251,9 +251,9 @@ public class DispatchCarServiceImpl implements DispatchCarService{ carNeedPlanVo.setDispatchDay(DateTimeHelper.getNowDay()); carNeedPlanVo.setDispatchNum(dispatchNum+vo.getDispatchNum()); if(ListHelpUtil.isEmpty(list)){ - carNeedPlanVo.setStatus(2); - }else{ carNeedPlanVo.setStatus(1); + }else{ + carNeedPlanVo.setStatus(2); } //更新计划信息 mapper.updateCarPlanInfo(carNeedPlanVo); diff --git a/src/main/java/com/bonus/gzcar/business/backstage/service/SupDispatchCarServiceImpl.java b/src/main/java/com/bonus/gzcar/business/backstage/service/SupDispatchCarServiceImpl.java index 39e5783..e415366 100644 --- a/src/main/java/com/bonus/gzcar/business/backstage/service/SupDispatchCarServiceImpl.java +++ b/src/main/java/com/bonus/gzcar/business/backstage/service/SupDispatchCarServiceImpl.java @@ -104,12 +104,6 @@ public class SupDispatchCarServiceImpl implements SupDispatchCarService{ fileMaps.put(key,fileList); } } - - - - - - outVo.setCreator(userId); outVo.setUpdater(userId); int planType=outVo.getPlanType(); @@ -233,6 +227,10 @@ public class SupDispatchCarServiceImpl implements SupDispatchCarService{ } outVo.setDispatchNum(detailsVoList.size()); int num=mapper.updateDispatchCarData(outVo); + if(StringHelper.isNotEmpty(outVo.getStatus())){ + mapper.updatePlanInfo(outVo); + } + if(num>0){ if(StringHelper.isNotEmpty(outVo.getDelFileId())){ uploadService.deleteFile(outVo.getDelFileId()); diff --git a/src/main/resources/mappers/business/backstage/SupDispatchCarMapper.xml b/src/main/resources/mappers/business/backstage/SupDispatchCarMapper.xml index 7cf9692..f57efbb 100644 --- a/src/main/resources/mappers/business/backstage/SupDispatchCarMapper.xml +++ b/src/main/resources/mappers/business/backstage/SupDispatchCarMapper.xml @@ -47,7 +47,7 @@ update car_plan_apply set dispatch_status=0 - WHERE id=#{planId} + WHERE id=#{planId} @@ -98,7 +98,7 @@ need_num needNum, dispatch_num dispatchNum,need_num-dispatch_num-IFNULL(outData.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 + if(cpa.dispatch_status=0,'待审核', if(cpa.dispatch_status=5,'待派车',if(cpa.dispatch_status=1,'已驳回','已驳回') ) ) auditStatus from car_plan_apply cpa left join bm_project pro on pro.bid_id=cpa.pro_id left join car_plan_apply_sup cpas on cpa.id=cpas.apply_id @@ -120,7 +120,7 @@ cpa.remark like concat('%',#{keyWord},'%') or if(cpa.type=1,'车辆','吊车') like concat('%',#{keyWord},'%') or if(cpa.dispatch_num>0,'已派车',if(cpa.dispatch_status=0,'待审核','待派车')) like concat('%',#{keyWord},'%') or - if(cpa.dispatch_status=0,'待审核', if(cpa.dispatch_status=5,'待派车',if(cpa.dispatch_status=2,'已通过','已驳回') ) ) like concat('%',#{keyWord},'%') + if(cpa.dispatch_status=0,'待审核', if(cpa.dispatch_status=5,'待派车',if(cpa.dispatch_status=1,'已通过','已驳回') ) ) like concat('%',#{keyWord},'%') )