提交 巡演

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/service/admin/IKylinPerformancesAdminService.java

@@ -65,7 +65,7 @@ public interface IKylinPerformancesAdminService extends IService<KylinPerformanc
      * @param status 演出状态
      * @return 20个 sql  数据
      */
-    List<PerformanceTitleDao> getListByStatus(String status);
+    List<PerformanceTitleDao> getListByStatus(String status,String title);
 
     /**
      * 修改演出的巡演关联

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

 package com.liquidnet.client.admin.web.controller.zhengzai.kylin;
 
 import com.github.pagehelper.PageInfo;
+import com.liquidnet.client.admin.common.annotation.Log;
 import com.liquidnet.client.admin.common.core.controller.BaseController;
+import com.liquidnet.client.admin.common.core.domain.AjaxResult;
 import com.liquidnet.client.admin.common.core.page.TableDataInfo;
+import com.liquidnet.client.admin.common.enums.BusinessType;
 import com.liquidnet.client.admin.zhengzai.kylin.service.impl.KylinPerformancesAdminServiceImpl;
 import com.liquidnet.client.admin.zhengzai.kylin.service.impl.KylinRoadShowsAdminServiceImpl;
 import com.liquidnet.service.kylin.dao.PerformanceAdminListDao;
+import com.liquidnet.service.kylin.dao.PerformanceTitleDao;
 import com.liquidnet.service.kylin.dao.RoadShowAdminListDao;
+import com.liquidnet.service.kylin.dto.param.CreateRoadShowParam;
+import com.liquidnet.service.kylin.dto.vo.admin.KylinRoadShowAdminVo;
+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.ui.ModelMap;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 
 /**
  * 演出Controller
@@ -26,6 +36,8 @@ public class KylinRoadShowController extends BaseController {
 
     @Autowired
     private KylinRoadShowsAdminServiceImpl kylinRoadShowsAdminService;
+    @Autowired
+    private KylinPerformancesAdminServiceImpl kylinPerformancesService;
 
     @RequiresPermissions("kylin:performances:roadShow")
     @GetMapping()
@@ -36,12 +48,92 @@ public class KylinRoadShowController extends BaseController {
     @RequiresPermissions("kylin:performances:roadShow:list")
     @PostMapping("/list")
     @ResponseBody
-    public TableDataInfo listRoadShow(@RequestParam(value = "title",required = false) String title,
+    public TableDataInfo listRoadShow(@RequestParam(value = "title", required = false) String title,
                                       @RequestParam(value = "pageNum") int page,
                                       @RequestParam(value = "pageSize") int size) {
-        startPage();/**/
+        startPage();
         PageInfo<RoadShowAdminListDao> result = kylinRoadShowsAdminService.listRoadShow(title, page, size);
         return getDataTable(result.getList());
     }
+
+    /**
+     * 新增巡演
+     */
+    @GetMapping("/add")
+    public String add() {
+        return prefix + "/add";
+    }
+
+    @RequiresPermissions("kylin:performances:roadShow:add")
+    @Log(title = "巡演", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    @ResponseBody
+    public AjaxResult createRoadShow(CreateRoadShowParam createRoadShowParam) {
+        return toAjax(!kylinRoadShowsAdminService.createRoadShow(createRoadShowParam).equals(""));
+    }
+
+    @RequiresPermissions("kylin:performances:roadShow:details")
+    @GetMapping(value = "/details/{roadShowId}")
+    public String detailsRoadShow(@PathVariable("roadShowId") String roadShowId, ModelMap mmap) {
+        KylinRoadShowAdminVo result = kylinRoadShowsAdminService.detailsRoadShow(roadShowId);
+        mmap.put("kylinRoadShowAdminVo", result);
+        return prefix + "/edit";
+    }
+
+    @RequiresPermissions("kylin:performances:roadShow:edit")
+    @Log(title = "巡演", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    @ResponseBody
+    public AjaxResult updateRoadShow(CreateRoadShowParam createRoadShowParam) {
+        return toAjax(kylinRoadShowsAdminService.updateRoadShow(createRoadShowParam));
+    }
+
+
+    /**
+     * 巡演详情
+     */
+    @GetMapping("/detailsList/{roadShowId}")
+    public String addPerformance(@PathVariable("roadShowId") String roadShowId, ModelMap mmap) {
+        mmap.put("roadShowId", roadShowId);
+        return prefix + "/details";
+    }
+
+    @RequiresPermissions("kylin:performances:roadShow:addPerformance")
+    @GetMapping(value = "/performance/{roadShowId}")
+    @ResponseBody
+    public TableDataInfo listByRoadShowId(@PathVariable("roadShowId") String roadShowId) {
+        List<PerformanceTitleDao> result = kylinPerformancesService.getListByRoadShowId(roadShowId);
+        return getDataTable(result);
+    }
+
+//
+
+    @RequiresPermissions("kylin:performances:roadShow:change:performance")
+    @PostMapping(value = "/roadShow/relation")
+    @ResponseBody
+    public AjaxResult changeRoadShowId(@RequestParam(value = "ids") String performancesId,@RequestParam(value = "roadShowId",required = false) String roadShowId) {
+        boolean result = kylinPerformancesService.changeRoadShowId(performancesId,roadShowId);
+        return toAjax(result);
+    }
+
+    /**
+     * 新增巡演演出
+     */
+    @GetMapping("/addPerformances/{roadShowId}")
+    public String addPerformances(@PathVariable("roadShowId") String roadShowId, ModelMap mmap) {
+        mmap.put("roadShowId", roadShowId);
+        return prefix + "/addPerformances";
+    }
+
+    @RequiresPermissions("kylin:performances:roadShow:change:performance")
+    @GetMapping(value = "/performance/status")
+    @ResponseBody
+    public AjaxResult listByStatus(@RequestParam(value = "status") String status,@RequestParam(value = "title",required = false) String title) {
+        List<PerformanceTitleDao> result = kylinPerformancesService.getListByStatus(status,title);
+        AjaxResult ajax = new AjaxResult();
+//        ajax.put("code", 200);
+        ajax.put("value", result);
+        return ajax;
+    }
 }
 

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

+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('新增巡演')" />
+</head>
+<body class="white-bg">
+    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+        <form class="form-horizontal m" id="form-roadShow-add">
+            <div class="form-group">
+                <label class="col-sm-3 control-label is-required">巡演名称：</label>
+                <div class="col-sm-8">
+                    <input name="title" class="form-control" type="text" required>
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label is-required">状态：</label>
+                <div class="col-sm-8">
+<!--                    <input name="status" class="form-control" type="number" required>-->
+                    <div class="radio check-box">
+                        <input type="radio" value="1" name="status" checked> 启用</label>
+                    </div>
+                    <div class="radio check-box">
+                        <input type="radio" value="0" name="status"> 停用</label>
+                    </div>
+                </div>
+            </div>
+        </form>
+    </div>
+    <th:block th:include="include :: footer" />
+    <script th:inline="javascript">
+        var prefix = ctx + "kylin/performances/roadShow";
+        $("#form-roadShow-add").validate({
+            focusCleanup: true
+        });
+
+        function submitHandler() {
+            if ($.validate.form()) {
+                $.operate.save(prefix + "/add", $('#form-roadShow-add').serialize());
+            }
+        }
+    </script>
+</body>
+</html>
\ No newline at end of file

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

+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org">
+<head>
+    <th:block th:include="include :: header('新增巡演演出')"/>
+</head>
+<body class="white-bg">
+<div class="wrapper wrapper-content animated fadeInRight ibox-content">
+    <form class="form-horizontal m" id="form-roadShow-add">
+        <div class="form-group">
+            <p>演出名称</p>
+            <div class="row">
+                <input name="roadShowId" th:value="*{roadShowId}" type="hidden">
+                <input name="ids" type="hidden">
+                <div class="col-lg-6">
+                    <div class="input-group">
+                        <input type="text" class="form-control" id="suggest-demo-2" onkeyup="getPerformanceTitle()">
+                        <div class="input-group-btn">
+                            <button type="button" class="btn btn-white dropdown-toggle" data-toggle="dropdown">
+                                <span class="caret"></span>
+                            </button>
+                            <ul class="dropdown-menu dropdown-menu-right" role="menu">
+                            </ul>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </form>
+</div>
+<th:block th:include="include :: footer"/>
+<th:block th:include="include :: bootstrap-suggest-js"/>
+<script th:inline="javascript">
+    var prefix = ctx + "kylin/performances/roadShow";
+    var roadShowId = '[[${roadShowId}]]'.replaceAll("\"", "");
+
+    $("#form-roadShow-add").validate({
+        focusCleanup: true
+    });
+
+    function submitHandler() {
+        if ($.validate.form()) {
+            $.operate.save(prefix + "/roadShow/relation", $('#form-roadShow-add').serialize());
+        }
+    }
+
+    function getPerformanceTitle() {
+        var testBsSuggest = $("#suggest-demo-2").bsSuggest({
+            url: prefix + "/performance/status?status=(3,6)&title=" + document.getElementById("suggest-demo-2").value,
+            showBtn: false,
+            idField: "performancesId",
+            keyField: "title"
+        }).on('onDataRequestSuccess', function (e, result) {
+        }).on('onSetSelectValue', function (e, keyword) {
+            document.getElementsByName("ids")[0].value=keyword.id;
+        }).on('onUnsetSelectValue', function (e) {
+        });
+    }
+</script>
+</body>
+</html>
\ No newline at end of file

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

+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+<head>
+    <th:block th:include="include :: header('巡演列表')"/>
+</head>
+<body class="gray-bg">
+<div class="container-div">
+    <div class="row">
+        <div class="btn-group-sm" id="toolbar" role="group">
+            <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="kylin:performances:roadShow:change:performance">
+                <i class="fa fa-plus"></i> 添加
+            </a>
+        </div>
+        <div class="col-sm-12 select-table table-bordered">
+            <table id="bootstrap-table"></table>
+        </div>
+    </div>
+</div>
+<th:block th:include="include :: footer"/>
+<script th:inline="javascript">
+    var removeFlag = [[${@permission.hasPermi('kylin:performances:roadShow:change:performance')}]];
+    var prefix = ctx + "kylin/performances/roadShow";
+    $(function () {
+        var options = {
+            url: prefix + "/performance/"+'[[${roadShowId}]]'.replaceAll("\"",""),
+            removeUrl: prefix + "/roadShow/relation",
+            createUrl: prefix + "/addPerformances/"+'[[${roadShowId}]]'.replaceAll("\"",""),
+            modalName: "巡演",
+            method:"get",
+            columns: [{
+                checkbox: true
+            },
+                {
+                    field: 'performancesId',
+                    title: '演出id'
+                },
+                {
+                    field: 'title',
+                    title: '巡演名称'
+                },
+                {
+                    title: '操作',
+                    align: 'center',
+                    formatter: function (value, row, index) {
+                        var actions = [];
+                        actions.push('<a class="btn btn-success btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.performancesId + '\')"><i class="fa fa-edit"></i>删除</a> ');
+                        return actions.join('');
+                    }
+                }]
+        };
+        $.table.init(options);
+    });
+</script>
+</body>
+</html>
\ No newline at end of file

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

+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('修改演出')" />
+</head>
+<body class="white-bg">
+    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+        <form class="form-horizontal m" id="form-roadShow-edit" th:object="${kylinRoadShowAdminVo}">
+            <input name="roadShowsId" th:value="*{roadShowId}" type="hidden">
+            <div class="form-group">
+                <label class="col-sm-3 control-label">巡演名称：</label>
+                <div class="col-sm-8">
+                    <div class="input-group date">
+                        <input name="title" th:value="*{title}" class="form-control" type="text">
+                    </div>
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">状态：</label>
+                <div class="col-sm-8">
+                    <div class="input-group date">
+                        <div class="input-group date" th:if="*{status==1}">
+                            <input th:value="启用" class="form-control" type="text" readonly>
+                        </div>
+                        <div class="input-group date" th:if="*{status==0}">
+                            <input th:value="停用" class="form-control" type="text" readonly>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </form>
+    </div>
+    <th:block th:include="include :: footer" />
+    <script th:inline="javascript">
+        var prefix = ctx + "kylin/performances/roadShow";
+        $("#form-roadShow-edit").validate({
+            focusCleanup: true
+        });
+
+        function submitHandler() {
+            if ($.validate.form()) {
+                $.operate.save(prefix + "/edit", $('#form-roadShow-edit').serialize());
+            }
+        }
+    </script>
+</body>
+</html>
\ No newline at end of file

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

@@ -26,7 +26,7 @@
         </div>
 
         <div class="btn-group-sm" id="toolbar" role="group">
-            <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="kylin:performances:add">
+            <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="kylin:performances:roadShow:add">
                 <i class="fa fa-plus"></i> 添加
             </a>
         </div>
@@ -37,20 +37,17 @@
 </div>
 <th:block th:include="include :: footer"/>
 <script th:inline="javascript">
-    var detailFlag = [[${@permission.hasPermi('kylin:performances:detail')}]];
-    var expertFlag = [[${@permission.hasPermi('kylin:performances:expert')}]];
+    var updateFlag = [[${@permission.hasPermi('kylin:performances:roadShow:details')}]];
+    var detailsFlag = [[${@permission.hasPermi('kylin:performances:roadShow:addPerformance')}]];
     var prefix = ctx + "kylin/performances/roadShow";
 
     $(function () {
         var options = {
             url: prefix + "/list",
-            detailUrl: prefix + "/details/{id}",
             createUrl: prefix + "/add",
-            updateUrl: prefix + "/edit/{id}",
-            removeUrl: prefix + "/remove",
-            exportUrl: prefix + "/export",
-            // sortName: "sort",
-            modalName: "演出",
+            updateUrl: prefix + "/details/{id}",
+            detailUrl: prefix + "/detailsList/{id}",
+            modalName: "巡演",
             columns: [{
                 checkbox: true
             },
@@ -75,7 +72,8 @@
                     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.detailTab(\'' + row.performancesId + '\')"><i class="fa fa-edit"></i>查看</a> ');
+                        actions.push('<a class="btn btn-success btn-xs ' + detailsFlag + '" href="javascript:void(0)" onclick="$.operate.detail(\'' + row.roadShowId + '\')"><i class="fa fa-edit"></i>添加演出</a> ');
+                        actions.push('<a class="btn btn-success btn-xs ' + updateFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.roadShowId + '\')"><i class="fa fa-edit"></i>编辑</a> ');
                         return actions.join('');
                     }
                 }]

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/KylinPerformancesAdminServiceImpl.java

@@ -228,8 +228,8 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
     }
 
     @Override
-    public List<PerformanceTitleDao> getListByStatus(String status) {
-        List<PerformanceTitleDao> voList = performancesMapper.misTitleByStatusList(status);
+    public List<PerformanceTitleDao> getListByStatus(String status,String title) {
+        List<PerformanceTitleDao> voList = performancesMapper.misTitleByStatusList(status,title);
         return voList;
     }
 
@@ -237,6 +237,9 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
     public boolean changeRoadShowId(String performancesId, String roadShowId) {
         try {
             //mysql
+            if(null==roadShowId || roadShowId.isEmpty()){
+                roadShowId="0";
+            }
             KylinPerformanceRelations performanceRelations = new KylinPerformanceRelations();
             performanceRelations.setRoadShowId(roadShowId);
             performanceRelationsMapper.update(performanceRelations, new UpdateWrapper<KylinPerformanceRelations>().eq("performance_id", performancesId));

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/mapper/KylinPerformancesMapper.java

@@ -3,6 +3,7 @@ package com.liquidnet.service.kylin.mapper;
 import com.liquidnet.service.kylin.dao.*;
 import com.liquidnet.service.kylin.entity.KylinPerformances;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 import java.util.Map;
@@ -27,7 +28,7 @@ public interface KylinPerformancesMapper extends BaseMapper<KylinPerformances> {
     List<PerformanceTitleDao> misTitleByRoadShowIdList(String roadShowId);
 
     //根据巡演查询 通过审核演出列表
-    List<PerformanceTitleDao> misTitleByStatusList(String status);
+    List<PerformanceTitleDao> misTitleByStatusList(@Param("status") String status, @Param("title") String title);
 
     //推荐列表
     List<PerformanceRecommendAdminDao> reCommendPerformanceList();

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/resources/com.liquidnet.service.kylin.mapper/KylinPerformancesMapper.xml

@@ -230,7 +230,7 @@
                  LEFT JOIN kylin_performance_relations AS pr ON pr.performance_id = p.performances_id
         WHERE (ps.status = 3 or ps.status = 6 or ps.status = 7)
           AND pr.road_show_id = ${roadShowId}
-        LIMIT 20
+        LIMIT 100
     </select>
     <!-- Mis 根据状态查询演出列表 -->
     <select id="misTitleByStatusList" parameterType="java.lang.String" resultMap="performanceTitleDaoResult">
@@ -239,7 +239,12 @@
         FROM kylin_performances AS p
                  LEFT JOIN kylin_performance_status AS ps ON ps.performance_id = p.performances_id
                  LEFT JOIN kylin_performance_relations AS pr ON pr.performance_id = p.performances_id
-        WHERE ps.status = ${roadShowId}
+        <where>
+        ps.status in ${status}
+        <if test="title!=''">
+            AND title LIKE concat('%', ${title}, '%')
+        </if>
+        </where>
         LIMIT 20
     </select>
     <!-- Mis演出推荐列表 -->