bug 修改

src/main/java/com/cjy/back/ybsjAppointment/controller/YbsjyAppointmentRecordController.java

@@ -164,8 +164,8 @@ public class YbsjyAppointmentRecordController {
      * @return
      */
     @RequestMapping("/getTimeInfo")
-    public ServerResponse getTimeInfo(Integer timeInfoId) {
-        return ServerResponse.createBySuccess(ybsjyAppointmentRecordService.getTimeInfo(timeInfoId));
+    public ServerResponse getTimeInfo(Integer timeInfoId,String unavailableDate) {
+        return ServerResponse.createBySuccess(ybsjyAppointmentRecordService.getTimeInfo(timeInfoId,unavailableDate));
     }
 
     /**

src/main/java/com/cjy/back/ybsjAppointment/dao/YbsjyAppointmentRecordMapper.java

@@ -197,7 +197,7 @@ public interface YbsjyAppointmentRecordMapper {
     int updatePeopleWriteOff(WriteOffVo writeOffVo);
 
     //查询预约设置时间段
-    List<Map<String, Object>> getTimeInfo(@Param("timeInfoId") Integer timeInfoId);
+    List<Map<String, Object>> getTimeInfo(@Param("timeInfoId") Integer timeInfoId,@Param("unavailableDate") String unavailableDate);
 
     //预约统计-预约总数和核销总数
     List<Map<String, Object>> selectStatistics(@Param("getAppointmentRecordVO") GetAppointmentRecordVO getAppointmentRecordVO);

src/main/java/com/cjy/back/ybsjAppointment/dao/YbsjyAppointmentRecordMapper.xml

@@ -422,8 +422,10 @@
                 LEFT JOIN ybsj_appointment_setting b ON a.appointment_settings_id = b.id
         WHERE
                 a.appointment_settings_id = ( SELECT appointment_settings_id FROM ybsj_appointment_time_info c WHERE c.id = #{timeInfoId} )
+       and a.del_flag = 0
+        and FIND_IN_SET (WEEKDAY(#{unavailableDate})+1,a.use_date)
+       and a.unavailable_date != #{unavailableDate}
     </select>
-
     <select id="selectStatistics" resultType="map">
         SELECT
         visitingPlace,

src/main/java/com/cjy/back/ybsjAppointment/service/YbsjyAppointmentRecordService.java

@@ -119,7 +119,7 @@ public interface YbsjyAppointmentRecordService {
     int updateWriteOff(WriteOffVo writeOffVo);
 
     //查询预约时间段
-    List<Map<String, Object>> getTimeInfo(Integer timeInfoId);
+    List<Map<String, Object>> getTimeInfo(Integer timeInfoId,String unavailableDate);
 
     //预约统计
     List<Map<String, Object>> selectStatistics(GetAppointmentRecordVO getAppointmentRecordVO);

src/main/java/com/cjy/back/ybsjAppointment/service/impl/YbsjyAppointmentRecordImpl.java

@@ -468,8 +468,8 @@ public class YbsjyAppointmentRecordImpl implements YbsjyAppointmentRecordService
     }
 
     //查询预约设置时间段
-    public List<Map<String, Object>> getTimeInfo(Integer timeInfoId) {
-        return ybsjyAppointmentRecordMapper.getTimeInfo(timeInfoId);
+    public List<Map<String, Object>> getTimeInfo(Integer timeInfoId,String unavailableDate) {
+        return ybsjyAppointmentRecordMapper.getTimeInfo(timeInfoId,unavailableDate);
     }
 
     @Override

src/main/java/com/cjy/back/ybsjHandset/dao/YbsjHandsetMapper.xml

@@ -6,63 +6,51 @@
 
     <select id="getPeopleCounting" resultType="int">
         SELECT
-            IFNULL(subquery1.count_result + subquery2.sum_result,0)
-        FROM
-            (
-                SELECT
-                    COUNT(nmd.id) AS count_result
-                FROM
-                    ybsj_appointment_documents_info cm
-                        LEFT JOIN ybsj_appointment_people_info nmd ON cm.id = nmd.appointment_documents_id
-                WHERE
-                    cm.appointment_type_id IN (5701, 5702)
-                  AND cm.appointment_date = CURDATE()
-                  AND cm.scenic_id = #{scenicId}
-                  AND nmd.write_off IN (0, 1)
-                  AND cm.del_flag = 0
-            ) AS subquery1,
-            (
-                SELECT
-                    SUM(cm.appointment_count) AS sum_result
-                FROM
-                    ybsj_appointment_documents_info cm
-                WHERE
-                    cm.appointment_type_id = 5703
-                  AND cm.appointment_date = CURDATE()
-                  AND cm.scenic_id = #{scenicId}
-                  AND cm.appointment_documents_write_off IN (0, 1)
-                  AND cm.del_flag = 0
-            ) AS subquery2;
+                COALESCE(
+                        (SELECT COUNT(nmd.id)
+                         FROM ybsj_appointment_documents_info cm
+                                  LEFT JOIN ybsj_appointment_people_info nmd ON cm.id = nmd.appointment_documents_id
+                         WHERE cm.appointment_type_id IN (5701, 5702)
+                           AND cm.appointment_date = CURDATE()
+                           AND cm.scenic_id = #{scenicId}
+                           AND nmd.write_off IN (0, 1)
+                           AND cm.del_flag = 0),
+                        0
+                    ) +
+                COALESCE(
+                        (SELECT SUM(cm.appointment_count)
+                         FROM ybsj_appointment_documents_info cm
+                         WHERE cm.appointment_type_id = 5703
+                           AND cm.appointment_date = CURDATE()
+                           AND cm.scenic_id = #{scenicId}
+                           AND cm.appointment_documents_write_off IN (0, 1)
+                           AND cm.del_flag = 0),
+                        0
+                    )
     </select>
     <select id="getPeopleCountingTwo" resultType="int">
         SELECT
-           IFNULL(subquery1.count_result + subquery2.sum_result,0)
-        FROM
-            (
-                SELECT
-                    COUNT(nmd.id) AS count_result
-                FROM
-                    ybsj_appointment_documents_info cm
-                        LEFT JOIN ybsj_appointment_people_info nmd ON cm.id = nmd.appointment_documents_id
-                WHERE
-                    cm.appointment_type_id IN (5701, 5702)
-                  AND cm.appointment_date = CURDATE()
-                  AND cm.scenic_id = #{scenicId}
-                  AND nmd.write_off IN (1)
-                  AND cm.del_flag = 0
-            ) AS subquery1,
-            (
-                SELECT
-                    SUM(cm.appointment_count) AS sum_result
-                FROM
-                    ybsj_appointment_documents_info cm
-                WHERE
-                    cm.appointment_type_id = 5703
-                  AND cm.appointment_date = CURDATE()
-                  AND cm.scenic_id = #{scenicId}
-                  AND cm.appointment_documents_write_off IN (1)
-                  AND cm.del_flag = 0
-            ) AS subquery2;
+                COALESCE(
+                        (SELECT COUNT(nmd.id)
+                         FROM ybsj_appointment_documents_info cm
+                                  LEFT JOIN ybsj_appointment_people_info nmd ON cm.id = nmd.appointment_documents_id
+                         WHERE cm.appointment_type_id IN (5701, 5702)
+                           AND cm.appointment_date = CURDATE()
+                           AND cm.scenic_id = #{scenicId}
+                           AND nmd.write_off =1
+                           AND cm.del_flag = 0),
+                        0
+                    ) +
+                COALESCE(
+                        (SELECT SUM(cm.appointment_count)
+                         FROM ybsj_appointment_documents_info cm
+                         WHERE cm.appointment_type_id = 5703
+                           AND cm.appointment_date = CURDATE()
+                           AND cm.scenic_id = #{scenicId}
+                           AND cm.appointment_documents_write_off =1
+                           AND cm.del_flag = 0),
+                        0
+                    )
     </select>
     <select id="getHaveTicketsCheckedPage" parameterType="map" resultType="map">
         SELECT