Merge branch 'joe_2021-05-08'

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

@@ -36,6 +36,61 @@ public class TeacherServeDto {
     @ApiModelProperty(value = "工作性质（兼职 PART_JOB、全职FULL_JOB）", required = false)
     private JobNatureEnum jobNature;
 
+    /** 预期训练次数 */
+    private Integer expectExercisesNum;
+
+    /** 实际训练次数 */
+    private Integer actualExercisesNum;
+
+    /** 提交训练次数 */
+    private Integer exercisesReplyNum;
+
+    /** 训练评价次数 */
+    private Integer exercisesMessageNum;
+
+    /** 及时训练评价次数 */
+    private Integer exercisesMessageTimelyNum;
+
+    public Integer getExpectExercisesNum() {
+        return expectExercisesNum;
+    }
+
+    public void setExpectExercisesNum(Integer expectExercisesNum) {
+        this.expectExercisesNum = expectExercisesNum;
+    }
+
+    public Integer getActualExercisesNum() {
+        return actualExercisesNum;
+    }
+
+    public void setActualExercisesNum(Integer actualExercisesNum) {
+        this.actualExercisesNum = actualExercisesNum;
+    }
+
+    public Integer getExercisesReplyNum() {
+        return exercisesReplyNum;
+    }
+
+    public void setExercisesReplyNum(Integer exercisesReplyNum) {
+        this.exercisesReplyNum = exercisesReplyNum;
+    }
+
+    public Integer getExercisesMessageNum() {
+        return exercisesMessageNum;
+    }
+
+    public void setExercisesMessageNum(Integer exercisesMessageNum) {
+        this.exercisesMessageNum = exercisesMessageNum;
+    }
+
+    public Integer getExercisesMessageTimelyNum() {
+        return exercisesMessageTimelyNum;
+    }
+
+    public void setExercisesMessageTimelyNum(Integer exercisesMessageTimelyNum) {
+        this.exercisesMessageTimelyNum = exercisesMessageTimelyNum;
+    }
+
     public JobNatureEnum getJobNature() {
         return jobNature;
     }

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

@@ -32,6 +32,18 @@ public class TeacherServeQueryInfo extends QueryInfo {
     @ApiModelProperty(value = "工作性质（兼职 PART_JOB、全职FULL_JOB）", required = false)
     private JobNatureEnum jobNature;
 
+    @ApiModelProperty(value = "实际训练次数是否达到预期")
+    private Integer actualExercisesNumIsAchieve;
+
+    @ApiModelProperty(value = "提交训练次数是否达到预期")
+    private Integer exercisesReplyNumIsAchieve;
+
+    @ApiModelProperty(value = "训练评价次数是否达到预期")
+    private Integer exercisesMessageNumIsAchieve;
+
+    @ApiModelProperty(value = "及时训练评价次数是否达到预期")
+    private Integer exercisesMessageTimelyNumIsAchieve;
+
     public JobNatureEnum getJobNature() {
         return jobNature;
     }
@@ -103,4 +115,36 @@ public class TeacherServeQueryInfo extends QueryInfo {
     public void setSunday(String sunday) {
         this.sunday = sunday;
     }
+
+    public Integer getActualExercisesNumIsAchieve() {
+        return actualExercisesNumIsAchieve;
+    }
+
+    public void setActualExercisesNumIsAchieve(Integer actualExercisesNumIsAchieve) {
+        this.actualExercisesNumIsAchieve = actualExercisesNumIsAchieve;
+    }
+
+    public Integer getExercisesReplyNumIsAchieve() {
+        return exercisesReplyNumIsAchieve;
+    }
+
+    public void setExercisesReplyNumIsAchieve(Integer exercisesReplyNumIsAchieve) {
+        this.exercisesReplyNumIsAchieve = exercisesReplyNumIsAchieve;
+    }
+
+    public Integer getExercisesMessageNumIsAchieve() {
+        return exercisesMessageNumIsAchieve;
+    }
+
+    public void setExercisesMessageNumIsAchieve(Integer exercisesMessageNumIsAchieve) {
+        this.exercisesMessageNumIsAchieve = exercisesMessageNumIsAchieve;
+    }
+
+    public Integer getExercisesMessageTimelyNumIsAchieve() {
+        return exercisesMessageTimelyNumIsAchieve;
+    }
+
+    public void setExercisesMessageTimelyNumIsAchieve(Integer exercisesMessageTimelyNumIsAchieve) {
+        this.exercisesMessageTimelyNumIsAchieve = exercisesMessageTimelyNumIsAchieve;
+    }
 }

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

@@ -506,6 +506,11 @@
 		<result column="remind_time_" property="remindDate"/>
 		<result column="operator_name_" property="operatorName"/>
 		<result column="job_nature_" property="jobNature" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
+		<result column="expect_exercises_num_" property="expectExercisesNum" />
+		<result column="actual_exercises_num_" property="actualExercisesNum" />
+		<result column="exercises_reply_num_" property="exercisesReplyNum" />
+		<result column="exercises_message_num_" property="exercisesMessageNum" />
+		<result column="exercises_message_timely_num_" property="exercisesMessageTimelyNum" />
 	</resultMap>
 
 	<sql id="queryTeacherServeInfoCondition">
@@ -548,6 +553,11 @@
 			sees.teacher_id_,
 			su.real_name_ teacher_name_,
 		    tea.job_nature_,
+			SUM(expect_exercises_num_) expect_exercises_num_,
+			SUM(actual_exercises_num_) actual_exercises_num_,
+			SUM(exercises_reply_num_) exercises_reply_num_,
+			SUM(exercises_message_num_) exercises_message_num_,
+			SUM(exercises_message_timely_num_) exercises_message_timely_num_,
 			SUM(CASE sees.serve_type_ WHEN 'HOMEWORK' THEN sees.expect_exercises_num_ ELSE 0 END) homework_num_,
 			SUM(CASE sees.serve_type_ WHEN 'EXERCISE' THEN 1 ELSE 0 END) exercise_num_,
 			SUM( sees.expect_exercises_num_-sees.not_over_course_num_ )> SUM( sees.actual_exercises_num_ ) un_done_
@@ -561,15 +571,40 @@
 			LEFT JOIN sys_user su ON tea.id_=su.id_
 		<include refid="queryTeacherServeInfoCondition" />
 		GROUP BY sees.monday_,sees.sunday_,sees.teacher_id_
-		<if test="unDone!=null">
-			HAVING
-			<if test="unDone==1">
-				SUM( sees.expect_exercises_num_-sees.not_over_course_num_ ) &gt; SUM( sees.actual_exercises_num_ )
+		<trim prefix="HAVING" prefixOverrides="AND">
+			<if test="unDone!=null">
+				<if test="unDone==1">
+					AND SUM( sees.expect_exercises_num_-sees.not_over_course_num_ ) &gt; SUM( sees.actual_exercises_num_ )
+				</if>
+				<if test="unDone==0">
+					AND SUM( sees.expect_exercises_num_-sees.not_over_course_num_ ) &lt;= SUM( sees.actual_exercises_num_ )
+				</if>
 			</if>
-			<if test="unDone==0">
-				SUM( sees.expect_exercises_num_-sees.not_over_course_num_ ) &lt;= SUM( sees.actual_exercises_num_ )
+			<if test="actualExercisesNumIsAchieve!=null and actualExercisesNumIsAchieve==0">
+				AND SUM(actual_exercises_num_) &lt; SUM(expect_exercises_num_)
 			</if>
-		</if>
+			<if test="actualExercisesNumIsAchieve!=null and actualExercisesNumIsAchieve==1">
+				AND SUM(actual_exercises_num_) &gt;= SUM(expect_exercises_num_)
+			</if>
+			<if test="exercisesReplyNumIsAchieve!=null and exercisesReplyNumIsAchieve==0">
+				AND SUM(exercises_reply_num_) &lt; SUM(actual_exercises_num_)
+			</if>
+			<if test="exercisesReplyNumIsAchieve!=null and exercisesReplyNumIsAchieve==1">
+				AND SUM(exercises_reply_num_) &gt;= SUM(actual_exercises_num_)
+			</if>
+			<if test="exercisesMessageNumIsAchieve!=null and exercisesMessageNumIsAchieve==0">
+				AND SUM(exercises_message_num_) &lt; SUM(exercises_reply_num_)
+			</if>
+			<if test="exercisesMessageNumIsAchieve!=null and exercisesMessageNumIsAchieve==1">
+				AND SUM(exercises_message_num_) &gt;= SUM(exercises_reply_num_)
+			</if>
+			<if test="exercisesMessageTimelyNumIsAchieve!=null and exercisesMessageTimelyNumIsAchieve==0">
+				AND SUM(exercises_message_timely_num_) &lt; SUM(exercises_message_num_)
+			</if>
+			<if test="exercisesMessageTimelyNumIsAchieve!=null and exercisesMessageTimelyNumIsAchieve==1">
+				AND SUM(exercises_message_timely_num_) &gt;= SUM(exercises_message_num_)
+			</if>
+		</trim>
 		ORDER BY sees.monday_,sees.sunday_,sees.teacher_id_
 		<include refid="global.limit"></include>
 	</select>
@@ -586,15 +621,40 @@
 				</if>
 			<include refid="queryTeacherServeInfoCondition" />
 			GROUP BY sees.monday_,sees.sunday_,sees.teacher_id_
-			<if test="unDone!=null">
-				HAVING
-				<if test="unDone==1">
-					SUM( sees.expect_exercises_num_-sees.not_over_course_num_ ) &gt; SUM( sees.actual_exercises_num_ )
+			<trim prefix="HAVING" prefixOverrides="AND">
+				<if test="unDone!=null">
+					<if test="unDone==1">
+						AND SUM( sees.expect_exercises_num_-sees.not_over_course_num_ ) &gt; SUM( sees.actual_exercises_num_ )
+					</if>
+					<if test="unDone==0">
+						AND SUM( sees.expect_exercises_num_-sees.not_over_course_num_ ) &lt;= SUM( sees.actual_exercises_num_ )
+					</if>
 				</if>
-				<if test="unDone==0">
-					SUM( sees.expect_exercises_num_-sees.not_over_course_num_ ) &lt;= SUM( sees.actual_exercises_num_ )
+				<if test="actualExercisesNumIsAchieve!=null and actualExercisesNumIsAchieve==0">
+					AND SUM(actual_exercises_num_) &lt; SUM(expect_exercises_num_)
 				</if>
-			</if>
+				<if test="actualExercisesNumIsAchieve!=null and actualExercisesNumIsAchieve==1">
+					AND SUM(actual_exercises_num_) &gt;= SUM(expect_exercises_num_)
+				</if>
+				<if test="exercisesReplyNumIsAchieve!=null and exercisesReplyNumIsAchieve==0">
+					AND SUM(exercises_reply_num_) &lt; SUM(actual_exercises_num_)
+				</if>
+				<if test="exercisesReplyNumIsAchieve!=null and exercisesReplyNumIsAchieve==1">
+					AND SUM(exercises_reply_num_) &gt;= SUM(actual_exercises_num_)
+				</if>
+				<if test="exercisesMessageNumIsAchieve!=null and exercisesMessageNumIsAchieve==0">
+					AND SUM(exercises_message_num_) &lt; SUM(exercises_reply_num_)
+				</if>
+				<if test="exercisesMessageNumIsAchieve!=null and exercisesMessageNumIsAchieve==1">
+					AND SUM(exercises_message_num_) &gt;= SUM(exercises_reply_num_)
+				</if>
+				<if test="exercisesMessageTimelyNumIsAchieve!=null and exercisesMessageTimelyNumIsAchieve==0">
+					AND SUM(exercises_message_timely_num_) &lt; SUM(exercises_message_num_)
+				</if>
+				<if test="exercisesMessageTimelyNumIsAchieve!=null and exercisesMessageTimelyNumIsAchieve==1">
+					AND SUM(exercises_message_timely_num_) &gt;= SUM(exercises_message_num_)
+				</if>
+			</trim>
 			ORDER BY sees.monday_,sees.sunday_,sees.teacher_id_
 		) e
 	</select>