diff --git a/src/main/java/com/budwk/app/zhgh/activity/trainSignUp/service/impl/TrainSignUpUserServiceImpl.java b/src/main/java/com/budwk/app/zhgh/activity/trainSignUp/service/impl/TrainSignUpUserServiceImpl.java index 64e878e..c6978f0 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/trainSignUp/service/impl/TrainSignUpUserServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/activity/trainSignUp/service/impl/TrainSignUpUserServiceImpl.java @@ -1,8 +1,10 @@ package com.budwk.app.zhgh.activity.trainSignUp.service.impl; +import cn.hutool.core.util.StrUtil; import com.budwk.app.base.page.Pagination; import com.budwk.app.base.param.PageForm; import com.budwk.app.base.service.impl.BaseServiceImpl; +import com.budwk.app.base.utils.PageUtil; import com.budwk.app.zhgh.activity.trainSignUp.models.TrainSignUpBlackList; import com.budwk.app.zhgh.activity.trainSignUp.service.TrainSignUpBlackListService; import org.nutz.dao.Cnd; @@ -42,6 +44,7 @@ public class TrainSignUpUserServiceImpl extends BaseServiceImpl courseEndTime $var) AS absentCount, + ( SELECT count( 1 ) FROM train_sign_up_user_course WHERE userId = tsuu.userId AND isAttend = 1 and tsuu.state!=2 AND now()> courseEndTime $var) AS signCount, if(tsubl.isDisabled=1,true,false) isDisabled, group_CONCAT( tsuc.courseName ) AS courseNames FROM @@ -51,7 +54,6 @@ public class TrainSignUpUserServiceImpl extends BaseServiceImpl - + - + @@ -36,7 +36,7 @@ layout("/layouts/platform.html"){ 导出签到名单 导出领取名单 - + @@ -111,7 +109,8 @@ layout("/layouts/platform.html"){ { label: "单位", prop: "unitName", sortable: true }, { label: "分工会", prop: "unionName", sortable: true }, { label: "课程", prop: "courseNames", sortable: true }, - { label: "缺席次数", prop: "absentCount" }, + { label: "签到次数", prop: "signCount", sortable: true }, + { label: "缺席次数", prop: "absentCount", sortable: true }, { label: "是否黑名单", prop: "isDisabled", sortable: true } ], trainType: "培训班", @@ -198,7 +197,12 @@ layout("/layouts/platform.html"){ this.trainType = type?.name || "培训班" const resp = await this.$axios.post(loc() + "/getCourseByActivityId", { activityId: val }) this.courseList = resp.data - this.pageForm.courseId = "" + if(this.courseList.length > 0) { + this.$set(this.pageForm, "courseId", this.courseList[0].id) + } else { + this.pageForm.courseId = "" + } + this.doSearch() }) }, async handleUser(userId) {