1、课外训练-教学

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

@@ -22,17 +22,17 @@ public class StudentExercisesSituationQueryInfo extends QueryInfo {
     @ApiModelProperty(value = "预期训练次数")
     private Integer expectExercisesNum;
 
-    @ApiModelProperty(value = "实际训练次数")
-    private Integer actualExercisesNum;
+    @ApiModelProperty(value = "实际训练次数是否达到预期")
+    private Integer actualExercisesNumIsAchieve;
 
-    @ApiModelProperty(value = "提交训练次数")
-    private Integer exercisesReplyNum;
+    @ApiModelProperty(value = "提交训练次数是否达到预期")
+    private Integer exercisesReplyNumIsAchieve;
 
-    @ApiModelProperty(value = "训练评价次数")
-    private Integer exercisesMessageNum;
+    @ApiModelProperty(value = "训练评价次数是否达到预期")
+    private Integer exercisesMessageNumIsAchieve;
 
-    @ApiModelProperty(value = "及时训练评价次数")
-    private Integer exercisesMessageTimelyNum;
+    @ApiModelProperty(value = "及时训练评价次数是否达到预期")
+    private Integer exercisesMessageTimelyNumIsAchieve;
 
     public String getOrganIdList() {
         return organIdList;
@@ -66,35 +66,35 @@ public class StudentExercisesSituationQueryInfo extends QueryInfo {
         this.expectExercisesNum = expectExercisesNum;
     }
 
-    public Integer getActualExercisesNum() {
-        return actualExercisesNum;
+    public Integer getActualExercisesNumIsAchieve() {
+        return actualExercisesNumIsAchieve;
     }
 
-    public void setActualExercisesNum(Integer actualExercisesNum) {
-        this.actualExercisesNum = actualExercisesNum;
+    public void setActualExercisesNumIsAchieve(Integer actualExercisesNumIsAchieve) {
+        this.actualExercisesNumIsAchieve = actualExercisesNumIsAchieve;
     }
 
-    public Integer getExercisesReplyNum() {
-        return exercisesReplyNum;
+    public Integer getExercisesReplyNumIsAchieve() {
+        return exercisesReplyNumIsAchieve;
     }
 
-    public void setExercisesReplyNum(Integer exercisesReplyNum) {
-        this.exercisesReplyNum = exercisesReplyNum;
+    public void setExercisesReplyNumIsAchieve(Integer exercisesReplyNumIsAchieve) {
+        this.exercisesReplyNumIsAchieve = exercisesReplyNumIsAchieve;
     }
 
-    public Integer getExercisesMessageNum() {
-        return exercisesMessageNum;
+    public Integer getExercisesMessageNumIsAchieve() {
+        return exercisesMessageNumIsAchieve;
     }
 
-    public void setExercisesMessageNum(Integer exercisesMessageNum) {
-        this.exercisesMessageNum = exercisesMessageNum;
+    public void setExercisesMessageNumIsAchieve(Integer exercisesMessageNumIsAchieve) {
+        this.exercisesMessageNumIsAchieve = exercisesMessageNumIsAchieve;
     }
 
-    public Integer getExercisesMessageTimelyNum() {
-        return exercisesMessageTimelyNum;
+    public Integer getExercisesMessageTimelyNumIsAchieve() {
+        return exercisesMessageTimelyNumIsAchieve;
     }
 
-    public void setExercisesMessageTimelyNum(Integer exercisesMessageTimelyNum) {
-        this.exercisesMessageTimelyNum = exercisesMessageTimelyNum;
+    public void setExercisesMessageTimelyNumIsAchieve(Integer exercisesMessageTimelyNumIsAchieve) {
+        this.exercisesMessageTimelyNumIsAchieve = exercisesMessageTimelyNumIsAchieve;
     }
 }

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

@@ -142,12 +142,32 @@
 			</if>
 			GROUP BY
 			student_id_
-			<trim prefix="HAVING" suffix=";" suffixOverrides="and">
+			<trim prefix="HAVING" suffixOverrides="and">
 				<if test="expectExercisesNum!=null">  SUM( expect_exercises_num_ ) = #{expectExercisesNum}</if>
-				<if test="actualExercisesNum!=null "> SUM( actual_exercises_num_ )= #{actualExercisesNum} and</if>
-				<if test="exercisesReplyNum!=null "> SUM( exercises_reply_num_ ) = #{exercisesReplyNum} and</if>
-				<if test="exercisesMessageNum!=null "> SUM( exercises_message_num_ ) = #{exercisesMessageNum} and</if>
-				<if test="exercisesMessageTimelyNum!=null "> SUM( exercises_message_timely_num_ ) = #{exercisesMessageTimelyNum} and</if>
+				<if test="actualExercisesNumIsAchieve!=null and actualExercisesNumIsAchieve==0">
+					SUM( actual_exercises_num_ )&lt;SUM( expect_exercises_num_ ) and
+				</if>
+				<if test="actualExercisesNumIsAchieve!=null and actualExercisesNumIsAchieve==1">
+					SUM( actual_exercises_num_ )&gt;=SUM( expect_exercises_num_ ) and
+				</if>
+				<if test="exercisesReplyNumIsAchieve!=null and exercisesReplyNumIsAchieve==0">
+					SUM( exercises_reply_num_ ) &lt; SUM( expect_exercises_num_ ) and
+				</if>
+				<if test="exercisesReplyNumIsAchieve!=null and exercisesReplyNumIsAchieve==1">
+					SUM( exercises_reply_num_ ) &gt;= SUM( expect_exercises_num_ ) and
+				</if>
+				<if test="exercisesMessageNumIsAchieve!=null and exercisesMessageNumIsAchieve==0">
+					SUM( exercises_message_num_ ) &lt; SUM( expect_exercises_num_ ) and
+				</if>
+				<if test="exercisesMessageNumIsAchieve!=null and exercisesMessageNumIsAchieve==1">
+					SUM( exercises_message_num_ ) &gt;= SUM( expect_exercises_num_ ) and
+				</if>
+				<if test="exercisesMessageTimelyNumIsAchieve!=null and exercisesMessageTimelyNumIsAchieve==0">
+					SUM( exercises_message_timely_num_ ) &lt; SUM( expect_exercises_num_ ) and
+				</if>
+				<if test="exercisesMessageTimelyNumIsAchieve!=null and exercisesMessageTimelyNumIsAchieve==1">
+					SUM( exercises_message_timely_num_ ) &gt;= SUM( expect_exercises_num_ ) and
+				</if>
 			</trim>
 		ORDER BY student_id_
 		<include refid="global.limit"/>
@@ -168,12 +188,32 @@
 			</if>
 			GROUP BY
 			student_id_
-			<trim prefix="HAVING" suffix=";" suffixOverrides="and">
+			<trim prefix="HAVING" suffixOverrides="and">
 				<if test="expectExercisesNum!=null">  SUM( expect_exercises_num_ ) = #{expectExercisesNum}</if>
-				<if test="actualExercisesNum!=null "> SUM( actual_exercises_num_ )= #{actualExercisesNum} and</if>
-				<if test="exercisesReplyNum!=null "> SUM( exercises_reply_num_ ) = #{exercisesReplyNum} and</if>
-				<if test="exercisesMessageNum!=null "> SUM( exercises_message_num_ ) = #{exercisesMessageNum} and</if>
-				<if test="exercisesMessageTimelyNum!=null "> SUM( exercises_message_timely_num_ ) = #{exercisesMessageTimelyNum} and</if>
+				<if test="actualExercisesNumIsAchieve!=null and actualExercisesNumIsAchieve==0">
+					SUM( actual_exercises_num_ )&lt;SUM( expect_exercises_num_ ) and
+				</if>
+				<if test="actualExercisesNumIsAchieve!=null and actualExercisesNumIsAchieve==1">
+					SUM( actual_exercises_num_ )&gt;=SUM( expect_exercises_num_ ) and
+				</if>
+				<if test="exercisesReplyNumIsAchieve!=null and exercisesReplyNumIsAchieve==0">
+					SUM( exercises_reply_num_ ) &lt; SUM( expect_exercises_num_ ) and
+				</if>
+				<if test="exercisesReplyNumIsAchieve!=null and exercisesReplyNumIsAchieve==1">
+					SUM( exercises_reply_num_ ) &gt;= SUM( expect_exercises_num_ ) and
+				</if>
+				<if test="exercisesMessageNumIsAchieve!=null and exercisesMessageNumIsAchieve==0">
+					SUM( exercises_message_num_ ) &lt; SUM( expect_exercises_num_ ) and
+				</if>
+				<if test="exercisesMessageNumIsAchieve!=null and exercisesMessageNumIsAchieve==1">
+					SUM( exercises_message_num_ ) &gt;= SUM( expect_exercises_num_ ) and
+				</if>
+				<if test="exercisesMessageTimelyNumIsAchieve!=null and exercisesMessageTimelyNumIsAchieve==0">
+					SUM( exercises_message_timely_num_ ) &lt; SUM( expect_exercises_num_ ) and
+				</if>
+				<if test="exercisesMessageTimelyNumIsAchieve!=null and exercisesMessageTimelyNumIsAchieve==1">
+					SUM( exercises_message_timely_num_ ) &gt;= SUM( expect_exercises_num_ ) and
+				</if>
 			</trim>
 		) tmp
 	</select>