diff --git a/src/main/java/com/bonus/aqgqj/business/backstage/controller/plan/PlanApplyController.java b/src/main/java/com/bonus/aqgqj/business/backstage/controller/plan/PlanApplyController.java index 3c22b24..8f32165 100644 --- a/src/main/java/com/bonus/aqgqj/business/backstage/controller/plan/PlanApplyController.java +++ b/src/main/java/com/bonus/aqgqj/business/backstage/controller/plan/PlanApplyController.java @@ -17,12 +17,15 @@ import io.swagger.annotations.Api; import lombok.extern.slf4j.Slf4j; import org.apache.poi.ss.usermodel.Workbook; import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; import javax.servlet.ServletOutputStream; +import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.net.URLEncoder; import java.util.List; +import java.util.Objects; /** * @className:PlanApplyController @@ -213,6 +216,9 @@ public class PlanApplyController { */ 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/aqgqj/business/backstage/controller/plan/PlanAuditController.java b/src/main/java/com/bonus/aqgqj/business/backstage/controller/plan/PlanAuditController.java index aa14be4..2ac4808 100644 --- a/src/main/java/com/bonus/aqgqj/business/backstage/controller/plan/PlanAuditController.java +++ b/src/main/java/com/bonus/aqgqj/business/backstage/controller/plan/PlanAuditController.java @@ -24,6 +24,7 @@ import javax.servlet.http.HttpServletResponse; import java.net.URLEncoder; import java.util.ArrayList; import java.util.List; +import java.util.Objects; /** * @className:PlanAuditController @@ -88,9 +89,9 @@ public class PlanAuditController { final int[] num = {1}; list.forEach(vo -> { PlanAuditExportVo exportVo = new PlanAuditExportVo(); + BeanUtils.copyProperties(vo, exportVo); exportVo.setId(num[0]); exportVo.setStatus(getStatus(vo.getStatusType(),vo.getStatus())); - BeanUtils.copyProperties(vo, exportVo); num[0]++; exportList.add(exportVo); }); @@ -116,6 +117,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 "审核通过"; diff --git a/src/main/java/com/bonus/aqgqj/business/backstage/service/plan/PlanApplyService.java b/src/main/java/com/bonus/aqgqj/business/backstage/service/plan/PlanApplyService.java index 1e41c15..304945c 100644 --- a/src/main/java/com/bonus/aqgqj/business/backstage/service/plan/PlanApplyService.java +++ b/src/main/java/com/bonus/aqgqj/business/backstage/service/plan/PlanApplyService.java @@ -5,7 +5,9 @@ import com.bonus.aqgqj.business.backstage.entity.plan.PlanApplyVo; import com.bonus.aqgqj.business.backstage.entity.plan.PlanDetailVo; import com.bonus.aqgqj.manager.webResult.AjaxResult; import com.bonus.aqgqj.manager.webResult.ServerResponse; +import org.springframework.web.multipart.MultipartFile; +import javax.servlet.http.HttpServletRequest; import java.util.List; /**