|
@@ -1074,21 +1074,24 @@ public class FirstArticleServiceImpl extends ServiceImpl<FirstArticleMapper, Ben
|
|
|
return ResponseBeanBuilder.ok(aLLPlanList, Function.identity());
|
|
|
}
|
|
|
|
|
|
- @Override
|
|
|
+ @Override
|
|
|
public ResponseBean<List<BentelerPlan>> getHisPlanList(SearchHisPlanListReq req) {
|
|
|
BentelerPlan plan = planService.getById(req.getId());
|
|
|
- if(plan!=null) {
|
|
|
+ if (plan != null) {
|
|
|
List<PlanBind> bindList = planBindService.list(Wrappers.<PlanBind>lambdaQuery().eq(PlanBind::getOldBentelerPlanId, req.getId()));
|
|
|
List<Long> psids = new ArrayList<>();
|
|
|
for (PlanBind b : bindList) {
|
|
|
psids.add(b.getNewBentelerPlanId());
|
|
|
}
|
|
|
- List<BentelerPlan> hisplans = planService.list(Wrappers.<BentelerPlan>lambdaQuery()
|
|
|
- .eq(BentelerPlan::getPlanType, plan.getPlanType()).in(BentelerPlan::getId, psids));
|
|
|
- return ResponseBeanBuilder.ok(hisplans, Function.identity());
|
|
|
- }else{
|
|
|
- return ResponseBeanBuilder.ok(new ArrayList<BentelerPlan>(), Function.identity());
|
|
|
+ if(psids.size()>0){
|
|
|
+ List<BentelerPlan> hisplans = planService.list(Wrappers.<BentelerPlan>lambdaQuery()
|
|
|
+ .eq(BentelerPlan::getPlanType, plan.getPlanType()).in(BentelerPlan::getId, psids));
|
|
|
+ return ResponseBeanBuilder.ok(hisplans, Function.identity());
|
|
|
+ }
|
|
|
+
|
|
|
}
|
|
|
+
|
|
|
+ return ResponseBeanBuilder.ok(new ArrayList<BentelerPlan>(), Function.identity());
|
|
|
}
|
|
|
|
|
|
|