From 8f918cb6db02c39e67ce7b0d77cc1be5ed26edaf Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期五, 25 八月 2023 11:03:28 +0800
Subject: [PATCH] # 企业端用户
---
server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordExtServiceImpl.java | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 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 6dfb8b2..4bb1cc3 100644
--- a/server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordExtServiceImpl.java
+++ b/server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordExtServiceImpl.java
@@ -1754,9 +1754,19 @@
wreev.setDeviceCode(re.getDeviceCode()+"|"+re.getDeviceName());
wreev.setCreateTime(format.format(re.getCreateTime()));
- wreev.setQualifiedNum(re.getQualifiedNum()+unintname);
- wreev.setUnqualifiedNum(re.getUnqualifiedNum()+unintname);
- wreev.setDuration(re.getDuration());
+ wreev.setQualifiedNum( (Objects.nonNull(re.getQualifiedNum()) ? re.getQualifiedNum() : 0)+unintname);
+ wreev.setUnqualifiedNum((Objects.nonNull(re.getUnqualifiedNum()) ? re.getQualifiedNum() : 0)+unintname);
+ Integer duration = re.getDuration();
+ if (Objects.nonNull(duration)){
+ Integer h = duration/3600;
+ Integer m = (duration%3600)/60;
+ Integer s = ((duration%3600)%60);
+ wreev.setDuration(h+"灏忔椂"+m+"鍒嗛挓"+s+"绉�");
+ }else {
+ wreev.setDuration("-");
+ }
+ wreev.setSalaryType(re.getSalaryType());
+ wreev.setSalaryPrice(re.getSalaryPrice());
list.add(wreev);
}
--
Gitblit v1.9.3