1.维修反馈：新增功能：人员选择时班次下拉内容根据BU查询

src/main/java/com/xujie/sys/modules/scheduling/controller/SchedulingController.java

@@ -52,8 +52,8 @@ public class SchedulingController {
 
     @PostMapping(value="/getClassesList")
     @ResponseBody
-    public R getClassesList(){
-        List<ClassesData> list  = schedulingService.getClassesList();
+    public R getClassesList(@RequestBody ClassesData data){
+        List<ClassesData> list  = schedulingService.getClassesList(data);
         return R.ok().put("rows",list);
     }
 

src/main/java/com/xujie/sys/modules/scheduling/mapper/SchedulingMapper.java

@@ -21,7 +21,7 @@ public interface SchedulingMapper {
 
     int getSchedulingDataCount(ClassesData data);
 
-    List<ClassesData> getClassesList();
+    List<ClassesData> getClassesList(ClassesData data);
 
     List<SchedulingData> querySchedulingList(SchedulingData data);
 

src/main/java/com/xujie/sys/modules/scheduling/service/SchedulingService.java

@@ -14,7 +14,7 @@ public interface SchedulingService {
 
     int delScheduling(ClassesData data);
 
-    List<ClassesData> getClassesList();
+    List<ClassesData> getClassesList(ClassesData data);
 
     List<SchedulingData> querySchedulingList(SchedulingData data);
 

src/main/java/com/xujie/sys/modules/scheduling/service/impl/SchedulingServiceImpl.java

@@ -57,8 +57,8 @@ public class SchedulingServiceImpl implements SchedulingService {
     }
 
     @Override
-    public List<ClassesData> getClassesList() {
-        List<ClassesData> list = schedulingMapper.getClassesList();
+    public List<ClassesData> getClassesList(ClassesData data) {
+        List<ClassesData> list = schedulingMapper.getClassesList(data);
         return list;
     }
 
@@ -92,12 +92,10 @@ public class SchedulingServiceImpl implements SchedulingService {
         while (!cal.getTime().after(endDate)) {
             int day = cal.get(Calendar.DAY_OF_WEEK);
             if ((day == Calendar.SATURDAY && !"true".equals(checkbox1))){
-                System.out.println("进入周六判断");
                 cal.add(Calendar.DATE, 1);
                 continue;
             }
             if ((day == Calendar.SUNDAY && !"true".equals(checkbox2))){
-                System.out.println("进入周日判断");
                 cal.add(Calendar.DATE, 1);
                 continue;
             }
@@ -107,7 +105,6 @@ public class SchedulingServiceImpl implements SchedulingService {
                 //新增主表信息
                 schedulingMapper.saveSchedulingHeader(data);
             }catch (Exception e){
-                System.out.println("进入catch逻辑");
                 return R.error("保存失败，请检查是否存在重复的班次编码和日期");
             }
             //设置子表参数

src/main/resources/mapper/scheduling/SchedulingMapper.xml

@@ -54,6 +54,14 @@
     </select>
     <select id="getClassesList" resultType="com.xujie.sys.modules.scheduling.entity.ClassesData">
         select * from tpm_classes
+        <where>
+            <if test="site != null and site != ''">
+                and site = #{site}
+            </if>
+            <if test="buNo != null and buNo != ''">
+                and bu_no = #{buNo}
+            </if>
+        </where>
     </select>
     <select id="querySchedulingList" resultType="com.xujie.sys.modules.scheduling.entity.SchedulingData">
         select tpm_scheduling.*,