Merge branch 'refs/heads/feat-20250730-userexport' into cnbg-master

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)

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()
@@ -284,6 +284,7 @@ public class WmTaskDetailExportServiceImpl implements WmTaskDetailExportService
 			// 任务ID、任务类型
 			model.setTaskId(task.getId());
 			model.setTaskName(taskTypeNameMap.getOrDefault(task.getTaskTypeId(), ""));
+			model.setTaskCreateTime(DateUtil.formatLocalDateTime(task.getCreateTime()));
 
 			// 判断事业部总经理及之前审核状态（
 			// 1.总经理未审之前，前面节点未拒绝的，则认为是审核中；
@@ -296,7 +297,6 @@ public class WmTaskDetailExportServiceImpl implements WmTaskDetailExportService
 				SysCheckChainNodeCheckHistory lastCheckHis = chainNodeCheckHistorys.get(chainNodeCheckHistorys.size() - 1);
 				model.setTaskStatus(Boolean.TRUE.equals(lastCheckHis.getCheckResult()) ?
 						lastCheckHis.getNodeId() == 6 ? "审核通过" : "审核中" : "已拒绝");
-				model.setTaskCreateTime(DateUtil.formatLocalDateTime(lastCheckHis.getCreateTime()));
 				model.setRejectReason(lastCheckHis.getCheckMsg());
 			}
 			models.add(model);