|
@@ -1476,7 +1476,14 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
|
|
|
}
|
|
|
|
|
|
wmScorePackage.setQuizRelations(quizRelations);
|
|
|
-
|
|
|
+
|
|
|
+ // 可分配积分值设置
|
|
|
+ if (StrUtil.isNotBlank(wmScorePackage.getRelationScoreId())) {
|
|
|
+ List<WmScorePackage> pkgList =
|
|
|
+ this.getScorePackagekfpjf(null, null, new String[]{"0", "1", "2"}, new String[]{wmScorePackage.getRelationScoreId()});
|
|
|
+ wmScorePackage.setKfpjf(pkgList.get(0).getKfpjf());
|
|
|
+ }
|
|
|
+
|
|
|
return R.ok(wmScorePackage);
|
|
|
}
|
|
|
|
|
@@ -1548,7 +1555,7 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
|
|
|
//更新可分配积分包值
|
|
|
if (kfpjf >= wmScorePackage.getScore()) {
|
|
|
relationScorePackage.setId(wmScorePackage.getRelationScoreId());
|
|
|
- relationScorePackage.setKfpjf(kfpjf - wmScorePackage.getScore());
|
|
|
+ relationScorePackage.setKfpjf(kfpjf - changeScore);
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -2475,6 +2482,12 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
|
|
|
String type1Lable = package_type1.getLabel();
|
|
|
String type2Lable = package_type2.getLabel();
|
|
|
|
|
|
+ // 可分配积分值设置
|
|
|
+ if (StrUtil.isNotBlank(scorePackage.getRelationScoreId())) {
|
|
|
+ List<WmScorePackage> pkgList =
|
|
|
+ this.getScorePackagekfpjf(null, null, new String[]{"0", "1", "2"}, new String[]{scorePackage.getRelationScoreId()});
|
|
|
+ scorePackage.setKfpjf(pkgList.get(0).getKfpjf());
|
|
|
+ }
|
|
|
|
|
|
// 设置
|
|
|
// scorePackage.setYsh(yshtt >= 100 ? scorePackage.getScore() : ysh);
|