From 0b6189c1c208a4f1c4cd4b230dba10b3581d1ff9 Mon Sep 17 00:00:00 2001
From: kongdeqiang <123456>
Date: 星期四, 16 五月 2024 16:01:16 +0800
Subject: [PATCH] fix: 获取司机配送员信息接口修改
---
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/serviceimpl/ISignCountServiceImpl.java | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 50 insertions(+), 3 deletions(-)
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/serviceimpl/ISignCountServiceImpl.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/serviceimpl/ISignCountServiceImpl.java
index 74f3c25..e4e8edf 100644
--- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/serviceimpl/ISignCountServiceImpl.java
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/serviceimpl/ISignCountServiceImpl.java
@@ -5,6 +5,7 @@
import cn.exrick.xboot.your.mapper.SignCountMapper;
import cn.exrick.xboot.your.entity.SignCount;
import cn.exrick.xboot.your.service.ISignCountService;
+import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -15,6 +16,7 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import java.math.BigDecimal;
import java.text.DecimalFormat;
import java.util.ArrayList;
import java.util.List;
@@ -103,27 +105,59 @@
List<OrderStatusCount> records = this.signCountMapper.signCount2New(orderStatusCount);
List<OrderStatusCount> recordsAll = this.signCountMapper.signCountNewTotal(orderStatusCount);
for (int i=0;i<records.size();i++) {
+ //if(records.get(i).getCarName()==null) continue;
for (OrderStatusCount statusCountx: recordsAll) {
+ //if(statusCountx.getCarName()==null) continue;
if(records.get(i).getCarName().equals(statusCountx.getCarName())){
- records.get(i).setSendMonth(statusCountx.getProportion());
+ if(statusCountx.getProportion().length()>6){
+ String ss = statusCountx.getProportion().replace("%","");
+ BigDecimal bigDecimal = new BigDecimal(ss);
+ double sss = bigDecimal.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
+ records.get(i).setName(sss + "%");
+ }else{
+ records.get(i).setName(statusCountx.getProportion());
+ }
break;
}
+ }
+ if(!StrUtil.isEmpty(records.get(i).getSignCount()) && !StrUtil.isEmpty(records.get(i).getAmount()) && !StrUtil.isEmpty(records.get(i).getNotSignCount())){
+ int abnormalSign = Integer.parseInt(records.get(i).getAmount())-Integer.parseInt(records.get(i).getSignCount())-Integer.parseInt(records.get(i).getNotSignCount());
+ if(abnormalSign<0){
+ abnormalSign = 0;
+ }
+ records.get(i).setAbnormalSign(abnormalSign + "");
+ }
+ if(records.get(i).getProportion().length()>6){
+ String ss = records.get(i).getProportion().replace("%","");
+ BigDecimal bigDecimal = new BigDecimal(ss);
+ double sss = bigDecimal.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
+ records.get(i).setProportion(sss+ "%");
}
//"oneBatch":"01娈�","twoBatch":"0","threeBatch":"0","fourBatch":"0","fiveBatch":"0"
if("0".equals(records.get(i).getOneBatch())){
records.get(i).setOneBatch(null);
+ }else{
+ records.get(i).setBatch("01娈�");
}
if("0".equals(records.get(i).getTwoBatch())){
records.get(i).setTwoBatch(null);
+ }else{
+ records.get(i).setBatch("02娈�");
}
if("0".equals(records.get(i).getThreeBatch())){
records.get(i).setThreeBatch(null);
+ }else{
+ records.get(i).setBatch("03娈�");
}
if("0".equals(records.get(i).getFourBatch())){
records.get(i).setFourBatch(null);
+ }else{
+ records.get(i).setBatch("04娈�");
}
if("0".equals(records.get(i).getFiveBatch())){
records.get(i).setFiveBatch(null);
+ }else{
+ records.get(i).setBatch("05娈�");
}
}
return records;
@@ -146,9 +180,22 @@
for (int i=0;i<records.size();i++) {
for (OrderStatusCount statusCountx: recordsAll) {
if(records.get(i).getCarName().equals(statusCountx.getCarName())){
- records.get(i).setSendMonth(statusCountx.getProportion());
+ if(statusCountx.getProportion().length()>6){
+ String ss = statusCountx.getProportion().replace("%","");
+ BigDecimal bigDecimal = new BigDecimal(ss);
+ double sss = bigDecimal.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
+ records.get(i).setSendMonth(sss + "%");
+ }else{
+ records.get(i).setSendMonth(statusCountx.getProportion());
+ }
break;
}
+ }
+ if(records.get(i).getProportion().length()>6){
+ String ss = records.get(i).getProportion().replace("%","");
+ BigDecimal bigDecimal = new BigDecimal(ss);
+ double sss = bigDecimal.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
+ records.get(i).setProportion(sss+ "%");
}
//"oneBatch":"01娈�","twoBatch":"0","threeBatch":"0","fourBatch":"0","fiveBatch":"0"
if("0".equals(records.get(i).getOneBatch())){
@@ -171,4 +218,4 @@
orderStatusCountIPage.setRecords(records);
return orderStatusCountIPage;
}
-}
+}
\ No newline at end of file
--
Gitblit v1.9.1