From d038170c90b5fa869aaca265041ddda03acbd5c4 Mon Sep 17 00:00:00 2001 From: dearLin <1261008090@qq.com> Date: Fri, 27 Mar 2026 10:10:48 +0800 Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E5=88=86=E5=85=AC=E5=8F=B8?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../primeport/web/VehicleApplyController.java | 8 ++--- .../command/query/PersonApplyQueryExe.java | 2 +- .../service/VehicleApplyServiceImpl.java | 29 ++++++++++++++----- .../primeport/api/VehicleApplyServiceI.java | 3 +- .../dto/clientobject/FgsVehicleCountCo.java | 2 +- .../dataobject/FgsVehicleCountDto.java | 2 +- .../dataobject/PersonCountDto.java | 2 ++ .../resources/mapper/XgfApplyPersonDO.xml | 1 + 8 files changed, 33 insertions(+), 16 deletions(-) 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 9ef3cc4..13a4b0d 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 @@ -91,11 +91,11 @@ public class VehicleApplyController { @ApiOperation("车牌号唯一性校验") @GetMapping("/check-licence-no") - public SingleResponse> checkLicenceNo(@RequestParam String licenceNo, + public SingleResponse> checkLicenceNo(@RequestParam String licenceNo, @RequestParam(required = false) Long id) { - Boolean available = vehicleApplyService.checkLicenceNo(licenceNo, id); - Map result = new HashMap<>(); - result.put("available", available); + Map result = vehicleApplyService.checkLicenceNo(licenceNo, id); +// Map result = new HashMap<>(); +// result.put("available", available); return SingleResponse.of(result); } @ApiOperation("分公司统计") diff --git a/web-app/src/main/java/com/zcloud/primeport/command/query/PersonApplyQueryExe.java b/web-app/src/main/java/com/zcloud/primeport/command/query/PersonApplyQueryExe.java index e35cd5a..5900836 100644 --- a/web-app/src/main/java/com/zcloud/primeport/command/query/PersonApplyQueryExe.java +++ b/web-app/src/main/java/com/zcloud/primeport/command/query/PersonApplyQueryExe.java @@ -98,7 +98,7 @@ public class PersonApplyQueryExe { public PageResponse personnelVehicleManagementList(PersonCountPageQry qry) { Map parmas = PageQueryHelper.toHashMap(qry); - parmas.put("applyCorpId", AuthContext.getTenantId()); + parmas.put("applyCorpId", qry.getCorpId()); PageResponse pageResponse = xgfPersonApplyRepository.personnelVehicleManagementList(parmas); List examCenterCOS = personApplyCoConvertor.converDtosToCOs(pageResponse.getData()); 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 e217728..2d5d8fd 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 @@ -17,15 +17,14 @@ import com.zcloud.primeport.dto.clientobject.FgsVehicleCountCo; import com.zcloud.primeport.dto.clientobject.VehicleApplyCO; import com.zcloud.primeport.dto.clientobject.VehicleAuditCO; import com.zcloud.primeport.persistence.dataobject.VehicleApplyDO; +import com.zcloud.primeport.persistence.dataobject.VehicleBlackDO; import com.zcloud.primeport.persistence.repository.VehicleApplyRepository; +import com.zcloud.primeport.persistence.repository.VehicleBlackRepository; import lombok.AllArgsConstructor; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; -import java.util.ArrayList; -import java.util.Date; -import java.util.HashMap; -import java.util.List; +import java.util.*; /** * web-app @@ -41,6 +40,7 @@ public class VehicleApplyServiceImpl implements VehicleApplyServiceI { private final VehicleApplyRemoveExe vehicleApplyRemoveExe; private final VehicleApplyQueryExe vehicleApplyQueryExe; private final VehicleApplyRepository vehicleApplyRepository; + private final VehicleBlackRepository blackRepository; @Override public PageResponse listPage(VehicleApplyPageQry qry) { @@ -75,14 +75,27 @@ public class VehicleApplyServiceImpl implements VehicleApplyServiceI { } @Override - public Boolean checkLicenceNo(String licenceNo, Long id) { + public Map checkLicenceNo(String licenceNo, Long id) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("licence_no", licenceNo); queryWrapper.eq("delete_enum", "false"); if (id != null) { queryWrapper.ne("id", id); } - return vehicleApplyRepository.count(queryWrapper) == 0; + Map result = new HashMap<>(); + result.put("available", true); + if (vehicleApplyRepository.count(queryWrapper) == 0) { + result.put("available", false); + result.put("availableMessage", "该车牌号已存在"); + } + QueryWrapper queryBlackWrapper = new QueryWrapper<>(); + queryBlackWrapper.eq("licence_no", licenceNo); + queryBlackWrapper.eq("delete_enum", "false"); + if (blackRepository.count(queryBlackWrapper) == 0) { + result.put("available", false); + result.put("availableMessage", "车牌号已拉黑"); + } + return result; } @Override @@ -127,8 +140,8 @@ public class VehicleApplyServiceImpl implements VehicleApplyServiceI { @Override public void xgfCarAuthorization(CarAuthCmd cmd) { UpdateWrapper objectUpdateWrapper = new UpdateWrapper<>(); - objectUpdateWrapper.set("mkmj_permission",cmd.getMkmjPermission()); - objectUpdateWrapper.eq("id",cmd.getVehicleApplyId()); + objectUpdateWrapper.set("mkmj_permission", cmd.getMkmjPermission()); + objectUpdateWrapper.eq("id", cmd.getVehicleApplyId()); vehicleApplyRepository.update(objectUpdateWrapper); } } 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 5704776..404825d 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 @@ -9,6 +9,7 @@ import com.zcloud.primeport.dto.clientobject.VehicleApplyCO; import com.zcloud.primeport.dto.clientobject.VehicleAuditCO; import java.util.HashMap; +import java.util.Map; /** * web-client @@ -29,7 +30,7 @@ public interface VehicleApplyServiceI { VehicleApplyCO getInfoById(Long id); - Boolean checkLicenceNo(String licenceNo, Long id); + Map checkLicenceNo(String licenceNo, Long id); void inspectCarSave(VehicleApplyInspectAddCmd cmd); diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/FgsVehicleCountCo.java b/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/FgsVehicleCountCo.java index 1a869ee..002e692 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/FgsVehicleCountCo.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/FgsVehicleCountCo.java @@ -11,7 +11,7 @@ public class FgsVehicleCountCo extends ClientObject { @ApiModelProperty(value = "企业id",name = "corpId") private Long corpId; @ApiModelProperty(value = "企业名称",name = "corpName") - private Long corpName; + private String corpName; @ApiModelProperty(value = "人员数",name = "userCount") private Integer userCount; @ApiModelProperty(value = "个人车辆数",name = "priCarCount") diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/FgsVehicleCountDto.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/FgsVehicleCountDto.java index 24f16c6..d4152ee 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/FgsVehicleCountDto.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/FgsVehicleCountDto.java @@ -9,7 +9,7 @@ public class FgsVehicleCountDto { @ApiModelProperty(value = "企业id",name = "corpId") private Long corpId; @ApiModelProperty(value = "企业名称",name = "corpName") - private Long corpName; + private String corpName; @ApiModelProperty(value = "人员数",name = "userCount") private Integer userCount; @ApiModelProperty(value = "个人车辆数",name = "priCarCount") diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/PersonCountDto.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/PersonCountDto.java index 8b63ae8..16c73de 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/PersonCountDto.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/PersonCountDto.java @@ -49,5 +49,7 @@ public class PersonCountDto{ private Integer mkmjPermission; @ApiModelProperty(value = "用户头像URL") private String userFaceUrl; + @ApiModelProperty(value = "身份证号") + private String userCard; } diff --git a/web-infrastructure/src/main/resources/mapper/XgfApplyPersonDO.xml b/web-infrastructure/src/main/resources/mapper/XgfApplyPersonDO.xml index 340ebf9..5fdda77 100644 --- a/web-infrastructure/src/main/resources/mapper/XgfApplyPersonDO.xml +++ b/web-infrastructure/src/main/resources/mapper/XgfApplyPersonDO.xml @@ -112,6 +112,7 @@ u.id user_id, u.phone user_phone, u.name user_name, + u.user_id_card , d.id department_id, d.`name` department_name, p.post_name,