From b5a63b29313463d1c2fd1b5678a2d6b2bb8a7044 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期五, 18 八月 2023 19:33:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordExtServiceImpl.java | 12 ++++++++++++
1 files changed, 12 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 75f7e0d..4858697 100644
--- a/server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordExtServiceImpl.java
+++ b/server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordExtServiceImpl.java
@@ -157,6 +157,9 @@
//鏌ヨ鐢熶骇浜哄憳濮撳悕
// model.setUserName(initProUser(user,model.getUserId(),allDepartList));
model.setUserInfo(initProUser(user,model.getUserId(),allDepartList));
+ model.setJijianSalary(model.getJijianSalary().divide(new BigDecimal("100"),2,BigDecimal.ROUND_HALF_UP));
+ model.setJishiSalary(model.getJishiSalary().divide(new BigDecimal("100"),2,BigDecimal.ROUND_HALF_UP));
+ model.setTotalSalary(model.getTotalSalary().divide(new BigDecimal("100"),2,BigDecimal.ROUND_HALF_UP));
}
}
return PageData.from(new PageInfo<>(result));
@@ -492,6 +495,7 @@
}
if(!Constants.equalsInteger(model.getWorkorderStatus(),Constants.WORKORDER_STATUS.create)
&& !Constants.equalsInteger(model.getWorkorderStatus(),Constants.WORKORDER_STATUS.material)
+ && !Constants.equalsInteger(model.getWorkorderStatus(),Constants.WORKORDER_STATUS.producing)
&& !Constants.equalsInteger(model.getWorkorderStatus(),Constants.WORKORDER_STATUS.check)
&& !Constants.equalsInteger(model.getWorkorderStatus(),Constants.WORKORDER_STATUS.done)){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "瀵逛笉璧凤紝璇ュ伐鍗曠姸鎬佸凡娴佽浆锛屼笉鑳借繘琛岃鎿嶄綔锛�");
@@ -529,6 +533,7 @@
}
if(!Constants.equalsInteger(model.getWorkorderStatus(),Constants.WORKORDER_STATUS.create)
&& !Constants.equalsInteger(model.getWorkorderStatus(),Constants.WORKORDER_STATUS.material)
+ && !Constants.equalsInteger(model.getWorkorderStatus(),Constants.WORKORDER_STATUS.producing)
&& !Constants.equalsInteger(model.getWorkorderStatus(),Constants.WORKORDER_STATUS.check)
&& !Constants.equalsInteger(model.getWorkorderStatus(),Constants.WORKORDER_STATUS.done)){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "瀵逛笉璧凤紝璇ュ伐鍗曠姸鎬佸凡娴佽浆锛屼笉鑳借繘琛岃鎿嶄綔锛�");
@@ -832,9 +837,11 @@
if(!Constants.equalsInteger(tModel.getDoneType(),Constants.ZERO)){
//濡傛灉涓嶈壇锛岀疮璁″伐鍗曠殑涓嶈壇浜у嚭
mp.setUnqualifiedNum(Constants.formatIntegerNum(mp.getUnqualifiedNum())+(Constants.formatBigdecimal(tModel.getNum()).intValue()));
+// mp.setUnqualifiedNum(mp.getUnqualifiedNum().add(tModel.getNum()));
}else{
//濡傛灉鏄悎鏍硷紝绱宸ュ崟鐨勫悎鏍兼暟閲�
mp.setQualifiedNum(Constants.formatIntegerNum(mp.getQualifiedNum())+(Constants.formatBigdecimal(tModel.getNum()).intValue()));
+// mp.setUnqualifiedNum(mp.getQualifiedNum().add(tModel.getNum()));
}
//妫�鏌ョ绛愭槸鍚﹁浣滀负浜у嚭绡瓙锛屽鏋滄槸锛屽垯闇�瑕佸垽鏂绡瓙鏄惁鎶曟枡浣欓涓�0
Appliances curUpdateModel = getApplianceFromList(tModel.getAppliancesId(),updateApplianceList);
@@ -1579,6 +1586,7 @@
}
if(!Constants.equalsInteger(mp.getStatus(),Constants.WORKORDER_STATUS.create)
&& !Constants.equalsInteger(mp.getStatus(),Constants.WORKORDER_STATUS.material)
+ && !Constants.equalsInteger(mp.getStatus(),Constants.WORKORDER_STATUS.producing)
&& !Constants.equalsInteger(mp.getStatus(),Constants.WORKORDER_STATUS.check)
&& !Constants.equalsInteger(mp.getStatus(),Constants.WORKORDER_STATUS.done)){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "瀵逛笉璧凤紝璇ュ伐鍗曠姸鎬佸凡娴佽浆锛屼笉鑳借繘琛岃鎿嶄綔锛�");
@@ -1679,6 +1687,10 @@
if(model.getUserInfo()!=null){
model.setUserName(model.getUserInfo().getUserName());
model.setDepartName(model.getUserInfo().getDepartName());
+ model.setNum(model.getNum().setScale(2));
+ model.setQualifiedNum(model.getQualifiedNum().setScale(2));
+ model.setUnQualifiedNum(model.getUnQualifiedNum().setScale(2));
+
}
}
ExcelExporter.build(UserSalaryListVO.class).export(result, "鍛樺伐缁╂晥鏄庣粏"+System.currentTimeMillis(), response);
--
Gitblit v1.9.3