调课修改

ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java

@@ -259,13 +259,14 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
 
     /***
      * 获取所传时间的周五时间
-     * @return
+     * @return date 本周的第一天
      * @throws Exception
      */
-    public static String getTimeIntervalFive(Date date) {
+    public static String getTimeIntervalFive(String date) throws ParseException {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        Date da = sdf.parse(date);
         Calendar cal = Calendar.getInstance();
-        cal.setTime(date);
+        cal.setTime(da);
         int dayWeek = cal.get(Calendar.DAY_OF_WEEK);
         if (1 == dayWeek) {
             cal.add(Calendar.DAY_OF_MONTH, 0);
@@ -276,11 +277,16 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
         return imptimeEnd;
     }
 
-    public static void main(String[] args) {
+    /*public static void main(String[] args) {
         String fist = getTimeIntervalOne(new Date());
-        String five = getTimeIntervalFive(new Date());
+        String five = null;
+        try {
+            five = getTimeIntervalFive(fist);
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
         System.out.println(fist);
         System.out.println(five);
-    }
+    }*/
 
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CourseTableServiceImpl.java

@@ -62,7 +62,7 @@ public class CourseTableServiceImpl implements ICourseTableService {
         List<CourseTable> courseTableList = courseTableMapper.selectCourseTableList(courseTable);
         //获取本周一和本周五的时间
         String fist = DateUtils.getTimeIntervalOne(new Date());
-        String five = DateUtils.getTimeIntervalFive(new Date());
+        String five = DateUtils.getTimeIntervalFive(fist);
         List<CourseChange> courseChangeList = courseChangeMapper.selectCourseChangeListByEdit(courseTable.getClassId(), fist, five);
         if (courseChangeList == null || courseChangeList.size() <=0){
             return courseTableList;
@@ -82,7 +82,7 @@ public class CourseTableServiceImpl implements ICourseTableService {
         for (CourseChange courseChange : courseChangeList) {
             //调课的时间是否在本周
             if(DateUtils.isClass(fist,five,DateUtils.dateTime(courseChange.getSubjectTime()),format)){
-                if(StringUtils.equals(courseChange.getIsNum(),table.getWeek())){
+                if(StringUtils.equals(courseChange.getSubjectWeek(),table.getWeek())){
                     classNum.add(Long.valueOf(courseChange.getIsNum()));
                     //第几节课
                     if(StringUtils.equals("1",courseChange.getIsNum())){

ruoyi-system/src/main/resources/mapper/system/CourseChangeMapper.xml

@@ -71,6 +71,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 </foreach>
             </if>
         </where>
+        order by create_time desc
     </select>
     
     <select id="selectCourseChangeById" parameterType="Long" resultMap="CourseChangeResult">
@@ -89,7 +90,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
     <select id="selectCourseChangeListByEdit" resultMap="CourseChangeResult">
         <include refid="selectCourseChangeVo"/>
-        where subject_class_id = #{classId}
+        where subject_class_id = #{classId} and is_pass = 2
         and ((date_format(subject_time,'%y%m%d') &gt;= date_format(#{fist},'%y%m%d') and date_format(subject_time,'%y%m%d') &lt;= date_format(#{five},'%y%m%d'))
                 or (date_format(be_subject_time,'%y%m%d') &gt;= date_format(#{fist},'%y%m%d') and date_format(be_subject_time,'%y%m%d') &lt;= date_format(#{five},'%y%m%d')))
     </select>