c-zhouhf1/zhgh_hgu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug整改

Browse Source
This commit is contained in:
=
2025-12-04 15:06:57 +08:00
parent 8b537ea21e
commit d8ad59084c
5 changed files with 20 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/budwk/app/zhgh/activity/planSummary/service/impl/YearPlanServiceImpl.java
+1 -1
View File
@@ -59,7 +59,7 @@ public class YearPlanServiceImpl extends BaseServiceImpl<YearPlan> implements Ye
SELECT SELECT
yp.*, yp.*,
ab.name as activityTypeName, ab.name as activityTypeName,
year(yp.planTime) as `year`, DATE_FORMAT(yp.planTime, '%Y') as `year`,
((SELECT COUNT(1) FROM activity_school acs WHERE acs.planId = yp.id) >0 ) carryOut ((SELECT COUNT(1) FROM activity_school acs WHERE acs.planId = yp.id) >0 ) carryOut
FROM FROM
year_plan yp year_plan yp
src/main/java/com/budwk/app/zhgh/activity/sports/controller/ActivitySportsResultsController.java
+2 -2
View File
@@ -222,7 +222,7 @@ public class ActivitySportsResultsController {
SELECT SELECT
un.id, un.id,
un.unionname un.name AS unionname
FROM FROM
activity_school_apply asa activity_school_apply asa
LEFT JOIN sys_union un ON un.id = asa.unionId LEFT JOIN sys_union un ON un.id = asa.unionId
@@ -231,7 +231,7 @@ public class ActivitySportsResultsController {
AND asa.eventId = @eventId AND asa.eventId = @eventId
GROUP BY GROUP BY
un.unionname un.name
""").setParam("activityId", activityId).setParam("eventId", eventId); """).setParam("activityId", activityId).setParam("eventId", eventId);
return Result.success(activitySchoolApplyViService.list(sql)); return Result.success(activitySchoolApplyViService.list(sql));
} }
src/main/java/com/budwk/app/zhgh/democratic/suggestionBox/controller/SuggestionBoxMineController.java
+1
View File
@@ -96,6 +96,7 @@ public class SuggestionBoxMineController {
} }
cnd.andEX("YEAR(info.submitTime)", "=", year); cnd.andEX("YEAR(info.submitTime)", "=", year);
cnd.desc("info.submitTime"); cnd.desc("info.submitTime");
cnd.groupBy("info.id");
sql.setCondition(cnd); sql.setCondition(cnd);
Pagination<NutMap> pagination = suggestionBoxService.listPageMap(pageNumber, pageSize, sql); Pagination<NutMap> pagination = suggestionBoxService.listPageMap(pageNumber, pageSize, sql);
return Result.success(pagination); return Result.success(pagination);
src/main/resources/static/assets/platform/js/mixin/flowMixins.js
+15 -15
View File
@@ -26,21 +26,21 @@ const flowMixins = {
console.log(this.$refs.guava) console.log(this.$refs.guava)
// this.oepnAudit({}) // this.oepnAudit({})
//
//
// this.$axios.post(location.pathname + '/queryTask', {taskId}).then(res => { this.$axios.post(location.pathname + '/queryTask', {taskId}).then(res => {
// if (res.code === 0) { if (res.code === 0) {
// // 延迟1.5秒 显示loading动画 解决Guava异步加载 获取不到实例的问题 // 延迟1.5秒 显示loading动画 解决Guava异步加载 获取不到实例的问题
// setTimeout(() => { setTimeout(() => {
// if (res.data.taskState === 10) { if (res.data.taskState === 10) {
// this.openAudit(res.data); this.openAudit(res.data);
// } else { } else {
// this.openView(res.data); this.openView(res.data);
// } }
// loading.close(); loading.close();
// }, 1500) }, 1500)
// } }
// }) })
}, },
} }
} }
src/main/resources/views/platform/sys/union/branchUnionManage.js
+1 -1
View File
@@ -6,7 +6,7 @@ const branchUnionManage = {
<el-input placeholder="请输入分工会名称" clearable size="small" style="width: 300px" v-model="pageForm.searchKeyword"></el-input> <el-input placeholder="请输入分工会名称" clearable size="small" style="width: 300px" v-model="pageForm.searchKeyword"></el-input>
<el-button type="primary" class="ml5" size="small" icon="el-icon-search" @click="doSearch"></el-button> <el-button type="primary" class="ml5" size="small" icon="el-icon-search" @click="doSearch"></el-button>
<el-button @click="openAudit" icon="el-icon-s-check" type="primary" style="margin-left: auto" size="small">基层干部审核</el-button> <el-button @click="openAudit" icon="el-icon-s-check" type="primary" style="margin-left: auto" size="small" v-if="$auth.hasPermission('sys.manager.union.add')">基层干部审核</el-button>
<el-button @click="openAdd" icon="ti-plus" type="primary" size="small" v-if="$auth.hasPermission('sys.manager.union.add')">新建分工会</el-button> <el-button @click="openAdd" icon="ti-plus" type="primary" size="small" v-if="$auth.hasPermission('sys.manager.union.add')">新建分工会</el-button>
</el-row> </el-row>
</el-card> </el-card>