Browse Source

add 需提交报告列表接口

周箭河 5 năm trước cách đây
mục cha
commit
b1196719ff

+ 10 - 0
mec-biz/src/main/java/com/ym/mec/biz/dal/dto/PracticeGroupDto.java

@@ -26,6 +26,8 @@ public class PracticeGroupDto extends PracticeGroup {
 
     private Integer evaluateId;
 
+    private Integer evaluateStatus;
+
     public Integer getSubClassTimes() {
         return subClassTimes;
     }
@@ -105,4 +107,12 @@ public class PracticeGroupDto extends PracticeGroup {
     public void setEvaluateId(Integer evaluateId) {
         this.evaluateId = evaluateId;
     }
+
+    public Integer getEvaluateStatus() {
+        return evaluateStatus;
+    }
+
+    public void setEvaluateStatus(Integer evaluateStatus) {
+        this.evaluateStatus = evaluateStatus;
+    }
 }

+ 4 - 3
mec-biz/src/main/resources/config/mybatis/PracticeGroupMapper.xml

@@ -48,6 +48,7 @@
         <result column="subject_name_" property="subjectName"/>
         <result column="teacher_name_" property="teacherName"/>
         <result column="evaluate_id_" property="evaluateId"/>
+        <result column="evaluate_status_" property="evaluateStatus"/>
     </resultMap>
     <update id="updateUserId">
         UPDATE practice_group
@@ -291,17 +292,17 @@
                 <![CDATA[ AND pg.courses_expire_date_ <= NOW()
 			]]></if>
             <if test='hasReport !=null and hasReport=="0"'>
-                <![CDATA[AND cse.id_ IS NULL
+                <![CDATA[AND cse.status =0
 			]]>
             </if>
             <if test='hasReport !=null and hasReport=="1"'>
-                <![CDATA[ AND cse.id_ > 0
+                <![CDATA[ AND cse.status = 1
 			]]></if>
         </where>
     </sql>
 
     <select id="findPracticeGroupsReviews" resultMap="PracticeGroupDto">
-        SELECT pg.*,cse.id_ evaluate_id_,
+        SELECT pg.*,cse.id_ evaluate_id_,cse.status_ evaluate_status_,
         su.real_name_ teacher_name_
         FROM
         practice_group pg