From 9a99fb4ddf4564e1adbe262a9159c439d2d02f03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9C18231669351=E2=80=9D?= <“1686821393@qq.com”> Date: Sat, 25 Mar 2023 18:00:54 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A1=E7=AE=97=E5=A2=9E=E5=8A=A0=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E5=90=8D=E7=A7=B0=E5=AD=97=E6=AE=B5=EF=BC=882023.3.25?= =?UTF-8?q?=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/task/TaskAuditServiceImpl.java | 21 ++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/CarbonSysBE1/src/main/java/edu/ncst/carbon/service/impl/task/TaskAuditServiceImpl.java b/CarbonSysBE1/src/main/java/edu/ncst/carbon/service/impl/task/TaskAuditServiceImpl.java index b828369..4b95023 100644 --- a/CarbonSysBE1/src/main/java/edu/ncst/carbon/service/impl/task/TaskAuditServiceImpl.java +++ b/CarbonSysBE1/src/main/java/edu/ncst/carbon/service/impl/task/TaskAuditServiceImpl.java @@ -21,11 +21,13 @@ import edu.ncst.carbon.model.task.TaskAudit; import edu.ncst.carbon.service.IImageService; import edu.ncst.carbon.service.ITaskAuditService; import edu.ncst.carbon.service.impl.image.ImageServiceImpl; +import edu.ncst.carbon.utils.CalendarUtil; import edu.ncst.carbon.utils.ImageUtils; import edu.ncst.carbon.utils.SessionUtils; import edu.ncst.carbon.vo.ListResultVO; import edu.ncst.carbon.vo.Query; import edu.ncst.carbon.vo.user.UserInfoVO; +import edu.ncst.carbon.vo.wechat.SportDay; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cache.annotation.CacheEvict; @@ -39,6 +41,7 @@ import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletRequest; import java.io.FileNotFoundException; +import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -79,11 +82,27 @@ public class TaskAuditServiceImpl extends ServiceImpl listResultVO = new ListResultVO<>(); - listResultVO.setList(page.getRecords()); +// listResultVO.setList(page.getRecords()); listResultVO.setTotal(page.getTotal()); listResultVO.setCurrent(page.getCurrent()); listResultVO.setPageSize(page.getSize()); + List list = new ArrayList<>(); + + for(TaskAudit item: listResultVO.getList()){ + switch (item.getStatus()){ + case "1": + item.setStatus("待审核");break; + case "2": + item.setStatus("审核通过");break; + case "3": + item.setStatus("审核未通过");break; + case "0": + item.setStatus("完成");break; + } + list.add(item); + } + listResultVO.setList(list); return listResultVO; }