luozhun
/
policeSecurity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: luozhun:b421a1f4c3de107e6a0e23767f9e5d370471f2cc
Branches Tags
luozhun:main
..
compare: luozhun:55c9bfa19b5538cd171c8cba14e40c7a845afe2b
Branches Tags
luozhun:main

No commits in common. "b421a1f4c3de107e6a0e23767f9e5d370471f2cc" and "55c9bfa19b5538cd171c8cba14e40c7a845afe2b" have entirely different histories.
b421a1f4c3 ... 55c9bfa19b

3 changed files with 1 additions and 10 deletions
Show Stats Expand all files Collapse all files

1
collect_information/.gitignore vendored
View File

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

3
policeSecurityServer/src/main/java/com/changhu/module/miniProgram/pojo/vo/IndexServiceProjectListVo.java
View File

@ -1,6 +1,5 @@
package com.changhu.module.miniProgram.pojo.vo; 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.IsOrNot;
import com.changhu.common.db.enums.ServiceProjectType; import com.changhu.common.db.enums.ServiceProjectType;
import com.changhu.module.management.pojo.model.ContactPersonInfo; import com.changhu.module.management.pojo.model.ContactPersonInfo;
@ -53,8 +52,6 @@ public class IndexServiceProjectListVo {
static class ServiceProjectVo { static class ServiceProjectVo {
@Schema(description = "服务项目id") @Schema(description = "服务项目id")
private Long snowFlakeId; private Long snowFlakeId;
@Schema(description = "项目经理信息")
private Dict projectManagerMiniProgramUserInfo;
@Schema(description = "服务项目名称") @Schema(description = "服务项目名称")
private String name; private String name;
@Schema(description = "服务项目类型") @Schema(description = "服务项目类型")

7
policeSecurityServer/src/main/resources/mapper/ServiceProjectMapper.xml
View File

@ -57,14 +57,9 @@
'houseTotal', sp.house_total, 'houseTotal', sp.house_total,
'staffTotal', sp.staff_total, 'staffTotal', sp.staff_total,
'securityUserTotal', sp.security_user_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' 'remark', sp.remark)) as 'service_project_list'
from enterprises_unit eu from enterprises_unit eu
join service_project sp on eu.snow_flake_id = sp.enterprises_unit_id and sp.delete_flag = 0 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 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 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 ad3 on eu.districts = ad3.code and ad3.delete_flag = 0
@ -81,4 +76,4 @@
group by eu.snow_flake_id group by eu.snow_flake_id
order by any_value(sp.create_time) desc; order by any_value(sp.create_time) desc;
</select> </select>
</mapper> </mapper>