客户下工作人员

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

@@ -0,0 +1,26 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+/**
+ * @description: 网格工作人员数据上报-查询客户网格下有效工作人员信息数据
+ * @author: sun
+ */
+@NoArgsConstructor
+@Data
+public class GridStaffUploadtFormDTO {
+
+    /**
+     * 客户Id
+     */
+    private String customerId;
+    /**
+     * 网格Id
+     */
+    private List<String> gridId;
+
+
+}

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

@@ -0,0 +1,39 @@
+package com.epmet.dto.result;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @description: 网格工作人员数据上报-查询客户网格下有效工作人员信息数据
+ * @author: sun
+ */
+@Data
+public class GridStaffUploadResultDTO {
+    /**
+     * 区县系统中的网格员唯一编码
+     */
+    private String gridUserId;
+
+    /**
+     * 网格员姓名
+     */
+    private String nickName;
+
+    /**
+     * 网格员身份证号码
+     */
+    private String cardNum;
+
+    /**
+     * 网格员手机号
+     */
+    private String phonenumber;
+
+    /**
+     * 网格员性别，应符合10.31中性别,不要有 其他
+     */
+    private String sex;
+
+}

epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java

@@ -846,4 +846,7 @@ public interface EpmetUserOpenFeignClient {
      */
     @PostMapping("/epmetuser/icResiUserDataSync/icDataSyncTask")
     Result<Boolean> icDataSyncTask(String customerId);
+
+    @PostMapping("/epmetuser/customerstaff/gridstaffupload")
+    Result<List<GridStaffUploadResultDTO>> gridStaffUploadt(@RequestBody GridStaffUploadtFormDTO formDTO);
 }

epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java

@@ -641,4 +641,9 @@ public class EpmetUserOpenFeignClientFallback implements EpmetUserOpenFeignClien
         return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "icDataSyncTask", customerId);
     }
 
+    @Override
+    public Result<List<GridStaffUploadResultDTO>> gridStaffUploadt(GridStaffUploadtFormDTO formDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "gridStaffUploadt", formDTO);
+    }
+
 }

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

@@ -493,5 +493,14 @@ public class CustomerStaffController {
         return new Result<List<GridMobileListResultDTO>>().ok(customerStaffService.gridMobileList(formDTO.getGridId(), tokenDto.getUserId()));
     }
 
+    /**
+     * @Author sun
+     * @Description  网格工作人员数据上报-查询客户网格下有效工作人员信息数据
+     **/
+    @PostMapping(value = "gridstaffupload")
+    public Result<List<GridStaffUploadResultDTO>> gridStaffUploadt(@RequestBody GridStaffUploadtFormDTO formDTO) {
+        return new Result<List<GridStaffUploadResultDTO>>().ok(customerStaffService.gridStaffUploadt(formDTO));
+    }
+
 
 }

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

@@ -229,4 +229,6 @@ public interface CustomerStaffDao extends BaseDao<CustomerStaffEntity> {
 	 * @Description 工作人员基本信息
 	 **/
     List<GridMobileListResultDTO> gridStaffMobileList(List<String> staffIdList);
+
+	List<GridStaffUploadResultDTO> getStaffByCustomerId(@Param("customerId") String customerId);
 }

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

@@ -347,4 +347,6 @@ public interface CustomerStaffService extends BaseService<CustomerStaffEntity> {
 	 * @Description 【事件】网格员服务电话
 	 **/
     List<GridMobileListResultDTO> gridMobileList(String gridId, String userId);
+
+    List<GridStaffUploadResultDTO> gridStaffUploadt(GridStaffUploadtFormDTO formDTO);
 }

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

@@ -856,4 +856,10 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl<CustomerStaffDao,
         return resultList;
     }
 
+    @Override
+    public List<GridStaffUploadResultDTO> gridStaffUploadt(GridStaffUploadtFormDTO formDTO) {
+        //1.查询客户下有效工作人员信息
+        return baseDao.getStaffByCustomerId(formDTO.getCustomerId());
+    }
+
 }

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

@@ -456,4 +456,19 @@
     </select>
     <select id="gridStaffMobileList" resultType="com.epmet.dto.result.GridMobileListResultDTO"></select>
 
+    <select id="getStaffByCustomerId" resultType="com.epmet.dto.result.GridStaffUploadResultDTO">
+        SELECT
+            user_id gridUserId,
+            real_name nickName,
+            id_card cardNum,
+            gender sex,
+            mobile phonenumber
+        FROM
+            customer_staff
+        WHERE
+            del_flag = '0'
+        AND enable_flag = 'enable'
+        AND customer_id = #{customerId}
+    </select>
+
 </mapper>