From 82c525da4e13329733ecbd9bca30124f0eb91081 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 18 八月 2023 21:57:29 +0800
Subject: [PATCH] 111
---
server/src/main/java/doumeemes/service/ext/impl/WorkorderExtServiceImpl.java | 18 +++++++++++-------
server/src/main/java/doumeemes/api/ext/SalaryParamExtController.java | 4 ++--
2 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/server/src/main/java/doumeemes/api/ext/SalaryParamExtController.java b/server/src/main/java/doumeemes/api/ext/SalaryParamExtController.java
index 0fab8d6..fc22dd3 100644
--- a/server/src/main/java/doumeemes/api/ext/SalaryParamExtController.java
+++ b/server/src/main/java/doumeemes/api/ext/SalaryParamExtController.java
@@ -92,9 +92,9 @@
}
@ApiOperation("鍒楄〃鏌ヨ")
- @PostMapping("/querytList")
+ @PostMapping("/queryList")
@RequiresPermissions("business:salaryparam:query")
- public ApiResponse<List<SalaryParam>> querytList(@RequestBody SalaryParam salaryParam) {
+ public ApiResponse<List<SalaryParam>> queryList(@RequestBody SalaryParam salaryParam) {
List<SalaryParam> data = salaryParamService.findList(salaryParam);
return ApiResponse.success(data);
}
diff --git a/server/src/main/java/doumeemes/service/ext/impl/WorkorderExtServiceImpl.java b/server/src/main/java/doumeemes/service/ext/impl/WorkorderExtServiceImpl.java
index 73db15a..16b82d8 100644
--- a/server/src/main/java/doumeemes/service/ext/impl/WorkorderExtServiceImpl.java
+++ b/server/src/main/java/doumeemes/service/ext/impl/WorkorderExtServiceImpl.java
@@ -407,8 +407,8 @@
tModle.setUrgent(w.getUrgent());
tModle.setUpdateTime(w.getUpdateTime());
tModle.setRemark(w.getRemark());
- tModle.setQualifiedNum(0);
- tModle.setUnqualifiedNum(0);
+ tModle.setQualifiedNum(w.getQualifiedNum());
+ tModle.setUnqualifiedNum(w.getUnqualifiedNum());
tModle.setProUserId(w.getProUserId());
tModle.setProUserName(w.getProUserName());
tModle.setProUserName(w.getProUserName());
@@ -450,13 +450,17 @@
//浜у嚭鏃ユ湡
tModle.setProduceDate(r.getCreateTime());
}
- if(Constants.equalsInteger(r.getDoneType(),Constants.ZERO)){
+// if(Constants.equalsInteger(r.getDoneType(),Constants.ZERO)){
//濡傛灉鏄悎鏍间骇鍑�
- tModle.setQualifiedNum(tModle.getQualifiedNum()+Constants.formatBigdecimal(r.getNum()).intValue());
- }else{
+// tModle.setQualifiedNum(tModle.getQualifiedNum()+Constants.formatBigdecimal(r.getNum()).intValue());
+// }else{
//濡傛灉鏄笉鑹搧
- tModle.setUnqualifiedNum(tModle.getUnqualifiedNum()+Constants.formatBigdecimal(r.getNum()).intValue());
- }
+// tModle.setUnqualifiedNum(tModle.getUnqualifiedNum()+Constants.formatBigdecimal(r.getNum()).intValue());
+// }
+ //濡傛灉鏄悎鏍间骇鍑�
+ tModle.setQualifiedNum(tModle.getQualifiedNum());
+ //濡傛灉鏄笉鑹搧
+ tModle.setUnqualifiedNum(tModle.getUnqualifiedNum());
}
}
}
--
Gitblit v1.9.3