Merge remote-tracking branch 'origin/main'

collect_information/.gitignore

@@ -8,4 +8,5 @@ node_modules/
 yarn.lock
 components.d.ts
 package-lock.json
+.idea
 

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 = "服务项目类型")

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>
+</mapper>