10.17，部门信息

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

@@ -11,6 +11,7 @@ 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.service.dept.DeptService;
 import cn.iocoder.yudao.module.system.service.user.AdminUserService;
+import cn.iocoder.yudao.module.system.service.userAchievement.UserAchievementService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -34,6 +35,8 @@ public class DeptController {
     private DeptService deptService;
     @Resource
     private AdminUserService adminUserService;
+    @Resource
+    private UserAchievementService userAchievementService;
 
     @PostMapping("create")
     @Operation(summary = "创建部门")
@@ -85,10 +88,10 @@ public class DeptController {
         //新加的负责人用户信息
         AdminUserDO user  =adminUserService.getUser(dept.getLeaderUserId());
         dept.setUser(user);
-        System.out.println(dept);
         return success(BeanUtils.toBean(dept, DeptRespVO.class));
     }
 
+
     @GetMapping("/GetUserDept")
     @Operation(summary = "获得登录人员工作间信息")
     public CommonResult<DeptRespVO> getUserDept() {
@@ -96,8 +99,27 @@ public class DeptController {
         //新加的负责人用户信息
         AdminUserDO user  =adminUserService.getUser(dept.getLeaderUserId());
         dept.setUser(user);
-        System.out.println(dept);
-        return success(BeanUtils.toBean(dept, DeptRespVO.class));
+        DeptRespVO newDept =BeanUtils.toBean(dept, DeptRespVO.class);
+
+        List<AdminUserDO> allUser  =adminUserService.getDeptUser();//获取所有用户
+
+        List<AdminUserDO> student  =null;
+        List<AdminUserDO> supervisor  =null;
+        List<String> userAchievements  =null;
+        for (AdminUserDO ad :allUser){
+            if (ad.getUserType().equals("1") || ad.getUserType().equals("2")){
+                student.add(ad);
+            }
+            else if (ad.getUserType().equals("3")){
+                supervisor.add(ad);
+            }
+            userAchievements.add(userAchievementService.getUserAchievement(Math.toIntExact(ad.getId())).getDetail());
+        }
+        newDept.setSupervisorNum(String.valueOf(supervisor.stream().count()));
+        newDept.setStudentNum(String.valueOf(student.stream().count()));
+        newDept.setUserAchievements(userAchievements);
+        System.out.println(newDept);
+        return success(newDept);
     }
 
 }

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

@@ -5,6 +5,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.time.LocalDateTime;
+import java.util.List;
 
 @Schema(description = "管理后台 - 部门信息 Response VO")
 @Data
@@ -37,6 +38,19 @@ public class DeptRespVO {
     @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED, example = "时间戳格式")
     private LocalDateTime createTime;
 
+    @Schema(description = "工作间地址")
+    private String address;
+
+    @Schema(description = "导师人数")
+    private String supervisorNum;
+
+    @Schema(description = "学生人数")
+    private String studentNum;
+
+    @Schema(description = "成果图片列表")
+    private List<String> userAchievements;
+
+
     @Schema(description = "用户")
     private AdminUserDO user;
 

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

@@ -67,4 +67,9 @@ public class DeptDO extends TenantBaseDO {
     @TableField(exist = false)
     private AdminUserDO user;
 
+    /**
+     * 工作间地址
+     */
+    private String address;
+
 }

yudao-server/src/main/resources/application.yaml

@@ -12,8 +12,8 @@ spring:
   servlet:
     # 文件上传相关配置项
     multipart:
-      max-file-size: 16MB # 单个文件大小
-      max-request-size: 32MB # 设置总上传的文件大小
+      max-file-size: 200MB # 单个文件大小
+      max-request-size: 300MB # 设置总上传的文件大小
 
   # Jackson 配置项
   jackson: