From c90003b80ba6e29eb2a45c1028a09789bad5dc20 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 14 八月 2023 18:43:01 +0800
Subject: [PATCH] 新增员工绩效分页查询接口
---
server/src/main/java/doumeemes/dao/ext/vo/UserSalaryListVO.java | 2 +-
server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordExtServiceImpl.java | 4 ++--
server/src/main/java/doumeemes/dao/business/model/WorkorderRecord.java | 4 ----
3 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/server/src/main/java/doumeemes/dao/business/model/WorkorderRecord.java b/server/src/main/java/doumeemes/dao/business/model/WorkorderRecord.java
index 7b1be66..42c564b 100644
--- a/server/src/main/java/doumeemes/dao/business/model/WorkorderRecord.java
+++ b/server/src/main/java/doumeemes/dao/business/model/WorkorderRecord.java
@@ -151,17 +151,13 @@
@ApiModelProperty(value = "鐢熶骇浜哄憳缂栫爜闆嗗悎锛圼1],[2],...褰㈠紡瀛樺偍锛屼紭鍖栨煡璇�)" )
@ExcelColumn(name="鐢熶骇浜哄憳缂栫爜闆嗗悎锛圼1],[2],...褰㈠紡瀛樺偍锛屼紭鍖栨煡璇�)")
private String proUserids;
-
@ApiModelProperty(value = "宸ュ崟鐘舵��" )
@TableField(exist = false)
private Integer workorderStatus;
-
-
@ApiModelProperty(value = "鐗╂枡璐ㄩ噺灞炴��0鍚堟牸 1涓嶈壇 2鎶ュ簾锛堝彧鏈塼ype=1鎵嶆湁鍊硷級" )
private Integer materialDonetype;
@ApiModelProperty(value = "鐗╂枡宸ュ簭缂栫爜锛堝叧鑱攑rocedure琛級" )
private Integer materialProcedureId;
-
@ApiModelProperty(value = "鍏宠仈绁ㄦ嵁缂栫爜锛堟姇鏂欐椂锛�" )
private Integer relobjId;
@ApiModelProperty(value = "鍏宠仈绁ㄦ嵁绫诲瀷 0宸ュ崟 1绡瓙鏇存崲鍗曡褰�" )
diff --git a/server/src/main/java/doumeemes/dao/ext/vo/UserSalaryListVO.java b/server/src/main/java/doumeemes/dao/ext/vo/UserSalaryListVO.java
index 7e44571..5ca376d 100644
--- a/server/src/main/java/doumeemes/dao/ext/vo/UserSalaryListVO.java
+++ b/server/src/main/java/doumeemes/dao/ext/vo/UserSalaryListVO.java
@@ -66,7 +66,7 @@
@ExcelColumn(name="涓嶈壇鍝佹暟")
private BigDecimal unQualifiedNum;
@ApiModelProperty(value = "鍚堟牸鐜囷紙%锛�")
- @ExcelColumn(name="鍚堟牸鐜�")
+ @ExcelColumn(name="鍚堟牸鐜�(%)")
private BigDecimal rate;
}
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 c200c20..75f7e0d 100644
--- a/server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordExtServiceImpl.java
+++ b/server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordExtServiceImpl.java
@@ -180,8 +180,8 @@
for(UserSalaryListVO model : result){
//鏌ヨ鐢熶骇浜哄憳濮撳悕
model.setUserInfo(initProUser(user,model.getUserId(),allDepartList));
- if(Constants.formatBigdecimal4Float(model.getNum()).compareTo(new BigDecimal(0))>1){
- model.setRate(Constants.formatBigdecimal4Float(model.getQualifiedNum()).divide(model.getNum()).multiply(new BigDecimal(100)));
+ if(Constants.formatBigdecimal4Float(model.getNum()).compareTo(new BigDecimal(0))>0){
+ model.setRate(Constants.formatBigdecimal4Float(model.getQualifiedNum()).divide(model.getNum(),4).multiply(new BigDecimal(100)));
}
}
}
--
Gitblit v1.9.3