From b70bbce994e573e58d4ee79a53ea60e9338b2516 Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期一, 06 五月 2024 10:18:37 +0800
Subject: [PATCH] 最新版本
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java | 47 +++++++++++++++++++++++++++++++++--------------
1 files changed, 33 insertions(+), 14 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 8e15e01..33ddd3a 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,6 +25,7 @@
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;
@@ -54,6 +55,8 @@
@Autowired
private CompanyMapper companyMapper;
@Autowired
+ private MemberMapper memberMapper;
+ @Autowired
private DataSyncConfig dataSyncConfig;
@Autowired
private SystemDictDataBiz systemDictDataBiz;
@@ -75,7 +78,11 @@
throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "瀵逛笉璧凤紝缁勭粐鍚嶇О涓嶈兘閲嶅~");
}
LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ if(user ==null){
+ 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());
@@ -86,7 +93,9 @@
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);
@@ -94,7 +103,6 @@
company.setStatus(Constants.ZERO);
company.setHkDate(company.getHkDate());
company.setHkId(UUID.randomUUID().toString().replace("-",""));
-
companyMapper.insert(company);
//涓嬪彂娴峰悍瀹夐槻骞冲彴
if(!addHkOrg(company)){
@@ -106,7 +114,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();
@@ -158,9 +165,12 @@
return model;
}
@Override
+ @Transactional(rollbackFor = {BusinessException.class,Exception.class})
public Integer createLaborServices(Company company) {
LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
-
+ if(loginUserInfo ==null){
+ loginUserInfo = company.getLoginUserInfo();
+ }
checkUnique(company);
Company insert = new Company();
insert.setCreator(loginUserInfo.getId());
@@ -184,21 +194,25 @@
}
@Override
- public void deleteById(Integer id) {
- LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ @Transactional(rollbackFor = {BusinessException.class,Exception.class})
+ public void deleteById(Integer id, LoginUserInfo user ) {
if(id== null ){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
-
- LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
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());
@@ -208,7 +222,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(),"瀵逛笉璧凤紝缁勭粐鍒犻櫎涓嬪彂澶辫触锛岃纭璇ョ粍缁囨棤涓嬬骇缁勭粐鎴栫粍缁囦汉鍛樹俊鎭瘇");
}
}
@@ -220,13 +234,13 @@
}
@Override
- public void deleteByIdInBatch(List<Integer> ids) {
+ public void deleteByIdInBatch(List<Integer> ids,LoginUserInfo user) {
if (CollectionUtils.isEmpty(ids)) {
return;
}
ids.stream().forEach(s->{
Company company = new Company();
- deleteById(s);
+ deleteById(s,user);
});
}
@@ -245,6 +259,9 @@
throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "瀵逛笉璧凤紝缁勭粐鍚嶇О涓嶈兘閲嶅~");
}
LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ if(user == null){
+ user = company.getLoginUserInfo();
+ }
Company model = findById(company.getId());
if(model == null || Constants.equalsInteger(model.getIsdeleted(),Constants.ONE)){
throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(), "瀵逛笉璧凤紝缁勭粐淇℃伅涓嶅瓨鍦▇");
@@ -422,7 +439,9 @@
@Override
public void updateStatusById(Company company) {
LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
-
+ if(loginUserInfo==null){
+ loginUserInfo = company.getLoginUserInfo();
+ }
company.setEditDate(new Date());
company.setEditor(loginUserInfo.getId());
company.setStatus(company.getStatus());
--
Gitblit v1.9.3