宿舍费用确认待办和宿舍费用数据展示修改

dms-dormitory/src/main/resources/mapper/dormitory/DmsNewRecordMapper.xml

@@ -37,6 +37,7 @@
             where a2.apply_status != 1
             ) as t1
             <where>
+                t1.apply_status = 1 or t1.apply_status = 2 or t1.apply_status = 3
                 <if test="stuNo != null  and stuNo != ''">and t1.stu_no = #{stuNo}</if>
                 <if test="roomId != null ">and t1.room_id = #{roomId}</if>
                 <if test="startDate != null ">and t1.start_date = #{startDate}</if>

srs-comprehensive/src/main/resources/mapper/comprehensive/CphGoodApplyMapper.xml

@@ -772,9 +772,10 @@
         -- 邵政文-(宿舍管理-住宿费用-辅导员确认待办)
         union
         select concat('zsfy-',count(a.id)) as `all`
-        from dms_new_record as a
-        left join view_dms_record as d on a.stu_no = d.stu_no
-        where  d.employee_id = #{tNo} and a.apply_status = 6 and a.apply_status = 1
+        from view_dms_record as a
+        left join dms_new_record as b on a.stu_year_id = b.id
+        left join view_stu_info as d on a.stu_no = d.stu_no
+        where d.t_no = #{tNo} and a.apply_status = 1
     </select>