yb导出

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/sweet/SweetYbActivityController.java

@@ -89,6 +89,7 @@ public class SweetYbActivityController {
     }
 
     @PostMapping("/export")
+    @ApiOperation("活动列表导出")
     @ResponseBody
     public AjaxResult exportMemberOrder(SweetYbActivityListParam param) {
         List<SweetYbActivityExportVo> list = sweetYbActivityService.aExport(param);

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/yb/bannerList.html

@@ -62,9 +62,9 @@
                         <ul>
                             <li class="leftSearchBox">
                                 <input class="form-control" type="text" name="title" placeholder="请输入名字">
-                                时间：<input type="text" class="layui-input form-control" id="test1" name="startTime" placeholder="请选择时间">
+                                <!-- 时间：<input type="text" class="layui-input form-control" id="test1" name="startTime" placeholder="请选择时间">
                                 ~  
-                                <input type="text" class="layui-input form-control" id="test1" name="endTime"  style="margin-left: 10px;" placeholder="请选择时间">
+                                <input type="text" class="layui-input form-control" id="test1" name="endTime"  style="margin-left: 10px;" placeholder="请选择时间"> -->
                                 <li>
                                     <a id="searchBtns" class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
                                     <a class="btn btn-warning btn-rounded btn-sm" onclick="ceshi()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
@@ -82,9 +82,6 @@
                     <a class="btn btn-success" id="addActivity" onclick="creatAndEdit(1)">
                         <i class="fa fa-plus"></i> 新增banner
                     </a>
-                    <a class="btn btn-warning" id="button-open-11">
-                        <i class="fa fa-download"></i> 导出Excel
-                    </a>
                 </div>
             </div>
             
@@ -169,7 +166,9 @@
                         title: '操作',
                         align: 'center',
                         formatter: function (value, row, index) {
-                            return`<a class="btn btn-info btn-xs" href="javascript:void(0)" onclick="creatAndEdit('','${row.activityId}')">编辑</a>`
+                            return`<a class="btn btn-info btn-xs" href="javascript:void(0)" onclick="creatAndEdit('','${row.activityId}')">编辑</a><a class="btn btn-warning btn-xs" id="button-open-11" onclick="exportData('','${row.activityId}')">
+                                    <i class="fa fa-download"></i> 导出Excel
+                                </a>`
                         }
                     },
 
@@ -208,7 +207,7 @@
             } else {
                 data.activityId = '';
                 promiseMethods('/sweet/activity/insert', 'post', JSON.stringify(data), 'application/json').then(res => {
-                    // $.operate.successCallback(res);
+                    $.operate.successCallback(res);
                 })
             }
 	    }
@@ -220,6 +219,12 @@
             let bodyDom = $(layero).find("iframe")[0].contentWindow;
             return bodyDom.document.getElementById(name);
         }
+        function exportData(id) {
+            promiseMethods('/sweet/activity/export', 'post', {activityId:id}).then(res => {
+                    // $.operate.successCallback(res);
+                    window.open(res);
+            })
+        }
         function onCheck (row, $element) {
             rowData = row;
         }