From 01ca20b4747e694ca29d31f60cfbb914f46a9dd0 Mon Sep 17 00:00:00 2001 From: wans <747101512@qq.com> Date: Mon, 5 Jul 2021 12:54:56 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=80=E6=9C=89=E7=89=87?= =?UTF-8?q?=E9=95=BF=E4=B8=BA=E7=BD=91=E6=A0=BC=E9=95=BF=20=20=E6=89=80?= =?UTF-8?q?=E6=9C=89N=E5=91=98=E4=B8=BA=E4=B8=93=E7=AE=A1=E5=91=98=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9C=B0=E5=9B=BE=E9=A6=96=E9=A1=B5=E7=82=B9?= =?UTF-8?q?=E5=87=BB=E7=BD=91=E6=A0=BC=E6=9F=A5=E7=9C=8B=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E4=B8=BA=E7=A9=BA=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../areapoints/impl/AreaPointsServiceImpl.java | 4 ++-- .../communityboss/impl/CommunityBossServiceImpl.java | 4 +++- .../userlocation/impl/UserLocationServiceImpl.java | 11 +++++++++-- src/main/resources/static/default.html | 4 ++-- .../resources/static/route/assessment/list_day.html | 4 ++-- .../static/route/assessment/list_history.html | 4 ++-- src/main/resources/static/route/config/config.html | 2 +- .../static/route/gridmember/list-gridmember.html | 2 +- src/main/resources/static/route/leave/list.html | 2 +- .../static/route/leave/list_jurisdiction.html | 2 +- .../static/route/reportcase/case_assign.html | 8 ++++---- .../route/reportcase/case_community_assign.html | 6 +++--- src/main/resources/static/route/reportcase/list.html | 2 +- .../static/route/reportcase/list_accept.html | 2 +- .../static/route/reportcase/list_assign.html | 2 +- .../resources/static/route/reportcase/list_close.html | 2 +- .../route/reportcase/list_community_accept.html | 2 +- .../route/reportcase/list_community_assign.html | 2 +- .../static/route/reportcase/list_community_close.html | 2 +- .../route/reportcase/list_community_forward.html | 2 +- .../route/reportcase/list_community_handle.html | 2 +- .../route/reportcase/list_community_inspect.html | 2 +- .../route/reportcase/list_community_placeonfile.html | 2 +- .../route/reportcase/list_community_register.html | 2 +- .../static/route/reportcase/list_exception.html | 2 +- .../static/route/reportcase/list_handle.html | 2 +- .../static/route/reportcase/list_inspect.html | 2 +- .../static/route/reportcase/list_placeonfile.html | 2 +- .../static/route/reportcase/list_register.html | 2 +- src/main/resources/static/route/reportcase/save.html | 2 +- src/main/resources/static/route/reportcase/show.html | 2 +- .../resources/static/route/reportcase/update.html | 2 +- .../static/route/reportcase/v2/case_assign_v2.html | 6 +++--- .../static/route/reportcase/v2/list_accept_v2.html | 2 +- .../static/route/reportcase/v2/list_assign_v2.html | 2 +- .../static/route/reportcase/v2/list_close_v2.html | 2 +- .../static/route/reportcase/v2/list_exception_v2.html | 2 +- .../static/route/reportcase/v2/list_handle_v2.html | 2 +- .../static/route/reportcase/v2/list_inspect_v2.html | 2 +- .../route/reportcase/v2/list_placeonfile_v2.html | 2 +- .../static/route/reportcase/v2/list_register_v2.html | 2 +- .../resources/static/route/reportcase/v2/list_v2.html | 2 +- .../resources/static/route/reportcase/v2/save_v2.html | 2 +- .../resources/static/route/reportcase/v2/show_v2.html | 2 +- .../static/route/reportcase/v2/update_v2.html | 2 +- .../static/route/specialreportcase/list.html | 2 +- .../static/route/specialreportcase/list_handle.html | 2 +- .../route/specialreportcase/list_place_on_file.html | 2 +- .../static/route/specialreportcase/save.html | 2 +- .../static/route/specialreportcase/show.html | 2 +- .../static/route/specialreportcase/update.html | 2 +- .../static/route/userlocation/list-user-detail.html | 2 +- .../static/route/userlocation/map_summary.html | 4 ++-- .../resources/static/route/userpoints/map_user.html | 8 ++++---- .../static/route/userpoints/map_user_old.html | 6 +++--- src/main/resources/static/route/usersignin/list.html | 4 ++-- .../static/route/usersignin/list_jurisdiction.html | 4 ++-- .../static/route/usersignin/list_unsign.html | 4 ++-- .../route/usersignin/list_unsign_jurisdiction.html | 4 ++-- src/main/resources/static/route/usersignout/list.html | 2 +- .../static/route/usersignout/list_jurisdiction.html | 2 +- .../static/route/usersignout/list_unsign.html | 2 +- .../route/usersignout/list_unsign_jurisdiction.html | 4 ++-- 63 files changed, 95 insertions(+), 86 deletions(-) diff --git a/src/main/java/com/cm/systemcity/service/areapoints/impl/AreaPointsServiceImpl.java b/src/main/java/com/cm/systemcity/service/areapoints/impl/AreaPointsServiceImpl.java index 3db3f16..035ee7c 100755 --- a/src/main/java/com/cm/systemcity/service/areapoints/impl/AreaPointsServiceImpl.java +++ b/src/main/java/com/cm/systemcity/service/areapoints/impl/AreaPointsServiceImpl.java @@ -115,8 +115,8 @@ public class AreaPointsServiceImpl extends AbstractService implements IAreaPoint subAdministrativeEasyUITreeDTOS.add(createAreaTreeDTO("community", "社区", "icon-area")); administrativeEasyUITreeDTO.setChildren(subAdministrativeEasyUITreeDTOS); easyUITreeDTOS.add(administrativeEasyUITreeDTO); - // 片区 - EasyUITreeDTO areaEasyUITreeDTO = createAreaTreeDTO("area", "片区", "icon-area"); + // 网格 + EasyUITreeDTO areaEasyUITreeDTO = createAreaTreeDTO("area", "网格", "icon-area"); List subAreaEasyUITreeDTOS = new ArrayList<>(); EasyUITreeDTO level1Area = createAreaTreeDTO("areaLevel1", "二级网格长责任区域", "icon-area"); diff --git a/src/main/java/com/cm/systemcity/service/communityboss/impl/CommunityBossServiceImpl.java b/src/main/java/com/cm/systemcity/service/communityboss/impl/CommunityBossServiceImpl.java index 064e4c3..5ce3427 100755 --- a/src/main/java/com/cm/systemcity/service/communityboss/impl/CommunityBossServiceImpl.java +++ b/src/main/java/com/cm/systemcity/service/communityboss/impl/CommunityBossServiceImpl.java @@ -59,6 +59,8 @@ public class CommunityBossServiceImpl extends AbstractService implements ICommun private ICityDistrictService cityDistrictService; @Autowired private ICityBuildingService cityBuildingService; + @Autowired + private ICommunityBossService communityBossService; private static final String CITY_DICT_ID = "9d179f05-3ea0-48f7-853c-d3b7124b791c"; @@ -349,7 +351,7 @@ public class CommunityBossServiceImpl extends AbstractService implements ICommun if (communityBossDTO != null) { for (int i = communityBossDTO.getCommunityBossLevel() - 1; i > 0; i--) { params.put("communityBossId", communityBossDTO.getCommunityBossParentId()); - communityBossDTO = getCommunityBossDTO(params); + communityBossDTO = communityBossService.getCommunityBoss(params); communityBossDTOs.add(0, communityBossDTO); } } diff --git a/src/main/java/com/cm/systemcity/service/userlocation/impl/UserLocationServiceImpl.java b/src/main/java/com/cm/systemcity/service/userlocation/impl/UserLocationServiceImpl.java index 3081a2f..7c2d81b 100755 --- a/src/main/java/com/cm/systemcity/service/userlocation/impl/UserLocationServiceImpl.java +++ b/src/main/java/com/cm/systemcity/service/userlocation/impl/UserLocationServiceImpl.java @@ -640,10 +640,17 @@ public class UserLocationServiceImpl extends BaseService implements IUserLocatio @Override public JSONObject getUserDetail(Map params) throws SearchException, AccessTokenException { String userId = params.get("userId").toString(); - JSONObject userDetail = userService.getUserDetail(params); + /** + * 小王帅 2021年7月5日12:02:18 + */ + Map queryMap = new HashMap<>(4); + queryMap.put("communityBossId",userId); + CommunityBossDTO communityBoss = communityBossService.getCommunityBoss(queryMap); + queryMap.put("userId",communityBoss.getCommunityBossUserId()); + JSONObject userDetail = userService.getUserDetail(queryMap); LOG.debug("上级网格长"); params.clear(); - params.put("communityBossId", userId); + params.put("communityBossId", communityBoss.getCommunityBossId()); List listParentCommunityBoss = communityBossService.listParentCommunityBossByUserId(params); userDetail.put("parentCommunityBosses", listParentCommunityBoss); LOG.debug("所属街道和社区"); diff --git a/src/main/resources/static/default.html b/src/main/resources/static/default.html index c9ad323..47b84d4 100755 --- a/src/main/resources/static/default.html +++ b/src/main/resources/static/default.html @@ -26,7 +26,7 @@
- 社区数量 + 三级网格

0

@@ -41,7 +41,7 @@
- 分管领导 + 一级网格长

0

diff --git a/src/main/resources/static/route/assessment/list_day.html b/src/main/resources/static/route/assessment/list_day.html index 9bce10a..0118022 100755 --- a/src/main/resources/static/route/assessment/list_day.html +++ b/src/main/resources/static/route/assessment/list_day.html @@ -38,7 +38,7 @@