Merge branch 'refs/heads/feat-20250730-userexport' into pre

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

@@ -118,6 +118,10 @@ public class WmScorePackageExportServiceImpl implements WmScorePackageExportServ
 			// 导出
 			String resultValue = exportUtils.WriteExportExcel(ExportType.SCORE_PACKAGE_SUB, data, WmScorePackageSubInfoExcelModel.class, user);
 			return !StrUtil.startWith(resultValue, "ERROR");
+		} catch (BizException e) {
+			log.error("{}导出异常", ExportType.SCORE_PACKAGE_SUB.getDescription(), e);
+			redisUtils.setExportError(ExportType.SCORE_PACKAGE_SUB, user.getId(), e.getMessage());
+			return Boolean.FALSE;
 		} finally {
 			redisUtils.releaseExportGlobalAllows();
 			redisUtils.cleanupGenerating(ExportType.SCORE_PACKAGE_SUB, user.getId());

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

@@ -32,6 +32,7 @@ import com.qunzhixinxi.hnqz.admin.service.WmTaskDetailExportService;
 import com.qunzhixinxi.hnqz.admin.util.ExportUtils;
 import com.qunzhixinxi.hnqz.admin.util.RedisUtils;
 import com.qunzhixinxi.hnqz.common.core.constant.CommonConstants;
+import com.qunzhixinxi.hnqz.common.core.exception.BizException;
 import com.qunzhixinxi.hnqz.common.core.util.SpringContextHolder;
 import com.qunzhixinxi.hnqz.common.security.service.HnqzUser;
 import lombok.RequiredArgsConstructor;
@@ -111,6 +112,10 @@ public class WmTaskDetailExportServiceImpl implements WmTaskDetailExportService
 			// 导出
 			String resultValue = exportUtils.WriteExportExcel(ExportType.TASK_DETAIL, data, WmTaskDetailExcelModel.class, user);
 			return !StrUtil.startWith(resultValue, "ERROR");
+		} catch (BizException e) {
+			log.error("{}导出异常", ExportType.TASK_DETAIL.getDescription(), e);
+			redisUtils.setExportError(ExportType.TASK_DETAIL, user.getId(), e.getMessage());
+			return Boolean.FALSE;
 		} finally {
 			redisUtils.releaseExportGlobalAllows();
 			redisUtils.cleanupGenerating(ExportType.TASK_DETAIL, user.getId());

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/util/RedisUtils.java

@@ -106,6 +106,13 @@ public final class RedisUtils {
       }
   }
 
+	public void setExportError(ExportType exportType, Integer userId, String errorMsg) {
+		// 缓存key
+		String cacheKey = ExportType.getAsyncExportCache(exportType, userId);
+		// 缓存错误信息
+		redisTemplate.opsForValue().set(cacheKey, errorMsg, CommonConstants.DEF_REPORT_TTL, TimeUnit.MILLISECONDS);
+	}
+
   @Data
   @AllArgsConstructor
   public static class Token{