From 9b3da964c23a31f9d1164b74b5742d1034de8af3 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 09 五月 2024 17:09:53 +0800
Subject: [PATCH] 最新版本
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java | 78 ++++++++++++++++++++++++++-------------
1 files changed, 52 insertions(+), 26 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 e94f81f..f1c3d72 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
@@ -25,10 +25,12 @@
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.model.Company;
import com.doumee.dao.business.model.Member;
+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;
@@ -54,6 +56,8 @@
@Autowired
private CompanyMapper companyMapper;
@Autowired
+ private MemberMapper memberMapper;
+ @Autowired
private DataSyncConfig dataSyncConfig;
@Autowired
private SystemDictDataBiz systemDictDataBiz;
@@ -67,9 +71,11 @@
if(StringUtils.isBlank(company.getName())){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
+ if(company.getType()==null || !(company.getType() ==0 || company.getType() ==1)){
+ throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "瀵逛笉璧凤紝缁勭粐绫诲瀷涓嶆纭紝璇锋寜瑕佹眰濉啓~");
+ }
//鏌ヨ鍚嶇О涓嶈兘閲嶅
if(companyMapper.selectCount(new QueryWrapper<Company>().lambda()
-// .eq(Company::getType,Constants.ONE)
.eq(Company::getName,company.getName())
.eq(Company::getIsdeleted,Constants.ZERO)) >0){
throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "瀵逛笉璧凤紝缁勭粐鍚嶇О涓嶈兘閲嶅~");
@@ -79,6 +85,7 @@
user = company.getLoginUserInfo();
}
String rootOrgId = systemDictDataBiz.queryByCode(Constants.HK_PARAM,Constants.HK_ROOTORG_CODE).getCode();
+ company.setCompanyPath(company.getName());//鍚嶇О璺緞
company.setHkParentId(rootOrgId);
if(company.getParentId() !=null){
Company parent = findById(company.getParentId());
@@ -89,15 +96,19 @@
throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "瀵逛笉璧凤紝鐖剁骇缁勭粐淇℃伅灏氭湭鍚屾涓嬪彂鎴愬姛~");
}
company.setHkParentId(parent.getHkId());
+ company.setCompanyPath(parent.getCompanyPath()+"/"+company.getName());
}
+ company.setHkCompanyPath(company.getCompanyPath());
company.setCreateDate(new Date());
company.setCreator(user.getId());
company.setIsdeleted(Constants.ZERO);
company.setHkStatus(Constants.ONE);
company.setStatus(Constants.ZERO);
- company.setHkDate(company.getHkDate());
+ company.setSortnum(0);//榛樿鏈�涓婇潰
+ company.setHkDate(company.getCreateDate());
+ company.setEditDate(company.getCreateDate());
+ company.setEditor(company.getCreator());
company.setHkId(UUID.randomUUID().toString().replace("-",""));
-
companyMapper.insert(company);
//涓嬪彂娴峰悍瀹夐槻骞冲彴
if(!addHkOrg(company)){
@@ -109,7 +120,6 @@
private boolean addHkOrg(Company company) {
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)){
OrgOrUserAddResponse data = result.getData();
@@ -161,6 +171,7 @@
return model;
}
@Override
+ @Transactional(rollbackFor = {BusinessException.class,Exception.class})
public Integer createLaborServices(Company company) {
LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
if(loginUserInfo ==null){
@@ -189,19 +200,25 @@
}
@Override
+ @Transactional(rollbackFor = {BusinessException.class,Exception.class})
public void deleteById(Integer id, LoginUserInfo user ) {
if(id== null ){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
-
Company model = findById(id);
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(companyMapper.selectCount(new QueryWrapper<Company>().lambda()
+ .eq(Company::getParentId,model.getId())
+ .eq(Company::getIsdeleted,Constants.ZERO)) >0){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(), "瀵逛笉璧凤紝璇ラ儴闂ㄥ瓨鍦ㄤ笅绾ч儴闂紝涓嶈兘杩涜鍒犻櫎鎿嶄綔锛�");
}
-
+ if(memberMapper.selectCount(new QueryWrapper<Member>().lambda()
+ .eq(Member::getCompanyId,model.getId())
+ .eq(Member::getIsdeleted,Constants.ZERO)) >0){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(), "瀵逛笉璧凤紝璇ラ儴闂ㄤ笅瀛樺湪浜哄憳淇℃伅锛屼笉鑳借繘琛屽垹闄ゆ搷浣滐紒");
+ }
Company company = new Company();
company.setId(id);
company.setEditDate(new Date());
@@ -211,7 +228,7 @@
company.setHkDate(company.getHkDate());
companyMapper.updateById(company);
//涓嬪彂娴峰悍瀹夐槻骞冲彴
- if(!delHkOrg(model)){
+ if(StringUtils.isBlank(model.getHkId()) && Constants.equalsInteger(Constants.ONE,model.getHkStatus()) && !delHkOrg(model)){
throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"瀵逛笉璧凤紝缁勭粐鍒犻櫎涓嬪彂澶辫触锛岃纭璇ョ粍缁囨棤涓嬬骇缁勭粐鎴栫粍缁囦汉鍛樹俊鎭瘇");
}
}
@@ -239,9 +256,11 @@
if(company.getId() == null|| StringUtils.isBlank(company.getName())){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
+ if(company.getType()!=null && !(company.getType() ==0 || company.getType() ==1)){
+ throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "瀵逛笉璧凤紝缁勭粐绫诲瀷涓嶆纭紝璇锋寜瑕佹眰濉啓~");
+ }
//鏌ヨ鍚嶇О涓嶈兘閲嶅
if(companyMapper.selectCount(new QueryWrapper<Company>().lambda()
-// .eq(Company::getType,Constants.ONE)
.eq(Company::getName,company.getName())
.ne(Company::getId,company.getId())
.eq(Company::getIsdeleted,Constants.ZERO)) >0){
@@ -262,13 +281,19 @@
company.setEditor(user.getId());
company.setHkStatus(Constants.ONE);
company.setHkDate(company.getHkDate());
- company.setHkId(model.getHkId());
+ company.setHkId(StringUtils.defaultString(model.getHkId(),UUID.randomUUID().toString().replace("-","")));
+ company.setParentId(null);//涓嶆敮鎸佷慨鏀圭埗绾�
companyMapper.updateById(company);
//涓嬪彂娴峰悍瀹夐槻骞冲彴
- if(StringUtils.isNotBlank(company.getHkId())
- && Constants.equalsObject(Constants.ONE,model.getHkId())
- && !editHkOrg(company)){
- throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"瀵逛笉璧凤紝缁勭粐鍚屾涓嬪彂澶辫触锛岃绋嶅悗閲嶈瘯");
+ if(StringUtils.isNotBlank(model.getHkId())
+ && Constants.equalsObject(Constants.ONE,model.getHkStatus())){
+ if(editHkOrg(company)){
+ throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"瀵逛笉璧凤紝缁勭粐鍚屾涓嬪彂澶辫触锛岃绋嶅悗閲嶈瘯");
+ }
+ }else{//濡傛灉娌℃湁涓嬪彂杩囷紝鐩存帴鏂板缓瀹夐槻骞冲彴缁勭粐
+ if(addHkOrg(company)){
+ throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"瀵逛笉璧凤紝缁勭粐鍚屾涓嬪彂澶辫触锛岃绋嶅悗閲嶈瘯");
+ }
}
}
@@ -407,17 +432,13 @@
queryWrapper.le(Company::getFsDate, Utils.Date.getEnd(pageWrap.getModel().getFsDate()));
}
queryWrapper.orderByDesc(Company::getCreateDate);
- queryWrapper.leftJoin(Category.class,Category::getId,Company::getCategoryId);
+ queryWrapper.leftJoin(Company.class,Company::getId,Company::getParentId);
/* .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("c.name as parentName");*/
- .selectAs(Category::getName,Company::getCategoryName);
- /* .selectAs(Member::getName,Company::getHeadName)
- .selectAs(Member::getPhone,Company::getHeadPhone)
- .select("count(t1.id) as countNum");*/
-// queryWrapper.eq(Company::getType,Constants.ZERO);
+ .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.eq(Objects.nonNull(pageWrap.getModel().getStatus()),Company::getStatus,Constants.ZERO);
queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getName()),Company::getName,pageWrap.getModel().getName());
queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getParentName()),"c.name",pageWrap.getModel().getParentName());
@@ -429,7 +450,7 @@
public void updateStatusById(Company company) {
LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
if(loginUserInfo==null){
- loginUserInfo = company.getLoginUserInfo()
+ loginUserInfo = company.getLoginUserInfo();
}
company.setEditDate(new Date());
company.setEditor(loginUserInfo.getId());
@@ -499,7 +520,6 @@
QueryWrapper<Company> wrapper = new QueryWrapper<>();
wrapper.lambda()
.eq(Company::getIsdeleted,Constants.ZERO)
- .eq(Company::getType,Constants.ZERO)
.eq(Company::getName,company.getName());
List<Company> companies = companyMapper.selectList(wrapper);
if (CollectionUtils.isEmpty(companies)){
@@ -521,11 +541,17 @@
public List<Company> companyTree(Integer type) {
MPJLambdaWrapper<Company> queryWrapper = new MPJLambdaWrapper<>();
queryWrapper.selectAll(Company.class);
+ queryWrapper.selectAs(SystemUser::getRealname,Company::getEditorName);
queryWrapper.selectAs(Member::getName,Company::getHeadName);
queryWrapper.selectAs(Member::getPhone,Company::getHeadPhone);
+ queryWrapper.select("t1.name",Company::getParentName);
+ queryWrapper.select("t1.company_path",Company::getParentCompanyPath);
+ 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(Company::getType,type);
+ queryWrapper.eq(type!=null,Company::getType,type);
+ queryWrapper.orderByAsc(Company::getSortnum );
List<Company> companyList = companyJoinMapper.selectJoinList(Company.class,queryWrapper);
//閰嶇疆缁勫憳浜哄憳绫诲瀷鏉ユ簮鏂瑰紡 0鑷缓 1ERP
CompanyTree treeBuild = new CompanyTree(companyList, dataSyncConfig.getOrgUserDataOrigin());
--
Gitblit v1.9.3