|
|
@@ -82,6 +82,7 @@ public class HospitalMealPlanServiceImpl implements IHospitalMealPlanService {
|
|
|
public TableDataInfo<HospitalMealPlanVo> queryPageList(HospitalMealPlanBo bo, PageQuery pageQuery) {
|
|
|
|
|
|
LambdaQueryWrapper<HospitalMealPlan> lqw = buildQueryWrapper(bo);
|
|
|
+// lqw.orderByDesc(HospitalMealPlan::getId);
|
|
|
Page<HospitalMealPlanVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
|
|
|
List<HospitalMealPlanVo> records = result.getRecords();
|
|
|
if (CollUtil.isNotEmpty(records)) {
|
|
|
@@ -117,7 +118,7 @@ public class HospitalMealPlanServiceImpl implements IHospitalMealPlanService {
|
|
|
Map<String, Long> userMap = userList.stream().collect(Collectors.toMap(k1 -> String.valueOf(k1.getUserName()), k2 -> k2.getUserId(), (k1, k2) -> k1));
|
|
|
Map<String, Object> params = bo.getParams();
|
|
|
LambdaQueryWrapper<HospitalMealPlan> lqw = Wrappers.lambdaQuery();
|
|
|
- lqw.orderByAsc(HospitalMealPlan::getId);
|
|
|
+ lqw.orderByDesc(HospitalMealPlan::getId);
|
|
|
lqw.eq(StringUtils.isNotBlank(bo.getType()), HospitalMealPlan::getType, bo.getType());
|
|
|
lqw.eq(bo.getPatientId() != null, HospitalMealPlan::getPatientId, bo.getPatientId());
|
|
|
if (StringUtils.isNotBlank(bo.getSearchValue())) {
|
|
|
@@ -131,6 +132,7 @@ public class HospitalMealPlanServiceImpl implements IHospitalMealPlanService {
|
|
|
|
|
|
}
|
|
|
}
|
|
|
+// lqw.orderByDesc(HospitalMealPlan::getCreateTime);
|
|
|
return lqw;
|
|
|
}
|
|
|
|
