Merge remote-tracking branch 'origin/dev_ic_mp' into dev_ic_mp

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/OrgMobileFormDTO.java

@@ -0,0 +1,26 @@
+package com.epmet.dto.form;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * @author sun
+ * @Description 查询网格所属组织电话
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class OrgMobileFormDTO {
+
+    /**
+     * 网格Id
+     */
+    @NotBlank(message = "网格Id不能为空", groups = OrgMobile.class)
+    private String gridId;
+
+    public interface OrgMobile{}
+
+}

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

@@ -46,6 +46,10 @@ public class AgencyListResultDTO implements Serializable {
      * 总人数
      */
     private Integer totalUser;
+    /**
+     * 编码
+     */
+    private String code;
     /**
      * 负责人
      */
@@ -55,5 +59,4 @@ public class AgencyListResultDTO implements Serializable {
      */
     private String mobile;
 
-
 }

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

@@ -46,6 +46,10 @@ public class DepartmentListResultDTO implements Serializable {
      * 部门下总人数
      */
     private Integer totalUser = 0;
+    /**
+     * 编码
+     */
+    private String code;
     /**
      * 负责人
      */

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

@@ -29,7 +29,10 @@ public class GridBaseInfoResultDTO implements Serializable {
      * 网格人数
      * */
     private Integer totalUser;
-
+    /**
+     * 编码
+     */
+    private String code;
     /**
      * 负责人
      */

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

@@ -0,0 +1,25 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author sun
+ * @Description 查询网格所属组织电话
+ */
+@Data
+public class OrgMobileResultDTO implements Serializable {
+    /**
+     * 机关组织Id
+     */
+    private String agencyId = "";
+    /**
+     * 机关组织名称
+     */
+    private String agencyName = "";
+    /**
+     * 组织联系电话
+     */
+    private String mobile = "";
+}

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java

@@ -369,4 +369,14 @@ public class CustomerAgencyController {
         return new Result<AgencyTreeResultDTO>().ok(customerAgencyService.getOrgTreeData(tokenDTO.getUserId()));
     }
 
+    /**
+     * @Description 【事件】社区服务热线
+     * @author sun
+     **/
+    @PostMapping("orgmobile")
+    Result<OrgMobileResultDTO> orgMobile(@RequestBody OrgMobileFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO, OrgMobileFormDTO.OrgMobile.class);
+        return new Result<OrgMobileResultDTO>().ok(customerAgencyService.orgMobile(formDTO.getGridId()));
+    }
+
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java

@@ -282,5 +282,10 @@ public interface CustomerAgencyDao extends BaseDao<CustomerAgencyEntity> {
      */
     List<String> getSonAgencyId(@Param("orgId") String orgId);
 
+    /**
+     * @Description 【事件】社区服务热线
+     * @author sun
+     **/
+    OrgMobileResultDTO getAgencyMobile(@Param("gridId") String gridId);
 }
 

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java

@@ -263,4 +263,10 @@ public interface CustomerAgencyService extends BaseService<CustomerAgencyEntity>
      * @return
      */
     AgencyTreeResultDTO getOrgTreeData(String staffId);
+
+    /**
+     * @Description 【事件】社区服务热线
+     * @author sun
+     **/
+    OrgMobileResultDTO orgMobile(String gridId);
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java

@@ -1193,4 +1193,14 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl<CustomerAgencyDao
     public List<StaffOrgsResultDTO> getStaffOrgListByStaffId(String staffId) {
         return baseDao.getStaffOrgListByStaffId(staffId);
     }
+
+    /**
+     * @Description 【事件】社区服务热线
+     * @author sun
+     **/
+    @Override
+    public OrgMobileResultDTO orgMobile(String gridId) {
+        return baseDao.getAgencyMobile(gridId);
+    }
+
 }

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml

@@ -124,6 +124,7 @@
             id AS 'agencyId',
             organization_name AS 'agencyName',
             total_user AS 'totalUser',
+            code 'code',
             contacts 'contacts',
 	        mobile 'mobile'
         FROM customer_agency
@@ -736,4 +737,18 @@
           AND PID = #{orgId}
     </select>
 
+    <select id="getAgencyMobile" resultType="com.epmet.dto.result.OrgMobileResultDTO">
+        SELECT
+            ca.id agencyId,
+            ca.organization_name agencyName,
+            ca.mobile mobile
+        FROM
+            customer_grid cg
+        INNER JOIN customer_agency ca ON cg.pid = ca.id
+        WHERE
+            cg.del_flag = '0'
+        AND ca.del_flag = '0'
+        AND cg.id = #{gridId}
+    </select>
+
 </mapper>

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerDepartmentDao.xml

@@ -24,6 +24,7 @@
             id AS 'departmentId',
             department_name AS 'departmentName',
             total_user AS 'totalUser',
+            code AS 'code',
             contacts AS 'contacts',
 	        mobile AS 'mobile'
         FROM customer_department

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml

@@ -284,6 +284,7 @@
             id AS gridId,
             IFNULL(grid_name,"") AS gridName,
             total_user,
+            code,
             contacts,
             mobile
         FROM

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/GridMobileListFormDTO.java

@@ -0,0 +1,24 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * @description: 【事件】网格员服务电话
+ * @author: sun
+ */
+@NoArgsConstructor
+@Data
+public class GridMobileListFormDTO {
+
+    /**
+     * 网格Id
+     */
+    @NotBlank(message = "网格Id不能为空", groups = Gridobile.class)
+    private String gridId;
+
+    public interface Gridobile{}
+
+}

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/GridMobileListResultDTO.java

@@ -0,0 +1,61 @@
+package com.epmet.dto.result;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @description: 【事件】网格员服务电话
+ * @author: sun
+ */
+@Data
+public class GridMobileListResultDTO {
+    /**
+     * 网格Id
+     */
+    private String gridId;
+
+    /**
+     * 工作人员Id
+     */
+    private String staffId;
+
+    /**
+     * 人员名称
+     */
+    private String staffName;
+
+    /**
+     * 性别
+     */
+    private String gender;
+
+    /**
+     * 工作人员头像
+     */
+    private String staffHeadPhoto;
+
+    /**
+     * 人员角色列表
+     */
+    private List<Role> roleList;
+
+    @Data
+    public static class Role {
+        /**
+         * 工作人员Id
+         */
+        @JsonIgnore
+        private String staffId;
+        /**
+         * 角色Id
+         */
+        private String roleId;
+
+        /**
+         * 角色名称
+         */
+        private String roleName;
+    }
+}

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/CustomerStaffController.java

@@ -479,5 +479,15 @@ public class CustomerStaffController {
         return new Result<List<CustomerStaffDTO>>().ok(customerStaffService.getByRealNames(formDTO));
     }
 
+    /**
+     * @Author sun
+     * @Description 【事件】网格员服务电话
+     **/
+    @PostMapping(value = "gridmobilelist")
+    public Result<List<GridMobileListResultDTO>> gridMobileList(@RequestBody GridMobileListFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO, GridMobileListFormDTO.Gridobile.class);
+        return new Result<List<GridMobileListResultDTO>>().ok(customerStaffService.gridMobileList(formDTO.getGridId()));
+    }
+
 
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/dao/CustomerStaffDao.java

@@ -127,7 +127,7 @@ public interface CustomerStaffDao extends BaseDao<CustomerStaffEntity> {
 	 * @Author sun
 	 * @Description 根据staffId集合查询工作人员基础信息
 	 **/
-    List<StaffListResultDTO>  selectStaffByIds(@Param("staffIdList") List<String> staffIdList);
+    List<StaffListResultDTO> selectStaffByIds(@Param("staffIdList") List<String> staffIdList);
 
 	/**
 	 * @param staffId
@@ -221,4 +221,10 @@ public interface CustomerStaffDao extends BaseDao<CustomerStaffEntity> {
 	 * @Description 根据工作人员姓名批量查询基础信息数据
 	 **/
     List<CustomerStaffDTO> getByRealNames(GetByRealNamesFormDTO formDTO);
+
+	/**
+	 * @Author sun
+	 * @Description 工作人员基本信息
+	 **/
+    List<GridMobileListResultDTO> gridStaffMobileList(List<String> staffIdList);
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/dao/StaffRoleDao.java

@@ -163,4 +163,10 @@ public interface StaffRoleDao extends BaseDao<StaffRoleEntity> {
      * @date 2021/8/19 11:16 上午
      */
     Set<String> selectRoleStaffIds(@Param("customerId") String customerId,@Param("roleIds") Set<String> roleIds);
+
+    /**
+     * @Author sun
+     * @Description 【事件】网格员服务电话
+     **/
+    List<GridMobileListResultDTO.Role> staffRoleList(@Param("staffIds") List<String> staffIds);
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/CustomerStaffService.java

@@ -341,4 +341,10 @@ public interface CustomerStaffService extends BaseService<CustomerStaffEntity> {
 	 * @Description 根据工作人员姓名批量查询基础信息数据
 	 **/
     List<CustomerStaffDTO> getByRealNames(GetByRealNamesFormDTO formDTO);
+
+	/**
+	 * @Author sun
+	 * @Description 【事件】网格员服务电话
+	 **/
+    List<GridMobileListResultDTO> gridMobileList(String gridId);
 }

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

@@ -799,4 +799,48 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl<CustomerStaffDao,
 		return baseDao.getByRealNames(formDTO);
 	}
 
+	/**
+	 * @Author sun
+	 * @Description 【事件】网格员服务电话
+	 **/
+	@Override
+	public List<GridMobileListResultDTO> gridMobileList(String gridId) {
+		List<GridMobileListResultDTO> resultList = new ArrayList<>();
+		//1.查询网格下工作人员列表
+		CommonGridIdFormDTO dto = new CommonGridIdFormDTO();
+		dto.setGridId(gridId);
+		Result<List<String>> gridStaffs = govOrgOpenFeignClient.getGridStaffs(dto);
+		if (!gridStaffs.success()) {
+			throw new RenException("获取网格下工作人员列表失败!");
+		}
+		if (gridStaffs.getData().size() < NumConstant.ONE) {
+			return resultList;
+		}
+
+		//2.查询工作人员中拥有网格长网格员角色的人员列表
+		List<GridMobileListResultDTO.Role> staffRoleList = staffRoleDao.staffRoleList(gridStaffs.getData());
+
+		//3.查询工作人员基础信息
+		List<String> staffIdList = staffRoleList.stream().map(GridMobileListResultDTO.Role::getStaffId).collect(Collectors.toList());
+		staffIdList = staffIdList.stream().distinct().collect(Collectors.toList());
+		List<StaffListResultDTO> list = baseDao.selectStaffByIds(staffIdList);
+
+		//4.封装数据并返回
+		resultList = ConvertUtils.sourceToTarget(list, GridMobileListResultDTO.class);
+		List<GridMobileListResultDTO.Role> roleList = null;
+		for (GridMobileListResultDTO re : resultList) {
+			roleList = new ArrayList<>();
+			for (GridMobileListResultDTO.Role r : staffRoleList) {
+				if (re.getStaffId().equals(r.getStaffId())) {
+					GridMobileListResultDTO.Role role = ConvertUtils.sourceToTarget(r, GridMobileListResultDTO.Role.class);
+					roleList.add(role);
+				}
+			}
+			re.setGridId(gridId);
+			re.setRoleList(roleList);
+		}
+
+		return resultList;
+	}
+
 }

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

@@ -451,5 +451,6 @@
             #{name}
         </foreach>
     </select>
+    <select id="gridStaffMobileList" resultType="com.epmet.dto.result.GridMobileListResultDTO"></select>
 
 </mapper>

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

@@ -253,4 +253,23 @@
               </foreach>
           </if>
     </select>
+
+    <select id="staffRoleList" resultType="com.epmet.dto.result.GridMobileListResultDTO$Role">
+        SELECT
+            sr.staff_id staffId,
+            sr.role_id roleId,
+            gsr.role_name roleName
+        FROM
+            staff_role sr
+        INNER JOIN gov_staff_role gsr ON sr.role_id = gsr.id
+        WHERE
+            sr.del_flag = '0'
+        AND gsr.del_flag = '0'
+        AND gsr.role_key IN('grid_manager','grid_member')
+        <foreach collection="staffIds" item="staffId" open="AND sr.staff_id IN (" separator="," close=")">
+            #{staffId}
+        </foreach>
+        ORDER BY sr.staff_id, gsr.role_key
+    </select>
+
 </mapper>