feat: 封装报告记录

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/WmScorePackageController.java

@@ -1400,8 +1400,6 @@ public class WmScorePackageController {
 
 			}
 
-			// 封装报告导出状态
-			getReportOpt(finalRecords);
 			pageAnswer.setRecords(finalRecords);
 		} catch (ExecutionException | InterruptedException e) {
 			log.error("获取分页信息失败");
@@ -1411,26 +1409,6 @@ public class WmScorePackageController {
 		return R.ok(pageAnswer);
 	}
 
-	/**
-	 * 查询报告导出状态
-	 *
-	 * @param finalRecords 列表
-	 */
-	private void getReportOpt(List<WmScorePackage> finalRecords) {
-
-		for (WmScorePackage p : finalRecords) {
-			log.warn("======================" + p.getId());
-			WmReportOpt opt = new WmReportOpt();
-			opt.setStatus(WmReportOpt.WmReportOptStatus.GENERATED);
-			opt.setTtl(LocalDateTime.now().plusDays(10));
-			opt.setLatestUrl("https://pre.yaoyi.net/admin/sys-file/wmkj/兼职学术信息沟通专员业绩报告(2249)-20211116191527.doc");
-
-			p.setReportOpt(opt);
-		}
-
-	}
-
-
 	/**
 	 * 获取关联积分包名称 二期  业务平台
 	 *

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

@@ -33,6 +33,7 @@ import com.qunzhixinxi.hnqz.admin.api.entity.SysDept;
 import com.qunzhixinxi.hnqz.admin.api.entity.SysDeptRelation;
 import com.qunzhixinxi.hnqz.admin.api.entity.SysDictItem;
 import com.qunzhixinxi.hnqz.admin.api.entity.SysUser;
+import com.qunzhixinxi.hnqz.admin.api.entity.WmReportOpt;
 import com.qunzhixinxi.hnqz.admin.api.vo.UserVO;
 import com.qunzhixinxi.hnqz.admin.api.vo.WmScorePackageVO;
 import com.qunzhixinxi.hnqz.admin.entity.*;
@@ -2226,6 +2227,25 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
 		wmScorePackage.setPayScore(payScoreAndYsh.get("payScore"));
 		wmScorePackage.setYsh(payScoreAndYsh.get("ysh"));
 
+		getReportOpt(wmScorePackage);
 		return wmScorePackage;
 	}
+
+
+	/**
+	 * 查询报告导出状态
+	 *
+	 * @param wmScorePackage 列表
+	 */
+	private void getReportOpt(WmScorePackage wmScorePackage) {
+
+		log.warn("======================" + wmScorePackage.getId());
+		WmReportOpt opt = new WmReportOpt();
+		opt.setStatus(WmReportOpt.WmReportOptStatus.GENERATED);
+		opt.setTtl(LocalDateTime.now().plusDays(10));
+		opt.setLatestUrl("https://pre.yaoyi.net/admin/sys-file/wmkj/兼职学术信息沟通专员业绩报告(2249)-20211116191527.doc");
+
+		wmScorePackage.setReportOpt(opt);
+
+	}
 }