From d5b7ec2f5564b863ee221fe5f8af0450a2ae3e9c Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 18 九月 2023 14:26:37 +0800
Subject: [PATCH] 基础字段
---
server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java | 23 ++++++++++++++---------
1 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
index 9a8694d..8f6815e 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
@@ -88,14 +88,15 @@
if (Objects.nonNull(company1)){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"浼佷笟宸插瓨鍦ㄨ閲嶆柊杈撳叆");
}
-
- wrapper.clear();
- wrapper.lambda()
- .eq(Company::getDeleted,Boolean.FALSE)
- .eq(Company::getCreditCode,company.getCreditCode());
- Company company2 = companyMapper.selectOne(wrapper);
- if (Objects.nonNull(company2)){
- throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"浼佷笟宸插瓨鍦ㄨ閲嶆柊杈撳叆");
+ if(StringUtils.isNotBlank(company.getCreditCode())){
+ wrapper.clear();
+ wrapper.lambda()
+ .eq(Company::getDeleted,Boolean.FALSE)
+ .eq(Company::getCreditCode,company.getCreditCode());
+ Company company2 = companyMapper.selectOne(wrapper);
+ if (Objects.nonNull(company2)){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"浼佷笟缁熶竴绀句細淇＄敤浠ｇ爜宸插瓨鍦ㄨ閲嶆柊杈撳叆");
+ }
}
Company insert = new Company();
insert.setDeleted((byte)Constants.ZERO);
@@ -114,6 +115,7 @@
insert.setOepnValidDate(company.getOepnValidDate());
insert.setOepnType(company.getOepnType());
insert.setSalesmanId(company.getSalesmanId());
+ insert.setStatus(Constants.ZERO);
companyMapper.insert(insert);
//鍒涘缓浼佷笟鐢ㄦ埛
SystemUser companyUser = createCompanyUser(company.getManagerUserName(), insert.getId());
@@ -139,6 +141,7 @@
QueryWrapper<SystemUser> query = new QueryWrapper<>();
query.lambda()
+ .eq(SystemUser::getType,Constants.ONE)
.eq(SystemUser::getDeleted,Boolean.FALSE)
.eq(SystemUser::getUsername,managerUserName);
Integer integer = systemUserMapper.selectCount(query);
@@ -192,6 +195,8 @@
.set(Company::getShortName,company.getShortName())
.set(Company::getCreditCode,company.getCreditCode())
.set(Company::getSalesmanId,company.getSalesmanId())
+ .set(company.getOepnValidDate()!=null,Company::getOepnValidDate,company.getOepnValidDate())
+ .set(company.getUserNum()!=null,Company::getUserNum,company.getUserNum())
.set(Company::getLinkname,company.getLinkname())
.set(Company::getLinkephone,company.getLinkephone());
companyMapper.update(null,wrapper);
@@ -295,7 +300,7 @@
"(select count(g.id) from goods g where g.COMPANY_ID = t.ID )goodsNum");
queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getName()),Company::getName,pageWrap.getModel().getName())
.like(StringUtils.isNotBlank(pageWrap.getModel().getManagerUserName()),SystemUser::getUsername,pageWrap.getModel().getManagerUserName())
- .eq(Objects.nonNull(pageWrap.getModel().getManagerUserName()),Company::getStatus,pageWrap.getModel().getStatus())
+ .eq(Objects.nonNull(pageWrap.getModel().getStatus()),Company::getStatus,pageWrap.getModel().getStatus())
.between((Objects.nonNull(pageWrap.getModel().getOepnValidDateStart()) && Objects.nonNull(pageWrap.getModel().getOepnValidDateEnd())),
Company::getOepnValidDate,pageWrap.getModel().getOepnValidDateStart(),pageWrap.getModel().getOepnValidDateEnd());
return PageData.from(companyJoinMapper.selectJoinPage(page,Company.class,queryWrapper));
--
Gitblit v1.9.3