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

commit

Browse Source
This commit is contained in:
@jyuhsin
2025-12-15 14:54:33 +08:00
parent c5c815fe39
commit e49e3d4b23
2 changed files with 27 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/budwk/app/zhgh/dayofficework/ghkh/controller/GhkhXghshController.java
+21 -20
View File
@@ -52,25 +52,26 @@ public class GhkhXghshController {
@Param(value = "unionid") String unionid, int pageNumber, int pageSize, @Param(value = "unionid") String unionid, int pageNumber, int pageSize,
@Param(value = "pageOrderName") String pageOrderName, @Param(value = "pageOrderName") String pageOrderName,
@Param(value = "pageOrderBy") String pageOrderBy) { @Param(value = "pageOrderBy") String pageOrderBy) {
Sql sql = Sqls.create(""" Sql sql = Sqls.create("""
SELECT SELECT
zb.assessment, zb.assessment,
zb.annual, zb.annual,
un.unionName, un.unionName,
un.unionCode,( un.unionCode,(
SELECT SELECT
sum( score ) sum( score )
FROM FROM
kh_bz kh_bz
WHERE WHERE
nr_id IN ( SELECT id FROM kh_nr WHERE zb_id = zb.id )) bzf, nr_id IN ( SELECT id FROM kh_nr WHERE zb_id = zb.id )) bzf,
re.* re.*,
FROM (select ifnull(sum(schools), 0) from kh_xghsh where flatid = re.union_id and nr_id in (select id from kh_nr where zb_id = re.zb_id and auditUser = @loginName)) as self_score
kh_record re FROM
LEFT JOIN kh_zb zb ON re.zb_id = zb.id kh_record re
LEFT JOIN `vw_user` un ON re.union_id = un.unionId LEFT JOIN kh_zb zb ON re.zb_id = zb.id
$condition LEFT JOIN `vw_user` un ON re.union_id = un.unionId
"""); $condition
""").setParam("loginName", SecurityUtil.getUserLoginname());
Cnd cnd = Cnd.NEW(); Cnd cnd = Cnd.NEW();
/*cnd.and("re.state", "=", 2);*/ /*cnd.and("re.state", "=", 2);*/
cnd.and("zb.disabled", "=", true); cnd.and("zb.disabled", "=", true);
@@ -146,8 +147,8 @@ public class GhkhXghshController {
for (Kh_xghsh p : pf) { for (Kh_xghsh p : pf) {
if(contentIds.contains(p.getNr_id())) { if(contentIds.contains(p.getNr_id())) {
khzpService.dao().insert(p); khzpService.dao().insert(p);
score += p.getSchools() != null ? p.getSchools() : 0;
} }
score += p.getSchools() != null ? p.getSchools() : 0;
} }
Kh_record record = baseService.dao().fetch(Kh_record.class, Cnd.where("zb_id", "=", pf[0].getZb_id()).and("union_id", "=", pf[0].getFlatid())); Kh_record record = baseService.dao().fetch(Kh_record.class, Cnd.where("zb_id", "=", pf[0].getZb_id()).and("union_id", "=", pf[0].getFlatid()));
src/main/resources/views/platform/zhgh/dayofficework/ghkh/xghsh.html
+6 -2
View File
@@ -74,11 +74,15 @@ layout("/layouts/platform.html"){
show-overflow-tooltip v-if="examConfig.selfAssessment === true" show-overflow-tooltip v-if="examConfig.selfAssessment === true"
align="center"></el-table-column> align="center"></el-table-column>
<el-table-column label="校工会评分" sortable prop="xgh_score" <el-table-column label="您的评分" sortable prop="self_score"
header-align="center" header-align="center"
show-overflow-tooltip show-overflow-tooltip
align="center"></el-table-column> align="center"></el-table-column>
<el-table-column label="校工会评分" sortable prop="xgh_score"
header-align="center"
show-overflow-tooltip
align="center"></el-table-column>
<el-table-column label="状态" prop="name" header-align="center" <el-table-column label="状态" prop="name" header-align="center"
align="center"> align="center">
@@ -397,7 +401,7 @@ layout("/layouts/platform.html"){
sums[index] = ''; sums[index] = '';
return; return;
} else if (column.property === 'fileCount') { } else if (column.property === 'fileCount') {
const zpfs = data.map(v => v['zp']['files']?.length || 0) const zpfs = data.map(v => v.zp?.files?.length || 0)
sums[index] = zpfs.reduce((a, b) => { sums[index] = zpfs.reduce((a, b) => {
return a + b; return a + b;
}) + ' 个' }) + ' 个'