课表查询增加工号条件

src/main/java/com/template/api/ClassScheduleAPI.java

@@ -14,7 +14,7 @@ public interface ClassScheduleAPI {
 
     @GetMapping("/schedule")
     @ApiOperation(value = "创建课表", notes = "创建课表", httpMethod = "GET")
-    CommonResult schedule(String stateTime,String endTime,String teacherName);
+    CommonResult schedule(String stateTime,String endTime,String teacherName,String jsgh);
 
     @GetMapping("/downloadSchedule")
     @ApiOperation(value = "导出课表", notes = "导出课表", httpMethod = "GET")

src/main/java/com/template/controller/ClassScheduleController.java

@@ -49,7 +49,7 @@ public class ClassScheduleController implements ClassScheduleAPI {
     ClassScheduleService classScheduleService;
 
     @Override
-    public CommonResult schedule(String stateTime, String endTime, String teacherName) {
+    public CommonResult schedule(String stateTime, String endTime, String teacherName,String jsgh) {
         DateTimeFormatter dateTimeFormatter2 = DateTimeFormatter.ofPattern("yyyy-MM-dd");
 
         if (ObjectUtils.isEmpty(stateTime) && ObjectUtils.isEmpty(endTime)) {
@@ -76,7 +76,7 @@ public class ClassScheduleController implements ClassScheduleAPI {
         for (int i = 0; i <= until; i++) {
             LocalDate localDate = date.plusDays(i);
             ScheduleVo scheduleVo = new ScheduleVo();
-            ClassListVo classListVo = classScheduleService.classList(localDate,teacherName);
+            ClassListVo classListVo = classScheduleService.classList(localDate,teacherName,jsgh);
             scheduleVo.setClassListVo(classListVo);
             String format = localDate.format(dateTimeFormatter2);
             Map<String, String> stringMap = getDjz(format);

src/main/java/com/template/mapper/ClassScheduleMapper.java

@@ -21,7 +21,7 @@ import java.time.LocalDate;
 @Component
 public interface ClassScheduleMapper extends BaseMapper<ClassSchedule> {
 
-    String remarks(@Param("localDate") LocalDate localDate,@Param("teacherName") String teacherName);
+    String remarks(@Param("localDate") LocalDate localDate,@Param("teacherName") String teacherName,@Param("jsgh")String jsgh);
 
     @Delete("delete from class_schedule where  remark =#{remark} ")
     int removeByRemark(String remark);

src/main/java/com/template/services/ClassScheduleService.java

@@ -16,7 +16,7 @@ import java.time.LocalDate;
  */
 public interface ClassScheduleService extends IService<ClassSchedule> {
 
-    ClassListVo  classList(LocalDate localDate, String teacherName);
+    ClassListVo  classList(LocalDate localDate, String teacherName,String jsgh);
 
     int removeByRemark(String remark);
 

src/main/java/com/template/services/impl/ClassScheduleServiceImpl.java

@@ -28,16 +28,17 @@ public class ClassScheduleServiceImpl extends ServiceImpl<ClassScheduleMapper, C
     ClassScheduleMapper classScheduleMapper;
 
     @Override
-    public ClassListVo classList(LocalDate localDate, String teacherName) {
+    public ClassListVo classList(LocalDate localDate, String teacherName,String jsgh) {
         LambdaQueryWrapper<ClassSchedule> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(ClassSchedule::getDateTime, localDate)
-                .like(ObjectUtils.isNotEmpty(teacherName),ClassSchedule::getJsxm,teacherName);
+                .like(ObjectUtils.isNotEmpty(teacherName),ClassSchedule::getJsxm,teacherName)
+                .eq(ClassSchedule::getJsgh,jsgh);
         List<ClassSchedule> list = this.list(wrapper);
 
         ClassListVo classListVo = new ClassListVo();
         classListVo.setList(list);
 
-        String remarks=classScheduleMapper.remarks(localDate,teacherName);
+        String remarks=classScheduleMapper.remarks(localDate,teacherName,jsgh);
 
         classListVo.setRemarks(remarks);
         return classListVo;

src/main/resources/mapper/template/ClassScheduleMapper.xml

@@ -14,6 +14,9 @@
             <if test="teacherName != null and teacherName != ''">
                 and cs.jsxm like '%' #{teacherName} '%'
             </if>
+            <if test="jsgh != null and jsgh != ''">
+                and cs.jsgh = #{jsgh}
+            </if>
         </where>
         GROUP BY date_time
     </select>