微调

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/DataStatisticalOpenFeignClient.java

@@ -293,14 +293,14 @@ public interface DataStatisticalOpenFeignClient {
     Result<List<CustomerAgencyDTO>> getAgencyBaseInfo(@RequestBody AgencyBaseInfoFormDTO formDTO);
 
     /**
-     * @dscription 批量查询客户组织基础信息
+     * @dscription 批量查询客户网格基础信息
      * @author sun
      */
     @PostMapping("/data/stats/datareporting/gridbaseinfo")
     Result<List<CustomerGridDTO>> getGridBaseInfo(@RequestBody GridBaseInfoFormDTO formDTO);
 
     /**
-     * @dscription 批量查询客户组织基础信息
+     * @dscription 批量查询客户网格员基础信息
      * @author sun
      */
     @PostMapping("/data/stats/datareporting/staffbaseinfo")

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DataReportingController.java

@@ -49,7 +49,7 @@ public class DataReportingController {
 
 	/**
 	 * @Author sun
-	 * @Description 批量查询客户网格人员基础信息
+	 * @Description 批量查询客户网格员基础信息
 	 **/
 	@PostMapping("staffbaseinfo")
 	public Result<List<CustomerStaffDTO>> getStaffBaseInfo(@RequestBody(required = false) StaffBaseInfoFormDTO formDTO) {

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/user/UserDao.java

@@ -256,7 +256,7 @@ public interface UserDao {
 
     /**
      * @Author sun
-     * @Description 批量查询客户网格人员基础信息
+     * @Description 批量查询客户网格员基础信息
      **/
     List<CustomerStaffDTO> getStaffBaseInfo(StaffBaseInfoFormDTO formDTO);
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/DataReportingService.java

@@ -30,7 +30,7 @@ public interface DataReportingService {
 
 	/**
 	 * @Author sun
-	 * @Description 批量查询客户网格人员基础信息
+	 * @Description 批量查询客户网格员基础信息
 	 *
 	 * @return*/
 	List<CustomerStaffDTO> getStaffBaseInfo(StaffBaseInfoFormDTO formDTO);

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/DataReportingServiceImpl.java

@@ -54,11 +54,11 @@ public class DataReportingServiceImpl implements DataReportingService {
 
 	/**
 	 * @Author sun
-	 * @Description 批量查询客户网格人员基础信息
+	 * @Description 批量查询客户网格员基础信息
 	 **/
 	@Override
 	public List<CustomerStaffDTO> getStaffBaseInfo(StaffBaseInfoFormDTO formDTO) {
-		//批量查询客户网格人员信息
+		//批量查询客户网格员信息
 		List<CustomerStaffDTO> resultList = userService.getStaffBaseInfo(formDTO);
 		return resultList;
 	}

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/user/UserService.java

@@ -141,7 +141,7 @@ public interface UserService {
 
     /**
      * @Author sun
-     * @Description 批量查询客户网格人员基础信息
+     * @Description 批量查询客户网格员基础信息
      **/
     List<CustomerStaffDTO> getStaffBaseInfo(StaffBaseInfoFormDTO formDTO);
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/user/impl/UserServiceImpl.java

@@ -1091,7 +1091,7 @@ public class UserServiceImpl implements UserService {
 
     /**
      * @Author sun
-     * @Description 批量查询客户网格人员基础信息
+     * @Description 批量查询客户网格员基础信息
      **/
     @Override
     public List<CustomerStaffDTO> getStaffBaseInfo(StaffBaseInfoFormDTO formDTO) {

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/user/UserDao.xml

@@ -993,13 +993,19 @@
 
     <select id="getStaffBaseInfo" resultType="com.epmet.dto.user.result.CustomerStaffDTO">
         SELECT
-        *
+            cs.*
         FROM
-            customer_staff
+            customer_staff cs
+        INNER JOIN staff_role sr ON cs.user_id = sr.staff_id
+        INNER JOIN gov_staff_role gsr ON sr.role_id = gsr.id
         WHERE
-            del_flag = '0'
+            cs.del_flag = '0'
-        AND customer_id = #{customerId}
+        AND cs.enable_flag = 'enable'
-        <foreach collection="staffIdList" item="staffId" open="AND user_id IN (" separator="," close=")">
+        AND sr.del_flag = '0'
+        AND gsr.del_flag = '0'
+        AND gsr.role_name = '网格员'
+        AND cs.customer_id = #{customerId}
+        <foreach collection="staffIdList" item="staffId" open="AND cs.USER_ID IN (" separator="," close=")">
             #{staffId}
         </foreach>
     </select>