From b3059e1a596b4fb05a708f3c3ac0ff3bc369d06b Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期四, 12 十二月 2024 16:03:27 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java | 185 ++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 162 insertions(+), 23 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 f1c3d72..e7aa1ca 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
@@ -24,15 +24,14 @@
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.CompanyMapper;
import com.doumee.dao.business.MemberMapper;
-import com.doumee.dao.business.join.CompanyJoinMapper;
-import com.doumee.dao.business.model.Category;
+import com.doumee.dao.business.dao.CompanyMapper;
+import com.doumee.dao.business.dao.join.CompanyJoinMapper;
import com.doumee.dao.business.model.Company;
import com.doumee.dao.business.model.Member;
+import com.doumee.dao.business.vo.CompanyTree;
import com.doumee.dao.system.model.SystemUser;
import com.doumee.service.business.CompanyService;
-import com.doumee.dao.business.vo.CompanyTree;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
@@ -85,8 +84,10 @@
user = company.getLoginUserInfo();
}
String rootOrgId = systemDictDataBiz.queryByCode(Constants.HK_PARAM,Constants.HK_ROOTORG_CODE).getCode();
- company.setCompanyPath(company.getName());//鍚嶇О璺緞
+ company.setCompanyPath(company.getId()+"/");//鍚嶇О璺緞
+ company.setCompanyNamePath(company.getName());//鍚嶇О璺緞
company.setHkParentId(rootOrgId);
+ String idPath = "";
if(company.getParentId() !=null){
Company parent = findById(company.getParentId());
if(parent == null || Constants.equalsInteger(parent.getIsdeleted(),Constants.ONE)){
@@ -95,10 +96,18 @@
if(StringUtils.isBlank(parent.getHkId())){
throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "瀵逛笉璧凤紝鐖剁骇缁勭粐淇℃伅灏氭湭鍚屾涓嬪彂鎴愬姛~");
}
+ if(Constants.equalsInteger(parent.getType(),Constants.ZERO)){
+ //濡傛灉鐖剁骇鏄浉鍏虫柟缁勭粐锛屼笅绾т笉鑳藉缓绔嬪唴閮ㄧ粍缁�
+ if(Constants.equalsInteger(company.getType(),Constants.ONE)){
+ throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "瀵逛笉璧凤紝鐩稿叧鏂圭粍缁囷紝涓嬬骇涓嶈兘寤虹珛鍐呴儴缁勭粐~");
+ }
+ }
+ idPath = parent.getCompanyPath();
company.setHkParentId(parent.getHkId());
- company.setCompanyPath(parent.getCompanyPath()+"/"+company.getName());
+ company.setCompanyPath(parent.getCompanyPath()+company.getId()+"/");
+ company.setCompanyNamePath(parent.getCompanyNamePath()+"/"+company.getName());
}
- company.setHkCompanyPath(company.getCompanyPath());
+ company.setHkCompanyPath(company.getCompanyNamePath());
company.setCreateDate(new Date());
company.setCreator(user.getId());
company.setIsdeleted(Constants.ZERO);
@@ -114,6 +123,10 @@
if(!addHkOrg(company)){
throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"瀵逛笉璧凤紝缁勭粐鍚屾涓嬪彂澶辫触锛岃绋嶅悗閲嶈瘯");
}
+ Company com = new Company();
+ com.setId(company.getId());
+ com.setCompanyPath(idPath+company.getId()+"/");
+ companyMapper.updateById(com);
return company.getId();
}
@@ -121,7 +134,7 @@
List<OrgAddRequest> addList = new ArrayList<>();
addList.add(getOrgAddModel(company));
BaseResponse<OrgOrUserAddResponse> result = HKService.addBatchOrg(addList);
- if(result !=null && StringUtils.equals(result.getCode(),HKConstants.RESPONSE_SUCCEE)){
+ if(result !=null && StringUtils.equals(result.getCode(), HKConstants.RESPONSE_SUCCEE)){
OrgOrUserAddResponse data = result.getData();
if(data.getSuccesses()!=null && data.getSuccesses().size()>0){
//澶勭悊鏂板鎴愬姛鐨勬暟鎹紝淇敼娴峰悍鍚屾鐘舵��
@@ -143,6 +156,7 @@
}
private boolean delHkOrg(Company company) {
OrgDelRequest request =new OrgDelRequest();
+
request.setIndexCodes(new String[]{company.getHkId()});
BaseResponse<List<OrgUpdateFailureResponse>> result = HKService.delBatchOrg(request);
if(result !=null && StringUtils.equals(result.getCode(),HKConstants.RESPONSE_SUCCEE)){
@@ -219,6 +233,7 @@
.eq(Member::getIsdeleted,Constants.ZERO)) >0){
throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(), "瀵逛笉璧凤紝璇ラ儴闂ㄤ笅瀛樺湪浜哄憳淇℃伅锛屼笉鑳借繘琛屽垹闄ゆ搷浣滐紒");
}
+
Company company = new Company();
company.setId(id);
company.setEditDate(new Date());
@@ -228,7 +243,7 @@
company.setHkDate(company.getHkDate());
companyMapper.updateById(company);
//涓嬪彂娴峰悍瀹夐槻骞冲彴
- if(StringUtils.isBlank(model.getHkId()) && Constants.equalsInteger(Constants.ONE,model.getHkStatus()) && !delHkOrg(model)){
+ if(StringUtils.isNotBlank(model.getHkId()) && Constants.equalsInteger(Constants.ONE,model.getHkStatus()) && !delHkOrg(model)){
throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"瀵逛笉璧凤紝缁勭粐鍒犻櫎涓嬪彂澶辫触锛岃纭璇ョ粍缁囨棤涓嬬骇缁勭粐鎴栫粍缁囦汉鍛樹俊鎭瘇");
}
}
@@ -274,8 +289,15 @@
if(model == null || Constants.equalsInteger(model.getIsdeleted(),Constants.ONE)){
throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(), "瀵逛笉璧凤紝缁勭粐淇℃伅涓嶅瓨鍦▇");
}
- if(StringUtils.isBlank(model.getHkId())){
- throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(), "瀵逛笉璧凤紝缁勭粐淇℃伅灏氭湭鍚屾涓嬪彂鎴愬姛,鏆備笉鏀寔淇敼锛岃灏濊瘯鍒犻櫎鍚庨噸鏂版坊鍔爚");
+ if( Constants.equalsInteger(Constants.ONE,model.getType())&& Constants.equalsInteger(Constants.ZERO,company.getType())){
+ //濡傛灉鐢卞唴閮ㄧ粍缁囧垏鎹㈡垚鍐呴儴缁勭粐锛屾帓鏌ヤ笅绾х粍缁囨槸鍚︽湁鍐呴儴缁勭粐
+ if(companyJoinMapper.selectCount(new QueryWrapper<Company>().lambda()
+ .eq(Company::getIsdeleted,Constants.ZERO )
+ .eq(Company::getType,Constants.ONE )
+ .ne(Company::getId,model.getId())
+ .likeRight(Company::getCompanyPath,model.getCompanyPath())) >0){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(), "瀵逛笉璧凤紝涓嬬骇閮ㄩ棬瀛樺湪鍐呴儴缁勭粐锛岃閮ㄩ棬涓嶆敮鎸佸垏鎹负鐩稿叧鏂圭粍缁囷紒~");
+ }
}
company.setEditDate(new Date());
company.setEditor(user.getId());
@@ -284,14 +306,19 @@
company.setHkId(StringUtils.defaultString(model.getHkId(),UUID.randomUUID().toString().replace("-","")));
company.setParentId(null);//涓嶆敮鎸佷慨鏀圭埗绾�
companyMapper.updateById(company);
+ //鏇存柊鐨刢ompanyPath
+ String newName = model.getCompanyNamePath().replace(model.getName(),company.getName());
+ companyMapper.update(null,new UpdateWrapper<Company>().lambda()
+ .setSql("company_name_path=REPLACE(company_name_path,'"+ model.getCompanyNamePath()+"','"+newName+"')")
+ .setSql("hk_company_path=REPLACE(hk_company_path,'"+ model.getCompanyNamePath()+"','"+newName+"')")
+ .likeRight(Company::getCompanyPath,model.getCompanyPath()));
//涓嬪彂娴峰悍瀹夐槻骞冲彴
- if(StringUtils.isNotBlank(model.getHkId())
- && Constants.equalsObject(Constants.ONE,model.getHkStatus())){
- if(editHkOrg(company)){
+ if(StringUtils.isNotBlank(model.getHkId())){
+ if(!editHkOrg(company)){
throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"瀵逛笉璧凤紝缁勭粐鍚屾涓嬪彂澶辫触锛岃绋嶅悗閲嶈瘯");
}
}else{//濡傛灉娌℃湁涓嬪彂杩囷紝鐩存帴鏂板缓瀹夐槻骞冲彴缁勭粐
- if(addHkOrg(company)){
+ if(!addHkOrg(company)){
throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"瀵逛笉璧凤紝缁勭粐鍚屾涓嬪彂澶辫触锛岃绋嶅悗閲嶈瘯");
}
}
@@ -328,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
@@ -458,13 +591,11 @@
companyMapper.updateById(company);
}
-
@Override
public long count(Company company) {
QueryWrapper<Company> wrapper = new QueryWrapper<>(company);
return companyMapper.selectCount(wrapper);
}
-
@Override
public List<CompanyDTO> findCompanyTreePage(Integer type) {
@@ -476,7 +607,6 @@
List<Company> companies = companyMapper.selectList(wrapper);
return getCompanyTree( companies, null);
}
-
private List<CompanyDTO> getCompanyTree(List<Company> companies, String parentId){
if (CollectionUtils.isEmpty(companies)){
@@ -546,12 +676,20 @@
queryWrapper.selectAs(Member::getPhone,Company::getHeadPhone);
queryWrapper.select("t1.name",Company::getParentName);
queryWrapper.select("t1.company_path",Company::getParentCompanyPath);
+ queryWrapper.select("t1.type",Company::getParentType);
queryWrapper.leftJoin(Company.class,Company::getId,Company::getParentId);
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);
- queryWrapper.orderByAsc(Company::getSortnum );
+ 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
CompanyTree treeBuild = new CompanyTree(companyList, dataSyncConfig.getOrgUserDataOrigin());
@@ -593,7 +731,8 @@
if (currentMenuIndex - 1 < 0) {
return;
}
- Company preMenu = companyPool.remove(currentMenuIndex - 1);
+ Company preMenu = companyPool.get(currentMenuIndex - 1);
+ companyPool.remove(currentMenuIndex - 1);
companyPool.add(currentMenuIndex, preMenu);
}
// 涓嬬Щ
--
Gitblit v1.9.3