From dac20eee2dd2846158ba96f25a17f87d96d95743 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期五, 25 八月 2023 10:17:54 +0800
Subject: [PATCH] # 企业端用户

---
 server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordExtServiceImpl.java |   14 ++++++++++----
 1 files changed, 10 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 c3a9961..4bb1cc3 100644
--- a/server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordExtServiceImpl.java
+++ b/server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordExtServiceImpl.java
@@ -1757,10 +1757,16 @@
                 wreev.setQualifiedNum( (Objects.nonNull(re.getQualifiedNum()) ? re.getQualifiedNum() : 0)+unintname);
                 wreev.setUnqualifiedNum((Objects.nonNull(re.getUnqualifiedNum()) ? re.getQualifiedNum() : 0)+unintname);
                 Integer duration = re.getDuration();
-                Integer h = duration/3600;
-                Integer m = (duration%3600)/60;
-                Integer s = ((duration%3600)%60);
-                wreev.setDuration(h+"灏忔椂"+m+"鍒嗛挓"+s+"绉�");
+                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