Optimized code

Pinnacle/src/main/java/com/cfive/pinnacle/controller/AffairController.java

@@ -11,7 +11,6 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import java.time.LocalDateTime;
-import java.util.Date;
 import java.util.List;
 
 /**
@@ -22,12 +21,15 @@ import java.util.List;
  * @author FatttSnake
  * @since 2023-04-30
  */
-@CrossOrigin
 @RestController
 @RequestMapping("/affair")
 public class AffairController {
+    private IAffairService affairService;
+
     @Autowired
-    IAffairService affairService;
+    public void setAffairService(IAffairService affairService) {
+        this.affairService = affairService;
+    }
 
     @PostMapping("/add")
     @PreAuthorize("hasAuthority('affair:self:add')")
@@ -35,7 +37,6 @@ public class AffairController {
         return ResponseResult.build(ResponseCode.DATABASE_SAVE_OK, "success", affairService.save(affair));
     }
 
-
     @GetMapping("/personal_affairs")
     @PreAuthorize("hasAuthority('affair:self:get')")
     public ResponseResult<List<Affair>> getPersonalAffairs() {
@@ -57,9 +58,9 @@ public class AffairController {
 
     @GetMapping("/personal_affairs_fuzzy_queries")
     @PreAuthorize("hasAuthority('affair:self:get')")
-    public ResponseResult getPersonalAffairsByTitle(String title,Long typeId,Integer status) {
-        Long applicantId =WebUtil.getLoginUser().getUser().getId();
-        return ResponseResult.build(ResponseCode.DATABASE_SELECT_OK,"success",affairService.getFuzzyQueriesByAffairTitle(title.trim(),typeId,status,applicantId));
+    public ResponseResult<List<Affair>> getPersonalAffairsByTitle(String title, Long typeId, Integer status) {
+        Long applicantId = WebUtil.getLoginUser().getUser().getId();
+        return ResponseResult.build(ResponseCode.DATABASE_SELECT_OK, "success", affairService.getFuzzyQueriesByAffairTitle(title.trim(), typeId, status, applicantId));
     }
 
     @GetMapping("/not_approved")
@@ -73,12 +74,11 @@ public class AffairController {
 
     @GetMapping("/not_approved_FuzzyQueries")
     @PreAuthorize("hasAuthority('affair:manage:get')")
-    public ResponseResult<List<Affair>> selectNotApprovedByFuzzyQueries(String title,Long typeId,Integer status,LocalDateTime startTime,LocalDateTime endTime ) {
-        Long inspectorId= WebUtil.getLoginUser().getUser().getId();
-        return ResponseResult.build(ResponseCode.DATABASE_SELECT_OK,"success",affairService.getNotApprovedByFuzzyQueries(title,typeId,status,inspectorId,startTime,endTime));
+    public ResponseResult<List<Affair>> selectNotApprovedByFuzzyQueries(String title, Long typeId, Integer status, LocalDateTime startTime, LocalDateTime endTime) {
+        Long inspectorId = WebUtil.getLoginUser().getUser().getId();
+        return ResponseResult.build(ResponseCode.DATABASE_SELECT_OK, "success", affairService.getNotApprovedByFuzzyQueries(title, typeId, status, inspectorId, startTime, endTime));
     }
 
-
     @GetMapping("/approved")
     @PreAuthorize("hasAuthority('affair:manage:get')")
     public ResponseResult<List<Affair>> selectApproved() {
@@ -90,9 +90,9 @@ public class AffairController {
 
     @GetMapping("/approved_FuzzyQueries")
     @PreAuthorize("hasAuthority('affair:manage:get')")
-    public  ResponseResult<List<Affair>> selectApprovedByFuzzyQueries(String title,Long typeId,Integer status,LocalDateTime startTime,LocalDateTime endTime ) {
-        Long inspectorId =WebUtil.getLoginUser().getUser().getId();
-        return  ResponseResult.build(ResponseCode.DATABASE_SELECT_OK,"success",affairService.getApprovedByFuzzyQueries(title,typeId,status,inspectorId,startTime,endTime));
+    public ResponseResult<List<Affair>> selectApprovedByFuzzyQueries(String title, Long typeId, Integer status, LocalDateTime startTime, LocalDateTime endTime) {
+        Long inspectorId = WebUtil.getLoginUser().getUser().getId();
+        return ResponseResult.build(ResponseCode.DATABASE_SELECT_OK, "success", affairService.getApprovedByFuzzyQueries(title, typeId, status, inspectorId, startTime, endTime));
     }
 
     @PutMapping("/yes")
@@ -109,7 +109,6 @@ public class AffairController {
         //审批驳回
     }
 
-
     @DeleteMapping("/{id}")
     @PreAuthorize("hasAuthority('affair:manage:delete')")
     public ResponseResult<Boolean> deleteAffairApproved(@PathVariable Long id) {

Pinnacle/src/main/java/com/cfive/pinnacle/controller/AttendanceController.java

@@ -19,14 +19,16 @@ import java.util.List;
  * @author gzw
  * @since 2023-04-30
  */
-@CrossOrigin
 @RestController
 @RequestMapping("/attendance")
 public class AttendanceController {
 
-    @Autowired
     private IAttendanceService attendanceService;
 
+    @Autowired
+    public void setAttendanceService(IAttendanceService attendanceService) {
+        this.attendanceService = attendanceService;
+    }
 
     //查询所有考勤信息和用户名
     @GetMapping("findAllAttendance")
@@ -35,30 +37,34 @@ public class AttendanceController {
         List<Attendance> attendances = attendanceService.getAllAttendanceAndUser();
         return ResponseResult.build(ResponseCode.DATABASE_SELECT_OK, "success", attendances);
     }
+
     //查询个人考勤
     @GetMapping("/selectAttendance")
     @PreAuthorize("hasAuthority('attendance:self:check')")
     public ResponseResult<List<Attendance>> findAttendanceAndUser() {
         Long userId = WebUtil.getLoginUser().getUser().getId();
-        List<Attendance> attendances = attendanceService.getAttendanceAndUserByid(userId);
+        List<Attendance> attendances = attendanceService.getAttendanceAndUserById(userId);
         return ResponseResult.build(ResponseCode.DATABASE_SELECT_OK, "success", attendances);
     }
+
     //模糊时间查询所有考勤信息
     @GetMapping("/findAttendanceByTime")
     @PreAuthorize("hasAuthority('attendance:manage:get')")
-    public ResponseResult<List<Attendance>> findAttendanceAndUserByTime(String startTime,String endTime) {
+    public ResponseResult<List<Attendance>> findAttendanceAndUserByTime(String startTime, String endTime) {
         List<Attendance> attendances = attendanceService.selectByTime(startTime, endTime);
         return ResponseResult.build(ResponseCode.DATABASE_SELECT_OK, "success", attendances);
     }
+
     //用户个人模糊时间查询
     @GetMapping("/findOneAttendanceByTime")
     @PreAuthorize("hasAuthority('attendance:self:check')")
-    public ResponseResult<List<Attendance>> findOneAttendanceAndUserByTime(String startTime,String endTime) {
+    public ResponseResult<List<Attendance>> findOneAttendanceAndUserByTime(String startTime, String endTime) {
         Long userId = WebUtil.getLoginUser().getUser().getId();
-        List<Attendance> attendances = attendanceService.selectOneByTime(startTime, endTime,userId);
+        List<Attendance> attendances = attendanceService.selectOneByTime(startTime, endTime, userId);
         System.out.println(attendances);
         return ResponseResult.build(ResponseCode.DATABASE_SELECT_OK, "success", attendances);
     }
+
     //添加或更新考勤信息
     @PostMapping("/saveAttendance")
     @PreAuthorize("hasAuthority('attendance:manage:modify') and hasAuthority('attendance:manage:get')")
@@ -79,7 +85,7 @@ public class AttendanceController {
             attendance.setStatus(3);
             return attendanceService.save(attendance) ? ResponseResult.build(ResponseCode.DATABASE_SAVE_OK, "success", attendance) :
                     ResponseResult.build(ResponseCode.DATABASE_SAVE_ERROR, "error", null);
-        } else if (attendance.getAttTime().getHour() >= 10&& attendance.getAttTime().getHour() < 15) {
+        } else if (attendance.getAttTime().getHour() >= 10 && attendance.getAttTime().getHour() < 15) {
 //            签退
             attendance.setStatus(2);
             return attendanceService.save(attendance) ? ResponseResult.build(ResponseCode.DATABASE_SAVE_OK, "success", attendance) :
@@ -95,12 +101,8 @@ public class AttendanceController {
             return attendanceService.save(attendance) ? ResponseResult.build(ResponseCode.DATABASE_SAVE_OK, "success", attendance) :
                     ResponseResult.build(ResponseCode.DATABASE_SAVE_ERROR, "error", null);
         }
-
-
     }
 
-
-
     //删除考勤信息
     @DeleteMapping("/delAttendance/{id}")
     @PreAuthorize("hasAuthority('attendance:manage:delete') and hasAuthority('attendance:manage:get')")
@@ -116,7 +118,4 @@ public class AttendanceController {
         return attendanceService.removeByIds(ids) ? ResponseResult.build(ResponseCode.DATABASE_DELETE_OK, "success", null) :
                 ResponseResult.build(ResponseCode.DATABASE_DELETE_ERROR, "error", null);
     }
-
-
-
 }

Pinnacle/src/main/java/com/cfive/pinnacle/controller/DepartmentController.java

@@ -8,6 +8,7 @@ import com.cfive.pinnacle.entity.common.ResponseResult;
 import com.cfive.pinnacle.exception.DataValidationFailedException;
 import com.cfive.pinnacle.service.IDepartmentService;
 import com.cfive.pinnacle.utils.WebUtil;
+import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -24,9 +25,9 @@ import java.util.regex.Pattern;
  * @author FatttSnake
  * @since 2023-04-30
  */
+@Tag(name = "部门", description = "部门相关接口")
 @RestController
 @RequestMapping("/department")
-@Tag(name = "部门", description = "部门相关接口")
 public class DepartmentController {
     private IDepartmentService departmentService;
 
@@ -35,19 +36,21 @@ public class DepartmentController {
         this.departmentService = departmentService;
     }
 
-    //获取所有部门及其各部门所属成员
+    @Operation(summary = "获取所有部门及其各部门所属成员")
     @GetMapping("/user")
     @PreAuthorize("hasAuthority('notice:manage:add')")
     public ResponseResult<List<Department>> getDepartAndUser() {
         return ResponseResult.databaseSelectSuccess(departmentService.getDepartmentWithUser());
     }
 
+    @Operation(summary = "获取所有部门")
     @GetMapping
     @PreAuthorize("hasAuthority('department:admin:get')")
     public ResponseResult<IPage<Department>> getAllDepartment(Long currentPage, Long pageSize, Integer searchType, String searchInput, Integer searchRegex) {
         return ResponseResult.databaseSelectSuccess(departmentService.getAllDepartment(currentPage, pageSize, searchType, searchInput, searchRegex));
     }
 
+    @Operation(summary = "获取部门列表")
     @GetMapping("list")
     @PreAuthorize("hasAnyAuthority('staff:manege:modify', 'staff:admin:modify')")
     public ResponseResult<List<Department>> getDepartmentList() {
@@ -62,6 +65,7 @@ public class DepartmentController {
         return ResponseResult.databaseSelectSuccess(departmentList);
     }
 
+    @Operation(summary = "添加部门")
     @PostMapping
     @PreAuthorize("hasAuthority('department:admin:add')")
     public ResponseResult<?> addDepartment(@RequestBody Department department) {
@@ -75,6 +79,7 @@ public class DepartmentController {
         }
     }
 
+    @Operation(summary = "修改部门")
     @PutMapping
     @PreAuthorize("hasAuthority('department:admin:modify')")
     public ResponseResult<?> modifyDepartment(@RequestBody Department department) {
@@ -88,6 +93,7 @@ public class DepartmentController {
         }
     }
 
+    @Operation(summary = "删除部门")
     @DeleteMapping("/{id}")
     @PreAuthorize("hasAuthority('department:admin:delete')")
     public ResponseResult<?> deleteDepartment(@PathVariable Long id) {

Pinnacle/src/main/java/com/cfive/pinnacle/controller/NoticeController.java

@@ -31,15 +31,23 @@ import java.util.stream.Collectors;
 @CrossOrigin
 @Slf4j
 public class NoticeController {
-    @Autowired
     private INoticeService noticeService;
-    @Autowired
     private INoticeReceiveService noticeReceiveService;
 
+    @Autowired
+    public void setNoticeService(INoticeService noticeService) {
+        this.noticeService = noticeService;
+    }
+
+    @Autowired
+    public void setNoticeReceiveService(INoticeReceiveService noticeReceiveService) {
+        this.noticeReceiveService = noticeReceiveService;
+    }
+
     //分页查询所有公告或分页模糊查询
     @GetMapping("/page")
     @PreAuthorize("hasAuthority('notice:manage:get')")
-    public ResponseResult<List<Notice>> selectPageNotice(Integer currentPage, Integer pageSize, String title, String type, String startTime, String endTime,String userIdList) {
+    public ResponseResult<List<Notice>> selectPageNotice(Integer currentPage, Integer pageSize, String title, String type, String startTime, String endTime, String userIdList) {
         List<Long> userIds = WebUtil.convertStringToList(userIdList, Long.class);
         Page<Notice> noticePage;
         if (null != currentPage && null != pageSize) {
@@ -48,7 +56,7 @@ public class NoticeController {
             // 不进行分页
             noticePage = PageDTO.of(1, -1);
         }
-        IPage<Notice> noticeIPage = noticeService.selectPageNotice(noticePage, title.trim(), type.trim(), startTime.trim(), endTime.trim(),userIds);
+        IPage<Notice> noticeIPage = noticeService.selectPageNotice(noticePage, title.trim(), type.trim(), startTime.trim(), endTime.trim(), userIds);
         int code = noticeIPage.getRecords() != null ? ResponseCode.DATABASE_SELECT_OK : ResponseCode.DATABASE_SELECT_ERROR;
         String msg = noticeIPage.getRecords() != null ? String.valueOf(noticeIPage.getTotal()) : "数据查询失败，请重试！";
         return ResponseResult.build(code, msg, noticeIPage.getRecords());
@@ -67,7 +75,7 @@ public class NoticeController {
     //根据登录用户id查询所接收的公告
     @GetMapping("/self")
     @PreAuthorize("hasAuthority('notice:self:get')")
-    public ResponseResult<List<Notice>> selectByUserId(Integer readStatus,String title, String type, String startTime, String endTime) {
+    public ResponseResult<List<Notice>> selectByUserId(Integer readStatus, String title, String type, String startTime, String endTime) {
         List<Notice> noticesByUserId = noticeReceiveService.selectByUserId(readStatus, title.trim(), type.trim(), startTime.trim(), endTime.trim());
         int code = noticesByUserId != null ? ResponseCode.DATABASE_SELECT_OK : ResponseCode.DATABASE_SELECT_ERROR;
         String msg = noticesByUserId != null ? "" : "数据查询失败，请重试！";
@@ -86,6 +94,7 @@ public class NoticeController {
         return ResponseResult.build(updateById ? ResponseCode.DATABASE_UPDATE_OK : ResponseCode.DATABASE_UPDATE_ERROR, msg, null);
 
     }
+
     //修改公告置顶状态
     @PutMapping("/update_notice_top")
     @PreAuthorize("hasAuthority('notice:manage:get')")

Pinnacle/src/main/java/com/cfive/pinnacle/controller/NoticeTypeController.java

@@ -7,7 +7,6 @@ import com.cfive.pinnacle.entity.NoticeType;
 import com.cfive.pinnacle.entity.common.ResponseCode;
 import com.cfive.pinnacle.entity.common.ResponseResult;
 import com.cfive.pinnacle.service.INoticeTypeService;
-import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.util.StringUtils;
@@ -26,19 +25,21 @@ import java.util.stream.Collectors;
  */
 @RestController
 @RequestMapping("/notice_type")
-@CrossOrigin
-@Slf4j
 public class NoticeTypeController {
 
+    private INoticeTypeService noticeTypeService;
+
     @Autowired
-    INoticeTypeService noticeTypeService;
+    public void setNoticeTypeService(INoticeTypeService noticeTypeService) {
+        this.noticeTypeService = noticeTypeService;
+    }
 
     //查询已启用的公告类型
     @GetMapping("/enable")
     @PreAuthorize("hasAnyAuthority('notice:type:enable', 'notice:self:get', 'notice:manage:get')")
-    public ResponseResult<List<NoticeType>> selectEnableTypeList(){
+    public ResponseResult<List<NoticeType>> selectEnableTypeList() {
         List<NoticeType> selectTypeName = noticeTypeService.selectEnableTypeList();
-        Integer code = selectTypeName != null ? ResponseCode.DATABASE_SELECT_OK : ResponseCode.DATABASE_SELECT_ERROR;
+        int code = selectTypeName != null ? ResponseCode.DATABASE_SELECT_OK : ResponseCode.DATABASE_SELECT_ERROR;
         String msg = selectTypeName != null ? "" : "数据查询失败，请重试！";
         return ResponseResult.build(code, msg, selectTypeName);
     }
@@ -46,9 +47,9 @@ public class NoticeTypeController {
     //查询所有公告类型
     @GetMapping
     @PreAuthorize("hasAuthority('notice:type:get')")
-    public ResponseResult<List<NoticeType>> selectTypeList(){
+    public ResponseResult<List<NoticeType>> selectTypeList() {
         List<NoticeType> selectTypeList = noticeTypeService.selectTypeList();
-        Integer code = selectTypeList != null ? ResponseCode.DATABASE_SELECT_OK : ResponseCode.DATABASE_SELECT_ERROR;
+        int code = selectTypeList != null ? ResponseCode.DATABASE_SELECT_OK : ResponseCode.DATABASE_SELECT_ERROR;
         String msg = selectTypeList != null ? "" : "数据查询失败，请重试！";
         return ResponseResult.build(code, msg, selectTypeList);
     }
@@ -56,7 +57,7 @@ public class NoticeTypeController {
     //分页查询所有公告类型
     @GetMapping("/page")
     @PreAuthorize("hasAuthority('notice:type:get')")
-    public ResponseResult<List<NoticeType>> selectPageTypeList(Integer currentPage, Integer pageSize,String name,Integer enable){
+    public ResponseResult<List<NoticeType>> selectPageTypeList(Integer currentPage, Integer pageSize, String name, Integer enable) {
         Page<NoticeType> noticeTypePage;
         if (null != currentPage && null != pageSize) {
             noticeTypePage = PageDTO.of(currentPage, pageSize);
@@ -64,8 +65,8 @@ public class NoticeTypeController {
             // 不进行分页
             noticeTypePage = PageDTO.of(1, -1);
         }
-        IPage<NoticeType> selectPageTypeList = noticeTypeService.selectPageTypeList(noticeTypePage,name.trim(),enable);
-        Integer code = selectPageTypeList.getRecords() != null ? ResponseCode.DATABASE_SELECT_OK : ResponseCode.DATABASE_SELECT_ERROR;
+        IPage<NoticeType> selectPageTypeList = noticeTypeService.selectPageTypeList(noticeTypePage, name.trim(), enable);
+        int code = selectPageTypeList.getRecords() != null ? ResponseCode.DATABASE_SELECT_OK : ResponseCode.DATABASE_SELECT_ERROR;
         String msg = selectPageTypeList.getRecords() != null ? String.valueOf(selectPageTypeList.getTotal()) : "数据查询失败，请重试！";
         return ResponseResult.build(code, msg, selectPageTypeList.getRecords());
     }
@@ -73,9 +74,9 @@ public class NoticeTypeController {
     //修改公告类型启用或禁用
     @GetMapping("/update")
     @PreAuthorize("hasAuthority('notice:type:modify')")
-    public ResponseResult<?> updateTypeEnableById(String typeId,Integer enable){
-        Long tid=null;
-        if (StringUtils.hasText(typeId)){
+    public ResponseResult<?> updateTypeEnableById(String typeId, Integer enable) {
+        Long tid = null;
+        if (StringUtils.hasText(typeId)) {
             tid = Long.parseLong(typeId);
         }
         Boolean updateEnableById = noticeTypeService.updateTypeEnableById(tid, enable);
@@ -86,7 +87,7 @@ public class NoticeTypeController {
     //添加公告类型
     @PostMapping
     @PreAuthorize("hasAuthority('notice:type:add')")
-    public ResponseResult<?> addNoticeType(@RequestBody NoticeType noticeType){
+    public ResponseResult<?> addNoticeType(@RequestBody NoticeType noticeType) {
         Boolean insertNotice = noticeTypeService.addNoticeType(noticeType);
         String msg = insertNotice ? "" : "数据添加失败，请重试！";
         return ResponseResult.build(insertNotice ? ResponseCode.DATABASE_SAVE_OK : ResponseCode.DATABASE_SAVE_ERROR, msg, null);
@@ -95,8 +96,8 @@ public class NoticeTypeController {
     //修改公告类型
     @PutMapping
     @PreAuthorize("hasAuthority('notice:type:modify')")
-    public ResponseResult<?> updateNoticeType(@RequestBody NoticeType noticeType){
-        boolean updateById =noticeTypeService.updateNoticeType(noticeType);
+    public ResponseResult<?> updateNoticeType(@RequestBody NoticeType noticeType) {
+        boolean updateById = noticeTypeService.updateNoticeType(noticeType);
         String msg = updateById ? "" : "数据修改失败，请重试！";
         return ResponseResult.build(updateById ? ResponseCode.DATABASE_UPDATE_OK : ResponseCode.DATABASE_UPDATE_ERROR, msg, null);
     }
@@ -113,7 +114,7 @@ public class NoticeTypeController {
     //批量删除公告
     @PostMapping("/batch")
     @PreAuthorize("hasAuthority('notice:manage:delete')")
-    public ResponseResult<?> deleteBatchByTypeIds(@RequestBody List<String> noticeTypeIds){
+    public ResponseResult<?> deleteBatchByTypeIds(@RequestBody List<String> noticeTypeIds) {
         //	List<String>转List<Long>
         List<Long> nTypeIds = noticeTypeIds.stream().map(s -> Long.parseLong(s.trim())).collect(Collectors.toList());
         Boolean deleteBatchByIds = noticeTypeService.deleteBatchByTypeIds(nTypeIds);

Pinnacle/src/main/java/com/cfive/pinnacle/controller/StaffController.java

@@ -20,9 +20,9 @@ import org.springframework.web.bind.annotation.*;
  * @author FatttSnake
  * @since 2023-04-30
  */
+@Tag(name = "员工信息", description = "员工信息相关接口")
 @RestController
 @RequestMapping("/staff")
-@Tag(name = "员工信息", description = "员工信息相关接口")
 public class StaffController {
     private IStaffService staffService;
 

Pinnacle/src/main/java/com/cfive/pinnacle/controller/WorkController.java

@@ -22,12 +22,15 @@ import java.util.List;
  */
 
 @RestController
-@CrossOrigin
 @RequestMapping("/work")
 public class WorkController {
-    @Autowired
     private IWorkService workService;
 
+    @Autowired
+    public void setWorkService(IWorkService workService) {
+        this.workService = workService;
+    }
+
     @GetMapping
     @PreAuthorize("hasAuthority('work:manage:get')")
     public ResponseResult<List<Work>> getAll(String content) {

Pinnacle/src/main/java/com/cfive/pinnacle/controller/permission/GroupController.java

@@ -2,9 +2,9 @@ package com.cfive.pinnacle.controller.permission;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.cfive.pinnacle.entity.permission.Group;
 import com.cfive.pinnacle.entity.common.ResponseCode;
 import com.cfive.pinnacle.entity.common.ResponseResult;
+import com.cfive.pinnacle.entity.permission.Group;
 import com.cfive.pinnacle.service.permission.IGroupService;
 import com.cfive.pinnacle.utils.WebUtil;
 import io.swagger.v3.oas.annotations.Operation;
@@ -27,9 +27,9 @@ import java.util.List;
  * @author FatttSnake
  * @since 2023-04-30
  */
+@Tag(name = "用户组", description = "用户组相关接口")
 @RestController
 @RequestMapping("/group")
-@Tag(name = "用户组", description = "用户组相关接口")
 public class GroupController {
     private IGroupService groupService;
 

Pinnacle/src/main/java/com/cfive/pinnacle/controller/permission/LoginController.java

@@ -1,8 +1,8 @@
 package com.cfive.pinnacle.controller.permission;
 
-import com.cfive.pinnacle.entity.permission.User;
 import com.cfive.pinnacle.entity.common.ResponseCode;
 import com.cfive.pinnacle.entity.common.ResponseResult;
+import com.cfive.pinnacle.entity.permission.User;
 import com.cfive.pinnacle.service.permission.ILoginService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -12,9 +12,8 @@ import org.springframework.web.bind.annotation.*;
 
 import java.util.HashMap;
 
-@RestController
-@CrossOrigin
 @Tag(name = "登录", description = "登录相关接口")
+@RestController
 public class LoginController {
 
     private ILoginService loginService;
@@ -44,7 +43,7 @@ public class LoginController {
 
     @Operation(summary = "更新 Token")
     @GetMapping("/token")
-    public ResponseResult<HashMap<String, String >> renewToken(HttpServletRequest request) {
+    public ResponseResult<HashMap<String, String>> renewToken(HttpServletRequest request) {
         String token = request.getHeader("token");
         HashMap<String, String> hashMap = loginService.renewToken(token);
         return ResponseResult.build(ResponseCode.TOKEN_RENEW_SUCCESS, "Token renew success", hashMap);

Pinnacle/src/main/java/com/cfive/pinnacle/controller/permission/RoleController.java

@@ -2,9 +2,9 @@ package com.cfive.pinnacle.controller.permission;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.cfive.pinnacle.entity.permission.Role;
 import com.cfive.pinnacle.entity.common.ResponseCode;
 import com.cfive.pinnacle.entity.common.ResponseResult;
+import com.cfive.pinnacle.entity.permission.Role;
 import com.cfive.pinnacle.service.permission.IRoleService;
 import com.cfive.pinnacle.utils.WebUtil;
 import io.swagger.v3.oas.annotations.Operation;
@@ -27,9 +27,9 @@ import java.util.List;
  * @author FatttSnake
  * @since 2023-04-30
  */
+@Tag(name = "角色", description = "角色相关接口")
 @RestController
 @RequestMapping("/role")
-@Tag(name = "角色", description = "角色相关接口")
 public class RoleController {
 
     private IRoleService roleService;

Pinnacle/src/main/java/com/cfive/pinnacle/controller/permission/UserController.java

@@ -2,9 +2,9 @@ package com.cfive.pinnacle.controller.permission;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.cfive.pinnacle.entity.permission.User;
 import com.cfive.pinnacle.entity.common.ResponseCode;
 import com.cfive.pinnacle.entity.common.ResponseResult;
+import com.cfive.pinnacle.entity.permission.User;
 import com.cfive.pinnacle.exception.DataValidationFailedException;
 import com.cfive.pinnacle.service.permission.IUserService;
 import com.cfive.pinnacle.utils.WebUtil;
@@ -26,9 +26,9 @@ import java.util.Map;
  * @author FatttSnake
  * @since 2023-04-30
  */
+@Tag(name = "用户", description = "用户相关接口")
 @RestController
 @RequestMapping("/user")
-@Tag(name = "用户", description = "用户相关接口")
 public class UserController {
     private IUserService userService;
 
@@ -37,14 +37,14 @@ public class UserController {
         this.userService = userService;
     }
 
-    @GetMapping("/info")
     @Operation(summary = "获取当前用户信息")
+    @GetMapping("/info")
     public ResponseResult<User> getInfo() {
         return ResponseResult.databaseSelectSuccess(userService.getInfo());
     }
 
-    @PutMapping("/passwd")
     @Operation(summary = "修改密码")
+    @PutMapping("/passwd")
     public ResponseResult<?> modifyPasswd(@RequestBody Map<String, String> passwd) {
         String oldPasswd = passwd.get("oldPasswd");
         String newPasswd = passwd.get("newPasswd");
@@ -62,30 +62,30 @@ public class UserController {
         }
     }
 
+    @Operation(summary = "获取拥有审批权限的用户")
     @GetMapping("/affair")
     @PreAuthorize("hasAnyAuthority('affair:self:add')")
-    @Operation(summary = "获取拥有审批权限的用户")
     public ResponseResult<List<User>> getAffairUser() {
         return ResponseResult.databaseSelectSuccess(userService.getAffairUser());
     }
 
+    @Operation(summary = "获取同部门下所有用户")
     @GetMapping("/department")
     @PreAuthorize("hasAnyAuthority('work:manage:add', 'work:admin:add', 'attendance:manage:modify')")
-    @Operation(summary = "获取同部门下所有用户")
     public ResponseResult<List<User>> getDepartmentUser() {
         return ResponseResult.databaseSelectSuccess(userService.getDepartmentUser());
     }
 
+    @Operation(summary = "获取拥有发布公告权限的用户")
     @GetMapping("/notice")
     @PreAuthorize("hasAuthority('notice:manage:get')")
-    @Operation(summary = "获取拥有发布公告权限的用户")
     public ResponseResult<List<User>> getNoticeUser() {
         return ResponseResult.databaseSelectSuccess(userService.getNoticeUser());
     }
 
+    @Operation(summary = "获取所有用户（权限管理相关）")
     @GetMapping
     @PreAuthorize("hasAuthority('system:user:get')")
-    @Operation(summary = "获取所有用户（权限管理相关）")
     public ResponseResult<IPage<User>> getAllUser(Long currentPage, Long pageSize, String searchName, String searchRole, String searchGroup, Integer searchEnable, Integer searchRegex) {
         List<Long> searchRoleList = WebUtil.convertStringToList(searchRole, Long.class);
         List<Long> searchGroupList = WebUtil.convertStringToList(searchGroup, Long.class);
@@ -94,17 +94,17 @@ public class UserController {
         return ResponseResult.databaseSelectSuccess(users);
     }
 
+    @Operation(summary = "获取单个用户（权限管理相关）")
     @GetMapping("/{id}")
     @PreAuthorize("hasAuthority('system:user:one')")
-    @Operation(summary = "获取单个用户（权限管理相关）")
     public ResponseResult<User> getUser(@PathVariable Long id) {
         User user = userService.getUser(id);
         return ResponseResult.databaseSelectSuccess(user);
     }
 
+    @Operation(summary = "添加用户（权限管理相关）")
     @PostMapping
     @PreAuthorize("hasAuthority('system:user:add')")
-    @Operation(summary = "添加用户（权限管理相关）")
     public ResponseResult<User> addUser(@RequestBody User user) {
         if (!StringUtils.hasText(user.getUsername())) {
             return ResponseResult.build(ResponseCode.DATABASE_SAVE_ERROR, "Username cannot be empty", null);
@@ -119,9 +119,9 @@ public class UserController {
         }
     }
 
+    @Operation(summary = "删除用户（权限管理相关）")
     @DeleteMapping("/{id}")
     @PreAuthorize("hasAuthority('system:user:delete')")
-    @Operation(summary = "删除用户（权限管理相关）")
     public ResponseResult<?> deleteUser(@PathVariable Long id) {
         if (id == 1L) {
             return ResponseResult.build(ResponseCode.DATABASE_DELETE_ERROR, "Unable to remove super admin", null);
@@ -135,9 +135,9 @@ public class UserController {
         }
     }
 
+    @Operation(summary = "修改用户（权限管理相关）")
     @PutMapping()
     @PreAuthorize("hasAuthority('system:user:modify')")
-    @Operation(summary = "修改用户（权限管理相关）")
     public ResponseResult<User> modifyUser(@RequestBody User user) {
         if (user.getId() == 1L && user.getEnable() == 0) {
             return ResponseResult.build(ResponseCode.DATABASE_DELETE_ERROR, "Unable to disable super admin", null);

Pinnacle/src/main/java/com/cfive/pinnacle/entity/Affair.java

@@ -1,21 +1,16 @@
 package com.cfive.pinnacle.entity;
 
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.Version;
-
-import java.io.Serial;
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
+import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
+import java.io.Serial;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
 /**
  * <p>
  * 事务
@@ -77,14 +72,14 @@ public class Affair implements Serializable {
      * 创建时间
      */
     @TableField("create_time")
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'",timezone = "UTC")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'", timezone = "UTC")
     private LocalDateTime createTime;
 
     /**
      * 审核时间
      */
     @TableField("inspect_time")
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'",timezone = "UTC")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'", timezone = "UTC")
     private LocalDateTime inspectTime;
 
     /**

Pinnacle/src/main/java/com/cfive/pinnacle/entity/AffairType.java

@@ -1,17 +1,12 @@
 package com.cfive.pinnacle.entity;
 
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.Version;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.experimental.Accessors;
 
 import java.io.Serial;
 import java.io.Serializable;
 
-import lombok.Data;
-import lombok.experimental.Accessors;
-
 /**
  * <p>
  * 事务类型

Pinnacle/src/main/java/com/cfive/pinnacle/entity/Attendance.java

@@ -1,15 +1,6 @@
 package com.cfive.pinnacle.entity;
 
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.Version;
-
-import java.io.Serial;
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
+import com.baomidou.mybatisplus.annotation.*;
 import com.cfive.pinnacle.entity.permission.User;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
@@ -17,6 +8,10 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
+import java.io.Serial;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
 /**
  * <p>
  * 考勤
@@ -48,7 +43,7 @@ public class Attendance implements Serializable {
      * 考勤时间
      */
     @TableField("att_time")
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'",timezone = "UTC")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'", timezone = "UTC")
     private LocalDateTime attTime;
 
     /**
@@ -71,7 +66,7 @@ public class Attendance implements Serializable {
     private LocalDateTime modifyTime;
 
     @TableField("deleted")
-    @TableLogic(value = "0",delval = "1")
+    @TableLogic(value = "0", delval = "1")
     private Long deleted;
 
     @TableField("version")

Pinnacle/src/main/java/com/cfive/pinnacle/entity/Department.java

@@ -1,21 +1,16 @@
 package com.cfive.pinnacle.entity;
 
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.Version;
-
-import java.io.Serial;
-import java.io.Serializable;
-import java.util.List;
-
+import com.baomidou.mybatisplus.annotation.*;
 import com.cfive.pinnacle.entity.permission.User;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.List;
+
 /**
  * <p>
  * 部门

Pinnacle/src/main/java/com/cfive/pinnacle/entity/Notice.java

@@ -1,16 +1,6 @@
 package com.cfive.pinnacle.entity;
 
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.Version;
-
-import java.io.Serial;
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.List;
-
+import com.baomidou.mybatisplus.annotation.*;
 import com.cfive.pinnacle.entity.permission.User;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
@@ -18,6 +8,11 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
+import java.io.Serial;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.List;
+
 /**
  * <p>
  * 公告

Pinnacle/src/main/java/com/cfive/pinnacle/entity/NoticeReceive.java

@@ -1,19 +1,14 @@
 package com.cfive.pinnacle.entity;
 
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.Version;
-
-import java.io.Serial;
-import java.io.Serializable;
-
+import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
+import java.io.Serial;
+import java.io.Serializable;
+
 /**
  * <p>
  * 公告接收

Pinnacle/src/main/java/com/cfive/pinnacle/entity/NoticeType.java

@@ -1,20 +1,14 @@
 package com.cfive.pinnacle.entity;
 
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.Version;
-
-import java.io.Serial;
-import java.io.Serializable;
-
-
+import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
+import java.io.Serial;
+import java.io.Serializable;
+
 /**
  * <p>
  * 公告类型

Pinnacle/src/main/java/com/cfive/pinnacle/entity/Staff.java

@@ -1,16 +1,15 @@
 package com.cfive.pinnacle.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
-
-import java.io.Serial;
-import java.io.Serializable;
-import java.time.LocalDate;
-
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
+import java.io.Serial;
+import java.io.Serializable;
+import java.time.LocalDate;
+
 /**
  * <p>
  * 员工
@@ -59,7 +58,7 @@ public class Staff implements Serializable {
     /**
      * 生日
      */
-    @TableField(value = "birth",updateStrategy = FieldStrategy.IGNORED)
+    @TableField(value = "birth", updateStrategy = FieldStrategy.IGNORED)
     private LocalDate birth;
 
     /**

Pinnacle/src/main/java/com/cfive/pinnacle/entity/UserWork.java

@@ -1,21 +1,16 @@
 package com.cfive.pinnacle.entity;
 
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.Version;
-
-import java.io.Serial;
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
+import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
+import java.io.Serial;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
 /**
  * <p>
  * 中间表-用户-工作事项

Pinnacle/src/main/java/com/cfive/pinnacle/entity/Work.java

@@ -1,16 +1,6 @@
 package com.cfive.pinnacle.entity;
 
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.Version;
-
-import java.io.Serial;
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.List;
-
+import com.baomidou.mybatisplus.annotation.*;
 import com.cfive.pinnacle.entity.permission.User;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
@@ -18,6 +8,11 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
+import java.io.Serial;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.List;
+
 /**
  * <p>
  * 工作事项

Pinnacle/src/main/java/com/cfive/pinnacle/entity/common/ResponseResult.java

@@ -12,7 +12,7 @@ import java.io.Serializable;
 @Data
 @NoArgsConstructor(access = AccessLevel.PRIVATE)
 @AllArgsConstructor(access = AccessLevel.PRIVATE)
-@Schema(title = "ResponseResult",description = "响应结果")
+@Schema(title = "ResponseResult", description = "响应结果")
 public class ResponseResult<T> implements Serializable {
 
     @Serial

Pinnacle/src/main/java/com/cfive/pinnacle/entity/permission/Element.java

@@ -3,10 +3,6 @@ package com.cfive.pinnacle.entity.permission;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-
-import java.io.Serial;
-import java.io.Serializable;
-
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import lombok.AllArgsConstructor;
@@ -14,6 +10,9 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 
+import java.io.Serial;
+import java.io.Serializable;
+
 /**
  * <p>
  * 页面元素
@@ -43,14 +42,14 @@ public class Element implements Serializable {
     private String name;
 
     /**
-     *  权限ID
+     * 权限ID
      */
     @TableField("power_id")
     @JsonSerialize(using = ToStringSerializer.class)
     private Long powerId;
 
     /**
-     *  菜单ID
+     * 菜单ID
      */
     @TableField("menu_id")
     @JsonSerialize(using = ToStringSerializer.class)

Pinnacle/src/main/java/com/cfive/pinnacle/entity/permission/File.java

@@ -3,10 +3,6 @@ package com.cfive.pinnacle.entity.permission;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-
-import java.io.Serial;
-import java.io.Serializable;
-
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import lombok.AllArgsConstructor;
@@ -14,6 +10,9 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 
+import java.io.Serial;
+import java.io.Serializable;
+
 /**
  * <p>
  * 文件
@@ -49,7 +48,7 @@ public class File implements Serializable {
     private String path;
 
     /**
-     *  权限ID
+     * 权限ID
      */
     @TableField("power_id")
     @JsonSerialize(using = ToStringSerializer.class)

Pinnacle/src/main/java/com/cfive/pinnacle/entity/permission/Group.java

@@ -1,15 +1,6 @@
 package com.cfive.pinnacle.entity.permission;
 
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.Version;
-
-import java.io.Serial;
-import java.io.Serializable;
-import java.util.List;
-
+import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import lombok.AllArgsConstructor;
@@ -17,6 +8,10 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.List;
+
 /**
  * <p>
  * 用户组

Pinnacle/src/main/java/com/cfive/pinnacle/entity/permission/Menu.java

@@ -3,10 +3,6 @@ package com.cfive.pinnacle.entity.permission;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-
-import java.io.Serial;
-import java.io.Serializable;
-
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import lombok.AllArgsConstructor;
@@ -14,6 +10,9 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 
+import java.io.Serial;
+import java.io.Serializable;
+
 /**
  * <p>
  * 菜单
@@ -37,7 +36,7 @@ public class Menu implements Serializable {
     private Long id;
 
     /**
-     *  菜单名
+     * 菜单名
      */
     @TableField("name")
     private String name;
@@ -49,7 +48,7 @@ public class Menu implements Serializable {
     private String url;
 
     /**
-     *  权限ID
+     * 权限ID
      */
     @TableField("power_id")
     @JsonSerialize(using = ToStringSerializer.class)

Pinnacle/src/main/java/com/cfive/pinnacle/entity/permission/Operation.java

@@ -3,10 +3,6 @@ package com.cfive.pinnacle.entity.permission;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-
-import java.io.Serial;
-import java.io.Serializable;
-
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import lombok.AllArgsConstructor;
@@ -14,6 +10,9 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 
+import java.io.Serial;
+import java.io.Serializable;
+
 /**
  * <p>
  * 功能
@@ -49,14 +48,14 @@ public class Operation implements Serializable {
     private String code;
 
     /**
-     *  权限ID
+     * 权限ID
      */
     @TableField("power_id")
     @JsonSerialize(using = ToStringSerializer.class)
     private Long powerId;
 
     /**
-     *  页面元素ID
+     * 页面元素ID
      */
     @TableField("element_id")
     @JsonSerialize(using = ToStringSerializer.class)

Pinnacle/src/main/java/com/cfive/pinnacle/entity/permission/OperationLog.java

@@ -1,15 +1,6 @@
 package com.cfive.pinnacle.entity.permission;
 
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.Version;
-
-import java.io.Serial;
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
+import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import lombok.AllArgsConstructor;
@@ -17,6 +8,10 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 
+import java.io.Serial;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
 /**
  * <p>
  * 操作日志

Pinnacle/src/main/java/com/cfive/pinnacle/entity/permission/Power.java

@@ -3,10 +3,6 @@ package com.cfive.pinnacle.entity.permission;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-
-import java.io.Serial;
-import java.io.Serializable;
-
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import lombok.AllArgsConstructor;
@@ -14,6 +10,9 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 
+import java.io.Serial;
+import java.io.Serializable;
+
 /**
  * <p>
  * 权限

Pinnacle/src/main/java/com/cfive/pinnacle/entity/permission/PowerRole.java

@@ -1,14 +1,6 @@
 package com.cfive.pinnacle.entity.permission;
 
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.Version;
-
-import java.io.Serial;
-import java.io.Serializable;
-
+import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import lombok.AllArgsConstructor;
@@ -16,6 +8,9 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 
+import java.io.Serial;
+import java.io.Serializable;
+
 /**
  * <p>
  * 中间表-权限-角色

Pinnacle/src/main/java/com/cfive/pinnacle/entity/permission/PowerType.java

@@ -3,10 +3,6 @@ package com.cfive.pinnacle.entity.permission;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-
-import java.io.Serial;
-import java.io.Serializable;
-
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import lombok.AllArgsConstructor;
@@ -14,6 +10,9 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 
+import java.io.Serial;
+import java.io.Serializable;
+
 /**
  * <p>
  * 权限类型

Pinnacle/src/main/java/com/cfive/pinnacle/entity/permission/Role.java

@@ -1,15 +1,6 @@
 package com.cfive.pinnacle.entity.permission;
 
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.Version;
-
-import java.io.Serial;
-import java.io.Serializable;
-import java.util.List;
-
+import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import lombok.AllArgsConstructor;
@@ -17,6 +8,10 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.List;
+
 /**
  * <p>
  * 角色

Pinnacle/src/main/java/com/cfive/pinnacle/entity/permission/RoleGroup.java

@@ -1,19 +1,14 @@
 package com.cfive.pinnacle.entity.permission;
 
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.Version;
-
-import java.io.Serial;
-import java.io.Serializable;
-
+import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
+import java.io.Serial;
+import java.io.Serializable;
+
 /**
  * <p>
  * 中间表-角色-用户组

Pinnacle/src/main/java/com/cfive/pinnacle/entity/permission/User.java

@@ -4,11 +4,6 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.Version;
-
-import java.io.Serial;
-import java.io.Serializable;
-import java.util.List;
-
 import com.cfive.pinnacle.entity.Department;
 import com.cfive.pinnacle.entity.Staff;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
@@ -16,6 +11,10 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.List;
+
 /**
  * <p>
  * 用户

Pinnacle/src/main/java/com/cfive/pinnacle/entity/permission/UserGroup.java

@@ -1,19 +1,14 @@
 package com.cfive.pinnacle.entity.permission;
 
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.Version;
-
-import java.io.Serial;
-import java.io.Serializable;
-
+import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
+import java.io.Serial;
+import java.io.Serializable;
+
 /**
  * <p>
  * 中间表-用户-用户组

Pinnacle/src/main/java/com/cfive/pinnacle/entity/permission/UserRole.java

@@ -1,19 +1,14 @@
 package com.cfive.pinnacle.entity.permission;
 
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.Version;
-
-import java.io.Serial;
-import java.io.Serializable;
-
+import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
+import java.io.Serial;
+import java.io.Serializable;
+
 /**
  * <p>
  * 中间表-用户-角色

Pinnacle/src/main/java/com/cfive/pinnacle/exception/DataValidationFailedException.java

@@ -1,6 +1,6 @@
 package com.cfive.pinnacle.exception;
 
-public class DataValidationFailedException extends RuntimeException{
+public class DataValidationFailedException extends RuntimeException {
     public DataValidationFailedException() {
         super("Data validation failed");
     }

Pinnacle/src/main/java/com/cfive/pinnacle/mapper/AffairMapper.java

@@ -1,9 +1,9 @@
 package com.cfive.pinnacle.mapper;
 
-import com.cfive.pinnacle.entity.Affair;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.cfive.pinnacle.entity.permission.User;
-import org.apache.ibatis.annotations.*;
+import com.cfive.pinnacle.entity.Affair;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Update;
 
 import java.time.LocalDateTime;
 import java.util.List;
@@ -19,16 +19,6 @@ import java.util.List;
 @Mapper
 public interface AffairMapper extends BaseMapper<Affair> {
 
-    @Insert("insert into t_affair(title,type_id,content,applicant_id,inspector_id,create_time) values(#{title},#{typeId},#{content},#{applicantId},#{inspectorId},#{createTime})")
-    int insertAffair(Affair affair);
-    //添加事务
-    //不添加事务的状态(affairsStatus)，当事务进行添加时，添加的状态默认为'未审批'
-
-    @Delete("delete from t_affair where id=#{id}")
-    int deleteAffairs(Affair affair);
-    //根据id，撤回新建的事务，在新建事务时，会再进行一次确定
-    // (是否撤回,当用户撤回新建的事务时，根据新建的事务的id，删除该条事务在数据库中的信息)
-
     @Update("update  t_affair set status=1,inspect_time=#{inspectTime} where id=#{id}")
     int updateAffairsYes(Affair affair);
     //管理员权限--->修改事务的状态(AffairsStatus)--->达到审批的效果
@@ -38,18 +28,10 @@ public interface AffairMapper extends BaseMapper<Affair> {
     int updateAffairsNO(Affair affair);
     //不同意
 
-    List<User> getSameDepartmentUser(@Param("id") long id);
+    List<Affair> getFuzzyQueriesByAffairTitle(String title, Long typeId, Integer status, Long applicantId);
 
+    List<Affair> getNotApprovedByFuzzyQueries(String title, Long typeId, Integer status, Long inspectorId, LocalDateTime startTime, LocalDateTime endTime);
 
-    List<Affair> getFuzzyQueriesByAffairTitle(String title, Long typeId, Integer status,Long applicantId);
-
-    List<Affair> getNotApprovedByFuzzyQueries(String title, Long typeId, Integer status,Long inspectorId ,LocalDateTime startTime,LocalDateTime endTime);
-
-    List<Affair> getApprovedByFuzzyQueries(String title, Long typeId, Integer status,Long inspectorId ,LocalDateTime startTime,LocalDateTime endTime);
-
-//
-//    @Select("SELECT t_affair.applicant_id,t_affair.inspector_id,t_user.id,t_user.username from t_affair,t_user ")
-//    @ResultType(Affair.class)
-//    List<Affair> selectAffairs_NotApproved();
+    List<Affair> getApprovedByFuzzyQueries(String title, Long typeId, Integer status, Long inspectorId, LocalDateTime startTime, LocalDateTime endTime);
 
 }

Pinnacle/src/main/java/com/cfive/pinnacle/mapper/AffairTypeMapper.java

@@ -1,7 +1,7 @@
 package com.cfive.pinnacle.mapper;
 
-import com.cfive.pinnacle.entity.AffairType;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.cfive.pinnacle.entity.AffairType;
 import org.apache.ibatis.annotations.Mapper;
 
 /**

Pinnacle/src/main/java/com/cfive/pinnacle/mapper/AttendanceMapper.java

@@ -1,8 +1,7 @@
 package com.cfive.pinnacle.mapper;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.cfive.pinnacle.entity.Attendance;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.cfive.pinnacle.entity.Attendance;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
@@ -19,8 +18,7 @@ import java.util.List;
 public interface AttendanceMapper extends BaseMapper<Attendance> {
 
     List<Attendance> getAllAttendanceAndUser();
-    List<Attendance> getAttendanceAndUserByid(Long userId);
-
 
+    List<Attendance> getAttendanceAndUserById(Long userId);
 
 }

Pinnacle/src/main/java/com/cfive/pinnacle/mapper/DepartmentMapper.java

@@ -1,8 +1,8 @@
 package com.cfive.pinnacle.mapper;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.cfive.pinnacle.entity.Department;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 

Pinnacle/src/main/java/com/cfive/pinnacle/mapper/NoticeMapper.java

@@ -1,8 +1,8 @@
 package com.cfive.pinnacle.mapper;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.cfive.pinnacle.entity.Notice;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.time.LocalDateTime;
@@ -20,6 +20,6 @@ import java.util.List;
 public interface NoticeMapper extends BaseMapper<Notice> {
     Notice selectByNoticeId(Long nid);
 
-    IPage<Notice> selectPageNotice(IPage<?> page, String title, String type, LocalDateTime startTime, LocalDateTime endTime,List<Long> userIdList);
+    IPage<Notice> selectPageNotice(IPage<?> page, String title, String type, LocalDateTime startTime, LocalDateTime endTime, List<Long> userIdList);
 
 }

Pinnacle/src/main/java/com/cfive/pinnacle/mapper/NoticeReceiveMapper.java

@@ -1,8 +1,8 @@
 package com.cfive.pinnacle.mapper;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.cfive.pinnacle.entity.Notice;
 import com.cfive.pinnacle.entity.NoticeReceive;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.time.LocalDateTime;
@@ -19,6 +19,7 @@ import java.util.List;
 @Mapper
 public interface NoticeReceiveMapper extends BaseMapper<NoticeReceive> {
     List<Notice> selectByUserId(Long userId, Integer readStatus, String title, String type, LocalDateTime startTime, LocalDateTime endTime);
+
     List<Notice> selectLimitByUserId(Long userId);
 
 }

Pinnacle/src/main/java/com/cfive/pinnacle/mapper/NoticeTypeMapper.java

@@ -1,7 +1,7 @@
 package com.cfive.pinnacle.mapper;
 
-import com.cfive.pinnacle.entity.NoticeType;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.cfive.pinnacle.entity.NoticeType;
 import org.apache.ibatis.annotations.Mapper;
 
 /**

Pinnacle/src/main/java/com/cfive/pinnacle/mapper/StaffMapper.java

@@ -1,8 +1,8 @@
 package com.cfive.pinnacle.mapper;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.cfive.pinnacle.entity.Staff;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.cfive.pinnacle.entity.permission.User;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;

Pinnacle/src/main/java/com/cfive/pinnacle/mapper/UserWorkMapper.java

@@ -1,7 +1,7 @@
 package com.cfive.pinnacle.mapper;
 
-import com.cfive.pinnacle.entity.UserWork;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.cfive.pinnacle.entity.UserWork;
 import org.apache.ibatis.annotations.Mapper;
 
 /**

Pinnacle/src/main/java/com/cfive/pinnacle/mapper/WorkMapper.java

@@ -1,7 +1,7 @@
 package com.cfive.pinnacle.mapper;
 
-import com.cfive.pinnacle.entity.Work;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.cfive.pinnacle.entity.Work;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
@@ -19,7 +19,9 @@ public interface WorkMapper extends BaseMapper<Work> {
     List<Work> getAll();
 
     List<Work> getTodo(Long userId);
+
     List<Work> getCard(Long userId);
+
     List<Work> getComplete(Long userId);
 
     Work getWork(Long workId);

Pinnacle/src/main/java/com/cfive/pinnacle/mapper/permission/ElementMapper.java

@@ -1,7 +1,7 @@
 package com.cfive.pinnacle.mapper.permission;
 
-import com.cfive.pinnacle.entity.permission.Element;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.cfive.pinnacle.entity.permission.Element;
 import org.apache.ibatis.annotations.Mapper;
 
 /**

Pinnacle/src/main/java/com/cfive/pinnacle/mapper/permission/FileMapper.java

@@ -1,7 +1,7 @@
 package com.cfive.pinnacle.mapper.permission;
 
-import com.cfive.pinnacle.entity.permission.File;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.cfive.pinnacle.entity.permission.File;
 import org.apache.ibatis.annotations.Mapper;
 
 /**

Pinnacle/src/main/java/com/cfive/pinnacle/mapper/permission/GroupMapper.java

@@ -1,7 +1,7 @@
 package com.cfive.pinnacle.mapper.permission;
 
-import com.cfive.pinnacle.entity.permission.Group;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.cfive.pinnacle.entity.permission.Group;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -18,6 +18,7 @@ import java.util.List;
 @Mapper
 public interface GroupMapper extends BaseMapper<Group> {
     List<Long> filterGroupByRoleId(@Param("groupList") List<Long> groupList, @Param("roleId") Long roleId, @Param("searchName") String searchName, @Param("searchEnable") Integer searchEnable, @Param("searchRegex") Integer searchRegex);
+
     List<Group> getAll(@Param("groupList") List<Group> groupList);
 
     Group getOneById(@Param("id") long id);

Pinnacle/src/main/java/com/cfive/pinnacle/mapper/permission/MenuMapper.java

@@ -1,7 +1,7 @@
 package com.cfive.pinnacle.mapper.permission;
 
-import com.cfive.pinnacle.entity.permission.Menu;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.cfive.pinnacle.entity.permission.Menu;
 import org.apache.ibatis.annotations.Mapper;
 
 /**

Pinnacle/src/main/java/com/cfive/pinnacle/mapper/permission/OperationLogMapper.java

@@ -1,7 +1,7 @@
 package com.cfive.pinnacle.mapper.permission;
 
-import com.cfive.pinnacle.entity.permission.OperationLog;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.cfive.pinnacle.entity.permission.OperationLog;
 import org.apache.ibatis.annotations.Mapper;
 
 /**

Pinnacle/src/main/java/com/cfive/pinnacle/mapper/permission/OperationMapper.java

@@ -1,7 +1,7 @@
 package com.cfive.pinnacle.mapper.permission;
 
-import com.cfive.pinnacle.entity.permission.Operation;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.cfive.pinnacle.entity.permission.Operation;
 import org.apache.ibatis.annotations.Mapper;
 
 /**

Pinnacle/src/main/java/com/cfive/pinnacle/mapper/permission/PowerMapper.java

@@ -1,7 +1,7 @@
 package com.cfive.pinnacle.mapper.permission;
 
-import com.cfive.pinnacle.entity.permission.Power;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.cfive.pinnacle.entity.permission.Power;
 import org.apache.ibatis.annotations.Mapper;
 
 /**

Pinnacle/src/main/java/com/cfive/pinnacle/mapper/permission/PowerRoleMapper.java

@@ -1,7 +1,7 @@
 package com.cfive.pinnacle.mapper.permission;
 
-import com.cfive.pinnacle.entity.permission.PowerRole;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.cfive.pinnacle.entity.permission.PowerRole;
 import org.apache.ibatis.annotations.Mapper;
 
 /**

Pinnacle/src/main/java/com/cfive/pinnacle/mapper/permission/RoleGroupMapper.java

@@ -1,7 +1,7 @@
 package com.cfive.pinnacle.mapper.permission;
 
-import com.cfive.pinnacle.entity.permission.RoleGroup;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.cfive.pinnacle.entity.permission.RoleGroup;
 import org.apache.ibatis.annotations.Mapper;
 
 /**

Pinnacle/src/main/java/com/cfive/pinnacle/mapper/permission/RoleMapper.java

@@ -1,7 +1,7 @@
 package com.cfive.pinnacle.mapper.permission;
 
-import com.cfive.pinnacle.entity.permission.Role;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.cfive.pinnacle.entity.permission.Role;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 

Pinnacle/src/main/java/com/cfive/pinnacle/mapper/permission/UserGroupMapper.java

@@ -1,7 +1,7 @@
 package com.cfive.pinnacle.mapper.permission;
 
-import com.cfive.pinnacle.entity.permission.UserGroup;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.cfive.pinnacle.entity.permission.UserGroup;
 import org.apache.ibatis.annotations.Mapper;
 
 /**

Pinnacle/src/main/java/com/cfive/pinnacle/mapper/permission/UserMapper.java

@@ -1,7 +1,7 @@
 package com.cfive.pinnacle.mapper.permission;
 
-import com.cfive.pinnacle.entity.permission.User;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.cfive.pinnacle.entity.permission.User;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -23,7 +23,7 @@ public interface UserMapper extends BaseMapper<User> {
 
     List<User> getAllAffairUser();
 
-    List<User> getAllDepartmentUser(@Param("departmentId")long departmentId);
+    List<User> getAllDepartmentUser(@Param("departmentId") long departmentId);
 
     List<User> getAllNoticeUser();
 

Pinnacle/src/main/java/com/cfive/pinnacle/mapper/permission/UserRoleMapper.java

@@ -1,7 +1,7 @@
 package com.cfive.pinnacle.mapper.permission;
 
-import com.cfive.pinnacle.entity.permission.UserRole;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.cfive.pinnacle.entity.permission.UserRole;
 import org.apache.ibatis.annotations.Mapper;
 
 /**

Pinnacle/src/main/java/com/cfive/pinnacle/service/IAffairService.java

@@ -1,8 +1,7 @@
 package com.cfive.pinnacle.service;
 
-import com.cfive.pinnacle.entity.Affair;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.cfive.pinnacle.entity.permission.User;
+import com.cfive.pinnacle.entity.Affair;
 
 import java.time.LocalDateTime;
 import java.util.List;
@@ -17,17 +16,14 @@ import java.util.List;
  */
 public interface IAffairService extends IService<Affair> {
 
-//    int insertAffair(Affair affair);
     int updateAffairYes(Affair affair);
+
     int updateAffairNo(Affair affair);
 
+    List<Affair> getFuzzyQueriesByAffairTitle(String title, Long typeId, Integer status, Long applicantId);
 
-//    int deleteAffair_ApprovedByID(Affair affair);
-    List<User> getSameDepartmentUser (long id);
-    List<Affair> getFuzzyQueriesByAffairTitle(String title,Long typeId,Integer status,Long applicantId);
+    List<Affair> getNotApprovedByFuzzyQueries(String title, Long typeId, Integer status, Long inspectorId, LocalDateTime startTime, LocalDateTime endTime);
 
-    List<Affair> getNotApprovedByFuzzyQueries(String title,Long typeId,Integer status,Long inspectorId,LocalDateTime startTime,LocalDateTime endTime);
-
-    List<Affair> getApprovedByFuzzyQueries(String title,Long typeId,Integer status,Long inspectorId,LocalDateTime startTime,LocalDateTime endTime);
+    List<Affair> getApprovedByFuzzyQueries(String title, Long typeId, Integer status, Long inspectorId, LocalDateTime startTime, LocalDateTime endTime);
 
 }

Pinnacle/src/main/java/com/cfive/pinnacle/service/IAffairTypeService.java

@@ -1,7 +1,7 @@
 package com.cfive.pinnacle.service;
 
-import com.cfive.pinnacle.entity.AffairType;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.cfive.pinnacle.entity.AffairType;
 
 /**
  * <p>

Pinnacle/src/main/java/com/cfive/pinnacle/service/IAttendanceService.java

@@ -1,8 +1,7 @@
 package com.cfive.pinnacle.service;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.cfive.pinnacle.entity.Attendance;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.cfive.pinnacle.entity.Attendance;
 
 import java.util.List;
 
@@ -16,11 +15,11 @@ import java.util.List;
  */
 public interface IAttendanceService extends IService<Attendance> {
     List<Attendance> getAllAttendanceAndUser();
-    List<Attendance> getAttendanceAndUserByid(Long userId);
 
+    List<Attendance> getAttendanceAndUserById(Long userId);
 
-    List<Attendance> selectByTime(String startTime,String endTime);
-    List<Attendance> selectOneByTime(String startTime,String endTime,Long userId);
+    List<Attendance> selectByTime(String startTime, String endTime);
 
+    List<Attendance> selectOneByTime(String startTime, String endTime, Long userId);
 
 }

Pinnacle/src/main/java/com/cfive/pinnacle/service/IDepartmentService.java

@@ -1,8 +1,8 @@
 package com.cfive.pinnacle.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.cfive.pinnacle.entity.Department;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.cfive.pinnacle.entity.Department;
 
 import java.util.List;
 

Pinnacle/src/main/java/com/cfive/pinnacle/service/INoticeReceiveService.java

@@ -1,10 +1,9 @@
 package com.cfive.pinnacle.service;
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.cfive.pinnacle.entity.Notice;
 import com.cfive.pinnacle.entity.NoticeReceive;
-import com.baomidou.mybatisplus.extension.service.IService;
 
-import java.time.LocalDateTime;
 import java.util.List;
 
 /**

Pinnacle/src/main/java/com/cfive/pinnacle/service/INoticeService.java

@@ -1,8 +1,8 @@
 package com.cfive.pinnacle.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.cfive.pinnacle.entity.Notice;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.cfive.pinnacle.entity.Notice;
 
 import java.util.List;
 
@@ -27,5 +27,5 @@ public interface INoticeService extends IService<Notice> {
 
     Boolean addNotice(Notice notice);
 
-    IPage<Notice> selectPageNotice(IPage<Notice> page, String title, String type, String startTime, String endTime,List<Long> userIdList);
+    IPage<Notice> selectPageNotice(IPage<Notice> page, String title, String type, String startTime, String endTime, List<Long> userIdList);
 }

Pinnacle/src/main/java/com/cfive/pinnacle/service/INoticeTypeService.java

@@ -1,8 +1,8 @@
 package com.cfive.pinnacle.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.cfive.pinnacle.entity.NoticeType;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.cfive.pinnacle.entity.NoticeType;
 
 import java.util.List;
 
@@ -17,7 +17,8 @@ import java.util.List;
 public interface INoticeTypeService extends IService<NoticeType> {
     List<NoticeType> selectTypeList();
 
-    IPage<NoticeType> selectPageTypeList(IPage<NoticeType> page,String name,Integer enable);
+    IPage<NoticeType> selectPageTypeList(IPage<NoticeType> page, String name, Integer enable);
+
     List<NoticeType> selectEnableTypeList();
 
     Boolean updateTypeEnableById(Long typeId, Integer enable);

Pinnacle/src/main/java/com/cfive/pinnacle/service/IStaffService.java

@@ -1,8 +1,8 @@
 package com.cfive.pinnacle.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.cfive.pinnacle.entity.Staff;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.cfive.pinnacle.entity.Staff;
 import com.cfive.pinnacle.entity.permission.User;
 
 /**

Pinnacle/src/main/java/com/cfive/pinnacle/service/IWorkService.java

@@ -1,8 +1,8 @@
 package com.cfive.pinnacle.service;
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.cfive.pinnacle.entity.UserWork;
 import com.cfive.pinnacle.entity.Work;
-import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.util.List;
 
@@ -16,17 +16,23 @@ import java.util.List;
  */
 public interface IWorkService extends IService<Work> {
     List<Work> getAll();
+
     List<Work> getTodo(Long userId);
 
     List<Work> getCard(Long userId);
+
     List<Work> getComplete(Long userId);
+
     Work getOne(Long workId);
 
     List<Work> getWorkByContent(String content);
+
     double getProgress(Long workId);
 
     String getUserName(Long userId);
+
     boolean addWork(Work work);
+
     boolean deleteByWorkId(Long wid);
 
     boolean updateStatus(UserWork userWork);

Pinnacle/src/main/java/com/cfive/pinnacle/service/impl/AffairServiceImpl.java

@@ -1,15 +1,13 @@
 package com.cfive.pinnacle.service.impl;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.cfive.pinnacle.entity.Affair;
-import com.cfive.pinnacle.entity.permission.User;
 import com.cfive.pinnacle.mapper.AffairMapper;
 import com.cfive.pinnacle.service.IAffairService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
 import java.util.List;
 
 /**
@@ -23,9 +21,13 @@ import java.util.List;
 @Service
 public class AffairServiceImpl extends ServiceImpl<AffairMapper, Affair> implements IAffairService {
 
-    @Autowired
     private AffairMapper affairMapper;
 
+    @Autowired
+    public void setAffairMapper(AffairMapper affairMapper) {
+        this.affairMapper = affairMapper;
+    }
+
     public int updateAffairYes(Affair affair) {
         return affairMapper.updateAffairsYes(affair);
     }
@@ -34,26 +36,15 @@ public class AffairServiceImpl extends ServiceImpl<AffairMapper, Affair> impleme
         return affairMapper.updateAffairsNO(affair);
     }
 
-    public List<User> getSameDepartmentUser(long id) {
-        List<User> user = affairMapper.getSameDepartmentUser(id);
-        return user;
+    public List<Affair> getFuzzyQueriesByAffairTitle(String title, Long typeId, Integer status, Long applicantId) {
+        return affairMapper.getFuzzyQueriesByAffairTitle(title, typeId, status, applicantId);
     }
 
-
-    public List<Affair> getFuzzyQueriesByAffairTitle(String title ,Long typeId,Integer status,Long applicantId) {
-        List<Affair> affairList = affairMapper.getFuzzyQueriesByAffairTitle(title,typeId,status,applicantId);
-        return  affairList;
+    public List<Affair> getNotApprovedByFuzzyQueries(String title, Long typeId, Integer status, Long inspectorId, LocalDateTime startTime, LocalDateTime endTime) {
+        return affairMapper.getNotApprovedByFuzzyQueries(title, typeId, status, inspectorId, startTime, endTime);
     }
 
-
-    public List<Affair> getNotApprovedByFuzzyQueries(String title, Long typeId, Integer status, Long inspectorId, LocalDateTime startTime ,LocalDateTime endTime) {
-        List<Affair> affairList =affairMapper.getNotApprovedByFuzzyQueries(title,typeId,status,inspectorId,startTime,endTime);
-        return affairList;
-    }
-
-
     public List<Affair> getApprovedByFuzzyQueries(String title, Long typeId, Integer status, Long inspectorId, LocalDateTime startTime, LocalDateTime endTime) {
-        List<Affair> affairList =affairMapper.getApprovedByFuzzyQueries(title,typeId,status,inspectorId,startTime,endTime);
-        return affairList;
+        return affairMapper.getApprovedByFuzzyQueries(title, typeId, status, inspectorId, startTime, endTime);
     }
 }

Pinnacle/src/main/java/com/cfive/pinnacle/service/impl/AffairTypeServiceImpl.java

@@ -1,9 +1,9 @@
 package com.cfive.pinnacle.service.impl;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.cfive.pinnacle.entity.AffairType;
 import com.cfive.pinnacle.mapper.AffairTypeMapper;
 import com.cfive.pinnacle.service.IAffairTypeService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 /**

Pinnacle/src/main/java/com/cfive/pinnacle/service/impl/AttendanceServiceImpl.java

@@ -1,11 +1,11 @@
 package com.cfive.pinnacle.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.cfive.pinnacle.entity.Attendance;
 import com.cfive.pinnacle.mapper.AttendanceMapper;
 import com.cfive.pinnacle.mapper.permission.UserMapper;
 import com.cfive.pinnacle.service.IAttendanceService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -23,47 +23,57 @@ import java.util.List;
  */
 @Service
 public class AttendanceServiceImpl extends ServiceImpl<AttendanceMapper, Attendance> implements IAttendanceService {
-    @Autowired
+
     private AttendanceMapper attendanceMapper;
-    @Autowired
     private UserMapper userMapper;
 
+    @Autowired
+    public void setAttendanceMapper(AttendanceMapper attendanceMapper) {
+        this.attendanceMapper = attendanceMapper;
+    }
+
+    @Autowired
+    public void setUserMapper(UserMapper userMapper) {
+        this.userMapper = userMapper;
+    }
+
     @Override
     public List<Attendance> getAllAttendanceAndUser() {
         return attendanceMapper.getAllAttendanceAndUser();
     }
 
     @Override
-    public List<Attendance> getAttendanceAndUserByid(Long userId) {
-        return attendanceMapper.getAttendanceAndUserByid(userId);
+    public List<Attendance> getAttendanceAndUserById(Long userId) {
+        return attendanceMapper.getAttendanceAndUserById(userId);
     }
 
     @Override
     public List<Attendance> selectByTime(String startTime, String endTime) {
-            LocalDateTime start = LocalDateTime.parse(startTime, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
-            LocalDateTime end = LocalDateTime.parse(endTime, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
-            System.out.println(start);
-            System.out.println(end);
-            LambdaQueryWrapper<Attendance> lqw = new LambdaQueryWrapper<>();
-            lqw.ge(null != start, Attendance::getAttTime, start).le(null != end, Attendance::getAttTime, end);
-            List<Attendance> attendancesByTime = attendanceMapper.selectList(lqw);
-        for (Attendance attendance:
-             attendancesByTime) {
-            attendance.setUser(userMapper.selectById(attendance.getUserId()));
-        }
-            return attendancesByTime;
-
-    }
-    @Override
-    public List<Attendance> selectOneByTime(String startTime, String endTime,Long userId) {
         LocalDateTime start = LocalDateTime.parse(startTime, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
         LocalDateTime end = LocalDateTime.parse(endTime, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
         System.out.println(start);
         System.out.println(end);
         LambdaQueryWrapper<Attendance> lqw = new LambdaQueryWrapper<>();
-        lqw.ge(null != start, Attendance::getAttTime, start).le(null != end, Attendance::getAttTime, end).eq(Attendance::getDeleted,0).eq(Attendance::getUserId,userId);
+        lqw.ge(Attendance::getAttTime, start).le(Attendance::getAttTime, end);
+        List<Attendance> attendancesByTime = attendanceMapper.selectList(lqw);
+        for (Attendance attendance :
+                attendancesByTime) {
+            attendance.setUser(userMapper.selectById(attendance.getUserId()));
+        }
+        return attendancesByTime;
+
+    }
+
+    @Override
+    public List<Attendance> selectOneByTime(String startTime, String endTime, Long userId) {
+        LocalDateTime start = LocalDateTime.parse(startTime, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+        LocalDateTime end = LocalDateTime.parse(endTime, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+        System.out.println(start);
+        System.out.println(end);
+        LambdaQueryWrapper<Attendance> lqw = new LambdaQueryWrapper<>();
+        lqw.ge(Attendance::getAttTime, start).le(Attendance::getAttTime, end).eq(Attendance::getDeleted, 0).eq(Attendance::getUserId, userId);
         List<Attendance> oneAttendancesByTime = attendanceMapper.selectList(lqw);
-        for (Attendance attendance:
+        for (Attendance attendance :
                 oneAttendancesByTime) {
             attendance.setUser(userMapper.selectById(userId));
         }

Pinnacle/src/main/java/com/cfive/pinnacle/service/impl/DepartmentServiceImpl.java

@@ -2,10 +2,10 @@ package com.cfive.pinnacle.service.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.PageDTO;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.cfive.pinnacle.entity.Department;
 import com.cfive.pinnacle.mapper.DepartmentMapper;
 import com.cfive.pinnacle.service.IDepartmentService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

Pinnacle/src/main/java/com/cfive/pinnacle/service/impl/NoticeReceiveServiceImpl.java

@@ -1,11 +1,11 @@
 package com.cfive.pinnacle.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.cfive.pinnacle.entity.Notice;
 import com.cfive.pinnacle.entity.NoticeReceive;
 import com.cfive.pinnacle.mapper.NoticeReceiveMapper;
 import com.cfive.pinnacle.service.INoticeReceiveService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.cfive.pinnacle.utils.WebUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -13,6 +13,7 @@ import org.springframework.stereotype.Service;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -24,14 +25,19 @@ import java.util.List;
  */
 @Service
 public class NoticeReceiveServiceImpl extends ServiceImpl<NoticeReceiveMapper, NoticeReceive> implements INoticeReceiveService {
-    @Autowired
+
     private NoticeReceiveMapper noticeReceiveMapper;
 
+    @Autowired
+    public void setNoticeReceiveMapper(NoticeReceiveMapper noticeReceiveMapper) {
+        this.noticeReceiveMapper = noticeReceiveMapper;
+    }
+
     @Override
     public List<Notice> selectByUserId(Integer readStatus, String title, String type, String startTime, String endTime) {
         Long userId = WebUtil.getLoginUser().getUser().getId();
         LocalDateTime start = null, end = null;
-        if (startTime != "" && endTime != "") {
+        if (!Objects.equals(startTime, "") && !Objects.equals(endTime, "")) {
             start = LocalDateTime.parse(startTime, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
             end = LocalDateTime.parse(endTime, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
         }

Pinnacle/src/main/java/com/cfive/pinnacle/service/impl/NoticeServiceImpl.java

@@ -3,6 +3,7 @@ package com.cfive.pinnacle.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.cfive.pinnacle.entity.Notice;
 import com.cfive.pinnacle.entity.NoticeReceive;
 import com.cfive.pinnacle.mapper.NoticeMapper;
@@ -10,7 +11,6 @@ import com.cfive.pinnacle.mapper.NoticeReceiveMapper;
 import com.cfive.pinnacle.mapper.NoticeTypeMapper;
 import com.cfive.pinnacle.mapper.permission.UserMapper;
 import com.cfive.pinnacle.service.INoticeService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.cfive.pinnacle.utils.WebUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -19,6 +19,7 @@ import org.springframework.transaction.annotation.Transactional;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -30,15 +31,32 @@ import java.util.List;
  */
 @Service
 public class NoticeServiceImpl extends ServiceImpl<NoticeMapper, Notice> implements INoticeService {
-    @Autowired
+
     NoticeMapper noticeMapper;
-    @Autowired
     NoticeTypeMapper noticeTypeMapper;
-    @Autowired
     UserMapper userMapper;
-    @Autowired
     NoticeReceiveMapper noticeReceiveMapper;
 
+    @Autowired
+    public void setNoticeMapper(NoticeMapper noticeMapper) {
+        this.noticeMapper = noticeMapper;
+    }
+
+    @Autowired
+    public void setNoticeTypeMapper(NoticeTypeMapper noticeTypeMapper) {
+        this.noticeTypeMapper = noticeTypeMapper;
+    }
+
+    @Autowired
+    public void setUserMapper(UserMapper userMapper) {
+        this.userMapper = userMapper;
+    }
+
+    @Autowired
+    public void setNoticeReceiveMapper(NoticeReceiveMapper noticeReceiveMapper) {
+        this.noticeReceiveMapper = noticeReceiveMapper;
+    }
+
     @Override
     public Notice selectByNoticeId(Long nid) {
         return noticeMapper.selectByNoticeId(nid);
@@ -47,7 +65,7 @@ public class NoticeServiceImpl extends ServiceImpl<NoticeMapper, Notice> impleme
     @Override
     public IPage<Notice> selectPageNotice(IPage<Notice> page, String title, String type, String startTime, String endTime, List<Long> userIdList) {
         LocalDateTime start = null, end = null;
-        if (startTime != "" && endTime != "") {
+        if (!Objects.equals(startTime, "") && !Objects.equals(endTime, "")) {
             start = LocalDateTime.parse(startTime, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
             end = LocalDateTime.parse(endTime, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
         }

Pinnacle/src/main/java/com/cfive/pinnacle/service/impl/NoticeTypeServiceImpl.java

@@ -3,10 +3,10 @@ package com.cfive.pinnacle.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.cfive.pinnacle.entity.NoticeType;
 import com.cfive.pinnacle.mapper.NoticeTypeMapper;
 import com.cfive.pinnacle.service.INoticeTypeService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -23,9 +23,14 @@ import java.util.List;
  */
 @Service
 public class NoticeTypeServiceImpl extends ServiceImpl<NoticeTypeMapper, NoticeType> implements INoticeTypeService {
-    @Autowired
+
     NoticeTypeMapper noticeTypeMapper;
 
+    @Autowired
+    public void setNoticeTypeMapper(NoticeTypeMapper noticeTypeMapper) {
+        this.noticeTypeMapper = noticeTypeMapper;
+    }
+
     @Override
     public List<NoticeType> selectTypeList() {
         LambdaQueryWrapper<NoticeType> lqw = new LambdaQueryWrapper<>();
@@ -36,7 +41,7 @@ public class NoticeTypeServiceImpl extends ServiceImpl<NoticeTypeMapper, NoticeT
     @Override
     public IPage<NoticeType> selectPageTypeList(IPage<NoticeType> page, String name, Integer enable) {
         LambdaQueryWrapper<NoticeType> lqw = new LambdaQueryWrapper<>();
-        lqw.like(null != name && name != "", NoticeType::getName, name);
+        lqw.like(null != name && !name.equals(""), NoticeType::getName, name);
         lqw.eq(null != enable && enable != -1, NoticeType::getEnable, enable);
         lqw.orderByDesc(NoticeType::getId);
         return noticeTypeMapper.selectPage(page, lqw);
@@ -46,8 +51,7 @@ public class NoticeTypeServiceImpl extends ServiceImpl<NoticeTypeMapper, NoticeT
     public List<NoticeType> selectEnableTypeList() {
         LambdaQueryWrapper<NoticeType> lqw = new LambdaQueryWrapper<>();
         lqw.eq(NoticeType::getEnable, 1);
-        List<NoticeType> noticeTypes = noticeTypeMapper.selectList(lqw);
-        return noticeTypes;
+        return noticeTypeMapper.selectList(lqw);
     }
 
     @Override
@@ -56,7 +60,7 @@ public class NoticeTypeServiceImpl extends ServiceImpl<NoticeTypeMapper, NoticeT
             return false;
         }
         LambdaUpdateWrapper<NoticeType> luw = new LambdaUpdateWrapper<>();
-        luw.eq(null != typeId, NoticeType::getId, typeId).set(null != enable, NoticeType::getEnable, enable);
+        luw.eq(NoticeType::getId, typeId).set(NoticeType::getEnable, enable);
         return noticeTypeMapper.update(null, luw) > 0;
     }
 

Pinnacle/src/main/java/com/cfive/pinnacle/service/impl/StaffServiceImpl.java

@@ -2,13 +2,13 @@ package com.cfive.pinnacle.service.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.PageDTO;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.cfive.pinnacle.entity.Staff;
 import com.cfive.pinnacle.entity.permission.User;
 import com.cfive.pinnacle.exception.DataValidationFailedException;
 import com.cfive.pinnacle.mapper.StaffMapper;
 import com.cfive.pinnacle.mapper.permission.UserMapper;
 import com.cfive.pinnacle.service.IStaffService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.cfive.pinnacle.utils.WebUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

Pinnacle/src/main/java/com/cfive/pinnacle/service/impl/WorkServiceImpl.java

@@ -2,14 +2,14 @@ package com.cfive.pinnacle.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.cfive.pinnacle.entity.permission.User;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.cfive.pinnacle.entity.UserWork;
 import com.cfive.pinnacle.entity.Work;
-import com.cfive.pinnacle.mapper.permission.UserMapper;
+import com.cfive.pinnacle.entity.permission.User;
 import com.cfive.pinnacle.mapper.UserWorkMapper;
 import com.cfive.pinnacle.mapper.WorkMapper;
+import com.cfive.pinnacle.mapper.permission.UserMapper;
 import com.cfive.pinnacle.service.IWorkService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Isolation;
@@ -28,12 +28,27 @@ import java.util.List;
  */
 @Service
 public class WorkServiceImpl extends ServiceImpl<WorkMapper, Work> implements IWorkService {
-    @Autowired
+
     private WorkMapper workMapper;
-    @Autowired
     private UserWorkMapper userWorkMapper;
-    @Autowired
+
     private UserMapper userMapper;
+
+    @Autowired
+    public void setWorkMapper(WorkMapper workMapper) {
+        this.workMapper = workMapper;
+    }
+
+    @Autowired
+    public void setUserWorkMapper(UserWorkMapper userWorkMapper) {
+        this.userWorkMapper = userWorkMapper;
+    }
+
+    @Autowired
+    public void setUserMapper(UserMapper userMapper) {
+        this.userMapper = userMapper;
+    }
+
     @Override
     public List<Work> getAll() {
         return workMapper.getAll();
@@ -69,8 +84,8 @@ public class WorkServiceImpl extends ServiceImpl<WorkMapper, Work> implements IW
 
     @Override
     public double getProgress(Long workId) {
-        double workNum = userWorkMapper.selectCount(new QueryWrapper<UserWork>().eq("work_id",workId));
-        double completeNum = userWorkMapper.selectCount(new QueryWrapper<UserWork>().eq("work_id",workId).eq("status",1));
+        double workNum = userWorkMapper.selectCount(new QueryWrapper<UserWork>().eq("work_id", workId));
+        double completeNum = userWorkMapper.selectCount(new QueryWrapper<UserWork>().eq("work_id", workId).eq("status", 1));
         double progress;
         progress = (completeNum / workNum) * 100;
         progress = (double) Math.round(progress * 100) / 100;
@@ -83,7 +98,7 @@ public class WorkServiceImpl extends ServiceImpl<WorkMapper, Work> implements IW
     }
 
     @Override
-    @Transactional(isolation = Isolation.READ_COMMITTED,propagation = Propagation.REQUIRED)
+    @Transactional(isolation = Isolation.READ_COMMITTED, propagation = Propagation.REQUIRED)
     public boolean addWork(Work work) {
         boolean flag = workMapper.insert(work) > 0;
         long workId = work.getId();
@@ -100,32 +115,31 @@ public class WorkServiceImpl extends ServiceImpl<WorkMapper, Work> implements IW
     }
 
     @Override
-    @Transactional(isolation = Isolation.READ_COMMITTED,propagation = Propagation.REQUIRED)
+    @Transactional(isolation = Isolation.READ_COMMITTED, propagation = Propagation.REQUIRED)
     public boolean deleteByWorkId(Long workId) {
         return userWorkMapper.delete(new QueryWrapper<UserWork>().eq("work_id", workId)) > 0 && workMapper.deleteById(workId) > 0;
     }
 
     @Override
-    @Transactional(isolation = Isolation.READ_COMMITTED,propagation = Propagation.REQUIRED)
+    @Transactional(isolation = Isolation.READ_COMMITTED, propagation = Propagation.REQUIRED)
     public boolean updateStatus(UserWork userWork) {
         return userWorkMapper.update(userWork, new UpdateWrapper<UserWork>().eq("work_id", userWork.getWorkId()).eq("user_id", userWork.getUserId())) > 0;
     }
 
     @Override
-    @Transactional(isolation = Isolation.READ_COMMITTED,propagation = Propagation.REQUIRED)
+    @Transactional(isolation = Isolation.READ_COMMITTED, propagation = Propagation.REQUIRED)
     public boolean updateWork(Work work) {
         boolean flag = userWorkMapper.delete(new QueryWrapper<UserWork>().eq("work_id", work.getId())) > 0;
         if (workMapper.update(null, new UpdateWrapper<Work>().eq("id", work.getId()).set("old", 1)) <= 0) {
             flag = false;
-        }
-        else{
+        } else {
             work.setOriginId(work.getId());
             work.setId(null); //清除id，使新插入的数据id重新生成
             work.setCreateTime(null);
             work.setModifyTime(null);
             work.setOld(0);
         }
-        if (workMapper.insert(work)<=0) {
+        if (workMapper.insert(work) <= 0) {
             flag = false;
         }
         for (User user :

Pinnacle/src/main/java/com/cfive/pinnacle/service/permission/IGroupService.java

@@ -1,8 +1,8 @@
 package com.cfive.pinnacle.service.permission;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.cfive.pinnacle.entity.permission.Group;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.cfive.pinnacle.entity.permission.Group;
 
 import java.util.List;
 

Pinnacle/src/main/java/com/cfive/pinnacle/service/permission/IOperationLogService.java

@@ -1,7 +1,7 @@
 package com.cfive.pinnacle.service.permission;
 
-import com.cfive.pinnacle.entity.permission.OperationLog;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.cfive.pinnacle.entity.permission.OperationLog;
 
 /**
  * <p>

Pinnacle/src/main/java/com/cfive/pinnacle/service/permission/IPowerService.java

@@ -1,7 +1,7 @@
 package com.cfive.pinnacle.service.permission;
 
-import com.cfive.pinnacle.entity.permission.Power;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.cfive.pinnacle.entity.permission.Power;
 import com.cfive.pinnacle.entity.permission.PowerSet;
 
 /**

Pinnacle/src/main/java/com/cfive/pinnacle/service/permission/IRoleService.java

@@ -1,8 +1,8 @@
 package com.cfive.pinnacle.service.permission;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.cfive.pinnacle.entity.permission.Role;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.cfive.pinnacle.entity.permission.Role;
 
 import java.util.List;
 

Pinnacle/src/main/java/com/cfive/pinnacle/service/permission/IUserService.java

@@ -1,8 +1,8 @@
 package com.cfive.pinnacle.service.permission;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.cfive.pinnacle.entity.permission.User;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.cfive.pinnacle.entity.permission.User;
 
 import java.util.List;
 

Pinnacle/src/main/java/com/cfive/pinnacle/service/permission/impl/GroupServiceImpl.java

@@ -5,12 +5,12 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.OrderItem;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.plugins.pagination.PageDTO;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.cfive.pinnacle.entity.permission.Group;
 import com.cfive.pinnacle.entity.permission.RoleGroup;
 import com.cfive.pinnacle.mapper.permission.GroupMapper;
 import com.cfive.pinnacle.mapper.permission.RoleGroupMapper;
 import com.cfive.pinnacle.service.permission.IGroupService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

Pinnacle/src/main/java/com/cfive/pinnacle/service/permission/impl/LoginServiceImpl.java

@@ -1,7 +1,7 @@
 package com.cfive.pinnacle.service.permission.impl;
 
-import com.cfive.pinnacle.entity.permission.User;
 import com.cfive.pinnacle.entity.permission.LoginUser;
+import com.cfive.pinnacle.entity.permission.User;
 import com.cfive.pinnacle.service.permission.ILoginService;
 import com.cfive.pinnacle.utils.JwtUtil;
 import com.cfive.pinnacle.utils.RedisCache;

Pinnacle/src/main/java/com/cfive/pinnacle/service/permission/impl/OperationLogServiceImpl.java

@@ -1,9 +1,9 @@
 package com.cfive.pinnacle.service.permission.impl;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.cfive.pinnacle.entity.permission.OperationLog;
 import com.cfive.pinnacle.mapper.permission.OperationLogMapper;
 import com.cfive.pinnacle.service.permission.IOperationLogService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 /**

Pinnacle/src/main/java/com/cfive/pinnacle/service/permission/impl/PowerServiceImpl.java

@@ -1,10 +1,10 @@
 package com.cfive.pinnacle.service.permission.impl;
 
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.cfive.pinnacle.entity.permission.*;
 import com.cfive.pinnacle.mapper.permission.*;
-import com.cfive.pinnacle.service.permission.*;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.cfive.pinnacle.service.permission.IPowerService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

Pinnacle/src/main/java/com/cfive/pinnacle/service/permission/impl/RoleServiceImpl.java

@@ -5,12 +5,14 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.OrderItem;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.plugins.pagination.PageDTO;
-import com.cfive.pinnacle.entity.permission.*;
-import com.cfive.pinnacle.exception.DataValidationFailedException;
-import com.cfive.pinnacle.mapper.permission.RoleMapper;
-import com.cfive.pinnacle.mapper.permission.PowerRoleMapper;
-import com.cfive.pinnacle.service.permission.IRoleService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.cfive.pinnacle.entity.permission.Power;
+import com.cfive.pinnacle.entity.permission.PowerRole;
+import com.cfive.pinnacle.entity.permission.Role;
+import com.cfive.pinnacle.exception.DataValidationFailedException;
+import com.cfive.pinnacle.mapper.permission.PowerRoleMapper;
+import com.cfive.pinnacle.mapper.permission.RoleMapper;
+import com.cfive.pinnacle.service.permission.IRoleService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

Pinnacle/src/main/java/com/cfive/pinnacle/service/permission/impl/UserDetailsServiceImpl.java

@@ -1,7 +1,7 @@
 package com.cfive.pinnacle.service.permission.impl;
 
-import com.cfive.pinnacle.entity.permission.User;
 import com.cfive.pinnacle.entity.permission.LoginUser;
+import com.cfive.pinnacle.entity.permission.User;
 import com.cfive.pinnacle.service.permission.IUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;

Pinnacle/src/main/java/com/cfive/pinnacle/service/permission/impl/UserServiceImpl.java

@@ -4,11 +4,11 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.PageDTO;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.cfive.pinnacle.entity.permission.*;
 import com.cfive.pinnacle.exception.OldPasswordNotMatchException;
 import com.cfive.pinnacle.mapper.permission.*;
 import com.cfive.pinnacle.service.permission.IUserService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.cfive.pinnacle.utils.WebUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.crypto.password.PasswordEncoder;
@@ -61,6 +61,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
     public void setUserRoleMapper(UserRoleMapper userRoleMapper) {
         this.userRoleMapper = userRoleMapper;
     }
+
     @Autowired
     public void setUserGroupMapper(UserGroupMapper userGroupMapper) {
         this.userGroupMapper = userGroupMapper;

Pinnacle/src/main/java/com/cfive/pinnacle/utils/JwtUtil.java

@@ -51,13 +51,7 @@ public class JwtUtil {
         }
         long expMillis = nowMillis + ttlMillis;
         Date expDate = new Date(expMillis);
-        return JWT.create()
-                .withJWTId(uuid)
-                .withSubject(subject)
-                .withIssuer(ISSUER)
-                .withIssuedAt(now)
-                .withExpiresAt(expDate)
-                .sign(algorithm());
+        return JWT.create().withJWTId(uuid).withSubject(subject).withIssuer(ISSUER).withIssuedAt(now).withExpiresAt(expDate).sign(algorithm());
     }
 
     /**
@@ -100,8 +94,7 @@ public class JwtUtil {
      * @return 解析内容
      */
     public static DecodedJWT parseJWT(String jwt) {
-        JWTVerifier jwtVerifier = JWT.require(algorithm())
-                .build();
+        JWTVerifier jwtVerifier = JWT.require(algorithm()).build();
         return jwtVerifier.verify(jwt);
     }
 
@@ -109,7 +102,6 @@ public class JwtUtil {
 //        String token = "eyJhbGciOiJIUzI1NiJ9.eyJqdGkiOiJjYWM2ZDVhZi1mNjVlLTQ0MDAtYjcxMi0zYWEwOGIyOTIwYjQiLCJzdWIiOiJzZyIsImlzcyI6InNnIiwiaWF0IjoxNjM4MTA2NzEyLCJleHAiOjE2MzgxMTAzMTJ9.JVsSbkP94wuczb4QryQbAke3ysBDIL5ou8fWsbt_ebg";
 //        Claims claims = parseJWT(token);
 
-        System.out.println(parseJWT("ayJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJzdWIiOiJxd2UiLCJpc3MiOiJjZml2ZSIsImV4cCI6MTY4MzE5MzkyOSwiaWF0IjoxNjgzMTkwMzI5LCJqdGkiOiIzOWY5YTcxYTllY2E0Mjg1OGVjNGExODU2ZmQwYjk4OCJ9.4YOOILGWxlnmToWTdo4YoCbfXqvzdJF_Ds4zulDWX1o")
-                .getClaims());
+        System.out.println(parseJWT("ayJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJzdWIiOiJxd2UiLCJpc3MiOiJjZml2ZSIsImV4cCI6MTY4MzE5MzkyOSwiaWF0IjoxNjgzMTkwMzI5LCJqdGkiOiIzOWY5YTcxYTllY2E0Mjg1OGVjNGExODU2ZmQwYjk4OCJ9.4YOOILGWxlnmToWTdo4YoCbfXqvzdJF_Ds4zulDWX1o").getClaims());
     }
 }

Pinnacle/src/main/java/com/cfive/pinnacle/utils/RedisCache.java

@@ -7,7 +7,10 @@ import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.data.redis.core.ValueOperations;
 import org.springframework.stereotype.Component;
 
-import java.util.*;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 import java.util.concurrent.TimeUnit;
 
 @SuppressWarnings(value = {"unchecked", "rawtypes"})

Pinnacle/src/main/resources/mapper/AffairMapper.xml

@@ -2,27 +2,9 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.cfive.pinnacle.mapper.AffairMapper">
 
-    <select id="getSameDepartmentUser" resultMap="userMap">
-        select t_user.id            as user_id,
-               t_user.username      as user_username,
-               t_user.department_id as user_department_id,
-               t_user.enable        as user_enable,
-               t_user.deleted       as user_deleted,
-               t_user.version       as user_version,
-               ts.id                as staff_id,
-               ts.first_name        as staff_first_name,
-               ts.last_name         as staff_last_name,
-               ts.deleted           as staff_deleted,
-               ts.version           as staff_version,
-        from t_user
-                 left join (select * from t_staff where deleted = 0) as ts on ts.user_id = t_user.id
-        where t_user.id=#{id}
-            t_user.deleted = 0;
-    </select>
-
     <select id="getFuzzyQueriesByAffairTitle" resultMap="affairMap">
         select
-                       *
+        *
         from t_affair
         <where>
             <if test=" applicantId !=null">
@@ -30,7 +12,7 @@
             </if>
 
             <if test=" title!=null and title!='' ">
-               and  instr(title,#{title})&gt;0
+                and instr(title,#{title})&gt;0
             </if>
             <if test=" typeId!=null ">
                 and instr(type_id,#{typeId})>0
@@ -45,8 +27,6 @@
     </select>
 
 
-
-
     <resultMap id="userMap" type="user">
         <id property="id" column="user_id"/>
         <result property="username" column="user_username"/>
@@ -67,7 +47,6 @@
         <id property="id" column="id"/>
     </resultMap>
 
-
     <select id="getNotApprovedByFuzzyQueries" resultMap="affairMap2">
         select
         *
@@ -79,7 +58,7 @@
             </if>
 
             <if test=" title!=null and title!='' ">
-                and  instr(title,#{title})&gt;0
+                and instr(title,#{title})&gt;0
             </if>
             <if test=" typeId!=null ">
                 and instr(type_id,#{typeId})>0
@@ -104,7 +83,7 @@
             </if>
 
             <if test=" title!=null and title!='' ">
-                and  instr(title,#{title})&gt;0
+                and instr(title,#{title})&gt;0
             </if>
             <if test=" typeId!=null ">
                 and instr(type_id,#{typeId})>0
@@ -128,8 +107,4 @@
     </resultMap>
 
 
-
-
-
-
 </mapper>

Pinnacle/src/main/resources/mapper/AttendanceMapper.xml

@@ -35,10 +35,7 @@
     </resultMap>
 
 
-
-
-
-    <select id="getAttendanceAndUserByid" resultMap="AttendAndUserResult">
+    <select id="getAttendanceAndUserById" resultMap="AttendAndUserResult">
         select att.id      attId,
                att.user_id,
                att.att_time,
@@ -56,7 +53,8 @@
         from t_attendance att,
              t_user u
         where att.user_id = u.id
-          and att.deleted = 0 and att.user_id=#{userid}
+          and att.deleted = 0
+          and att.user_id = #{userid}
         order by att_time DESC
     </select>
     <resultMap id="AttendAndUserResult" type="attendance" autoMapping="true">
@@ -70,4 +68,4 @@
         </association>
     </resultMap>
 
-    </mapper>
+</mapper>

Pinnacle/src/main/resources/mapper/NoticeReceiveMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.cfive.pinnacle.mapper.NoticeReceiveMapper">
-<!--查询所有或根据用户阅读状态进行查询-->
+    <!--查询所有或根据用户阅读状态进行查询-->
     <select id="selectByUserId" resultMap="selectAllMap">
         select u.id uid,
         u.username,
@@ -57,7 +57,7 @@
             <id property="id" column="uid"/>
         </association>
     </resultMap>
-<!-- 所接收到公告的前五条公告   -->
+    <!-- 所接收到公告的前五条公告   -->
     <select id="selectLimitByUserId" resultMap="selectAllMap">
         select u.id uid,
         u.username,

Pinnacle/src/main/resources/mapper/WorkMapper.xml

@@ -26,20 +26,20 @@
         select w.id,
                content,
                publisher_id,
-               u.username publisher_name,
+               u.username        publisher_name,
                create_time,
                deadline,
-               tuw.user_id worker_id,
-               tu.username  worker_name,
-               tuw.status  status,
+               tuw.user_id       worker_id,
+               tu.username       worker_name,
+               tuw.status        status,
                tuw.complete_time complete_time,
                first_name,
                last_name
         from t_work w
-            left join (select * from t_user where deleted = 0) as u on w.publisher_id = u.id
-            left join (select * from t_user_work where deleted = 0) as tuw on w.id = tuw.work_id
-            left join (select * from t_user where deleted = 0) as tu on tuw.user_id = tu.id
-            left join (select * from t_staff where deleted = 0) as ts on tuw.user_id = ts.user_id
+                 left join (select * from t_user where deleted = 0) as u on w.publisher_id = u.id
+                 left join (select * from t_user_work where deleted = 0) as tuw on w.id = tuw.work_id
+                 left join (select * from t_user where deleted = 0) as tu on tuw.user_id = tu.id
+                 left join (select * from t_staff where deleted = 0) as ts on tuw.user_id = ts.user_id
         where w.deleted = 0
           and w.old = 0
         order by w.id desc;
@@ -48,20 +48,20 @@
         select w.id,
                content,
                publisher_id,
-               u.username publisher_name,
+               u.username        publisher_name,
                create_time,
                deadline,
-               tuw.user_id worker_id,
-               tu.username  worker_name,
-               tuw.status  status,
+               tuw.user_id       worker_id,
+               tu.username       worker_name,
+               tuw.status        status,
                tuw.complete_time completeTime,
                first_name,
                last_name
         from t_work w
-                   left join (select * from t_user where deleted = 0) as u on w.publisher_id = u.id
-                   left join (select * from t_user_work where deleted = 0) as tuw on w.id = tuw.work_id
-                   left join (select * from t_user where deleted = 0) as tu on tuw.user_id = tu.id
-                   left join (select * from t_staff where deleted = 0) as ts on tuw.user_id = ts.user_id
+                 left join (select * from t_user where deleted = 0) as u on w.publisher_id = u.id
+                 left join (select * from t_user_work where deleted = 0) as tuw on w.id = tuw.work_id
+                 left join (select * from t_user where deleted = 0) as tu on tuw.user_id = tu.id
+                 left join (select * from t_staff where deleted = 0) as ts on tuw.user_id = ts.user_id
         where w.id = #{id}
           and w.deleted = 0
           and w.old = 0;
@@ -70,11 +70,11 @@
         select w.id,
                content,
                publisher_id,
-               u.username publisher_name,
+               u.username        publisher_name,
                create_time,
                deadline,
                tuw.user_id       worker_id,
-               tu.username        worker_name,
+               tu.username       worker_name,
                tuw.status        status,
                tuw.complete_time completeTime,
                first_name,
@@ -93,18 +93,17 @@
         select w.id,
                content,
                publisher_id,
-               u.username publisher_name,
+               u.username  publisher_name,
                create_time,
                deadline,
                tuw.user_id worker_id,
-               tu.username  worker_name,
+               tu.username worker_name,
                tuw.status  status
         from t_work w
                  left join (select * from t_user where deleted = 0) as u on w.publisher_id = u.id
                  left join (select * from t_user_work where deleted = 0) as tuw on w.id = tuw.work_id
                  left join (select * from t_user where deleted = 0) as tu on tuw.user_id = tu.id
-        where
-            tuw.user_id = #{userId}
+        where tuw.user_id = #{userId}
           and status = false
           and w.deleted = 0
           and w.old = 0
@@ -112,22 +111,22 @@
     </select>
     <select id="getCard" parameterType="long" resultMap="workMap">
         select w.id,
-        content,
-        publisher_id,
-        u.username publisher_name,
-        create_time,
-        deadline,
-        tuw.user_id worker_id,
-        tu.username worker_name,
-        tuw.status status
+               content,
+               publisher_id,
+               u.username  publisher_name,
+               create_time,
+               deadline,
+               tuw.user_id worker_id,
+               tu.username worker_name,
+               tuw.status  status
         from t_work w
                  left join (select * from t_user where deleted = 0) as u on w.publisher_id = u.id
                  left join (select * from t_user_work where deleted = 0) as tuw on w.id = tuw.work_id
                  left join (select * from t_user where deleted = 0) as tu on tuw.user_id = tu.id
         where tuw.user_id = #{userId}
-        and status = false
-        and w.deleted = 0
-        and w.old = 0
+          and status = false
+          and w.deleted = 0
+          and w.old = 0
         order by w.deadline asc, w.id desc
         limit 5;
 
@@ -136,12 +135,12 @@
         select w.id,
                content,
                publisher_id,
-               u.username publisher_name,
+               u.username        publisher_name,
                create_time,
                deadline,
-               tuw.user_id worker_id,
-               u.username  worker_name,
-               tuw.status status,
+               tuw.user_id       worker_id,
+               u.username        worker_name,
+               tuw.status        status,
                tuw.complete_time complete_time
         from t_work w
                  left join (select * from t_user where deleted = 0) as u on w.publisher_id = u.id

Pinnacle/src/main/resources/mapper/permission/GroupMapper.xml

@@ -5,8 +5,8 @@
     <select id="filterGroupByRoleId" resultType="long">
         select distinct t_group.id as group_id
         from (select * from t_group where deleted = 0) as t_group
-                 left join (select * from t_role_group where deleted = 0) as trg on t_group.id = trg.group_id
-                 left join (select * from t_role where deleted = 0) as tr on tr.id = trg.role_id
+        left join (select * from t_role_group where deleted = 0) as trg on t_group.id = trg.group_id
+        left join (select * from t_role where deleted = 0) as tr on tr.id = trg.role_id
         <where>
             <if test="roleId != null">
                 tr.id = #{roleId}

Pinnacle/src/main/resources/sql/schema.sql

@@ -39,11 +39,11 @@ create table `t_power`
 
 create table `t_menu`
 (
-    `id`        bigint       not null primary key auto_increment,
-    `name`      varchar(30)  not null comment ' 菜单名',
+    `id`        bigint      not null primary key auto_increment,
+    `name`      varchar(30) not null comment ' 菜单名',
     `url`       varchar(100) null comment 'URL',
-    `power_id`  bigint       not null comment '权限ID',
-    `parent_id` bigint       null comment '父ID',
+    `power_id`  bigint      not null comment '权限ID',
+    `parent_id` bigint null comment '父ID',
     constraint t_menu_power_id_fk foreign key (power_id) references t_power (id)
 ) comment '菜单';
 
@@ -72,7 +72,7 @@ create table `t_operation`
     `name`       varchar(50) not null comment '功能名',
     `code`       varchar(50) null comment '功能编码',
     `power_id`   bigint      not null comment '权限ID',
-    `parent_id`  bigint      null comment '父ID',
+    `parent_id`  bigint null comment '父ID',
     `element_id` bigint      not null comment '页面元素ID',
     constraint t_operation_power_id_fk foreign key (power_id) references t_power (id),
     constraint t_operation_element_id_fk foreign key (element_id) references t_element (id)
@@ -94,7 +94,7 @@ create table `t_user`
     `id`            bigint      not null primary key,
     `username`      varchar(20) not null comment '用户名',
     `passwd`        char(70)    not null comment '密码',
-    `department_id` bigint      null comment '部门',
+    `department_id` bigint null comment '部门',
     `enable`        int         not null comment '启用',
     `deleted`       bigint      not null default 0,
     `version`       int         not null default 0,
@@ -186,7 +186,7 @@ create table `t_staff`
     `first_name` varchar(20) not null comment '名',
     `last_name`  varchar(20) not null comment '姓',
     `gender`     int         not null default 0 comment '性别',
-    `birth`      date        null comment '生日',
+    `birth`      date null comment '生日',
     `email`      varchar(50) null comment '邮箱',
     `tel`        varchar(20) null comment '电话',
     `address`    varchar(100) null comment '地址',
@@ -217,7 +217,7 @@ create table `t_notice`
     `priority`    int         not null default 1 comment '优先级',
     `top`         int         not null default 0 comment '置顶',
     `modify_time` datetime    not null default (utc_timestamp()) comment '修改时间',
-    `origin_id`   bigint      null comment '源ID',
+    `origin_id`   bigint null comment '源ID',
     `old`         int         not null default 0 comment '已修改',
     `deleted`     bigint      not null default 0,
     `version`     int         not null default 0,
@@ -246,7 +246,7 @@ create table `t_work`
     `deadline`     datetime     not null comment '截止时间',
     `modify_time`  datetime     not null default (utc_timestamp()) comment '修改时间',
     `old`          int          not null default 0 comment '已修改',
-    `origin_id`    bigint       null comment '源ID',
+    `origin_id`    bigint null comment '源ID',
     `deleted`      bigint       not null default 0,
     `version`      int          not null default 0,
     constraint t_work_publisher_id_fk foreign key (publisher_id) references t_user (id)
@@ -254,13 +254,13 @@ create table `t_work`
 
 create table `t_user_work`
 (
-    `id`            bigint   not null primary key,
-    `user_id`       bigint   not null comment '用户',
-    `work_id`       bigint   not null comment '工作事项',
-    `status`        int      not null default 0 comment '工作状态',
+    `id`            bigint not null primary key,
+    `user_id`       bigint not null comment '用户',
+    `work_id`       bigint not null comment '工作事项',
+    `status`        int    not null default 0 comment '工作状态',
     `complete_time` datetime null comment '完成时间',
-    `deleted`       bigint   not null default 0,
-    `version`       int      not null default 0,
+    `deleted`       bigint not null default 0,
+    `version`       int    not null default 0,
     constraint t_user_work_user_id_fk foreign key (user_id) references t_user (id),
     constraint t_user_work_work_id_fk foreign key (work_id) references t_work (id)
 ) comment '中间表-用户-工作事项';
@@ -284,10 +284,10 @@ create table `t_affair`
     `applicant_id` bigint      not null comment '申请者',
     `inspector_id` bigint      not null comment '审核者',
     `create_time`  datetime    not null default (utc_timestamp()) comment '创建时间',
-    `inspect_time` datetime    null comment '审核时间',
+    `inspect_time` datetime null comment '审核时间',
     `priority`     int         not null default 1 comment '优先级',
     `modify_time`  datetime             default (utc_timestamp()) comment '修改时间',
-    `origin_id`    bigint      null comment '源ID',
+    `origin_id`    bigint null comment '源ID',
     `old`          int         not null default 0 comment '已修改',
     `deleted`      bigint      not null default 0,
     `version`      int         not null default 0,