springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/GridMemberVO.java
@@ -33,6 +33,12 @@ private Integer workEndTime; @ApiModelProperty(value = "市平台网格员关联id") private Long lcMemberId; @ApiModelProperty(value = "市平台网格员id") private String lcGridMemberId; @ApiModelProperty(value = "市平台网格员名称") private String lcGridMemberName; @ApiModelProperty(value = "浪潮网格员绑定的用户ID") private String lcBindUserId; @ApiModelProperty(value = "网格员关联楼栋信息") private List<GridMemberBuildingVO> memberBuildingList;
@@ -24,6 +24,7 @@ import com.panzhihua.common.service.grid.GridService; import com.panzhihua.common.utlis.CopyUtil; import com.panzhihua.common.utlis.DateUtils; import com.panzhihua.common.utlis.StringUtils; import com.panzhihua.serviceapi.biz.LcApiService; import com.panzhihua.serviceapi.model.dto.*; import lombok.extern.slf4j.Slf4j; @@ -175,7 +176,7 @@ request.form("areaId", areaId); request.form("limit", pageSize); request.form("page", pageNum); if(param !=null){ if(StringUtils.isNotEmpty(param)){ request.form("param", param); } HttpResponse result = request.execute(); springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java
@@ -423,8 +423,8 @@ @Delete("delete from event_grid_member_building_relation where grid_member_id = #{gridMemberId}") void delGridMemberRelation(@Param("gridMemberId") Long gridMemberId); @Select("select id from lc_compare_code_member where local_grid_member_id = #{gridMemberId}") Long getLcMemberId(@Param("gridMemberId") Long gridMemberId); @Select("select lc_grid_member_id,lc_grid_member_name,lc_bind_user_id from lc_compare_code_member where local_grid_member_id = #{gridMemberId}") Map<String,String> getLcMemberId(@Param("gridMemberId") Long gridMemberId); @Select("select count(id) from event_grid_member_relation where grid_member_id = #{userId}") Integer getGridIsOk(@Param("userId") Long userId); springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
@@ -2008,7 +2008,12 @@ if(!gridMemberPage.getRecords().isEmpty()){ gridMemberPage.getRecords().forEach(gridMember -> { //查询网格员关联市平台网格员id gridMember.setLcMemberId(this.userDao.getLcMemberId(gridMember.getUserId())); Map<String,String> lcMemberMap = this.userDao.getLcMemberId(gridMember.getUserId()); if(lcMemberMap != null){ gridMember.setLcGridMemberId(lcMemberMap.get("lc_grid_member_id")); gridMember.setLcGridMemberName(lcMemberMap.get("lc_grid_member_name")); gridMember.setLcBindUserId(lcMemberMap.get("lc_bind_user_id")); } //查询网格员关联楼栋信息 List<GridMemberBuildingVO> memberBuildingList = eventGridMemberBuildingRelationMapper.getGridMemberBuildingRelation(gridMember.getUserId());
