Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/xjrsoft/module/personnel/service/impl/CarMessageApplyServiceImpl.java

@@ -61,10 +61,11 @@ public class CarMessageApplyServiceImpl extends MPJBaseServiceImpl<CarMessageApp
                 idsMap.remove(object.get("vehicleId").getAsString());
             }
             Collection<String> values = idsMap.values();
-            this.removeBatchByIds(values);
-        }else{
-            this.removeBatchByIds(ids);
+//            this.removeBatchByIds(values); 远程没有数据
         }
+//        else{
+            this.removeBatchByIds(ids);
+//        }
         return true;
     }
 }

src/main/java/com/xjrsoft/module/schedule/controller/ScheduleController.java

@@ -16,7 +16,9 @@ import com.xjrsoft.common.model.result.RT;
 import com.xjrsoft.common.utils.VoToColumnUtil;
 import com.xjrsoft.module.base.entity.BaseSemester;
 import com.xjrsoft.module.base.service.IBaseSemesterService;
+import com.xjrsoft.module.courseTable.entity.ClassTime;
 import com.xjrsoft.module.courseTable.entity.CourseTable;
+import com.xjrsoft.module.courseTable.service.IClassTimeService;
 import com.xjrsoft.module.courseTable.service.ICourseTableService;
 import com.xjrsoft.module.schedule.dto.ClassOptionDto;
 import com.xjrsoft.module.schedule.dto.CourseTableAdjustDto;
@@ -84,6 +86,7 @@ public class ScheduleController {
     private final ITeacherbaseManagerService teacherService;
     private final IBaseSemesterService semesterService;
     private final IWfCourseAdjustService courseAdjustService;
+    private final IClassTimeService classTimeService;
 
     @GetMapping(value = "/receive-msg")
     @ApiOperation(value="接收消息")
@@ -239,13 +242,24 @@ public class ScheduleController {
                 new QueryWrapper<CourseTable>().lambda()
                         .in(CourseTable::getId, Arrays.asList(split))
         );
+
+        List<ClassTime> classTimeList =classTimeService.list();
         String result = "";
         for (int i = 0; i< list.size(); i ++){
             if(i > 0){
                 result += ",";
             }
             CourseTable courseTable = list.get(i);
-            result += courseTable.getCourseName();
+
+            String courseName = courseTable.getCourseName();
+
+            ClassTime classTime = classTimeList.stream().filter(u->u.getNumber().equals(courseTable.getTimePeriod())).findAny().orElse(null);
+
+            if(classTime!=null){
+                courseName +="("+classTime.getShortName()+")";
+            }
+
+            result += courseName;
         }
 
         return RT.ok(result);