Browse Source

feat:update pkg support quiz rel

shc 1 year ago
parent
commit
e81b3c03f2

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

@@ -1411,14 +1411,11 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
 	}
 	}
 
 
 	@Override
 	@Override
-	public R getScorePackagePageById(WmScorePackage wmScorePackage) {
+	public R<?> getScorePackagePageById(WmScorePackage wmScorePackage) {
 
 
-		wmScorePackage = getRemainScore(wmScorePackage.getId());
+		String pkgId = wmScorePackage.getId();
+		wmScorePackage = getRemainScore(pkgId);
 
 
-		// wmScorePackage = wmScorePackageMapper.getScorePackagePageById(wmScorePackage.getId());
-		//
-
-		//wmScorePackage=this.getById(wmScorePackage.getId());
 		if (StringUtil.isEmpty(wmScorePackage.getRelationScoreId())) {
 		if (StringUtil.isEmpty(wmScorePackage.getRelationScoreId())) {
 			wmScorePackage.setRelationScoreId("-1");
 			wmScorePackage.setRelationScoreId("-1");
 		}
 		}
@@ -1447,6 +1444,12 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
 				wmScorePackage.setUserScore(String.format("%.2f", Integer.parseInt(userScore) / 100.0));
 				wmScorePackage.setUserScore(String.format("%.2f", Integer.parseInt(userScore) / 100.0));
 			}
 			}
 		}
 		}
+
+		// 查询关联的试卷
+		List<WmPkgQuizRelation> quizRelations = pkgQuizRelationService.listQuizRelationsByPkgIds(Collections.singletonList(Integer.parseInt(pkgId)));
+
+		wmScorePackage.setQuizRelations(quizRelations);
+		
 		return R.ok(wmScorePackage);
 		return R.ok(wmScorePackage);
 	}
 	}