接口定义

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/SubFeeSettingDto.java

@@ -37,6 +37,17 @@ public class SubFeeSettingDto {
     @ApiModelProperty(value = "分部乐器分润上限",required = false)
     private BigDecimal maxMusicalInstrumentsProfits;
 
+    @ApiModelProperty(value = "年级分布",required = false)
+    private String gradeType;
+
+    public String getGradeType() {
+        return gradeType;
+    }
+
+    public void setGradeType(String gradeType) {
+        this.gradeType = gradeType;
+    }
+
     public MusicGroupStatusEnum getMusicGroupStatus() {
         return musicGroupStatus;
     }

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

@@ -170,12 +170,18 @@ public class CoursePatrolEvaluationWrapper {
         @ApiModelProperty("老师姓名")
         private String teacherName;
 
+        @ApiModelProperty("老师头像")
+        private String teacherAvatar;
+
         @ApiModelProperty("课程ID")
         private Integer courseScheduleId;
 
         @ApiModelProperty("课程类型")
         private CourseSchedule.CourseScheduleType courseType;
 
+        @ApiModelProperty("课程名称")
+        private String courseName;
+
         /** 上课时间 */
         @ApiModelProperty(value = "上课时间", required = false)
         private java.util.Date startClassTime;
@@ -184,7 +190,7 @@ public class CoursePatrolEvaluationWrapper {
         @ApiModelProperty(value = "结束时间", required = false)
         private java.util.Date endClassTime;
 
-        @ApiModelProperty("用户ID")
+        @ApiModelProperty("操作用户ID")
         private Integer userId;
 
         @ApiModelProperty("优秀EXCELLENT、良好GOOD、合格QUALIFIED、不合格UNQUALIFIED")

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

@@ -136,7 +136,7 @@ public class StudentWrapper {
         @ApiModelProperty(value = "艺术实践次数")
         private Integer artPracticeCount;
 
-        @ApiModelProperty(value = "在团状态")
+        @ApiModelProperty(value = "在团状态 在团 IN 退团 OUT 申请退团 APPLY_OUT")
         private EInGroupStatus inGroupStatus;
 
     }

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

@@ -2,7 +2,7 @@
 <!DOCTYPE  mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="com.ym.mec.biz.dal.mapper.SchoolActivityMapper">
     
-    <select id="selectPage" resultType="com.ym.mec.biz.dal.wrapper.SchoolActivityWrapper.SchoolActivity">
+    <select id="selectPage" resultType="com.ym.mec.biz.dal.wrapper.SchoolActivityWrapper$SchoolActivity">
 		SELECT         
         	t.*
 		FROM school_activity t

mec-web/src/main/java/com/ym/mec/web/controller/OrganizationController.java

@@ -1,6 +1,7 @@
 package com.ym.mec.web.controller;
 
 import com.ym.mec.biz.dal.entity.Organization;
+import com.ym.mec.biz.dal.enums.EGroupGradeType;
 import com.ym.mec.biz.dal.page.OrganizationQueryInfo;
 import com.ym.mec.biz.service.OrganizationService;
 import com.ym.mec.common.controller.BaseController;
@@ -78,7 +79,7 @@ public class OrganizationController extends BaseController {
     @GetMapping("/getGradeList")
     @PreAuthorize("@pcs.hasPermissions('organization/getGradeList')")
     @ApiParam(value = "分部编号", required = true)
-    public HttpResponseResult<Map<Integer,String>> getGradeList(Integer id) {
+    public HttpResponseResult<Map<Integer,String>> getGradeList(Integer id,@ApiParam("年级分布") EGroupGradeType gradeType){
         return succeed(organizationService.getGradeList(id));
     }
 }

mec-web/src/main/java/com/ym/mec/web/controller/school/CoursePatrolEvaluationController.java

@@ -45,12 +45,22 @@ public class CoursePatrolEvaluationController extends BaseController {
 
         return succeed(null);
     }
-    
-    @ApiOperation(value = "web/学校端-查询巡堂分页", notes = "巡堂详情- 传入 CoursePatrolEvaluationWrapper.CoursePatrolEvaluationQuery")
+
+
+    @ApiOperation(value = "web-查询巡堂分页", notes = "巡堂详情- 传入 CoursePatrolEvaluationWrapper.CoursePatrolEvaluationQuery")
+    @PostMapping("/webPage")
+    public HttpResponseResult<PageInfo<CoursePatrolEvaluationWrapper.CoursePatrolEvaluationInfo>> webPage(@RequestBody CoursePatrolEvaluationWrapper.CoursePatrolEvaluationQuery query) {
+
+        query.setOrganId(organizationService.getEmployeeOrgan(query.getOrganId()));
+        IPage<CoursePatrolEvaluationWrapper.CoursePatrolEvaluationInfo> pages = coursePatrolEvaluationService.selectPage(QueryInfo.getPage(query), query);
+
+        return succeed(QueryInfo.pageInfo(pages));
+    }
+
+    @ApiOperation(value = "学校端-查询巡堂分页", notes = "巡堂详情- 传入 CoursePatrolEvaluationWrapper.CoursePatrolEvaluationQuery")
     @PostMapping("/page")
     public HttpResponseResult<PageInfo<CoursePatrolEvaluationWrapper.CoursePatrolEvaluationInfo>> page(@RequestBody CoursePatrolEvaluationWrapper.CoursePatrolEvaluationQuery query) {
 
-        query.setOrganId(organizationService.getEmployeeOrgan(query.getOrganId()));
         IPage<CoursePatrolEvaluationWrapper.CoursePatrolEvaluationInfo> pages = coursePatrolEvaluationService.selectPage(QueryInfo.getPage(query), query);
         
         return succeed(QueryInfo.pageInfo(pages));