From e462144e6dcf574cf538baba510b69e477d2b057 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 06 一月 2025 10:21:42 +0800
Subject: [PATCH] 最新版本541200007
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java | 135 +++++++++++++++++++++++++++++++++++++++++---
1 files changed, 124 insertions(+), 11 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 ff8ceb5..731771c 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
@@ -17,14 +17,14 @@
import com.doumee.core.haikang.model.param.respose.OrgOrUserAddResponse;
import com.doumee.core.haikang.model.param.respose.OrgUpdateFailureResponse;
import com.doumee.core.haikang.service.HKService;
-import com.doumee.core.model.LoginUserInfo;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.LoginUserInfo;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
import com.doumee.dao.admin.request.UpdateCompanySortDTO;
import com.doumee.dao.admin.response.CompanyDTO;
-import com.doumee.dao.business.MemberMapper;
+import com.doumee.dao.business.dao.MemberMapper;
import com.doumee.dao.business.dao.CompanyMapper;
import com.doumee.dao.business.dao.join.CompanyJoinMapper;
import com.doumee.dao.business.model.Company;
@@ -74,11 +74,11 @@
throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "瀵逛笉璧凤紝缁勭粐绫诲瀷涓嶆纭紝璇锋寜瑕佹眰濉啓~");
}
//鏌ヨ鍚嶇О涓嶈兘閲嶅
- /* if(companyMapper.selectCount(new QueryWrapper<Company>().lambda()
+ if(companyMapper.selectCount(new QueryWrapper<Company>().lambda()
.eq(Company::getName,company.getName())
.eq(Company::getIsdeleted,Constants.ZERO)) >0){
throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "瀵逛笉璧凤紝缁勭粐鍚嶇О涓嶈兘閲嶅~");
- }*/
+ }
LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
if(user ==null){
user = company.getLoginUserInfo();
@@ -275,12 +275,12 @@
throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "瀵逛笉璧凤紝缁勭粐绫诲瀷涓嶆纭紝璇锋寜瑕佹眰濉啓~");
}
//鏌ヨ鍚嶇О涓嶈兘閲嶅
- /* if(companyMapper.selectCount(new QueryWrapper<Company>().lambda()
+ if(companyMapper.selectCount(new QueryWrapper<Company>().lambda()
.eq(Company::getName,company.getName())
.ne(Company::getId,company.getId())
.eq(Company::getIsdeleted,Constants.ZERO)) >0){
throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "瀵逛笉璧凤紝缁勭粐鍚嶇О涓嶈兘閲嶅~");
- }*/
+ }
LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
if(user == null){
user = company.getLoginUserInfo();
@@ -355,8 +355,114 @@
@Override
public List<Company> findList(Company company) {
- QueryWrapper<Company> wrapper = new QueryWrapper<>(company);
- return companyMapper.selectList(wrapper);
+ MPJLambdaWrapper<Company> queryWrapper = new MPJLambdaWrapper<>();
+ if (company.getId() != null) {
+ queryWrapper.eq(Company::getId, company.getId());
+ }
+ if (company.getCreator() != null) {
+ queryWrapper.eq(Company::getCreator, company.getCreator());
+ }
+ if (company.getCreateDate() != null) {
+ queryWrapper.ge(Company::getCreateDate, Utils.Date.getStart(company.getCreateDate()));
+ queryWrapper.le(Company::getCreateDate, Utils.Date.getEnd(company.getCreateDate()));
+ }
+ if (company.getEditor() != null) {
+ queryWrapper.eq(Company::getEditor, company.getEditor());
+ }
+ if (company.getEditDate() != null) {
+ queryWrapper.ge(Company::getEditDate, Utils.Date.getStart(company.getEditDate()));
+ queryWrapper.le(Company::getEditDate, Utils.Date.getEnd(company.getEditDate()));
+ }
+ if (company.getIsdeleted() != null) {
+ queryWrapper.eq(Company::getIsdeleted, company.getIsdeleted());
+ }
+ if (company.getName() != null) {
+ queryWrapper.like(Company::getName, company.getName());
+ }
+ if (company.getRemark() != null) {
+ queryWrapper.eq(Company::getRemark, company.getRemark());
+ }
+ if (company.getStatus() != null) {
+ queryWrapper.eq(Company::getStatus, company.getStatus());
+ }
+ if (company.getSortnum() != null) {
+ queryWrapper.eq(Company::getSortnum, company.getSortnum());
+ }
+ if (company.getImgurl() != null) {
+ queryWrapper.eq(Company::getImgurl, company.getImgurl());
+ }
+ if (company.getType() != null) {
+ queryWrapper.eq(Company::getType, company.getType());
+ }
+ if (company.getCategoryId() != null) {
+ queryWrapper.eq(Company::getCategoryId, company.getCategoryId());
+ }
+ if (company.getCode() != null) {
+ queryWrapper.eq(Company::getCode, company.getCode());
+ }
+ if (company.getParentId() != null) {
+ queryWrapper.eq(Company::getParentId, company.getParentId());
+ }
+ if (company.getLinkName() != null) {
+ queryWrapper.eq(Company::getLinkName, company.getLinkName());
+ }
+ if (company.getLinkPhone() != null) {
+ queryWrapper.eq(Company::getLinkPhone, company.getLinkPhone());
+ }
+ if (company.getHkId() != null) {
+ queryWrapper.eq(Company::getHkId, company.getHkId());
+ }
+ if (company.getHkStatus() != null) {
+ queryWrapper.eq(Company::getHkStatus, company.getHkStatus());
+ }
+ if (company.getHkDate() != null) {
+ queryWrapper.ge(Company::getHkDate, Utils.Date.getStart(company.getHkDate()));
+ queryWrapper.le(Company::getHkDate, Utils.Date.getEnd(company.getHkDate()));
+ }
+ if (company.getErpId() != null) {
+ queryWrapper.eq(Company::getErpId, company.getErpId());
+ }
+ if (company.getErpDate() != null) {
+ queryWrapper.ge(Company::getErpDate, Utils.Date.getStart(company.getErpDate()));
+ queryWrapper.le(Company::getErpDate, Utils.Date.getEnd(company.getErpDate()));
+ }
+ if (company.getErpStatus() != null) {
+ queryWrapper.eq(Company::getErpStatus, company.getErpStatus());
+ }
+ if (company.getDdId() != null) {
+ queryWrapper.eq(Company::getDdId, company.getDdId());
+ }
+ if (company.getDdDate() != null) {
+ queryWrapper.ge(Company::getDdDate, Utils.Date.getStart(company.getDdDate()));
+ queryWrapper.le(Company::getDdDate, Utils.Date.getEnd(company.getDdDate()));
+ }
+ if (company.getDdStatus() != null) {
+ queryWrapper.eq(Company::getDdStatus, company.getDdStatus());
+ }
+ if (company.getFsId() != null) {
+ queryWrapper.eq(Company::getFsId, company.getFsId());
+ }
+ if (company.getFsStatus() != null) {
+ queryWrapper.eq(Company::getFsStatus, company.getFsStatus());
+ }
+ if (company.getFsDate() != null) {
+ queryWrapper.ge(Company::getFsDate, Utils.Date.getStart(company.getFsDate()));
+ queryWrapper.le(Company::getFsDate, Utils.Date.getEnd(company.getFsDate()));
+ }
+ if (company.getQueryHiddenDanger() != null && Constants.equalsInteger(company.getQueryHiddenDanger(),Constants.ONE)) {
+ queryWrapper.apply(" t.id in ( select hdp.COMPANY_ID from hidden_danger_param hdp where hdp.ISDELETED = 0 and hdp.STATUS = 0 and hdp.TYPE = 0 ) ");
+ }
+ queryWrapper.orderByDesc(Company::getCreateDate);
+ queryWrapper.leftJoin(Company.class,Company::getId,Company::getParentId);
+ queryWrapper.select(" t.* ")
+ .select("(select count(m.id) from member m where m.COMPANY_ID=t.id and m.ISDELETED=0) as countNum") ;
+ queryWrapper.select("t1.name",Company::getParentName);
+ queryWrapper.select("t1.company_path",Company::getParentCompanyPath);
+ queryWrapper.apply(" t.isdeleted = 0 ") ;
+ queryWrapper.eq(Objects.nonNull(company.getStatus()),Company::getStatus,Constants.ZERO);
+ queryWrapper.like(StringUtils.isNotBlank(company.getName()),Company::getName,company.getName());
+ queryWrapper.like(StringUtils.isNotBlank(company.getParentName()),"c.name",company.getParentName());
+ return companyMapper.selectList(queryWrapper);
}
@Override
@@ -575,7 +681,14 @@
queryWrapper.leftJoin(Member.class,Member::getId,Company::getHeadId);
queryWrapper.leftJoin(SystemUser.class,SystemUser::getId,Company::getEditor);
queryWrapper.eq(Company::getIsdeleted,Constants.ZERO);
- queryWrapper.eq(type!=null,Company::getType,type);
+ if(Objects.nonNull(type) && ( Constants.equalsInteger(type,Constants.ONE) || Constants.equalsInteger(type,Constants.ZERO))){
+ queryWrapper.eq(type!=null,Company::getType,type);
+ }else if(Objects.nonNull(type) && Constants.equalsInteger(type,Constants.TWO)){
+ String companySpecialId = systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.SPECIAL_COMPANY_ID).getCode();
+ if(StringUtils.isNotBlank(companySpecialId)){
+ queryWrapper.apply(" (find_in_set('"+companySpecialId+"',REPLACE(t.company_path,'/',',')) or t.parent_id is null ) ");
+ }
+ }
queryWrapper.orderByAsc(true,"t.sortnum");
List<Company> companyList = companyJoinMapper.selectJoinList(Company.class,queryWrapper);
//閰嶇疆缁勫憳浜哄憳绫诲瀷鏉ユ簮鏂瑰紡 0鑷缓 1ERP
--
Gitblit v1.9.3