From 5783c2f63c373a8db6a05ade069976754d2c5782 Mon Sep 17 00:00:00 2001 From: bawei <95887577@qq.com> Date: Tue, 16 May 2023 09:14:30 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E6=B7=BB=E5=8A=A0=E9=87=8D?= =?UTF-8?q?=E5=A4=8D=E5=8A=A0=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vehicle/controller/VehicleController.java | 26 ++++++++++++++----- 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/vehicle/controller/VehicleController.java b/SC-boot/linkage-scm/src/main/java/jnpf/vehicle/controller/VehicleController.java index e2c27671..f38574e8 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/vehicle/controller/VehicleController.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/vehicle/controller/VehicleController.java @@ -16,6 +16,7 @@ import jnpf.base.vo.PageListVO; import jnpf.base.vo.PaginationVO; import jnpf.config.ConfigValueUtil; import jnpf.exception.DataException; +import jnpf.paymentdoc.entity.PaymentdocEntity; import jnpf.poundlist.entity.PoundlistEntity; import jnpf.poundlist.service.PoundlistService; import jnpf.util.*; @@ -135,13 +136,26 @@ public class VehicleController { public ActionResult create(@RequestBody @Valid VehicleCrForm vehicleCrForm) throws DataException { String mainId =RandomUtil.uuId(); UserInfo userInfo=userProvider.get(); - vehicleCrForm.setCreatortime(DateUtil.getNow()); - VehicleEntity entity = JsonUtil.getJsonToBean(vehicleCrForm, VehicleEntity.class); - entity.setId(mainId); - vehicleService.save(entity); - + String userId=userProvider.get().getUserId(); + String detpartment = null; + QueryWrapper vehicleQueryWrapper=new QueryWrapper<>(); + vehicleQueryWrapper.lambda().eq(VehicleEntity::getTicketno,vehicleCrForm.getTicketno()); + vehicleQueryWrapper.lambda().eq(VehicleEntity::getDrivername,vehicleCrForm.getDrivername()); + if (!userProvider.get().getIsAdministrator()) { + detpartment = userProvider.getDepartmentId(userId); + vehicleQueryWrapper.lambda().eq(VehicleEntity::getDepartmentId,detpartment); + } + List vehicleEntityList = vehicleService.list(vehicleQueryWrapper); + if (vehicleEntityList.size()>0){ + return ActionResult.fail("已经存在该车辆信息"); + }else { + vehicleCrForm.setCreatortime(DateUtil.getNow()); + VehicleEntity entity = JsonUtil.getJsonToBean(vehicleCrForm, VehicleEntity.class); + entity.setId(mainId); + vehicleService.save(entity); + return ActionResult.success("创建成功"); + } - return ActionResult.success("创建成功"); }