Merge branch 'pre' into 'master'

Pre

See merge request !309

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/smile/SmileShowBaseController.java

@@ -52,11 +52,11 @@ public class SmileShowBaseController extends BaseController {
     @GetMapping("/export")
     @ApiOperation("单个演出销售列表导出")
     @ResponseBody
-    public void export(String perId,String title, HttpServletResponse response) {
+    public void export(String perId, HttpServletResponse response) {
         ServletOutputStream servletOutputStream = null;
         try {
             response.setHeader(HttpHeaders.CONTENT_DISPOSITION, "attachment;filename="
-                    .concat(new String((title + DateUtil.getNowTime() + "代理数据").getBytes("gb2312"), StandardCharsets.ISO_8859_1)).concat(ExcelTypeEnum.XLSX.getValue()));
+                    .concat(new String(("演出id_" + perId + "_" + DateUtil.getNowTime() + "代理数据").getBytes("gb2312"), StandardCharsets.ISO_8859_1)).concat(ExcelTypeEnum.XLSX.getValue()));
             response.setContentType(MediaType.MULTIPART_FORM_DATA_VALUE);
             response.setCharacterEncoding(StandardCharsets.UTF_8.name());
             servletOutputStream = response.getOutputStream();
@@ -68,7 +68,7 @@ public class SmileShowBaseController extends BaseController {
             EasyExcel.write(servletOutputStream,UserDataExcel.class).sheet(saleDataVo.getTitle() + "演出销售列表导出").doWrite(rowsToExcels);
 
 */
-            smileShowService.exportData(servletOutputStream,perId,title);
+            smileShowService.exportData(servletOutputStream,perId);
 
         } catch (IOException e) {
             log.error("单个演出销售列表导出异常[performancesId={},ex.msg={}]", perId, e.getLocalizedMessage());

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/smile/smileTickets/saleData.html

@@ -112,7 +112,7 @@
     }
 
     function onexport(){
-        window.location.replace(window.location.protocol +"//"+window.location.host + '/smile/show/base/export?perId=' + '[[${saleDataVo.performancesId}]]'.replaceAll("\"", "") + '&title=' +encodeURIComponent('[[${saleDataVo.title}]]'.replaceAll("\"", "")))
+        window.location.replace(window.location.protocol +"//"+window.location.host + '/smile/show/base/export?perId=' + '[[${saleDataVo.performancesId}]]'.replaceAll("\"", ""))
     }
 </script>
 </body>

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/service/ISmileShowService.java

@@ -71,6 +71,6 @@ public interface ISmileShowService extends IService<SmileSchool> {
      */
     AjaxResult updateRedis();
 
-    void exportData(ServletOutputStream servletOutputStream, String performancesId,String title);
+    void exportData(ServletOutputStream servletOutputStream, String performancesId);
 
 }

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/service/impl/SmileShowServiceImpl.java

@@ -611,12 +611,12 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc
     }
 
     @Override
-    public void exportData(ServletOutputStream servletOutputStream, String performancesId,String title) {
+    public void exportData(ServletOutputStream servletOutputStream, String performancesId) {
         ExcelWriter writer = EasyExcelFactory.write(servletOutputStream).build();
         // 动态添加表头，适用一些表头动态变化的场景
         SaleDataVo saleDataVo = saleData(performancesId);
         WriteSheet sheet1 = new WriteSheet();
-        sheet1.setSheetName(title.replace("/","").concat("演出数据"));
+        sheet1.setSheetName("演出id_".concat(performancesId).concat("演出数据"));
         sheet1.setSheetNo(0);
 
         List<UserData> userDataList = saleDataVo.getUserDataList();