commit

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<TrainSignUpBlack
                 	tsuu.state,
                 	( SELECT count( 1 ) FROM train_sign_up_user_course WHERE userId = tsuu.userId $var) courseTotal,
                 	( SELECT count( 1 ) FROM train_sign_up_user_course WHERE userId = tsuu.userId AND isAttend = 0 and tsuu.state!=2 AND now()> 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<TrainSignUpBlack
                 	LEFT JOIN train_sign_up_course tsuc ON tsuc.id = tsuu.courseId
                 	LEFT JOIN train_sign_up_black_list tsubl on tsubl.userId = tsuu.userId
                 $condition
-                    ORDER BY FIELD( tsuu.state, 1, 3, 2, 4 )
                 """);
         cnd.groupBy("tsuu.userId");
         Criteria varCnd = Cnd.cri();
@@ -61,6 +63,11 @@ public class TrainSignUpUserServiceImpl extends BaseServiceImpl<TrainSignUpBlack
         if (!varCnd.where().isEmpty()) {
             sql.vars().set("var", "and " + varCnd.toSql(null));
         }
+		if (StrUtil.isAllBlank(pageForm.getPageOrderName(), pageForm.getPageOrderBy())) {
+			cnd.desc("tsuu.unitId");
+		} else {
+			cnd.orderBy(pageForm.getPageOrderName(), PageUtil.getOrder(pageForm.getPageOrderBy()));
+		}
         sql.setCondition(cnd);
         return listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql);
     }

src/main/resources/views/platform/zhgh/activity/trainSignUp/userManage/index.html

@@ -16,12 +16,12 @@ layout("/layouts/platform.html"){
                     ></el-date-picker>
                 </search-item>
                 <search-item label="活动名称">
-                    <el-select @change="activityChange" style="width: 100%" v-model="pageForm.activityId">
+                    <el-select @change="activityChange" style="width: 100%" v-model="pageForm.activityId" filterable>
                         <el-option :label="item.activityName" :value="item.id" v-for="item in activityList" :key="item.id"></el-option>
                     </el-select>
                 </search-item>
                 <search-item :label="trainType + '：'">
-                    <el-select @change="courseChange" :placeholder="'请选择' + trainType" style="width: 100%" v-model="pageForm.courseId">
+                    <el-select @change="courseChange" :placeholder="'请选择' + trainType" style="width: 100%" v-model="pageForm.courseId" filterable>
                         <el-option :label="item.courseName" :value="item.id" v-for="item in courseList" :key="item.id"></el-option>
                     </el-select>
                 </search-item>
@@ -36,7 +36,7 @@ layout("/layouts/platform.html"){
                 <el-button @click="exportSignPerson" type="primary" size="small">导出签到名单</el-button>
                 <el-button @click="exportGiftPerson" type="primary" size="small">导出领取名单</el-button>
             </table-tool>
-            <el-table :data="tableData" :size="tableSize">
+            <el-table :data="tableData" :size="tableSize" @sort-change="pageOrder">
                 <el-table-column :index="indexMethod" label="序号" type="index" width="80px"></el-table-column>
                 <el-table-column
                     :label="column.prop === 'courseNames' ? trainType : column.label"
@@ -45,8 +45,6 @@ layout("/layouts/platform.html"){
                     align="center"
                     header-align="center"
                     show-overflow-tooltip
-                    v-if="(column.prop !== 'state' && column.prop !== 'absentCount') || (reserveMode === 2 && column.prop === 'state' && column.prop !== 'absentCount')
-                                || (column.prop === 'absentCount' && course.isMobileSign === true)"
                     v-for="(column,index) in tableColumns"
                     :key="index"
                 >
@@ -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) {