From 1d7a8b4a2e5898b9b090caade7f253478b459ee6 Mon Sep 17 00:00:00 2001 From: haozq <1611483981@qq.com> Date: Fri, 24 Jan 2025 09:33:40 +0800 Subject: [PATCH 1/3] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/mappers/business/backstage/CarTypeMapper.xml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/main/resources/mappers/business/backstage/CarTypeMapper.xml b/src/main/resources/mappers/business/backstage/CarTypeMapper.xml index 73fbcde..9326c81 100644 --- a/src/main/resources/mappers/business/backstage/CarTypeMapper.xml +++ b/src/main/resources/mappers/business/backstage/CarTypeMapper.xml @@ -11,13 +11,10 @@ #{creator},now(),#{updater},now()) - update car_ma_type set name=#{name} + update car_ma_type set name=#{name} ,remark=#{remark} ,unit_name=#{unit} - - ,remark=#{remark} - where id=#{id} From 4a7a6079f2bc3a0cc5991d190eb91940bcafe509 Mon Sep 17 00:00:00 2001 From: haozq <1611483981@qq.com> Date: Fri, 24 Jan 2025 10:04:52 +0800 Subject: [PATCH 2/3] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bonus/gzcar/business/backstage/mapper/CarSupMapper.java | 2 ++ .../gzcar/business/backstage/service/CarCarServiceImpl.java | 4 ---- .../gzcar/business/backstage/service/CarSupServiceImpl.java | 6 +++++- .../resources/mappers/business/backstage/CarSupMapper.xml | 5 +++++ 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/bonus/gzcar/business/backstage/mapper/CarSupMapper.java b/src/main/java/com/bonus/gzcar/business/backstage/mapper/CarSupMapper.java index 6c61e47..275cfca 100644 --- a/src/main/java/com/bonus/gzcar/business/backstage/mapper/CarSupMapper.java +++ b/src/main/java/com/bonus/gzcar/business/backstage/mapper/CarSupMapper.java @@ -85,4 +85,6 @@ public interface CarSupMapper { * @return */ List getContractSupList(CarSupVo data); + + int getUserBySup(CarSupVo data); } diff --git a/src/main/java/com/bonus/gzcar/business/backstage/service/CarCarServiceImpl.java b/src/main/java/com/bonus/gzcar/business/backstage/service/CarCarServiceImpl.java index 772d83c..ade6649 100644 --- a/src/main/java/com/bonus/gzcar/business/backstage/service/CarCarServiceImpl.java +++ b/src/main/java/com/bonus/gzcar/business/backstage/service/CarCarServiceImpl.java @@ -325,10 +325,6 @@ public class CarCarServiceImpl implements CarCarService { @Override public ServerResponse deleteCarData(CarCarVo data) { try{ - int nums=mapper.getUserBySup(data); - if(nums>0){ - return ServerResponse.createBySuccessMsg("供应商下存在车辆信息不允许删除!"); - } int num=mapper.deleteCarData(data); uploadService.deleteFileByTableId(data.getId(),"car_supplier_info"); if(num>0){ diff --git a/src/main/java/com/bonus/gzcar/business/backstage/service/CarSupServiceImpl.java b/src/main/java/com/bonus/gzcar/business/backstage/service/CarSupServiceImpl.java index d55b3fd..71d64e9 100644 --- a/src/main/java/com/bonus/gzcar/business/backstage/service/CarSupServiceImpl.java +++ b/src/main/java/com/bonus/gzcar/business/backstage/service/CarSupServiceImpl.java @@ -96,6 +96,10 @@ public class CarSupServiceImpl implements CarSupService{ @Override public ServerResponse deleteCarSup(CarSupVo data) { try{ + int nums=mapper.getUserBySup(data); + if(nums>0){ + return ServerResponse.createBySuccessMsg("供应商下存在车辆信息不允许删除!"); + } int num=mapper.deleteCarSup(data); if(num>0){ return ServerResponse.createSuccess("删除成功","删除成功"); @@ -103,7 +107,7 @@ public class CarSupServiceImpl implements CarSupService{ }catch (Exception e){ log.error(e.toString(),e); } - return ServerResponse.createErroe("修改失败"); + return ServerResponse.createErroe("删除失败"); } @Override diff --git a/src/main/resources/mappers/business/backstage/CarSupMapper.xml b/src/main/resources/mappers/business/backstage/CarSupMapper.xml index fef0519..61ccd67 100644 --- a/src/main/resources/mappers/business/backstage/CarSupMapper.xml +++ b/src/main/resources/mappers/business/backstage/CarSupMapper.xml @@ -90,4 +90,9 @@ and ccr.type=#{type} + \ No newline at end of file From 055d19668b4bffc5cacbbb38ded758a5097e90cf Mon Sep 17 00:00:00 2001 From: haozq <1611483981@qq.com> Date: Fri, 24 Jan 2025 16:40:44 +0800 Subject: [PATCH 3/3] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../backstage/service/CarSupServiceImpl.java | 2 +- .../mappers/business/app/AppMapper.xml | 2 +- .../backstage/CarStatisticsMapper.xml | 33 ++++++++++++------- .../backstage/SupDispatchCarMapper.xml | 5 ++- 4 files changed, 28 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/bonus/gzcar/business/backstage/service/CarSupServiceImpl.java b/src/main/java/com/bonus/gzcar/business/backstage/service/CarSupServiceImpl.java index 71d64e9..2bd8a10 100644 --- a/src/main/java/com/bonus/gzcar/business/backstage/service/CarSupServiceImpl.java +++ b/src/main/java/com/bonus/gzcar/business/backstage/service/CarSupServiceImpl.java @@ -98,7 +98,7 @@ public class CarSupServiceImpl implements CarSupService{ try{ int nums=mapper.getUserBySup(data); if(nums>0){ - return ServerResponse.createBySuccessMsg("供应商下存在车辆信息不允许删除!"); + return ServerResponse.createErroe("供应商下存在车辆信息不允许删除!"); } int num=mapper.deleteCarSup(data); if(num>0){ diff --git a/src/main/resources/mappers/business/app/AppMapper.xml b/src/main/resources/mappers/business/app/AppMapper.xml index 75685f2..34376ae 100644 --- a/src/main/resources/mappers/business/app/AppMapper.xml +++ b/src/main/resources/mappers/business/app/AppMapper.xml @@ -80,7 +80,7 @@ from car_plan_out_details cpod left join car_plan_out cpo on cpod.out_id=cpo.id left join car_supplier cs on cpod.sup_id=cs.id - left join car_plan_details cpd on cpd.apply_id=cpod.apply_id and cpd.model_id + left join car_plan_details cpd on cpd.apply_id=cpod.apply_id and cpd.model_id=cpod.model_id LEFT JOIN car_ma_type_info cmti on cmti.id=cpod.model_id left join car_plan_apply cpa on cpa.id =cpod.apply_id left join car_supplier_info csi on csi.id= cpod.car_id diff --git a/src/main/resources/mappers/business/backstage/CarStatisticsMapper.xml b/src/main/resources/mappers/business/backstage/CarStatisticsMapper.xml index 24958d4..ac2122a 100644 --- a/src/main/resources/mappers/business/backstage/CarStatisticsMapper.xml +++ b/src/main/resources/mappers/business/backstage/CarStatisticsMapper.xml @@ -82,21 +82,24 @@ left join car_slt_plan csp on csp.plan_id=cpas.apply_id left join bm_project pro on pro.bid_id=cpa.pro_id where cpa.status_type=1 - GROUP BY pro.bmname - ) info on pro.bmname=info.bmname - left join( - SELECT distinct pro_id - FROM car_plan_apply - WHERE status_type=1 - ) cp on cp.pro_id=pro.bid_id - where cp.pro_id is not null - - and DATE_FORMAT(cpa.create_time,'%Y')=YEAR(CURDATE()) - and DATE_FORMAT(cpa.create_time,'%Y-%m-%d') between DATE_FORMAT(#{startTime},'%Y-%m-%d') and DATE_FORMAT(#{endTime},'%Y-%m-%d') + GROUP BY pro.bmname + ) info on pro.bmname=info.bmname + left join( + SELECT distinct pro_id + FROM car_plan_apply cpa + WHERE status_type=1 + + and DATE_FORMAT(cpa.create_time,'%Y-%m-%d') + between DATE_FORMAT(#{startTime},'%Y-%m-%d') and DATE_FORMAT(#{endTime},'%Y-%m-%d') + + ) cp on cp.pro_id=pro.bid_id + where cp.pro_id is not null + + GROUP BY pro.bmname @@ -121,6 +124,10 @@ and pro.name like concat('%',#{proName},'%') + + and DATE_FORMAT(cpa.create_time,'%Y-%m-%d') + between DATE_FORMAT(#{startTime},'%Y-%m-%d') and DATE_FORMAT(#{endTime},'%Y-%m-%d') + GROUP BY cpa.pro_id diff --git a/src/main/resources/mappers/business/backstage/SupDispatchCarMapper.xml b/src/main/resources/mappers/business/backstage/SupDispatchCarMapper.xml index 1120c5f..610fd32 100644 --- a/src/main/resources/mappers/business/backstage/SupDispatchCarMapper.xml +++ b/src/main/resources/mappers/business/backstage/SupDispatchCarMapper.xml @@ -212,7 +212,10 @@ select distinct cpd.id, cpd.apply_id planId ,cpd.model_id modelId,cpd.need_day needDay,cpd.need_num needNum, cpd.remark,cpd.plan_type planType,cmti.type,cmti.name,cmti.model ,cmti.unit,cpas.sup_id supId, cct.is_out_set isOutSet,cct.is_driver_set isDriverSet,cpas.contract_id contractId, - cpod.car_num carNum,cpod.use_day planDay + cpod.car_num carNum,cpod.use_day planDay,cpod.car_id carId, + cpod.start_address startAddress, cpod.end_address endAddress, + cpod.jc_gls jcGls, cpod.gls, cpod.jc_price jcMoney, + cpod.dc_money dcMoney, cpod.dc_unit dcUnit from car_plan_out_details cpod left join car_plan_details cpd on cpod.apply_id=cpd.apply_id and cpd.model_id=cpod.model_id left join car_plan_apply_sup cpas on cpd.apply_id=cpas.apply_id