core: 修复作业成绩表计分异常的问题

packages/hydrojudge/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@hydrooj/hydrojudge",
     "bin": "bin/hydrojudge.js",
-    "version": "2.3.0",
+    "version": "2.3.1",
     "main": "package.json",
     "author": "undefined <i@undefined.moe>",
     "repository": "https://github.com/hydro-dev/Hydro.git",

packages/hydrojudge/src/service.ts

@@ -71,7 +71,6 @@ async function postInit() {
     }
 
     async function cacheOpen(domainId: string, pid: string, files: any[]) {
-        console.log(files);
         const filePath = path.join(getConfig('cache_dir'), domainId, pid);
         await fs.ensureDir(filePath);
         if (!files.length) throw new SystemError('Problem data not found.');

packages/hydrooj/package.json

@@ -1,6 +1,6 @@
 {
     "name": "hydrooj",
-    "version": "2.17.1",
+    "version": "2.17.2",
     "bin": "bin/hydrooj.js",
     "main": "dist/loader.js",
     "typings": "dist/loader.d.ts",

packages/hydrooj/src/model/contest.ts

@@ -214,7 +214,7 @@ const homework: ContestRule = {
     stat: (tdoc, journal) => {
         const effective = {};
         for (const j of journal) {
-            if (tdoc.pids.includes(j.pid) && !effective[j.pid] && j.accept) {
+            if (tdoc.pids.includes(j.pid) && (!effective[j.pid] || j.accept)) {
                 effective[j.pid] = j;
             }
         }
@@ -248,7 +248,7 @@ const homework: ContestRule = {
         }
         return {
             score: Math.sum(detail.map((d) => d.score)),
-            penaltyScore: Math.sum(detail.map((d) => d.penaltySince)),
+            penaltyScore: Math.sum(detail.map((d) => d.penaltyScore)),
             time: Math.sum(detail.map((d) => d.time)),
             detail,
         };
@@ -300,7 +300,7 @@ const homework: ContestRule = {
         const rows = [columns];
         for (const [rank, tsdoc] of rankedTsdocs) {
             const tsddict = {};
-            for (const item of tsdoc.journal || []) {
+            for (const item of tsdoc.detail || []) {
                 tsddict[item.pid] = item;
             }
             const row = [