Jelajahi Sumber

台账统计调整

dzx 1 tahun lalu
induk
melakukan
4c69d52549

+ 2 - 2
src/main/java/com/xjrsoft/module/ledger/controller/LedgerStatisticsController.java

@@ -389,7 +389,7 @@ public class LedgerStatisticsController {
         }
         DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd");
 
-        String sql = "SELECT t1.user_id,count(t1.course_name) as course_count FROM wf_teacher_listen t1" +
+        String sql = "SELECT t1.user_id,sum(t1.time_number) as course_count FROM wf_teacher_listen t1" +
                 " LEFT JOIN xjr_workflow_form_relation t2 ON t1.id = t2.form_key_value" +
                 " WHERE t2.current_state = 'COMPLETED'";
         if(dto.getStartDate() != null && dto.getEndDate() != null){
@@ -460,7 +460,7 @@ public class LedgerStatisticsController {
 
         DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd");
 
-        String sql = "SELECT t1.user_id,count(t1.course_name) as course_count FROM wf_teacher_listen t1" +
+        String sql = "SELECT t1.user_id,sum(t1.time_number) as course_count FROM wf_teacher_listen t1" +
                 " LEFT JOIN xjr_workflow_form_relation t2 ON t1.id = t2.form_key_value" +
                 " WHERE t2.current_state = 'COMPLETED'";
         if(dto.getStartDate() != null && dto.getEndDate() != null){

+ 0 - 2
src/main/java/com/xjrsoft/module/schedule/controller/ScheduleController.java

@@ -166,8 +166,6 @@ public class ScheduleController {
         List<BaseSemester> semesterList = semesterService.list(
                 new QueryWrapper<BaseSemester>().lambda()
                         .eq(BaseSemester::getDeleteMark, DeleteMark.NODELETE.getCode())
-                        .le(BaseSemester::getEndDate, LocalDate.now())
-                        .ge(BaseSemester::getStartDate, LocalDate.now())
                         .orderByDesc(BaseSemester::getStartDate)
         );
         BaseSemester baseSemester = semesterList.get(0);