教材申领bug修复

src/main/java/com/xjrsoft/module/activity/controller/ActivityInfoController.java

@@ -15,6 +15,7 @@ import com.xjrsoft.common.page.ConventPage;
 import com.xjrsoft.common.page.PageOutput;
 import com.xjrsoft.module.activity.dto.ActivityEnrollExportDto;
 import com.xjrsoft.module.activity.dto.ActivityInfoPageDto;
+import com.xjrsoft.module.activity.dto.ActivityInfoTodayDto;
 import com.xjrsoft.module.activity.dto.AddActivityEnrollRangeDto;
 import com.xjrsoft.module.activity.dto.AddActivityInfoDto;
 import com.xjrsoft.module.activity.dto.ChangeStatusDto;
@@ -92,11 +93,17 @@ public class ActivityInfoController {
     @GetMapping(value = "/today-schedule")
     @ApiOperation(value="今日安排(分页)")
     @SaCheckPermission("activityinfo:detail")
-    public RT<PageOutput<ActivityInfoPageVo>> todaySchedule(@Valid ActivityInfoPageDto dto){
-
-        Page<ActivityInfoPageVo> page = activityInfoService.getPage(new Page<>(dto.getLimit(), dto.getSize()), dto);
-        PageOutput<ActivityInfoPageVo> pageOutput = ConventPage.getPageOutput(page, ActivityInfoPageVo.class);
-        return RT.ok(pageOutput);
+    public RT<PageOutput<ActivityInfoPageVo>> todaySchedule(@Valid ActivityInfoTodayDto dto){
+        List<String> roleList = StpUtil.getRoleList();
+        if(dto.getLoginUserId() == null){
+            dto.setLoginUserId(StpUtil.getLoginIdAsLong());
+        }
+        if(roleList.contains("STUDENT")){
+            dto.setRoleType(3);
+        }else if(roleList.contains("TEACHER")){
+            dto.setRoleType(2);
+        }
+        return RT.ok();
     }
 
     @GetMapping(value = "/info")

src/main/java/com/xjrsoft/module/activity/dto/ActivityInfoTodayDto.java

@@ -0,0 +1,47 @@
+package com.xjrsoft.module.activity.dto;
+
+import com.xjrsoft.common.page.PageInput;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.List;
+
+
+/**
+* @title: 活动信息分页查询入参
+* @Author dzx
+* @Date: 2024-07-19
+* @Version 1.0
+*/
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class ActivityInfoTodayDto extends PageInput {
+
+    @ApiModelProperty("活动类别(1:校企合作活动 2:赛事活动)")
+    private Integer category;
+
+    @ApiModelProperty("是否有效活动(1:是 0:否)")
+    private Integer isEffective;
+
+    @ApiModelProperty("登录者id")
+    private Long loginUserId;
+
+    @ApiModelProperty("活动名称")
+    private String name;
+
+    @ApiModelProperty("活动类型(xjr_dictionary_detail[match_activity_type])")
+    private String type;
+
+    @ApiModelProperty("组织部门(xjr_department)")
+    private Long orgId;
+
+    @ApiModelProperty("状态(0:未发布 1:报名中 2:报名结束 3:活动结束)")
+    private Integer status;
+
+    @ApiModelProperty("活动ids")
+    private List<Long> activityInfoIds;
+
+    @ApiModelProperty("状态(0:未发布 1:报名中 2:报名结束 3:活动结束)")
+    private Integer roleType;
+}

src/main/java/com/xjrsoft/module/textbook/dto/TextbookClaimStudentConfirmDto.java

@@ -29,6 +29,6 @@ public class TextbookClaimStudentConfirmDto extends PageInput {
     /**
      * 查看还是确认（1 = 查看，2 = 确认）
      */
-    @ApiModelProperty(value = "查看还是确认（1 = 查看，2 = 确认）",required = true)
+    @ApiModelProperty(value = "查看还是确认（1 = 查看，2 = 确认）")
     private Integer showOrConfirm;
 }

src/main/resources/mapper/activity/ActivityInfoMapper.xml

@@ -85,7 +85,7 @@
         )
     </select>
     <select id="getTodaySchedule" parameterType="com.xjrsoft.module.activity.dto.ActivityInfoPageDto" resultType="com.xjrsoft.module.activity.vo.ActivityInfoPageVo">
-        SELECT t1.id,t1.name,t1.place,t1.start_date,t1.end_date,
+        SELECT t1.id,t1.name,t1.place,DATE_FORMAT(t1.start_date,'%Y-%m-%d %H:%m:%s') as start_date,DATE_FORMAT(t1.end_date,'%Y-%m-%d %H:%m:%s') as end_date,
         t1.type, t4.name AS org_name, t1.enroll_end_time, t1.cover_file_id,
         t1.status,t1.content,t1.category,t5.status AS enroll_status,t2.name as type_cn, 1 as is_enroll FROM activity_info t1
         LEFT JOIN xjr_dictionary_detail t2 ON t1.type = t2.code
@@ -100,7 +100,8 @@
             and (t1.status = 1 or t1.status = 2) and NOW() between t1.start_date and t1.end_date
         </if>
         UNION
-        SELECT a1.id, a1.club_activities_name AS NAME,a1.activity_location AS place,a1.start_time AS start_date,a1.end_time AS end_date,
+        SELECT a1.id, a1.club_activities_name AS NAME,a1.activity_location AS place,
+        DATE_FORMAT(a1.start_time,'%Y-%m-%d %H:%m:%s') as start_date,DATE_FORMAT(a1.end_time,'%Y-%m-%d %H:%m:%s') as end_date,
         NULL AS TYPE,NULL AS org_name,NULL AS enroll_end_time,NULL AS cover_file_id,1 AS STATUS,
         a1.club_activities_content AS content,3 AS category,2 AS enroll_status,
         a1.activity_type AS type_cn, 1 AS is_enroll
@@ -108,7 +109,8 @@
         (SELECT credential_number FROM xjr_user WHERE id = #{dto.loginUserId})
         UNION
         SELECT a2.id, a2.moral_event_name AS NAME,a2.event_address AS place,
-        a2.event_start_time AS start_date,a2.event_end_time AS end_date,NULL AS TYPE,NULL AS org_name,NULL AS enroll_end_time,
+        DATE_FORMAT(a2.event_start_time,'%Y-%m-%d %H:%m:%s') as start_date,DATE_FORMAT(a2.event_end_time,'%Y-%m-%d %H:%m:%s') as end_date,
+        NULL AS TYPE,NULL AS org_name,NULL AS enroll_end_time,
         NULL AS cover_file_id,1 AS status,
         a2.event_content AS content,4 AS category,2 AS enroll_status
         , a2.event_type AS type_cn, 1 as is_enroll
@@ -118,7 +120,8 @@
         ),a2.attend_class) > 0
         )
         UNION
-        SELECT a3.id,a3.training_name AS NAME,a3.training_address AS place,a3.start_time AS start_date, a3.end_time AS end_date,
+        SELECT a3.id,a3.training_name AS NAME,a3.training_address AS place,
+        DATE_FORMAT(a3.start_time,'%Y-%m-%d %H:%m:%s') as start_date,DATE_FORMAT(a3.end_time,'%Y-%m-%d %H:%m:%s') as end_date,
         NULL AS TYPE,NULL AS org_name,NULL AS enroll_end_time,NULL AS cover_file_id, STATUS,
         a3.training_topic AS content,5 AS category,2 AS enroll_status,  NULL AS type_cn, 1 as is_enroll FROM wf_teacher_training a3
         INNER JOIN wf_teacher_training_participant a4 ON a3.id = a4.wf_teacher_training_id
@@ -132,11 +135,18 @@
         )
 
         UNION
-        SELECT id,party_tissue_name AS NAME,event_address AS place,event_start_time AS start_date, event_end_time AS end_date,event_type AS TYPE,
-        NULL AS org_name,NULL AS enroll_end_time,NULL AS cover_file_id,1 AS STATUS, event_content AS content, 6 AS category,
-        2 AS enroll_status, NULL AS type_cn, 1 as is_enroll FROM party_build_event
-        WHERE delete_mark = 0 AND (
-        participant_teacher_name LIKE CONCAT('%',#{dto.loginUserId},'%') OR participant_student_name LIKE CONCAT('%',#{dto.loginUserId},'%')
-        )
+        SELECT t1.id, t1.course_name AS NAME, CONCAT(t4.name,t3.name) AS place,t5.summer_start_time AS start_date,t5.summer_end_time AS end_date,
+        NULL AS TYPE,NULL AS org_name,NULL AS enroll_end_time,NULL AS cover_file_id, 1 AS STATUS,
+        NULL AS content,7 AS category,NULL AS enroll_status,  NULL AS type_cn, NULL AS is_enroll,t1.time_period,t1.time_number
+        FROM course_table t1
+        INNER JOIN base_student_school_roll t2 ON t1.class_id = t2.class_id
+        inner join base_class
+        LEFT JOIN base_classroom t3 ON t1.site_id = t3.id
+        LEFT JOIN base_office_build t4 ON t3.office_build_id = t4.id
+        LEFT JOIN class_time t5 ON t1.time_period = t5.time_period AND t1.time_number = t5.number
+        WHERE t1.schedule_date = DATE_FORMAT(NOW(),'%Y-%m-%d')
+        AND t2.user_id = #{dto.loginUserId}
+        ORDER BY t5.summer_start_time
+
     </select>
 </mapper>

src/main/resources/mapper/textbook/TextbookStudentClaimMapper.xml

@@ -18,7 +18,9 @@
         WHERE t.delete_mark = 0
         AND (t.student_user_id = #{dto.studentUserId})
         AND (t2.base_semester_id = #{dto.baseSemesterId})
+        <if test="dto.showOrConfirm != null and dto.showOrConfirm == 2">
             and t.is_claim = 0
+        </if>
         ORDER BY t.id DESC
     </select>