|
@@ -70,6 +70,14 @@ public class InfoController extends BaseController {
|
|
@RequiresPermissions("info:info:view")
|
|
@RequiresPermissions("info:info:view")
|
|
@RequestMapping(value = {"list", ""})
|
|
@RequestMapping(value = {"list", ""})
|
|
public String list(Info info, HttpServletRequest request, HttpServletResponse response, Model model) {
|
|
public String list(Info info, HttpServletRequest request, HttpServletResponse response, Model model) {
|
|
|
|
+ if (null != info.getStartPubDate() && !"".equals(info.getStartPubDate()) && !info.getStartPubDate().endsWith("00:00:00")) {
|
|
|
|
+ model.addAttribute("startConfirmTime", info.getStartPubDate());
|
|
|
|
+ info.setStartPubDate(info.getStartPubDate().trim() + " 00:00:00");
|
|
|
|
+ }
|
|
|
|
+ if (null != info.getEndPubDate() && !"".equals(info.getEndPubDate()) && !info.getEndPubDate().endsWith("23:59:59")) {
|
|
|
|
+ model.addAttribute("endConfirmTime", info.getEndPubDate());
|
|
|
|
+ info.setEndPubDate(info.getEndPubDate().trim() + " 23:59:59");
|
|
|
|
+ }
|
|
Page<Info> page = infoService.findPage(new Page<Info>(request, response), info);
|
|
Page<Info> page = infoService.findPage(new Page<Info>(request, response), info);
|
|
List<Info> list = page.getList();
|
|
List<Info> list = page.getList();
|
|
if(CollectionUtils.isNotEmpty(list)){
|
|
if(CollectionUtils.isNotEmpty(list)){
|