From 3591f6907f20b82f870f28b846843e1eabbfbde3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=B8=85?= <3115919733@qq.com> Date: Fri, 9 May 2025 08:44:41 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E5=AE=A1=E6=A0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/org/jeecg/config/shiro/ShiroConfig.java | 2 ++ .../vehicleinout/controller/VehicleInOutController.java | 2 +- .../carinout/vehicleinout/mapper/xml/VehicleInOutMapper.xml | 3 +-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java index 817e589..f019cc9 100644 --- a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java +++ b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java @@ -80,6 +80,8 @@ public class ShiroConfig { filterChainDefinitionMap.put("/vehicledemandcount/vehicleDemandCount/getVdCountById", "anon"); //获取用车计算数据 filterChainDefinitionMap.put("/vehicleinout/vehicleInOut/take", "anon"); //提货 filterChainDefinitionMap.put("/logisticsdriver/logisticsDriver/getDriverInfo", "anon"); //查询司机信息 + filterChainDefinitionMap.put("/vehicleinout/vehicleInOut/getCarNum", "anon"); // 车辆出入厂明细 + filterChainDefinitionMap.put("/vehicleinout/vehicleInOut/handleConfirm", "anon"); // 车辆出入厂审核 filterChainDefinitionMap.put("/sys/cas/client/validateLogin", "anon"); //cas验证登录 filterChainDefinitionMap.put("/sys/randomImage/**", "anon"); //登录验证码接口排除 diff --git a/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/carinout/vehicleinout/controller/VehicleInOutController.java b/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/carinout/vehicleinout/controller/VehicleInOutController.java index c37612d..8c27ca4 100644 --- a/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/carinout/vehicleinout/controller/VehicleInOutController.java +++ b/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/carinout/vehicleinout/controller/VehicleInOutController.java @@ -182,7 +182,7 @@ public class VehicleInOutController extends JeecgController handleConfirm(@RequestBody VehicleInOut vehicleInOut) { VehicleInOut byId = vehicleInOutService.getById(vehicleInOut.getId()); - if (Integer.parseInt(vehicleInOut.getCurrentStatus()) <= Integer.parseInt(byId.getCurrentStatus())) { + if (vehicleInOut.getCurrentStatus() != null && Integer.parseInt(vehicleInOut.getCurrentStatus()) <= Integer.parseInt(byId.getCurrentStatus())) { return Result.error("操作失败，请按照流程操作！"); } if ("3".equals(vehicleInOut.getCurrentStatus())) { diff --git a/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/carinout/vehicleinout/mapper/xml/VehicleInOutMapper.xml b/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/carinout/vehicleinout/mapper/xml/VehicleInOutMapper.xml index 3ce07cf..a102ab3 100644 --- a/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/carinout/vehicleinout/mapper/xml/VehicleInOutMapper.xml +++ b/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/carinout/vehicleinout/mapper/xml/VehicleInOutMapper.xml @@ -29,7 +29,6 @@ FROM tms_vehicle_in_out a LEFT JOIN tms_vehicle_demand b ON a.VD_NO = b.VD_NO - WHERE b.SHIP_DATE = TRUNC(SYSDATE) - AND a.CURRENT_STATUS != '4'; + WHERE b.SHIP_DATE = TRUNC(SYSDATE); \ No newline at end of file