1、床位调整查询调整

2、数据面板查询调整

src/main/java/com/xjrsoft/module/databoard/controller/DataboardController.java

@@ -162,7 +162,7 @@ public class DataboardController {
         DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
         String sql = "SELECT t1.* FROM wf_course_adjust t1" +
                 " INNER JOIN xjr_workflow_form_relation t2 ON t2.form_key_value = t1.id" +
-                " WHERE t1.adjust_type = 'course_substitute'" +
+                " WHERE t1.adjust_type = 'course_exchange'" +
                 " AND t2.current_state = 'COMPLETED'";
         if(dto.getStartDate() != null && dto.getEndDate() != null){
             sql += " AND t1.adjust_date between '" + dto.getStartDate().format(formatter) + "' and '" + dto.getEndDate().format(formatter) + "'";
@@ -173,7 +173,7 @@ public class DataboardController {
 
         sql = "SELECT t1.* FROM wf_course_adjust t1" +
             " INNER JOIN xjr_workflow_form_relation t2 ON t2.form_key_value = t1.id" +
-            " WHERE t1.adjust_type = 'course_exchange'" +
+            " WHERE t1.adjust_type = 'course_substitute'" +
             " AND t2.current_state = 'COMPLETED'";
         if(dto.getStartDate() != null && dto.getEndDate() != null){
             sql += " AND t1.adjust_date between '" + dto.getStartDate().format(formatter) + "' and '" + dto.getEndDate().format(formatter) + "'";

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

@@ -287,7 +287,7 @@
     <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,'SB10001','男'),'SB10002','女') AS gender_cn,t7.name AS build_name,t6.room_name,t5.bed_number
-        ,(SELECT (SUM(factrecarmny) >= SUM(factar)) FROM pb_v_xsxxsfytb WHERE Studentcode = t2.credential_number) AS pay_status
+        ,ifnull((SELECT (SUM(factrecarmny) >= SUM(factar)) FROM pb_v_xsxxsfytb WHERE Studentcode = t2.credential_number), 0) AS pay_status
         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