From 653cb0ed3e7be231059480cee266b11f1c9ba11e Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 11 七月 2025 11:52:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TAppealServiceImpl.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 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 c40fd30..8c12ffc 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
@@ -78,7 +78,11 @@
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));
+ if (taskListVO.getDistance()!=null){
+ taskListVO.setDistance(taskListVO.getDistance().divide(new BigDecimal(1000),2, RoundingMode.HALF_DOWN));
+ }else{
+ taskListVO.setDistance(new BigDecimal(0));
+ }
}
pageInfo.setRecords(list);
return pageInfo;
@@ -89,7 +93,7 @@
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));
+ taskListAllVO.setDistance(taskListAllVO.getDistance().divide(new BigDecimal(1000),2, RoundingMode.HALF_DOWN));
if (taskListAllVO.getStatus()==1 || taskListAllVO.getStatus()==2 ){
taskListAllVO.setStatus(1);
}else{
--
Gitblit v1.7.1