feat: 封装报告记录,redis5

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

@@ -2265,12 +2265,16 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
 
 		if (StrUtil.isNotEmpty(o)) {
 
-			Long expire = redisTemplate.opsForValue().getOperations().getExpire(key, TimeUnit.SECONDS);
-			opt.setStatus(WmReportOpt.WmReportOptStatus.GENERATED);
-			opt.setTtl(LocalDateTime.now().plusSeconds(expire));
-			o = "https://pre.yaoyi.net/admin/sys-file/wmkj/兼职学术信息沟通专员业绩报告(2249)-20211116191527.doc";
-			opt.setLatestUrl(o);
-
+			// 生成中的
+			if ("GENERATING".equals(o)){
+				opt.setStatus(WmReportOpt.WmReportOptStatus.GENERATING);
+			} else {
+				Long expire = redisTemplate.opsForValue().getOperations().getExpire(key, TimeUnit.SECONDS);
+				opt.setStatus(WmReportOpt.WmReportOptStatus.GENERATED);
+				opt.setTtl(LocalDateTime.now().plusSeconds(expire));
+				// o = "https://pre.yaoyi.net/admin/sys-file/wmkj/兼职学术信息沟通专员业绩报告(2249)-20211116191527.doc";
+				opt.setLatestUrl(o);
+			}
 
 		} else {
 			opt.setStatus(WmReportOpt.WmReportOptStatus.NOT_GENERATE);