From d7fe8ae3888c8e2b1eea3c1e3769be0d42a21cc9 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 16 十月 2023 09:03:47 +0800
Subject: [PATCH] Merge branch '1.0.3' of http://139.186.142.91:10010/r/productDev/dmMes into 1.0.3
---
server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordExtServiceImpl.java | 9 ++++++---
1 files changed, 6 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 4bb1cc3..ac96eba 100644
--- a/server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordExtServiceImpl.java
+++ b/server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordExtServiceImpl.java
@@ -137,6 +137,9 @@
for(WorkorderRecordExtListVO model : result){
//鏌ヨ鐢熶骇浜哄憳濮撳悕
initProUser(user,model,allDepartList);
+// BigDecimal s =new BigDecimal(Constants.formatIntegerNum(model.getSalary()));
+// s.divide(new BigDecimal(0),2);
+// model.setSalary(s.doubleValue());
}
}
return PageData.from(new PageInfo<>(result));
@@ -1755,7 +1758,7 @@
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();
if (Objects.nonNull(duration)){
Integer h = duration/3600;
@@ -1766,7 +1769,7 @@
wreev.setDuration("-");
}
wreev.setSalaryType(re.getSalaryType());
- wreev.setSalaryPrice(re.getSalaryPrice());
+ wreev.setSalaryPrice(re.getSalary());
list.add(wreev);
}
@@ -1813,7 +1816,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