Merge branch 'saas_wangzhao' into master_saas

mec-teacher/src/main/java/com/ym/mec/teacher/controller/VisitController.java

@@ -3,11 +3,15 @@ package com.ym.mec.teacher.controller;
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dto.BasicUserDto;
+import com.ym.mec.biz.dal.dto.StudentPreVisitDto;
 import com.ym.mec.biz.dal.dto.StudentVisitDto;
 import com.ym.mec.biz.dal.entity.MusicGroup;
 import com.ym.mec.biz.dal.entity.StudentRegistration;
 import com.ym.mec.biz.dal.entity.StudentVisit;
+import com.ym.mec.biz.dal.page.StudentPreVisitQueryInfo;
 import com.ym.mec.biz.dal.page.StudentVisitQueryInfo;
+import com.ym.mec.biz.service.OrganizationService;
+import com.ym.mec.biz.service.StudentPreVisitService;
 import com.ym.mec.biz.service.StudentVisitService;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.entity.HttpResponseResult;
@@ -32,6 +36,10 @@ public class VisitController extends BaseController {
     private StudentVisitService studentVisitService;
     @Autowired
     private SysUserFeignService sysUserFeignService;
+    @Autowired
+    private StudentPreVisitService studentPreVisitService;
+    @Autowired
+    private OrganizationService organizationService;
 
     @ApiOperation(value = "回访列表")
     @GetMapping("/queryPage")
@@ -50,6 +58,13 @@ public class VisitController extends BaseController {
         studentVisitService.addVisit(studentVisit);
         return succeed(studentVisit);
     }
+    @ApiOperation(value = "待回访列表")
+    @GetMapping("/queryVisitPage")
+    @PreAuthorize("@pcs.hasPermissions('visit/queryVisitPage')")
+    public HttpResponseResult<PageInfo<StudentPreVisitDto>> queryVisitPage(StudentPreVisitQueryInfo queryInfo) {
+        queryInfo.setOrganId(organizationService.getEmployeeOrgan(queryInfo.getOrganId()));
+        return succeed(studentPreVisitService.getPageList(queryInfo));
+    }
 
 
     @ApiOperation(value = "回访详情")