Merge branch 'release'

dev-finalcheck/pom.xml

@@ -36,10 +36,28 @@
         </dependency>
 
         <dependency>
-            <groupId>org.jeecgframework</groupId>
-            <artifactId>autopoi-web</artifactId>
-            <version>1.0.3</version>
+            <groupId>cn.afterturn</groupId>
+            <artifactId>easypoi-spring-boot-starter</artifactId>
         </dependency>
+        <dependency>
+            <groupId>cn.afterturn</groupId>
+            <artifactId>easypoi-base</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>cn.afterturn</groupId>
+            <artifactId>easypoi-web</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>cn.afterturn</groupId>
+            <artifactId>easypoi-annotation</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>29.0-jre</version>
+        </dependency>
+
 
     </dependencies>
 

dev-finalcheck/src/main/java/com/tykj/dev/device/finalcheck/controller/FinalCheckController.java

 package com.tykj.dev.device.finalcheck.controller;
 
+import cn.afterturn.easypoi.excel.ExcelExportUtil;
+import cn.afterturn.easypoi.excel.entity.TemplateExportParams;
 import com.tykj.dev.config.swagger.AutoDocument;
 import com.tykj.dev.device.finalcheck.entity.other.TimeParam;
 import com.tykj.dev.device.finalcheck.entity.vo.FinalDetailVo;
@@ -13,8 +15,6 @@ import io.swagger.annotations.ApiOperation;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.poi.ss.usermodel.Workbook;
-import org.jeecgframework.poi.excel.ExcelExportUtil;
-import org.jeecgframework.poi.excel.entity.TemplateExportParams;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.http.ResponseEntity;
@@ -161,6 +161,8 @@ public class FinalCheckController {
 
         map.put("list", listMap);
         params.setTemplateUrl("excelTemplate/finalCheck.xlsx");
+
+
         Workbook book = ExcelExportUtil.exportExcel(params, map);
 
 //

dev-finalcheck/src/main/java/com/tykj/dev/device/finalcheck/entity/domain/FinalReport.java

@@ -6,9 +6,8 @@ import com.tykj.dev.misc.base.BaseEntity;
 import com.tykj.dev.misc.utils.MapperUtils;
 import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
-import org.jeecgframework.poi.excel.annotation.Excel;
-import org.jeecgframework.poi.excel.annotation.ExcelTarget;
 
 import javax.persistence.Entity;
 import java.time.LocalDate;
@@ -21,6 +20,7 @@ import java.util.List;
  * @author Matrix <xhyrzldf@gmail.com>
  * @since 2020/9/24 at 6:14 下午
  */
+@EqualsAndHashCode(callSuper = true)
 @Data
 @NoArgsConstructor
 @AllArgsConstructor

dev-finalcheck/src/main/java/com/tykj/dev/device/finalcheck/entity/vo/FinalDetailVo.java

 package com.tykj.dev.device.finalcheck.entity.vo;
 
+import cn.afterturn.easypoi.excel.annotation.ExcelTarget;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiModel;
@@ -7,7 +8,6 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import org.jeecgframework.poi.excel.annotation.ExcelTarget;
 
 /**
  * finalDetailVo.

dev-finalcheck/src/main/java/com/tykj/dev/device/finalcheck/entity/vo/FinalReportVo.java

 package com.tykj.dev.device.finalcheck.entity.vo;
 
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import cn.afterturn.easypoi.excel.annotation.ExcelTarget;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
@@ -11,8 +13,6 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import org.jeecgframework.poi.excel.annotation.Excel;
-import org.jeecgframework.poi.excel.annotation.ExcelTarget;
 
 import java.time.LocalDate;
 import java.time.LocalDateTime;

pom.xml

@@ -53,6 +53,27 @@
     <dependencyManagement>
         <dependencies>
 
+            <dependency>
+                <groupId>cn.afterturn</groupId>
+                <artifactId>easypoi-spring-boot-starter</artifactId>
+                <version>3.3.0</version>
+            </dependency>
+            <dependency>
+                <groupId>cn.afterturn</groupId>
+                <artifactId>easypoi-base</artifactId>
+                <version>3.3.0</version>
+            </dependency>
+            <dependency>
+                <groupId>cn.afterturn</groupId>
+                <artifactId>easypoi-web</artifactId>
+                <version>3.3.0</version>
+            </dependency>
+            <dependency>
+                <groupId>cn.afterturn</groupId>
+                <artifactId>easypoi-annotation</artifactId>
+                <version>3.3.0</version>
+            </dependency>
+
             <dependency>
                 <groupId>com.tykj.dev</groupId>
                 <artifactId>union</artifactId>