1.元教练时长分页接口添加操作人和取消时间接口

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/CloudTeacherStudent.java

@@ -59,6 +59,9 @@ public class CloudTeacherStudent {
     @ApiModelProperty(value = "数量")
     private Integer time;
 
+    @ApiModelProperty(value = "状态")
+    private Integer status;
+
     @ApiModelProperty(value = "操作人")
     private Integer operator;
 
@@ -225,4 +228,12 @@ public class CloudTeacherStudent {
     public void setCancelReason(String cancelReason) {
         this.cancelReason = cancelReason;
     }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/page/CloudTeacherOrderQueryInfo.java

@@ -35,6 +35,15 @@ public class CloudTeacherOrderQueryInfo extends QueryInfo {
 	@ApiModelProperty(value = "分部")
 	private String organIds;
 
+	@ApiModelProperty(value = "操作人")
+	private String operatorName;
+
+	@ApiModelProperty(value = "操作开始时间")
+	private Date operateStartTime;
+
+	@ApiModelProperty(value = "操作结束时间")
+	private Date operateEndTime;
+
 	public Date getStartTime() {
 		return startTime;
 	}
@@ -109,4 +118,28 @@ public class CloudTeacherOrderQueryInfo extends QueryInfo {
 	public void setOrganIds(String organIds) {
 		this.organIds = organIds;
 	}
+
+	public String getOperatorName() {
+		return operatorName;
+	}
+
+	public void setOperatorName(String operatorName) {
+		this.operatorName = operatorName;
+	}
+
+	public Date getOperateStartTime() {
+		return operateStartTime;
+	}
+
+	public void setOperateStartTime(Date operateStartTime) {
+		this.operateStartTime = operateStartTime;
+	}
+
+	public Date getOperateEndTime() {
+		return operateEndTime;
+	}
+
+	public void setOperateEndTime(Date operateEndTime) {
+		this.operateEndTime = operateEndTime;
+	}
 }

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

@@ -331,6 +331,7 @@
                cto.tenant_id_ as tenantId,
                u.username_ as name,
                u.phone_ as phone
+               ,cto.status_ as status
                ,cto.operator_ as operator
                ,cto.operate_time_ as operateTime
                ,cto.cancel_reason_ as cancelReason
@@ -355,6 +356,18 @@
             <if test="subjectId">
                 AND (s.subject_id_list_ = #{subjectId})
             </if>
+            <if test="operatorName != null and operatorName.trim() != ''">
+                AND cto.operator_ in (
+                select id_ from sys_user where real_name_ like concat('%',#{operatorName},'%')
+                union select -1 from sys_user
+                )
+            </if>
+            <if test="operateStartTime != null">
+                AND cto.operate_time_ >= #{operateStartTime}
+            </if>
+            <if test="operateEndTime != null">
+                AND #{operateEndTime} >= cto.operate_time_
+            </if>
         </where>
         ORDER BY cto.id_ DESC
         <include refid="global.limit"/>
@@ -382,6 +395,18 @@
             <if test="subjectId">
                 AND (s.subject_id_list_ = #{subjectId})
             </if>
+            <if test="operatorName != null and operatorName.trim() != ''">
+                AND cto.operator_ in (
+                select id_ from sys_user where real_name_ like concat('%',#{operatorName},'%')
+                union select -1 from sys_user
+                )
+            </if>
+            <if test="operateStartTime != null">
+                AND cto.operate_time_ >= #{operateStartTime}
+            </if>
+            <if test="operateEndTime != null">
+                AND #{operateEndTime} >= cto.operate_time_
+            </if>
         </where>
     </select>