update

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/SysMusicCompareRecordDao.java

@@ -4,6 +4,7 @@ import com.ym.mec.biz.dal.dto.*;
 import com.ym.mec.biz.dal.entity.SysMusicCompareRecord;
 import com.ym.mec.biz.dal.entity.SysMusicCompareWeekData;
 import com.ym.mec.biz.dal.enums.HeardLevelEnum;
+import com.ym.mec.biz.dal.page.ExportCompareQueryInfo;
 import com.ym.mec.common.dal.BaseDAO;
 import org.apache.ibatis.annotations.Param;
 
@@ -102,5 +103,5 @@ public interface SysMusicCompareRecordDao extends BaseDAO<Long, SysMusicCompareR
     
     int queryCurrentDatePlayTimeByUserId(Integer userId);
 
-    List<ExportCompareRecordDto> exportCompareRecord(@Param("organId") String organId);
+    List<ExportCompareRecordDto> exportCompareRecord(@Param("queryInfo") ExportCompareQueryInfo queryInfo);
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/page/ExportCompareQueryInfo.java

@@ -0,0 +1,32 @@
+package com.ym.mec.biz.dal.page;
+
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+* @author zx
+* @date 2021/9/26 15:52
+*/
+public class ExportCompareQueryInfo extends BaseOrganQueryInfo {
+
+    @ApiModelProperty(value = "开始时间（年月日）")
+    private String startDate;
+
+    @ApiModelProperty(value = "结束时间（年月日）")
+    private String endDate;
+
+    public String getStartDate() {
+        return startDate;
+    }
+
+    public void setStartDate(String startDate) {
+        this.startDate = startDate;
+    }
+
+    public String getEndDate() {
+        return endDate;
+    }
+
+    public void setEndDate(String endDate) {
+        this.endDate = endDate;
+    }
+}

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

@@ -1472,10 +1472,10 @@ public class ExportServiceImpl implements ExportService {
 
     //导出训练统计
     private HttpResponseResult exportCompareRecord(Map<String, Object> info){
-        BaseOrganQueryInfo queryInfo = JSONObject.parseObject(JSONObject.toJSONString(info), BaseOrganQueryInfo.class);
+        ExportCompareQueryInfo queryInfo = JSONObject.parseObject(JSONObject.toJSONString(info), ExportCompareQueryInfo.class);
         SysUser user = sysUserService.getUser();
         queryInfo.setOrganId(organizationService.getEmployeeOrgan(user.getId(), queryInfo.getOrganId(), user.getIsSuperAdmin()));
-        List<ExportCompareRecordDto> rows = sysMusicCompareRecordDao.exportCompareRecord(queryInfo.getOrganId());
+        List<ExportCompareRecordDto> rows = sysMusicCompareRecordDao.exportCompareRecord(queryInfo);
         this.checkRows(rows);
         ManagerDownload managerDownload = saveManagerDownload(ExportTypeEnum.EXPORT_TRAINING_STATISTICS,user.getId());
         return this.asyncExport(() -> this.initExportInfo(rows, managerDownload,ExportEnum.EXPORT_TRAINING_STATISTICS),

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

@@ -451,8 +451,14 @@
 		left join sys_user su ON su.id_ = smcr.user_id_
 		left join organization o ON o.id_ = su.organ_id_
 		<where>
-			<if test="organId != null and organId != ''">
-				AND FIND_IN_SET(su.organ_id_, #{organId})
+			<if test="queryInfo.organId != null and queryInfo.organId != ''">
+				AND FIND_IN_SET(su.organ_id_, #{queryInfo.organId})
+			</if>
+			<if test="queryInfo.startDate != null and queryInfo.startDate != ''">
+				AND DATE_FORMAT(smcr.create_time_, '%Y-%m-%d') &gt;= #{queryInfo.startDate}
+			</if>
+			<if test="queryInfo.endDate != null and queryInfo.endDate != ''">
+				AND DATE_FORMAT(smcr.create_time_, '%Y-%m-%d') &lt;= #{queryInfo.endDate}
 			</if>
 		</where>
 		group by smcr.user_id_