From 14b568a466b548b6b7014b941390a86de56e6ff3 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期五, 18 八月 2023 20:05:03 +0800
Subject: [PATCH] #产出计算
---
server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordExtServiceImpl.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordExtServiceImpl.java b/server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordExtServiceImpl.java
index 4858697..49064a0 100644
--- a/server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordExtServiceImpl.java
+++ b/server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordExtServiceImpl.java
@@ -1687,10 +1687,10 @@
if(model.getUserInfo()!=null){
model.setUserName(model.getUserInfo().getUserName());
model.setDepartName(model.getUserInfo().getDepartName());
- model.setNum(model.getNum().setScale(2));
- model.setQualifiedNum(model.getQualifiedNum().setScale(2));
- model.setUnQualifiedNum(model.getUnQualifiedNum().setScale(2));
-
+ model.setNum(Objects.isNull(model.getNum()) ? model.getNum().setScale(2) : new BigDecimal("0"));
+ model.setQualifiedNum(Objects.isNull(model.getQualifiedNum()) ? model.getQualifiedNum().setScale(2) : new BigDecimal("0"));
+ model.setUnQualifiedNum(Objects.isNull(model.getUnQualifiedNum()) ? model.getUnQualifiedNum().setScale(2): new BigDecimal("0"));
+ model.setRate(Objects.isNull(model.getRate()) ? model.getRate().setScale(2): new BigDecimal("0"));
}
}
ExcelExporter.build(UserSalaryListVO.class).export(result, "鍛樺伐缁╂晥鏄庣粏"+System.currentTimeMillis(), response);
--
Gitblit v1.9.3