浏览代码

fix: 个人任务明细数据表,取所选月份内提交的任务

lixuesong 22 小时之前
父节点
当前提交
ad7527d74c

+ 2 - 1
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/WmScorePackageExportServiceImpl.java

@@ -809,7 +809,8 @@ public class WmScorePackageExportServiceImpl implements WmScorePackageExportServ
 		List<WmScorePackage> pkgs = scorePackageMapper.selectList(
 				Wrappers.<WmScorePackage>lambdaQuery()
 						.eq(WmScorePackage::getEnableFlag, EnableEnum.ENABLE.val())
-						.between(WmScorePackage::getCreateTime, startDate, endDate)
+						.between(startDate != null && endDate != null,
+								WmScorePackage::getCreateTime, startDate, endDate)
 						.in(WmScorePackage::getSendPackageDeptId,
 								regionDepts.keySet().stream()
 										.map(String::valueOf)

+ 2 - 2
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/WmTaskDetailExportServiceImpl.java

@@ -4,7 +4,6 @@ import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.qunzhixinxi.hnqz.admin.api.constant.UpmsState;
 import com.qunzhixinxi.hnqz.admin.api.constant.enums.EnableEnum;
 import com.qunzhixinxi.hnqz.admin.api.constant.enums.ExportType;
 import com.qunzhixinxi.hnqz.admin.api.constant.enums.PackageStatusEnum;
@@ -160,7 +159,8 @@ public class WmTaskDetailExportServiceImpl implements WmTaskDetailExportService
 		// 获取全部的任务
 		List<WmTask> tasks = taskMapper.selectList(
 				Wrappers.<WmTask>lambdaQuery()
-						.in(WmTask::getScorePackageId, cPkgIds));
+						.in(WmTask::getScorePackageId, cPkgIds)
+						.between(WmTask::getCreateTime, startDate, endDate));
 
 		// 任务类型名称
 		List<WmTaskType> taskTypes = taskTypeMapper.selectList(Wrappers.<WmTaskType>lambdaQuery()