From 60b3a617617ae46ba72bc04cee50c67ddf30a76c Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期二, 24 十月 2023 18:16:30 +0800
Subject: [PATCH] 111
---
server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordExtServiceImpl.java | 6 ++++--
1 files changed, 4 insertions(+), 2 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 a323db6..a9265ac 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,8 @@
for(WorkorderRecordExtListVO model : result){
//鏌ヨ鐢熶骇浜哄憳濮撳悕
initProUser(user,model,allDepartList);
+// int s= Constants.formatIntegerNum(model.getSalary());
+// model.setSalaryYuan(new BigDecimal(s).divide(new BigDecimal(100),2));
}
}
return PageData.from(new PageInfo<>(result));
@@ -1766,7 +1768,7 @@
wreev.setDuration("-");
}
wreev.setSalaryType(re.getSalaryType());
- wreev.setSalaryPrice(re.getSalary());
+ wreev.setSalaryPrice(re.getSalaryYuan());
list.add(wreev);
}
@@ -1813,7 +1815,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