床位详情

src/main/java/com/template/api/WelcomeBedControllerAPI.java

@@ -56,7 +56,7 @@ public interface WelcomeBedControllerAPI {
 
     @GetMapping(value = "/bedDetails")
     @ApiOperation(value = "宿舍详情", notes = "宿舍详情", httpMethod = "GET")
-    CommonResult bedDetails(Integer schoolId,Integer buildId,Integer dormitoryId,String studentCard);
+    CommonResult bedDetails(@RequestAttribute String studentCard);
 
     @GetMapping(value = "/queryBedDatas")
     @ApiOperation(value = "获取床位下拉数据", notes = "获取床位下拉数据", httpMethod = "GET")

src/main/java/com/template/controller/WelcomeBedController.java

@@ -32,6 +32,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.StringUtils;
 import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.RequestAttribute;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.web.bind.annotation.RestController;
@@ -813,11 +814,40 @@ public class WelcomeBedController implements WelcomeBedControllerAPI {
     }
 
     @Override
-    public CommonResult bedDetails(Integer schoolId, Integer buildId, Integer dormitoryId, String studentCard) {
+    public CommonResult bedDetails(String studentCard) {
+        List<BedDetailsVo> result = new ArrayList<>();
+        WelcomeStudent student = welcomeStudentService.getDataByIdcard(studentCard);
+        if(student == null){
+            return CommonResult.fail("当前学生信息已失效，查看失败");
+        }
         //        获取未入住的床位
-        List<BedDetailsVo> beds = welcomeBedService.getBedList(schoolId, buildId, dormitoryId, studentCard);
+        List<BedInfosVo> beds = welcomeBedService.queryBedList(studentCard);
+
+        for (BedInfosVo bed:beds) {
+            BedDetailsVo data = new BedDetailsVo();
+            if(bed.getStudentCard() != null && bed.getStudentCard().equals(studentCard)){
+                data.setPicture(student.getPicture());
+                data.setCardNum(student.getAdmissNum());
+                data.setName(student.getName());
+                data.setSex(student.getSex());
+                data.setNationality(student.getNationality());
+                data.setCollege(student.getCollege());
+                data.setMajor(student.getMajor());
+                data.setClassstr(student.getClassstr());
+                data.setBatchValue(student.getBatchValue());
+                data.setExamNum(student.getExamNum());
+                data.setStudentCard(student.getCardId());
+                data.setAddress(student.getAddress());
+                data.setPhone(student.getPhone());
+            }
+            data.setBuild(bed.getBuild());
+            data.setDormitory(bed.getDormitory());
+            data.setNumber(bed.getNumber());
+            data.setIsCheck(bed.getIsCheck());
+            result.add(data);
+        }
 
-        return CommonResult.ok(beds);
+        return CommonResult.ok(result);
 
     }
 

src/main/java/com/template/mapper/WelcomeBedMapper.java

@@ -2,10 +2,7 @@ package com.template.mapper;
 
 import com.template.model.pojo.WelcomeBed;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.template.model.vo.BedDetailsVo;
-import com.template.model.vo.BedSqlTotalVo;
-import com.template.model.vo.SleepSqlTotalVo;
-import com.template.model.vo.WelcomeBedCheckVo;
+import com.template.model.vo.*;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
@@ -33,4 +30,6 @@ public interface WelcomeBedMapper extends BaseMapper<WelcomeBed> {
     List<SleepSqlTotalVo> queryTotalSqlList(@Param("collegeId") Integer collegeId,@Param("sex") String sex);
 
     void updateData(@Param("bedId") Integer bedId);
+
+    List<BedInfosVo> queryBedList(@Param("studentCard") String studentCard);
 }

src/main/java/com/template/model/pojo/WelcomeStudent.java

@@ -11,6 +11,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import java.io.Serializable;
 import java.util.List;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.template.model.vo.AccompanyVo;
 import com.template.model.vo.ArriveTimeVo;
 import com.template.model.vo.FamilyVo;
@@ -155,6 +156,7 @@ public class WelcomeStudent implements Serializable {
     private String arrive;
 
     @ApiModelProperty(value = "到站日期")
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     private Date arrvieDate;
 
     @ApiModelProperty(value = "到站时间")

src/main/java/com/template/model/vo/BedDetailsVo.java

@@ -24,36 +24,18 @@ public class BedDetailsVo {
     @ApiModelProperty(value = "所属学院")
     private String college;
 
-//    @ApiModelProperty(value = "所属学院ID")
-//    private Integer collegeId;
-//
-//    @ApiModelProperty(value = "所属专业ID")
-//    private Integer majorId;
-
     @ApiModelProperty(value = "专业")
     private String major;
 
     @ApiModelProperty(value = "所属班级")
     private String classstr;
 
-//    @ApiModelProperty(value = "所属班级ID")
-//    private Integer classstrId;
-
     @ApiModelProperty(value = "批次(年级)")
     private String batchValue;
 
-//    @ApiModelProperty(value = "楼栋ID")
-//    private Integer buildId;
-
-    @ApiModelProperty(value = "楼栋名称")
-    private String build;
-
     @ApiModelProperty(value = "考生号")
     private String examNum;
 
-    @ApiModelProperty(value = "寝室号")
-    private String dormitory;
-
     @ApiModelProperty(value = "学生身份证号")
     private String studentCard;
 
@@ -63,6 +45,12 @@ public class BedDetailsVo {
     @ApiModelProperty(value = "手机号码")
     private String phone;
 
+    @ApiModelProperty(value = "楼栋名称")
+    private String build;
+
+    @ApiModelProperty(value = "寝室号")
+    private String dormitory;
+
     @ApiModelProperty(value = "床位号")
     private Integer number;
 

src/main/java/com/template/model/vo/BedInfosVo.java

@@ -0,0 +1,29 @@
+package com.template.model.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author: xwt
+ * @Date: 2025/6/16 星期一 11:28
+ * @Description: com.template.model.vo
+ * @Version: 1.0
+ */
+@Data
+public class BedInfosVo {
+    @ApiModelProperty(value = "数据ID")
+    private Integer id;
+    private Integer isCheck;
+    @ApiModelProperty(value = "身份证号")
+    private String studentCard;
+    @ApiModelProperty(value = "床位号")
+    private Integer number;
+    @ApiModelProperty(value = "楼栋")
+    private String build;
+    @ApiModelProperty(value = "楼栋ID")
+    private Integer build_id;
+    @ApiModelProperty(value = "寝室")
+    private String dormitory;
+    @ApiModelProperty(value = "寝室ID")
+    private Integer dormitory_id;
+}

src/main/java/com/template/services/WelcomeBedService.java

@@ -4,10 +4,7 @@ import com.template.model.pojo.WelcomeBed;
 import com.template.model.pojo.WelcomeBed;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.template.model.result.PageUtils;
-import com.template.model.vo.BedDetailsVo;
-import com.template.model.vo.BedSqlTotalVo;
-import com.template.model.vo.SleepSqlTotalVo;
-import com.template.model.vo.WelcomeBedCheckVo;
+import com.template.model.vo.*;
 
 import java.util.List;
 
@@ -88,4 +85,6 @@ public interface WelcomeBedService extends IService<WelcomeBed> {
     PageUtils<WelcomeBed> studentAccommodationPageS(int currentPage, int pageCount, Integer schoolId, Integer buildId, Integer dormitoryId, List<String> collegeIds , Integer majorId, Integer classstrId, String name);
 
     List<WelcomeBed> studentAccommodationListS(Integer schoolId, Integer buildId, Integer dormitoryId, List<String> collegeIds, Integer majorId, Integer classstrId, String name);
+
+    List<BedInfosVo> queryBedList(String studentCard);
 }

src/main/java/com/template/services/impl/WelcomeBedServiceImpl.java

@@ -9,10 +9,7 @@ import com.template.model.pojo.WelcomeBed;
 import com.template.model.pojo.WelcomeBed;
 import com.template.mapper.WelcomeBedMapper;
 import com.template.model.result.PageUtils;
-import com.template.model.vo.BedDetailsVo;
-import com.template.model.vo.BedSqlTotalVo;
-import com.template.model.vo.SleepSqlTotalVo;
-import com.template.model.vo.WelcomeBedCheckVo;
+import com.template.model.vo.*;
 import com.template.services.WelcomeBedService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -444,4 +441,11 @@ public class WelcomeBedServiceImpl extends ServiceImpl<WelcomeBedMapper, Welcome
         List<WelcomeBed> result = welcomeBedMapper.selectList(queryWrapper);
         return result;
     }
+
+    @Override
+    public List<BedInfosVo> queryBedList(String studentCard){
+        List<BedInfosVo> result = welcomeBedMapper.queryBedList(studentCard);
+        return result;
+    }
+
 }

src/main/resources/mapper/template/WelcomeBedMapper.xml

@@ -16,6 +16,15 @@
             id = #{bedId}
     </update>
 
+    <select id="queryBedList" resultType="com.template.model.vo.BedInfosVo">
+        select id,student_card,is_check,number,build,build_id,dormitory_id,dormitory from welcome_bed
+        where dormitory_id in (
+        SELECT dormitory_id FROM `welcome_bed`
+        where student_card = #{studentCard} and deleted = 0)
+        and deleted = 0
+        order by number
+    </select>
+
     <select id="getBedList" resultType="com.template.model.vo.BedDetailsVo">
         SELECT
             number,
@@ -102,7 +111,8 @@
     </resultMap>
 
     <select id="queryBedSqlList" resultType="com.template.model.vo.BedSqlTotalVo" resultMap="queryBedSqlMap">
+        -- select (select sum(1) as total from welcome_student where deleted = 0 and college = wb.college and iden_type
+        = 1 and sex = wb.sex) as totalData,
         select 0 as totalData,
         SUM(1) as totalBed,college,sex,build,dormitory
         from welcome_bed wb
@@ -127,8 +137,10 @@
 
     <select id="queryTotalSqlList" resultType="com.template.model.vo.SleepSqlTotalVo" resultMap="queryTotalSqlMap">
         select SUM(1) as totalBed,
-        (select SUM(1) as total from welcome_bed where deleted = 0 and `name` is not null and name != '' and college = wb.college and sex = wb.sex) as sleeper,
+        (select SUM(1) as total from welcome_bed where deleted = 0 and `name` is not null and name != '' and college =
+        wb.college and sex = wb.sex) as sleeper,
+        -- (select sum(1) as total from welcome_student where deleted = 0 and college = wb.college and iden_type = 1 and
+        sex = wb.sex) as totalData,wb.college,wb.sex from welcome_bed wb
         0 as totalData,wb.college,wb.sex from welcome_bed wb
         where wb.deleted = 0 and wb.college is not null
         <if test="collegeId != null and collegeId != ''">