From 6cd597dd7a0cf3e560ee198b536ea7f4e568930b Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 22 十一月 2024 11:04:41 +0800
Subject: [PATCH] 开发更新
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java | 42 +++++++++++++++++++++++++++++++++++++++++-
1 files changed, 41 insertions(+), 1 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
index 01d2a84..4cdd677 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
@@ -64,6 +64,32 @@
@Autowired
private CompanyJoinMapper companyJoinMapper;
+ /**
+ * 鍒涘缓璐㈠姟鍏徃
+ * @param company
+ * @return
+ */
+ @Override
+ public Integer createFinanceCompany(Company company) {
+ company.setType(Constants.TWO);
+ if(companyMapper.selectCount(new QueryWrapper<Company>().lambda()
+ .eq(Company::getName,company.getName())
+ .eq(Company::getType,company.getType())
+ .eq(Company::getIsdeleted,Constants.ZERO)) >0){
+ throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "瀵逛笉璧凤紝鍚嶇О涓嶈兘閲嶅~");
+ }
+ company.setCreateDate(new Date());
+ company.setCreator(company.getLoginUserInfo().getId());
+ company.setIsdeleted(Constants.ZERO);
+ company.setStatus(Constants.ZERO);
+ company.setSortnum(0);//榛樿鏈�涓婇潰
+ company.setHkDate(company.getCreateDate());
+ company.setEditDate(company.getCreateDate());
+ company.setEditor(company.getCreator());
+ companyMapper.insert(company);
+ return company.getId();
+ }
+
@Override
@Transactional(rollbackFor = {BusinessException.class,Exception.class})
public Integer create(Company company) {
@@ -332,6 +358,18 @@
companyMapper.updateById(company);
return null;
}
+ @Override
+ public Integer updateFinanceCompany(Company company) {
+ if(companyMapper.selectCount(new QueryWrapper<Company>().lambda()
+ .eq(Company::getName,company.getName())
+ .eq(Company::getType,company.getType())
+ .ne(Company::getId,company.getId())
+ .eq(Company::getIsdeleted,Constants.ZERO)) >0){
+ throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "瀵逛笉璧凤紝鍚嶇О涓嶈兘閲嶅~");
+ }
+ companyMapper.updateById(company);
+ return company.getId();
+ }
@Override
public void updateByIdInBatch(List<Company> companys) {
@@ -570,7 +608,8 @@
/* .leftJoin(Member.class, Member::getId,Company::getHeadId)*/
/* queryWrapper.leftJoin(" company c on c.id=t.parent_id");*/
queryWrapper.selectAll(Company.class)
- .select("(select count(m.id) from member m where m.COMPANY_ID=t.id and m.ISDELETED=0) as countNum") ;
+ .select("(select count(m.id) from member m where m.COMPANY_ID=t.id and m.ISDELETED=0) ",Company::getCountNum)
+ .select("(select count(m.id) from yw_account m where m.COMPANY_ID=t.id and m.ISDELETED=0)",Company::getAccountNum) ;
queryWrapper.select("t1.name",Company::getParentName);
queryWrapper.select("t1.company_path",Company::getParentCompanyPath);
queryWrapper.eq(Objects.nonNull(pageWrap.getModel().getStatus()),Company::getStatus,Constants.ZERO);
@@ -651,6 +690,7 @@
QueryWrapper<Company> wrapper = new QueryWrapper<>();
wrapper.lambda()
.eq(Company::getIsdeleted,Constants.ZERO)
+ .eq(Company::getType,company.getType())
.eq(Company::getName,company.getName());
List<Company> companies = companyMapper.selectList(wrapper);
if (CollectionUtils.isEmpty(companies)){
--
Gitblit v1.9.3