From 96ab5fe9e22dc2dcb4387fc03cf4553a85f54c98 Mon Sep 17 00:00:00 2001
From: luozhun <2025254074@qq.com>
Date: Sat, 14 Sep 2024 14:16:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 collect_information/.gitignore                             | 1 +
 .../miniProgram/pojo/vo/IndexServiceProjectListVo.java     | 3 +++
 .../src/main/resources/mapper/ServiceProjectMapper.xml     | 7 ++++++-
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/collect_information/.gitignore b/collect_information/.gitignore
index 4abd8e3..e83724e 100644
--- a/collect_information/.gitignore
+++ b/collect_information/.gitignore
@@ -8,4 +8,5 @@ node_modules/
 yarn.lock
 components.d.ts
 package-lock.json
+.idea
 
diff --git a/policeSecurityServer/src/main/java/com/changhu/module/miniProgram/pojo/vo/IndexServiceProjectListVo.java b/policeSecurityServer/src/main/java/com/changhu/module/miniProgram/pojo/vo/IndexServiceProjectListVo.java
index 40af593..961908a 100644
--- a/policeSecurityServer/src/main/java/com/changhu/module/miniProgram/pojo/vo/IndexServiceProjectListVo.java
+++ b/policeSecurityServer/src/main/java/com/changhu/module/miniProgram/pojo/vo/IndexServiceProjectListVo.java
@@ -1,5 +1,6 @@
 package com.changhu.module.miniProgram.pojo.vo;
 
+import cn.hutool.core.lang.Dict;
 import com.changhu.common.db.enums.IsOrNot;
 import com.changhu.common.db.enums.ServiceProjectType;
 import com.changhu.module.management.pojo.model.ContactPersonInfo;
@@ -52,6 +53,8 @@ public class IndexServiceProjectListVo {
     static class ServiceProjectVo {
         @Schema(description = "服务项目id")
         private Long snowFlakeId;
+        @Schema(description = "项目经理信息")
+        private Dict projectManagerMiniProgramUserInfo;
         @Schema(description = "服务项目名称")
         private String name;
         @Schema(description = "服务项目类型")
diff --git a/policeSecurityServer/src/main/resources/mapper/ServiceProjectMapper.xml b/policeSecurityServer/src/main/resources/mapper/ServiceProjectMapper.xml
index 44ad736..b18db61 100644
--- a/policeSecurityServer/src/main/resources/mapper/ServiceProjectMapper.xml
+++ b/policeSecurityServer/src/main/resources/mapper/ServiceProjectMapper.xml
@@ -57,9 +57,14 @@
                        'houseTotal', sp.house_total,
                        'staffTotal', sp.staff_total,
                        'securityUserTotal', sp.security_user_total,
+                       'projectManagerMiniProgramUserInfo',JSON_OBJECT(
+                                                        'name',mpu.name,
+                                                        'telephone',mpu.telephone,
+                                                        'idCard',mpu.id_card),
                        'remark', sp.remark)) as 'service_project_list'
         from enterprises_unit eu
                  join service_project sp on eu.snow_flake_id = sp.enterprises_unit_id and sp.delete_flag = 0
+                 left join mini_program_user mpu on sp.project_manager_mini_program_user_id = mpu.snow_flake_id and mpu.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
@@ -76,4 +81,4 @@
         group by eu.snow_flake_id
         order by any_value(sp.create_time) desc;
     </select>
-</mapper>
\ No newline at end of file
+</mapper>