diff --git a/src/main/java/io/v/nutz/zhgh/trainSignUp/controller/manage/TrainSignUpUserAdjustController.java b/src/main/java/io/v/nutz/zhgh/trainSignUp/controller/manage/TrainSignUpUserAdjustController.java index 5176012..9dca703 100644 --- a/src/main/java/io/v/nutz/zhgh/trainSignUp/controller/manage/TrainSignUpUserAdjustController.java +++ b/src/main/java/io/v/nutz/zhgh/trainSignUp/controller/manage/TrainSignUpUserAdjustController.java @@ -137,8 +137,9 @@ public class TrainSignUpUserAdjustController { @Param(value = "unionId", required = false) String unionId, @Param(value = "unitId", required = false) String unitId, @Param(value = "searchName", required = false) String searchName, + @Param(value = "sex", required = false) String sex, @Param(value = "searchKeyword", required = false) String searchKeyword) { - return trainSignUpActivityStatisticsService.registerUserList(courseId, unionId, unitId, searchName, searchKeyword); + return trainSignUpActivityStatisticsService.registerUserList(courseId, unionId, unitId, searchName, searchKeyword, sex); } @At diff --git a/src/main/java/io/v/nutz/zhgh/trainSignUp/service/TrainSignUpActivityStatisticsService.java b/src/main/java/io/v/nutz/zhgh/trainSignUp/service/TrainSignUpActivityStatisticsService.java index e0873cc..173f77a 100644 --- a/src/main/java/io/v/nutz/zhgh/trainSignUp/service/TrainSignUpActivityStatisticsService.java +++ b/src/main/java/io/v/nutz/zhgh/trainSignUp/service/TrainSignUpActivityStatisticsService.java @@ -39,7 +39,7 @@ public interface TrainSignUpActivityStatisticsService extends ViService registerUserList(String courseId, String unionId, String unitId, String searchName, String searchKeyword); + List registerUserList(String courseId, String unionId, String unitId, String searchName, String searchKeyword, String sex); /** * 获取每个课程的签到情况 diff --git a/src/main/java/io/v/nutz/zhgh/trainSignUp/service/impl/TrainSignUpActivityStatisticsServiceImpl.java b/src/main/java/io/v/nutz/zhgh/trainSignUp/service/impl/TrainSignUpActivityStatisticsServiceImpl.java index 6805179..b2f3a74 100644 --- a/src/main/java/io/v/nutz/zhgh/trainSignUp/service/impl/TrainSignUpActivityStatisticsServiceImpl.java +++ b/src/main/java/io/v/nutz/zhgh/trainSignUp/service/impl/TrainSignUpActivityStatisticsServiceImpl.java @@ -8,6 +8,7 @@ import io.v.nutz.base.utils.Vi; import io.v.nutz.zhgh.trainSignUp.models.TrainSignUpUser; import io.v.nutz.zhgh.trainSignUp.service.TrainSignUpActivityStatisticsService; import lombok.extern.slf4j.Slf4j; +import org.nutz.dao.Cnd; import org.nutz.dao.Dao; import org.nutz.dao.Sqls; import org.nutz.dao.sql.Sql; @@ -84,7 +85,7 @@ public class TrainSignUpActivityStatisticsServiceImpl extends ViServiceImpl registerUserList(String courseId, String unionId, String unitId, String searchName, String searchKeyword) { + public List registerUserList(String courseId, String unionId, String unitId, String searchName, String searchKeyword, String sex) { Sql sql = Sqls.create(""" SELECT tsuu.id, @@ -103,10 +104,11 @@ public class TrainSignUpActivityStatisticsServiceImpl extends ViServiceImpl
@@ -368,11 +392,47 @@ layout("/mobile/platform.html"){
- - + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + +
姓名性别所属工会
{{ item.username }}{{ item.sex }}{{ item.unionname }}
+ + + +
@@ -392,6 +452,19 @@ layout("/mobile/platform.html"){ mixins: [mobileMixins], data() { return { + registerForm: { + searchKeyword: '', + searchName: 'u.username', + unionId: '', + sex: null + }, + unionList: [], + sexList: [ + {text: '全部性别', value: null}, + {text: '男', value: '男'}, + {text: '女', value: '女'} + ], + remarkActive: 0, tarBarActive: 0, assort: '', assortList: [], @@ -422,12 +495,26 @@ layout("/mobile/platform.html"){ remarkShow: false, courseRemark: '', + + clickCourseRemark: {}, + signUsers: [], } }, components: { 'train-dynamic-form': httpVueLoader('/components/mobile/common/TrainDynamicForm.vue') }, methods: { + async remarkActiveClick(name, title) { + if (name === 1) { + //获取报名人员 + await this.getSignUsers() + } + }, + async getSignUsers() { + this.registerForm.courseId = this.clickCourseRemark.id + const {data} = await $.get('/platform/trainSingUp/manage/userAdjust/registerUserList', this.registerForm) + this.signUsers = data + }, tabClick(name, title) { if(this.courseType === '0' &&　this.activityStatus !== '1') { this.tableData.courseList = this.tempArray.courseList.filter(o => o.assort === title) @@ -757,6 +844,7 @@ layout("/mobile/platform.html"){ }, showRemark(o){ this.remarkShow = true + this.clickCourseRemark = o this.courseRemark = o.remarks }, remarkClick(event){ @@ -905,9 +993,19 @@ layout("/mobile/platform.html"){ if (resp.code === 0) { this.activity = resp.data } - } + }, + async getUnionList(){ + const {data} = await $.get("/platform/vi/common/unions") + data.forEach(v => { + v.text = v.unionname + v.value = v.id + }) + data.unshift({text: "全部工会", value: ''}) + this.unionList = data + }, }, async created() { + this.getUnionList() this.trainTypeList = await getDictOptions("trainSignUpType") this.activityId = GetQueryString('activityId') this.type = GetQueryString('type') diff --git a/src/main/resources/views/platform/trainSingUp/manage/apply.html b/src/main/resources/views/platform/trainSingUp/manage/apply.html index fd1d7de..ecbdbb3 100644 --- a/src/main/resources/views/platform/trainSingUp/manage/apply.html +++ b/src/main/resources/views/platform/trainSingUp/manage/apply.html @@ -454,8 +454,41 @@ layout("/layouts/platform.html"){ - -
+ + + +
+ + +
+ +
+
+ + + + +
+
+ + + + +
+
+ +
+ + + + + + + 关 闭 @@ -470,6 +503,8 @@ layout("/layouts/platform.html"){ data() { const self = this return { + remarkActive: 'first', + signUsers: [], trainSignUpActivity: {}, pageForm: { year: moment().format('YYYY'), @@ -500,16 +535,36 @@ layout("/layouts/platform.html"){ applyDialog: false, remarkShow: false, - courseRemark: '', + courseRemark: {}, + + registerForm: { + searchKeyword: '', + searchName: 'u.username', + unionId: '', + }, + unionList: [], } }, methods: { + async remarkActiveClick(tab) { + if (tab.name === 'second') { + //获取报名人员 + await this.getSignUsers() + } + }, + async getSignUsers() { + this.registerForm.courseId = this.courseRemark.id + const {data} = await $.get('/platform/trainSingUp/manage/userAdjust/registerUserList', this.registerForm) + this.signUsers = data + }, openViewRemark(row){ + this.remarkActive = 'first' + this.signUsers = [] if (!row.remarks) { this.$message.warning('暂无详细信息') return } - this.courseRemark = row.remarks + this.courseRemark = row this.remarkShow = true }, async doCancel(row){ @@ -716,6 +771,7 @@ layout("/layouts/platform.html"){ }, }, async created() { + this.unionList = await getUnion() await this.activityData(); await this.getCourseTypeList(); }