Merge branch 'feat-20221128-exportexcel' into temp-pre

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

@@ -2360,6 +2360,11 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
 				opt.setStatus(WmReportOpt.WmReportOptStatus.ERROR);
 				opt.setErrorMsg(o.split(StrUtil.UNDERLINE)[1]);
 			}
+			// 生成失败的2
+			else if (!o.startsWith("http")) {
+				opt.setStatus(WmReportOpt.WmReportOptStatus.ERROR);
+				opt.setErrorMsg(o);
+			}
 			// 成功的
 			else {
 				Long expire = redisTemplate.opsForValue().getOperations().getExpire(key, TimeUnit.SECONDS);
@@ -2404,6 +2409,11 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
 				opt.setStatus(WmReportOpt.WmReportOptStatus.ERROR);
 				opt.setErrorMsg(o.split(StrUtil.UNDERLINE)[1]);
 			}
+			// 生成失败的2
+			else if (!o.startsWith("http")) {
+				opt.setStatus(WmReportOpt.WmReportOptStatus.ERROR);
+				opt.setErrorMsg(o);
+			}
 			// 成功的
 			else {
 				Long expire = redisTemplate.opsForValue().getOperations().getExpire(key, TimeUnit.SECONDS);