美甲师排班

src/main/java/com/gogirl/application/store/store/impl/StoreClassesTechnicianServiceImpl.java

@@ -51,7 +51,7 @@ public class StoreClassesTechnicianServiceImpl extends ServiceImpl<StoreClassesT
 
     @Override
     public List<StoreClassesTechnician> listClassesTechnicianDetail(Integer userId, String days) {
-        return storeClassesTechnicianMapper.listClassesTechnicianDetail(userId, days);
+        return storeClassesTechnicianMapper.listClassesTechnicianDetail(userId, days, SessionUtils.getTechnicianToken().getDepartmentId());
     }
 
     @Override

src/main/java/com/gogirl/infrastructure/mapper/store/store/StoreClassesTechnicianMapper.java

@@ -25,7 +25,7 @@ public interface StoreClassesTechnicianMapper extends BaseMapper<StoreClassesTec
 
     List<StoreClassesTechnician> listClassTimeByStartDate(@Param("startDate") String startDate, @Param("startTime") String startTime, @Param("departmentId") Integer departmentId);
 
-    List<StoreClassesTechnician> listClassesTechnicianDetail(@Param("userId") Integer userId, @Param("days") String days);
+    List<StoreClassesTechnician> listClassesTechnicianDetail(@Param("userId") Integer userId, @Param("days") String days, @Param("departmentId") Integer departmentId);
 
     List<StoreClassesTechnician> listClassesTechnicianDetailByDays(@Param("userId") Integer userId, @Param("days") String days);
 

src/main/java/com/gogirl/infrastructure/schedule/Schedule.java

@@ -304,7 +304,6 @@ public class Schedule {
         orderServeMapper.syncOrderServeTimes();
     }
 
-
     @Scheduled(cron = "0 0/1 * * * *")
     public void weekTest() {
         log.debug("同步闲时折扣周");

src/main/resources/application.yml

 spring:
   profiles:
-    active: pre
+    active: prod
   servlet:
     #文件上传最大容量
     multipart:

src/main/resources/mapper/store/StoreClassesTechnicianMapper.xml

@@ -80,14 +80,17 @@
     </sql>
 
     <select id="listClassesTechnicianDetail" resultMap="classesTechnicianMap">
-        select
-        <include refid="storeClassesTechnicianSql"/>
-        from
-        store_classes_technician ct
-        where
-        user_id = #{userId}
-        and
-        date_format(days, '%Y-%m') = #{days}
+        SELECT *
+        FROM (
+                 SELECT ct.*
+                 FROM store_classes_technician ct
+                          LEFT JOIN store_classes sc ON ct.classes = sc.id
+                 WHERE ct.user_id = #{userId}
+                   AND date_format(ct.days, '%Y-%m') = #{days}
+                   and (sc.department_id = #{departmentId} or sc.department_id is null)
+                 ORDER BY ct.days, ct.classes DESC
+             ) t
+        GROUP BY days
     </select>
 
     <select id="listClassesTechnicianDetailByDays"