From 3e17b898ed5c4a62fbad777f39c3f89953345ff2 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期三, 29 七月 2026 16:38:42 +0800
Subject: [PATCH] 修改工资计算
---
src/main/java/com/ruoyi/technology/service/impl/TechnologyOperationServiceImpl.java | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/technology/service/impl/TechnologyOperationServiceImpl.java b/src/main/java/com/ruoyi/technology/service/impl/TechnologyOperationServiceImpl.java
index a407cd6..949530a 100644
--- a/src/main/java/com/ruoyi/technology/service/impl/TechnologyOperationServiceImpl.java
+++ b/src/main/java/com/ruoyi/technology/service/impl/TechnologyOperationServiceImpl.java
@@ -47,6 +47,9 @@
*/
@Override
public R add(TechnologyOperationDto technologyOperationDto) {
+ if (technologyOperationDto == null || technologyOperationDto.getType() == null || technologyOperationDto.getType() != 1) {
+ return R.fail("宸ュ簭浠呮敮鎸佽浠�");
+ }
TechnologyOperation technologyOperation = new TechnologyOperation();
BeanUtils.copyProperties(technologyOperationDto, technologyOperation);
boolean saved = technologyOperationMapper.insert(technologyOperation) > 0;
@@ -62,6 +65,9 @@
if (technologyOperation.getId() == null) {
return R.fail("宸ュ簭ID涓嶈兘涓虹┖");
}
+ if (technologyOperation.getType() == null || technologyOperation.getType() != 1) {
+ return R.fail("宸ュ簭浠呮敮鎸佽浠�");
+ }
boolean updated = technologyOperationMapper.update(
null,
Wrappers.<TechnologyOperation>lambdaUpdate()
@@ -70,6 +76,10 @@
.set(TechnologyOperation::getNo, technologyOperation.getNo())
.set(TechnologyOperation::getRemark, technologyOperation.getRemark())
.set(TechnologyOperation::getSalaryQuota, technologyOperation.getSalaryQuota())
+ .set(TechnologyOperation::getStandardQuantity, technologyOperation.getStandardQuantity())
+ .set(TechnologyOperation::getViolinFactor, technologyOperation.getViolinFactor())
+ .set(TechnologyOperation::getViolaFactor, technologyOperation.getViolaFactor())
+ .set(TechnologyOperation::getBassFactor, technologyOperation.getBassFactor())
.set(TechnologyOperation::getIsQuality, technologyOperation.getIsQuality())
.set(TechnologyOperation::getIsProduction, technologyOperation.getIsProduction())
.set(TechnologyOperation::getType, technologyOperation.getType())
--
Gitblit v1.9.3