11.1

yudao-module-md/yudao-module-md-biz/src/main/java/cn/iocoder/yudao/module/md/controller/admin/AcsController.java

@@ -64,7 +64,7 @@ public class AcsController {
 
 
     //
-    @Scheduled(cron = "0 */10 * * * ?") // 每10分钟执行
+//    @Scheduled(cron = "0 */10 * * * ?") // 每10分钟执行
     public void scheduledTask() throws UnsupportedEncodingException, InterruptedException {
         acsService.searchEvents(adminUserService, studentAttendanceService);
     }

yudao-module-mp/yudao-module-mp-biz/src/main/java/cn/iocoder/yudao/module/mp/service/message/MpMessageServiceImpl.java

@@ -21,6 +21,7 @@ import cn.iocoder.yudao.module.mp.service.account.MpAccountService;
 import cn.iocoder.yudao.module.mp.service.material.MpMaterialService;
 import cn.iocoder.yudao.module.mp.service.message.bo.MpMessageSendOutReqBO;
 import cn.iocoder.yudao.module.mp.service.user.MpUserService;
+import cn.iocoder.yudao.module.system.controller.admin.studentAttendance.vo.StudentAttendancePageReqVO;
 import cn.iocoder.yudao.module.system.dal.dataobject.studentAttendance.StudentAttendanceDO;
 import cn.iocoder.yudao.module.system.service.studentAttendance.StudentAttendanceService;
 import lombok.extern.slf4j.Slf4j;
@@ -163,7 +164,11 @@ public class MpMessageServiceImpl implements MpMessageService {
         MpAccountDO account = mpAccountService.getRequiredAccount(user.getAccountId());
 
         //获取今天的考勤记录列表
-       List<StudentAttendanceDO> attendanceList= studentAttendanceService.getStudentsAttendanceDay(LocalDate.now());
+
+        LocalDate localDate = LocalDate.now();
+        StudentAttendancePageReqVO pageReqVO =new StudentAttendancePageReqVO();
+        pageReqVO.setDate(localDate);
+       List<StudentAttendanceDO> attendanceList= studentAttendanceService.getStudentAttendancePage(pageReqVO).getList();
 
        sendReqVO.setContent(attendanceList.toString());
 
@@ -197,15 +202,14 @@ public class MpMessageServiceImpl implements MpMessageService {
         MpAccountDO account = mpAccountService.getRequiredAccount(user.getAccountId());
 
         //获取今天的考勤记录列表
-        List<StudentAttendanceDO> attendanceList= studentAttendanceService.getStudentsAttendanceDay(LocalDate.now());
+        LocalDate localDate = LocalDate.now();
+        StudentAttendancePageReqVO pageReqVO =new StudentAttendancePageReqVO();
+        pageReqVO.setDate(localDate);
+        pageReqVO.setDeptId(String.valueOf(deptId));
+        List<StudentAttendanceDO> attendanceList= studentAttendanceService.getStudentAttendancePage(pageReqVO).getList();
+
         //仅导师工作间下的
-        List<StudentAttendanceDO> newAttendanceList =new ArrayList<>();
-        for (StudentAttendanceDO list :attendanceList){
-            if (list.getDeptId().equals(deptId)){
-                newAttendanceList.add(list);
-            }
-        }
-        sendReqVO.setContent(newAttendanceList.toString());
+        sendReqVO.setContent(attendanceList.toString());
 
         WxMpKefuMessage wxMessage = MpMessageConvert.INSTANCE.convert(BeanUtils.toBean(sendReqVO,MpMessageSendReqVO.class), user);
         WxMpService mpService = mpServiceFactory.getRequiredMpService(user.getAppId());

yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/ErrorCodeConstants.java

@@ -169,11 +169,6 @@ public interface ErrorCodeConstants {
     // ========== 学生考勤记录 TODO 补充编号 ==========
     ErrorCode STUDENT_ATTENDANCE_NOT_EXISTS = new ErrorCode(1_002_030_000, "学生考勤记录不存在");
 
-    // ========== 照片组 TODO 补充编号 ==========
-    ErrorCode USER_PHOTO_GROUP_NOT_EXISTS = new ErrorCode(1_002_031_000, "用户照片组不存在");
-    // ========== 照片 TODO 补充编号 ==========
-    ErrorCode USER_PHOTOS_NOT_EXISTS = new ErrorCode(1_002_032_000, "用户照片不存在");
-
     // ========== 上传文件 TODO 补充编号 ==========
     ErrorCode UPLOADED_FOLDER_CANNOT_EMPTY = new ErrorCode(1_002_033_001, "上传的文件夹为空！");
 

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/DeptController.java

@@ -3,10 +3,12 @@ package cn.iocoder.yudao.module.system.controller.admin.dept;
 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
 import cn.iocoder.yudao.module.system.controller.admin.dept.vo.dept.DeptListReqVO;
 import cn.iocoder.yudao.module.system.controller.admin.dept.vo.dept.DeptRespVO;
 import cn.iocoder.yudao.module.system.controller.admin.dept.vo.dept.DeptSaveReqVO;
 import cn.iocoder.yudao.module.system.controller.admin.dept.vo.dept.DeptSimpleRespVO;
+import cn.iocoder.yudao.module.system.controller.admin.userAchievement.vo.UserAchievementPageReqVO;
 import cn.iocoder.yudao.module.system.dal.dataobject.dept.DeptDO;
 import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO;
 import cn.iocoder.yudao.module.system.dal.dataobject.userAchievement.UserAchievementDO;
@@ -24,7 +26,10 @@ import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import javax.validation.Valid;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
 
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
 
@@ -89,9 +94,18 @@ public class DeptController {
     public CommonResult<DeptRespVO> getDept(@RequestParam("id") Long id) {
         DeptDO dept = deptService.getDept(id);
         //新加的负责人用户信息
-        AdminUserDO user  =adminUserService.getUser(dept.getLeaderUserId());
-        dept.setUser(user);
-        return success(BeanUtils.toBean(dept, DeptRespVO.class));
+        DeptRespVO newDept =BeanUtils.toBean(dept, DeptRespVO.class);
+        List<Long> leaderUserIds = newDept.getLeaderUserId();
+        List<AdminUserDO> userList =  new ArrayList<>();
+        if (leaderUserIds.size()>0) {
+            for (Long leaderUserId : leaderUserIds) {
+                AdminUserDO user = (leaderUserId != null) ? adminUserService.getUser(leaderUserId) : null;
+                userList.add(user);
+            }
+            newDept.setUser(userList);
+        }
+        return success(newDept);
+
     }
 
 
@@ -99,43 +113,42 @@ public class DeptController {
     @Operation(summary = "获得登录人员工作间信息")
     @PreAuthorize("@ss.hasPermission('system:dept:selfQuery')")
     public CommonResult<DeptRespVO> getUserDept() {
+        Long deptId = SecurityFrameworkUtils.getLoginUserDeptId();
         // TODO 你这里不是用了部门信息查询吗哈哈哈哈，user那些方法里怎么不用，还写了sql
         // 获取部门信息
         DeptDO dept = deptService.getUserDept();
         if (dept == null) {
             return null;
         }
-        // TODO 有一点小问题，工作间负责人（老师）可能是多个，这里是只能存一个了
-        // 获取负责人用户信息
-        Long leaderUserId = dept.getLeaderUserId();
-        AdminUserDO user = (leaderUserId != null) ? adminUserService.getUser(leaderUserId) : null;
-        dept.setUser(user);
 
-        DeptRespVO newDept = BeanUtils.toBean(dept, DeptRespVO.class);
+        // 获取负责人用户信息
+        DeptRespVO newDept =BeanUtils.toBean(dept, DeptRespVO.class);
+        List<Long> leaderUserIds = newDept.getLeaderUserId();
+        List<AdminUserDO> userList =  new ArrayList<>();
+        if (leaderUserIds.size()>0) {
+            for (Long leaderUserId : leaderUserIds) {
+                AdminUserDO user = (leaderUserId != null) ? adminUserService.getUser(leaderUserId) : null;
+                userList.add(user);
+            }
+            newDept.setUser(userList);
+        }
 
         // 获取工作间下所有用户
         List<AdminUserDO> allUser = adminUserService.getDeptUser();
         List<AdminUserDO> student = new ArrayList<>();
         List<AdminUserDO> supervisor = new ArrayList<>();
-        List<String> userAchievements = new ArrayList<>();
 
         for (AdminUserDO ad : allUser) {
-            if (ad.getUserType().equals("1") || ad.getUserType().equals("2")) {
+            if (ad.getUserType().equals("1")) {//仅在校生
                 student.add(ad);
             } else if (ad.getUserType().equals("3")) {
                 supervisor.add(ad);
             }
-
-            var achievements = userAchievementService.getUserAchievementByUserId(Math.toIntExact(ad.getId()));
-            // 检查列表是否为空
-            if (achievements != null && !achievements.isEmpty()) {
-                // 遍历成就列表并添加每个成就的细节到 userAchievements
-                for (UserAchievementDO achievement : achievements) {
-                    userAchievements.add(achievement.getDetail());
-                }
-            }
         }
-        // TODO 人数可以直接使用sql 统计，成果不是也存deptId吗，可以直接根据部门id来查出所有部门下面的成果
+        // TODO 人数可以直接使用sql 统计
+        UserAchievementPageReqVO pageReqVO =new UserAchievementPageReqVO();
+        pageReqVO.setDeptId(deptId);
+        List<UserAchievementDO> userAchievements = userAchievementService.getUserAchievementPage(pageReqVO).getList();
         newDept.setSupervisorNum(String.valueOf(supervisor.size()));
         newDept.setStudentNum(String.valueOf(student.size()));
         newDept.setUserAchievements(userAchievements);

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/vo/dept/DeptRespVO.java

@@ -1,6 +1,7 @@
 package cn.iocoder.yudao.module.system.controller.admin.dept.vo.dept;
 
 import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO;
+import cn.iocoder.yudao.module.system.dal.dataobject.userAchievement.UserAchievementDO;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
@@ -24,7 +25,7 @@ public class DeptRespVO {
     private Integer sort;
 
     @Schema(description = "负责人的用户编号", example = "2048")
-    private Long leaderUserId;
+    private List<Long> leaderUserId;
 
     @Schema(description = "联系电话", example = "15601691000")
     private String phone;
@@ -48,9 +49,9 @@ public class DeptRespVO {
     private String studentNum;
 
     @Schema(description = "成果图片列表")
-    private List<String> userAchievements;
+    private List<UserAchievementDO> userAchievements;
 
     @Schema(description = "负责人信息")
-    private AdminUserDO user;
+    private List<AdminUserDO> user;
 
 }

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/studentAttendance/StudentAttendanceController.java

@@ -57,7 +57,7 @@ public class StudentAttendanceController {
 //        checkAttendanceSecond();
 //    }
 
-    @Scheduled(cron = "0 00 0 * * ?") // 每天0:00检测，更新未打卡
+    @Scheduled(cron = "0 00 10 * * ?") // 每天0:00检测，更新未打卡
     public void attendanceNormalFirst() {
         checkAttendanceFirst();
     }
@@ -65,7 +65,7 @@ public class StudentAttendanceController {
     public void checkAttendanceFirst() {
         List<AdminUserDO> userList = adminUserService.getAllUserList();
         LocalDate localDate = LocalDate.now();
-        // TODO 也不需要再查一下所有用户吧，直接StudentAttendanceDO里面分类就好了，
+
          for (AdminUserDO user : userList) {
             List<StudentAttendanceDO> result = studentAttendanceService.getStudentAttendanceDay(user.getUserNumber(),localDate);
             if ("1".equals(user.getUserType())) {//只对在校生
@@ -181,8 +181,10 @@ public class StudentAttendanceController {
     @PreAuthorize("@ss.hasPermission('system:student-attendance:day')")
     public CommonResult<List<StudentAttendanceDO>> getDayStudentAttendance () {
         LocalDate localDate = LocalDate.now();
-
-        List<StudentAttendanceDO> attendanceList =studentAttendanceService.getStudentsAttendanceDay(localDate);
+        StudentAttendancePageReqVO pageReqVO =new StudentAttendancePageReqVO();
+        pageReqVO.setClockInStatus("0");//正常
+        pageReqVO.setDate(localDate);
+        List<StudentAttendanceDO> attendanceList =studentAttendanceService.getStudentAttendancePage(pageReqVO).getList();
         List<StudentAttendanceDO> result =new ArrayList<>();
         for (StudentAttendanceDO attendance :attendanceList ){
             attendance.setSupervisor(adminUserService.getUser(attendance.getSupervisorId()).getNickname());//导师名字
@@ -194,25 +196,19 @@ public class StudentAttendanceController {
     }
 
     @GetMapping("/dayErrorAttendance")
-    @Operation(summary = "获得所有人当日警告列表")
+    @Operation(summary = "获得所有人当日未打卡列表")
     @PreAuthorize("@ss.hasPermission('system:student-attendance:dayError')")
     public CommonResult<List<StudentAttendanceDO>> getDayStudentErrorAttendance () {
         LocalDate localDate = LocalDate.now();
-        List<StudentAttendanceDO> attendanceList =studentAttendanceService.getStudentsAttendanceDay(localDate);
-        List<StudentAttendanceDO> result =new ArrayList<>();
-        for (StudentAttendanceDO attendance :attendanceList ){
-            if ("1".equals(attendance.getClockInStatus())){
-                attendance.setSupervisor(adminUserService.getUser(attendance.getSupervisorId()).getNickname());//导师名字
-                attendance.setDeptName(deptService.getDept(attendance.getDeptId()).getName());//工作间名称
-
-                result.add(attendance);
-            }
-        }
-        return success(result);
+        StudentAttendancePageReqVO pageReqVO =new StudentAttendancePageReqVO();
+        pageReqVO.setDate(localDate);
+        pageReqVO.setClockInStatus("1");//未打卡
+        List<StudentAttendanceDO> attendanceList =studentAttendanceService.getStudentAttendancePage(pageReqVO).getList();
+        return success(attendanceList);
     }
 
 
-    //当周有一次警告则异常
+    //当周有一次未打卡则异常
     @GetMapping("/weekendAttendance")
     @Operation(summary = "周出勤统计")
     @PreAuthorize("@ss.hasPermission('system:student-attendance:day')")
@@ -229,10 +225,9 @@ public class StudentAttendanceController {
         for (AdminUserDO student : studentList) {
             if ("1".equals(student.getUserType())) {
                 List<StudentAttendanceDO> attendanceList = studentAttendanceService.getStudentAttendanceInRange(student.getUserNumber(), startDate, endDate);
-                boolean hasWarning = false; // 标志位，表示是否有警告
+                boolean hasWarning = false; // 标志位，表示是否有未打卡
                 if (attendanceList != null && !attendanceList.isEmpty()) {
                     for (StudentAttendanceDO attendance : attendanceList) {
-                        System.out.println("Checking clockInStatus: " + attendance.getClockInStatus());
                         if ("1".equals(attendance.getClockInStatus())) { // 有一个未打卡就添加
                             errorList.add(student);
                             errorNameList.add(student.getNickname());

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/studentAttendance/vo/StudentAttendancePageReqVO.java

@@ -28,7 +28,7 @@ public class StudentAttendancePageReqVO extends PageParam {
 
     @Schema(description = "日期")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
-    private LocalDate[] date;
+    private LocalDate date;
 
     @Schema(description = "打卡状态 0正常，1未打卡、2警告、3已恢复", example = "1")
     private String clockInStatus;

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserController.java

@@ -13,8 +13,7 @@ import cn.iocoder.yudao.module.infra.api.file.FileApi;
 import cn.iocoder.yudao.module.infra.service.file.FileService;
 import cn.iocoder.yudao.module.system.controller.admin.dept.vo.dept.DeptListReqVO;
 import cn.iocoder.yudao.module.system.controller.admin.user.vo.user.*;
-import cn.iocoder.yudao.module.system.controller.admin.userPhotoGroup.vo.UserPhotoGroupSaveReqVO;
-import cn.iocoder.yudao.module.system.controller.admin.userPhotos.vo.UserPhotosSaveReqVO;
+
 import cn.iocoder.yudao.module.system.convert.user.UserConvert;
 import cn.iocoder.yudao.module.system.dal.dataobject.dept.DeptDO;
 import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO;
@@ -22,8 +21,7 @@ import cn.iocoder.yudao.module.system.enums.common.SexEnum;
 import cn.iocoder.yudao.module.system.service.dept.DeptService;
 import cn.iocoder.yudao.module.system.service.permission.PermissionService;
 import cn.iocoder.yudao.module.system.service.user.AdminUserService;
-import cn.iocoder.yudao.module.system.service.userPhotoGroup.UserPhotoGroupService;
-import cn.iocoder.yudao.module.system.service.userPhotos.UserPhotosService;
+
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.Parameters;
@@ -38,14 +36,11 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.io.*;
-import java.nio.file.Files;
-import java.nio.file.Path;
+
 import java.util.*;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipInputStream;
 
 import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
-import static cn.iocoder.yudao.framework.common.pojo.CommonResult.error;
+
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
 import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList;
 
@@ -344,7 +339,7 @@ public class UserController {
        List<AdminUserDO> userList =userService.getAllUserList();
        List<AdminUserDO> studnetList = new ArrayList<>();
        List<AdminUserDO> teacherList = new ArrayList<>();
-        DeptListReqVO reqVO =null;
+       DeptListReqVO reqVO =null;
        for (AdminUserDO user :userList){
            if ("1".equals(user.getUserType())){
                studnetList.add(user);

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/userAchievement/UserAchievementController.java

@@ -43,9 +43,6 @@ public class UserAchievementController {
     private UserAchievementService userAchievementService;
 
 
-    @Resource
-    private DeptService deptService;
-
     @PostMapping("/create")
     @Operation(summary = "创建成果")
     @PreAuthorize("@ss.hasPermission('system:user-achievement:create')")
@@ -77,14 +74,6 @@ public class UserAchievementController {
         userAchievementService.updateUserAchievement(updateReqVO);
         return success(true);
     }
-    // TODO 这里的两个方法不是一样的吗?
-    @PutMapping("/selfUpdate")
-    @Operation(summary = "更新自己的成果")
-    @PreAuthorize("@ss.hasPermission('system:user-achievement:selfUpdate')")
-    public CommonResult<Boolean> updateUserAchievement(@Valid @RequestBody SelfAchievementSaveReqVO updateReqVO) {
-        userAchievementService.updateSelfAchievement(updateReqVO);
-        return success(true);
-    }
 
     @DeleteMapping("/delete")
     @Operation(summary = "删除成果")
@@ -108,7 +97,6 @@ public class UserAchievementController {
     @Operation(summary = "获得工作间下成员成果分页")
     @PreAuthorize("@ss.hasPermission('system:user-achievement:query')")
     public CommonResult<PageResult<UserAchievementRespVO>> getUserAchievementPage(@Valid UserAchievementPageReqVO pageReqVO) {
-        // TODO 应该依托于这个原生成的方法，对搜索条件进行修改，进而实现各类查询，简单且不用书写太多
         PageResult<UserAchievementDO>pageResult = userAchievementService.getUserAchievementPage(pageReqVO);
 
         System.out.println(pageResult);
@@ -119,7 +107,8 @@ public class UserAchievementController {
     @Operation(summary = "获得工作间下导师的成果分页")
     @PreAuthorize("@ss.hasPermission('system:user-achievement:teacherQuery')")
     public CommonResult<PageResult<UserAchievementRespVO>> getTeacherAchievementPage(@Valid UserAchievementPageReqVO pageReqVO) {
-        PageResult<UserAchievementDO>pageResult = userAchievementService.getTeacherAchievementPage(pageReqVO);
+        pageReqVO.getUserType().add("3");
+        PageResult<UserAchievementDO>pageResult = userAchievementService.getUserAchievementPage(pageReqVO);
 
         return success(BeanUtils.toBean(pageResult, UserAchievementRespVO.class));
     }
@@ -128,7 +117,9 @@ public class UserAchievementController {
     @Operation(summary = "获得工作间下学生的成果分页")
     @PreAuthorize("@ss.hasPermission('system:user-achievement:studentQuery')")
     public CommonResult<PageResult<UserAchievementRespVO>> getStudentAchievementPage(@Valid UserAchievementPageReqVO pageReqVO) {
-        PageResult<UserAchievementDO>pageResult = userAchievementService.getStudentAchievementPage(pageReqVO);
+        pageReqVO.getUserType().add("1");
+        pageReqVO.getUserType().add("2");
+        PageResult<UserAchievementDO>pageResult = userAchievementService.getUserAchievementPage(pageReqVO);
 
         return success(BeanUtils.toBean(pageResult, UserAchievementRespVO.class));
     }
@@ -150,19 +141,12 @@ public class UserAchievementController {
     @Operation(summary = "获得自己的成果分页")
     @PreAuthorize("@ss.hasPermission('system:user-achievement:selfQuery')")
     public CommonResult<PageResult<UserAchievementRespVO>> getSelfAchievementPage(@Valid UserAchievementPageReqVO pageReqVO) {
-        PageResult<UserAchievementDO>pageResult = userAchievementService.getSelfAchievementPage(pageReqVO);
+        Long loginId =SecurityFrameworkUtils.getLoginUserId();
+        pageReqVO.setUserId(loginId);
+        PageResult<UserAchievementDO>pageResult = userAchievementService.getUserAchievementPage(pageReqVO);
 
         return success(BeanUtils.toBean(pageResult, UserAchievementRespVO.class));
     }
 
-    @GetMapping("/oneUserPage")
-    @Operation(summary = "获得某个用户的成果分页")
-    @PreAuthorize("@ss.hasPermission('system:user-achievement:oneUserQuery')")
-    public CommonResult<PageResult<UserAchievementRespVO>> getOneUserAchievementPage(Integer userId) {
-        //TODO 这里没分页啊，  也不用单独写一个方法，在page里面传入userId即可
-        PageResult<UserAchievementDO>pageResult = userAchievementService.selectUserAchievementPageById(userId);
-
-        return success(BeanUtils.toBean(pageResult, UserAchievementRespVO.class));
-    }
 
 }

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/userAchievement/vo/UserAchievementPageReqVO.java

@@ -34,4 +34,10 @@ public class UserAchievementPageReqVO extends PageParam {
     @Schema(description = "照片详情url")
     private String detail;
 
+    @Schema(description = "工作间id")
+    private Long deptId;
+
+    @Schema(description = "用户类型")
+    private List<String> userType;
+
 }

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/userPhotoGroup/UserPhotoGroupController.java

@@ -1,95 +0,0 @@
-package cn.iocoder.yudao.module.system.controller.admin.userPhotoGroup;
-
-import org.springframework.web.bind.annotation.*;
-import javax.annotation.Resource;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.security.access.prepost.PreAuthorize;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.Operation;
-
-import javax.validation.constraints.*;
-import javax.validation.*;
-import javax.servlet.http.*;
-import java.util.*;
-import java.io.IOException;
-
-import cn.iocoder.yudao.framework.common.pojo.PageParam;
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.common.pojo.CommonResult;
-import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
-import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
-
-import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
-
-import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
-import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.*;
-
-import cn.iocoder.yudao.module.system.controller.admin.userPhotoGroup.vo.*;
-import cn.iocoder.yudao.module.system.dal.dataobject.userPhotoGroup.UserPhotoGroupDO;
-import cn.iocoder.yudao.module.system.service.userPhotoGroup.UserPhotoGroupService;
-
-@Tag(name = "管理后台 - 用户照片组")
-@RestController
-@RequestMapping("/system/user-photo-group")
-@Validated
-public class UserPhotoGroupController {
-    //TODO 这个类是不是没用上啊
-    @Resource
-    private UserPhotoGroupService userPhotoGroupService;
-
-    @PostMapping("/create")
-    @Operation(summary = "创建用户照片组")
-    @PreAuthorize("@ss.hasPermission('system:user-photo-group:create')")
-    public CommonResult<Long> createUserPhotoGroup(@Valid @RequestBody UserPhotoGroupSaveReqVO createReqVO) {
-        return success(userPhotoGroupService.createUserPhotoGroup(createReqVO));
-    }
-
-    @PutMapping("/update")
-    @Operation(summary = "更新用户照片组")
-    @PreAuthorize("@ss.hasPermission('system:user-photo-group:update')")
-    public CommonResult<Boolean> updateUserPhotoGroup(@Valid @RequestBody UserPhotoGroupSaveReqVO updateReqVO) {
-        userPhotoGroupService.updateUserPhotoGroup(updateReqVO);
-        return success(true);
-    }
-
-    @DeleteMapping("/delete")
-    @Operation(summary = "删除用户照片组")
-    @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('system:user-photo-group:delete')")
-    public CommonResult<Boolean> deleteUserPhotoGroup(@RequestParam("id") Long id) {
-        userPhotoGroupService.deleteUserPhotoGroup(id);
-        return success(true);
-    }
-
-    @GetMapping("/get")
-    @Operation(summary = "获得用户照片组")
-    @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('system:user-photo-group:query')")
-    public CommonResult<UserPhotoGroupRespVO> getUserPhotoGroup(@RequestParam("id") Long id) {
-        UserPhotoGroupDO userPhotoGroup = userPhotoGroupService.getUserPhotoGroup(id);
-        return success(BeanUtils.toBean(userPhotoGroup, UserPhotoGroupRespVO.class));
-    }
-
-    @GetMapping("/page")
-    @Operation(summary = "获得用户照片组分页")
-    @PreAuthorize("@ss.hasPermission('system:user-photo-group:query')")
-    public CommonResult<PageResult<UserPhotoGroupRespVO>> getUserPhotoGroupPage(@Valid UserPhotoGroupPageReqVO pageReqVO) {
-        PageResult<UserPhotoGroupDO> pageResult = userPhotoGroupService.getUserPhotoGroupPage(pageReqVO);
-        return success(BeanUtils.toBean(pageResult, UserPhotoGroupRespVO.class));
-    }
-
-    @GetMapping("/export-excel")
-    @Operation(summary = "导出用户照片组 Excel")
-    @PreAuthorize("@ss.hasPermission('system:user-photo-group:export')")
-    @ApiAccessLog(operateType = EXPORT)
-    public void exportUserPhotoGroupExcel(@Valid UserPhotoGroupPageReqVO pageReqVO,
-              HttpServletResponse response) throws IOException {
-        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
-        List<UserPhotoGroupDO> list = userPhotoGroupService.getUserPhotoGroupPage(pageReqVO).getList();
-        // 导出 Excel
-        ExcelUtils.write(response, "用户照片组.xls", "数据", UserPhotoGroupRespVO.class,
-                        BeanUtils.toBean(list, UserPhotoGroupRespVO.class));
-    }
-
-}

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/userPhotoGroup/vo/UserPhotoGroupPageReqVO.java

@@ -1,29 +0,0 @@
-package cn.iocoder.yudao.module.system.controller.admin.userPhotoGroup.vo;
-
-import lombok.*;
-
-import java.io.File;
-import java.util.*;
-import io.swagger.v3.oas.annotations.media.Schema;
-import cn.iocoder.yudao.framework.common.pojo.PageParam;
-import org.springframework.format.annotation.DateTimeFormat;
-import java.time.LocalDateTime;
-
-import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
-
-@Schema(description = "管理后台 - 用户照片组分页 Request VO")
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString(callSuper = true)
-public class UserPhotoGroupPageReqVO extends PageParam {
-
-    @Schema(description = "照片组名称", example = "张三")
-    private String groupName;
-
-    @Schema(description = "照片组简介", example = "随便")
-    private String groupDescription;
-
-    @Schema(description = "压缩包文件")
-    private java.io.File File; // 压缩包文件
-
-}

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/userPhotoGroup/vo/UserPhotoGroupRespVO.java

@@ -1,31 +0,0 @@
-package cn.iocoder.yudao.module.system.controller.admin.userPhotoGroup.vo;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-import java.util.*;
-import org.springframework.format.annotation.DateTimeFormat;
-import java.time.LocalDateTime;
-import com.alibaba.excel.annotation.*;
-
-@Schema(description = "管理后台 - 用户照片组 Response VO")
-@Data
-@ExcelIgnoreUnannotated
-public class UserPhotoGroupRespVO {
-
-    @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "17155")
-    @ExcelProperty("主键")
-    private Long id;
-
-    @Schema(description = "照片组名称", example = "张三")
-    @ExcelProperty("照片组名称")
-    private String groupName;
-
-    @Schema(description = "照片组简介", example = "随便")
-    @ExcelProperty("照片组简介")
-    private String groupDescription;
-
-    @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
-    @ExcelProperty("创建时间")
-    private LocalDateTime createTime;
-
-}

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/userPhotoGroup/vo/UserPhotoGroupSaveReqVO.java

@@ -1,21 +0,0 @@
-package cn.iocoder.yudao.module.system.controller.admin.userPhotoGroup.vo;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-import java.util.*;
-import javax.validation.constraints.*;
-
-@Schema(description = "管理后台 - 用户照片组新增/修改 Request VO")
-@Data
-public class UserPhotoGroupSaveReqVO {
-
-    @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "17155")
-    private Long id;
-
-    @Schema(description = "照片组名称", example = "张三")
-    private String groupName;
-
-    @Schema(description = "照片组简介", example = "随便")
-    private String groupDescription;
-
-}

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/userPhotos/UserPhotosController.java

@@ -1,95 +0,0 @@
-package cn.iocoder.yudao.module.system.controller.admin.userPhotos;
-
-import org.springframework.web.bind.annotation.*;
-import javax.annotation.Resource;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.security.access.prepost.PreAuthorize;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.Operation;
-
-import javax.validation.constraints.*;
-import javax.validation.*;
-import javax.servlet.http.*;
-import java.util.*;
-import java.io.IOException;
-
-import cn.iocoder.yudao.framework.common.pojo.PageParam;
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.common.pojo.CommonResult;
-import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
-import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
-
-import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
-
-import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
-import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.*;
-
-import cn.iocoder.yudao.module.system.controller.admin.userPhotos.vo.*;
-import cn.iocoder.yudao.module.system.dal.dataobject.userPhotos.UserPhotosDO;
-import cn.iocoder.yudao.module.system.service.userPhotos.UserPhotosService;
-
-@Tag(name = "管理后台 - 用户照片")
-@RestController
-@RequestMapping("/system/user-photos")
-@Validated
-public class UserPhotosController {
-    // TODO 这里是不是也没用上
-    @Resource
-    private UserPhotosService userPhotosService;
-
-    @PostMapping("/create")
-    @Operation(summary = "创建用户照片")
-    @PreAuthorize("@ss.hasPermission('system:user-photos:create')")
-    public CommonResult<Long> createUserPhotos(@Valid @RequestBody UserPhotosSaveReqVO createReqVO) {
-        return success(userPhotosService.createUserPhotos(createReqVO));
-    }
-
-    @PutMapping("/update")
-    @Operation(summary = "更新用户照片")
-    @PreAuthorize("@ss.hasPermission('system:user-photos:update')")
-    public CommonResult<Boolean> updateUserPhotos(@Valid @RequestBody UserPhotosSaveReqVO updateReqVO) {
-        userPhotosService.updateUserPhotos(updateReqVO);
-        return success(true);
-    }
-
-    @DeleteMapping("/delete")
-    @Operation(summary = "删除用户照片")
-    @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('system:user-photos:delete')")
-    public CommonResult<Boolean> deleteUserPhotos(@RequestParam("id") Long id) {
-        userPhotosService.deleteUserPhotos(id);
-        return success(true);
-    }
-
-    @GetMapping("/get")
-    @Operation(summary = "获得用户照片")
-    @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('system:user-photos:query')")
-    public CommonResult<UserPhotosRespVO> getUserPhotos(@RequestParam("id") Long id) {
-        UserPhotosDO userPhotos = userPhotosService.getUserPhotos(id);
-        return success(BeanUtils.toBean(userPhotos, UserPhotosRespVO.class));
-    }
-
-    @GetMapping("/page")
-    @Operation(summary = "获得用户照片分页")
-    @PreAuthorize("@ss.hasPermission('system:user-photos:query')")
-    public CommonResult<PageResult<UserPhotosRespVO>> getUserPhotosPage(@Valid UserPhotosPageReqVO pageReqVO) {
-        PageResult<UserPhotosDO> pageResult = userPhotosService.getUserPhotosPage(pageReqVO);
-        return success(BeanUtils.toBean(pageResult, UserPhotosRespVO.class));
-    }
-
-    @GetMapping("/export-excel")
-    @Operation(summary = "导出用户照片 Excel")
-    @PreAuthorize("@ss.hasPermission('system:user-photos:export')")
-    @ApiAccessLog(operateType = EXPORT)
-    public void exportUserPhotosExcel(@Valid UserPhotosPageReqVO pageReqVO,
-              HttpServletResponse response) throws IOException {
-        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
-        List<UserPhotosDO> list = userPhotosService.getUserPhotosPage(pageReqVO).getList();
-        // 导出 Excel
-        ExcelUtils.write(response, "用户照片.xls", "数据", UserPhotosRespVO.class,
-                        BeanUtils.toBean(list, UserPhotosRespVO.class));
-    }
-
-}

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/userPhotos/vo/UserPhotosPageReqVO.java

@@ -1,28 +0,0 @@
-package cn.iocoder.yudao.module.system.controller.admin.userPhotos.vo;
-
-import lombok.*;
-import java.util.*;
-import io.swagger.v3.oas.annotations.media.Schema;
-import cn.iocoder.yudao.framework.common.pojo.PageParam;
-import org.springframework.format.annotation.DateTimeFormat;
-import java.time.LocalDateTime;
-
-import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
-
-@Schema(description = "管理后台 - 用户照片分页 Request VO")
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString(callSuper = true)
-public class UserPhotosPageReqVO extends PageParam {
-
-    @Schema(description = "照片组id", example = "9150")
-    private String photoGroupId;
-
-    @Schema(description = "照片url", example = "https://www.iocoder.cn")
-    private String photoUrl;
-
-    @Schema(description = "创建时间")
-    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
-    private LocalDateTime[] createTime;
-
-}

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/userPhotos/vo/UserPhotosRespVO.java

@@ -1,31 +0,0 @@
-package cn.iocoder.yudao.module.system.controller.admin.userPhotos.vo;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-import java.util.*;
-import org.springframework.format.annotation.DateTimeFormat;
-import java.time.LocalDateTime;
-import com.alibaba.excel.annotation.*;
-
-@Schema(description = "管理后台 - 用户照片 Response VO")
-@Data
-@ExcelIgnoreUnannotated
-public class UserPhotosRespVO {
-
-    @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "10387")
-    @ExcelProperty("主键")
-    private Long id;
-
-    @Schema(description = "照片组id", example = "9150")
-    @ExcelProperty("照片组id")
-    private String photoGroupId;
-
-    @Schema(description = "照片url", example = "https://www.iocoder.cn")
-    @ExcelProperty("照片url")
-    private String photoUrl;
-
-    @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
-    @ExcelProperty("创建时间")
-    private LocalDateTime createTime;
-
-}

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/userPhotos/vo/UserPhotosSaveReqVO.java

@@ -1,21 +0,0 @@
-package cn.iocoder.yudao.module.system.controller.admin.userPhotos.vo;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-import java.util.*;
-import javax.validation.constraints.*;
-
-@Schema(description = "管理后台 - 用户照片新增/修改 Request VO")
-@Data
-public class UserPhotosSaveReqVO {
-
-    @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "10387")
-    private Long id;
-
-    @Schema(description = "照片组id", example = "9150")
-    private Long photoGroupId;
-
-    @Schema(description = "照片url", example = "https://www.iocoder.cn")
-    private String photoUrl;
-
-}

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/dept/DeptDO.java

@@ -10,6 +10,8 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.util.List;
+
 /**
  * 部门表
  *
@@ -48,7 +50,7 @@ public class DeptDO extends TenantBaseDO {
      *
      * 关联 {@link AdminUserDO#getId()}
      */
-    private Long leaderUserId;
+    private String leaderUserId;
     /**
      * 联系电话
      */
@@ -65,7 +67,7 @@ public class DeptDO extends TenantBaseDO {
     private Integer status;
 
     @TableField(exist = false)
-    private AdminUserDO user;
+    private List<AdminUserDO> user;
 
     /**
      * 工作间地址

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/userAchievement/UserAchievementDO.java

@@ -53,4 +53,8 @@ public class UserAchievementDO extends BaseDO {
      */
     private String detail;
 
+    @TableField(exist = false)
+    private String userType;
+
+
 }

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/userPhotoGroup/UserPhotoGroupDO.java

@@ -1,39 +0,0 @@
-package cn.iocoder.yudao.module.system.dal.dataobject.userPhotoGroup;
-
-import lombok.*;
-import java.util.*;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.*;
-import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
-
-/**
- * 用户照片组 DO
- *
- * @author 芋道源码
- */
-@TableName("system_users_photo_group")
-@KeySequence("system_users_photo_group_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString(callSuper = true)
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-public class UserPhotoGroupDO extends BaseDO {
-
-    /**
-     * 主键
-     */
-    @TableId
-    private Long id;
-    /**
-     * 照片组名称
-     */
-    private String groupName;
-    /**
-     * 照片组简介
-     */
-    private String groupDescription;
-
-}

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/userPhotos/UserPhotosDO.java

@@ -1,39 +0,0 @@
-package cn.iocoder.yudao.module.system.dal.dataobject.userPhotos;
-
-import lombok.*;
-import java.util.*;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.*;
-import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
-
-/**
- * 用户照片 DO
- *
- * @author 芋道源码
- */
-@TableName("system_user_photos")
-@KeySequence("system_user_photos_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString(callSuper = true)
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-public class UserPhotosDO extends BaseDO {
-
-    /**
-     * 主键
-     */
-    @TableId
-    private Long id;
-    /**
-     * 照片组id
-     */
-    private String photoGroupId;
-    /**
-     * 照片url
-     */
-    private String photoUrl;
-
-}

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/studentAttendance/StudentAttendanceMapper.java

@@ -37,7 +37,8 @@ public interface StudentAttendanceMapper extends BaseMapperX<StudentAttendanceDO
         MPJLambdaWrapperX<StudentAttendanceDO> queryWrapper = new MPJLambdaWrapperX<>();
 
         // 添加查询条件
-        queryWrapper.selectAll(StudentAttendanceDO.class)
+        queryWrapper.betweenIfPresent(StudentAttendanceDO::getClockInTime,reqVO.getCreateTime())
+                .selectAll(StudentAttendanceDO.class)
                 .selectAs(DeptDO::getName, StudentAttendanceDO::getDeptName)
                 .leftJoin(DeptDO.class, DeptDO::getId, AdminUserDO::getDeptId)
                 .eqIfExists(StudentAttendanceDO::getClockInStatus,"0")//正常
@@ -45,13 +46,10 @@ public interface StudentAttendanceMapper extends BaseMapperX<StudentAttendanceDO
                 .likeIfExists(StudentAttendanceDO::getStudentName, reqVO.getStudentName())
                 .eqIfExists(StudentAttendanceDO::getDeptId, reqVO.getDeptId())
                 .eqIfExists(StudentAttendanceDO::getClockInStatus, reqVO.getClockInStatus())
-//                .betweenIfPresent(StudentAttendanceDO::getCreateTime, reqVO.getCreateTime())
+
                 .eqIfExists(StudentAttendanceDO::getRemark, reqVO.getRemark())
                 .orderByDesc(StudentAttendanceDO::getClockInTime);
-        //替代查询时间
-        if (reqVO.getCreateTime() != null && reqVO.getCreateTime().length > 0){
-            queryWrapper.apply("DATE(" + "clock_in_time" + ") BETWEEN {0} AND {1}", reqVO.getCreateTime()[0], reqVO.getCreateTime()[1]);
-        }
+
         if (roleIds != null && !roleIds.isEmpty()) {
             if (roleIds.contains(113L)) {//是教师 只出现在老师工作间下面的学生考勤情况
                 queryWrapper.eqIfPresent(StudentAttendanceDO::getDeptId, dept_id);
@@ -69,21 +67,17 @@ public interface StudentAttendanceMapper extends BaseMapperX<StudentAttendanceDO
 
         MPJLambdaWrapperX<StudentAttendanceDO> queryWrapperX =new MPJLambdaWrapperX<>();
 
-        queryWrapperX
+        queryWrapperX.betweenIfPresent(StudentAttendanceDO::getClockInTime,reqVO.getCreateTime())
                 .selectAll(StudentAttendanceDO.class)
                 .selectAs(DeptDO::getName, StudentAttendanceDO::getDeptName)
                 .leftJoin(DeptDO.class, DeptDO::getId, AdminUserDO::getDeptId)
                 .likeIfExists(StudentAttendanceDO::getStudentName, reqVO.getStudentName())
                 .eqIfExists(StudentAttendanceDO::getDeptId, reqVO.getDeptId())
-//                .betweenIfPresent(StudentAttendanceDO::getCreateTime, reqVO.getCreateTime())
                 .eqIfExists(StudentAttendanceDO::getClockInStatus, reqVO.getClockInStatus())
                 //1未打卡，2警告
                 .eqIfExists(StudentAttendanceDO::getClockInStatus,"1")
                 .orderByDesc(StudentAttendanceDO::getClockInTime);//未打卡
 
-        if (reqVO.getCreateTime() != null && reqVO.getCreateTime().length > 0){
-            queryWrapperX.apply("DATE(" + "clock_in_time" + ") BETWEEN {0} AND {1}", reqVO.getCreateTime()[0], reqVO.getCreateTime()[1]);
-        }
         if (roleIds != null && !roleIds.isEmpty()) {
             if (roleIds.contains(113L)) {//如果是导师，只看工作间下面的
                 queryWrapperX.eqIfPresent(StudentAttendanceDO::getDeptId, dept_id);
@@ -123,9 +117,5 @@ public interface StudentAttendanceMapper extends BaseMapperX<StudentAttendanceDO
                                                           @Param("startDate") LocalDate startDate,
                                                           @Param("endDate") LocalDate endDate);
 
-    //找某天所有用户的打卡记录
-    @Select("SELECT * FROM system_student_attendance " +
-            "WHERE date = #{clockDate}")
-    List<StudentAttendanceDO> getStudentsAttendanceDay(@Param("clockDate") LocalDate clockDate);
 
 }

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/user/AdminUserMapper.java

@@ -69,6 +69,7 @@ public interface AdminUserMapper extends BaseMapperX<AdminUserDO> {
         LambdaQueryWrapperX<AdminUserDO> queryWrapperX =new LambdaQueryWrapperX<AdminUserDO>();
         queryWrapperX.likeIfPresent(AdminUserDO::getUsername, reqVO.getUsername())
                 .likeIfPresent(AdminUserDO::getMobile, reqVO.getMobile())
+                .likeIfPresent(AdminUserDO::getUserNumber,reqVO.getUserNumber())//学号查询
                 .eqIfPresent(AdminUserDO::getStatus, reqVO.getStatus())
                 .betweenIfPresent(AdminUserDO::getCreateTime, reqVO.getCreateTime())
                 .inIfPresent(AdminUserDO::getDeptId, deptIds)
@@ -112,6 +113,7 @@ public interface AdminUserMapper extends BaseMapperX<AdminUserDO> {
         // 查询用户数据
         PageResult<AdminUserDO> result = selectPage(reqVO, new LambdaQueryWrapperX<AdminUserDO>()
                 .likeIfPresent(AdminUserDO::getUsername, reqVO.getUsername())
+                .likeIfPresent(AdminUserDO::getUserNumber,reqVO.getUserNumber())//学号查询
                 .likeIfPresent(AdminUserDO::getMobile, reqVO.getMobile())
                 .eqIfPresent(AdminUserDO::getStatus, reqVO.getStatus())
                 .betweenIfPresent(AdminUserDO::getCreateTime, reqVO.getCreateTime())
@@ -139,6 +141,7 @@ public interface AdminUserMapper extends BaseMapperX<AdminUserDO> {
                 .inIfPresent(AdminUserDO::getDeptId, deptIds)
                 .eqIfPresent(AdminUserDO::getGrade, reqVO.getGrade())
                 .likeIfPresent(AdminUserDO::getNickname, reqVO.getNickname())
+                .likeIfPresent(AdminUserDO::getUserNumber,reqVO.getUserNumber())//学号查询
                 .orderByDesc(AdminUserDO::getId);
         if (roleIds.contains(113L)){//如果是教师
             queryWrapper.eqIfPresent(AdminUserDO::getSupervisorId,loginId);

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/userAchievement/UserAchievementMapper.java

@@ -3,8 +3,8 @@ package cn.iocoder.yudao.module.system.dal.mysql.userAchievement;
 import java.util.*;
 
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.framework.mybatis.core.query.MPJLambdaWrapperX;
 import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
 import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO;
 import cn.iocoder.yudao.module.system.dal.dataobject.userAchievement.UserAchievementDO;
@@ -22,78 +22,25 @@ public interface UserAchievementMapper extends BaseMapperX<UserAchievementDO> {
     //都是按时间分页
     //所有用户
     default PageResult<UserAchievementDO> selectPage(UserAchievementPageReqVO reqVO) {
-        Long loginID = SecurityFrameworkUtils.getLoginUserId(); //
-        System.out.println(loginID);
-        // TODO 和下面同理
-
-        return selectPage(reqVO, new LambdaQueryWrapperX<UserAchievementDO>()
-                .eqIfPresent(UserAchievementDO::getUserId, reqVO.getUserId())
-                .likeIfPresent(UserAchievementDO::getAchievementName, reqVO.getAchievementName())
-                .eqIfPresent(UserAchievementDO::getAchievementType, reqVO.getAchievementType())
-                .likeIfPresent(UserAchievementDO::getUserName, reqVO.getUserName())
-                .betweenIfPresent(UserAchievementDO::getCreateTime, reqVO.getCreateTime())
-                .eqIfPresent(UserAchievementDO::getDetail, reqVO.getDetail())
-                //找到这个工作室下的人员成果
-                .inSql(UserAchievementDO::getDeptId,String.format("SELECT dept_id FROM system_users WHERE id = %d", loginID))
-                .orderByDesc(UserAchievementDO::getCreateTime));
-    }
-    //导师
-    default PageResult<UserAchievementDO> selectTeacherPage(UserAchievementPageReqVO reqVO) {
-        Long loginID = SecurityFrameworkUtils.getLoginUserId(); //
-        // TODO 逻辑还是稍微有点混乱，UserAchievementPageReqVO里面可以直接加入deptId这个参数，
-        //  这样就不需要再另外查询了，就是成果表中加入一个dept_id字段，然后查询的时候直接用这个字段来查询（看了一下，发现你是存了的，为啥不直接用）
-        //  如果需要查询，也不建议用下面这种，如果dept_id出现问题应该会报错
-        //  而且我看这个逻辑好像没把老师筛选出来
-
-
-        return selectPage(reqVO, new LambdaQueryWrapperX<UserAchievementDO>()
-                .eqIfPresent(UserAchievementDO::getUserId, reqVO.getUserId())
-                .likeIfPresent(UserAchievementDO::getAchievementName, reqVO.getAchievementName())
-                .eqIfPresent(UserAchievementDO::getAchievementType, reqVO.getAchievementType())
-                .likeIfPresent(UserAchievementDO::getUserName, reqVO.getUserName())
-                .betweenIfPresent(UserAchievementDO::getCreateTime, reqVO.getCreateTime())
-                .eqIfPresent(UserAchievementDO::getDetail, reqVO.getDetail())
-                //找到这个工作室下的人员成果
-                .inSql(UserAchievementDO::getDeptId,String.format("SELECT dept_id FROM system_users WHERE id = %d", loginID))
-                // 找到这个工作室下的人员成果，3导师
-                // TODO 这里的筛选应该是无效筛选，没有达成目的
-                .inSql(UserAchievementDO::getDeptId,
-                        String.format("SELECT dept_id FROM system_users WHERE id = %d AND user_type = 3", loginID))
-                .orderByDesc(UserAchievementDO::getCreateTime));
-    }
-    //学生
-    default PageResult<UserAchievementDO> selectStudentPage(UserAchievementPageReqVO reqVO) {
-        Long loginID = SecurityFrameworkUtils.getLoginUserId(); //
-        return selectPage(reqVO, new LambdaQueryWrapperX<UserAchievementDO>()
-                .eqIfPresent(UserAchievementDO::getUserId, reqVO.getUserId())
-                .likeIfPresent(UserAchievementDO::getAchievementName, reqVO.getAchievementName())
-                .eqIfPresent(UserAchievementDO::getAchievementType, reqVO.getAchievementType())
-                .likeIfPresent(UserAchievementDO::getUserName, reqVO.getUserName())
-                .betweenIfPresent(UserAchievementDO::getCreateTime, reqVO.getCreateTime())
-                .eqIfPresent(UserAchievementDO::getDetail, reqVO.getDetail())
-                //找到这个工作室下的人员成果
-                .inSql(UserAchievementDO::getDeptId,String.format("SELECT dept_id FROM system_users WHERE id = %d", loginID))
-                // 找到这个工作室下的人员成果//1在校生，2毕业生
-                .inSql(UserAchievementDO::getDeptId,
-                        String.format("SELECT dept_id FROM system_users WHERE id = %d AND user_type IN (1, 2)", loginID))
-                .orderByDesc(UserAchievementDO::getCreateTime));
-    }
-
-    //获取登录人员自己的
-    default PageResult<UserAchievementDO> selectSelfPage(UserAchievementPageReqVO reqVO) {
-        Long loginID = SecurityFrameworkUtils.getLoginUserId(); //
-        System.out.println(loginID);
-        return selectPage(reqVO, new LambdaQueryWrapperX<UserAchievementDO>()
-                .eqIfPresent(UserAchievementDO::getUserId, reqVO.getUserId())
-                .likeIfPresent(UserAchievementDO::getAchievementName, reqVO.getAchievementName())
-                .eqIfPresent(UserAchievementDO::getAchievementType, reqVO.getAchievementType())
-                .likeIfPresent(UserAchievementDO::getUserName, reqVO.getUserName())
-                .betweenIfPresent(UserAchievementDO::getCreateTime, reqVO.getCreateTime())
-                .eqIfPresent(UserAchievementDO::getDetail, reqVO.getDetail())
-                //找到这个自己的成果
-                //TODO 怎么还插入了一段原生sql哈哈哈哈，直接.eqIfPresent(UserAchievementDO::getUserId, loginID)即可
-                .inSql(UserAchievementDO::getUserId,String.format("SELECT id FROM system_users WHERE id = %d", loginID))
-                .orderByDesc(UserAchievementDO::getCreateTime));
+       Long deptId =SecurityFrameworkUtils.getLoginUserDeptId();
+        MPJLambdaWrapperX<UserAchievementDO> queryWrapper =new MPJLambdaWrapperX<>();
+
+        queryWrapper.betweenIfPresent(UserAchievementDO::getCreateTime,reqVO.getCreateTime())
+                .inIfPresent(UserAchievementDO::getUserType,reqVO.getUserType())
+                .selectAll(UserAchievementDO.class)
+                .selectAs(AdminUserDO::getUserType,UserAchievementDO::getUserType)
+                .leftJoin(AdminUserDO.class,AdminUserDO::getId,UserAchievementDO::getUserId)
+                .eqIfExists(UserAchievementDO::getUserId, reqVO.getUserId())
+                .likeIfExists(UserAchievementDO::getAchievementName, reqVO.getAchievementName())
+                .eqIfExists(UserAchievementDO::getAchievementType, reqVO.getAchievementType())
+                .likeIfExists(UserAchievementDO::getUserName, reqVO.getUserName())
+                .eqIfExists(UserAchievementDO::getDetail, reqVO.getDetail())
+                //找到这个登录人工作室下的所有人员成果
+                .eqIfExists(UserAchievementDO::getDeptId,deptId)
+                //用户类型查
+                .orderByDesc(UserAchievementDO::getCreateTime);
+
+        return selectPage(reqVO,queryWrapper);
     }
 
     @Select("SELECT * FROM system_user_achievement WHERE user_id = #{userId}")

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/userPhotoGroup/UserPhotoGroupMapper.java

@@ -1,27 +0,0 @@
-package cn.iocoder.yudao.module.system.dal.mysql.userPhotoGroup;
-
-import java.util.*;
-
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
-import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
-import cn.iocoder.yudao.module.system.dal.dataobject.userPhotoGroup.UserPhotoGroupDO;
-import org.apache.ibatis.annotations.Mapper;
-import cn.iocoder.yudao.module.system.controller.admin.userPhotoGroup.vo.*;
-
-/**
- * 用户照片组 Mapper
- *
- * @author 芋道源码
- */
-@Mapper
-public interface UserPhotoGroupMapper extends BaseMapperX<UserPhotoGroupDO> {
-
-    default PageResult<UserPhotoGroupDO> selectPage(UserPhotoGroupPageReqVO reqVO) {
-        return selectPage(reqVO, new LambdaQueryWrapperX<UserPhotoGroupDO>()
-                .likeIfPresent(UserPhotoGroupDO::getGroupName, reqVO.getGroupName())
-                .eqIfPresent(UserPhotoGroupDO::getGroupDescription, reqVO.getGroupDescription())
-                .orderByDesc(UserPhotoGroupDO::getId));
-    }
-
-}

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/userPhotos/UserPhotosMapper.java

@@ -1,28 +0,0 @@
-package cn.iocoder.yudao.module.system.dal.mysql.userPhotos;
-
-import java.util.*;
-
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
-import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
-import cn.iocoder.yudao.module.system.dal.dataobject.userPhotos.UserPhotosDO;
-import org.apache.ibatis.annotations.Mapper;
-import cn.iocoder.yudao.module.system.controller.admin.userPhotos.vo.*;
-
-/**
- * 用户照片 Mapper
- *
- * @author 芋道源码
- */
-@Mapper
-public interface UserPhotosMapper extends BaseMapperX<UserPhotosDO> {
-
-    default PageResult<UserPhotosDO> selectPage(UserPhotosPageReqVO reqVO) {
-        return selectPage(reqVO, new LambdaQueryWrapperX<UserPhotosDO>()
-                .eqIfPresent(UserPhotosDO::getPhotoGroupId, reqVO.getPhotoGroupId())
-                .eqIfPresent(UserPhotosDO::getPhotoUrl, reqVO.getPhotoUrl())
-                .betweenIfPresent(UserPhotosDO::getCreateTime, reqVO.getCreateTime())
-                .orderByDesc(UserPhotosDO::getId));
-    }
-
-}

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/studentAttendance/StudentAttendanceService.java

@@ -54,10 +54,10 @@ public interface StudentAttendanceService {
      * @return 学生考勤记录分页
      */
     //全部
-    PageResult<StudentAttendanceDO> getStudentAttendancePage(StudentAttendancePageReqVO pageReqVO);//导师
+    PageResult<StudentAttendanceDO> getStudentAttendancePage(StudentAttendancePageReqVO pageReqVO);//
 
     //异常
-    PageResult<StudentAttendanceDO> getStudentAttendanceErrorPage(StudentAttendancePageReqVO pageReqVO);//导师
+    PageResult<StudentAttendanceDO> getStudentAttendanceErrorPage(StudentAttendancePageReqVO pageReqVO);//
 
 
     List<StudentAttendanceDO> getStudentAttendanceByUserNumber(String userNumber);
@@ -67,9 +67,6 @@ public interface StudentAttendanceService {
     //某个学生某天
     List<StudentAttendanceDO> getStudentAttendanceDay(String userNumber, LocalDate clockDate);
 
-    //所有学生某天
-    List<StudentAttendanceDO> getStudentsAttendanceDay( LocalDate clockDate);
-
     //一段时间内的考勤
     List<StudentAttendanceDO> getStudentAttendanceInRange( String userNumber, LocalDate startDate,LocalDate endDate);
 

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/studentAttendance/StudentAttendanceServiceImpl.java

@@ -105,12 +105,7 @@ public class StudentAttendanceServiceImpl implements StudentAttendanceService {
         return studentAttendanceMapper.getStudentAttendanceDay(userNumber,clockDate);
     }
 
-    //找某天所有用户的打卡记录
-    @Override
-    public  List<StudentAttendanceDO> getStudentsAttendanceDay(LocalDate clockDate){
-        return studentAttendanceMapper.getStudentsAttendanceDay(clockDate);
-    }
-    //一段时间内某个用户的打卡记录
+//    //一段时间内某个用户的打卡记录
     @Override
    public List<StudentAttendanceDO> getStudentAttendanceInRange( String userNumber, LocalDate startDate,LocalDate endDate){
         return studentAttendanceMapper.getStudentAttendanceInRange(userNumber,startDate,endDate);

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/userAchievement/UserAchievementService.java

@@ -29,7 +29,7 @@ public interface UserAchievementService {
      * @param updateReqVO 更新信息
      */
     void updateUserAchievement(@Valid UserAchievementSaveReqVO updateReqVO);
-    void updateSelfAchievement(@Valid SelfAchievementSaveReqVO updateReqVO);
+
 
     /**
      * 删除成果
@@ -57,11 +57,6 @@ public interface UserAchievementService {
      */
     PageResult<UserAchievementDO> getUserAchievementPage(UserAchievementPageReqVO pageReqVO);
 
-    PageResult<UserAchievementDO> getTeacherAchievementPage(UserAchievementPageReqVO pageReqVO);//导师
-
-    PageResult<UserAchievementDO> getStudentAchievementPage(UserAchievementPageReqVO pageReqVO);//学生
-
-    PageResult<UserAchievementDO> getSelfAchievementPage(UserAchievementPageReqVO pageReqVO);
 
 
 }

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/userAchievement/UserAchievementServiceImpl.java

@@ -53,15 +53,6 @@ public class UserAchievementServiceImpl implements UserAchievementService {
         userAchievementMapper.updateById(updateObj);
     }
 
-    @Override
-    public void updateSelfAchievement(SelfAchievementSaveReqVO updateReqVO) {
-        // 校验存在
-        validateUserAchievementExists(updateReqVO.getId());
-        // 更新
-        UserAchievementDO updateObj = BeanUtils.toBean(updateReqVO, UserAchievementDO.class);
-        userAchievementMapper.updateById(updateObj);
-    }
-
     @Override
     public void deleteUserAchievement(Integer id) {
         // 校验存在
@@ -95,20 +86,6 @@ public class UserAchievementServiceImpl implements UserAchievementService {
         return userAchievementMapper.selectPage(pageReqVO);
     }
 
-    @Override
-    public PageResult<UserAchievementDO> getTeacherAchievementPage(UserAchievementPageReqVO pageReqVO) {
-        return userAchievementMapper.selectTeacherPage(pageReqVO);
-    }
-
-    @Override
-    public PageResult<UserAchievementDO> getStudentAchievementPage(UserAchievementPageReqVO pageReqVO) {
-        return userAchievementMapper.selectTeacherPage(pageReqVO);
-    }
-
-    @Override
-    public PageResult<UserAchievementDO> getSelfAchievementPage(UserAchievementPageReqVO pageReqVO) {
-        return userAchievementMapper.selectSelfPage(pageReqVO);
-    }
 
 
 

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/userPhotoGroup/UserPhotoGroupService.java

@@ -1,55 +0,0 @@
-package cn.iocoder.yudao.module.system.service.userPhotoGroup;
-
-import java.util.*;
-import javax.validation.*;
-import cn.iocoder.yudao.module.system.controller.admin.userPhotoGroup.vo.*;
-import cn.iocoder.yudao.module.system.dal.dataobject.userPhotoGroup.UserPhotoGroupDO;
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.common.pojo.PageParam;
-
-/**
- * 用户照片组 Service 接口
- *
- * @author 芋道源码
- */
-public interface UserPhotoGroupService {
-
-    /**
-     * 创建用户照片组
-     *
-     * @param createReqVO 创建信息
-     * @return 编号
-     */
-    Long createUserPhotoGroup(@Valid UserPhotoGroupSaveReqVO createReqVO);
-
-    /**
-     * 更新用户照片组
-     *
-     * @param updateReqVO 更新信息
-     */
-    void updateUserPhotoGroup(@Valid UserPhotoGroupSaveReqVO updateReqVO);
-
-    /**
-     * 删除用户照片组
-     *
-     * @param id 编号
-     */
-    void deleteUserPhotoGroup(Long id);
-
-    /**
-     * 获得用户照片组
-     *
-     * @param id 编号
-     * @return 用户照片组
-     */
-    UserPhotoGroupDO getUserPhotoGroup(Long id);
-
-    /**
-     * 获得用户照片组分页
-     *
-     * @param pageReqVO 分页查询
-     * @return 用户照片组分页
-     */
-    PageResult<UserPhotoGroupDO> getUserPhotoGroupPage(UserPhotoGroupPageReqVO pageReqVO);
-
-}

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/userPhotoGroup/UserPhotoGroupServiceImpl.java

@@ -1,74 +0,0 @@
-package cn.iocoder.yudao.module.system.service.userPhotoGroup;
-
-import org.springframework.stereotype.Service;
-import javax.annotation.Resource;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.*;
-import cn.iocoder.yudao.module.system.controller.admin.userPhotoGroup.vo.*;
-import cn.iocoder.yudao.module.system.dal.dataobject.userPhotoGroup.UserPhotoGroupDO;
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.common.pojo.PageParam;
-import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
-
-import cn.iocoder.yudao.module.system.dal.mysql.userPhotoGroup.UserPhotoGroupMapper;
-
-import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.*;
-
-/**
- * 用户照片组 Service 实现类
- *
- * @author 芋道源码
- */
-@Service
-@Validated
-public class UserPhotoGroupServiceImpl implements UserPhotoGroupService {
-
-    @Resource
-    private UserPhotoGroupMapper userPhotoGroupMapper;
-
-    @Override
-    public Long createUserPhotoGroup(UserPhotoGroupSaveReqVO createReqVO) {
-        // 插入
-        UserPhotoGroupDO userPhotoGroup = BeanUtils.toBean(createReqVO, UserPhotoGroupDO.class);
-        userPhotoGroupMapper.insert(userPhotoGroup);
-        // 返回
-        return userPhotoGroup.getId();
-    }
-
-    @Override
-    public void updateUserPhotoGroup(UserPhotoGroupSaveReqVO updateReqVO) {
-        // 校验存在
-        validateUserPhotoGroupExists(updateReqVO.getId());
-        // 更新
-        UserPhotoGroupDO updateObj = BeanUtils.toBean(updateReqVO, UserPhotoGroupDO.class);
-        userPhotoGroupMapper.updateById(updateObj);
-    }
-
-    @Override
-    public void deleteUserPhotoGroup(Long id) {
-        // 校验存在
-        validateUserPhotoGroupExists(id);
-        // 删除
-        userPhotoGroupMapper.deleteById(id);
-    }
-
-    private void validateUserPhotoGroupExists(Long id) {
-        if (userPhotoGroupMapper.selectById(id) == null) {
-            throw exception(USER_PHOTO_GROUP_NOT_EXISTS);
-        }
-    }
-
-    @Override
-    public UserPhotoGroupDO getUserPhotoGroup(Long id) {
-        return userPhotoGroupMapper.selectById(id);
-    }
-
-    @Override
-    public PageResult<UserPhotoGroupDO> getUserPhotoGroupPage(UserPhotoGroupPageReqVO pageReqVO) {
-        return userPhotoGroupMapper.selectPage(pageReqVO);
-    }
-
-}

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/userPhotos/UserPhotosService.java

@@ -1,55 +0,0 @@
-package cn.iocoder.yudao.module.system.service.userPhotos;
-
-import java.util.*;
-import javax.validation.*;
-import cn.iocoder.yudao.module.system.controller.admin.userPhotos.vo.*;
-import cn.iocoder.yudao.module.system.dal.dataobject.userPhotos.UserPhotosDO;
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.common.pojo.PageParam;
-
-/**
- * 用户照片 Service 接口
- *
- * @author 芋道源码
- */
-public interface UserPhotosService {
-
-    /**
-     * 创建用户照片
-     *
-     * @param createReqVO 创建信息
-     * @return 编号
-     */
-    Long createUserPhotos(@Valid UserPhotosSaveReqVO createReqVO);
-
-    /**
-     * 更新用户照片
-     *
-     * @param updateReqVO 更新信息
-     */
-    void updateUserPhotos(@Valid UserPhotosSaveReqVO updateReqVO);
-
-    /**
-     * 删除用户照片
-     *
-     * @param id 编号
-     */
-    void deleteUserPhotos(Long id);
-
-    /**
-     * 获得用户照片
-     *
-     * @param id 编号
-     * @return 用户照片
-     */
-    UserPhotosDO getUserPhotos(Long id);
-
-    /**
-     * 获得用户照片分页
-     *
-     * @param pageReqVO 分页查询
-     * @return 用户照片分页
-     */
-    PageResult<UserPhotosDO> getUserPhotosPage(UserPhotosPageReqVO pageReqVO);
-
-}

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/userPhotos/UserPhotosServiceImpl.java

@@ -1,74 +0,0 @@
-package cn.iocoder.yudao.module.system.service.userPhotos;
-
-import org.springframework.stereotype.Service;
-import javax.annotation.Resource;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.*;
-import cn.iocoder.yudao.module.system.controller.admin.userPhotos.vo.*;
-import cn.iocoder.yudao.module.system.dal.dataobject.userPhotos.UserPhotosDO;
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.common.pojo.PageParam;
-import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
-
-import cn.iocoder.yudao.module.system.dal.mysql.userPhotos.UserPhotosMapper;
-
-import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.*;
-
-/**
- * 用户照片 Service 实现类
- *
- * @author 芋道源码
- */
-@Service
-@Validated
-public class UserPhotosServiceImpl implements UserPhotosService {
-
-    @Resource
-    private UserPhotosMapper userPhotosMapper;
-
-    @Override
-    public Long createUserPhotos(UserPhotosSaveReqVO createReqVO) {
-        // 插入
-        UserPhotosDO userPhotos = BeanUtils.toBean(createReqVO, UserPhotosDO.class);
-        userPhotosMapper.insert(userPhotos);
-        // 返回
-        return userPhotos.getId();
-    }
-
-    @Override
-    public void updateUserPhotos(UserPhotosSaveReqVO updateReqVO) {
-        // 校验存在
-        validateUserPhotosExists(updateReqVO.getId());
-        // 更新
-        UserPhotosDO updateObj = BeanUtils.toBean(updateReqVO, UserPhotosDO.class);
-        userPhotosMapper.updateById(updateObj);
-    }
-
-    @Override
-    public void deleteUserPhotos(Long id) {
-        // 校验存在
-        validateUserPhotosExists(id);
-        // 删除
-        userPhotosMapper.deleteById(id);
-    }
-
-    private void validateUserPhotosExists(Long id) {
-        if (userPhotosMapper.selectById(id) == null) {
-            throw exception(USER_PHOTOS_NOT_EXISTS);
-        }
-    }
-
-    @Override
-    public UserPhotosDO getUserPhotos(Long id) {
-        return userPhotosMapper.selectById(id);
-    }
-
-    @Override
-    public PageResult<UserPhotosDO> getUserPhotosPage(UserPhotosPageReqVO pageReqVO) {
-        return userPhotosMapper.selectPage(pageReqVO);
-    }
-
-}