From 6765787baa5e0b771d71f865c4deb776367410c4 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 13 八月 2024 13:38:19 +0800
Subject: [PATCH] 修复bug
---
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java | 315 +++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 294 insertions(+), 21 deletions(-)
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
index 484823e..19b9e48 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
@@ -1,37 +1,50 @@
package com.doumee.service.business.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.doumee.biz.system.SystemDictDataBiz;
+import com.doumee.config.DataSyncConfig;
import com.doumee.core.annotation.excel.ExcelColumn;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
+import com.doumee.core.haikang.model.HKConstants;
+import com.doumee.core.haikang.model.param.BaseResponse;
+import com.doumee.core.haikang.model.param.request.OrgAddRequest;
+import com.doumee.core.haikang.model.param.request.OrgDelRequest;
+import com.doumee.core.haikang.model.param.request.OrgEditRequest;
+import com.doumee.core.haikang.model.param.respose.OrgOrUserAddResponse;
+import com.doumee.core.haikang.model.param.respose.OrgOrUserAddSuccessResponse;
+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.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.CompanyMapper;
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.*;
+import com.doumee.dao.system.dto.UpdateSystemMenuSortDTO;
+import com.doumee.dao.system.model.SystemMenu;
import com.doumee.dao.system.model.SystemUser;
import com.doumee.service.business.CompanyService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.doumee.service.common.tree.CompanyTree;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import io.swagger.annotations.ApiModelProperty;
import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
import java.util.stream.Collectors;
/**
@@ -44,16 +57,110 @@
@Autowired
private CompanyMapper companyMapper;
+ @Autowired
+ private DataSyncConfig dataSyncConfig;
+ @Autowired
+ private SystemDictDataBiz systemDictDataBiz;
@Autowired
private CompanyJoinMapper companyJoinMapper;
@Override
+ @Transactional(rollbackFor = {BusinessException.class,Exception.class})
public Integer create(Company company) {
+ if(StringUtils.isBlank(company.getName())){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ //鏌ヨ鍚嶇О涓嶈兘閲嶅
+ 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(), "瀵逛笉璧凤紝缁勭粐鍚嶇О涓嶈兘閲嶅~");
+ }
+ LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ String rootOrgId = systemDictDataBiz.queryByCode(Constants.HK_PARAM,Constants.HK_ROOTORG_CODE).getCode();
+ company.setHkParentId(rootOrgId);
+ if(company.getParentId() !=null){
+ Company parent = findById(company.getParentId());
+ if(parent == null || Constants.equalsInteger(parent.getIsdeleted(),Constants.ONE)){
+ throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "瀵逛笉璧凤紝鐖剁骇缁勭粐淇℃伅涓嶅瓨鍦▇");
+ }
+ if(StringUtils.isBlank(parent.getHkId())){
+ throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "瀵逛笉璧凤紝鐖剁骇缁勭粐淇℃伅灏氭湭鍚屾涓嬪彂鎴愬姛~");
+ }
+ company.setHkParentId(parent.getHkId());
+ }
+ 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.setHkId(UUID.randomUUID().toString().replace("-",""));
+
companyMapper.insert(company);
+ //涓嬪彂娴峰悍瀹夐槻骞冲彴
+ if(!addHkOrg(company)){
+ throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"瀵逛笉璧凤紝缁勭粐鍚屾涓嬪彂澶辫触锛岃绋嶅悗閲嶈瘯");
+ }
return company.getId();
}
+ 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();
+ if(data.getSuccesses()!=null && data.getSuccesses().size()>0){
+ //澶勭悊鏂板鎴愬姛鐨勬暟鎹紝淇敼娴峰悍鍚屾鐘舵��
+ return true;
+ }
+ }
+ return false;
+ }
+
+
+ private boolean editHkOrg(Company company) {
+ OrgEditRequest request = (getOrgHkEditModel(company));
+ BaseResponse result = HKService.editOrg(request);
+ if(result !=null && StringUtils.equals(result.getCode(),HKConstants.RESPONSE_SUCCEE)){
+ //澶勭悊鏂板鎴愬姛鐨勬暟鎹紝淇敼娴峰悍鍚屾鐘舵��
+ return true;
+ }
+ return false;
+ }
+ 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)){
+ //澶勭悊鏂板鎴愬姛鐨勬暟鎹紝淇敼娴峰悍鍚屾鐘舵��
+ if(result.getData()!=null && result.getData().size()==0){
+ return true;
+ }
+ }
+
+ return false;
+ }
+
+
+ private OrgAddRequest getOrgAddModel(Company c ) {
+ OrgAddRequest model = new OrgAddRequest();
+ model.setOrgIndexCode(c.getHkId());
+ model.setOrgName(c.getName());
+// model.setOrgCode(c.getCode());
+ model.setParentIndexCode(c.getHkParentId());
+ return model;
+ }
+ private OrgEditRequest getOrgHkEditModel(Company c ) {
+ OrgEditRequest model = new OrgEditRequest();
+ model.setOrgIndexCode(c.getHkId());
+ model.setOrgName(c.getName());
+ return model;
+ }
@Override
public Integer createLaborServices(Company company) {
LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
@@ -82,7 +189,32 @@
@Override
public void deleteById(Integer id) {
- companyMapper.deleteById(id);
+ LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ 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(), "瀵逛笉璧凤紝缁勭粐淇℃伅灏氭湭鍚屾涓嬪彂鎴愬姛,鏆備笉鏀寔淇敼锛岃灏濊瘯鍒犻櫎鍚庨噸鏂版坊鍔爚");
+ }
+
+ Company company = new Company();
+ company.setId(id);
+ company.setEditDate(new Date());
+ company.setEditor(user.getId());
+ company.setIsdeleted(Constants.ONE);
+ company.setHkStatus(Constants.ONE);
+ company.setHkDate(company.getHkDate());
+ companyMapper.updateById(company);
+ //涓嬪彂娴峰悍瀹夐槻骞冲彴
+ if(!delHkOrg(model)){
+ throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"瀵逛笉璧凤紝缁勭粐鍒犻櫎涓嬪彂澶辫触锛岃纭璇ョ粍缁囨棤涓嬬骇缁勭粐鎴栫粍缁囦汉鍛樹俊鎭瘇");
+ }
}
@Override
@@ -96,12 +228,47 @@
if (CollectionUtils.isEmpty(ids)) {
return;
}
- companyMapper.deleteBatchIds(ids);
+ ids.stream().forEach(s->{
+ Company company = new Company();
+ deleteById(s);
+ });
}
@Override
+ @Transactional(rollbackFor = {BusinessException.class,Exception.class})
public void updateById(Company company) {
+ if(company.getId() == null|| StringUtils.isBlank(company.getName())){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ //鏌ヨ鍚嶇О涓嶈兘閲嶅
+ 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){
+ throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "瀵逛笉璧凤紝缁勭粐鍚嶇О涓嶈兘閲嶅~");
+ }
+ LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ Company model = findById(company.getId());
+ 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(), "瀵逛笉璧凤紝缁勭粐淇℃伅灏氭湭鍚屾涓嬪彂鎴愬姛,鏆備笉鏀寔淇敼锛岃灏濊瘯鍒犻櫎鍚庨噸鏂版坊鍔爚");
+ }
+ company.setEditDate(new Date());
+ company.setEditor(user.getId());
+ company.setHkStatus(Constants.ONE);
+ company.setHkDate(company.getHkDate());
+ company.setHkId(model.getHkId());
companyMapper.updateById(company);
+ //涓嬪彂娴峰悍瀹夐槻骞冲彴
+ if(StringUtils.isNotBlank(company.getHkId())
+ && Constants.equalsObject(Constants.ONE,model.getHkId())
+ && !editHkOrg(company)){
+ throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"瀵逛笉璧凤紝缁勭粐鍚屾涓嬪彂澶辫触锛岃绋嶅悗閲嶈瘯");
+ }
+
}
@Override
@@ -143,6 +310,7 @@
IPage<Company> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
MPJLambdaWrapper<Company> queryWrapper = new MPJLambdaWrapper<>();
Utils.MP.blankToNull(pageWrap.getModel());
+ pageWrap.getModel().setIsdeleted(Constants.ZERO);
if (pageWrap.getModel().getId() != null) {
queryWrapper.eq(Company::getId, pageWrap.getModel().getId());
}
@@ -164,7 +332,7 @@
queryWrapper.eq(Company::getIsdeleted, pageWrap.getModel().getIsdeleted());
}
if (pageWrap.getModel().getName() != null) {
- queryWrapper.eq(Company::getName, pageWrap.getModel().getName());
+ queryWrapper.like(Company::getName, pageWrap.getModel().getName());
}
if (pageWrap.getModel().getRemark() != null) {
queryWrapper.eq(Company::getRemark, pageWrap.getModel().getRemark());
@@ -237,15 +405,34 @@
queryWrapper.le(Company::getFsDate, Utils.Date.getEnd(pageWrap.getModel().getFsDate()));
}
queryWrapper.orderByDesc(Company::getCreateDate);
- queryWrapper.leftJoin(Category.class,Category::getId,Company::getCategoryId)
- .leftJoin(SystemUser.class,SystemUser::getId,Company::getCreator);
+ queryWrapper.leftJoin(Category.class,Category::getId,Company::getCategoryId);
+ /* .leftJoin(Member.class, Member::getId,Company::getHeadId)*/
+ /* queryWrapper.leftJoin(" company c on c.id=t.parent_id");*/
queryWrapper.selectAll(Company.class)
- .selectAs(Category::getName,Company::getCategoryName)
- .select("count(t1.id) as countNum")
- .selectAs(SystemUser::getRealname,Company::getCreatorName);
+ .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);
+ 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());
IPage<Company> companyIPage = companyJoinMapper.selectJoinPage(page, Company.class, queryWrapper);
return PageData.from(companyIPage);
}
+
+ @Override
+ public void updateStatusById(Company company) {
+ LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+
+ company.setEditDate(new Date());
+ company.setEditor(loginUserInfo.getId());
+ company.setStatus(company.getStatus());
+ companyMapper.updateById(company);
+ }
+
@Override
public long count(Company company) {
@@ -256,7 +443,7 @@
@Override
public List<CompanyDTO> findCompanyTreePage(Integer type) {
-
+ //閰嶇疆缁勫憳浜哄憳绫诲瀷鏉ユ簮鏂瑰紡 0鑷缓 1ERP
LambdaQueryWrapper<Company> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(Company::getIsdeleted,Constants.ZERO)
@@ -266,14 +453,20 @@
}
- private List<CompanyDTO> getCompanyTree(List<Company> companies, Integer parentId){
+ private List<CompanyDTO> getCompanyTree(List<Company> companies, String parentId){
if (CollectionUtils.isEmpty(companies)){
return null;
}
- List<Company> collect = companies.stream()
- .filter(s -> Constants.equalsInteger(s.getParentId(), parentId))
- .collect(Collectors.toList());
- if (CollectionUtils.isEmpty(companies)){
+ int origin =Constants.formatIntegerNum(dataSyncConfig.getOrgUserDataOrigin());
+ List<Company> collect = null;
+ if(origin == DataSyncConfig.origin.erp){
+ collect= companies.stream().filter(s -> ( StringUtils.defaultString(s.getErpParentId(),"").equals(StringUtils.defaultString(parentId)))).collect(Collectors.toList());
+ }else if(origin == DataSyncConfig.origin.hk){
+ collect= companies.stream().filter(s -> ( StringUtils.defaultString(s.getHkParentId(),"").equals(StringUtils.defaultString(parentId)))).collect(Collectors.toList());
+ }else{
+ collect= companies.stream().filter(s -> (StringUtils.defaultString(s.getParentId()+"","").equals(StringUtils.defaultString(parentId)))).collect(Collectors.toList());
+ }
+ if (CollectionUtils.isEmpty(collect)){
return null;
}
List<CompanyDTO> companyDTOList = new ArrayList<>();
@@ -281,7 +474,13 @@
Company company = collect.get(i);
CompanyDTO companyDTO = new CompanyDTO();
BeanUtils.copyProperties(company,companyDTO);
- companyDTO.setCompanyDTOList(getCompanyTree(companies, company.getId()));
+ String pId = company.getId()+"";
+ if(origin == 1){
+ pId = company.getErpId();
+ }else if(origin == 2){
+ pId = company.getHkParentId();
+ }
+ companyDTO.setCompanyDTOList(getCompanyTree(companies,pId));
companyDTOList.add(companyDTO);
}
return companyDTOList;
@@ -311,4 +510,78 @@
throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(),"鍏徃鍚嶇О宸插瓨鍦�");
}
}
+
+
+
+ @Override
+ public List<Company> companyTree(Integer type) {
+ MPJLambdaWrapper<Company> queryWrapper = new MPJLambdaWrapper<>();
+ queryWrapper.selectAll(Company.class);
+ queryWrapper.selectAs(Member::getName,Company::getHeadName);
+ queryWrapper.selectAs(Member::getPhone,Company::getHeadPhone);
+ queryWrapper.leftJoin(Member.class,Member::getId,Company::getHeadId);
+ queryWrapper.eq(Company::getIsdeleted,Constants.ZERO);
+ queryWrapper.eq(Company::getType,type);
+ List<Company> companyList = companyJoinMapper.selectJoinList(Company.class,queryWrapper);
+ //閰嶇疆缁勫憳浜哄憳绫诲瀷鏉ユ簮鏂瑰紡 0鑷缓 1ERP
+ CompanyTree treeBuild = new CompanyTree(companyList, dataSyncConfig.getOrgUserDataOrigin());
+ companyList = treeBuild.buildTree();
+ return companyList;
+ }
+
+
+ @Override
+ public void updateSort(UpdateCompanySortDTO dto) {
+ Company company = companyMapper.selectById(dto.getId());
+ if(Objects.isNull(company)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY);
+ }
+
+ List<Company> companyPool;
+ if (company.getParentId() == null) {
+ companyPool = companyMapper.selectList(new QueryWrapper<Company>().lambda()
+ .eq(Company::getIsdeleted,Constants.ZERO)
+ .isNull(Company::getParentId)
+ .orderByAsc(Company::getSortnum)
+ );
+ } else {
+ companyPool = companyMapper.selectList(new QueryWrapper<Company>().lambda()
+ .eq(Company::getIsdeleted,Constants.ZERO)
+ .eq(Company::getParentId,company.getParentId())
+ .orderByAsc(Company::getSortnum)
+ );
+ }
+ int currentMenuIndex = 0;
+ for (int i = 0; i < companyPool.size(); i++) {
+ if (companyPool.get(i).getId().equals(dto.getId())) {
+ currentMenuIndex = i;
+ break;
+ }
+ }
+ // 涓婄Щ
+ if ("top".equals(dto.getDirection())) {
+ if (currentMenuIndex - 1 < 0) {
+ return;
+ }
+ Company preMenu = companyPool.remove(currentMenuIndex - 1);
+ companyPool.add(currentMenuIndex, preMenu);
+ }
+ // 涓嬬Щ
+ else {
+ if (currentMenuIndex + 1 > companyPool.size() - 1) {
+ return;
+ }
+ Company nextMenu = companyPool.remove(currentMenuIndex + 1);
+ companyPool.add(currentMenuIndex, nextMenu);
+ }
+ for (int i = 0; i < companyPool.size(); i++) {
+ companyPool.get(i).setSortnum(i);
+ }
+
+ for (Company updCompany:companyPool) {
+ companyMapper.updateById(updCompany);
+ }
+
+ }
+
}
--
Gitblit v1.9.3