|
@@ -25,6 +25,7 @@ import com.qunzhixinxi.hnqz.admin.api.entity.SysUserRole;
|
|
|
import com.qunzhixinxi.hnqz.admin.api.entity.WmDaDrugEntDrugtable;
|
|
|
import com.qunzhixinxi.hnqz.admin.api.entity.WmPackageRedemptionNotice;
|
|
|
import com.qunzhixinxi.hnqz.admin.api.entity.WmPackageRedemptionNotice.CheckState;
|
|
|
+import com.qunzhixinxi.hnqz.admin.api.entity.WmPackageRedemptionNotice.NoticeState;
|
|
|
import com.qunzhixinxi.hnqz.admin.api.entity.WmPackageTaskTypeQty;
|
|
|
import com.qunzhixinxi.hnqz.admin.api.entity.WmScorePackage;
|
|
|
import com.qunzhixinxi.hnqz.admin.api.entity.WmScorePackageStatus;
|
|
@@ -410,21 +411,18 @@ public class WmPackageManager {
|
|
|
result.put("pkgScore", scorePackage.getScore());
|
|
|
result.put("passedByNode6Total", CollUtil.isEmpty(passedByNode6) ? 0 : passedByNode6.size());
|
|
|
|
|
|
- int nextStep =
|
|
|
- CollUtil.isNotEmpty(notices)
|
|
|
- ? notices.stream()
|
|
|
- .filter(
|
|
|
- rdm ->
|
|
|
- StrUtil.equalsAny(
|
|
|
- rdm.getNoticeState(),
|
|
|
- WmPackageRedemptionNotice.NoticeState.CONFIRM.getState(),
|
|
|
- WmPackageRedemptionNotice.NoticeState.ARGUE.getState(),
|
|
|
- WmPackageRedemptionNotice.NoticeState.DONE.getState()))
|
|
|
- .collect(Collectors.toList())
|
|
|
- .get(0)
|
|
|
- .getStep()
|
|
|
- + 1
|
|
|
- : 1;
|
|
|
+ List<WmPackageRedemptionNotice> notices1 =
|
|
|
+ notices.stream()
|
|
|
+ .filter(
|
|
|
+ rdm ->
|
|
|
+ StrUtil.equalsAny(
|
|
|
+ rdm.getNoticeState(),
|
|
|
+ NoticeState.CONFIRM.getState(),
|
|
|
+ NoticeState.ARGUE.getState(),
|
|
|
+ NoticeState.DONE.getState()))
|
|
|
+ .collect(Collectors.toList());
|
|
|
+
|
|
|
+ int nextStep = CollUtil.isNotEmpty(notices1) ? notices1.get(0).getStep() + 1 : 1;
|
|
|
|
|
|
double usedRdpScore =
|
|
|
CollUtil.isNotEmpty(notices)
|