Merge remote-tracking branch 'remotes/origin/dev_patrol_count' into develop

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/user/StaffPatrolDetailController.java

@@ -25,12 +25,12 @@ import java.util.List;
 @RestController
 @RequestMapping("staffpatrol")
 public class StaffPatrolDetailController {
-    
+
     @Autowired
     private StaffPatrolDetailService staffPatrolService;
 
     /**
-     * @Description  001、网格员分布
+     * @Description  001、网格员分布 优先选择areaCode查询
      * @Param formDTO
      * @author zxc
      * @date 2021/6/7 3:06 下午
@@ -77,4 +77,4 @@ public class StaffPatrolDetailController {
         return new Result<PatrolCountResultDTO>().ok(staffPatrolService.patrolCount(formDTO));
     }
 
-}
+}

epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerAgencyDao.xml

@@ -333,11 +333,11 @@
         LEFT JOIN epmet_evaluation_index.screen_customer_agency ca ON ca.AGENCY_ID = cg.PARENT_AGENCY_ID AND ca.DEL_FLAG = 0
         LEFT JOIN epmet_evaluation_index.screen_customer_agency ca2 ON ca2.AGENCY_ID = ca.PID AND ca2.DEL_FLAG = 0
         WHERE cg.DEL_FLAG = 0
-          <if test="agencyId == null">
+          <if test="areaCode != null and areaCode != ''">
               AND cg.AREA_CODE LIKE CONCAT(#{areaCode},'%')
           </if>
-          <if test="areaCode == null">
+           <if test="agencyId != null and agencyId != ''">
-              AND cg.PARENT_AGENCY_ID = #{agencyId}
+              AND cg.ALL_PARENT_IDS LIKE CONCAT(#{agencyId}, '%')
           </if>
     </select>