fix: 论文中止扣分逻辑修改.

nju-softeng · Apr 29, 2024 · f14b362 · f14b362
1 parent 719f495
commit f14b362
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 4 deletions.
diff --git a/src/main/java/com/softeng/dingtalk/controller/SystemController.java b/src/main/java/com/softeng/dingtalk/controller/SystemController.java
@@ -123,7 +123,6 @@ public void updateUserInfo(@RequestBody User user) {
      */
     @GetMapping("/system/disable/user/{uid}")
     public void disableUser(@PathVariable int uid) {
-
         systemService.disableUser(uid);
     }
 

diff --git a/src/main/java/com/softeng/dingtalk/dao/repository/UserRepository.java b/src/main/java/com/softeng/dingtalk/dao/repository/UserRepository.java
@@ -165,6 +165,14 @@ public interface UserRepository extends CustomizedRepository<User, Integer>, Jpa
     @Query("update User set deleted = false where id = :uid")
     void enableUser(int uid);
 
+    /**
+     * 停用用户
+     * @param uid
+     */
+    @Modifying
+    @Query("update User set deleted = true where id = :uid")
+    void disableUser(int uid);
+
     /**
      * 查询所有被禁用的用户
      * @return

diff --git a/src/main/java/com/softeng/dingtalk/service/PaperService.java b/src/main/java/com/softeng/dingtalk/service/PaperService.java
@@ -243,7 +243,10 @@ public double calculateWeightOfAc(InternalPaper internalPaper) {
      * @return AC值
      */
     public double calculateAc(InternalPaper internalPaper, double sum, int rank) {
-        return calculateWeightOfAc(internalPaper) * calculateRatioOfAc(rank) * sum;
+//        论文中止时，只有第一作者扣分
+        double flagForSuspend = (internalPaper.getResult() == InternalPaper.SUSPEND && rank == 1) ? 1.0 : 0.0;
+
+        return calculateWeightOfAc(internalPaper) * calculateRatioOfAc(rank) * sum * flagForSuspend;
     }
 
     /**

diff --git a/src/main/java/com/softeng/dingtalk/service/SystemService.java b/src/main/java/com/softeng/dingtalk/service/SystemService.java
@@ -293,7 +293,7 @@ public void updateUserInfo(User u) {
      * @param uid
      */
     public void disableUser(int uid) {
-        userRepository.deleteById(uid);
+        userRepository.disableUser(uid);
     }
 
 

diff --git a/src/main/java/com/softeng/dingtalk/service/VoteService.java b/src/main/java/com/softeng/dingtalk/service/VoteService.java
@@ -379,7 +379,7 @@ private AcRecord generateAcRecord(String title, User user, boolean voteDetail, i
                 // todo- 论文投票AC变化，对于硕士生是1分，对于博士生是2分
                 .ac(coefficient * (user.getPosition() == Position.DOCTOR ? 2 : 1))
                 .classify(AcRecord.VOTE)
-                .reason((coefficient == 0 ? "投稿中止：" : (coefficient == 1 ? "投票预测正确：" : "投票预测错误：") + title))
+                .reason((coefficient == 0 ? "投稿中止：" + title: (coefficient == 1 ? "投票预测正确：" : "投票预测错误：") + title))
                 .createTime(dateTime)
                 .build();
     }