From fb4762049abdca953db1ed4528d128dd8d887710 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 08 十一月 2023 18:53:45 +0800
Subject: [PATCH] 代码提交
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java | 28 +++++++++++++++++-----------
1 files changed, 17 insertions(+), 11 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 50de8a3..2878287 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
@@ -528,7 +528,7 @@
lcStatus = treeQueryObject.getConditionMap().getOrDefault("lcStatus",null);
}
if(StringUtils.isNotBlank(id) || StringUtils.isNotBlank(lcStatus) ){
- String tableName = this.getTableName(treeQueryObject.getParentOid(),treeQueryObject.getConditionMap().get("id"), treeQueryObject.getConditionMap().get("lcStatus"));
+ String tableName = this.getTableName(treeQueryObject.getConditionMap().get("btmTypeId"),treeQueryObject.getConditionMap().get("id"), treeQueryObject.getConditionMap().get("lcStatus"));
doList = codeClassifyMapper
.selectCodeClassifyDOByTree(
treeQueryObject.getConditionMap().get("id"),
@@ -537,6 +537,12 @@
VciBaseUtil.checkAdminTenant() ? null:AuthUtil.getTenantId(),
tableName
);
+ // 璇佹槑鏄煡椤跺眰鑺傜偣
+ if(StringUtils.isNotBlank(id)){
+ // 鏈夋椂鍊欐煡璇otal杩囨參浼氬鑷存棤娉曞姞杞斤紝鐜板湪淇敼鏌ヨ鎬绘暟涓鸿繛琛ㄦ煡璇絾鏄氨瀵艰嚧椤跺眰鑺傜偣鏃犳硶鏌ヨ鍑烘�绘暟
+ String total = commonsMapper.selectCountByTableName(tableName);
+ doList.get(0).setTotal(total);
+ }
}else{
// 鍙鍓嶇浼氫紶鍙傛暟杩囨潵灏变笉浼氬嚭鐜拌蛋杩欏彞鐨勬儏鍐碉紝鎵�浠ユ煡璇㈡�绘暟娌″湪杩欏効娣诲姞
doList =codeClassifyMapper.selectCodeClassifyVOByTree(
@@ -570,22 +576,22 @@
* 鍒嗙被鍔犺浇鏃惰幏鍙栦笟鍔＄被鍨媔d锛屾嫾鎺ヤ笟鍔＄被鍨嬭〃鍚�
* @return
*/
- private String getTableName(String parentCodeClassifyOid,String id,String lcStatus){
+ private String getTableName(String btmTypeId,String id,String lcStatus){
+ if(Func.isNotEmpty(btmTypeId)){
+ return VciBaseUtil.getTableName(btmTypeId,true);
+ }
LambdaQueryWrapper<CodeClassify> wrapper = Wrappers.<CodeClassify>query()
.lambda().select(CodeClassify::getBtmTypeId)
.eq(CodeClassify::getLcStatus, lcStatus)
.isNotNull(CodeClassify::getBtmTypeId)
- .last("limit 1");
- if(Func.isNotBlank(id)){
- wrapper.eq(CodeClassify::getId,id).isNull(CodeClassify::getParentCodeClassifyOid);
- }else{
- wrapper.eq(CodeClassify::getParentCodeClassifyOid,parentCodeClassifyOid);
- }
+ .last("limit 1")
+ .eq(CodeClassify::getId,id).isNull(CodeClassify::getParentCodeClassifyOid);
+
CodeClassify codeClassify = codeClassifyMapper.selectOne(wrapper);
if(Func.isEmpty(codeClassify) || Func.isEmpty(codeClassify.getBtmTypeId())){
- throw new ServiceException("鏌ヨ涓绘暟鎹�绘暟鏃讹紝鏈幏鍙栦笟鍔＄被鍨婭D锛�");
+ throw new ServiceException("鏌ヨ涓绘暟鎹�绘暟鏃讹紝鏈幏鍙栧埌涓氬姟绫诲瀷ID锛�");
}
- return VciBaseUtil.getTableName(codeClassify.getBtmTypeId().toLowerCase(Locale.ROOT),true);
+ return VciBaseUtil.getTableName(codeClassify.getBtmTypeId(),true);
}
/**
@@ -1264,7 +1270,7 @@
return null;
}
List<Tree> treeList = trees.stream().filter(tree -> !CollectionUtils.isEmpty(btmTypeVOS.stream().filter(btmType -> {
- if(Objects.equals(tree.getAttributes().get("id"), btmType.getId())){
+ if(Objects.equals(tree.getAttributes().get("btmTypeId"), btmType.getId())){
tree.getAttributes().put("btmTypeOid",btmType.getOid());
return true;
}
--
Gitblit v1.9.3