From 42b42a208d27e1ad1ddbd0e23dfb895f319ec3c8 Mon Sep 17 00:00:00 2001 From: xiepeng Date: Wed, 6 Mar 2024 09:41:06 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=90=E8=90=A5=E8=BD=A6=E8=BE=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../OperatingVehiclesController.java | 7 ++++++ .../system/DictionariesController.java | 23 ++++++++++++++++++ .../datasource/system/DictionariesMapper.java | 2 ++ .../service/system/DictionariesService.java | 2 ++ .../system/impl/DictionariesServiceImpl.java | 5 ++++ .../OperatingVehiclesMapper.xml | 24 ++++++++++++++----- .../datasource/system/DictionariesMapper.xml | 9 +++++++ 7 files changed, 66 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/zcloud/controller/operatingvehicles/OperatingVehiclesController.java b/src/main/java/com/zcloud/controller/operatingvehicles/OperatingVehiclesController.java index 13f9298..6504b21 100644 --- a/src/main/java/com/zcloud/controller/operatingvehicles/OperatingVehiclesController.java +++ b/src/main/java/com/zcloud/controller/operatingvehicles/OperatingVehiclesController.java @@ -4,6 +4,7 @@ import com.zcloud.controller.base.BaseController; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; import com.zcloud.logs.LogAnno; +import com.zcloud.service.assignedManage.AssignedManageService; import com.zcloud.service.operatingvehicles.OperatingVehiclesService; import com.zcloud.util.*; import org.springframework.beans.factory.annotation.Autowired; @@ -51,6 +52,7 @@ public class OperatingVehiclesController extends BaseController { pd.put("OPERATOR", Jurisdiction.getUSER_ID()); //修改人id pd.put("OPERATORNAME", Jurisdiction.getUsername()); // 修改人名字 pd.put("OPERATTIME", DateUtil.date2Str(new Date())); // 修改时间 + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); if (null != headstockFile && !headstockFile.isEmpty()) { String ffile = DateUtil.getDays(); //本地 @@ -98,6 +100,10 @@ public class OperatingVehiclesController extends BaseController { String errInfo = "success"; PageData pd = new PageData(); pd = this.getPageData(); + pd.put("DELETOR", Jurisdiction.getUSER_ID()); + pd.put("DELETORNAME", Jurisdiction.getUsername()); + pd.put("DELETTIME", DateUtil.date2Str(new Date())); + operatingVehiclesService.delete(pd); map.put("result", errInfo); //返回结果 return map; } @@ -186,6 +192,7 @@ public class OperatingVehiclesController extends BaseController { map.put("varList", varList); map.put("page", page); map.put("result", errInfo); + System.out.println(); return map; } } diff --git a/src/main/java/com/zcloud/controller/system/DictionariesController.java b/src/main/java/com/zcloud/controller/system/DictionariesController.java index d41f26a..210d72b 100644 --- a/src/main/java/com/zcloud/controller/system/DictionariesController.java +++ b/src/main/java/com/zcloud/controller/system/DictionariesController.java @@ -1030,4 +1030,27 @@ public class DictionariesController extends BaseController { return map; } + @RequestMapping(value = "/getVehicleType") + @ResponseBody + public Object getVehicleType() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + String DICTIONARIES_ID = pd.getString("DICTIONARIES_ID"); + DICTIONARIES_ID = Tools.isEmpty(DICTIONARIES_ID) ? "0" : DICTIONARIES_ID; + List varList = dictionariesService.listgetVehicleType(DICTIONARIES_ID); //用传过来的ID获取此ID下的子列表数据 + List pdList = new ArrayList(); + for (Dictionaries d : varList) { + PageData pdf = new PageData(); + pdf.put("DICTIONARIES_ID", d.getDICTIONARIES_ID()); + pdf.put("BIANMA", d.getBIANMA()); + pdf.put("NAME", d.getNAME()); + pdList.add(pdf); + } + map.put("list", pdList); + map.put("result", errInfo); //返回结果 + return map; + } + } diff --git a/src/main/java/com/zcloud/mapper/datasource/system/DictionariesMapper.java b/src/main/java/com/zcloud/mapper/datasource/system/DictionariesMapper.java index 883d499..b5dbc9f 100644 --- a/src/main/java/com/zcloud/mapper/datasource/system/DictionariesMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/system/DictionariesMapper.java @@ -154,4 +154,6 @@ public interface DictionariesMapper { List listgetAssignedVehicleModel(String parentId); List listgetAssignedVehicle(String parentId); + + List listgetVehicleType(String parentId); } diff --git a/src/main/java/com/zcloud/service/system/DictionariesService.java b/src/main/java/com/zcloud/service/system/DictionariesService.java index 3ccc20c..9a3275e 100644 --- a/src/main/java/com/zcloud/service/system/DictionariesService.java +++ b/src/main/java/com/zcloud/service/system/DictionariesService.java @@ -199,4 +199,6 @@ public interface DictionariesService { List listgetAssignedVehicleModel(String parentId); List listgetAssignedVehicle(String parentId); + + List listgetVehicleType(String parentId); } diff --git a/src/main/java/com/zcloud/service/system/impl/DictionariesServiceImpl.java b/src/main/java/com/zcloud/service/system/impl/DictionariesServiceImpl.java index 3ba93cb..829cd05 100644 --- a/src/main/java/com/zcloud/service/system/impl/DictionariesServiceImpl.java +++ b/src/main/java/com/zcloud/service/system/impl/DictionariesServiceImpl.java @@ -496,4 +496,9 @@ public class DictionariesServiceImpl implements DictionariesService { public List listgetAssignedVehicle(String parentId) { return dictionariesMapper.listgetAssignedVehicle(parentId); } + + @Override + public List listgetVehicleType(String parentId) { + return dictionariesMapper.listgetVehicleType(parentId); + } } diff --git a/src/main/resources/mybatis/datasource/operatingvehicles/OperatingVehiclesMapper.xml b/src/main/resources/mybatis/datasource/operatingvehicles/OperatingVehiclesMapper.xml index 0b68af8..dff7c4f 100644 --- a/src/main/resources/mybatis/datasource/operatingvehicles/OperatingVehiclesMapper.xml +++ b/src/main/resources/mybatis/datasource/operatingvehicles/OperatingVehiclesMapper.xml @@ -24,6 +24,7 @@ f.VEHICLE_TYPE, f.FIRSTSHOW_DATE, f.EXPIRE_DATE, + f.VEHICLE_EQUIPMENT, f.BELONGING_DEPARTMENT, f.TRANSPORT_ENTERPRISES, f.TRANSPORT_TYPE, @@ -48,6 +49,7 @@ f.VOUCH_NUMBERLOAD, f.VOUCH_PAYLOAD, f.RACTIONMASS_QUALITY, + f.HOME_TERRITORY, f.REMARK, f.HEADSTOCK_PHOTO, f.DRIVINGLICENSE_PHOTO, @@ -64,7 +66,8 @@ f.OPERATTIME, f.DELETOR, f.DELETORNAME, - f.DELETTIME + f.DELETTIME, + f.CORPINFO_ID @@ -79,6 +82,7 @@ VEHICLE_TYPE, FIRSTSHOW_DATE, EXPIRE_DATE, + VEHICLE_EQUIPMENT, BELONGING_DEPARTMENT, TRANSPORT_ENTERPRISES, TRANSPORT_TYPE, @@ -103,6 +107,7 @@ VOUCH_NUMBERLOAD, VOUCH_PAYLOAD, RACTIONMASS_QUALITY, + HOME_TERRITORY, REMARK, HEADSTOCK_PHOTO, DRIVINGLICENSE_PHOTO, @@ -119,7 +124,8 @@ OPERATTIME, DELETOR, DELETORNAME, - DELETTIME + DELETTIME, + CORPINFO_ID @@ -134,6 +140,7 @@ #{VEHICLE_TYPE}, #{FIRSTSHOW_DATE}, #{EXPIRE_DATE}, + #{VEHICLE_EQUIPMENT}, #{BELONGING_DEPARTMENT}, #{TRANSPORT_ENTERPRISES}, #{TRANSPORT_TYPE}, @@ -158,6 +165,7 @@ #{VOUCH_NUMBERLOAD}, #{VOUCH_PAYLOAD}, #{RACTIONMASS_QUALITY}, + #{HOME_TERRITORY}, #{REMARK}, #{HEADSTOCK_PHOTO}, #{DRIVINGLICENSE_PHOTO}, @@ -175,6 +183,7 @@ #{DELETOR}, #{DELETORNAME}, #{DELETTIME} + #{CORPINFO_ID} @@ -213,6 +222,7 @@ VEHICLE_TYPE = #{VEHICLE_TYPE}, FIRSTSHOW_DATE = #{FIRSTSHOW_DATE}, EXPIRE_DATE = #{EXPIRE_DATE}, + VEHICLE_EQUIPMENT = #{VEHICLE_EQUIPMENT}, BELONGING_DEPARTMENT = #{BELONGING_DEPARTMENT}, TRANSPORT_ENTERPRISES = #{TRANSPORT_ENTERPRISES}, TRANSPORT_TYPE = #{TRANSPORT_TYPE}, @@ -236,6 +246,7 @@ VOUCH_TOTALMASS = #{VOUCH_TOTALMASS}, VOUCH_NUMBERLOAD = #{VOUCH_NUMBERLOAD}, VOUCH_PAYLOAD = #{VOUCH_PAYLOAD}, + HOME_TERRITORY = #{HOME_TERRITORY}, RACTIONMASS_QUALITY = #{RACTIONMASS_QUALITY}, REMARK = #{REMARK}, HEADSTOCK_PHOTO = #{HEADSTOCK_PHOTO}, @@ -253,7 +264,8 @@ OPERATTIME = #{OPERATTIME}, DELETOR = #{DELETOR}, DELETORNAME = #{DELETORNAME}, - DELETTIME = #{DELETTIME} + DELETTIME = #{DELETTIME}, + CORPINFO_ID = #{CORPINFO_ID} where OPERATING_ID = #{OPERATING_ID} @@ -451,7 +463,7 @@ and f.PLATE_NUMBER LIKE CONCAT(CONCAT('%', #{pd.PLATE_NUMBER}),'%') - and f.VEHICLE_COLOR = #{pd.VEHICLE_COLOR} + and f.VEHICLE_COLOR LIKE CONCAT(CONCAT('%', #{pd.VEHICLE_COLOR}),'%') and f.FRAMES_NUMBER LIKE CONCAT(CONCAT('%', #{pd.FRAMES_NUMBER}),'%') @@ -462,8 +474,8 @@ and f.BELONGING_DEPARTMENT LIKE CONCAT(CONCAT('%', #{pd.BELONGING_DEPARTMENT}),'%') - - and f.TRANSPORT_ENTERPRISES = #{pd.TRANSPORT_ENTERPRISES} + + and f.TRANSPORT_TYPE = #{pd.TRANSPORT_TYPE} and f.NETWORK_STATUS = #{pd.NETWORK_STATUS} diff --git a/src/main/resources/mybatis/datasource/system/DictionariesMapper.xml b/src/main/resources/mybatis/datasource/system/DictionariesMapper.xml index cea65e9..067021c 100644 --- a/src/main/resources/mybatis/datasource/system/DictionariesMapper.xml +++ b/src/main/resources/mybatis/datasource/system/DictionariesMapper.xml @@ -437,5 +437,14 @@ PARENT_ID = #{parentId} order by ORDER_BY + +