Browse Source

运营管理-创业服务-路演管理-详情:报500,详情页数据拿不到

mydq 5 years ago
parent
commit
52e03f0741

+ 12 - 8
src/main/java/com/lightinit/hsdataplatform/controller/admin/RoadShowMgrController.java

@@ -19,6 +19,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.ModelAndView;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 路演管理
@@ -29,8 +30,9 @@ public class RoadShowMgrController {
 
     @Autowired
     private IRoadShowMgrService roadShowMgrService;
+
     @RequestMapping(value = "index.htm")
-    public ModelAndView index(){
+    public ModelAndView index() {
         ModelAndView modelAndView = new ModelAndView("admin/roadshow_mgr/index");
         modelAndView.addObject("dicRoadShowStage", DicRoadShowStage.getInstacne().getDicMap());
         modelAndView.addObject("dicRoadShowState", DicRoadShowState.getInstacne().getDicMap());
@@ -40,7 +42,7 @@ public class RoadShowMgrController {
 
 
     @RequestMapping(value = "list.action")
-    public ModelAndView list(RoadShowSearchModel inputModel, @RequestParam(defaultValue = "1") int pageNo){
+    public ModelAndView list(RoadShowSearchModel inputModel, @RequestParam(defaultValue = "1") int pageNo) {
         ModelAndView modelAndView = new ModelAndView("admin/roadshow_mgr/list");
         BaseExample.Page pager = new BaseExample.Page();
         pager.setPageNo(pageNo);
@@ -53,15 +55,17 @@ public class RoadShowMgrController {
 
     @RequestMapping(value = "delete.action/{id}")
     @ResponseBody
-    public ResultState delete(@PathVariable long id){
+    public ResultState delete(@PathVariable long id) {
         ResultState<Long> resultState = roadShowMgrService.delete(id);
         return resultState;
     }
 
-    @RequestMapping(value = "detail.htm/{id}")
-    public ModelAndView detail(@PathVariable long id){
-            ModelAndView modelAndView = new ModelAndView("admin/roadshow_mgr/detail");
-            modelAndView.addObject("busiModel", roadShowMgrService.queryOne(id));
-            return modelAndView;
+    @RequestMapping(value = "detail.htm")
+    public ModelAndView detail(@RequestParam("id") long id) {
+        ModelAndView modelAndView = new ModelAndView("admin/roadshow_mgr/detail");
+        Map<String, Object> map = roadShowMgrService.queryOne(id);
+        modelAndView.addObject("busiModel", map.get("roadshowWithBLOBs"));
+        modelAndView.addObject("auditor", map.get("auditor"));
+        return modelAndView;
     }
 }

+ 6 - 4
src/main/java/com/lightinit/hsdataplatform/impl/admin/RoadShowMgrServiceImpl.java

@@ -117,12 +117,14 @@ public class RoadShowMgrServiceImpl implements IRoadShowMgrService {
     @Override
     public Map<String, Object> queryOne(long id) {
         RoadshowWithBLOBs roadshowWithBLOBs= roadshowMapper.selectByPrimaryKey(id);
-        AdminExample adminExample = new AdminExample();
-        adminExample.createCriteria().andIdEqualTo(roadshowWithBLOBs.getAuditedBy());
-        List<Admin> admins = adminMapper.selectByExample(adminExample);
         Map<String, Object> map = new HashMap<>();
         map.put("roadshowWithBLOBs",roadshowWithBLOBs);
-        map.put("auditor",admins.get(0).getUsername());
+        if (roadshowWithBLOBs.getAuditedBy() != null){
+            AdminExample adminExample = new AdminExample();
+            adminExample.createCriteria().andIdEqualTo(roadshowWithBLOBs.getAuditedBy());
+            List<Admin> admins = adminMapper.selectByExample(adminExample);
+            map.put("auditor",admins.get(0).getUsername());
+        }
         return map;
     }
 }

+ 1 - 1
src/main/webapp/pages/admin/roadshow_mgr/detail.jsp

@@ -60,7 +60,7 @@
     </div>
     <div class="form-group">
         <label for="auditedBy">审核人:</label>
-        <label id="auditedBy" name="auditedBy" >${busiModel.auditedBy !=null?busiModel.auditedBy:'无'}</label>
+        <label id="auditedBy" name="auditedBy" >${auditor !=null?auditor:'无'}</label>
         <span class="field-validation-valid help-block"></span>
     </div>
     <div class="form-group">

+ 1 - 1
src/main/webapp/pages/admin/roadshow_mgr/list.jsp

@@ -63,7 +63,7 @@
 
         .on("click", "button[name='btnDetail']", function () {
             var id = $(this).parent().children("input[type='hidden'][name='id']").val();
-            $.popBsPartial({ url: "<%=basePath%>/admin/roadshow_mgr/detail.htm/" + id });
+            $.popBsPartial({ url: "<%=basePath%>/admin/roadshow_mgr/detail.htm?id=" + id });
         })
         .on("click", "button[name='btnDelete']", function() {
             var id = $(this).parent().children("input[type='hidden'][name='id']").val();