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 | 10 +++++----- 1 files changed, 5 insertions(+), 5 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 9826144..ad37932 100644 --- a/server/src/main/java/doumeemes/service/ext/impl/StatisticsServiceImpl.java +++ b/server/src/main/java/doumeemes/service/ext/impl/StatisticsServiceImpl.java @@ -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){ //涓嶈壇鍝佺巼 @@ -299,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).multiply(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); -- Gitblit v1.9.3