Merge branch 'develop_migration' into 'develop_master'

feat: There is no way the,

See merge request LiuChao/foton-slrs-system-rest!431
This commit is contained in:
super_liu
2022-03-27 17:30:27 +08:00
2 changed files with 7 additions and 4 deletions
@@ -49,12 +49,12 @@ public class EsRevisePlanServiceImpl extends ServiceImpl<EsRevisePlanDao, EsRevi
@Override
public List<EsRevisePlan> queryAllPlans(EsRevisePlan esRevisePlan) {
Integer count = esRevisePlanDao.getQueryTotal(esRevisePlan);
esRevisePlan.getPager().setRowCount(count);
if(StringUtils.isNotBlank(esRevisePlan.getPlanStatus())){
List<String> list= Arrays.stream(esRevisePlan.getPlanStatus().split(",")).map(String::trim).collect(Collectors.toList());
esRevisePlan.setPlanStatusList(list);
}
Integer count = esRevisePlanDao.getQueryTotal(esRevisePlan);
esRevisePlan.getPager().setRowCount(count);
List<EsRevisePlan> esRevisePlans = esRevisePlanDao.queryAll(esRevisePlan);
return esRevisePlans;
}