bonus
/
gz_safety_ma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

需求计划撤回

This commit is contained in:
cwchen 2025-03-24 14:30:27 +08:00
parent 6f86643e55
commit 846847436f
3 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/bonus/aqgqj/business/backstage/controller/plan/PlanApplyController.java
View File

@ -17,12 +17,15 @@ import io.swagger.annotations.Api;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.poi.ss.usermodel.Workbook; import org.apache.poi.ss.usermodel.Workbook;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource; import javax.annotation.Resource;
import javax.servlet.ServletOutputStream; import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.net.URLEncoder; import java.net.URLEncoder;
import java.util.List; import java.util.List;
import java.util.Objects;
/** /**
* @className:PlanApplyController * @className:PlanApplyController
@ -213,6 +216,9 @@ public class PlanApplyController {
*/ */
private String getStatus(String statusType, String status) { private String getStatus(String statusType, String status) {
try { try {
if(Objects.equals(statusType,"0") && Objects.equals(status,"0")){
return "已撤回";
}
String company = ""; String company = "";
if ("1".equals(statusType)) { if ("1".equals(statusType)) {
return "审核通过"; return "审核通过";

6
src/main/java/com/bonus/aqgqj/business/backstage/controller/plan/PlanAuditController.java
View File

@ -24,6 +24,7 @@ import javax.servlet.http.HttpServletResponse;
import java.net.URLEncoder; import java.net.URLEncoder;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Objects;
/** /**
* @className:PlanAuditController * @className:PlanAuditController
@ -88,9 +89,9 @@ public class PlanAuditController {
final int[] num = {1}; final int[] num = {1};
list.forEach(vo -> { list.forEach(vo -> {
PlanAuditExportVo exportVo = new PlanAuditExportVo(); PlanAuditExportVo exportVo = new PlanAuditExportVo();
BeanUtils.copyProperties(vo, exportVo);
exportVo.setId(num[0]); exportVo.setId(num[0]);
exportVo.setStatus(getStatus(vo.getStatusType(),vo.getStatus())); exportVo.setStatus(getStatus(vo.getStatusType(),vo.getStatus()));
BeanUtils.copyProperties(vo, exportVo);
num[0]++; num[0]++;
exportList.add(exportVo); exportList.add(exportVo);
}); });
@ -116,6 +117,9 @@ public class PlanAuditController {
*/ */
private String getStatus(String statusType, String status) { private String getStatus(String statusType, String status) {
try { try {
if(Objects.equals(statusType,"0") && Objects.equals(status,"0")){
return "已撤回";
}
String company = ""; String company = "";
if ("1".equals(statusType)) { if ("1".equals(statusType)) {
return "审核通过"; return "审核通过";

2
src/main/java/com/bonus/aqgqj/business/backstage/service/plan/PlanApplyService.java
View File

@ -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.business.backstage.entity.plan.PlanDetailVo;
import com.bonus.aqgqj.manager.webResult.AjaxResult; import com.bonus.aqgqj.manager.webResult.AjaxResult;
import com.bonus.aqgqj.manager.webResult.ServerResponse; import com.bonus.aqgqj.manager.webResult.ServerResponse;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletRequest;
import java.util.List; import java.util.List;
/** /**