From c5c6fa800cedd37cea0e3cc3e68df78b47ee2813 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 28 八月 2023 10:37:59 +0800
Subject: [PATCH] 111
---
server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordExtServiceImpl.java | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 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..09bf3d7 100644
--- a/server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordExtServiceImpl.java
+++ b/server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordExtServiceImpl.java
@@ -1755,12 +1755,18 @@
wreev.setDeviceCode(re.getDeviceCode()+"|"+re.getDeviceName());
wreev.setCreateTime(format.format(re.getCreateTime()));
wreev.setQualifiedNum( (Objects.nonNull(re.getQualifiedNum()) ? re.getQualifiedNum() : 0)+unintname);
- wreev.setUnqualifiedNum((Objects.nonNull(re.getUnqualifiedNum()) ? re.getQualifiedNum() : 0)+unintname);
+ wreev.setUnqualifiedNum((Objects.nonNull(re.getUnqualifiedNum()) ? re.getUnqualifiedNum() : 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.getSalary());
list.add(wreev);
}
@@ -1807,7 +1813,7 @@
wreev.setProcedureName(re.getProcedureName());
wreev.setUnintname(unintname);
if(re.getOmodel().getPlanNum() != null){
- wreev.setPlanNum(re.getOmodel().getPlanNum()+unintname );
+ wreev.setPlanNum(re.getOmodel().getPlanNum().toString() );
}
wreev.setMaterialDonetype(re.getMaterialDonetype());
wreev.setDeviceCode(re.getDeviceCode()+"|"+re.getDeviceName());
--
Gitblit v1.9.3