From 4779ade9fdcb8a2d17df73232e6be86f4805c4e4 Mon Sep 17 00:00:00 2001 From: dearLin <1261008090@qq.com> Date: Fri, 20 Mar 2026 13:36:34 +0800 Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E5=B0=81=E9=97=AD=E8=BD=A6?= =?UTF-8?q?=E8=BE=86=E7=9A=84=E5=AE=A1=E6=89=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../primeport/web/VehicleApplyController.java | 6 +++++ .../close/ClosedAreaCarApplyController.java | 25 +++++++++--------- .../command/ClosedAreaCarApplyUpdateExe.java | 14 ++++++++++ .../command/query/VehicleApplyQueryExe.java | 8 ++++++ .../ClosedAreaCarApplyServiceImpl.java | 6 +++++ .../service/VehicleApplyServiceImpl.java | 5 ++++ .../api/ClosedAreaCarApplyServiceI.java | 3 +++ .../primeport/api/VehicleApplyServiceI.java | 3 +++ .../repository/VehicleApplyRepository.java | 2 ++ .../impl/VehicleApplyRepositoryImpl.java | 26 +++++++++++++++++++ 10 files changed, 86 insertions(+), 12 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 cd52f19..ed46408 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 @@ -102,5 +102,11 @@ public class VehicleApplyController { public PageResponse fgsCount(@RequestParam HashMap qry) { return vehicleApplyService.fgsCount(qry); } + + @ApiOperation("跟据车辆归属查询车辆分页") + @GetMapping("/getCarByVehicleBelongIype") + public PageResponse getCarByVehicleBelongType(VehicleApplyPageQry qry) { + return vehicleApplyService.getCarByVehicleBelongType(qry); + } } diff --git a/web-adapter/src/main/java/com/zcloud/primeport/web/close/ClosedAreaCarApplyController.java b/web-adapter/src/main/java/com/zcloud/primeport/web/close/ClosedAreaCarApplyController.java index 1eed4ce..4d5ed0a 100644 --- a/web-adapter/src/main/java/com/zcloud/primeport/web/close/ClosedAreaCarApplyController.java +++ b/web-adapter/src/main/java/com/zcloud/primeport/web/close/ClosedAreaCarApplyController.java @@ -1,17 +1,14 @@ package com.zcloud.primeport.web.close; +import com.alibaba.cola.dto.*; +import com.alibaba.cola.exception.BizException; import com.zcloud.primeport.api.ClosedAreaCarApplyServiceI; import com.zcloud.primeport.dto.ClosedAreaCarApplyAddCmd; +import com.zcloud.primeport.dto.ClosedAreaCarApplyAuditCmd; import com.zcloud.primeport.dto.ClosedAreaCarApplyPageQry; import com.zcloud.primeport.dto.ClosedAreaCarApplyUpdateCmd; import com.zcloud.primeport.dto.clientobject.ClosedAreaCarApplyCO; -import com.alibaba.cola.dto.MultiResponse; -import com.alibaba.cola.dto.PageResponse; -import com.alibaba.cola.dto.Response; -import com.alibaba.cola.dto.SingleResponse; -import com.jjb.saas.framework.auth.model.SSOUser; -import com.jjb.saas.framework.auth.utils.AuthContext; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; @@ -45,12 +42,6 @@ public class ClosedAreaCarApplyController { return closedAreaCarApplyService.listPage(qry); } - @ApiOperation("所有数据") - @GetMapping("/listAll") - public MultiResponse listAll() { - return MultiResponse.of(new ArrayList()); - } - @ApiOperation("详情") @GetMapping("/{id}") public SingleResponse getInfoById(@PathVariable("id") Long id) { @@ -63,5 +54,15 @@ public class ClosedAreaCarApplyController { closedAreaCarApplyService.remove(id); return SingleResponse.buildSuccess(); } + + @ApiOperation("审批车辆申请") + @PostMapping("/auditCarApply") + public Response auditCarApply(@RequestBody ClosedAreaCarApplyAuditCmd auditCmd) { + if (!(auditCmd.getAuditFlag().equals(2) || auditCmd.getAuditFlag().equals(3))) { + throw new BizException("只能是通过或者不通过"); + } + closedAreaCarApplyService.auditCarApply(auditCmd); + return Response.buildSuccess(); + } } diff --git a/web-app/src/main/java/com/zcloud/primeport/command/ClosedAreaCarApplyUpdateExe.java b/web-app/src/main/java/com/zcloud/primeport/command/ClosedAreaCarApplyUpdateExe.java index 043ce32..6aadfb8 100644 --- a/web-app/src/main/java/com/zcloud/primeport/command/ClosedAreaCarApplyUpdateExe.java +++ b/web-app/src/main/java/com/zcloud/primeport/command/ClosedAreaCarApplyUpdateExe.java @@ -1,14 +1,18 @@ package com.zcloud.primeport.command; import com.alibaba.cola.exception.BizException; +import com.zcloud.gbscommon.utils.DateUtil; import com.zcloud.primeport.domain.gateway.ClosedAreaCarApplyGateway; import com.zcloud.primeport.domain.model.ClosedAreaCarApplyE; +import com.zcloud.primeport.dto.ClosedAreaCarApplyAuditCmd; import com.zcloud.primeport.dto.ClosedAreaCarApplyUpdateCmd; import lombok.AllArgsConstructor; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; +import java.util.Date; + /** * web-app @@ -30,5 +34,15 @@ public class ClosedAreaCarApplyUpdateExe { throw new BizException("修改失败"); } } + + @Transactional(rollbackFor = Exception.class) + public void auditCarApply(ClosedAreaCarApplyAuditCmd auditCmd) { + ClosedAreaCarApplyE closedAreaCarApplyE = new ClosedAreaCarApplyE(); + closedAreaCarApplyE.setId(auditCmd.getId()); + closedAreaCarApplyE.setAuditFlag(auditCmd.getAuditFlag()); + closedAreaCarApplyE.setRefusalReason(auditCmd.getRefusalReason()); + closedAreaCarApplyE.setAuditTime(DateUtil.date2Str(new Date())); + closedAreaCarApplyGateway.update(closedAreaCarApplyE); + } } diff --git a/web-app/src/main/java/com/zcloud/primeport/command/query/VehicleApplyQueryExe.java b/web-app/src/main/java/com/zcloud/primeport/command/query/VehicleApplyQueryExe.java index bf809db..62ac024 100644 --- a/web-app/src/main/java/com/zcloud/primeport/command/query/VehicleApplyQueryExe.java +++ b/web-app/src/main/java/com/zcloud/primeport/command/query/VehicleApplyQueryExe.java @@ -83,5 +83,13 @@ public class VehicleApplyQueryExe { return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); } + + public PageResponse getCarByVehicleBelongType(VehicleApplyPageQry qry) { + Map parmas = PageQueryHelper.toHashMap(qry); + PageResponse pageResponse = vehicleApplyRepository.getCarByVehicleBelongType(parmas); + List examCenterCOS = vehicleApplyCoConvertor.converDOsToCOs(pageResponse.getData()); + return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); + + } } diff --git a/web-app/src/main/java/com/zcloud/primeport/service/ClosedAreaCarApplyServiceImpl.java b/web-app/src/main/java/com/zcloud/primeport/service/ClosedAreaCarApplyServiceImpl.java index ff86838..ef01590 100644 --- a/web-app/src/main/java/com/zcloud/primeport/service/ClosedAreaCarApplyServiceImpl.java +++ b/web-app/src/main/java/com/zcloud/primeport/service/ClosedAreaCarApplyServiceImpl.java @@ -6,6 +6,7 @@ import com.zcloud.primeport.command.ClosedAreaCarApplyRemoveExe; import com.zcloud.primeport.command.ClosedAreaCarApplyUpdateExe; import com.zcloud.primeport.command.query.ClosedAreaCarApplyQueryExe; import com.zcloud.primeport.dto.ClosedAreaCarApplyAddCmd; +import com.zcloud.primeport.dto.ClosedAreaCarApplyAuditCmd; import com.zcloud.primeport.dto.ClosedAreaCarApplyPageQry; import com.zcloud.primeport.dto.ClosedAreaCarApplyUpdateCmd; import com.zcloud.primeport.dto.clientobject.ClosedAreaCarApplyCO; @@ -61,5 +62,10 @@ public class ClosedAreaCarApplyServiceImpl implements ClosedAreaCarApplyServiceI public void removeBatch(Long[] ids) { closedAreaCarApplyRemoveExe.execute(ids); } + + @Override + public void auditCarApply(ClosedAreaCarApplyAuditCmd auditCmd) { + closedAreaCarApplyUpdateExe.auditCarApply(auditCmd); + } } 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 78422ee..bae1932 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 @@ -117,5 +117,10 @@ public class VehicleApplyServiceImpl implements VehicleApplyServiceI { public PageResponse xgfCarApplyList(XgfApplyCarPageQry qry) { return null; } + + @Override + public PageResponse getCarByVehicleBelongType(VehicleApplyPageQry qry) { + return vehicleApplyQueryExe.getCarByVehicleBelongType(qry); + } } diff --git a/web-client/src/main/java/com/zcloud/primeport/api/ClosedAreaCarApplyServiceI.java b/web-client/src/main/java/com/zcloud/primeport/api/ClosedAreaCarApplyServiceI.java index b6351be..2833e76 100644 --- a/web-client/src/main/java/com/zcloud/primeport/api/ClosedAreaCarApplyServiceI.java +++ b/web-client/src/main/java/com/zcloud/primeport/api/ClosedAreaCarApplyServiceI.java @@ -1,6 +1,7 @@ package com.zcloud.primeport.api; import com.zcloud.primeport.dto.ClosedAreaCarApplyAddCmd; +import com.zcloud.primeport.dto.ClosedAreaCarApplyAuditCmd; import com.zcloud.primeport.dto.ClosedAreaCarApplyPageQry; import com.zcloud.primeport.dto.ClosedAreaCarApplyUpdateCmd; import com.zcloud.primeport.dto.clientobject.ClosedAreaCarApplyCO; @@ -26,5 +27,7 @@ public interface ClosedAreaCarApplyServiceI { void remove(Long id); void removeBatch(Long[] ids); + + void auditCarApply(ClosedAreaCarApplyAuditCmd auditCmd); } 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 549a73d..42622d7 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 @@ -37,5 +37,8 @@ public interface VehicleApplyServiceI { PageResponse fgsCount(HashMap qry); PageResponse xgfCarApplyList(XgfApplyCarPageQry qry); + + + PageResponse getCarByVehicleBelongType(VehicleApplyPageQry qry); } diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/VehicleApplyRepository.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/VehicleApplyRepository.java index 3e3b248..8a9e88b 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/VehicleApplyRepository.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/VehicleApplyRepository.java @@ -18,5 +18,7 @@ public interface VehicleApplyRepository extends BaseRepository { PageResponse listPage(Map parmas); PageResponse fgsCount(HashMap qry); + + PageResponse getCarByVehicleBelongType(Map parmas); } diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/VehicleApplyRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/VehicleApplyRepositoryImpl.java index 803f706..acedf7d 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/VehicleApplyRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/VehicleApplyRepositoryImpl.java @@ -4,13 +4,18 @@ import com.alibaba.cola.dto.PageResponse; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.jjb.saas.framework.auth.utils.AuthContext; import com.jjb.saas.framework.repository.common.PageHelper; import com.jjb.saas.framework.repository.repo.impl.BaseRepositoryImpl; import com.zcloud.gbscommon.utils.PageQueryHelper; import com.zcloud.gbscommon.utils.Query; +import com.zcloud.gbscommon.utils.Tools; +import com.zcloud.primeport.domain.enums.AuditEnum; import com.zcloud.primeport.domain.enums.MenuEnum; +import com.zcloud.primeport.domain.enums.VehicleBelongTypeEnum; import com.zcloud.primeport.persistence.dataobject.FgsVehicleCountDto; import com.zcloud.primeport.persistence.dataobject.VehicleApplyDO; +import com.zcloud.primeport.persistence.dataobject.VehicleMessageDO; import com.zcloud.primeport.persistence.mapper.VehicleApplyMapper; import com.zcloud.primeport.persistence.repository.VehicleApplyRepository; import lombok.RequiredArgsConstructor; @@ -50,5 +55,26 @@ public class VehicleApplyRepositoryImpl extends BaseRepositoryImpl getCarByVehicleBelongType(Map parmas) { + IPage iPage = new Query().getPage(parmas); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("vehicle_belong_type", parmas.get("vehicleBelongType")); + queryWrapper.eq("audit_flag", AuditEnum.APPROVED.getCode()); + queryWrapper.eq("mkmj_permission", 1); + queryWrapper.like(Tools.notEmpty(parmas.get("licenceNo").toString()),"mkmj_permission", parmas.get("licenceNo")); + String vehicleBelongType = parmas.get("vehicleBelongType").toString(); + if (VehicleBelongTypeEnum.JGD_PRI_VEHICLES.getCode().equals(vehicleBelongType) ||VehicleBelongTypeEnum.FGS_PRI_VEHICLES.getCode().equals(vehicleBelongType)) { + // 分公司、股份个人车，查询当前登录用户车辆 + queryWrapper.eq("employee_vehicle_user_id", AuthContext.getUserId()); + } + if (VehicleBelongTypeEnum.JGD_PUB_VEHICLES.getCode().equals(vehicleBelongType) ||VehicleBelongTypeEnum.FGS_PUB_VEHICLES.getCode().equals(vehicleBelongType)) { + // 分公司、股份公车，查询当前登录 + queryWrapper.eq("vehicle_corp_id", AuthContext.getTenantId()); + } + IPage result = vehicleApplyMapper.selectPage(iPage, queryWrapper); + return PageHelper.pageToResponse(result, result.getRecords()); + } }