From dac20eee2dd2846158ba96f25a17f87d96d95743 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期五, 25 八月 2023 10:17:54 +0800
Subject: [PATCH] # 企业端用户
---
server/src/main/java/doumeemes/service/business/impl/DeviceServiceImpl.java | 6 +++---
server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordExtServiceImpl.java | 14 ++++++++++----
server/src/main/java/doumeemes/dao/ext/vo/WorkorderRecordExportExtListVO.java | 6 +++---
3 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/server/src/main/java/doumeemes/dao/ext/vo/WorkorderRecordExportExtListVO.java b/server/src/main/java/doumeemes/dao/ext/vo/WorkorderRecordExportExtListVO.java
index dac4c98..978f428 100644
--- a/server/src/main/java/doumeemes/dao/ext/vo/WorkorderRecordExportExtListVO.java
+++ b/server/src/main/java/doumeemes/dao/ext/vo/WorkorderRecordExportExtListVO.java
@@ -82,13 +82,13 @@
@ApiModelProperty(value = "璁′环鏂瑰紡 0璁′欢 1璁℃椂", example = "1")
- @ExcelColumn(name="璁′环鏂瑰紡",index =13,width =15, valueMapping =" 0璁′欢 1璁℃椂")
- private String salaryType;
+ @ExcelColumn(name="璁′环鏂瑰紡",index =13,width =15, valueMapping =" 0=璁′欢;1=璁℃椂")
+ private Integer salaryType;
@ApiModelProperty(value = "宸ヨ祫鍗曚环", example = "1")
- @ExcelColumn(name="宸ヨ祫鍗曚环",index =14,width =15, suffix ="鍏�")
+ @ExcelColumn(name="璁′环宸ヨ祫锛堝厓锛�",index =14,width =15, suffix ="鍏�")
private Integer salaryPrice;
diff --git a/server/src/main/java/doumeemes/service/business/impl/DeviceServiceImpl.java b/server/src/main/java/doumeemes/service/business/impl/DeviceServiceImpl.java
index e22b797..dbaafcf 100644
--- a/server/src/main/java/doumeemes/service/business/impl/DeviceServiceImpl.java
+++ b/server/src/main/java/doumeemes/service/business/impl/DeviceServiceImpl.java
@@ -304,7 +304,7 @@
QueryWrapper<Department> wrapper = new QueryWrapper<>();
wrapper.lambda()
.eq(Department::getRootId,user.getRootDepartment().getId())
- .eq(Department::getName,departName)
+ .eq(Department::getName,s.getDepartName())
.last("limit 1");
Department department = departmentMapper.selectOne(wrapper);
if(Objects.isNull(department)){
@@ -314,11 +314,11 @@
QueryWrapper<Procedures> proceduresQuery = new QueryWrapper<>();
proceduresQuery.lambda()
.eq(Procedures::getRootDepartId,user.getRootDepartment().getId())
- .eq(Procedures::getDepartId,department.getId())
+ .eq(Procedures::getOrgId,department.getId())
.eq(Procedures::getName,s.getProcedureName());
Procedures procedures = proceduresMapper.selectOne(proceduresQuery);
if(Objects.isNull(procedures)){
- throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"宸ュ簭鍚嶇О宸插瓨鍦�");
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"宸ュ簭鍚嶇О涓嶅瓨鍦�");
}
QueryDeviceExtDTO queryDeviceExtDTO=new QueryDeviceExtDTO();
queryDeviceExtDTO.setDeleted(Constants.ZERO);
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 c3a9961..4bb1cc3 100644
--- a/server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordExtServiceImpl.java
+++ b/server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordExtServiceImpl.java
@@ -1757,10 +1757,16 @@
wreev.setQualifiedNum( (Objects.nonNull(re.getQualifiedNum()) ? re.getQualifiedNum() : 0)+unintname);
wreev.setUnqualifiedNum((Objects.nonNull(re.getUnqualifiedNum()) ? re.getQualifiedNum() : 0)+unintname);
Integer duration = re.getDuration();
- Integer h = duration/3600;
- Integer m = (duration%3600)/60;
- Integer s = ((duration%3600)%60);
- wreev.setDuration(h+"灏忔椂"+m+"鍒嗛挓"+s+"绉�");
+ if (Objects.nonNull(duration)){
+ Integer h = duration/3600;
+ Integer m = (duration%3600)/60;
+ Integer s = ((duration%3600)%60);
+ wreev.setDuration(h+"灏忔椂"+m+"鍒嗛挓"+s+"绉�");
+ }else {
+ wreev.setDuration("-");
+ }
+ wreev.setSalaryType(re.getSalaryType());
+ wreev.setSalaryPrice(re.getSalaryPrice());
list.add(wreev);
}
--
Gitblit v1.9.3