Browse Source

修改社区食堂居民端查询菜单时,没有过滤早中晚三餐的问题;

dev
luyan 2 years ago
parent
commit
eb89a0cbae
  1. 7
      epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/CanteenMenusServiceImpl.java

7
epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/CanteenMenusServiceImpl.java

@ -21,6 +21,7 @@ import com.epmet.dto.CanteenMenusDTO;
import com.epmet.dto.CanteenMenusListDTO; import com.epmet.dto.CanteenMenusListDTO;
import com.epmet.dto.result.LoginUserDetailsResultDTO; import com.epmet.dto.result.LoginUserDetailsResultDTO;
import com.epmet.entity.CanteenMenusEntity; import com.epmet.entity.CanteenMenusEntity;
import com.epmet.entity.CommunityCanteenEntity;
import com.epmet.feign.EpmetUserOpenFeignClient; import com.epmet.feign.EpmetUserOpenFeignClient;
import com.epmet.remote.EpmetUserRemoteService; import com.epmet.remote.EpmetUserRemoteService;
import com.epmet.service.CanteenDishesService; import com.epmet.service.CanteenDishesService;
@ -316,6 +317,12 @@ public class CanteenMenusServiceImpl extends BaseServiceImpl<CanteenMenusDao, Ca
if (StringUtils.isNotEmpty(startTime) && StringUtils.isNotEmpty(endTime)) { if (StringUtils.isNotEmpty(startTime) && StringUtils.isNotEmpty(endTime)) {
wrapper.between("START_TIME", startTime, endTime); wrapper.between("START_TIME", startTime, endTime);
} }
if (StringUtils.isNotEmpty(canteenId)) {
CommunityCanteenEntity canteenEntity = communityCanteenService.selectById(canteenId);
String threeMeals = canteenEntity.getThreeMeals();
wrapper.in("MEALS", threeMeals);
}
//获取菜单 //获取菜单
List<CanteenMenusEntity> menusDTOList = baseDao.selectList(wrapper); List<CanteenMenusEntity> menusDTOList = baseDao.selectList(wrapper);
if (!CollectionUtils.isEmpty(menusDTOList)) { if (!CollectionUtils.isEmpty(menusDTOList)) {

Loading…
Cancel
Save