diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/ghkh/controller/GhkhXghshController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/ghkh/controller/GhkhXghshController.java
index 663e026..d60c1cd 100644
--- a/src/main/java/com/budwk/app/zhgh/dayofficework/ghkh/controller/GhkhXghshController.java
+++ b/src/main/java/com/budwk/app/zhgh/dayofficework/ghkh/controller/GhkhXghshController.java
@@ -52,25 +52,26 @@ public class GhkhXghshController {
@Param(value = "unionid") String unionid, int pageNumber, int pageSize,
@Param(value = "pageOrderName") String pageOrderName,
@Param(value = "pageOrderBy") String pageOrderBy) {
- Sql sql = Sqls.create("""
- SELECT
- zb.assessment,
- zb.annual,
- un.unionName,
- un.unionCode,(
- SELECT
- sum( score )
- FROM
- kh_bz
- WHERE
- nr_id IN ( SELECT id FROM kh_nr WHERE zb_id = zb.id )) bzf,
- re.*
- FROM
- kh_record re
- LEFT JOIN kh_zb zb ON re.zb_id = zb.id
- LEFT JOIN `vw_user` un ON re.union_id = un.unionId
- $condition
- """);
+ Sql sql = Sqls.create("""
+ SELECT
+ zb.assessment,
+ zb.annual,
+ un.unionName,
+ un.unionCode,(
+ SELECT
+ sum( score )
+ FROM
+ kh_bz
+ WHERE
+ nr_id IN ( SELECT id FROM kh_nr WHERE zb_id = zb.id )) bzf,
+ re.*,
+ (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
+ FROM
+ kh_record re
+ LEFT JOIN kh_zb zb ON re.zb_id = zb.id
+ LEFT JOIN `vw_user` un ON re.union_id = un.unionId
+ $condition
+ """).setParam("loginName", SecurityUtil.getUserLoginname());
Cnd cnd = Cnd.NEW();
/*cnd.and("re.state", "=", 2);*/
cnd.and("zb.disabled", "=", true);
@@ -146,8 +147,8 @@ public class GhkhXghshController {
for (Kh_xghsh p : pf) {
if(contentIds.contains(p.getNr_id())) {
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()));
diff --git a/src/main/resources/views/platform/zhgh/dayofficework/ghkh/xghsh.html b/src/main/resources/views/platform/zhgh/dayofficework/ghkh/xghsh.html
index dcc2303..bd9a937 100644
--- a/src/main/resources/views/platform/zhgh/dayofficework/ghkh/xghsh.html
+++ b/src/main/resources/views/platform/zhgh/dayofficework/ghkh/xghsh.html
@@ -74,11 +74,15 @@ layout("/layouts/platform.html"){
show-overflow-tooltip v-if="examConfig.selfAssessment === true"
align="center">
-
+
@@ -397,7 +401,7 @@ layout("/layouts/platform.html"){
sums[index] = '';
return;
} 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) => {
return a + b;
}) + ' 个'