调整性别数据

src/main/java/com/xjrsoft/module/room/service/impl/RoomBedServiceImpl.java

@@ -433,12 +433,12 @@ public class RoomBedServiceImpl extends MPJBaseServiceImpl<RoomBedMapper, RoomBe
     public Boolean adjustBed(AdjustStudentBedDto dto) {
         //查询学生的性别
         XjrUser xjrUser = xjrUserMapper.selectById(dto.getStudentUserId());
-        String studentGender = null;
-        if(1 == xjrUser.getGender()){
-            studentGender = "SB10001";
-        }else if(2 == xjrUser.getGender()){
-            studentGender = "SB10002";
-        }
+        String studentGender = xjrUser.getGender();
+//        if(1 == xjrUser.getGender()){
+//            studentGender = "SB10001";
+//        }else if(2 == xjrUser.getGender()){
+//            studentGender = "SB10002";
+//        }
         RoomBed roomBedInfo = roomBedMapper.selectById(dto.getBedId());
         Room room = roomMapper.selectById(roomBedInfo.getRoomId());
         if(room == null){

src/main/java/com/xjrsoft/module/teacher/entity/XjrUser.java

@@ -63,7 +63,7 @@ public class XjrUser implements Serializable {
     * 性别
     */
     @ApiModelProperty("性别")
-    private Integer gender;
+    private String gender;
     /**
     * 手机号
     */

src/main/resources/mapper/room/RoomBedMapper.xml

@@ -295,7 +295,7 @@
     </select>
 
     <select id="getClassStudetBed" parameterType="com.xjrsoft.module.room.dto.AdjustClassPageDto" resultType="com.xjrsoft.module.room.vo.AdjustBedClassStudentPageVo">
-        SELECT t1.user_id,t4.id AS class_id, t4.name AS class_name,t2.name AS student_name,REPLACE(REPLACE(t2.gender,1,'男'),2,'女') AS gender_cn,t7.name AS build_name,t6.room_name,t5.bed_number FROM base_student t1
+        SELECT t1.user_id,t4.id AS class_id, t4.name AS class_name,t2.name AS student_name,REPLACE(REPLACE(t2.gender,'SB10001','男'),'SB10002','女') AS gender_cn,t7.name AS build_name,t6.room_name,t5.bed_number FROM base_student t1
         LEFT JOIN xjr_user t2 ON t1.user_id = t2.id
         LEFT JOIN base_student_school_roll t3 ON t1.user_id = t3.user_id
         LEFT JOIN base_class t4 ON t3.class_id = t4.id
@@ -371,7 +371,7 @@
     </select>
 
     <select id="getNoBedStudent" parameterType="com.xjrsoft.module.room.dto.AdjustBedPageDto" resultType="com.xjrsoft.module.room.vo.NoBedStudentPageVo">
-        SELECT t1.user_id, t2.name AS student_name,REPLACE(REPLACE(t2.gender,1,'男'),2,'女') as gender_cn,t4.name AS class_name FROM base_student t1
+        SELECT t1.user_id, t2.name AS student_name,REPLACE(REPLACE(t2.gender,'SB10001','男'),'SB10002','女') as gender_cn,t4.name AS class_name FROM base_student t1
         INNER JOIN xjr_user t2 ON t1.user_id = t2.id
         LEFT JOIN base_student_school_roll t3 ON t1.user_id = t3.user_id
         LEFT JOIN base_class t4 ON t3.class_id = t4.id

src/main/resources/mapper/teacher/AttendancePersonnelMapper.xml

@@ -10,7 +10,7 @@
         t1.id as userId,
         t1.name as userName,
         t1.user_name as jobNumber,
-        REPLACE(REPLACE(t1.gender,1,'男'),2,'女') AS gender,
+        REPLACE(REPLACE(t1.gender,'SB10001','男'),'SB10002','女') AS gender,
         t1.mobile as mobile,
         t5.name as deptName,
         t4.name as postName
@@ -24,7 +24,7 @@
         <if test="dto.keyword != null and dto.keyword != ''">
             and (
             t1.name LIKE CONCAT('%',#{dto.keyword},'%')
-            OR t1.gender LIKE CONCAT('%',REPLACE(REPLACE(#{dto.keyword},'男',1),'女',2),'%')
+            OR t1.gender LIKE CONCAT('%',REPLACE(REPLACE(#{dto.keyword},'男','SB10001'),'女','SB10002'),'%')
             OR t1.mobile LIKE CONCAT('%',#{dto.keyword},'%')
             OR t1.user_name LIKE CONCAT('%',#{dto.keyword},'%')
             OR t4.name LIKE CONCAT('%',#{dto.keyword},'%')
@@ -39,7 +39,7 @@
         select
             t.id as userId,
             t.name as userName,
-            REPLACE(REPLACE(t.gender,1,'男'),2,'女') AS gender,
+            REPLACE(REPLACE(t.gender,'SB10001','男'),'SB10002','女') AS gender,
             t.mobile as mobile,
             t.user_name as jobNumber,
             t3.name as deptName,
@@ -63,7 +63,7 @@
             <if test="dto.keyword != null and dto.keyword != ''">
                 and (
                 t.name LIKE CONCAT('%',#{dto.keyword},'%')
-                OR t.gender LIKE CONCAT('%',REPLACE(REPLACE(#{dto.keyword},'男',1),'女',2),'%')
+                OR t.gender LIKE CONCAT('%',REPLACE(REPLACE(#{dto.keyword},'男','SB10001'),'女','SB10002'),'%')
                 OR t.mobile LIKE CONCAT('%',#{dto.keyword},'%')
                 OR t.user_name LIKE CONCAT('%',#{dto.keyword},'%')
                 OR t3.name LIKE CONCAT('%',#{dto.keyword},'%')