Merge branch 'fixbug-1015367' into 'master'

'导出授权码去掉授权码字段'

See merge request rays/pcloud-book!202

pcloud-service-book/src/main/java/com/pcloud/book/copyright/biz/impl/BookAuthCodeBizImpl.java

@@ -371,7 +371,7 @@ public class BookAuthCodeBizImpl implements BookAuthCodeBiz {
         }
         //表名
         String title = "《" + bookDto.getBookName() + "》" + "的授权码";
-        String[] rowsName = {"序号", "授权码", "完整授权码", "生成方式", "状态", "创建时间"};
+        String[] rowsName = {"序号", "完整授权码", "生成方式", "状态", "创建时间"};
         String fileUrl = "";
         String finalTitle = title;
         //不管是全部导出还是导出部分，都使用异步处理
@@ -443,13 +443,13 @@ public class BookAuthCodeBizImpl implements BookAuthCodeBiz {
                 }
                 Object[] objs = new Object[rowsNameList.size()];
                 objs[0] = i + 1;
-                objs[1] = bookAuthCode.getAuthCode();
-                objs[2] = bookAuthCode.getFullCode();
+                //objs[1] = bookAuthCode.getAuthCode();
+                objs[1] = bookAuthCode.getFullCode();
                 CopyrightConstants.CreateType createType = CopyrightConstants.CreateType.CRATE_TYPE_MAP.get(bookAuthCode.getCreateType());
-                objs[3] = null == createType ? "-" : createType.getName();
-                objs[4] = bookAuthCode.getUseCount() > 0 ? "已使用" : "未使用";
+                objs[2] = null == createType ? "-" : createType.getName();
+                objs[3] = bookAuthCode.getUseCount() > 0 ? "已使用" : "未使用";
                 SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-                objs[5] = bookAuthCode.getCreatedDate() != null ? df.format(bookAuthCode.getCreatedDate()) : "";
+                objs[4] = bookAuthCode.getCreatedDate() != null ? df.format(bookAuthCode.getCreatedDate()) : "";
                 dataList.add(objs);
                 fileUrl = exportConsr.exportExcel(title, rowsName, dataList);
             }
@@ -516,20 +516,20 @@ public class BookAuthCodeBizImpl implements BookAuthCodeBiz {
                     SXSSFCell cell0 = srow.createCell(0);
                     cell0.setCellStyle(dataStyle);
                     cell0.setCellValue(k++);
-                    SXSSFCell cell1 = srow.createCell(1);
+                    /*SXSSFCell cell1 = srow.createCell(1);
                     cell1.setCellStyle(dataStyle);
-                    cell1.setCellValue(bookAuthCodeDTO.getAuthCode());
-                    SXSSFCell cell2 = srow.createCell(2);
+                    cell1.setCellValue(bookAuthCodeDTO.getAuthCode());*/
+                    SXSSFCell cell2 = srow.createCell(1);
                     cell2.setCellStyle(dataStyle);
                     cell2.setCellValue(bookAuthCodeDTO.getFullCode());
-                    SXSSFCell cell3 = srow.createCell(3);
+                    SXSSFCell cell3 = srow.createCell(2);
                     cell3.setCellStyle(dataStyle);
                     CopyrightConstants.CreateType createType = CopyrightConstants.CreateType.CRATE_TYPE_MAP.get(bookAuthCodeDTO.getCreateType());
                     cell3.setCellValue(null == createType ? "-" : createType.getName());
-                    SXSSFCell cell4 = srow.createCell(4);
+                    SXSSFCell cell4 = srow.createCell(3);
                     cell4.setCellStyle(dataStyle);
                     cell4.setCellValue(bookAuthCodeDTO.getUseCount() > 0 ? "已使用" : "未使用");
-                    SXSSFCell cell5 = srow.createCell(5);
+                    SXSSFCell cell5 = srow.createCell(4);
                     cell5.setCellStyle(dataStyle);
                     cell5.setCellValue(bookAuthCodeDTO.getCreatedDate() != null ? df.format(bookAuthCodeDTO.getCreatedDate()) : "");
                 }