From 23081b2ebf01f9b64306effb4447705ccf667ce3 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期一, 21 八月 2023 14:14:25 +0800
Subject: [PATCH] # 删除 a.status = 和字段 a.code
---
server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordExtServiceImpl.java | 9 ++++-----
1 files changed, 4 insertions(+), 5 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 49064a0..d155676 100644
--- a/server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordExtServiceImpl.java
+++ b/server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordExtServiceImpl.java
@@ -1687,14 +1687,13 @@
if(model.getUserInfo()!=null){
model.setUserName(model.getUserInfo().getUserName());
model.setDepartName(model.getUserInfo().getDepartName());
- 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"));
+ model.setNum(Constants.formatBigdecimalFloat(model.getNum(),2));
+ model.setQualifiedNum(Constants.formatBigdecimalFloat(model.getQualifiedNum(),2));
+ model.setUnQualifiedNum(Constants.formatBigdecimalFloat(model.getUnQualifiedNum(),2));
+ model.setRate(Constants.formatBigdecimalFloat(model.getRate(),2));
}
}
ExcelExporter.build(UserSalaryListVO.class).export(result, "鍛樺伐缁╂晥鏄庣粏"+System.currentTimeMillis(), response);
-
}
@Override
public void exportSalaryStatistics(PageWrap<QuerySalaryStatisticDTO> pageWrap, HttpServletResponse response){
--
Gitblit v1.9.3