diff --git a/web-adapter/src/main/java/com/zcloud/primeport/web/VehicleApplyController.java b/web-adapter/src/main/java/com/zcloud/primeport/web/VehicleApplyController.java index 13a4b0d..246d636 100644 --- a/web-adapter/src/main/java/com/zcloud/primeport/web/VehicleApplyController.java +++ b/web-adapter/src/main/java/com/zcloud/primeport/web/VehicleApplyController.java @@ -98,6 +98,13 @@ public class VehicleApplyController { // result.put("available", available); return SingleResponse.of(result); } + @ApiOperation("车牌号黑名单校验") + @GetMapping("/check-licence-no-black") + public SingleResponse> checkLicenceNoBlack(@RequestParam String licenceNo) { + Map result = vehicleApplyService.checkLicenceNoBlack(licenceNo); + return SingleResponse.of(result); + } + @ApiOperation("分公司统计") @GetMapping("/fgsCount") public PageResponse fgsCount(@RequestParam HashMap qry) { diff --git a/web-app/src/main/java/com/zcloud/primeport/command/query/MkmjApprovalUserQueryExe.java b/web-app/src/main/java/com/zcloud/primeport/command/query/MkmjApprovalUserQueryExe.java index 6fed8c0..db931d7 100644 --- a/web-app/src/main/java/com/zcloud/primeport/command/query/MkmjApprovalUserQueryExe.java +++ b/web-app/src/main/java/com/zcloud/primeport/command/query/MkmjApprovalUserQueryExe.java @@ -2,6 +2,8 @@ package com.zcloud.primeport.command.query; import com.alibaba.cola.dto.PageResponse; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.incrementer.DefaultIdentifierGenerator; +import com.jjb.saas.framework.auth.utils.AuthContext; import com.zcloud.gbscommon.utils.PageQueryHelper; import com.zcloud.gbscommon.utils.Tools; import com.zcloud.primeport.command.convertor.MkmjApprovalUserCoConvertor; @@ -43,6 +45,9 @@ public class MkmjApprovalUserQueryExe { public List listAll(MkmjApprovalUserPageQry qry) { QueryWrapper mkmjApprovalUserCOQueryWrapper = new QueryWrapper<>(); + if (qry.getNeedSelfCorpApprovalUserFlag() != null) { + mkmjApprovalUserCOQueryWrapper.eq("corp_id", AuthContext.getTenantId()); + } if (qry.getCorpId() != null) { mkmjApprovalUserCOQueryWrapper.eq("corp_id", qry.getCorpId()); } @@ -67,5 +72,13 @@ public class MkmjApprovalUserQueryExe { MkmjApprovalUserDO byId = mkmjApprovalUserRepository.getById(id); return mkmjApprovalUserCoConvertor.converDOToCO(byId); } -} + public static void main(String[] args) { + + for (int i = 0; i < 30; i++) { + DefaultIdentifierGenerator x = new DefaultIdentifierGenerator(); + Long l = x.nextId(new Object()); + System.out.println("0,2039146629018386432,"+l); + } + } +} diff --git a/web-app/src/main/java/com/zcloud/primeport/service/VehicleApplyServiceImpl.java b/web-app/src/main/java/com/zcloud/primeport/service/VehicleApplyServiceImpl.java index 6deeaa2..6e66ed9 100644 --- a/web-app/src/main/java/com/zcloud/primeport/service/VehicleApplyServiceImpl.java +++ b/web-app/src/main/java/com/zcloud/primeport/service/VehicleApplyServiceImpl.java @@ -78,6 +78,7 @@ public class VehicleApplyServiceImpl implements VehicleApplyServiceI { public Map checkLicenceNo(String licenceNo, Long id) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("licence_no", licenceNo); + queryWrapper.in("vehicle_belong_type", 1,2,3,4,8,9); queryWrapper.eq("delete_enum", "false"); if (id != null) { queryWrapper.ne("id", id); @@ -144,5 +145,19 @@ public class VehicleApplyServiceImpl implements VehicleApplyServiceI { objectUpdateWrapper.eq("id", cmd.getVehicleApplyId()); vehicleApplyRepository.update(objectUpdateWrapper); } + + @Override + public Map checkLicenceNoBlack(String licenceNo) { + QueryWrapper queryBlackWrapper = new QueryWrapper<>(); + queryBlackWrapper.eq("licence_no", licenceNo); + queryBlackWrapper.eq("delete_enum", "false"); + Map result = new HashMap<>(); + result.put("available", true); + if (blackRepository.count(queryBlackWrapper) != 0) { + result.put("available", false); + result.put("availableMessage", "车牌号已拉黑"); + } + return result; + } } diff --git a/web-client/src/main/java/com/zcloud/primeport/api/VehicleApplyServiceI.java b/web-client/src/main/java/com/zcloud/primeport/api/VehicleApplyServiceI.java index 404825d..4f85dd9 100644 --- a/web-client/src/main/java/com/zcloud/primeport/api/VehicleApplyServiceI.java +++ b/web-client/src/main/java/com/zcloud/primeport/api/VehicleApplyServiceI.java @@ -44,5 +44,7 @@ public interface VehicleApplyServiceI { PageResponse getCarByVehicleBelongType(VehicleApplyPageQry qry); void xgfCarAuthorization(CarAuthCmd cmd); + + Map checkLicenceNoBlack(String licenceNo); } diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/MkmjApprovalUserPageQry.java b/web-client/src/main/java/com/zcloud/primeport/dto/MkmjApprovalUserPageQry.java index b8d4a93..97d32e6 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/MkmjApprovalUserPageQry.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/MkmjApprovalUserPageQry.java @@ -38,6 +38,8 @@ public class MkmjApprovalUserPageQry extends PageQuery { //临时审核权限(1-无权限,2-有权限) @ApiModelProperty(value = "临时审核权限(1-有权限,0-没权限)") private Integer temporaryPermissionFlag; + @ApiModelProperty(value = "临时审核权限(1-本租户,2-所有审批人)") + private Integer needSelfCorpApprovalUserFlag; private String menuPath; }