Merge branch 'develop-wxl' of https://e.coding.net/chuanghaikeji/smarCampus/iHotel_student_houtai

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

@@ -5,9 +5,11 @@ import com.template.model.pojo.ClassSchedule;
 import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 import org.springframework.stereotype.Component;
 
 import java.time.LocalDate;
+import java.util.List;
 
 /**
  * <p>
@@ -26,4 +28,20 @@ public interface ClassScheduleMapper extends BaseMapper<ClassSchedule> {
     @Delete("delete from class_schedule where  remark =#{remark} ")
     int removeByRemark(String remark);
 
+    @Select({"<script>"+
+            "select cs.*,o.name as orginizationName from class_schedule cs " +
+            "   left join users u on cs.jsgh=u.card_number and u.deleted=0" +
+            "   left join organization o on o.id=u.organ_id " +
+            "where"+
+            "   cs.deleted=0" +
+            "   and cs.date_time = #{dateTime}\n" +
+            "   <if test=\"teacherName != null and teacherName != ''\">" +
+            "       and cs.jsxm like '%' #{teacherName} '%'" +
+            "   </if>" +
+            "   <if test=\"jsgh != null and jsgh != ''\">" +
+            "       and cs.jsgh = #{jsgh}\n" +
+            "   </if>"+
+            "</script>"
+    })
+    List<ClassSchedule> listVo(String teacherName, String jsgh, LocalDate dateTime);
 }

src/main/java/com/template/model/pojo/ClassSchedule.java

@@ -56,6 +56,10 @@ public class ClassSchedule implements Serializable {
     @ApiModelProperty(value = "备注")
     private String remark;
 
+    @TableField(exist = false)
+    @ApiModelProperty(value = "学院名称")
+    private String orginizationName;
+
     @ApiModelProperty(value = "创建时间")
     @TableField(fill = FieldFill.INSERT)
     private String createTime;

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

@@ -28,17 +28,14 @@ public class ClassScheduleServiceImpl extends ServiceImpl<ClassScheduleMapper, C
     ClassScheduleMapper classScheduleMapper;
 
     @Override
-    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)
-                .eq(ClassSchedule::getJsgh,jsgh);
-        List<ClassSchedule> list = this.list(wrapper);
+    public ClassListVo classList(LocalDate dateTime, String teacherName,String jsgh) {
+
+        List<ClassSchedule> list = classScheduleMapper.listVo(teacherName,jsgh,dateTime);
 
         ClassListVo classListVo = new ClassListVo();
         classListVo.setList(list);
 
-        String remarks=classScheduleMapper.remarks(localDate,teacherName,jsgh);
+        String remarks=classScheduleMapper.remarks(dateTime,teacherName,jsgh);
 
         classListVo.setRemarks(remarks);
         return classListVo;