|
@@ -50,8 +50,7 @@ public class VisitRemarkController extends BaseController {
|
|
@RequestMapping(value = {"list", ""})
|
|
@RequestMapping(value = {"list", ""})
|
|
public String list(VisitRemarkVo visit, HttpServletRequest request, HttpServletResponse response, Model model) {
|
|
public String list(VisitRemarkVo visit, HttpServletRequest request, HttpServletResponse response, Model model) {
|
|
Page<VisitRemarkVo> page = visitRemarkService.findPage(new Page<VisitRemarkVo>(request, response, 20), visit);
|
|
Page<VisitRemarkVo> page = visitRemarkService.findPage(new Page<VisitRemarkVo>(request, response, 20), visit);
|
|
- VisitRemarkVo visitRemarkVo = get(null);
|
|
|
|
- model.addAttribute("visitRemark", visitRemarkVo);
|
|
|
|
|
|
+ model.addAttribute("visitRemark", visit);
|
|
model.addAttribute("page", page);
|
|
model.addAttribute("page", page);
|
|
return "modules/userNew/cmVisitList";
|
|
return "modules/userNew/cmVisitList";
|
|
}
|
|
}
|
|
@@ -63,8 +62,7 @@ public class VisitRemarkController extends BaseController {
|
|
public String remarksList(VisitRemarkVo visit, HttpServletRequest request, HttpServletResponse response, Model model) {
|
|
public String remarksList(VisitRemarkVo visit, HttpServletRequest request, HttpServletResponse response, Model model) {
|
|
Page<VisitRemarkVo> page = visitRemarkService.findPage(new Page<VisitRemarkVo>(request, response, 20), visit);
|
|
Page<VisitRemarkVo> page = visitRemarkService.findPage(new Page<VisitRemarkVo>(request, response, 20), visit);
|
|
model.addAttribute("page", page);
|
|
model.addAttribute("page", page);
|
|
- VisitRemarkVo visitRemarkVo = get(null);
|
|
|
|
- model.addAttribute("visitRemark", visitRemarkVo);
|
|
|
|
|
|
+ model.addAttribute("visitRemark", visit);
|
|
return "modules/userNew/cmVisitList";
|
|
return "modules/userNew/cmVisitList";
|
|
}
|
|
}
|
|
|
|
|
|
@@ -85,8 +83,7 @@ public class VisitRemarkController extends BaseController {
|
|
});
|
|
});
|
|
page.setList(remarksList);
|
|
page.setList(remarksList);
|
|
model.addAttribute("page", page);
|
|
model.addAttribute("page", page);
|
|
- VisitRemarkVo visitRemarkVo = get(null);
|
|
|
|
- model.addAttribute("visit", visitRemarkVo);
|
|
|
|
|
|
+ model.addAttribute("visit", visit);
|
|
return "modules/userNew/cmVisitRemarksList";
|
|
return "modules/userNew/cmVisitRemarksList";
|
|
}
|
|
}
|
|
|
|
|