基本完成

jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/contoller/CeesGroupController.java

@@ -13,6 +13,7 @@ import org.jeecg.common.system.base.controller.JeecgController;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.modules.entity.CeesGroup;
 import org.jeecg.modules.entity.dto.UpdateGroupUserDto;
+import org.jeecg.modules.entity.vo.CeesUserGroupVo;
 import org.jeecg.modules.service.ICeesGroupService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -58,14 +59,14 @@ public class CeesGroupController extends JeecgController<CeesGroup, ICeesGroupSe
     }
 
     /**
-     * 根据id查询当前分组的组员
+     * 根据分组id查询当前分组的组员
      *
      * @param id
      * @return
      */
     @GetMapping(value = "/getRowUser")
-    public Result<?> getRowUser(@RequestParam(name = "id") String id) {
+    public Result<?> getRowUser(@RequestParam(name = "groupId") String id) {
-        ArrayList<String> list = ceesGroupService.getRowUser(id);
+        ArrayList<CeesUserGroupVo> list = ceesGroupService.getRowUser(id);
         return Result.ok(list);
     }
 

jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/contoller/h5/h5WaiTeacherController.java

@@ -3,10 +3,7 @@ package org.jeecg.modules.contoller.h5;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.modules.entity.CeesWaiTeacher;
 import org.jeecg.modules.service.ICeesWaiTeacherService;
-import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
 
@@ -20,4 +17,8 @@ public class h5WaiTeacherController {
     public Result<?> save(@RequestBody CeesWaiTeacher ceesWaiTeacher) {
         return ceesWaiTeacherService.h5Save(ceesWaiTeacher);
     }
+    @GetMapping("/getDormitoryName")
+    public Result<?> getDormitoryName(@RequestParam String dormitoryId) {
+        return ceesWaiTeacherService.getDormitoryName(dormitoryId);
+    }
 }

jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/entity/CeesWaiTeacher.java

@@ -112,8 +112,8 @@ public class CeesWaiTeacher implements Serializable {
     private String carNumber;
 	/**性别*/
 	@Excel(name = "性别", width = 15)
-    @ApiModelProperty(value = "性别")
+    @ApiModelProperty(value = "性别 0男/1女")
-    private String sex;
+    private Integer sex;
 	/**年龄*/
 	@Excel(name = "年龄", width = 15)
     @ApiModelProperty(value = "年龄")

jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/entity/vo/CeesUserGroupVo.java

@@ -0,0 +1,9 @@
+package org.jeecg.modules.entity.vo;
+
+import lombok.Data;
+
+@Data
+public class CeesUserGroupVo {
+    private String userId;
+    private String userName;
+}

jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/mapper/CeesGroupMapper.java

@@ -3,6 +3,7 @@ package org.jeecg.modules.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.jeecg.modules.entity.CeesGroup;
 import org.jeecg.modules.entity.dto.UpdateGroupUserDto;
+import org.jeecg.modules.entity.vo.CeesUserGroupVo;
 
 import java.util.ArrayList;
 
@@ -14,7 +15,7 @@ import java.util.ArrayList;
  */
 public interface CeesGroupMapper extends BaseMapper<CeesGroup> {
 
-    ArrayList<String> getGroupUser(String id);
+    ArrayList<CeesUserGroupVo> getGroupUser(String groupId);
 
     void updateGroupUser(UpdateGroupUserDto updateGroupUserDto);
 }

jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/mapper/xml/CeesGroupMapper.xml

@@ -7,7 +7,7 @@
         UPDATE  group_id = #{groupId};
     </update>
 
-    <select id="getGroupUser" resultType="java.lang.String">
+    <select id="getGroupUser" resultType="org.jeecg.modules.entity.vo.CeesUserGroupVo">
-        select user_id from cees_user_group where group_id = #{groupId}
+        select g.user_id as userId, u.user_name as userName from cees_user_group g JOIN cees_user u ON g.user_id = u.user_id WHERE g.group_id = #{groupId}
     </select>
 </mapper>

jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/ICeesGroupService.java

@@ -4,6 +4,7 @@ package org.jeecg.modules.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.jeecg.modules.entity.CeesGroup;
 import org.jeecg.modules.entity.dto.UpdateGroupUserDto;
+import org.jeecg.modules.entity.vo.CeesUserGroupVo;
 
 import java.util.ArrayList;
 
@@ -17,7 +18,7 @@ public interface ICeesGroupService extends IService<CeesGroup> {
     //TODO 查分组中间表的所有组员
     //TODO 添加分组，要分别修改信息表和分组中间表
 
-    ArrayList<String> getRowUser(String id);
+    ArrayList<CeesUserGroupVo> getRowUser(String id);
 
     void updateGroupUser(UpdateGroupUserDto updateGroupUserDto);
 }

jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/ICeesWaiTeacherService.java

@@ -29,4 +29,6 @@ public interface ICeesWaiTeacherService extends IService<CeesWaiTeacher> {
     Result<?> confirmCheckIn(String id);
 
     Result<?> h5Save(CeesWaiTeacher ceesWaiTeacher);
+
+    Result<?> getDormitoryName(String dormitoryId);
 }

jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/impl/CeesGroupServiceImpl.java

@@ -3,6 +3,7 @@ package org.jeecg.modules.service.impl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.jeecg.modules.entity.CeesGroup;
 import org.jeecg.modules.entity.dto.UpdateGroupUserDto;
+import org.jeecg.modules.entity.vo.CeesUserGroupVo;
 import org.jeecg.modules.mapper.CeesGroupMapper;
 import org.jeecg.modules.service.ICeesGroupService;
 import org.springframework.stereotype.Service;
@@ -23,13 +24,13 @@ public class CeesGroupServiceImpl extends ServiceImpl<CeesGroupMapper, CeesGroup
     private CeesGroupMapper ceesGroupMapper;
 
     /**
-     * @param id
+     * @param groupId
      * @return {@link ArrayList }<{@link String }>
      */
     @Override
-    public ArrayList<String> getRowUser(String id) {
+    public ArrayList<CeesUserGroupVo> getRowUser(String groupId) {
-        ArrayList<String> list;
+        ArrayList<CeesUserGroupVo> list;
-        list = ceesGroupMapper.getGroupUser(id);
+        list = ceesGroupMapper.getGroupUser(groupId);
         return list;
     }
 

jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/impl/CeesWaiTeacherServiceImpl.java

@@ -150,4 +150,13 @@ public class CeesWaiTeacherServiceImpl extends ServiceImpl<CeesWaiTeacherMapper,
         jsonObject.put("router", "/mainPage");
         return Result.ok(jsonObject);
     }
+
+    /**
+     * @param dormitoryId
+     * @return
+     */
+    @Override
+    public Result<?> getDormitoryName(String dormitoryId) {
+        return Result.ok(ceesDormitoryInfoMapper.selectById(dormitoryId).getDormitory());
+    }
 }

jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml

@@ -1,5 +1,5 @@
 server:
-  port: 8091
+  port: 10001
   tomcat:
     max-swallow-size: -1
   error: