操行管理，移动端接口调整查询参数

src/main/java/com/xjrsoft/module/student/dto/BaseStudentBehaviorManageMobilePageDto.java

@@ -5,6 +5,8 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.util.List;
+
 
 /**
 * @title: 学生操行分记录管理分页查询入参
@@ -16,71 +18,39 @@ import lombok.EqualsAndHashCode;
 @EqualsAndHashCode(callSuper = false)
 public class BaseStudentBehaviorManageMobilePageDto extends PageInput {
 
-    /**
-     * 是否影响
-     */
-    @ApiModelProperty("是否影响(1:是 0:否)")
-    private Integer isAffect;
-
-    /**
-     * 学期id
-     */
-    @ApiModelProperty("学期id")
-    private Long semesterId;
-
-    /**
-     * 考核类别ids
-     */
-    @ApiModelProperty("考核类别ids")
-    private String behaviorCategoryIds;
 
     /**
-     * 考核项目ids
+     * 班级ids
      */
-    @ApiModelProperty("考核项目ids")
-    private String behaviorProjectIds;
+    @ApiModelProperty("年级ids")
+    private List<Long> gradeIds;
 
     /**
-     * 考核类型
+     * 班级ids
      */
-    @ApiModelProperty("考核类型")
-    private String scoreType;
+    @ApiModelProperty("班级ids")
+    private List<Long> classIds;
 
     /**
-     * 组织结构ids
+     * 考核人ids
      */
-    @ApiModelProperty("组织结构ids")
-    private String orgIds;
+    @ApiModelProperty("考核人ids")
+    private List<Long> assessmentUserIds;
 
-    /**
-     * 年级ids
-     */
-    @ApiModelProperty("年级id")
-    private Long gradeId;
 
     /**
-     * 专业ids
+     * 考核时间-开始
      */
-    @ApiModelProperty("专业ids")
-    private String majorSetIds;
+    @ApiModelProperty("考核时间-开始")
+    private String startDate;
 
-    /**
-     * 班级ids
-     */
-    @ApiModelProperty("班级ids")
-    private String classIds;
 
     /**
-     * 修改人
+     * 考核时间-结束
      */
-    @ApiModelProperty("修改人")
-    private String modifyUserName;
+    @ApiModelProperty("考核时间-结束")
+    private String endDate;
 
-    /**
-     * 等级人
-     */
-    @ApiModelProperty("等级人")
-    private String createUserName;
     /**
      * 教师id
      */

src/main/resources/mapper/student/BaseStudentBehaviorManageMapper.xml

@@ -77,6 +77,30 @@
         AND t5.class_id IN (
         SELECT id FROM base_class WHERE teacher_id = #{dto.teacherId}
         )
+        <if test="dto.gradeIds != null and dto.gradeIds != ''">
+            AND t5.grade_id in
+            <foreach item="gradeId" index="index" collection="dto.gradeIds" open="(" close=")" separator=",">
+                #{gradeId}
+            </foreach>
+        </if>
+        <if test="dto.classIds != null and dto.classIds != ''">
+            AND t5.class_id in
+            <foreach item="classId" index="index" collection="dto.classIds" open="(" close=")" separator=",">
+                #{classId}
+            </foreach>
+        </if>
+        <if test="dto.assessmentUserIds != null and dto.assessmentUserIds != ''">
+            AND t.assessment_user_id in
+            <foreach item="assessmentUserId" index="index" collection="dto.assessmentUserIds" open="(" close=")" separator=",">
+                #{assessmentUserId}
+            </foreach>
+        </if>
+        <if test="dto.startDate != null and dto.startDate != ''">
+            and t.assessment_date &gt;= #{dto.startDate}
+        </if>
+        <if test="dto.endDate != null and dto.endDate != ''">
+            and t.assessment_date &lt;= #{dto.endDate}
+        </if>
     </select>
 
 </mapper>