Browse Source

1、课时删除时间展示不正确问题
2、教室查看课时统计课时量查询不正确问题

dzx 12 hours ago
parent
commit
2442252e14

+ 1 - 0
src/main/java/com/xjrsoft/module/classtime/controller/ClassTimeStatisticsController.java

@@ -252,6 +252,7 @@ public class ClassTimeStatisticsController {
         MPJLambdaWrapper<ClassTimeStatistics> queryWrapper = new MPJLambdaWrapper<>();
         queryWrapper
                 .select(ClassTimeStatisticsRecord::getId)
+                .selectAs(ClassTimeStatisticsRecord::getAllClassTime, ClassTimeStatistics::getAllClassTime)
                 .select(ClassTimeStatistics.class,x -> VoToColumnUtil.fieldsToColumns(ClassTimeStatisticsPageVo.class).contains(x.getProperty()))
                 .innerJoin(ClassTimeStatisticsRecord.class, ClassTimeStatisticsRecord::getClassTimeStatisticsId, ClassTimeStatistics::getId)
                 .eq(dto.getYear() != null, ClassTimeStatistics::getYear, dto.getYear())

+ 0 - 3
src/main/java/com/xjrsoft/module/classtime/service/impl/ClassTimeStatisticsServiceImpl.java

@@ -831,9 +831,6 @@ public class ClassTimeStatisticsServiceImpl extends MPJBaseServiceImpl<ClassTime
                 List<CourseListVo> courseList = allCourseList.stream()
                         .filter(x -> x.getTeacherId().contains(teacher.getId().toString()))
                         .collect(Collectors.toList());
-                if(14954800729414L == teacher.getId()){
-                    System.out.println(111);
-                }
 
                 //循环,统计出各项数据
                 for (CourseListVo courseListVo : courseList) {

+ 1 - 1
src/main/resources/mapper/classtime/ClassTimeDeleteMapper.xml

@@ -5,7 +5,7 @@
 <mapper namespace="com.xjrsoft.module.classtime.mapper.ClassTimeDeleteMapper">
     <select id="getPage" parameterType="com.xjrsoft.module.classtime.dto.ClassTimeDeletePageDto" resultType="com.xjrsoft.module.classtime.vo.ClassTimeDeletePageVo">
         SELECT t1.id, t2.name AS class_name,t3.name AS type_cn,t1.type,t4.name AS operation_user_name,t1.remark,t1.time_period,
-        t1.start_date,t1.end_date,t1.status,IFNULL(t1.modify_date,t1.create_date) AS operation_time FROM class_time_delete t1
+        t1.start_date,t1.end_date,t1.status,IFNULL(t1.modify_date,t1.create_date) AS operation_date FROM class_time_delete t1
         INNER JOIN base_class t2 ON t1.class_id = t2.id
         LEFT JOIN xjr_dictionary_detail t3 ON t1.type = t3.code
         LEFT JOIN xjr_user t4 ON IFNULL(t1.modify_user_id, t1.create_user_id) = t4.id