From 519b464e4ed3d07bd5aa23a4067e5869058de2e5 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 26 十月 2023 13:36:51 +0800
Subject: [PATCH] 添加统计日志

---
 server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordExtServiceImpl.java |    5 +++++
 1 files changed, 5 insertions(+), 0 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 ac34454..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,9 +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));

--
Gitblit v1.9.3