From ead0a2f837503380c26f008338ac9ce026680e47 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 17 六月 2025 15:21:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TAppealServiceImpl.java | 31 +++++++++++++++++++++++++++++++
1 files changed, 31 insertions(+), 0 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TAppealServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TAppealServiceImpl.java
index 3bcb3c9..9c0e9eb 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TAppealServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TAppealServiceImpl.java
@@ -4,6 +4,9 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.core.domain.BaseModel;
+import com.ruoyi.system.applet.dto.AppealListDTO;
+import com.ruoyi.system.applet.query.AppealListQuery;
+import com.ruoyi.system.applet.vo.TaskListAllVO;
import com.ruoyi.system.mapper.TAppealMapper;
import com.ruoyi.system.mapper.TDeptMapper;
import com.ruoyi.system.mapper.TTaskDetailMapper;
@@ -19,6 +22,8 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
import java.util.Arrays;
import java.util.List;
@@ -53,4 +58,30 @@
pageInfo.setRecords(list);
return pageInfo;
}
+
+ @Override
+ public PageInfo<AppealListVO> pageListUser(AppealListQuery query) {
+ PageInfo<AppealListVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
+ List<AppealListVO> list = this.baseMapper.pageListUser(query,pageInfo);
+ for (AppealListVO taskListVO : list) {
+ taskListVO.setDistance(taskListVO.getDistance().divide(new BigDecimal(1000),2, RoundingMode.HALF_UP));
+ }
+ pageInfo.setRecords(list);
+ return pageInfo;
+ }
+
+ @Override
+ public List<TaskListAllVO> listAllTask(AppealListDTO query) {
+ PageInfo<AppealListVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
+ List<TaskListAllVO> list = this.baseMapper.listAllTask(query,pageInfo);
+ for (TaskListAllVO taskListAllVO : list) {
+ taskListAllVO.setDistance(taskListAllVO.getDistance().divide(new BigDecimal(1000),2, RoundingMode.HALF_UP));
+ if (taskListAllVO.getStatus()==1 || taskListAllVO.getStatus()==2 || taskListAllVO.getStatus()==3){
+ taskListAllVO.setStatus(1);
+ }else{
+ taskListAllVO.setStatus(2);
+ }
+ }
+ return list;
+ }
}
--
Gitblit v1.7.1