From ddab14a4547255236c60b1cd039013c2eaecf18f Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 01 八月 2023 21:07:05 +0800
Subject: [PATCH] 修改参照组件值回填bug等
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeClassifyTemplateController.java | 1
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyTemplateAttrServiceImpl.java | 10 ++++-
Source/UBCS-WEB/src/components/code-dialog-page/referConfigFormDialog.vue | 2
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeClassifyService.java | 7 ---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeClassifyTemplateAttrController.java | 10 ++++
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java | 10 ++++-
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClstemplateServiceImpl.java | 4 +-
Source/UBCS/service-stop.sh | 53 ++++++++++----------------
8 files changed, 50 insertions(+), 47 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/code-dialog-page/referConfigFormDialog.vue b/Source/UBCS-WEB/src/components/code-dialog-page/referConfigFormDialog.vue
index c072a8e..b575e34 100644
--- a/Source/UBCS-WEB/src/components/code-dialog-page/referConfigFormDialog.vue
+++ b/Source/UBCS-WEB/src/components/code-dialog-page/referConfigFormDialog.vue
@@ -919,7 +919,7 @@
},
// 鐩戝惉鐖剁粍浠朵紶鐨勭獥鍙ｆ樉绀洪殣钘忕殑鍊�
isShowReferConfigForm (){
- if(this.isShowReferConfigForm){
+ if(this.isShowReferConfigForm && this.codeShowFieldConfigVOS.length <= 0){
this.onloadAttrData();
}
}
diff --git a/Source/UBCS/service-stop.sh b/Source/UBCS/service-stop.sh
index 3ec7333..9f348d3 100644
--- a/Source/UBCS/service-stop.sh
+++ b/Source/UBCS/service-stop.sh
@@ -2,7 +2,7 @@
stop(){
#瀹氫箟瀹瑰櫒鍜岄暅鍍忕殑鍚嶇О
- imagesName=vci-ubcs/ubcs-
+ imagesName=vci-ubcs/ubcs-auth
#瀹氫箟鏈嶅姟鍚嶇О
containerName=ubcs-auth
#濡傛灉瀛樺湪锛屽氨鍏抽棴骞朵笖鍒犻櫎璇ュ鍣�
@@ -25,17 +25,6 @@
else
echo $containerName" is not up!!!"
fi
-
- imagesName=vci-ubcs/ubcs-auth
- containerName=ubcs-auth
- if [[ -n $(docker ps -q -f "name=$containerName") ]];then
- echo $containerName" is up,we will stop and remove it !!!"
- docker stop $containerName
- docker rm $containerName
- docker rmi $imagesName
- else
- echo $containerName" is not up!!!"
- fi
imagesName=vci-ubcs/ubcs-log
containerName=ubcs-log
@@ -70,16 +59,16 @@
echo $containerName" is not up!!!"
fi
- imagesName=vci-ubcs/ubcs-develop
- containerName=ubcs-develop
- if [[ -n $(docker ps -q -f "name=$containerName") ]];then
- echo $containerName" is up,we will stop and remove it !!!"
- docker stop $containerName
- docker rm $containerName
- docker rmi $imagesName
- else
- echo $containerName" is not up!!!"
- fi
+# imagesName=vci-ubcs/ubcs-develop
+# containerName=ubcs-develop
+# if [[ -n $(docker ps -q -f "name=$containerName") ]];then
+# echo $containerName" is up,we will stop and remove it !!!"
+# docker stop $containerName
+# docker rm $containerName
+# docker rmi $imagesName
+# else
+# echo $containerName" is not up!!!"
+# fi
imagesName=vci-ubcs/ubcs-jobadmin
containerName=ubcs-jobadmin
@@ -125,16 +114,16 @@
echo $containerName" is not up!!!"
fi
- imagesName=vci-ubcs/ubcs-swagger
- containerName=ubcs-swagger
- if [[ -n $(docker ps -q -f "name=$containerName") ]];then
- echo $containerName" is up,we will stop and remove it !!!"
- docker stop $containerName
- docker rm $containerName
- docker rmi $imagesName
- else
- echo $containerName" is not up!!!"
- fi
+# imagesName=vci-ubcs/ubcs-swagger
+# containerName=ubcs-swagger
+# if [[ -n $(docker ps -q -f "name=$containerName") ]];then
+# echo $containerName" is up,we will stop and remove it !!!"
+# docker stop $containerName
+# docker rm $containerName
+# docker rmi $imagesName
+# else
+# echo $containerName" is not up!!!"
+# fi
imagesName=vci-ubcs/ubcs-system
containerName=ubcs-system
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeClassifyTemplateAttrController.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeClassifyTemplateAttrController.java
index f894dd4..b623e12 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeClassifyTemplateAttrController.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeClassifyTemplateAttrController.java
@@ -34,6 +34,8 @@
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
+import org.springblade.core.secure.BladeUser;
+import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
import org.springframework.util.CollectionUtils;
@@ -42,6 +44,7 @@
import javax.validation.Valid;
import java.util.Collection;
import java.util.List;
+import java.util.Map;
/**
* 缂栫爜搴撳畾涔�-妯℃澘灞炴�� 鎺у埗鍣�
@@ -140,7 +143,12 @@
if(baseQueryObject == null){
baseQueryObject = new BaseQueryObject();
}
- return CodeClstempattrService.gridCodeClassifyTemplateAttr(baseQueryObject.getConditionMap(),baseQueryObject.getPageHelper());
+ String tenantId = AuthUtil.getTenantId().toString();
+ Map<String, String> conditionMap = baseQueryObject.getConditionMap();
+ if(Func.isNotEmpty(tenantId)){
+ conditionMap.put("TENANT_ID",tenantId);
+ }
+ return CodeClstempattrService.gridCodeClassifyTemplateAttr(conditionMap,baseQueryObject.getPageHelper());
}
/**
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeClassifyTemplateController.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeClassifyTemplateController.java
index c3de44d..57972e7 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeClassifyTemplateController.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeClassifyTemplateController.java
@@ -229,6 +229,7 @@
public List<Tree> referTree(TreeQueryObject treeQueryObject) {
return plCodeClstemplateService.referTree(treeQueryObject);
}
+
/**
* 澧炲姞 鍒嗙被妯℃澘瀵硅薄
* @param codeClassifyTemplateDTO 鍒嗙被妯℃澘瀵硅薄鏁版嵁浼犺緭瀵硅薄
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeClassifyService.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeClassifyService.java
index 78c532e..6979efd 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeClassifyService.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeClassifyService.java
@@ -32,19 +32,12 @@
*/
List<CodeClassify> selectByWrapper(Wrapper wrapper);
-
-
/**
* 浣跨敤鏌ヨ灏佽鍣ㄦ潵鏌ヨ
* @param wrapper 鏌ヨ灏佽鍣�
* @return 鏁版嵁瀵硅薄
*/
List<String> select1(Wrapper wrapper);
-
-
-
-
-
/**
* 鑷畾涔夊垎椤�
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 1f12c5a..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);
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyTemplateAttrServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyTemplateAttrServiceImpl.java
index f352c19..83408a0 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyTemplateAttrServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyTemplateAttrServiceImpl.java
@@ -41,6 +41,7 @@
import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
+import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
import org.springframework.beans.BeanUtils;
@@ -455,7 +456,10 @@
if(!CollectionUtils.isEmpty(oids)){
this.removeBatchByIds(oids);
}
-
+ String tenantId = AuthUtil.getTenantId().toString();
+ codeClassifyTemplateAttrDOInsert.parallelStream().forEach(item->{
+ item.setTenantId(tenantId);
+ });
//鍐嶆柊澧�
if(!CollectionUtils.isEmpty(codeClassifyTemplateAttrDOInsert)){
this.saveBatch(codeClassifyTemplateAttrDOInsert);
@@ -736,6 +740,7 @@
// queryWrapper.addQueryMap("CLASSIFYTEMPLATEOID",templateAttrOid);
Map<String,Object> condition = new HashMap<>(1);
condition.put("CLASSIFYTEMPLATEOID",templateAttrOid);
+
List<CodeClassifyTemplateAttr> codeClassifyTemplateAttrDOList = baseMapper.selectByMap(condition);
List<String> btmIds = new ArrayList<String>();
@@ -745,7 +750,6 @@
//杩囨护鎺夊凡缁忓瓨鍦ㄧ殑灞炴��
List<BtmTypeAttributeVO> boAttrss = new ArrayList<BtmTypeAttributeVO>();
-
for (BtmTypeAttributeVO osBtmTypeAttributeVO:btmTypeVOR.getData().getAttributes()){
if(!btmIds.contains(osBtmTypeAttributeVO.getId())){
//鐪嬬湅鏄笉鏄湁妯＄硦鏌ヨ
@@ -761,6 +765,8 @@
}
}
}
+ // 鎸夌収id鍗囧簭鎺掑簭
+ boAttrss = boAttrss.stream().sorted(Comparator.comparing(BtmTypeAttributeVO::getId)).collect(Collectors.toList());
dataGrid.setData(boAttrss);
dataGrid.setTotal(boAttrss.size());
return dataGrid;
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClstemplateServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClstemplateServiceImpl.java
index e849ba0..6ff578d 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClstemplateServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClstemplateServiceImpl.java
@@ -898,11 +898,11 @@
//鎵�鏈夊垎绫婚兘娌℃湁涓氬姟绫诲瀷锛岃繑鍥炴彁绀�
if(codeClassifyDOList.size()==0){
- return R.fail("娣诲姞妯℃澘娣诲姞澶辫触,鍒嗙被鍜屼笂绾у垎绫婚兘娌℃湁鍏宠仈涓氬姟绫诲瀷锛�");
+ return R.fail(DATA_OID_NOT_EXIST);
}
//璁剧疆btmtypeid鍜宯ame
- CodeClassify codeClassifyDO = codeClassifyDOList.get(0);
+ CodeClassify codeClassifyDO = codeClassifyDOList.stream().filter(s -> StringUtils.isNotBlank(s.getBtmTypeId())).findFirst().get();
codeClassifyTemplateDO.setBtmTypeId(codeClassifyDO.getBtmTypeId());
codeClassifyTemplateDO.setNameOid(VciBaseUtil.getPk());
codeClassifyTemplateDO.setBtmTypeName(codeClassifyDO.getBtmTypeName());
--
Gitblit v1.9.3