diff --git a/src/main/java/com/bonus/gzgqj/business/plan/controller/ExportController.java b/src/main/java/com/bonus/gzgqj/business/plan/controller/ExportController.java index e26730e..fdfec05 100644 --- a/src/main/java/com/bonus/gzgqj/business/plan/controller/ExportController.java +++ b/src/main/java/com/bonus/gzgqj/business/plan/controller/ExportController.java @@ -27,6 +27,7 @@ import java.io.File; import java.net.URLEncoder; import java.util.ArrayList; import java.util.List; +import java.util.Objects; /** * @author 黑子 @@ -450,6 +451,9 @@ public class ExportController { */ private String getStatus(String statusType,String status) { try { + if(Objects.equals(statusType,"0") && Objects.equals(status,"0")){ + return "已撤回"; + } String company =""; if("1".equals(statusType)) { return "审核通过"; diff --git a/src/main/java/com/bonus/gzgqj/business/plan/controller/PlanAuditController.java b/src/main/java/com/bonus/gzgqj/business/plan/controller/PlanAuditController.java index d3fd223..f07cd89 100644 --- a/src/main/java/com/bonus/gzgqj/business/plan/controller/PlanAuditController.java +++ b/src/main/java/com/bonus/gzgqj/business/plan/controller/PlanAuditController.java @@ -4,6 +4,7 @@ import java.net.URLEncoder; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Objects; import cn.afterturn.easypoi.excel.ExcelExportUtil; import cn.afterturn.easypoi.excel.entity.ExportParams; @@ -117,6 +118,9 @@ public class PlanAuditController { */ private String getStatus(String statusType,String status) { try { + if(Objects.equals(statusType,"0") && Objects.equals(status,"0")){ + return "已撤回"; + } String company =""; if("1".equals(statusType)) { return "审核通过";