Commit cae4d721 authored by Quxl's avatar Quxl

x

parent 790ed40c
Pipeline #117 canceled with stages
......@@ -25,8 +25,10 @@ import com.egolm.common.bean.Rjx;
import com.egolm.common.jdbc.Page;
import com.egolm.film.api.service.CinemaService;
import com.egolm.film.api.service.CommonService;
import com.egolm.film.api.service.FilmService;
import com.egolm.film.bean.Fc_cinema;
import com.egolm.film.bean.Fc_cinema_showtime;
import com.egolm.film.bean.Fc_member_film;
import com.egolm.film.bean.model.Fc_cinema_model;
import com.egolm.film.bean.model.Fc_cinema_showtime_model;
import com.egolm.film.config.XRException;
......@@ -47,6 +49,10 @@ public class CinemaController {
@Autowired
CommonService common;
@Autowired
FilmService filmService;
@ResponseBody
@PostMapping("saveOrUpdate")
@ApiOperation("保存影院影厅")
......@@ -213,7 +219,14 @@ public class CinemaController {
@ApiOperation("查询排片详情")
public Object getShowtimeById(Integer id) {
Fc_cinema_showtime showtime = common.queryById(id, Fc_cinema_showtime.class);
return Rjx.jsonOk().setData(showtime);
Map<String, Object> map = Util.toMap(showtime);
map.put("show_date", DateUtil.formatDate((Date)map.get("show_date")));
Rjx rjx = Rjx.jsonOk().setData(map);
if(showtime.getFilm_id() != null) {
Fc_member_film film = filmService.queryMemberFilmById(showtime.getFilm_id().longValue());
rjx.set("mv", film);
}
return rjx;
}
@ResponseBody
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment