Merge branch 'driver' of http://122.51.230.86:3000/dianliang/lanan-system into driver

dl-module-jx/src/main/java/cn/iocoder/yudao/module/exam/service/impl/ExamBatchServiceImpl.java

@@ -13,6 +13,7 @@ import cn.iocoder.yudao.module.exam.vo.ExamBatchVO;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
@@ -48,9 +49,33 @@ public class ExamBatchServiceImpl extends ServiceImpl<ExamBatchMapper, ExamBatch
      **/
     @Override
     public IPage<ExamBatchVO> queryListPage(ExamBatchVO pageReqVO, Page<ExamBatchVO> page) {
-        //教练ID
+        if(StringUtils.isEmpty(pageReqVO.getTimeType())){
-        Long userId = SecurityFrameworkUtils.getLoginUserId();
+            //不是首页过来的，那么代表是教练自己查自己的所有考试记录
-        pageReqVO.setCoachId(userId);
+            Long userId = SecurityFrameworkUtils.getLoginUserId();
+            pageReqVO.setCoachId(userId);
+        }else {
+            //首页过来的，默认查全部的数据
+            String startTimeStr = "";
+            String endTimeStr = "";
+            if("more".equals(pageReqVO.getTimeType())){
+                if(StringUtils.isNotEmpty(pageReqVO.getStartTimeSearch())){
+                    startTimeStr = pageReqVO.getStartTimeSearch()+" 00:00:01";
+                }
+                if(StringUtils.isNotEmpty(pageReqVO.getEndTimeSearch())) {
+                    endTimeStr = pageReqVO.getEndTimeSearch() + " 23:59:59";
+                }
+            }else if("month".equals(pageReqVO.getTimeType())){
+                //当月
+                startTimeStr = DateUtil.format(DateUtil.beginOfMonth(DateUtil.date()),"yyyy-MM-dd")+" 00:00:01";
+                endTimeStr = DateUtil.format(DateUtil.endOfMonth(DateUtil.date()),"yyyy-MM-dd")+" 23:59:59";
+            }else if("day".equals(pageReqVO.getTimeType())){
+                //当天
+                startTimeStr = DateUtil.formatDate(DateUtil.date())+" 00:00:01";
+                endTimeStr = DateUtil.formatDate(DateUtil.date())+" 23:59:59";
+            }
+            pageReqVO.setStartTimeSearch(startTimeStr);
+            pageReqVO.setEndTimeSearch(endTimeStr);
+        }
         IPage<ExamBatchVO> rtnList = examBatchMapper.queryListPage(pageReqVO, page);
         return rtnList;
     }

dl-module-jx/src/main/java/cn/iocoder/yudao/module/exam/vo/ExamBatchVO.java

@@ -15,4 +15,17 @@ public class ExamBatchVO extends ExamBatch {
      * 学员姓名
      */
     private String userName;
+
+    /**
+     * 时间查询类型（all-全部|day-当日|month-当月|more-自定义）
+     */
+    private String timeType;
+    /**
+     * 查询时间区间-开始
+     */
+    private String startTimeSearch;
+    /**
+     * 查询时间区间-结束
+     */
+    private String endTimeSearch;
 }

dl-module-jx/src/main/resources/mapper/exam/ExamBatchMapper.xml

@@ -19,6 +19,12 @@
         <if test="entity.subject != null and entity.subject != ''">
             and dseb.subject =#{entity.subject}
         </if>
+        <if test="entity.startTimeSearch!=null and entity.startTimeSearch!=''">
+            AND dseb.start_time &gt;= #{entity.startTimeSearch}
+        </if>
+        <if test="entity.endTimeSearch!=null and entity.endTimeSearch!=''">
+            AND dseb.start_time &lt;= #{entity.endTimeSearch}
+        </if>
         ORDER BY dseb.create_time DESC
     </select>
 </mapper>