From f1de635486a35dee4897ccd2c82eedb10d73f23b Mon Sep 17 00:00:00 2001
From: Glaxky <191250075@smail.nju.edu.cn>
Date: Fri, 4 Oct 2024 16:13:43 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=B7=BB=E5=8A=A0ac=E5=8F=98=E6=9B=B4?=
 =?UTF-8?q?=E7=9A=84=E6=8E=A5=E5=8F=A3.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/PerformanceController.java     | 24 +++++++++++++++++++
 .../dao/repository/AcRecordRepository.java    |  2 +-
 .../dingtalk/service/PerformanceService.java  |  6 +++++
 3 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/softeng/dingtalk/controller/PerformanceController.java b/src/main/java/com/softeng/dingtalk/controller/PerformanceController.java
index 6fa2984f..67c66204 100644
--- a/src/main/java/com/softeng/dingtalk/controller/PerformanceController.java
+++ b/src/main/java/com/softeng/dingtalk/controller/PerformanceController.java
@@ -1,12 +1,20 @@
 package com.softeng.dingtalk.controller;
 
+import com.softeng.dingtalk.aspect.AccessPermission;
+import com.softeng.dingtalk.component.UserContextHolder;
+import com.softeng.dingtalk.dto.CommonResult;
+import com.softeng.dingtalk.entity.AcRecord;
+import com.softeng.dingtalk.entity.User;
+import com.softeng.dingtalk.enums.PermissionEnum;
 import com.softeng.dingtalk.service.PerformanceService;
+import com.softeng.dingtalk.service.UserService;
 import com.softeng.dingtalk.vo.DateVO;
 import com.softeng.dingtalk.vo.TopupVO;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
 import java.util.List;
 import java.util.Map;
 
@@ -19,6 +27,10 @@
 @RestController
 @RequestMapping("/api")
 public class PerformanceController {
+    @Resource
+    UserContextHolder userContextHolder;
+    @Resource
+    UserService userService;
     @Autowired
     PerformanceService performanceService;
 
@@ -86,4 +98,16 @@ public void updatetopup(@RequestBody TopupVO vo) {
         performanceService.updateTopup(vo.getUid(), vo.getYearmonth(), vo.getTopup());
     }
 
+//    todo
+    @PostMapping("/performance")
+    @AccessPermission(PermissionEnum.EDIT_ANY_USER_INFO)
+    public CommonResult<String> addPerformance(@RequestBody AcRecord acRecord) {
+        User auditor = new User(userContextHolder.getUserContext().getUid());
+        User user = new User(acRecord.getUser().getId());
+        acRecord.setAuditor(auditor);
+        acRecord.setUser(user);
+        performanceService.addPerformance(acRecord);
+        return CommonResult.success("添加成功");
+    }
+
 }
diff --git a/src/main/java/com/softeng/dingtalk/dao/repository/AcRecordRepository.java b/src/main/java/com/softeng/dingtalk/dao/repository/AcRecordRepository.java
index 000de97c..8d475dc6 100644
--- a/src/main/java/com/softeng/dingtalk/dao/repository/AcRecordRepository.java
+++ b/src/main/java/com/softeng/dingtalk/dao/repository/AcRecordRepository.java
@@ -37,7 +37,7 @@ public interface AcRecordRepository extends CustomizedRepository<AcRecord, Integ
      * @return
      */
     @Query(value = "select u.id, u.name, ifnull(sum(a.ac), 0)  as total from" +
-            " (SELECT id, name FROM `user` WHERE position != '待定' and is_deleted = 0) u left join" +
+            " (SELECT id, name FROM `user` WHERE position != '待定' and position != '教师' and is_deleted = 0) u left join" +
             " ac_record a on u.id = a.user_id  group by u.id order by total DESC", nativeQuery = true)
     List<Map<String, Object>> listAcSummary();
 
diff --git a/src/main/java/com/softeng/dingtalk/service/PerformanceService.java b/src/main/java/com/softeng/dingtalk/service/PerformanceService.java
index 8c42e585..cbea88f8 100644
--- a/src/main/java/com/softeng/dingtalk/service/PerformanceService.java
+++ b/src/main/java/com/softeng/dingtalk/service/PerformanceService.java
@@ -4,6 +4,7 @@
 import com.softeng.dingtalk.dao.repository.BugRepository;
 import com.softeng.dingtalk.dao.repository.DcSummaryRepository;
 import com.softeng.dingtalk.dao.repository.UserRepository;
+import com.softeng.dingtalk.entity.AcRecord;
 import com.softeng.dingtalk.entity.DcSummary;
 import com.softeng.dingtalk.enums.Position;
 import lombok.extern.slf4j.Slf4j;
@@ -140,4 +141,9 @@ public Map getUserPerformance(int uid) {
                 "w5", dc.getWeek5());
     }
 
+//    todo
+    public void addPerformance(AcRecord acRecord) {
+        acRecordRepository.save(acRecord);
+    }
+
 }