From 1f4e7d0f73a73e7350cf5a1df279d5f30904c5d5 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 06 十二月 2023 08:41:32 +0800
Subject: [PATCH] bug
---
server/src/main/java/doumeemes/service/ext/impl/StatisticsServiceImpl.java | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/server/src/main/java/doumeemes/service/ext/impl/StatisticsServiceImpl.java b/server/src/main/java/doumeemes/service/ext/impl/StatisticsServiceImpl.java
index 126abd9..ad37932 100644
--- a/server/src/main/java/doumeemes/service/ext/impl/StatisticsServiceImpl.java
+++ b/server/src/main/java/doumeemes/service/ext/impl/StatisticsServiceImpl.java
@@ -179,7 +179,7 @@
List<Unqualified7DayModel> result = new ArrayList<>();
Date date = DateUtil.getCurrentDate();
for (int i = 0; i < 7; i++) {
- Date td = DateUtil.addDaysToDate(date, 7-i);
+ Date td = DateUtil.addDaysToDate(date, i-6);
Unqualified7DayModel m = getReusltModelByDate(td,model);
if(m == null){
m = new Unqualified7DayModel();
@@ -219,7 +219,7 @@
List<RecordLogModel> result = workorderRecordExtMapper.getRecordLog(pageWrap.getModel());
if(result!=null){
for(RecordLogModel model : result){
- model.setUnqualifiedNum(new BigDecimal(0));
+ model.setUnqualifiedRate(new BigDecimal(0));
BigDecimal doneNum = Constants.formatBigdecimal(model.getUnqualifiedNum()).add(Constants.formatBigdecimal(model.getQualifiedNum()));
if(model.getUnqualifiedNum() !=null && doneNum.compareTo(new BigDecimal(0)) != 0){
//涓嶈壇鍝佺巼
@@ -288,6 +288,7 @@
QueryRouteProcedureExtDTO r = new QueryRouteProcedureExtDTO();
r.setRouteId(model.getRouteId());
r.setDeleted(Constants.ZERO);
+ r.setWorkPlanId(model.getId());
List<RouteProcedureExtListVO> list = routeProcedureExtMapper.selectStatisticsList(r);
List<WorkPlansProcedureModel> rList = new ArrayList<>();
if(list != null){
@@ -298,14 +299,14 @@
tt.setRate(new BigDecimal(0));
if( Constants.formatBigdecimal(t.getPlanNum()).compareTo(new BigDecimal(0)) >0){
//瀹屾垚鐜�
- tt.setRate(Constants.formatBigdecimal(t.getDoneNum()).divide(t.getPlanNum(),4).subtract(new BigDecimal(100)));
+ tt.setRate(Constants.formatBigdecimal(t.getQualifiedNum()).divide(t.getPlanNum(),4).multiply(new BigDecimal(100)));
}
tt.setPlanNum(Constants.formatBigdecimal(t.getPlanNum()));
- tt.setDoneNum(Constants.formatBigdecimal(t.getDoneNum()));
+ tt.setDoneNum(Constants.formatBigdecimal(t.getQualifiedNum()));
rList.add(tt);
//鏈�鍚庝竴鍒楃殑鑹搧鏁�/瀹屽伐鏁帮細涓哄綋鍓嶄骇鍝佹渶鍚庝竴閬撳伐搴忕殑鑹搧鏁�/瀹屽伐鏁�
- model.setNum(t.getPlanNum());
- model.setQualifiedNum(t.getDoneNum());
+ model.setDoneNum(t.getDoneNum());
+ model.setQualifiedNum(t.getQualifiedNum());
}
}
model.setProcedureList(rList);
@@ -317,7 +318,9 @@
private Unqualified7DayModel getReusltModelByDate(Date td, List<Unqualified7DayModel> model ) {
if(model !=null){
for(Unqualified7DayModel m : model){
- if(StringUtils.equals(DateUtil.getShortTime(td),DateUtil.getShortTime(m.getCreateTime()))){
+ String d1 = DateUtil.getShortTime(td);
+ String d2 = DateUtil.getShortTime(m.getCreateTime());
+ if(StringUtils.equals(d1,d2)){
return m;
}
}
--
Gitblit v1.9.3