From ab4c69c34a7d8be4b1132615e507984dd01f0bf3 Mon Sep 17 00:00:00 2001 From: zhouhefeng Date: Wed, 2 Jul 2025 20:30:46 +0800 Subject: [PATCH] commit --- ...tivityCultureUserStatisticsController.java | 1 + .../ActivitySportsInfoManageController.java | 2 +- .../ActivitySportsApplyUserServiceImpl.java | 8 + .../impl/ActivitySportsServiceImpl.java | 3 +- .../plugins/sysUserSelect/index.vue | 202 +++++++------- .../culture/club/applyActivity/index.html | 6 +- .../activity/culture/common/applyActivity.js | 214 ++++++++------- .../activity/culture/common/singleSignUp.js | 51 ++-- .../culture/school/applyActivity/index.html | 6 +- .../culture/union/applyActivity/index.html | 6 +- .../zhgh/activity/sports/applyUser/index.html | 258 +++++++++--------- .../zhghh5/activity/culture/signUp.html | 191 +++++++++---- .../zhghh5/activity/sports/applyUser.html | 54 ++-- 13 files changed, 572 insertions(+), 430 deletions(-) diff --git a/src/main/java/com/budwk/app/zhgh/activity/culture/controller/ActivityCultureUserStatisticsController.java b/src/main/java/com/budwk/app/zhgh/activity/culture/controller/ActivityCultureUserStatisticsController.java index d050be3..a22b253 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/culture/controller/ActivityCultureUserStatisticsController.java +++ b/src/main/java/com/budwk/app/zhgh/activity/culture/controller/ActivityCultureUserStatisticsController.java @@ -134,6 +134,7 @@ public class ActivityCultureUserStatisticsController { public Result getActivityByYearOrType(Integer year, @Valid Integer activity_type) { Cnd cnd = Cnd.where("activity_type", "=", activity_type); + cnd.and("projectTypeCode", "!=", 50004); if (!AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name(), RoleConstant.SCHOOL_UNION_ADMIN.name())) { cnd.and("signUpMethod", "in", List.of(1, 2, 3)); if (activity_type == 40002) { diff --git a/src/main/java/com/budwk/app/zhgh/activity/sports/controller/ActivitySportsInfoManageController.java b/src/main/java/com/budwk/app/zhgh/activity/sports/controller/ActivitySportsInfoManageController.java index fd30b91..26a5828 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/sports/controller/ActivitySportsInfoManageController.java +++ b/src/main/java/com/budwk/app/zhgh/activity/sports/controller/ActivitySportsInfoManageController.java @@ -83,7 +83,7 @@ public class ActivitySportsInfoManageController { school.activityCode, school.foundDate, school.applyType, - (SELECT COUNT(1) FROM activity_school_apply asa WHERE asa.activityId = school.id) applyNum + (SELECT COUNT(1) FROM activity_school_apply asa WHERE asa.activityId = school.id and status=2) applyNum FROM activity_school school LEFT JOIN activity_basic_settings ba ON ba.`code` = school.activityLevel diff --git a/src/main/java/com/budwk/app/zhgh/activity/sports/service/impl/ActivitySportsApplyUserServiceImpl.java b/src/main/java/com/budwk/app/zhgh/activity/sports/service/impl/ActivitySportsApplyUserServiceImpl.java index d8b9483..fab9b64 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/sports/service/impl/ActivitySportsApplyUserServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/activity/sports/service/impl/ActivitySportsApplyUserServiceImpl.java @@ -17,6 +17,7 @@ import com.budwk.app.zhgh.activity.sports.models.ActivitySchoolTeam; import com.budwk.app.zhgh.activity.sports.param.ActivitySportsApplyUserPageParam; import com.budwk.app.zhgh.activity.sports.service.ActivitySportsApplyUserService; import org.nutz.aop.interceptor.ioc.TransAop; +import org.nutz.dao.Chain; import org.nutz.dao.Cnd; import org.nutz.dao.Dao; import org.nutz.dao.Sqls; @@ -384,6 +385,13 @@ public class ActivitySportsApplyUserServiceImpl extends BaseServiceImpl - - + + + diff --git a/src/main/resources/views/platform/zhgh/activity/culture/club/applyActivity/index.html b/src/main/resources/views/platform/zhgh/activity/culture/club/applyActivity/index.html index 2acfe2e..d13a73e 100644 --- a/src/main/resources/views/platform/zhgh/activity/culture/club/applyActivity/index.html +++ b/src/main/resources/views/platform/zhgh/activity/culture/club/applyActivity/index.html @@ -4,7 +4,7 @@ layout("/layouts/platform.html"){
- +
diff --git a/src/main/resources/views/platform/zhgh/activity/culture/common/applyActivity.js b/src/main/resources/views/platform/zhgh/activity/culture/common/applyActivity.js index c01e8f6..7f1240f 100644 --- a/src/main/resources/views/platform/zhgh/activity/culture/common/applyActivity.js +++ b/src/main/resources/views/platform/zhgh/activity/culture/common/applyActivity.js @@ -31,10 +31,10 @@ const ACTIVITY_CULTURE_APPLY_ACTIVITY = { style="width: 100%;" v-model="formData.projectTypeCode"> + :key="item.id" + :label="item.name+' ('+item.code+')'" + :value="item.code" + v-for="item in projectTypeList"> @@ -68,10 +68,10 @@ const ACTIVITY_CULTURE_APPLY_ACTIVITY = { reserve-keyword style="width: 100%" v-model="formData.userId"> + :key="item.userId" + :label="item.userName+'-'+item.loginName+'-'+item.unitName" + :value="item.userId" + v-for="item in userList"> @@ -84,48 +84,48 @@ const ACTIVITY_CULTURE_APPLY_ACTIVITY = { - - - - - - - - - - - - - - + + + + + + + + + + + + + + + end-placeholder="结束日期" + range-separator="-" + start-placeholder="开始日期" + style="width: 100%" + type="daterange" + v-model="formData.time" + value-format="yyyy-MM-dd"> + :rules="[{required:[1,2].includes(formData.signUpMethod),message:'请选择报名日期',trigger:['change','blur']}]" + label="报名日期" + prop="applyTime2"> + end-placeholder="结束时间" + range-separator="-" + start-placeholder="开始时间" + style="width: 100%" + type="datetimerange" + v-model="formData.applyTime2" + value-format="yyyy-MM-dd HH:mm"> @@ -133,9 +133,9 @@ const ACTIVITY_CULTURE_APPLY_ACTIVITY = { + maxlength="10" + placeholder="请填写活动人数" + v-model="formData.peopleNum"> @@ -156,8 +156,8 @@ const ACTIVITY_CULTURE_APPLY_ACTIVITY = {
设置 + @click="$refs.drawerUserScope.userScopeDialog = true" + type="primary">设置
@@ -181,15 +181,13 @@ const ACTIVITY_CULTURE_APPLY_ACTIVITY = { 总人数限制 - - 分工会人数限制 - + 分工会人数限制 不限制 + v-if="[2].includes(formData.signUpMethod)"> + :rows="7" + placeholder="请输入活动考核内容" + type="textarea" + v-model="formData.activityExamineContent"> @@ -430,16 +428,16 @@ const ACTIVITY_CULTURE_APPLY_ACTIVITY = { + label="序号" type="index" + width="100"> + :label="column.label" + :prop="column.prop" + :key="column.prop" + :sortable="column.sortable" + v-for="column in userColumns"> + :disabled="!formData.time || Date.now() < Date.parse(formData.time[1])" + :rows="5" + placeholder="请输入活动内容" + type="textarea" + v-model="formData.activitySummary"> + class="mb20" + show-icon + style="margin-left: 130px" + title="活动结束后可输入活动总结" + type="info" + v-if="!formData.time || Date.now() < Date.parse(formData.time[1])"> - - + + +
确 定 @@ -485,12 +484,12 @@ const ACTIVITY_CULTURE_APPLY_ACTIVITY = { - + @@ -502,11 +501,11 @@ const ACTIVITY_CULTURE_APPLY_ACTIVITY = { style="width: 100%" v-model="formData.tissuePersonList"> + :disabled="userData.map(v=>v.userId).includes(item.userId)" + :key="item.userId" + :label="item.userName+'-'+item.loginName+'-'+item.unitName" + :value="item.userId" + v-for="item in userList"> @@ -733,29 +732,34 @@ const ACTIVITY_CULTURE_APPLY_ACTIVITY = { }) return data }, - init() { - this.formData = { - time: [], - applyTime2: [], - plannedDate: [], - goods: [], - billFiles: [], - photoFiles: [], - otherFiles: [], - tissuePersonList: [], - unionUserNumberLimit: [], - signUpMethod: null, - rangerMeter: 100, - isEnrollSystem: true, - isPushHome: 0, - isIntegral: false + init(id) { + if (id){ + this.activeName = "1" + this.findOne(id) + }else{ + this.formData = { + time: [], + applyTime2: [], + plannedDate: [], + goods: [], + billFiles: [], + photoFiles: [], + otherFiles: [], + tissuePersonList: [], + unionUserNumberLimit: [], + signUpMethod: null, + rangerMeter: 100, + isEnrollSystem: true, + isPushHome: 0, + isIntegral: false + } + this.generateActivityCode().then((data) => { + this.$set(this.formData, "activityCode", data) + }) + this.getUnionData().then((data) => { + this.$set(this.formData, "unionUserNumberLimit", data) + }) } - this.generateActivityCode().then((data) => { - this.$set(this.formData, "activityCode", data) - }) - this.getUnionData().then((data) => { - this.$set(this.formData, "unionUserNumberLimit", data) - }) }, async queryUserByIds(ids) { const { data } = await this.$axios.post("/platform/activity/culture/applyActivity/queryUserByIds", { ids: JSON.stringify(ids) }) @@ -787,7 +791,7 @@ const ACTIVITY_CULTURE_APPLY_ACTIVITY = { }, openEdit(id) { this.activeName = "1" - this.findOne(id) + this.init(id) } }, async created() { @@ -799,6 +803,6 @@ const ACTIVITY_CULTURE_APPLY_ACTIVITY = { }) }) this.getActivityGroup() - this.init() + // this.init() } } diff --git a/src/main/resources/views/platform/zhgh/activity/culture/common/singleSignUp.js b/src/main/resources/views/platform/zhgh/activity/culture/common/singleSignUp.js index b5d01ca..b85d6d6 100644 --- a/src/main/resources/views/platform/zhgh/activity/culture/common/singleSignUp.js +++ b/src/main/resources/views/platform/zhgh/activity/culture/common/singleSignUp.js @@ -25,9 +25,9 @@ const singleSignUp = { : '协会/社团活动' }} - - - + + + {{ viewData.startTime + ' - ' + viewData.endTime }} @@ -107,19 +107,19 @@ const singleSignUp = {
如需取消报名，请联系报名人。 + v-if="isApplyUser && inApplyTime" + v-model="searchTeammateUserId" + filterable + clearable + remote + reserve-keyword + placeholder="请输入关键词" + :remote-method="queryTeammate"> + v-for="item in teammateOptions" + :key="item.userId" + :label="item.userName + '(' + item.loginName + ')'" + :value="item.userId">
填写报名信息
@@ -233,7 +233,7 @@ const singleSignUp = { //查询报名人员 listTeamUser() { - this.$axios.post("/platform/activity/culture/applyUser/listTeamUser", { activityId: this.id }).then((res) => { + this.$axios.post("/platform/activity/culture/applyUser/listTeamUser", {activityId: this.id}).then((res) => { if (res.code === 0) { this.isSignUp = res.data.length > 0 this.teamUsers = res.data @@ -270,10 +270,6 @@ const singleSignUp = { //提交报名 async onConfirm() { - console.log(this.fapi) - - console.log(this.fapi.formData()) - if (this.isCustomForm && this.fapi) { let formValid = false try { @@ -411,7 +407,7 @@ const singleSignUp = { cancelButtonText: "取消", type: "warning" }).then(() => { - this.$axios.post("/platform/activity/culture/applyUser/cancelSignUp", { activityId: this.id }).then((res) => { + this.$axios.post("/platform/activity/culture/applyUser/cancelSignUp", {activityId: this.id}).then((res) => { if (res.code === 0) { this.dialogVisible = false this.$message.success(res.msg) @@ -424,8 +420,9 @@ const singleSignUp = { //查询队友信息 queryTeammate(val) { if (val) { - this.$axios.post("/platform/activity/culture/applyUser/queryTeammate", { keyword: val }).then((res) => { + this.$axios.post("/platform/activity/culture/applyUser/queryTeammate", {keyword: val}).then((res) => { if (res.code === 0) { + res.data.map(v => v.applyUserId = this.$store.state.user.id) this.teammateOptions = res.data } }) @@ -457,7 +454,7 @@ const singleSignUp = { //活动信息 activityInfo() { - this.$axios.post("/platform/activity/culture/infoManage/activityInfo", { id: this.id }).then((res) => { + this.$axios.post("/platform/activity/culture/infoManage/activityInfo", {id: this.id}).then((res) => { if (res.code === 0) { this.viewData = res.data if (this.viewData.formConfig) { diff --git a/src/main/resources/views/platform/zhgh/activity/culture/school/applyActivity/index.html b/src/main/resources/views/platform/zhgh/activity/culture/school/applyActivity/index.html index 02037ee..db664ef 100644 --- a/src/main/resources/views/platform/zhgh/activity/culture/school/applyActivity/index.html +++ b/src/main/resources/views/platform/zhgh/activity/culture/school/applyActivity/index.html @@ -4,7 +4,7 @@ layout("/layouts/platform.html"){
- +
@@ -23,7 +23,9 @@ layout("/layouts/platform.html"){ "activity-culture-apply-activity": ACTIVITY_CULTURE_APPLY_ACTIVITY }, methods: {}, - async created() {} + async created() { + setTimeout(()=>{this.$refs.activityApply.init()},500) + } }) diff --git a/src/main/resources/views/platform/zhgh/activity/culture/union/applyActivity/index.html b/src/main/resources/views/platform/zhgh/activity/culture/union/applyActivity/index.html index 96022b5..3016b0e 100644 --- a/src/main/resources/views/platform/zhgh/activity/culture/union/applyActivity/index.html +++ b/src/main/resources/views/platform/zhgh/activity/culture/union/applyActivity/index.html @@ -4,7 +4,7 @@ layout("/layouts/platform.html"){
- +
diff --git a/src/main/resources/views/platform/zhgh/activity/sports/applyUser/index.html b/src/main/resources/views/platform/zhgh/activity/sports/applyUser/index.html index e3cac9d..e73573f 100644 --- a/src/main/resources/views/platform/zhgh/activity/sports/applyUser/index.html +++ b/src/main/resources/views/platform/zhgh/activity/sports/applyUser/index.html @@ -26,12 +26,12 @@ layout("/layouts/platform.html"){ @@ -45,12 +45,12 @@ layout("/layouts/platform.html"){ @@ -67,8 +67,8 @@ layout("/layouts/platform.html"){ + :class="'box-card '+(item.id===pageForm.activityId?'activeCard':'')" + style="border-radius: 10px">
{{item.activityLevelName}} 报名结束 报名中 报名未开始 @@ -138,13 +138,13 @@ layout("/layouts/platform.html"){
@@ -153,13 +153,13 @@ layout("/layouts/platform.html"){
@@ -170,7 +170,7 @@ layout("/layouts/platform.html"){ {{leaderData.username?leaderData.username:'暂无'}}   教练： {{coachData.username ?coachData.username:'暂无'}} + style="color: #419bf8">{{coachData.username ?coachData.username:'暂无'}}