Browse Source

add 学时审核时间字段

he2802 2 years ago
parent
commit
64cbbc30ce

+ 6 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/bo/ClassGradeUserQueryBo.java

@@ -263,4 +263,10 @@ public class ClassGradeUserQueryBo extends BaseEntity {
 
 	@ApiModelProperty("是否关注公众号 1是 0不是")
 	private Integer hasFollowWx;
+
+	@ApiModelProperty("查询审核通过开始时间")
+	private Long periodStartTime;
+
+	@ApiModelProperty("查询审核通过结束时间")
+	private Long periodEndTime;
 }

+ 4 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/vo/ClassPeriodStudentVo.java

@@ -201,4 +201,8 @@ public class ClassPeriodStudentVo {
 
 	private List<String> recenPhotosList;
 
+	@Excel(name = "学时通过时间")
+	@ApiModelProperty("学时通过时间")
+	private Long periodTime;
+
 }

+ 8 - 0
zhongzheng-system/src/main/resources/mapper/modules/grade/ClassGradeUserMapper.xml

@@ -117,6 +117,7 @@
         <result property="serviceStartTime" column="service_start_time"/>
         <result property="serviceEndTime" column="service_end_time"/>
         <result property="oneInchPhotos" column="one_inch_photos"/>
+        <result property="periodTime" column="period_time"/>
     </resultMap>
 
     <resultMap type="com.zhongzheng.modules.grade.vo.ClassPeriodUserVo" id="ClassPeriodUserVo">
@@ -335,6 +336,7 @@
         cg.class_name,
         cgu.period_plush,
         cgu.period_status_num,
+        cgu.period_time,
         IFNULL(ge.exam_num,0) as exam_num,
         <if test="userPhoto != null and userPhoto == 1">
             up.key_value,
@@ -420,6 +422,12 @@
         <if test="searchEndTime != null and searchEndTime !='' ">
             AND #{searchEndTime} >= cgu.create_time
         </if>
+        <if test="periodStartTime != null and periodStartTime !='' ">
+            AND cgu.period_time >=#{periodStartTime}
+        </if>
+        <if test="periodEndTime != null and periodEndTime !='' ">
+            AND #{periodEndTime} >= cgu.period_time
+        </if>
         <!-- 数据范围过滤 -->
         ${params.dataScope}
         <if test="periodStatus != 2 and periodStatus != 3">