From 4f9c69f3bd1c68e35e707823c6e73834576f5377 Mon Sep 17 00:00:00 2001 From: luozhun <2025254074@qq.com> Date: Wed, 20 Nov 2024 10:40:00 +0800 Subject: [PATCH] =?UTF-8?q?feat(SecurityUnitUseStatisticsDTO):=20=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=9C=B0=E5=8C=BA=E4=BF=A1=E6=81=AF=E5=AD=97=E6=AE=B5?= =?UTF-8?q?-=20=E5=9C=A8=20SecurityUnitUseStatisticsDTO=20=E4=B8=AD?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=9C=81=E3=80=81=E5=B8=82=E3=80=81=E5=8C=BA?= =?UTF-8?q?/=E5=8E=BF=E3=80=81=E8=A1=97=E9=81=93=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=20-=20=E4=BF=AE=E6=94=B9=20OpenApiMapper.xml?= =?UTF-8?q?=EF=BC=8C=E5=8A=A0=E5=85=A5=E5=9C=B0=E5=8C=BA=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E7=9A=84=20SQL=20=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/dto/SecurityUnitUseStatisticsDTO.java | 9 +++++++++ .../src/main/resources/mapper/OpenApiMapper.xml | 11 ++++++++++- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/policeSecurityServer/src/main/java/com/changhu/pojo/dto/SecurityUnitUseStatisticsDTO.java b/policeSecurityServer/src/main/java/com/changhu/pojo/dto/SecurityUnitUseStatisticsDTO.java index 185ba4b..1e20599 100644 --- a/policeSecurityServer/src/main/java/com/changhu/pojo/dto/SecurityUnitUseStatisticsDTO.java +++ b/policeSecurityServer/src/main/java/com/changhu/pojo/dto/SecurityUnitUseStatisticsDTO.java @@ -49,4 +49,13 @@ public class SecurityUnitUseStatisticsDTO { @Schema(description = "项目经理联系方式") private String serviceProjectManagerTelephone; + @Schema(description = "省") + private String provinceName; + @Schema(description = "市") + private String cityName; + @Schema(description = "区/县") + private String districtsName; + @Schema(description = "街道") + private String streetName; + } diff --git a/policeSecurityServer/src/main/resources/mapper/OpenApiMapper.xml b/policeSecurityServer/src/main/resources/mapper/OpenApiMapper.xml index 645e7cb..0509e9f 100644 --- a/policeSecurityServer/src/main/resources/mapper/OpenApiMapper.xml +++ b/policeSecurityServer/src/main/resources/mapper/OpenApiMapper.xml @@ -50,13 +50,22 @@ sp.id_number, su.legal_person_info as 'securityUnitLegalPersonInfo', mpu.name as 'serviceProjectManagerName', - mpu.telephone as 'serviceProjectManagerTelephone' + mpu.telephone as 'serviceProjectManagerTelephone', + ad1.name as 'provinceName', + ad2.name as 'cityName', + ad3.name as 'districtsName', + ad4.name as 'streetName' from police_unit pu join enterprises_unit eu on pu.snow_flake_id = eu.police_unit_id and eu.delete_flag = 0 join service_project sp on eu.snow_flake_id = sp.enterprises_unit_id and sp.delete_flag = 0 join security_unit su on sp.security_unit_id = su.snow_flake_id and su.delete_flag = 0 LEFT join mini_program_user mpu on sp.project_manager_mini_program_user_id = mpu.snow_flake_id LEFT join security_user suu on suu.service_project_id = sp.snow_flake_id and suu.delete_flag = 0 + left join administrative_division ad1 on eu.province = ad1.code and ad1.delete_flag = 0 + left join administrative_division ad2 on eu.city = ad2.code and ad2.delete_flag = 0 + left join administrative_division ad3 on eu.districts = ad3.code and ad3.delete_flag = 0 + left join administrative_division ad4 on eu.street = ad4.code and ad4.delete_flag = 0 + where pu.delete_flag = 0