统计添加分部数据筛选，过滤没有声部老师的学生

mec-application/src/main/java/com/ym/mec/web/controller/StudentCoursewarePlayRecordController.java

@@ -10,6 +10,7 @@ import com.ym.mec.biz.dal.entity.StudentCoursewarePlayRecord;
 import com.ym.mec.biz.dal.enums.ExportEnum;
 import com.ym.mec.biz.dal.wrapper.StudentCoursewarePlayRecordWrapper;
 import com.ym.mec.biz.service.ExportService;
+import com.ym.mec.biz.service.OrganizationService;
 import com.ym.mec.biz.service.StudentCoursewarePlayRecordService;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.entity.HttpResponseResult;
@@ -46,6 +47,9 @@ public class StudentCoursewarePlayRecordController extends BaseController {
     @Autowired
     private ExportService exportService;
 
+    @Autowired
+    private OrganizationService organizationService;
+
     @ApiOperation(value = "详情", notes = "学生课件播放统计记录-根据详情ID查询单条, 传入id")
     @PreAuthorize("@pcs.hasPermissions('studentCoursewarePlayRecord/detail')")
 //    @GetMapping("/detail/{id}")
@@ -98,6 +102,7 @@ public class StudentCoursewarePlayRecordController extends BaseController {
     @PostMapping("/statList")
     @PreAuthorize("@pcs.hasPermissions('studentCoursewarePlayRecord/statList')")
     public HttpResponseResult<List<StudentCoursewarePlayRecordWrapper.StatQueryData>> statList(@RequestBody StudentCoursewarePlayRecordWrapper.StatQuery statQuery) {
+        statQuery.setOrganizationId(organizationService.getEmployeeOrgan(statQuery.getOrganizationId()));
         return succeed(studentCoursewarePlayRecordService.statList(statQuery));
     }
 

mec-biz/src/main/java/com/ym/mec/biz/dal/wrapper/StudentCoursewarePlayRecordWrapper.java

@@ -115,7 +115,7 @@ public class StudentCoursewarePlayRecordWrapper {
         private Date endTime;
 
         @ApiModelProperty("分部ID")
-        private Long organizationId;
+        private String organizationId;
 
         @ApiModelProperty("排序值，1:会员，2：无练习，3:10分钟，4:60分钟，5:120分钟，6:240分钟，7：>240分钟，8：平均时长")
         private Integer sort = 1;

mec-biz/src/main/resources/config/mybatis/StudentCoursewarePlayRecordMapper.xml

@@ -31,7 +31,12 @@
                             where create_time_ > #{statQuery.startTime}
                               and #{statQuery.endTime} > create_time_
                             group by user_id_) pr on s.user_id_ = pr.user_id_
-        where s.membership_end_time_ >= now()
+        <where>
+            s.membership_end_time_ >= now()
+            <if test="statQuery.organizationId != null and statQuery.organizationId.trim() !=''">
+                and find_in_set(o.id_,statQuery.organizationId)
+            </if>
+        </where>
         group by o.id_
         order by ${statQuery.sortBy}
     </select>
@@ -58,7 +63,7 @@
                               and #{statQuery.endTime} > create_time_
                             group by user_id_) pr on s.user_id_ = pr.user_id_
         where o.id_ = #{statQuery.organizationId}
-          and s.membership_end_time_ >= now()
+          and s.membership_end_time_ >= now() and stm.id_ is not null
         group by stm.teacher_id_
         order by ${statQuery.sortBy}
     </select>