init3

src/main/java/com/hr/controller/DemoController.java

@@ -148,22 +148,26 @@ public class DemoController {
         d1.setName("名字1");
         d1.setTestCode("test1");
         d1.setMydate(new Date());
+        d1.setSex("1");
         list.add(d1);
         DemoExcelDto d2 = new DemoExcelDto();
         d2.setName("名字2");
         d2.setTestCode("test2");
         d2.setMydate(new Date());
+        d2.setSex("2");
         list.add(d2);
         DemoExcelDto d3 = new DemoExcelDto();
         d3.setName("名字3");
         d3.setTestCode("test3");
         d3.setMydate(new Date());
+        d3.setSex("2");
         list.add(d3);
 
         DemoExcelDto d4 = new DemoExcelDto();
         d4.setName("名字4");
         d4.setTestCode("test4");//没有值则导出来是空白
         d4.setMydate(new Date());
+        d4.setSex("2");
         list.add(d4);
 
         return util.exportExcel(response, list, "字典数据");
@@ -244,7 +248,7 @@ public class DemoController {
     }
 
     @GetMapping("list1")
-    public MyDto list1() {
+    public MyDto<JSONObject> list1() {
 
         log.info("list1");
 

src/main/java/com/hr/dto/DemoExcelDto.java

@@ -34,4 +34,13 @@ public class DemoExcelDto {
             dateFormat = "yyyy-MM-dd HH:mm:ss"
     )
     private Date mydate;
+
+    @Excel(
+            name = "性别",
+            cellType = Excel.ColumnType.STRING,
+            headerColor= IndexedColors.GREY_40_PERCENT,
+            dictName = "sex"
+
+    )
+    private String sex;
 }

src/main/java/com/hr/dto/MyDto.java

@@ -10,13 +10,13 @@ public class  MyDto<T> extends BaseReturnDto<T> {
    public MyDto(int code, String msg, T data) {
       super(code, msg,data);
    }
-   public static MyDto success( Object data) {
-      return new MyDto(200, "success",data);
+   public static <T>  MyDto<T> success(T data) {
+      return new MyDto<T>(200, "success",data);
    }
-   public static MyDto error( Object data) {
+   public static <T> MyDto<T> error( Object data) {
       return new MyDto(0, "error",data);
    }
-   public static MyDto success( ) {
+   public static <T> MyDto<T> success( ) {
       return new MyDto(200, "success",null);
    }
 

src/main/java/com/hr/repository/service/DemoAsyncServer.java

@@ -8,6 +8,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.concurrent.CompletableFuture;
 
@@ -31,6 +32,8 @@ public class DemoAsyncServer {
         return CompletableFuture.completedFuture(String.valueOf(i));
     }
 
+//    @GlobalTransactional
+    @Transactional
     @Async("asyncExecutor")
     public CompletableFuture<String> testAsyncThread(int i){
         try {