From 16332a341801f80d27830d2ea4e683b4ab21167c Mon Sep 17 00:00:00 2001 From: k94314517 <8417338+k94314517@user.noreply.gitee.com> Date: 星期一, 21 四月 2025 18:28:00 +0800 Subject: [PATCH] 工单业务 --- server/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java | 74 +++++++++++++++++++++++++++++++++++-- 1 files changed, 70 insertions(+), 4 deletions(-) diff --git a/server/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java b/server/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java index 4edd8cb..aa8d4d6 100644 --- a/server/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java +++ b/server/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java @@ -10,6 +10,7 @@ import com.doumee.core.utils.Utils; import com.doumee.dao.business.CategoryMapper; import com.doumee.dao.business.model.Category; +import com.doumee.dao.business.model.Member; import com.doumee.dao.business.vo.CompanyTree; import com.doumee.dao.web.vo.CategoryVO; import com.doumee.dao.web.vo.CategoryVOTree; @@ -35,6 +36,7 @@ import java.util.List; import java.util.Objects; import java.util.UUID; +import java.util.stream.Collectors; /** * 鍒嗙被淇℃伅琛⊿ervice瀹炵幇 @@ -70,7 +72,10 @@ if(parent == null || Constants.equalsInteger(parent.getIsdeleted(),Constants.ONE)){ throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "瀵逛笉璧凤紝鐖剁骇淇℃伅涓嶅瓨鍦▇"); } - + if(Constants.equalsInteger(parent.getType(),Constants.FOUR) && parent.getParentId()!=null){ + //濡傛灉鏄簩绾DA涓婚,鑷繁涓鸿瀵熼」 + category.setType(Constants.SIX); + } idPath = parent.getIdPath(); category.setIdPath(parent.getIdPath()+category.getId()+"/"); category.setNamePath(parent.getNamePath()+"/"+category.getName()); @@ -123,6 +128,9 @@ if( category.getId() == null){ throw new BusinessException(ResponseStatus.BAD_REQUEST); } + if(Constants.equalsInteger(category.getId(),category.getParentId())){ + throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝鐖剁骇涓嶈兘璁剧疆涓鸿嚜韬紒"); + } category.setType(null);//绫诲瀷涓嶆敮鎸佷慨鏀� Category model = categoryMapper.selectById(category.getId()); if(model ==null || Constants.equalsInteger(model.getIsdeleted(),Constants.ONE)) { @@ -136,6 +144,8 @@ .eq(Category::getIsdeleted,Constants.ZERO)) >0){ throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "瀵逛笉璧凤紝鍚嶇О涓嶈兘閲嶅~"); }*/ + String oldIdPath = model.getIdPath(); + String oldNamePath = model.getNamePath(); LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal(); category.setIdPath(category.getId()+"/");//鍚嶇О璺緞 category.setNamePath(category.getName());//鍚嶇О璺緞 @@ -150,7 +160,25 @@ } category.setEditDate(new Date()); category.setEditor(user.getId()); - categoryMapper.updateById(category); + categoryMapper.update(null,new UpdateWrapper<Category>().lambda() + .eq(Category::getId,category.getId()) + .set(Category::getEditDate,category.getEditDate()) + .set(Category::getEditor,category.getEditor()) + .set(Category::getName,category.getName()) + .set(Category::getParentId,category.getParentId()) + .set(Category::getSortnum,category.getSortnum()) + .set(Category::getRemark,category.getRemark()) + .set(Category::getNamePath,category.getNamePath()) + .set(Category::getIdPath,category.getId()) + ); + //淇敼鍏ㄩ儴涓嬬骇鐨勭紪鐮佸拰鍚嶇О璺緞 + categoryMapper.update(null,new UpdateWrapper<Category>().lambda() + .likeRight(Category::getIdPath,oldIdPath) + .set(Category::getEditDate,category.getEditDate()) + .set(Category::getEditor,category.getEditor()) + .setSql("id_path=replace(id_path,'"+oldIdPath+"','"+category.getIdParentPath()+"')") + .setSql("name_path=replace(name_path,'"+oldNamePath+"/','"+category.getName()+"/')") + ); } @Override @@ -176,6 +204,7 @@ @Override public List<Category> findList(Category category) { + category.setIsdeleted(Constants.ZERO); MPJLambdaWrapper<Category> queryWrapper = new MPJLambdaWrapper<>(); queryWrapper.selectAll(Category.class); queryWrapper.selectAs(SystemUser::getUsername,Category::getEditorName); @@ -268,10 +297,11 @@ @Override - public List<CategoryVO> getCategoryVOTree(String categoryType){ + public List<CategoryVO> getCategoryVOTree(String categoryType,Integer categoryId){ List<Category> categoryList = categoryMapper.selectList(new QueryWrapper<Category>().lambda() .eq(Category::getIsdeleted, Constants.ZERO) .in(Objects.nonNull(categoryType),Category::getType,categoryType.split(",")) + .apply(Objects.nonNull(categoryId)," find_in_set("+categoryId+", REPLACE(ID_PATH,'/',',') ) ") .orderByAsc(Category::getSortnum,Category::getId) ); List<CategoryVO> categoryVOList = new ArrayList<>(); @@ -291,10 +321,46 @@ @Override - public List<CategoryVO> getCategoryVOList(Integer categoryType){ + public List<CategoryVO> getCategoryVOForGCXTree(Integer categoryId){ + List<Category> categoryList = categoryMapper.selectList(new QueryWrapper<Category>().lambda() + .eq(Category::getIsdeleted, Constants.ZERO) + .eq(Category::getType, Constants.FOUR) + .and( ms->ms.eq(Category::getId,categoryId).or().eq(Category::getParentId,categoryId)) + .orderByAsc(Category::getSortnum,Category::getId) + ); + if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(categoryList)){ + categoryList.addAll( + categoryMapper.selectList(new QueryWrapper<Category>().lambda() + .eq(Category::getIsdeleted, Constants.ZERO) + .eq(Category::getType, Constants.SIX) + .in(Category::getParentId,categoryList.stream().map(i->i.getId()).collect(Collectors.toList())) + .orderByAsc(Category::getSortnum,Category::getId)) + ); + } + List<CategoryVO> categoryVOList = new ArrayList<>(); + if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(categoryList)){ + for (Category category:categoryList) { + CategoryVO categoryVO = new CategoryVO(); + categoryVO.setId(category.getId()); + categoryVO.setName(category.getName()); + categoryVO.setParentId(category.getParentId()); + categoryVOList.add(categoryVO); + } + CategoryVOTree treeBuild = new CategoryVOTree(categoryVOList); + categoryVOList = treeBuild.buildTree(); + } + return categoryVOList; + } + + + + + @Override + public List<CategoryVO> getCategoryVOList(Integer categoryType,Integer isRoot){ List<Category> categoryList = categoryMapper.selectList(new QueryWrapper<Category>().lambda() .eq(Category::getIsdeleted, Constants.ZERO) .eq(Objects.nonNull(categoryType),Category::getType,categoryType) + .isNull(Constants.equalsInteger(isRoot,Constants.ONE),Category::getParentId) .orderByAsc(Category::getSortnum,Category::getId) ); List<CategoryVO> categoryVOList = new ArrayList<>(); -- Gitblit v1.9.3