From 3e5bba6ac8fd2a26445bf93208a5ee1745405548 Mon Sep 17 00:00:00 2001
From: yuxc <653031404@qq.com>
Date: 星期三, 02 八月 2023 12:20:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java | 61 +++++++++++++++++++++++++++++-
1 files changed, 59 insertions(+), 2 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java
index 16f1e3f..6f1dbdf 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.baomidou.mybatisplus.extension.toolkit.SqlHelper;
import com.vci.ubcs.code.bo.CodeClassifyFullInfoBO;
@@ -139,6 +140,11 @@
if(codeClassifyList.size()!=0){
return R.fail("褰撳墠鍒嗙被涓嬩笉鍏佽鍒嗙被缂栧彿閲嶅锛岃妫�鏌ワ紒锛侊紒");
}
+ if(Func.isNotEmpty(codeClassifyEntity.getParentCodeClassifyOid())){
+ CodeClassify codeClassify = baseMapper.selectOne(Wrappers.<CodeClassify>query().lambda().eq(CodeClassify::getOid, codeClassifyEntity.getParentCodeClassifyOid()));
+ codeClassifyEntity.setBtmTypeId(codeClassify.getBtmTypeId());
+ codeClassifyEntity.setBtmTypeName(codeClassify.getBtmTypeName());
+ }
codeClassifyEntity.setCreator(String.valueOf(AuthUtil.getUser().getUserId()));
codeClassifyEntity.setCreateTime(new Date());
codeClassifyEntity.setTs(new Date());
@@ -236,7 +242,7 @@
if(checkChildIsLinked(detail.getOid())){
return R.fail("dataCascadeLinkedNotDelete");
}
- return R.data(checkHasChild(detail.getOid()));
+ return R.status(!checkHasChild(detail.getOid()));
}
/**
@@ -292,7 +298,7 @@
R result = checkIsCanDeleteForDO(codeClassify);
- //鍏堢畝绉版槸鍚︽湁鍏宠仈妯℃澘锛屾湁妯℃澘瑕佸厛鍒犻櫎
+ //鍏堟鏌ユ槸鍚︽湁鍏宠仈妯℃澘锛屾湁妯℃澘瑕佸厛鍒犻櫎
Map<String,Object> condition = new HashMap<>(2);
condition.put("codeClassifyOid",codeClassify.getOid());
List<CodeClassifyTemplate> codeClstemplateEntities = codeClassifyTemplateMapper.selectByMap(condition);
@@ -528,6 +534,57 @@
List<CodeClassifyVO> voList = codeClassifyDO2VOs(doList);
return voList;
}
+
+ /***
+ *
+ * @param parentOid
+ * @return
+ */
+ @Override
+ public List<CodeClassifyVO> selectCodeClassifyVOByParentId(String parentOid) {
+ List<CodeClassify> doList =codeClassifyMapper.selectCodeClassifyDOByParentId(parentOid,AuthUtil.getTenantId());
+ List<CodeClassifyVO> voList = codeClassifyDO2VOs(doList);
+ return voList;
+ }
+
+ /**
+ * 鏍规嵁搴撹妭鐐瑰悕绉拌幏鍙栧垎绫�
+ * @param libName
+ * @return
+ */
+ @Override
+ public List<CodeClassifyVO> getRMLibByName(String libName) {
+ List<String> libNameList=new ArrayList<>();
+ if(StringUtils.isNotBlank(libName)){
+ libNameList=VciBaseUtil.str2List(libName);
+ }
+ List<CodeClassify> doList =codeClassifyMapper.getRMLibByName(libNameList,"Enabled",AuthUtil.getTenantId());
+ List<CodeClassifyVO> voList = codeClassifyDO2VOs(doList);
+ return voList;
+ }
+
+ /***
+ * 鏍规嵁鍒嗙被鎻忚堪澶囨敞鍜屽簱鑺傜偣鏌ヨ鍒嗙被淇℃伅
+ * @param desc
+ * @param codeLibName
+ * @return
+ */
+ @Override
+ public List<CodeClassifyVO> getRMTypeByDescAndLib(String desc, String codeLibName) {
+ List<CodeClassify> doList =codeClassifyMapper.getRMTypeByDesc(desc,"Enabled",AuthUtil.getTenantId());
+ if (CollectionUtils.isEmpty(doList)) {
+ return new LinkedList<CodeClassifyVO>();
+ }
+ CodeClassify codeClassify=doList.get(0);
+ List<CodeClassify> codeClassifyList=codeClassifyMapper.selectAllParenClassifytByOid(codeClassify.getOid(),AuthUtil.getTenantId());
+ CodeClassify currentLib = codeClassifyList.get(codeClassifyList.size() - 1);
+ if (!currentLib.getName().equals(codeLibName)) {
+ return new ArrayList<>();
+ }
+ List<CodeClassifyVO> voList = codeClassifyDO2VOs(codeClassifyList);
+ return voList;
+ }
+
/**
* 浣跨敤缂栧彿鐨勮矾寰勮幏鍙栧璞�
*
--
Gitblit v1.9.3