网格员数据上报

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

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

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

@@ -447,7 +447,7 @@ public class GovOrgOpenFeignClientFallback implements GovOrgOpenFeignClient {
 
     @Override
     public Result<List<CustomerGridStaffListResultDTO>> gridStaff(CustomerGridStaffListFormDTO dto) {
-        return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "gridStaff", dto);
+        return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "gridStaffList", dto);
     }
 
 }

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

@@ -161,8 +161,8 @@ public class CustomerStaffGridController {
      * @Author sun
      * @Description  网格下工作人员列表
      **/
-    @PostMapping(value = "gridstaff")
-    public Result<List<CustomerGridStaffListResultDTO>> gridStaff(@RequestBody CustomerGridStaffListFormDTO formDTO) {
-        return new Result<List<CustomerGridStaffListResultDTO>>().ok(customerStaffGridService.gridStaff(formDTO));
+    @PostMapping("gridstafflist")
+    public Result<List<CustomerGridStaffListResultDTO>> gridStaffList(@RequestBody CustomerGridStaffListFormDTO formDTO) {
+        return new Result<List<CustomerGridStaffListResultDTO>>().ok(customerStaffGridService.gridStaffList(formDTO));
     }
 }

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

@@ -144,5 +144,5 @@ public interface CustomerStaffGridService extends BaseService<CustomerStaffGridE
      */
     List<String> getAllStaffByGridId(String gridId);
 
-    List<CustomerGridStaffListResultDTO> gridStaff(CustomerGridStaffListFormDTO formDTO);
+    List<CustomerGridStaffListResultDTO> gridStaffList(CustomerGridStaffListFormDTO formDTO);
 }

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

@@ -206,7 +206,8 @@ public class CustomerStaffGridServiceImpl extends BaseServiceImpl<CustomerStaffG
     }
 
     @Override
-    public List<CustomerGridStaffListResultDTO> gridStaff(CustomerGridStaffListFormDTO formDTO) {
+    public List<CustomerGridStaffListResultDTO> gridStaffList(CustomerGridStaffListFormDTO formDTO) {
+        //查询客户下未被禁用的工作人员基本信息
         return baseDao.getGridStaffByCustomerId(formDTO.getCustomerId());
     }
 

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

@@ -205,7 +205,7 @@
             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'
+        INNER JOIN customer_grid b ON a.grid_id = b.id AND b.del_flag = '0' AND b.`code` is not null
         WHERE
             a.del_flag = '0'
         AND a.customer_id = #{customerId}

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GridstaffInfoPingyinServiceImpl.java

@@ -44,7 +44,7 @@ public class GridstaffInfoPingyinServiceImpl extends BaseServiceImpl<GridstaffIn
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void gridStaffInfo(GridStaffInfoFormDTO formDTO) {
-        //1.查询客户网格下工作人员
+        //1.查询客户网格下工作人员【存在网格code的网格下的工作人员】
         CustomerGridStaffListFormDTO org = new CustomerGridStaffListFormDTO();
         org.setCustomerId(formDTO.getCustomerId());
         Result<List<CustomerGridStaffListResultDTO>> orgList = govOrgOpenFeignClient.gridStaff(org);
@@ -53,7 +53,7 @@ public class GridstaffInfoPingyinServiceImpl extends BaseServiceImpl<GridstaffIn
         }
         log.info(String.format("网格员数据同步，查询到网格下工作人员记录共%s条", orgList.getData().size()));
 
-        //2.查询客户工作人员基础信息
+        //2.查询客户工作人员基础信息【客户下未被禁用的有效工作人员信息】
         GridStaffUploadtFormDTO user = new GridStaffUploadtFormDTO();
         user.setCustomerId(formDTO.getCustomerId());
         Result<List<GridStaffUploadResultDTO>> userList = epmetUserOpenFeignClient.customerStaff(user);