From 5e8c2d87726f60dc740f1cc0796f479d9953cb05 Mon Sep 17 00:00:00 2001 From: dearLin <1261008090@qq.com> Date: Mon, 16 Mar 2026 18:12:56 +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=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../primeport/web/VehicleApplyController.java | 5 +- .../convertor/VehicleApplyCoConvertor.java | 3 ++ .../command/query/VehicleApplyQueryExe.java | 10 ++++ .../service/VehicleApplyServiceImpl.java | 8 +++ .../primeport/api/VehicleApplyServiceI.java | 5 ++ .../dataobject/FgsVehicleCountDto.java | 19 +++++++ .../mapper/VehicleApplyMapper.java | 4 ++ .../repository/VehicleApplyRepository.java | 5 ++ .../impl/VehicleApplyRepositoryImpl.java | 11 +++++ .../main/resources/mapper/VehicleApplyDO.xml | 49 +++++++++++++++++++ 10 files changed, 117 insertions(+), 2 deletions(-) create mode 100644 web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/FgsVehicleCountDto.java 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 696bae4..c237e68 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 @@ -9,6 +9,7 @@ import com.jjb.saas.framework.auth.model.SSOUser; import com.jjb.saas.framework.auth.utils.AuthContext; import com.zcloud.primeport.api.VehicleApplyServiceI; import com.zcloud.primeport.dto.*; +import com.zcloud.primeport.dto.clientobject.FgsVehicleCountCo; import com.zcloud.primeport.dto.clientobject.VehicleApplyCO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiModelProperty; @@ -96,8 +97,8 @@ public class VehicleApplyController { } @ApiOperation("分公司统计") @GetMapping("/fgsCount") - public PageResponse fgsCount(@RequestBody VehicleApplyPageQry qry) { - return vehicleApplyService.listPage(qry); + public PageResponse fgsCount(@RequestParam HashMap qry) { + return vehicleApplyService.fgsCount(qry); } } diff --git a/web-app/src/main/java/com/zcloud/primeport/command/convertor/VehicleApplyCoConvertor.java b/web-app/src/main/java/com/zcloud/primeport/command/convertor/VehicleApplyCoConvertor.java index 0e85897..7287976 100644 --- a/web-app/src/main/java/com/zcloud/primeport/command/convertor/VehicleApplyCoConvertor.java +++ b/web-app/src/main/java/com/zcloud/primeport/command/convertor/VehicleApplyCoConvertor.java @@ -1,6 +1,8 @@ package com.zcloud.primeport.command.convertor; +import com.zcloud.primeport.dto.clientobject.FgsVehicleCountCo; import com.zcloud.primeport.dto.clientobject.VehicleApplyCO; +import com.zcloud.primeport.persistence.dataobject.FgsVehicleCountDto; import com.zcloud.primeport.persistence.dataobject.VehicleApplyDO; import org.mapstruct.Mapper; @@ -20,6 +22,7 @@ public interface VehicleApplyCoConvertor { * @return */ List converDOsToCOs(List vehicleApplyDOs); + List converCOsToDtos(List vehicleApplyDOs); VehicleApplyCO converDOToCO(VehicleApplyDO vehicleApplyDO); } 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 68ae48a..91298d1 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 @@ -5,7 +5,9 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.zcloud.gbscommon.utils.PageQueryHelper; import com.zcloud.primeport.command.convertor.VehicleApplyCoConvertor; import com.zcloud.primeport.dto.VehicleApplyPageQry; +import com.zcloud.primeport.dto.clientobject.FgsVehicleCountCo; import com.zcloud.primeport.dto.clientobject.VehicleApplyCO; +import com.zcloud.primeport.persistence.dataobject.FgsVehicleCountDto; import com.zcloud.primeport.persistence.dataobject.VehicleApplyDO; import com.zcloud.primeport.persistence.dataobject.VehicleAuditDO; import com.zcloud.primeport.persistence.repository.VehicleApplyRepository; @@ -15,6 +17,7 @@ import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Component; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; @@ -61,5 +64,12 @@ public class VehicleApplyQueryExe { vehicleApplyCO.setVehicleAuditLogList(vehicleAuditLogs); return vehicleApplyCO; } + + public PageResponse fgsCount(HashMap qry) { + PageResponse pageResponse = vehicleApplyRepository.fgsCount(qry); + List examCenterCOS = vehicleApplyCoConvertor.converCOsToDtos(pageResponse.getData()); + return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); + + } } 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 a584b24..da32d26 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 @@ -10,6 +10,7 @@ import com.zcloud.primeport.command.VehicleApplyUpdateExe; import com.zcloud.primeport.command.query.VehicleApplyQueryExe; import com.zcloud.primeport.domain.enums.AuditEnum; import com.zcloud.primeport.dto.*; +import com.zcloud.primeport.dto.clientobject.FgsVehicleCountCo; import com.zcloud.primeport.dto.clientobject.VehicleApplyCO; import com.zcloud.primeport.persistence.dataobject.VehicleApplyDO; import com.zcloud.primeport.persistence.repository.VehicleApplyRepository; @@ -18,6 +19,7 @@ import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; /** @@ -100,5 +102,11 @@ public class VehicleApplyServiceImpl implements VehicleApplyServiceI { public void inspectCarEdit(VehicleApplyInspectUpdateCmd cmd) { vehicleApplyUpdateExe.inspectCarEdit(cmd); } + + @Override + public PageResponse fgsCount(HashMap qry) { + + return vehicleApplyQueryExe.fgsCount(qry); + } } 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 374cfb0..131a24e 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 @@ -3,8 +3,11 @@ package com.zcloud.primeport.api; import com.alibaba.cola.dto.PageResponse; import com.alibaba.cola.dto.SingleResponse; import com.zcloud.primeport.dto.*; +import com.zcloud.primeport.dto.clientobject.FgsVehicleCountCo; import com.zcloud.primeport.dto.clientobject.VehicleApplyCO; +import java.util.HashMap; + /** * web-client * @@ -29,5 +32,7 @@ public interface VehicleApplyServiceI { void inspectCarSave(VehicleApplyInspectAddCmd cmd); void inspectCarEdit(VehicleApplyInspectUpdateCmd cmd); + + PageResponse fgsCount(HashMap qry); } 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 new file mode 100644 index 0000000..24f16c6 --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/FgsVehicleCountDto.java @@ -0,0 +1,19 @@ +package com.zcloud.primeport.persistence.dataobject; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class FgsVehicleCountDto { + //审批人企业id + @ApiModelProperty(value = "企业id",name = "corpId") + private Long corpId; + @ApiModelProperty(value = "企业名称",name = "corpName") + private Long corpName; + @ApiModelProperty(value = "人员数",name = "userCount") + private Integer userCount; + @ApiModelProperty(value = "个人车辆数",name = "priCarCount") + private Integer priCarCount; + @ApiModelProperty(value = "单位车辆数",name = "pubCarCount") + private Integer pubCarCount; +} diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/VehicleApplyMapper.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/VehicleApplyMapper.java index fe61578..b7a1286 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/VehicleApplyMapper.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/VehicleApplyMapper.java @@ -3,9 +3,11 @@ package com.zcloud.primeport.persistence.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.zcloud.primeport.persistence.dataobject.FgsVehicleCountDto; import com.zcloud.primeport.persistence.dataobject.VehicleApplyDO; import org.apache.ibatis.annotations.Mapper; +import java.util.HashMap; import java.util.Map; /** @@ -18,5 +20,7 @@ import java.util.Map; public interface VehicleApplyMapper extends BaseMapper { IPage listPage(Page> page, Map parmas, String menuPerms); + + IPage fgsCount(Page> page, HashMap 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 73de20e..3e3b248 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 @@ -2,7 +2,10 @@ package com.zcloud.primeport.persistence.repository; import com.alibaba.cola.dto.PageResponse; import com.jjb.saas.framework.repository.repo.BaseRepository; +import com.zcloud.primeport.persistence.dataobject.FgsVehicleCountDto; import com.zcloud.primeport.persistence.dataobject.VehicleApplyDO; + +import java.util.HashMap; import java.util.Map; /** @@ -13,5 +16,7 @@ import java.util.Map; */ public interface VehicleApplyRepository extends BaseRepository { PageResponse listPage(Map parmas); + + PageResponse fgsCount(HashMap qry); } 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 25062fd..803f706 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 @@ -9,12 +9,14 @@ import com.jjb.saas.framework.repository.repo.impl.BaseRepositoryImpl; import com.zcloud.gbscommon.utils.PageQueryHelper; import com.zcloud.gbscommon.utils.Query; import com.zcloud.primeport.domain.enums.MenuEnum; +import com.zcloud.primeport.persistence.dataobject.FgsVehicleCountDto; import com.zcloud.primeport.persistence.dataobject.VehicleApplyDO; import com.zcloud.primeport.persistence.mapper.VehicleApplyMapper; import com.zcloud.primeport.persistence.repository.VehicleApplyRepository; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; +import java.util.HashMap; import java.util.Map; /** @@ -39,5 +41,14 @@ public class VehicleApplyRepositoryImpl extends BaseRepositoryImpl result = vehicleApplyMapper.listPage(page, parmas,menuPerms); return PageHelper.pageToResponse(result, result.getRecords()); } + + @Override + public PageResponse fgsCount(HashMap qry) { + Page> page = new Page<>(Integer.parseInt(qry.get("pageIndex").toString()), + Integer.parseInt(qry.get("pageSize").toString())); + IPage result = vehicleApplyMapper.fgsCount(page, qry); + + return PageHelper.pageToResponse(result, result.getRecords()); + } } diff --git a/web-infrastructure/src/main/resources/mapper/VehicleApplyDO.xml b/web-infrastructure/src/main/resources/mapper/VehicleApplyDO.xml index c3b73aa..200de99 100644 --- a/web-infrastructure/src/main/resources/mapper/VehicleApplyDO.xml +++ b/web-infrastructure/src/main/resources/mapper/VehicleApplyDO.xml @@ -71,5 +71,54 @@ AND f.employee_vehicle_user_id = #{parmas.employeeVehicleUserId} +