From 627c3e0a6920131d75eafa4646db373ccc936546 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 26 十月 2023 13:52:07 +0800
Subject: [PATCH] 小程序diamante
---
server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordExtServiceImpl.java | 12 ++++++++++--
1 files changed, 10 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..81e09f4 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,14 @@
for(WorkorderRecordExtListVO model : result){
//鏌ヨ鐢熶骇浜哄憳濮撳悕
initProUser(user,model,allDepartList);
+<<<<<<< HEAD
+// BigDecimal s =new BigDecimal(Constants.formatIntegerNum(model.getSalary()));
+// s.divide(new BigDecimal(0),2);
+// model.setSalary(s.doubleValue());
+=======
+// int s= Constants.formatIntegerNum(model.getSalary());
+// model.setSalaryYuan(new BigDecimal(s).divide(new BigDecimal(100),2));
+>>>>>>> dev
}
}
return PageData.from(new PageInfo<>(result));
@@ -1766,7 +1774,7 @@
wreev.setDuration("-");
}
wreev.setSalaryType(re.getSalaryType());
- wreev.setSalaryPrice(re.getSalary());
+ wreev.setSalaryPrice(re.getSalaryYuan());
list.add(wreev);
}
@@ -1813,7 +1821,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