网格下工作人员列表

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

@@ -0,0 +1,16 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+
+@Data
+public class CustomerGridStaffListFormDTO implements Serializable {
+
+    /**
+     * 客户Id
+     */
+    private String customerId;
+
+}

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

@@ -0,0 +1,34 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author sun
+ * @DESC
+ */
+@Data
+public class CustomerGridStaffListResultDTO implements Serializable {
+
+    /**
+     * 网格Id
+     */
+    private String gridId;
+
+    /**
+     * 网格编码
+     */
+    private String gridCode;
+
+    /**
+     * 网格名
+     */
+    private String gridName;
+
+    /**
+     * 区县系统中的网格员唯一编码
+     */
+    private String gridUserId;
+
+}

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java

@@ -695,4 +695,8 @@ public interface GovOrgOpenFeignClient {
      */
     @PostMapping("/gov/org/coverage/dictinit/{customerId}")
     Result dictInit(@PathVariable(value = "customerId") String customerId);
+
+    @PostMapping("/gov/org/customerstaffgrid/gridstaff")
+    Result<List<CustomerGridStaffListResultDTO>> gridStaff(CustomerGridStaffListFormDTO dto);
+
 }

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java

@@ -445,4 +445,9 @@ public class GovOrgOpenFeignClientFallback implements GovOrgOpenFeignClient {
         return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "dictInit", customerId);
     }
 
+    @Override
+    public Result<List<CustomerGridStaffListResultDTO>> gridStaff(CustomerGridStaffListFormDTO dto) {
+        return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "gridStaff", dto);
+    }
+
 }

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

@@ -29,10 +29,10 @@ import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.CustomerStaffGridDTO;
 import com.epmet.dto.form.CommonGridIdFormDTO;
+import com.epmet.dto.form.CustomerGridStaffListFormDTO;
+import com.epmet.dto.form.GridStaffUploadtFormDTO;
 import com.epmet.dto.form.LatestGridFormDTO;
-import com.epmet.dto.result.CustomerGridByUserIdResultDTO;
-import com.epmet.dto.result.EventTitleOrgResultDTO;
-import com.epmet.dto.result.GridStaffResultDTO;
+import com.epmet.dto.result.*;
 import com.epmet.excel.CustomerStaffGridExcel;
 import com.epmet.service.CustomerStaffGridService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -156,4 +156,13 @@ public class CustomerStaffGridController {
     public Result<List<String>> getAllStaffByGridId(@RequestParam("gridId")String gridId){
         return new Result<List<String>>().ok(customerStaffGridService.getAllStaffByGridId(gridId));
     }
+
+    /**
+     * @Author sun
+     * @Description  网格下工作人员列表
+     **/
+    @PostMapping(value = "gridstaff")
+    public Result<List<CustomerGridStaffListResultDTO>> gridStaff(@RequestBody CustomerGridStaffListFormDTO formDTO) {
+        return new Result<List<CustomerGridStaffListResultDTO>>().ok(customerStaffGridService.gridStaff(formDTO));
+    }
 }

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

@@ -22,6 +22,7 @@ import com.epmet.dto.CustomerGridDTO;
 import com.epmet.dto.CustomerStaffGridDTO;
 import com.epmet.dto.StaffOrgRelationDTO;
 import com.epmet.dto.form.LatestGridFormDTO;
+import com.epmet.dto.result.CustomerGridStaffListResultDTO;
 import com.epmet.dto.result.EventTitleOrgResultDTO;
 import com.epmet.dto.result.GridStaffResultDTO;
 import com.epmet.entity.CustomerStaffGridEntity;
@@ -130,4 +131,5 @@ public interface CustomerStaffGridDao extends BaseDao<CustomerStaffGridEntity> {
      */
     List<String> getAllStaffByGridId(String gridId);
 
+    List<CustomerGridStaffListResultDTO> getGridStaffByCustomerId(@Param("customerId") String customerId);
 }

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

@@ -22,8 +22,10 @@ import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.CustomerStaffGridDTO;
 import com.epmet.dto.form.CommonGridIdFormDTO;
+import com.epmet.dto.form.CustomerGridStaffListFormDTO;
 import com.epmet.dto.form.LatestGridFormDTO;
 import com.epmet.dto.result.CustomerGridByUserIdResultDTO;
+import com.epmet.dto.result.CustomerGridStaffListResultDTO;
 import com.epmet.dto.result.EventTitleOrgResultDTO;
 import com.epmet.dto.result.GridStaffResultDTO;
 import com.epmet.entity.CustomerStaffGridEntity;
@@ -142,4 +144,5 @@ public interface CustomerStaffGridService extends BaseService<CustomerStaffGridE
      */
     List<String> getAllStaffByGridId(String gridId);
 
+    List<CustomerGridStaffListResultDTO> gridStaff(CustomerGridStaffListFormDTO formDTO);
 }

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

@@ -29,8 +29,10 @@ import com.epmet.dao.CustomerStaffGridDao;
 import com.epmet.dto.CustomerGridDTO;
 import com.epmet.dto.CustomerStaffGridDTO;
 import com.epmet.dto.form.CommonGridIdFormDTO;
+import com.epmet.dto.form.CustomerGridStaffListFormDTO;
 import com.epmet.dto.form.LatestGridFormDTO;
 import com.epmet.dto.result.CustomerGridByUserIdResultDTO;
+import com.epmet.dto.result.CustomerGridStaffListResultDTO;
 import com.epmet.dto.result.EventTitleOrgResultDTO;
 import com.epmet.dto.result.GridStaffResultDTO;
 import com.epmet.entity.CustomerStaffGridEntity;
@@ -202,4 +204,10 @@ public class CustomerStaffGridServiceImpl extends BaseServiceImpl<CustomerStaffG
     public List<String> getAllStaffByGridId(String gridId) {
         return baseDao.getAllStaffByGridId(gridId);
     }
+
+    @Override
+    public List<CustomerGridStaffListResultDTO> gridStaff(CustomerGridStaffListFormDTO formDTO) {
+        return baseDao.getGridStaffByCustomerId(formDTO.getCustomerId());
+    }
+
 }

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

@@ -196,4 +196,20 @@
         WHERE DEL_FLAG = '0'
           AND GRID_ID = #{gridId}
     </select>
+
+    <select id="getGridStaffByCustomerId" resultType="com.epmet.dto.result.CustomerGridStaffListResultDTO">
+        SELECT
+            b.id gridId,
+            b.grid_name gridName,
+            b. code gridCode,
+            a.user_id gridUserId
+        FROM
+            customer_staff_grid a
+        INNER JOIN customer_grid b ON a.grid_id = b.id AND b.del_flag = '0'
+        WHERE
+            a.del_flag = '0'
+        AND a.customer_id = #{customerId}
+        ORDER BY a.grid_id ASC
+    </select>
+
 </mapper>

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

@@ -17,10 +17,6 @@ public class GridStaffUploadtFormDTO {
      * 客户Id
      */
     private String customerId;
-    /**
-     * 网格Id
-     */
-    private List<String> gridId;
 
 
 }

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

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

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

@@ -642,8 +642,8 @@ public class EpmetUserOpenFeignClientFallback implements EpmetUserOpenFeignClien
     }
 
     @Override
-    public Result<List<GridStaffUploadResultDTO>> gridStaffUploadt(GridStaffUploadtFormDTO formDTO) {
-        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "gridStaffUploadt", formDTO);
+    public Result<List<GridStaffUploadResultDTO>> customerStaff(GridStaffUploadtFormDTO formDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "customerStaff", formDTO);
     }
 
 }

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

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

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

@@ -348,5 +348,5 @@ public interface CustomerStaffService extends BaseService<CustomerStaffEntity> {
 	 **/
     List<GridMobileListResultDTO> gridMobileList(String gridId, String userId);
 
-    List<GridStaffUploadResultDTO> gridStaffUploadt(GridStaffUploadtFormDTO formDTO);
+    List<GridStaffUploadResultDTO> customerStaff(GridStaffUploadtFormDTO formDTO);
 }

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

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