修改所有片长为网格长 所有N员为专管员

修改地图首页点击网格查看详情数据为空的问题
This commit is contained in:
wans 2021-07-05 12:54:56 +08:00
parent 941396ae1d
commit 01ca20b474
63 changed files with 95 additions and 86 deletions

View File

@ -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<EasyUITreeDTO> subAreaEasyUITreeDTOS = new ArrayList<>();
EasyUITreeDTO level1Area = createAreaTreeDTO("areaLevel1", "二级网格长责任区域", "icon-area");

View File

@ -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);
}
}

View File

@ -640,10 +640,17 @@ public class UserLocationServiceImpl extends BaseService implements IUserLocatio
@Override
public JSONObject getUserDetail(Map<String, Object> params) throws SearchException, AccessTokenException {
String userId = params.get("userId").toString();
JSONObject userDetail = userService.getUserDetail(params);
/**
* 小王帅 2021年7月5日12:02:18
*/
Map<String, Object> 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<CommunityBossDTO> listParentCommunityBoss = communityBossService.listParentCommunityBossByUserId(params);
userDetail.put("parentCommunityBosses", listParentCommunityBoss);
LOG.debug("所属街道和社区");

View File

@ -26,7 +26,7 @@
<i class="fa fa-users media-object"></i>
</span>
<div class="media-body">
<small>社区数量</small>
<small>三级网格</small>
<h2 id="communityCount" class="media-heading animate-number">0</h2>
</div>
</div>
@ -41,7 +41,7 @@
<i class="fa fa-users media-object"></i>
</span>
<div class="media-body">
<small>分管领导</small>
<small>一级网格长</small>
<h2 id="bossLeaderCount" class="media-heading animate-number">0</h2>
</div>
</div>

View File

@ -38,7 +38,7 @@
<div class="layui-inline" id="communitySelectTemplateBox" style="width: 150px;"></div>
<script id="communitySelectTemplate" type="text/html">
<select id="communityId" name="communityId">
<option value="">选择片区</option>
<option value="">选择网格</option>
{{# for(var i = 0, item; item = d[i++];) { }}
<option value="{{item.communityId}}">{{item.communityName}}</option>
{{# } }}
@ -50,7 +50,7 @@
<option value="1">一级网格长</option>
<option value="2">二级网格长</option>
<option value="3">三级网格长</option>
<option value="4">N</option>
<option value="4">专管</option>
</select>
</div>
<div class="layui-inline">

View File

@ -38,7 +38,7 @@
<div class="layui-inline" id="communitySelectTemplateBox" style="width: 150px;"></div>
<script id="communitySelectTemplate" type="text/html">
<select id="communityId" name="communityId">
<option value="">选择片区</option>
<option value="">选择网格</option>
{{# for(var i = 0, item; item = d[i++];) { }}
<option value="{{item.communityId}}">{{item.communityName}}</option>
{{# } }}
@ -50,7 +50,7 @@
<option value="1">一级网格长</option>
<option value="2">二级网格长</option>
<option value="3">三级网格长</option>
<option value="4">N</option>
<option value="4">专管</option>
</select>
</div>
<div class="layui-inline">

View File

@ -117,7 +117,7 @@
<div class="layui-row layui-col-space1">
<div class="layui-col-md6">
<div class="layui-card">
<div class="layui-card-header">N员】打卡</div>
<div class="layui-card-header">专管员】打卡</div>
<div class="layui-card-body">
<div class="layui-row">
<div class="layui-col-md6">

View File

@ -124,7 +124,7 @@
return '网格长';
}
if(rowData == 2) {
return 'N员';
return '专管员';
}
return '错误';
}

View File

@ -50,7 +50,7 @@
<option value="1">一级网格长</option>
<option value="2">二级网格长</option>
<option value="3">三级网格长</option>
<option value="4">N</option>
<option value="4">专管</option>
</select>
</div>
<div class="layui-inline" style="width: 150px;">

View File

@ -50,7 +50,7 @@
<option value="1">一级网格长</option>
<option value="2">二级网格长</option>
<option value="3">三级网格长</option>
<option value="4">N</option>
<option value="4">专管</option>
</select>
</div>
<div class="layui-inline" style="width: 150px;">

View File

@ -25,8 +25,8 @@
<option value="1">二级网格长</option>
<option value="2">三级网格长</option>
<option value="3">四级网格长</option>
<option value="4">五级网格</option>
<option value="5">N</option>
<option value="4">五级网格</option>
<option value="5">专管</option>
</select>
</div>
</div>
@ -143,12 +143,12 @@
});
}
// 选择N
// 选择专管
function selectNPerson() {
var index = layer.open({
type: 2,
icon: 1,
title: '选择N员',
title: '选择专管员',
shadeClose: false,
maxmin: false,
closeBtn: 0,

View File

@ -25,7 +25,7 @@
<option value="1">二级网格长</option>
<option value="2">三级网格长</option>
<option value="3">四级网格长</option>
<option value="4">五级网格</option>
<option value="4">五级网格</option>
</select>
</div>
</div>
@ -142,12 +142,12 @@
});
}
// 选择N
// 选择专管
function selectNPerson() {
var index = layer.open({
type: 2,
icon: 1,
title: '选择N员',
title: '选择专管员',
shadeClose: false,
maxmin: false,
closeBtn: 0,

View File

@ -322,7 +322,7 @@
value = '巡检采集';
break;
case '3':
value = 'N员上报';
value = '专管员上报';
break;
default:
value = '未知';

View File

@ -336,7 +336,7 @@
value = '巡检采集';
break;
case '3':
value = 'N员上报';
value = '专管员上报';
break;
default:
value = '未知';

View File

@ -333,7 +333,7 @@
value = '巡检采集';
break;
case '3':
value = 'N员上报';
value = '专管员上报';
break;
default:
value = '未知';

View File

@ -356,7 +356,7 @@
value = '巡检采集';
break;
case '3':
value = 'N员上报';
value = '专管员上报';
break;
default:
value = '未知';

View File

@ -331,7 +331,7 @@
value = '巡检采集';
break;
case '3':
value = 'N员上报';
value = '专管员上报';
break;
default:
value = '未知';

View File

@ -331,7 +331,7 @@
value = '巡检采集';
break;
case '3':
value = 'N员上报';
value = '专管员上报';
break;
default:
value = '未知';

View File

@ -354,7 +354,7 @@
value = '巡检采集';
break;
case '3':
value = 'N员上报';
value = '专管员上报';
break;
default:
value = '未知';

View File

@ -319,7 +319,7 @@
value = '巡检采集';
break;
case '3':
value = 'N员上报';
value = '专管员上报';
break;
default:
value = '未知';

View File

@ -329,7 +329,7 @@
value = '巡检采集';
break;
case '3':
value = 'N员上报';
value = '专管员上报';
break;
default:
value = '未知';

View File

@ -329,7 +329,7 @@
value = '巡检采集';
break;
case '3':
value = 'N员上报';
value = '专管员上报';
break;
default:
value = '未知';

View File

@ -317,7 +317,7 @@
value = '巡检采集';
break;
case '3':
value = 'N员上报';
value = '专管员上报';
break;
default:
value = '未知';

View File

@ -317,7 +317,7 @@
value = '巡检采集';
break;
case '3':
value = 'N员上报';
value = '专管员上报';
break;
default:
value = '未知';

View File

@ -324,7 +324,7 @@
value = '巡检采集';
break;
case '3':
value = 'N员上报';
value = '专管员上报';
break;
default:
value = '未知';

View File

@ -331,7 +331,7 @@
value = '巡检采集';
break;
case '3':
value = 'N员上报';
value = '专管员上报';
break;
default:
value = '未知';

View File

@ -331,7 +331,7 @@
value = '巡检采集';
break;
case '3':
value = 'N员上报';
value = '专管员上报';
break;
default:
value = '未知';

View File

@ -319,7 +319,7 @@
value = '巡检采集';
break;
case '3':
value = 'N员上报';
value = '专管员上报';
break;
default:
value = '未知';

View File

@ -319,7 +319,7 @@
value = '巡检采集';
break;
case '3':
value = 'N员上报';
value = '专管员上报';
break;
default:
value = '未知';

View File

@ -70,7 +70,7 @@
<option value="">选择来源</option>
<option value="1">群众举报</option>
<option value="2">巡检采集</option>
<option value="3">N员上报</option>
<option value="3">专管员上报</option>
</select>
</div>
</div>

View File

@ -70,7 +70,7 @@
<option value="">选择来源</option>
<option value="1">群众举报</option>
<option value="2">巡检采集</option>
<option value="3">N员上报</option>
<option value="3">专管员上报</option>
</select>
</div>
</div>

View File

@ -70,7 +70,7 @@
<option value="">选择来源</option>
<option value="1">群众举报</option>
<option value="2">巡检采集</option>
<option value="3">N员上报</option>
<option value="3">专管员上报</option>
</select>
</div>
</div>

View File

@ -24,7 +24,7 @@
<option value="0">请选择分类</option>
<option value="1">二级网格长</option>
<option value="2">三级网格长</option>
<option value="3">N</option>
<option value="3">专管</option>
</select>
</div>
</div>
@ -271,12 +271,12 @@
});
}
// 选择N
// 选择专管
function selectNPerson() {
var index = layer.open({
type: 2,
icon: 1,
title: '选择N员',
title: '选择专管员',
shadeClose: false,
maxmin: false,
closeBtn: 0,

View File

@ -320,7 +320,7 @@
value = '巡检采集';
break;
case '3':
value = 'N员上报';
value = '专管员上报';
break;
default:
value = '未知';

View File

@ -333,7 +333,7 @@
value = '巡检采集';
break;
case '3':
value = 'N员上报';
value = '专管员上报';
break;
default:
value = '未知';

View File

@ -356,7 +356,7 @@
value = '巡检采集';
break;
case '3':
value = 'N员上报';
value = '专管员上报';
break;
default:
value = '未知';

View File

@ -324,7 +324,7 @@
value = '巡检采集';
break;
case '3':
value = 'N员上报';
value = '专管员上报';
break;
default:
value = '未知';

View File

@ -333,7 +333,7 @@
value = '巡检采集';
break;
case '3':
value = 'N员上报';
value = '专管员上报';
break;
default:
value = '未知';

View File

@ -331,7 +331,7 @@
value = '巡检采集';
break;
case '3':
value = 'N员上报';
value = '专管员上报';
break;
default:
value = '未知';

View File

@ -319,7 +319,7 @@
value = '巡检采集';
break;
case '3':
value = 'N员上报';
value = '专管员上报';
break;
default:
value = '未知';

View File

@ -319,7 +319,7 @@
value = '巡检采集';
break;
case '3':
value = 'N员上报';
value = '专管员上报';
break;
default:
value = '未知';

View File

@ -322,7 +322,7 @@
value = '巡检采集';
break;
case '3':
value = 'N员上报';
value = '专管员上报';
break;
default:
value = '未知';

View File

@ -71,7 +71,7 @@
<option value="">选择来源</option>
<option value="1">群众举报</option>
<option value="2">巡检采集</option>
<option value="3">N员上报</option>
<option value="3">专管员上报</option>
</select>
</div>
</div>

View File

@ -70,7 +70,7 @@
<option value="">选择来源</option>
<option value="1">群众举报</option>
<option value="2">巡检采集</option>
<option value="3">N员上报</option>
<option value="3">专管员上报</option>
</select>
</div>
</div>

View File

@ -71,7 +71,7 @@
<option value="">选择来源</option>
<option value="1">群众举报</option>
<option value="2">巡检采集</option>
<option value="3">N员上报</option>
<option value="3">专管员上报</option>
</select>
</div>
</div>

View File

@ -327,7 +327,7 @@
value = '巡检采集';
break;
case '3':
value = 'N员上报';
value = '专管员上报';
break;
default:
value = '未知';

View File

@ -329,7 +329,7 @@
value = '巡检采集';
break;
case '3':
value = 'N员上报';
value = '专管员上报';
break;
default:
value = '未知';

View File

@ -316,7 +316,7 @@
value = '巡检采集';
break;
case '3':
value = 'N员上报';
value = '专管员上报';
break;
default:
value = '未知';

View File

@ -84,7 +84,7 @@
<option value="">选择来源</option>
<option value="1">群众举报</option>
<option value="2">巡检采集</option>
<option value="3">N员上报</option>
<option value="3">专管员上报</option>
</select>
</div>
</div>

View File

@ -84,7 +84,7 @@
<option value="">选择来源</option>
<option value="1">群众举报</option>
<option value="2">巡检采集</option>
<option value="3">N员上报</option>
<option value="3">专管员上报</option>
</select>
</div>
</div>

View File

@ -84,7 +84,7 @@
<option value="">选择来源</option>
<option value="1">群众举报</option>
<option value="2">巡检采集</option>
<option value="3">N员上报</option>
<option value="3">专管员上报</option>
</select>
</div>
</div>

View File

@ -56,7 +56,7 @@
<td colspan="3">
<span v-for="(parentCommunityBoss, index) in userDetail.parentCommunityBosses" v-if="userDetail.parentCommunityBosses.length > 0">
<span v-if="index > 0"></span>
<span>{{parentCommunityBoss.communityBossName}}<span v-if="parentCommunityBoss.communityBossLevel == 1">级网格长】</span><span v-if="parentCommunityBoss.communityBossLevel == 2">级网格长】</span><span v-if="parentCommunityBoss.communityBossLevel == 3">级网格长】</span></span>
<span>{{parentCommunityBoss.communityBossName}}<span v-if="parentCommunityBoss.communityBossLevel == 1">级网格长】</span><span v-if="parentCommunityBoss.communityBossLevel == 2">级网格长】</span><span v-if="parentCommunityBoss.communityBossLevel == 3">级网格长】</span></span>
</span>
<span v-if="userDetail.parentCommunityBosses.length == 0"></span>
</td>

View File

@ -61,7 +61,7 @@
<li id="menuBtn1" class="menu-btn active">
<a href="javascript: void(0);">
<i class="fa fa-map"></i>
<span>片区</span>
<span>网格</span>
</a>
</li>
<li id="menuBtn2" class="menu-btn">
@ -304,7 +304,7 @@
top.dialog.close(loadLayerIndex);
});
},
// N员片区
// 专管员片区
initNPersonArea: function(departmentId) {
var self = this;
var loadLayerIndex;

View File

@ -24,7 +24,7 @@
<div class="layui-inline layui-form area-select-item">
<select id="userType" name="userType" class="area-edit" lay-filter="userType" lay-search>
<option value="1" selected>网格长</option>
<option value="2">N</option>
<option value="2">专管</option>
</select>
</div>
<div class="layui-inline layui-form area-select-item" id="selectNPersonBox" style="display: none;">
@ -47,7 +47,7 @@
<option value="1">二级网格长</option>
<option value="2">三级网格长</option>
<option value="3">四级网格长</option>
<option value="4">五级网格</option>
<option value="4">五级网格</option>
<!--<option value="5">五级网格长</option>-->
</select>
</div>
@ -265,7 +265,7 @@
}
});
}
// 选择N
// 选择专管
function selectNPerson() {
var selectedUserIds = '';
for(var i = 0, item; item = gridMember.users[i++];) {
@ -277,7 +277,7 @@
top.dialog.dialogData.selectedUserIds = selectedUserIds;
top.dialog.user({
url: top.restAjax.path('route/system/user/select-department-user.html', []),
title: '选择N员',
title: '选择专管员',
width: '500px',
height: '500px',
onClose: function () {

View File

@ -29,7 +29,7 @@
<div id="userTypeBox" style="padding: 0 5px 5px 5px; display: none;">
<select id="userType" class="easyui-combobox" name="userType" style="width:100%;">
<option value="1">网格长</option>
<option value="2">N</option>
<option value="2">专管</option>
</select>
</div>
<div id="communityBossLevelBox" style="padding: 0 5px 5px 5px; display: none;">
@ -546,11 +546,11 @@
}
});
},
// 选择N
// 选择专管
selectNPerson: function() {
var self = this;
top.DialogBox.user({
title: '选择N员',
title: '选择专管员',
width: '400px',
height: '400px',
single: false,

View File

@ -38,7 +38,7 @@
<div class="layui-inline" id="communitySelectTemplateBox" style="width: 150px;"></div>
<script id="communitySelectTemplate" type="text/html">
<select id="communityId" name="communityId">
<option value="">选择片区</option>
<option value="">选择网格</option>
{{# for(var i = 0, item; item = d[i++];) { }}
<option value="{{item.communityId}}">{{item.communityName}}</option>
{{# } }}
@ -50,7 +50,7 @@
<option value="1">一级网格长</option>
<option value="2">二级网格长</option>
<option value="3">三级网格长</option>
<option value="4">N</option>
<option value="4">专管</option>
</select>
</div>
<div class="layui-inline" style="width: 150px;">

View File

@ -38,7 +38,7 @@
<div class="layui-inline" id="communitySelectTemplateBox" style="width: 150px;"></div>
<script id="communitySelectTemplate" type="text/html">
<select id="communityId" name="communityId">
<option value="">选择片区</option>
<option value="">选择网格</option>
{{# for(var i = 0, item; item = d[i++];) { }}
<option value="{{item.communityId}}">{{item.communityName}}</option>
{{# } }}
@ -50,7 +50,7 @@
<option value="1">一级网格长</option>
<option value="2">二级网格长</option>
<option value="3">三级网格长</option>
<option value="4">N</option>
<option value="4">专管</option>
</select>
</div>
<div class="layui-inline" style="width: 150px;">

View File

@ -38,7 +38,7 @@
<div class="layui-inline" id="communitySelectTemplateBox" style="width: 150px;"></div>
<script id="communitySelectTemplate" type="text/html">
<select id="communityId" name="communityId">
<option value="">选择片区</option>
<option value="">选择网格</option>
{{# for(var i = 0, item; item = d[i++];) { }}
<option value="{{item.communityId}}">{{item.communityName}}</option>
{{# } }}
@ -50,7 +50,7 @@
<option value="1">一级网格长</option>
<option value="2">二级网格长</option>
<option value="3">三级网格长</option>
<option value="4">N</option>
<option value="4">专管</option>
</select>
</div>
<div class="layui-inline">

View File

@ -38,7 +38,7 @@
<div class="layui-inline" id="communitySelectTemplateBox" style="width: 150px;"></div>
<script id="communitySelectTemplate" type="text/html">
<select id="communityId" name="communityId">
<option value="">选择片区</option>
<option value="">选择网格</option>
{{# for(var i = 0, item; item = d[i++];) { }}
<option value="{{item.communityId}}">{{item.communityName}}</option>
{{# } }}
@ -50,7 +50,7 @@
<option value="1">一级网格长</option>
<option value="2">二级网格长</option>
<option value="3">三级网格长</option>
<option value="4">N</option>
<option value="4">专管</option>
</select>
</div>
<div class="layui-inline">

View File

@ -50,7 +50,7 @@
<option value="1">一级网格长</option>
<option value="2">二级网格长</option>
<option value="3">三级网格长</option>
<option value="4">N</option>
<option value="4">专管</option>
</select>
</div>
<div class="layui-inline" style="width: 150px;">

View File

@ -50,7 +50,7 @@
<option value="1">一级网格长</option>
<option value="2">二级网格长</option>
<option value="3">三级网格长</option>
<option value="4">N</option>
<option value="4">专管</option>
</select>
</div>
<div class="layui-inline" style="width: 150px;">

View File

@ -50,7 +50,7 @@
<option value="1">一级网格长</option>
<option value="2">二级网格长</option>
<option value="3">三级网格长</option>
<option value="4">N</option>
<option value="4">专管</option>
</select>
</div>
<div class="layui-inline">

View File

@ -43,7 +43,7 @@
地区
<input id="areaId" class="easyui-textbox" style="width:150px;" data-options="prompt:'选择地区'">
<span id="communityIdBox" style="display: none;">
片区
网格
<input id="communityId" class="easyui-textbox" style="width:150px;" data-options="prompt:'选择社区'">
</span>
类别
@ -52,7 +52,7 @@
<option value="1">一级网格长</option>
<option value="2">二级网格长</option>
<option value="3">三级网格长</option>
<option value="4">N</option>
<option value="4">专管</option>
</select>
姓名 <input id="keywords" class="easyui-textbox" style="width:120px;">
</div>