From 6baf2c39511f7364bb7c7f8071228317aab21203 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 25 八月 2023 13:41:35 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmMes
---
server/src/main/java/doumeemes/biz/system/impl/SystemUserBizImpl.java | 12 ++++++++++++
server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordExtServiceImpl.java | 4 ++--
server/src/main/java/doumeemes/service/business/impl/UnqualifiedRecordServiceImpl.java | 6 +++---
3 files changed, 17 insertions(+), 5 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 3b1a1a6..f6ea8f1 100644
--- a/server/src/main/java/doumeemes/biz/system/impl/SystemUserBizImpl.java
+++ b/server/src/main/java/doumeemes/biz/system/impl/SystemUserBizImpl.java
@@ -166,6 +166,18 @@
if(plansList == null || plansList.size()==0){
throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(), "瀵煎叆鏁版嵁鍐呭鏈夎锛�");
}
+ //娣诲姞浼佷笟鍛樺伐鍏宠仈鍏崇郴
+ CompanyUser cuw = new CompanyUser();
+ cuw.setDeleted(Constants.ZERO);
+ cuw.setRootDepartId(user.getRootDepartment().getId());
+ Company company = companyMapper.selectById(user.getCompany().getId());
+ if(company.getOpenUserNum() > 0){
+ //浜烘暟闄愬埗杈撳叆0锛岃〃绀轰笉闄愬埗浜烘暟
+ if(companyUserExtMapper.selectCount(new QueryWrapper<>(cuw)) + plansList.size() > company.getOpenUserNum() ){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鐢ㄦ埛鏁伴噺瓒呰繃璐拱鏁伴噺锛岃鑱旂郴涓氬姟缁忕悊缁喘!");
+ }
+ }
+
CompanyPosition cp = new CompanyPosition();
cp.setDeleted(Constants.ZERO);
cp.setCompanyId(user.getCompany().getId());
diff --git a/server/src/main/java/doumeemes/service/business/impl/UnqualifiedRecordServiceImpl.java b/server/src/main/java/doumeemes/service/business/impl/UnqualifiedRecordServiceImpl.java
index 59a226b..7257dbe 100644
--- a/server/src/main/java/doumeemes/service/business/impl/UnqualifiedRecordServiceImpl.java
+++ b/server/src/main/java/doumeemes/service/business/impl/UnqualifiedRecordServiceImpl.java
@@ -100,7 +100,7 @@
QueryWrapper<UnqualifiedRecord> wrapper = new QueryWrapper<>(unqualifiedRecord);
return unqualifiedRecordMapper.selectList(wrapper);
}
-
+
@Override
public PageData<UnqualifiedRecord> findPage(PageWrap<UnqualifiedRecord> pageWrap) {
IPage<UnqualifiedRecord> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
@@ -151,8 +151,8 @@
MPJLambdaWrapper<UnqualifiedRecord> mpjLambdaWrapper = new MPJLambdaWrapper<>();
mpjLambdaWrapper.selectAll(UnqualifiedRecord.class);
mpjLambdaWrapper.selectAs(Workorder::getCode, UnqualifiedRecord::getWorkOrderCode);
- mpjLambdaWrapper.selectAs(Material::getCode, UnqualifiedRecord::getMaterialName);
- mpjLambdaWrapper.selectAs(Workorder::getCode, UnqualifiedRecord::getMaterialCode);
+ mpjLambdaWrapper.selectAs(Material::getName, UnqualifiedRecord::getMaterialName);
+ mpjLambdaWrapper.selectAs(Material::getCode, UnqualifiedRecord::getMaterialCode);
mpjLambdaWrapper.selectAs(Procedures::getName, UnqualifiedRecord::getProceduresName);
mpjLambdaWrapper.selectAs(Category::getName, UnqualifiedRecord::getCategoryName);
mpjLambdaWrapper.selectAs(SystemUser::getRealname, UnqualifiedRecord::getCreateUserName);
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 4bb1cc3..a323db6 100644
--- a/server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordExtServiceImpl.java
+++ b/server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordExtServiceImpl.java
@@ -1755,7 +1755,7 @@
wreev.setDeviceCode(re.getDeviceCode()+"|"+re.getDeviceName());
wreev.setCreateTime(format.format(re.getCreateTime()));
wreev.setQualifiedNum( (Objects.nonNull(re.getQualifiedNum()) ? re.getQualifiedNum() : 0)+unintname);
- wreev.setUnqualifiedNum((Objects.nonNull(re.getUnqualifiedNum()) ? re.getQualifiedNum() : 0)+unintname);
+ wreev.setUnqualifiedNum((Objects.nonNull(re.getUnqualifiedNum()) ? re.getUnqualifiedNum() : 0)+unintname);
Integer duration = re.getDuration();
if (Objects.nonNull(duration)){
Integer h = duration/3600;
@@ -1766,7 +1766,7 @@
wreev.setDuration("-");
}
wreev.setSalaryType(re.getSalaryType());
- wreev.setSalaryPrice(re.getSalaryPrice());
+ wreev.setSalaryPrice(re.getSalary());
list.add(wreev);
}
--
Gitblit v1.9.3