From 5709af7bcc1da20f12679391ae3b49cabce21069 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期四, 24 八月 2023 18:43:43 +0800
Subject: [PATCH] # 企业端用户 导入
---
server/src/main/java/doumeemes/service/business/impl/CompanyOpenServiceImpl.java | 2 +-
server/src/main/java/doumeemes/biz/system/impl/SystemUserBizImpl.java | 11 ++++++++---
server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordExtServiceImpl.java | 10 +++++++---
server/src/main/java/doumeemes/dao/ext/vo/WorkorderRecordExportExtListVO.java | 19 +++++++++++++++----
4 files changed, 31 insertions(+), 11 deletions(-)
diff --git a/server/src/main/java/doumeemes/biz/system/impl/SystemUserBizImpl.java b/server/src/main/java/doumeemes/biz/system/impl/SystemUserBizImpl.java
index 65c732d..3b1a1a6 100644
--- a/server/src/main/java/doumeemes/biz/system/impl/SystemUserBizImpl.java
+++ b/server/src/main/java/doumeemes/biz/system/impl/SystemUserBizImpl.java
@@ -10,6 +10,7 @@
import doumeemes.core.utils.DateUtil;
import doumeemes.core.utils.Utils;
import doumeemes.core.utils.excel.EasyExcelUtil;
+import doumeemes.dao.business.CompanyMapper;
import doumeemes.dao.business.CompanyPositionMapper;
import doumeemes.dao.business.dto.AutoLoginUserDTO;
import doumeemes.dao.business.dto.CompanyInitDataDTO;
@@ -78,6 +79,9 @@
private DepartmentExtService departmentExtService;
@Autowired
private CompanyUserExtMapper companyUserExtMapper;
+
+ @Autowired
+ private CompanyMapper companyMapper;
@Override
public void deleteById(Integer id) {
@@ -546,10 +550,11 @@
cu.setDeleted(Constants.ZERO);
cu.setRootDepartId(loginUser.getRootDepartment().getId());
//闄愬埗浜烘暟
- int limitUserNum = Constants.formatIntegerNum(loginUser.getCompany().getOpenUserNum());
- if(limitUserNum > 0){
+// int limitUserNum = Constants.formatIntegerNum(loginUser.getCompany().getOpenUserNum());
+ Company company = companyMapper.selectById(loginUser.getCompany().getId());
+ if(company.getOpenUserNum() > 0){
//浜烘暟闄愬埗杈撳叆0锛岃〃绀轰笉闄愬埗浜烘暟
- if(companyUserExtMapper.selectCount(new QueryWrapper<>(cu)) +1 > limitUserNum ){
+ if(companyUserExtMapper.selectCount(new QueryWrapper<>(cu)) +1 > company.getOpenUserNum() ){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鐢ㄦ埛鏁伴噺瓒呰繃璐拱鏁伴噺锛岃鑱旂郴涓氬姟缁忕悊缁喘!");
}
}
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 e2b02c4..dac4c98 100644
--- a/server/src/main/java/doumeemes/dao/ext/vo/WorkorderRecordExportExtListVO.java
+++ b/server/src/main/java/doumeemes/dao/ext/vo/WorkorderRecordExportExtListVO.java
@@ -55,7 +55,7 @@
private String qualifiedNum;
@ApiModelProperty(value = "妫�楠屼笉鍚堟牸鏁伴噺", example = "1")
- @ExcelColumn(name="妫�楠屼笉鍚堟牸鏁伴噺",index = 10,width =15)
+ @ExcelColumn(name="涓嶈壇鏁伴噺",index = 10,width =15)
private String unqualifiedNum;
/* @ApiModelProperty(value = "璁″垝鏁伴噺")
@@ -78,15 +78,26 @@
@ApiModelProperty(value = "鎶ュ伐鏃堕暱锛堢锛�", example = "1")
@ExcelColumn(name="鎶ュ伐鏃堕暱锛堢锛�",index =12,width =15)
- private Integer duration;
+ private String duration;
+
+
+ @ApiModelProperty(value = "璁′环鏂瑰紡 0璁′欢 1璁℃椂", example = "1")
+ @ExcelColumn(name="璁′环鏂瑰紡",index =13,width =15, valueMapping =" 0璁′欢 1璁℃椂")
+ private String salaryType;
+
+
+
+ @ApiModelProperty(value = "宸ヨ祫鍗曚环", example = "1")
+ @ExcelColumn(name="宸ヨ祫鍗曚环",index =14,width =15, suffix ="鍏�")
+ private Integer salaryPrice;
@ApiModelProperty(value = "璁惧")
- @ExcelColumn(name="璁惧",index =13,width =15)
+ @ExcelColumn(name="璁惧",index =15,width =15)
private String deviceCode;
@ApiModelProperty(value = "鎶ュ伐鏃堕棿")
- @ExcelColumn(name="鎶ュ伐鏃堕棿",index =14,width =15)
+ @ExcelColumn(name="鎶ュ伐鏃堕棿",index =16,width =15)
private String createTime;
// @ApiModelProperty(value = "璁惧鍚嶇О")
diff --git a/server/src/main/java/doumeemes/service/business/impl/CompanyOpenServiceImpl.java b/server/src/main/java/doumeemes/service/business/impl/CompanyOpenServiceImpl.java
index 59e3d19..0ad7ede 100644
--- a/server/src/main/java/doumeemes/service/business/impl/CompanyOpenServiceImpl.java
+++ b/server/src/main/java/doumeemes/service/business/impl/CompanyOpenServiceImpl.java
@@ -112,7 +112,7 @@
companyLog.setCompanyId(company.getId());
companyLog.setUpdateType(Constants.CompanyUpdateType.UPDATE_VAIL_DATE.getKey());
companyLog.setDetail("鏈夋晥鏈熶粠"+format.format(cyResult.getOepnValidDate())+"鏃ヨ皟鏁磋嚦"+format.format(companyOpen.getValidDate())+"\n"+
- "鐢ㄦ埛寮�閫氫汉鏁颁粠"+format.format(cyResult.getOpenUserNum())+"璋冩暣鑷�"+format.format(companyOpen.getUserNum()));
+ "鐢ㄦ埛寮�閫氫汉鏁颁粠"+cyResult.getOpenUserNum()+"璋冩暣鑷�"+companyOpen.getUserNum());
companyLogService.create(companyLog);
initRedisCache(company1);
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 6dfb8b2..c3a9961 100644
--- a/server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordExtServiceImpl.java
+++ b/server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordExtServiceImpl.java
@@ -1754,9 +1754,13 @@
wreev.setDeviceCode(re.getDeviceCode()+"|"+re.getDeviceName());
wreev.setCreateTime(format.format(re.getCreateTime()));
- wreev.setQualifiedNum(re.getQualifiedNum()+unintname);
- wreev.setUnqualifiedNum(re.getUnqualifiedNum()+unintname);
- wreev.setDuration(re.getDuration());
+ 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+"绉�");
list.add(wreev);
}
--
Gitblit v1.9.3