feat：车牌号校验

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<Map<String, Object>> checkLicenceNoBlack(@RequestParam String licenceNo) {
+        Map<String, Object> result = vehicleApplyService.checkLicenceNoBlack(licenceNo);
+        return SingleResponse.of(result);
+    }
+
     @ApiOperation("分公司统计")
     @GetMapping("/fgsCount")
     public PageResponse<FgsVehicleCountCo> fgsCount(@RequestParam HashMap<String,String> qry) {

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<MkmjApprovalUserCO> listAll(MkmjApprovalUserPageQry qry) {
         QueryWrapper<MkmjApprovalUserDO> 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);
+        }
+    }
+}

web-app/src/main/java/com/zcloud/primeport/service/VehicleApplyServiceImpl.java

@@ -78,6 +78,7 @@ public class VehicleApplyServiceImpl implements VehicleApplyServiceI {
     public Map<String, Object> checkLicenceNo(String licenceNo, Long id) {
         QueryWrapper<VehicleApplyDO> 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<String, Object> checkLicenceNoBlack(String licenceNo) {
+        QueryWrapper<VehicleBlackDO> queryBlackWrapper = new QueryWrapper<>();
+        queryBlackWrapper.eq("licence_no", licenceNo);
+        queryBlackWrapper.eq("delete_enum", "false");
+        Map<String, Object> result = new HashMap<>();
+        result.put("available", true);
+        if (blackRepository.count(queryBlackWrapper) != 0) {
+            result.put("available", false);
+            result.put("availableMessage", "车牌号已拉黑");
+        }
+        return result;
+    }
 }
 

web-client/src/main/java/com/zcloud/primeport/api/VehicleApplyServiceI.java

@@ -44,5 +44,7 @@ public interface VehicleApplyServiceI {
     PageResponse<VehicleApplyCO> getCarByVehicleBelongType(VehicleApplyPageQry qry);
 
     void xgfCarAuthorization(CarAuthCmd cmd);
+
+    Map<String, Object> checkLicenceNoBlack(String licenceNo);
 }
 

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;
 }