Merge branch 'lingshan_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud

epmet-module/data-report/data-report-client/src/main/java/com/epmet/user/result/GridManagerListResultDTO.java

@@ -20,6 +20,11 @@ public class GridManagerListResultDTO implements Serializable {
      */
     private String staffId;
 
+    private Integer gender;
+
+    private Integer age;
+
+    private String headPhoto;
     /**
      * 工作人员手机号
      */

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/user/impl/StaffPatrolDetailServiceImpl.java

@@ -1,14 +1,18 @@
 package com.epmet.datareport.service.user.impl;
 
 import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
 import com.epmet.commons.tools.exception.RenException;
+import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
 import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.commons.tools.utils.EpmetRequestHolder;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.datareport.constant.PatrolConstant;
 import com.epmet.datareport.dao.user.StaffPatrolDetailDao;
 import com.epmet.datareport.dao.user.StaffPatrolRecordDao;
 import com.epmet.datareport.service.evaluationindex.screen.ScreenOrgService;
 import com.epmet.datareport.service.user.StaffPatrolDetailService;
+import com.epmet.dto.IcEventDTO;
 import com.epmet.dto.form.PatrolCountFormDTO;
 import com.epmet.dto.form.PatrolTrackFormDTO;
 import com.epmet.dto.form.RecordListFormDTO;
@@ -54,7 +58,7 @@ public class StaffPatrolDetailServiceImpl implements StaffPatrolDetailService {
     private EpmetUserOpenFeignClient epmetUserOpenFeignClient;
 
     /**
-     * @Description  001、网格员分布
+     * @Description 001、网格员分布
      * 1.根据agencyId或者areaCode查询出网格
      * 2.根据查出来的网格ID去查网格下边的人【人只要网格员】
      * 3.根据userId查询巡查记录表
@@ -66,31 +70,40 @@ public class StaffPatrolDetailServiceImpl implements StaffPatrolDetailService {
     @Override
     public List<GridManagerListResultDTO> gridManagerList(GridManagerListFormDTO formDTO) {
         List<GridManagerListResultDTO> grids = new ArrayList<>();
-        if (StringUtils.isEmpty(formDTO.getAreaCode())){
+        if (StringUtils.isEmpty(formDTO.getAreaCode())) {
             // 根据agencyId查询网格
             grids = screenOrgService.selectAllGrid(formDTO.getAgencyId(), null);
-        }else {
+        } else {
             // 根据areaCode查询网格
             grids = screenOrgService.selectAllGrid(null, formDTO.getAreaCode());
         }
-        if (CollectionUtils.isEmpty(grids)){
+        if (CollectionUtils.isEmpty(grids)) {
             return new ArrayList<>();
         }
-        List<String> gridIds = grids.stream().map(m -> m.getGridId()).collect(Collectors.toList());
+        List<String> gridIds = grids.stream().map(GridManagerListResultDTO::getGridId).collect(Collectors.toList());
         // 查询网格下的网格员
         Result<List<GridStaffResultDTO>> resultData = govOrgOpenFeignClient.selectGridStaffByGridIds(gridIds);
-        if(!resultData.success()){
-            throw new RenException("查询网格下的网格员失败【"+resultData.getMsg()+"】");
+        if (!resultData.success()) {
+            throw new RenException("查询网格下的网格员失败【" + resultData.getMsg() + "】");
         }
         List<GridStaffResultDTO> data = resultData.getData();
-        if (CollectionUtils.isEmpty(data)){
+        if (CollectionUtils.isEmpty(data)) {
             return new ArrayList<>();
         }
         List<GridManagerListResultDTO> result = ConvertUtils.sourceToTarget(data, GridManagerListResultDTO.class);
+        result.forEach(staff -> {//获取头像
+            CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(EpmetRequestHolder.getLoginUserCustomerId(), staff.getStaffId());
+            if (null != staffInfo) {
+                staff.setHeadPhoto(staffInfo.getHeadPhoto());
+            }
+        });
+        //统计事件
+        List<IcEventDTO> events = null;
+
         // 查询经纬度
-        Result<UserNameAndLLResultDTO> selectll = epmetUserOpenFeignClient.selectll(result.stream().map(m -> m.getStaffId()).collect(Collectors.toList()));
-        if (!selectll.success()){
-            throw new RenException("查询经纬度和姓名失败【"+selectll.getMsg()+"】");
+        Result<UserNameAndLLResultDTO> selectll = epmetUserOpenFeignClient.selectll(result.stream().map(GridManagerListResultDTO::getStaffId).collect(Collectors.toList()));
+        if (!selectll.success()) {
+            throw new RenException("查询经纬度和姓名失败【" + selectll.getMsg() + "】");
         }
         UserNameAndLLResultDTO llAndNameData = selectll.getData();
         List<GridManagerListResultDTO> finalGrids = grids;
@@ -107,27 +120,27 @@ public class StaffPatrolDetailServiceImpl implements StaffPatrolDetailService {
                 });
             }
             // 姓名赋值
-            if (!CollectionUtils.isEmpty(llAndNameData.getUserNames())){
+            if (!CollectionUtils.isEmpty(llAndNameData.getUserNames())) {
                 llAndNameData.getUserNames().forEach(n -> {
-                    if (r.getStaffId().equals(n.getUserId())){
+                    if (r.getStaffId().equals(n.getUserId())) {
                         r.setStaffName(n.getUserName());
                     }
                 });
             }
             // 网格名赋值
             finalGrids.forEach(g -> {
-                if (r.getGridId().equals(g.getGridId())){
+                if (r.getGridId().equals(g.getGridId())) {
                     r.setGridName(g.getGridName());
                 }
             });
         });
         result.forEach(r -> {
-            if (!r.getLlStatus()){
+            if (!r.getLlStatus()) {
                 finalGrids.forEach(g -> {
                     // 网格相同，并且中心点位不为空，并且中心点位不等于 '[]'
-                    if (r.getGridId().equals(g.getGridId()) && (StringUtils.isNotBlank(g.getCenterMark())&& !"[]".equals(g.getCenterMark()))){
-                        r.setLongitude(getLL(g.getCenterMark(),PatrolConstant.LONGITUDE));
-                        r.setLatitude(getLL(g.getCenterMark(),PatrolConstant.LATITUDE));
+                    if (r.getGridId().equals(g.getGridId()) && (StringUtils.isNotBlank(g.getCenterMark()) && !"[]".equals(g.getCenterMark()))) {
+                        r.setLongitude(getLL(g.getCenterMark(), PatrolConstant.LONGITUDE));
+                        r.setLatitude(getLL(g.getCenterMark(), PatrolConstant.LATITUDE));
                     }
                 });
             }
@@ -136,7 +149,7 @@ public class StaffPatrolDetailServiceImpl implements StaffPatrolDetailService {
     }
 
     /**
-     * @Description  网格员分布
+     * @Description 网格员分布
      * @Param formDTO
      * @author zxc
      * @date 2021/8/25 3:00 下午
@@ -146,14 +159,14 @@ public class StaffPatrolDetailServiceImpl implements StaffPatrolDetailService {
         List<GridManagerListResultDTO> resultTwo = this.gridManagerList(formDTO);
         List<GridManagerListGeneralResultDTO> result = ConvertUtils.sourceToTarget(resultTwo, GridManagerListGeneralResultDTO.class);
         Result<List<PatrolYuShanResultDTO>> listResult = epmetUserOpenFeignClient.patrolInfo(formDTO.getAgencyId());
-        if (!listResult.success()){
+        if (!listResult.success()) {
             throw new RenException("查询巡查次数和时长失败");
         }
         List<PatrolYuShanResultDTO> data = listResult.getData();
-        if (!CollectionUtils.isEmpty(data)){
+        if (!CollectionUtils.isEmpty(data)) {
             result.forEach(r -> {
                 data.forEach(d -> {
-                    if (r.getGridId().equals(d.getGridId()) && r.getStaffId().equals(d.getStaffId())){
+                    if (r.getGridId().equals(d.getGridId()) && r.getStaffId().equals(d.getStaffId())) {
                         r.setPatrolCount(d.getPatrolCount());
                         r.setPatrolDuration(d.getPatrolDuration());
                     }
@@ -164,17 +177,17 @@ public class StaffPatrolDetailServiceImpl implements StaffPatrolDetailService {
     }
 
     /**
-     * @Description  根据中心点位截取经纬度
+     * @Description 根据中心点位截取经纬度
      * @Param centMark
      * @Param ll
      * @author zxc
      * @date 2021/6/9 2:08 下午
      */
-    public String getLL(String centMark,String ll){
-        if (ll.equals(PatrolConstant.LONGITUDE)){
+    public String getLL(String centMark, String ll) {
+        if (ll.equals(PatrolConstant.LONGITUDE)) {
             String longitude = centMark.substring(NumConstant.TWO, centMark.indexOf(","));
             return longitude;
-        }else {
+        } else {
             String s = centMark.substring(NumConstant.ZERO, centMark.indexOf(","));
             String latitude = centMark.substring(s.length() + NumConstant.ONE, centMark.length() - NumConstant.TWO);
             return latitude;
@@ -182,7 +195,7 @@ public class StaffPatrolDetailServiceImpl implements StaffPatrolDetailService {
     }
 
     /**
-     * @Description  002、查看巡查记录
+     * @Description 002、查看巡查记录
      * @Param formDTO
      * @author zxc
      * @date 2021/6/7 3:25 下午
@@ -190,18 +203,18 @@ public class StaffPatrolDetailServiceImpl implements StaffPatrolDetailService {
     @Override
     public List<RecordListResultDTO> recordList(RecordListFormDTO formDTO) {
         Result<List<RecordListResultDTO>> listResult = epmetUserOpenFeignClient.recordList(formDTO);
-        if (!listResult.success()){
-            throw new RenException("查询巡查记录失败【"+listResult.getMsg()+"】");
+        if (!listResult.success()) {
+            throw new RenException("查询巡查记录失败【" + listResult.getMsg() + "】");
         }
         List<RecordListResultDTO> result = listResult.getData();
-        if (!CollectionUtils.isEmpty(result)){
+        if (!CollectionUtils.isEmpty(result)) {
             return result;
         }
         return new ArrayList<>();
     }
 
     /**
-     * @Description  003、巡查轨迹
+     * @Description 003、巡查轨迹
      * @Param formDTO
      * @author zxc
      * @date 2021/6/7 3:35 下午
@@ -209,18 +222,18 @@ public class StaffPatrolDetailServiceImpl implements StaffPatrolDetailService {
     @Override
     public List<PatrolTrackResultDTO> patrolTrack(PatrolTrackFormDTO formDTO) {
         Result<List<PatrolTrackResultDTO>> result = epmetUserOpenFeignClient.patrolTrack(formDTO);
-        if (!result.success()){
-            throw new RenException("查询 巡查轨迹失败【"+result.getMsg()+"】");
+        if (!result.success()) {
+            throw new RenException("查询 巡查轨迹失败【" + result.getMsg() + "】");
         }
         List<PatrolTrackResultDTO> results = result.getData();
-        if (!CollectionUtils.isEmpty(results)){
+        if (!CollectionUtils.isEmpty(results)) {
             return results;
         }
         return new ArrayList<>();
     }
 
     /**
-     * @Description  004、网格员巡查中和未巡查中的人数
+     * @Description 004、网格员巡查中和未巡查中的人数
      * @Param formDTO
      * @author zxc
      * @date 2021/6/22 2:01 下午
@@ -228,7 +241,7 @@ public class StaffPatrolDetailServiceImpl implements StaffPatrolDetailService {
     @Override
     public PatrolCountResultDTO patrolCount(PatrolCountFormDTO formDTO) {
         Result<PatrolCountResultDTO> resultDTOResult = epmetUserOpenFeignClient.patrolCount(formDTO);
-        if (!resultDTOResult.success()){
+        if (!resultDTOResult.success()) {
             throw new RenException("查询巡查人数失败...");
         }
         return resultDTOResult.getData();

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/GridStaffResultDTO.java

@@ -20,4 +20,8 @@ public class GridStaffResultDTO implements Serializable {
 
     private String mobile;
 
+    private Integer age;
+
+    private Integer gender;
+
 }

epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/IcEventResultDTO.java

@@ -9,6 +9,7 @@ public class IcEventResultDTO {
     private String gridId;
     private String sourceType;
     private String eventType;
+    private int repayStatus;
     private String manageStatus;
     private String categoryCode;
     private String latitude;

epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/IcEventRsultCountDTO.java

@@ -0,0 +1,35 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author yan Lu
+ * @description 描述
+ * @create 2023/6/2 16:10
+ */
+@Data
+public class IcEventRsultCountDTO {
+
+    /**
+     * 总量
+     */
+    private Integer eventTotal;
+
+    /**
+     * 已完成
+     */
+    private Integer completeTotal;
+
+    /**
+     * 未完成
+     */
+    private Integer unCompleteTotal;
+
+    /**
+     * 事件列表
+     */
+
+    private List<IcEventResultDTO> eventList;
+}

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/IcEventController.java

@@ -40,9 +40,11 @@ import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.PrintWriter;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 事件管理表
@@ -640,7 +642,7 @@ public class IcEventController {
      * @param orgId
      * @param orgType
      * @param sourceType 事件来源
-     * @param eventType  响应几杯
+     * @param eventType  响应级别
      * @return
      */
     @GetMapping("getListBySourceTypeOrEventType")
@@ -671,5 +673,28 @@ public class IcEventController {
         return new Result<List<IcEventResultDTO>>().ok(icEventService.getListByStatus(orgId, orgType, eventType, sourceType, status, categoryCode));
     }
 
-
+    /**
+     * @description 根据网格员ID获取统计事件处理情况和事件列表
+     * @author yan Lu
+     * @date 2023/6/2 16:13
+     */
+    @GetMapping("getEventsByStaffId")
+    public Result<IcEventRsultCountDTO> getEventsByStaffId(@RequestParam("staffId") String staffId, @RequestParam("status") String status) {
+        IcEventRsultCountDTO data = new IcEventRsultCountDTO();
+        List<IcEventResultDTO> eventList = icEventService.getEventsByStaffId(staffId, status);
+        if (null != eventList && eventList.size() > 0) {
+            data.setEventTotal(eventList.size());
+            Long complateTotal = eventList.stream().filter(e -> e.getRepayStatus() >= 2).collect(Collectors.counting());
+            Long unComplateTotal = eventList.stream().filter(e -> e.getRepayStatus() < 2).collect(Collectors.counting());
+            data.setCompleteTotal(Math.toIntExact(complateTotal));
+            data.setUnCompleteTotal(Math.toIntExact(unComplateTotal));
+            data.setEventList(eventList);
+        } else {
+            data.setEventList(new ArrayList<>());
+            data.setEventTotal(0);
+            data.setCompleteTotal(0);
+            data.setUnCompleteTotal(0);
+        }
+        return new Result<IcEventRsultCountDTO>().ok(data);
+    }
 }

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/IcEventDao.java

@@ -218,5 +218,7 @@ public interface IcEventDao extends BaseDao<IcEventEntity> {
     List<IcEventResultDTO> getListBySourceTypeOrEventType(@Param("orgIdPath") String orgPath,
                                                           @Param("sourceType") String sourceType, @Param("eventType") String eventType);
 
-    GridOrVillageEventRateResultDTO getEventRateByGridIds(@Param("orgId") String orgId,@Param("orgType") String orgType);
+    GridOrVillageEventRateResultDTO getEventRateByGridIds(@Param("orgId") String orgId, @Param("orgType") String orgType);
+
+    List<IcEventResultDTO> getEventsByStaffId(@Param("staffId") String staffId, @Param("replyStatus") String status);
 }

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/IcEventService.java

@@ -278,11 +278,14 @@ public interface IcEventService extends BaseService<IcEventEntity> {
 
     /**
      * 根据事件处理状态查询列表
+     *
      * @param sourceType 事件来源
-     * @param status 事件处理状态
+     * @param status     事件处理状态
      * @return
      */
-    List<IcEventResultDTO> getListByStatus(String orgId, String orgType, String eventType,String sourceType, String status,String categoryCode);
+    List<IcEventResultDTO> getListByStatus(String orgId, String orgType, String eventType, String sourceType, String status, String categoryCode);
 
     List<IcEventResultDTO> getListBySourceTypeOrEventType(String orgId, String orgType, String sourceType, String eventType);
+
+    List<IcEventResultDTO> getEventsByStaffId(String staffId, String status);
 }

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java

@@ -2070,6 +2070,11 @@ public class IcEventServiceImpl extends BaseServiceImpl<IcEventDao, IcEventEntit
         return baseDao.getListBySourceTypeOrEventType(getOrgPath(orgId, orgType), sourceType, eventType);
     }
 
+    @Override
+    public List<IcEventResultDTO> getEventsByStaffId(String staffId,String status) {
+        return baseDao.getEventsByStaffId(staffId,status);
+    }
+
     /**
      * @deprecationg 获取orgPath
      */

epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml

@@ -606,6 +606,7 @@
             e.GRID_ID AS gridId,
             e.SOURCE_TYPE AS sourceType,
             e.EVENT_TYPE AS eventType,
+            e.REPLY_STATUS AS repayStatus,
             e.LATITUDE,
             e.LONGITUDE,
             e.EVENT_CONTENT AS eventContent,
@@ -681,4 +682,26 @@
         </where>
     </select>
 
+    <select id="getEventsByStaffId" resultType="com.epmet.dto.result.IcEventResultDTO">
+        SELECT
+            <include refid="eventArguments"/>
+        FROM ic_event e
+        LEFT JOIN ic_event_reply r ON r.IC_EVENT_ID = e.ID
+         <if test="null != staffId and staffId != ''">
+             AND r.FROM_USER_ID = #{staffId}
+         </if>
+        LEFT JOIN ic_event_category c ON c.IC_EVENT_ID = e.ID
+        <where>
+            e.DEL_FLAG = 0
+            <if test="replyStatus == 0 and replyStatus !=''">
+                AND (e.REPLY_STATUS = 0 OR e.REPLY_STATUS = 1 OR e.REPLY_STATUS IS NULL)
+            </if>
+            <if test="replyStatus == 1 and replyStatus !=''">
+                AND (e.REPLY_STATUS = 2 OR e.REPLY_STATUS = 3 OR e.REPLY_STATUS = 4 OR e.REPLY_STATUS = 5)
+            </if>
+        </where>
+        GROUP BY e.ID,c.ic_event_id,r.ic_event_id
+        ORDER BY r.MANAGE_TIME DESC,e.CREATED_TIME DESC
+    </select>
+
 </mapper>

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffRoleServiceImpl.java

@@ -53,8 +53,10 @@ public class StaffRoleServiceImpl extends BaseServiceImpl<StaffRoleDao, StaffRol
 
     @Autowired
     private GovOrgOpenFeignClient govOrgOpenFeignClient;
+
     /**
      * 查询具有某角色的staff列表
+     *
      * @param roleKey
      * @param orgId
      * @return
@@ -71,9 +73,9 @@ public class StaffRoleServiceImpl extends BaseServiceImpl<StaffRoleDao, StaffRol
     }
 
     /**
+     * @return Result<StaffRolesResultDTO>
      * @Description 得到某一个员工在一个客户下的所有角色
      * @Param CommonUserFormDTO :: getUserId :: getCustomerId
-     * @return Result<StaffRolesResultDTO>
      * @Author wangc
      * @Date 2020.04.26 10:59
      **/
@@ -83,19 +85,19 @@ public class StaffRoleServiceImpl extends BaseServiceImpl<StaffRoleDao, StaffRol
     }
 
     /**
-     * @Description 查找具有特定角色的人员Id(可用)
      * @param rolesUsersListFormDTO
      * @return Result<String>
+     * @Description 查找具有特定角色的人员Id(可用)
      * @author wangc
      * @date 2020.04.29 23:44
      **/
     @Override
     public Result<List<String>> getSpecificRolesStaffs(RolesUsersListFormDTO rolesUsersListFormDTO) {
-        if(null != rolesUsersListFormDTO.getRoleKeys() && null != rolesUsersListFormDTO.getUserIds()
+        if (null != rolesUsersListFormDTO.getRoleKeys() && null != rolesUsersListFormDTO.getUserIds()
                 && rolesUsersListFormDTO.getRoleKeys().size() > NumConstant.ZERO
-                && rolesUsersListFormDTO.getUserIds().size() > NumConstant.ZERO){
+                && rolesUsersListFormDTO.getUserIds().size() > NumConstant.ZERO) {
             return new Result<List<String>>().ok(
-                    baseDao.selectSpecificRolesStaffs(rolesUsersListFormDTO.getRoleKeys(),rolesUsersListFormDTO.getUserIds(),rolesUsersListFormDTO.getCustomerId()));
+                    baseDao.selectSpecificRolesStaffs(rolesUsersListFormDTO.getRoleKeys(), rolesUsersListFormDTO.getUserIds(), rolesUsersListFormDTO.getCustomerId()));
         }
         return new Result<List<String>>().ok(new ArrayList<>());
     }
@@ -126,20 +128,21 @@ public class StaffRoleServiceImpl extends BaseServiceImpl<StaffRoleDao, StaffRol
     }
 
     /**
-     * @Description  查询网格员角色
+     * @Description 查询网格员角色
      * @Param forms
      * @author zxc
      * @date 2021/6/8 4:42 下午
      */
     @Override
     public List<GridStaffResultDTO> staffGridRole(List<GridStaffResultDTO> forms) {
-        if (CollectionUtils.isEmpty(forms)){
+        if (CollectionUtils.isEmpty(forms)) {
             return new ArrayList<>();
         }
-        List<String> userIds = forms.stream().map(m -> m.getStaffId()).distinct().collect(Collectors.toList());
+        //不用为什么要下面这一句？
+//        List<String> userIds = forms.stream().map(m -> m.getStaffId()).distinct().collect(Collectors.toList());
 //        List<GridStaffResultDTO> result = baseDao.staffGridRoleByIds(userIds);
         List<GridStaffResultDTO> result = baseDao.staffGridRole(forms);
-        if (CollectionUtils.isEmpty(result)){
+        if (CollectionUtils.isEmpty(result)) {
             return new ArrayList<>();
         }
         return result;
@@ -155,10 +158,10 @@ public class StaffRoleServiceImpl extends BaseServiceImpl<StaffRoleDao, StaffRol
      */
     @Override
     public Set<String> queryRoleStaffIds(RoleStaffIdFormDTO formDTO) {
-        if(CollectionUtils.isEmpty(formDTO.getRoleIds())){
+        if (CollectionUtils.isEmpty(formDTO.getRoleIds())) {
             return Collections.EMPTY_SET;
         }
-        return baseDao.selectRoleStaffIds(formDTO.getCustomerId(),formDTO.getRoleIds());
+        return baseDao.selectRoleStaffIds(formDTO.getCustomerId(), formDTO.getRoleIds());
     }
 
     @Override
@@ -166,15 +169,15 @@ public class StaffRoleServiceImpl extends BaseServiceImpl<StaffRoleDao, StaffRol
         //有这些条件 优先查询用户信息
         List<CustomerGridStaffResultDTO> staffList = baseDao.getStaffList(formDTO);
 
-        if (CollectionUtils.isEmpty(staffList)){
+        if (CollectionUtils.isEmpty(staffList)) {
             log.warn("getGridStaffList getStaffList return empty,param:{}", JSON.toJSONString(formDTO));
-            return new PageData<>(null,NumConstant.ZERO);
+            return new PageData<>(null, NumConstant.ZERO);
         }
         //继续查询 在网格里的人
-        Result<List<CustomerStaffGridResultDTO>> staffGridResult = govOrgOpenFeignClient.getStaffGridList(formDTO.getCustomerId(),formDTO.getOrgId(),formDTO.getOrgType());
-        if (staffGridResult == null || !staffGridResult.success() || CollectionUtils.isEmpty(staffGridResult.getData())){
-            log.warn("getGridStaffList getStaffGridList return empty,param orgId:{},orgType:{}",formDTO.getOrgId(),formDTO.getOrgType());
-            return new PageData<>(null,NumConstant.ZERO);
+        Result<List<CustomerStaffGridResultDTO>> staffGridResult = govOrgOpenFeignClient.getStaffGridList(formDTO.getCustomerId(), formDTO.getOrgId(), formDTO.getOrgType());
+        if (staffGridResult == null || !staffGridResult.success() || CollectionUtils.isEmpty(staffGridResult.getData())) {
+            log.warn("getGridStaffList getStaffGridList return empty,param orgId:{},orgType:{}", formDTO.getOrgId(), formDTO.getOrgType());
+            return new PageData<>(null, NumConstant.ZERO);
         }
         Map<String, List<CustomerStaffGridResultDTO>> userGridListMap = staffGridResult.getData().stream()
                 .collect(Collectors.groupingBy(CustomerStaffGridResultDTO::getUserId));
@@ -183,13 +186,13 @@ public class StaffRoleServiceImpl extends BaseServiceImpl<StaffRoleDao, StaffRol
         Integer pageSize = formDTO.getPageSize();
 
         AtomicInteger count = new AtomicInteger();
-        staffList.forEach(staff->{
+        staffList.forEach(staff -> {
             List<CustomerStaffGridResultDTO> dtoList = userGridListMap.get(staff.getUserId());
-            if (dtoList == null){
+            if (dtoList == null) {
                 return;
             }
 
-            dtoList.forEach(grid-> {
+            dtoList.forEach(grid -> {
                 CustomerGridStaffResultDTO staffNew = ConvertUtils.sourceToTarget(staff, CustomerGridStaffResultDTO.class);
                 staffNew.setGridId(grid.getGridId());
                 staffNew.setGridName(grid.getGridName());
@@ -201,11 +204,12 @@ public class StaffRoleServiceImpl extends BaseServiceImpl<StaffRoleDao, StaffRol
             });
 
         });
-        return new PageData<>(result,count.get());
+        return new PageData<>(result, count.get());
     }
 
     /**
      * Desc: 查询是否是超级管理员
+     *
      * @param userId
      * @author zxc
      * @date 2022/7/13 11:03
@@ -214,11 +218,11 @@ public class StaffRoleServiceImpl extends BaseServiceImpl<StaffRoleDao, StaffRol
     public Boolean getIsRootManager(String userId) {
         Boolean result = false;
         List<String> roleKeys = baseDao.getRoleKeys(userId);
-        if (roleKeys.isEmpty()){
+        if (roleKeys.isEmpty()) {
             return result;
         }
         for (String roleKey : roleKeys) {
-            if (roleKey.equals("root_manager")){
+            if (roleKey.equals("root_manager")) {
                 result = true;
                 break;
             }

epmet-user/epmet-user-server/src/main/resources/mapper/StaffRoleDao.xml

@@ -198,15 +198,18 @@
     <select id="staffGridRole" resultType="com.epmet.dto.result.GridStaffResultDTO">
         <foreach collection="forms" item="s" separator=" UNION ALL ">
             SELECT
-            #{s.gridId} as gridId,
-            sr.STAFF_ID,
-            cs.MOBILE
+                #{s.gridId} as gridId,
+                sr.STAFF_ID,
+                cs.MOBILE,
+                YEAR(NOW())-YEAR(cs.BIRTHDAY) AS age,
+                cs.GENDER
             FROM staff_role sr
             LEFT JOIN gov_staff_role gsr ON gsr.ID = sr.ROLE_ID AND gsr.DEL_FLAG = 0
-            LEFT JOIN  customer_staff cs ON cs.USER_ID = sr.STAFF_ID AND cs.customer_id = sr.customer_id AND cs.DEL_FLAG = 0
-            WHERE sr.DEL_FLAG = 0
-            AND gsr.ROLE_KEY = 'grid_member'
-            AND sr.STAFF_ID = #{s.staffId}
+            LEFT JOIN customer_staff cs ON cs.USER_ID = sr.STAFF_ID AND cs.customer_id = sr.customer_id AND cs.DEL_FLAG = 0
+            WHERE
+                sr.DEL_FLAG = 0
+                AND gsr.ROLE_KEY = 'grid_member'
+                AND sr.STAFF_ID = #{s.staffId}
         </foreach>
     </select>