From 3d75411e392b483d9b2ab322e2dd0005027e28d2 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 18 八月 2023 23:10:27 +0800
Subject: [PATCH] 111
---
server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordStandardServiceImpl.java | 2 +-
server/src/main/java/doumeemes/dao/business/dto/CreateWorkorderRecordDTO.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/server/src/main/java/doumeemes/dao/business/dto/CreateWorkorderRecordDTO.java b/server/src/main/java/doumeemes/dao/business/dto/CreateWorkorderRecordDTO.java
index e10453f..29af15d 100644
--- a/server/src/main/java/doumeemes/dao/business/dto/CreateWorkorderRecordDTO.java
+++ b/server/src/main/java/doumeemes/dao/business/dto/CreateWorkorderRecordDTO.java
@@ -26,6 +26,6 @@
private Integer duration;
@ApiModelProperty(value = "鎶ュ伐绫诲瀷 0璁′欢 1璁℃椂" )
- private Integer salaryType;
+ private Integer type;
}
diff --git a/server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordStandardServiceImpl.java b/server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordStandardServiceImpl.java
index 99efc41..a322fce 100644
--- a/server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordStandardServiceImpl.java
+++ b/server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordStandardServiceImpl.java
@@ -1558,7 +1558,7 @@
workorderRecord.setQualifiedNum(createWorkorderRecordDTO.getQualifiedNum());
//璁＄畻宸ヨ祫淇℃伅
SalaryParam salaryParam = salaryParamMapper.selectOne(new QueryWrapper<SalaryParam>().eq("DELETED",Constants.ZERO).eq("MATERIAL_ID",workorderRecord.getMaterialId())
- .eq("DEPART_ID",workorderRecord.getFactoryId()).eq("PROCEDURE_ID",workorderRecord.getProcedureId()).eq("TYPE",workorderRecord.getSalaryType()).last(" limit 1 "));
+ .eq("DEPART_ID",workorderRecord.getFactoryId()).eq("PROCEDURE_ID",workorderRecord.getProcedureId()).eq("TYPE",createWorkorderRecordDTO.getType()).last(" limit 1 "));
if(!Objects.isNull(salaryParam)&&!Objects.isNull(createWorkorderRecordDTO.getDuration())){
workorderRecord.setSalaryPrice(salaryParam.getSalary());
workorderRecord.setSalaryType(salaryParam.getType());
--
Gitblit v1.9.3