学生干部任命重构sql

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

@@ -223,7 +223,7 @@ public class RoomBedCheckRecordServiceImpl extends MPJBaseServiceImpl<RoomBedChe
             MPJLambdaWrapper<Room> queryRoomByClass = new MPJLambdaWrapper<>();
             queryRoomByClass
                     .selectAs(Room::getId, RoomEchoVo::getRoomId)
-                    .select("CONCAT(t2.name,\"-\" , t3.name, t.room_name) as roomName")
+                    .select("CONCAT(t3.name,\"-\" , t4.name, t.room_name) as roomName")
                     .leftJoin(RoomBed.class, RoomBed::getRoomId, Room::getId)
                     .leftJoin(BaseStudentSchoolRoll.class, BaseStudentSchoolRoll::getUserId, RoomBed::getStudentUserId)
                     .leftJoin(BaseOfficeBuild.class, BaseOfficeBuild::getId, Room::getOfficeBuildId)

src/main/java/com/xjrsoft/module/textbook/service/impl/TextbookStudentClaimServiceImpl.java

@@ -86,6 +86,7 @@ public class TextbookStudentClaimServiceImpl extends MPJBaseServiceImpl<Textbook
         //获取当前学生领取记录的所有学期
         MPJLambdaWrapper<TextbookStudentClaim> qwerySemester = new MPJLambdaWrapper<>();
         qwerySemester
+                .distinct()
                 .disableSubLogicDel()
                 .selectAs(BaseSemester::getName, TextbookStudentSemesterVo::getBaseSemesterIdCN)
                 .select(TextbookStudentClaim.class, x -> VoToColumnUtil.fieldsToColumns(TextbookStudentSemesterVo.class).contains(x.getProperty()))

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

@@ -5,22 +5,25 @@
 <mapper namespace="com.xjrsoft.module.room.mapper.RoomStudentAppointMapper">
     <select id="getPage" parameterType="com.xjrsoft.module.room.dto.RoomStudentAppointPageDto" resultType="com.xjrsoft.module.room.vo.HeadTeaRoomCadreAppointPageVo">
         select
-        t2.room_id as roomId,
-        t3.room_name as roomName,
+        t.id as roomId,
         t4.name as genderCn,
-        t3.is_max as isMax
-        from base_class t
-        left join base_student_school_roll t1 on t1.class_id = t.id
-        inner join room_bed t2 on t2.student_user_id = t1.user_id
-        left join room t3 on t3.id = t2.room_id
-        left join xjr_dictionary_detail t4 on t4.code = t3.gender
-        where t1.delete_mark = 0 and t2.delete_mark = 0 and t.teacher_id = #{dto.teacherId}
+        t.room_name as roomName,
+        t.is_max as isMax
+        from room t
+        left join room_bed t1 on t1.room_id = t.id
+        left join base_student_school_roll t2 on t2.user_id = t1.student_user_id
+        left join base_class t3 on t3.id = t2.class_id
+        left join xjr_dictionary_detail t4 on t4.code = t.gender
+        where t.delete_mark = 0
+        and t1.delete_mark = 0
+        and t2.delete_mark = 0
+        and t3.teacher_id = #{dto.teacherId}
         <if test="dto.gender != null and dto.gender != ''">
             and t3.gender = #{dto.gender}
         </if>
         <if test="dto.roomId != null and dto.roomId > 0">
             and t3.id = #{dto.roomId}
         </if>
-        group by t2.room_id,t4.name
+        group by t.id,t4.name
     </select>
 </mapper>

src/main/resources/mapper/textbook/TextbookStudentClaimMapper.xml

@@ -6,7 +6,7 @@
     <select id="getTextbookClaimList" parameterType="com.xjrsoft.module.textbook.dto.TextbookClaimStudentConfirmDto"
             resultType="com.xjrsoft.module.textbook.vo.TextbookClaimVO">
         SELECT t.id                   AS textbookStudentClaimId,
-        t1.price * t1.discount AS discountPrice,
+        t1.price * t1.discount/10 AS discountPrice,
         t.sort_code as sortCode,
         t.textbook_id as textbookId,
         t.is_claim as isClaim,

src/main/resources/mapper/textbook/WfTextbookClaimMapper.xml

@@ -23,7 +23,7 @@
                  LEFT JOIN textbook_claim_user t6 ON (t6.wf_textbook_claim_id = t.id)
                  LEFT JOIN xjr_user t7 ON (t7.id = t6.user_id)
         WHERE t.delete_mark = 0 and t6.user_id = #{dto.userId}
-        order by t.id;
+        order by t.create_date desc;
     </select>
 
     <select id="infoDistribute" parameterType="java.lang.Long"