From e3154dfe0fe80687e6ecdd8243a193cbfac2f6b3 Mon Sep 17 00:00:00 2001 From: hayu <1604366271@qq.com> Date: Wed, 14 May 2025 14:34:04 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=B7=A5=E7=A8=8B=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=BE=85=E5=88=86=E9=85=8D=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=202=E3=80=81=E8=BD=A6=E8=BE=86=EF=BC=8C=E9=A9=BE=E9=A9=B6?= =?UTF-8?q?=E5=91=98=E6=96=B0=E5=A2=9E=E7=99=BD=E5=90=8D=E5=8D=95=203?= =?UTF-8?q?=E3=80=81=E6=95=B0=E6=8D=AE=E5=BA=93=EF=BC=9A=E8=A1=A8car=5Fdri?= =?UTF-8?q?ver=5Finfo=E5=A2=9E=E5=8A=A0is=5Fwhite=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=EF=BC=8C=E8=A1=A8car=5Fsupplier=5Finfo=E5=A2=9E=E5=8A=A0is=5Fw?= =?UTF-8?q?hite=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/CarCarController.java | 5 ++++ .../controller/CarDriverController.java | 5 ++++ .../business/backstage/entity/CarCarVo.java | 11 +++++++++ .../backstage/entity/CarDriverVo.java | 13 ++++++++++ .../business/backstage/CarCarMapper.xml | 10 ++++---- .../business/backstage/CarDriverMapper.xml | 10 ++++---- .../business/backstage/HomeIndexMapper.xml | 24 ++++++++++++------- 7 files changed, 60 insertions(+), 18 deletions(-) diff --git a/src/main/java/com/bonus/gzcar/business/backstage/controller/CarCarController.java b/src/main/java/com/bonus/gzcar/business/backstage/controller/CarCarController.java index 2488495..9b04fb0 100644 --- a/src/main/java/com/bonus/gzcar/business/backstage/controller/CarCarController.java +++ b/src/main/java/com/bonus/gzcar/business/backstage/controller/CarCarController.java @@ -64,6 +64,11 @@ public class CarCarController { List list = service.getCarPageList(dto); final int[] num = {1}; list.forEach(vo->{ + if (vo.getIsWhiteList()==1){ + vo.setIsWhiteStr("是"); + } else { + vo.setIsWhiteStr("否"); + } vo.setXh(num[0]); num[0]++; }); diff --git a/src/main/java/com/bonus/gzcar/business/backstage/controller/CarDriverController.java b/src/main/java/com/bonus/gzcar/business/backstage/controller/CarDriverController.java index 4a3d984..10459dd 100644 --- a/src/main/java/com/bonus/gzcar/business/backstage/controller/CarDriverController.java +++ b/src/main/java/com/bonus/gzcar/business/backstage/controller/CarDriverController.java @@ -63,6 +63,11 @@ public class CarDriverController { List list = service.getDriverPageList(dto); final int[] num = {1}; list.forEach(vo->{ + if (vo.getIsWhiteList()==1){ + vo.setIsWhiteStr("是"); + } else { + vo.setIsWhiteStr("否"); + } vo.setXh(num[0]); num[0]++; }); diff --git a/src/main/java/com/bonus/gzcar/business/backstage/entity/CarCarVo.java b/src/main/java/com/bonus/gzcar/business/backstage/entity/CarCarVo.java index fe4c060..8528091 100644 --- a/src/main/java/com/bonus/gzcar/business/backstage/entity/CarCarVo.java +++ b/src/main/java/com/bonus/gzcar/business/backstage/entity/CarCarVo.java @@ -77,6 +77,17 @@ public class CarCarVo extends ParentVo { @Excel(name = "行驶证", width = 10.0, orderNum = "7") private int xszNum; + /** + * 是否为白名单 + */ + private int isWhiteList; + + /** + * 是否为白名单 + */ + @Excel(name = "是否为白名单", width = 10.0, orderNum = "10") + private String isWhiteStr; + /** * 图片类型 */ diff --git a/src/main/java/com/bonus/gzcar/business/backstage/entity/CarDriverVo.java b/src/main/java/com/bonus/gzcar/business/backstage/entity/CarDriverVo.java index 6c48ce4..c8dec8f 100644 --- a/src/main/java/com/bonus/gzcar/business/backstage/entity/CarDriverVo.java +++ b/src/main/java/com/bonus/gzcar/business/backstage/entity/CarDriverVo.java @@ -42,6 +42,18 @@ public class CarDriverVo extends ParentVo { */ @Excel(name = "其他操作证", width = 10.0, orderNum = "5") private int otherNum; + + /** + * 是否为白名单 + */ + private int isWhiteList; + + /** + * 是否为白名单 + */ + @Excel(name = "是否为白名单", width = 10.0, orderNum = "7") + private String isWhiteStr; + /** * 图片类型 */ @@ -54,4 +66,5 @@ public class CarDriverVo extends ParentVo { * 删除的文件类型 */ private String delTypes; + } diff --git a/src/main/resources/mappers/business/backstage/CarCarMapper.xml b/src/main/resources/mappers/business/backstage/CarCarMapper.xml index 3586f27..d974233 100644 --- a/src/main/resources/mappers/business/backstage/CarCarMapper.xml +++ b/src/main/resources/mappers/business/backstage/CarCarMapper.xml @@ -5,14 +5,14 @@ insert into car_supplier_info( car_num, brand, type, ton, xy_num, bx_num, xsz_num, bx_date, - sup_id, creator, create_time, updator, update_time, is_active + sup_id, creator, create_time, updator, update_time,is_white, is_active )values (#{carNum},#{brand},#{type},#{ton},#{xyNum},#{bxNum},#{xszNum},#{bxDay},#{supId}, - #{creator},now(),#{updater},now(),1) + #{creator},now(),#{updater},now(),#{isWhiteList},1) update car_supplier_info set car_num=#{carNum}, brand=#{brand}, type=#{type}, ton=#{ton}, bx_date=#{bxDay}, - sup_id=#{supId}, updator=#{updater}, update_time=now(),xy_num=#{xyNum},bx_num=#{bxNum},xsz_num=#{xszNum} + sup_id=#{supId}, updator=#{updater}, update_time=now(),xy_num=#{xyNum},bx_num=#{bxNum},xsz_num=#{xszNum},is_white=#{isWhiteList} WHERE id=#{id} @@ -20,7 +20,7 @@ - select cdi.id, cdi.name, cdi.phone, cdi.sup_id supId,file1.num sfzNum,file2.num jszNum,file3.num otherNum,cs.name supName + select cdi.id, cdi.name, cdi.phone, cdi.sup_id supId,file1.num sfzNum,file2.num jszNum,file3.num otherNum,cs.name supName,cdi.is_white as isWhiteList from car_driver_info cdi left join car_supplier cs on cs.id=cdi.sup_id left join( @@ -46,7 +46,7 @@ ORDER BY cdi.create_time desc