Merge remote-tracking branch 'origin/dev' into dev

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/kylin/KylinPerformancesController.java

@@ -4,19 +4,14 @@ import com.github.pagehelper.PageInfo;
 import com.liquidnet.client.admin.common.core.controller.BaseController;
 import com.liquidnet.client.admin.common.core.page.TableDataInfo;
 import com.liquidnet.client.admin.zhengzai.kylin.service.impl.KylinPerformancesAdminServiceImpl;
-import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.kylin.dao.PerformanceAdminListDao;
 import com.liquidnet.service.kylin.dto.param.PerformanceAdminListParam;
 import com.liquidnet.service.kylin.dto.vo.partner.KylinPerformanceMisVo;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import javax.websocket.server.PathParam;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.*;
 
 
 /**
@@ -54,24 +49,19 @@ public class KylinPerformancesController extends BaseController
         return getDataTable(result.getList());
     }
 
-    @RequiresPermissions("kylin:performances:view")
-    @GetMapping()
-    public String tickets()
-    {
-        return prefix + "/details";
-    }
-
     @RequiresPermissions("kylin:performances:detail")
-    @GetMapping(value = "/details/{id}")
-    @ResponseBody
-    public ResponseDto<KylinPerformanceMisVo> performanceDetails(@PathParam("performancesId") String performancesId) {
+    @GetMapping(value = "/details/{performancesId}")
+    public String performanceDetails(@PathVariable("performancesId") String performancesId, ModelMap mmap) {
         KylinPerformanceMisVo result = null;
         result = kylinPerformancesService.performanceDetails(performancesId);
-        if (null != result) {
-            return ResponseDto.success(result);
-        } else {
-            return ResponseDto.failure("获取演出详情失败");
-        }
+        mmap.put("kylinPerformanceMisVo", result);
+        return prefix + "/details";
+//        if (null != result) {
+//            return ResponseDto.success(result);
+//        } else {
+//            return ResponseDto.failure("获取演出详情失败");
+//        }
+
     }
 
 //

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/performances/performances.html

@@ -156,7 +156,7 @@
                     align: 'center',
                     formatter: function(value, row, index) {
                         var actions = [];
-                        actions.push('<a class="btn btn-success btn-xs ' + detailFlag + '" href="javascript:void(0)" onclick="$.operate.detail(\'' + row.performancesId + '\')"><i class="fa fa-edit"></i>查看</a> ');
+                        actions.push('<a class="btn btn-success btn-xs ' + detailFlag + '" href="javascript:void(0)" onclick="$.operate.detailTab(\'' + row.performancesId + '\')"><i class="fa fa-edit"></i>查看</a> ');
                         actions.push('<a class="btn btn-danger btn-xs ' + expertFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.mid + '\')"><i class="fa fa-remove"></i>导出</a>');
                         return actions.join('');
                     }