From efd825d47f9cab3d7535e069d4a1b5e094e92e44 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 18 八月 2023 21:06:22 +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 ++
server/src/main/java/doumeemes/api/ext/SalaryParamExtController.java | 8 ++++++++
server/src/main/java/doumeemes/service/ext/impl/PlansExtServiceImpl.java | 4 ++--
4 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/server/src/main/java/doumeemes/api/ext/SalaryParamExtController.java b/server/src/main/java/doumeemes/api/ext/SalaryParamExtController.java
index 4eec3eb..0fab8d6 100644
--- a/server/src/main/java/doumeemes/api/ext/SalaryParamExtController.java
+++ b/server/src/main/java/doumeemes/api/ext/SalaryParamExtController.java
@@ -91,6 +91,14 @@
return ApiResponse.success(salaryParamService.findPage(pageWrap));
}
+ @ApiOperation("鍒楄〃鏌ヨ")
+ @PostMapping("/querytList")
+ @RequiresPermissions("business:salaryparam:query")
+ public ApiResponse<List<SalaryParam>> querytList(@RequestBody SalaryParam salaryParam) {
+ List<SalaryParam> data = salaryParamService.findList(salaryParam);
+ return ApiResponse.success(data);
+ }
+
@ApiOperation("瀵煎嚭Excel")
@PostMapping("/exportExcel")
@RequiresPermissions("business:salaryparam:exportExcel")
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 dfb0a01..e10453f 100644
--- a/server/src/main/java/doumeemes/dao/business/dto/CreateWorkorderRecordDTO.java
+++ b/server/src/main/java/doumeemes/dao/business/dto/CreateWorkorderRecordDTO.java
@@ -25,5 +25,7 @@
@ApiModelProperty(value = "鎶ュ伐鏃堕暱锛堢锛�" )
private Integer duration;
+ @ApiModelProperty(value = "鎶ュ伐绫诲瀷 0璁′欢 1璁℃椂" )
+ private Integer salaryType;
}
diff --git a/server/src/main/java/doumeemes/service/ext/impl/PlansExtServiceImpl.java b/server/src/main/java/doumeemes/service/ext/impl/PlansExtServiceImpl.java
index 26a9562..6991000 100644
--- a/server/src/main/java/doumeemes/service/ext/impl/PlansExtServiceImpl.java
+++ b/server/src/main/java/doumeemes/service/ext/impl/PlansExtServiceImpl.java
@@ -1652,8 +1652,8 @@
Workorder param = new Workorder();
param.setPlanId(autoWorkReportDTO.getPlansId());
param.setPlanDate(new Date());
- CompanyUser companyUser= companyUserExtMapper.selectById(autoWorkReportDTO.getProUserList().get(Constants.ZERO));
- param.setCreateUser(companyUser.getUserId());
+// CompanyUser companyUser= companyUserExtMapper.selectById(autoWorkReportDTO.getProUserList().get(Constants.ZERO));
+ param.setCreateUser(autoWorkReportDTO.getProUserList().get(Constants.ZERO));
param.setProGroupId(autoWorkReportDTO.getProGroupId());
param.setProUserList(autoWorkReportDTO.getProUserList());
param.setPlanNum(num.intValue());
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 d8abd47..497bbb0 100644
--- a/server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordStandardServiceImpl.java
+++ b/server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordStandardServiceImpl.java
@@ -1555,7 +1555,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()).last(" limit 1 "));
+ .eq("DEPART_ID",workorderRecord.getFactoryId()).eq("PROCEDURE_ID",workorderRecord.getProcedureId()).eq("TYPE",workorderRecord.getSalaryType()).last(" limit 1 "));
if(!Objects.isNull(salaryParam)&&!Objects.isNull(createWorkorderRecordDTO.getDuration())){
workorderRecord.setSalaryPrice(salaryParam.getSalary());
workorderRecord.setSalaryType(salaryParam.getType());
--
Gitblit v1.9.3