Merge remote-tracking branch 'origin/master_saas' into master_saas

mec-biz/src/main/java/com/ym/mec/biz/dal/mapper/CourseSchedulePlusMapper.java

@@ -11,7 +11,7 @@ import java.util.List;
 
 
 @Repository
-public interface CourseSchedulePlusMapper extends BaseMapper<CourseSchedule> {
+public interface CourseSchedulePlusMapper extends BaseMapper<Object> {
 
     List<TeachingPointWrapper.CourseTeachingPoint> teachingPointCourse(@Param("page") IPage<TeachingPointWrapper.CourseTeachingPoint> page,
                                                                        @Param("param") TeachingPointWrapper.TeachingPointQuery queryInfo);

mec-biz/src/main/java/com/ym/mec/biz/dal/mapper/StudentPlusMapper.java

@@ -3,14 +3,16 @@ package com.ym.mec.biz.dal.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.ym.mec.biz.dal.entity.Student;
+import com.ym.mec.biz.dal.entity.StudentNew;
 import com.ym.mec.biz.dal.wrapper.StudentWrapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
+import java.util.Objects;
 
 @Repository
-public interface StudentPlusMapper extends BaseMapper<Student> {
+public interface StudentPlusMapper extends BaseMapper<Object> {
 
 
     List<StudentWrapper.StudentList> userPage(@Param("page") IPage<StudentWrapper.StudentList> page, @Param("param") StudentWrapper.StudentQuery queryInfo);

mec-biz/src/main/java/com/ym/mec/biz/service/impl/SchoolActivityServiceImpl.java

@@ -3,6 +3,7 @@ package com.ym.mec.biz.service.impl;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ym.mec.biz.dal.enums.ESchoolActivityStatus;
 import org.springframework.stereotype.Service;
 import org.springframework.beans.BeanUtils;
 import lombok.extern.slf4j.Slf4j;
@@ -11,6 +12,9 @@ import com.ym.mec.biz.dal.wrapper.SchoolActivityWrapper;
 import com.ym.mec.biz.dal.mapper.SchoolActivityMapper;
 import com.ym.mec.biz.service.SchoolActivityService;
 
+import java.util.Date;
+import java.util.List;
+
 /**
  * 学校活动
  * 2023-05-04 11:32:00
@@ -19,14 +23,19 @@ import com.ym.mec.biz.service.SchoolActivityService;
 @Service
 public class SchoolActivityServiceImpl extends ServiceImpl<SchoolActivityMapper, SchoolActivity> implements SchoolActivityService {
 
-	/**
+    /**
      * 查询详情
      * @param id 详情ID
      * @return SchoolActivity
      */
-	@Override
+    @Override
     public SchoolActivityWrapper.SchoolActivityDetail detail(Long id) {
-        
+        SchoolActivity schoolActivity = getById(id);
+        if(schoolActivity == null)
+            return null;
+        SchoolActivityWrapper.SchoolActivityDetail schoolActivityDetail = new SchoolActivityWrapper.SchoolActivityDetail();
+        BeanUtils.copyProperties(schoolActivity, schoolActivityDetail);
+
         return null;
     }
     
@@ -38,18 +47,36 @@ public class SchoolActivityServiceImpl extends ServiceImpl<SchoolActivityMapper,
      */
     @Override
     public IPage<SchoolActivityWrapper.SchoolActivity> selectPage(IPage<SchoolActivityWrapper.SchoolActivity> page, SchoolActivityWrapper.SchoolActivityQuery query) {
-        
-        return page.setRecords(baseMapper.selectPage(page, query));
+
+        List<SchoolActivityWrapper.SchoolActivity> schoolActivities = baseMapper.selectPage(page, query);
+
+        // 设置状态
+        for (SchoolActivityWrapper.SchoolActivity schoolActivity : schoolActivities) {
+            setStatus(schoolActivity);
+        }
+
+        return page.setRecords(schoolActivities);
+    }
+
+    private static void setStatus(SchoolActivityWrapper.SchoolActivity schoolActivity) {
+        Date now = new Date();
+        if (schoolActivity.getStartTime().after(now)) {
+            schoolActivity.setStatus(ESchoolActivityStatus.NOT_START);
+        } else if (schoolActivity.getEndTime().before(now)) {
+            schoolActivity.setStatus(ESchoolActivityStatus.END);
+        } else {
+            schoolActivity.setStatus(ESchoolActivityStatus.PROCESSING);
+        }
     }
-	
+
     /**
      * 添加
      * @param schoolActivity SchoolActivityWrapper.SchoolActivity
      * @return Boolean
      */
     @Override
-    public Boolean add(SchoolActivityWrapper.SchoolActivity schoolActivity) {    	
-        
+    public Boolean add(SchoolActivityWrapper.SchoolActivity schoolActivity) {
+
         return this.save(JSON.parseObject(schoolActivity.jsonString(), SchoolActivity.class));
     }
 

mec-biz/src/main/resources/config/mybatis/SchoolActivityMapper.xml

@@ -4,7 +4,12 @@
     
     <select id="selectPage" resultType="com.ym.mec.biz.dal.wrapper.SchoolActivityWrapper$SchoolActivity">
 		SELECT         
-        	distinct t.*
+        	distinct t.id_ as id
+            ,t.cooperation_organ_id_ as cooperationOrganId
+            ,t.start_time_ as startTime
+        ,t.end_time_ as endTime
+        ,t.name_ as name
+        ,t.type_ as type
 		FROM school_activity t
         <if test="param.studentId != null or param.musicGroupId != null">
             left join school_activity_detail t1 on t.id_ = t1.school_activity_id_