|
@@ -510,10 +510,14 @@ public class WmScorePackageStatusServiceImpl extends ServiceImpl<WmScorePackageS
|
|
|
|
|
|
log.warn("开始审批,id:[{}], packageId:[{}]", status, wmScorePackage.getId());
|
|
log.warn("开始审批,id:[{}], packageId:[{}]", status, wmScorePackage.getId());
|
|
//定额
|
|
//定额
|
|
- if (StrUtil.equals("1", wmScorePackage.getPackageType1())) {
|
|
|
|
|
|
+ if (StrUtil.equals(PackageTypeEnum.TYPE1_SCOTE_PACKAGE.val(), wmScorePackage.getPackageType1())) {
|
|
//定额包一人一包,所以score=userscore
|
|
//定额包一人一包,所以score=userscore
|
|
status.setUserScore(String.valueOf(wmScorePackage.getScore()));
|
|
status.setUserScore(String.valueOf(wmScorePackage.getScore()));
|
|
status.setTaskNum(0);
|
|
status.setTaskNum(0);
|
|
|
|
+ } else if(StrUtil.equals(PackageTypeEnum.TYPE1_SCORE_AND_TASK_PACKAGE.val(), wmScorePackage.getPackageType1())) {
|
|
|
|
+ //定额+定量(多人承接-按积分值)
|
|
|
|
+ status.setUserScore(String.valueOf(wmScorePackage.getScore()));
|
|
|
|
+ status.setTaskNum(wmScorePackage.getTaskNum());
|
|
} else {
|
|
} else {
|
|
status.setTaskNum(wmScorePackage.getTaskNum());
|
|
status.setTaskNum(wmScorePackage.getTaskNum());
|
|
status.setUserScore(String.valueOf(wmScorePackage.getUserScore()));
|
|
status.setUserScore(String.valueOf(wmScorePackage.getUserScore()));
|