导出

zxkf-api/src/main/java/api/controller/Report/WorkReportController.java

@@ -9,6 +9,7 @@ import api.entity.view.system.CustomerViewExportView;
 import api.model.AjaxResult;
 import api.service.order.IReportBaseService;
 import api.util.annotation.Anonymous;
+
 import api.util.annotation.Log;
 import api.util.enums.BusinessType;
 import api.util.helper.ExcelHelper;
@@ -28,6 +29,8 @@ import org.springframework.web.bind.annotation.RestController;
 
 import java.text.SimpleDateFormat;
 import java.util.*;
+import java.util.stream.Collectors;
+
 @Api(value = "报表",tags = "报表")
 @RestController
 @RequestMapping("/WorkReport")
@@ -44,7 +47,7 @@ public class WorkReportController extends BaseController {
     }
     @ApiOperation("在线客服工作报表导出Excel")
     @Log(title = "在线客服工作报表导出excel", businessType = BusinessType.EXPORT)
-    @GetMapping("/OnlineServiceExcel")
+    @GetMapping("/OnlineService/exportExcel")
     public void OnlineServiceExcel(ScreenReport input) {
         var table= ReportBaseService.selectOnlineServiceReport( input);
 
@@ -75,7 +78,7 @@ public class WorkReportController extends BaseController {
     }
     @ApiOperation("工单分类报表导出Excel")
     @Log(title = "工单分类报表导出excel", businessType = BusinessType.EXPORT)
-    @GetMapping("/WorkOrderTypeExcel")
+    @GetMapping("/WorkOrderType/exportExcel")
     public void WorkOrderTypeExportExcel(ScreenReport input) {
         var table= ReportBaseService.selectWorkOrderTypeReport( input);
         if (table != null && table.size() > 0) {
@@ -91,7 +94,6 @@ public class WorkReportController extends BaseController {
                 }
             }
         }
-
         ExcelHelper<WorkOrderTypeReport> excel = new ExcelHelper<>(WorkOrderTypeReport.class);
         excel.exportExcel("xlsx", table);
     }
@@ -122,7 +124,7 @@ public class WorkReportController extends BaseController {
     }
     @ApiOperation("话务工作报表导出Excel")
     @Log(title = "话务工作报表导出Excel", businessType = BusinessType.EXPORT)
-    @GetMapping("/RecordExcel")
+    @GetMapping("/Record/exportExcel")
     public void RecordExportExcel(ScreenReport input) {
         var table = ReportBaseService.selectRecordReport(input);
         if (table != null && table.size() > 0) {
@@ -142,6 +144,7 @@ public class WorkReportController extends BaseController {
             }
         }
         ExcelHelper<RecordReport> excel = new ExcelHelper<>(RecordReport.class);
+
         excel.exportExcel("xlsx", table);
     }
 

zxkf-entity/pom.xml

@@ -20,6 +20,12 @@
             <artifactId>swagger-models</artifactId>
             <version>1.6.2</version>
         </dependency>
+        <dependency>
+            <groupId>api</groupId>
+            <artifactId>zxkf-util</artifactId>
+            <version>1.0.0</version>
+            <scope>compile</scope>
+        </dependency>
 
     </dependencies>
 

zxkf-entity/src/main/java/api/entity/database/Report/ScreenReport.java

@@ -3,6 +3,7 @@ package api.entity.database.Report;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;
 
@@ -11,11 +12,13 @@ import java.util.Date;
 public class ScreenReport {
 
     /**开始时间**/
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty("开始时间")
     private Date startTime;
 
 
     /**结束时间**/
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty("结束时间")
     private Date endTime;
 

zxkf-entity/src/main/java/api/entity/database/Report/WorkOrderTypeReport.java

@@ -1,8 +1,10 @@
 package api.entity.database.Report;
 
+
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.springframework.core.annotation.Order;
 
 @ApiModel(value = "WorkOrderTypeReport", description = "工单分类报表")
 @Data
@@ -10,19 +12,14 @@ public class WorkOrderTypeReport {
 
     @ApiModelProperty("工单类型")
     private String type_name;
-
     @ApiModelProperty("总量")
     private long type_count;
-
     @ApiModelProperty("已处理量")
     private long processed;
-
     @ApiModelProperty("完成率")
     private String processedRate;
-
     @ApiModelProperty("完结量")
     private long completed;
-
     @ApiModelProperty("完结率")
     private String completedRate;
 }

zxkf-util/src/main/java/api/util/helper/ExcelHelper.java

@@ -1,15 +1,19 @@
 package api.util.helper;
 
+
 import com.alibaba.fastjson2.JSON;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.poi.hpsf.UnicodeString;
 import org.apache.poi.hssf.usermodel.*;
 import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.springframework.core.annotation.AnnotationAwareOrderComparator;
 import org.springframework.stereotype.Component;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.*;
+import java.lang.reflect.AnnotatedArrayType;
 import java.lang.reflect.Field;
 import java.math.BigDecimal;
 import java.text.DecimalFormat;
@@ -260,7 +264,7 @@ public class ExcelHelper<T> {
     public void exportExcel(String suffix, List<T> list, String title) {
         HttpServletResponse response=ServletHelper.getResponse();
         try {
-            Map<String, Field> filedMap = new HashMap<>();
+            LinkedHashMap<String, Field> filedMap = new LinkedHashMap<>();
             for (Field field : clazz.getDeclaredFields()) {
                 if (field.getAnnotation(ApiModelProperty.class) != null) {
                     filedMap.put(field.getAnnotation(ApiModelProperty.class).value(), field);
@@ -300,6 +304,8 @@ public class ExcelHelper<T> {
             cellStyle.setBorderBottom(BorderStyle.THIN);
             cellStyle.setBorderLeft(BorderStyle.THIN);
             cellStyle.setBorderRight(BorderStyle.THIN);
+            cellStyle.setAlignment(HorizontalAlignment.CENTER);
+
 
             int limit=60000;
             int rowindex=0;
@@ -317,6 +323,26 @@ public class ExcelHelper<T> {
                 }
             }
 
+            for (int columnNum = 0; columnNum <= filedMap.size(); columnNum++)
+            {
+                int columnWidth = sheet.getColumnWidth(columnNum) / 256;//获取当前列宽
+                for (int rowNum = 0; rowNum <= sheet.getLastRowNum(); rowNum++)
+                {
+                    Row  currentRow = sheet.getRow(rowNum);
+                    if (currentRow.getCell(columnNum) != null)
+                    {
+                        Cell currentCell = currentRow.getCell(columnNum);
+                        int length = currentCell.toString().getBytes("UTF-8").length;//获取当前单元格的内容宽度
+                        if (columnWidth < length)//若当前单元格内容宽度大于列宽，则调整列宽为当前单元格宽度
+                        {
+                            columnWidth = length;
+                        }
+                    }
+                }
+                sheet.setColumnWidth(columnNum, columnWidth * 256);
+            }
+
+
             if (StringHelper.isEmpty(title)) {
                 title = System.currentTimeMillis() + "";
             }
@@ -347,7 +373,7 @@ public class ExcelHelper<T> {
      * @param wb
      * @param filedMap
      */
-    private Sheet createSheet(Workbook wb,Map<String, Field> filedMap,CellStyle style){
+    private Sheet createSheet(Workbook wb,LinkedHashMap<String, Field> filedMap,CellStyle style){
         Sheet sheet = wb.createSheet();
         Row headerRow = sheet.createRow(0);
         headerRow.setHeightInPoints(16);
@@ -388,7 +414,7 @@ public class ExcelHelper<T> {
      * @param t
      * @param style
      */
-    private void createRow(Sheet sheet,int rowindex,Map<String, Field> filedMap,T t,CellStyle style)
+    private void createRow(Sheet sheet,int rowindex,LinkedHashMap<String, Field> filedMap,T t,CellStyle style)
     {
         Row row = sheet.createRow(rowindex);
         row.setHeightInPoints(16);