From 13f2d9d9b067d571f37fc14fe8ea4399eaad2547 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 13 九月 2023 08:45:23 +0800
Subject: [PATCH] 代码提交
---
Source/UBCS-WEB/src/components/code-dialog-page/referSelectBtmAttrDialog.vue | 1 +
Source/UBCS-WEB/src/components/code-dialog-page/cloneOtherBasicSecDialog.vue | 1 +
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyValueServiceImpl.java | 24 +++++++++++++-----------
Source/UBCS-WEB/src/components/code-dialog-page/referBtmTypeCrudDialog.vue | 1 +
Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeClassifyValueMapper.xml | 3 +++
Source/UBCS-WEB/src/components/code-dialog-page/formulaEditor.vue | 1 +
Source/UBCS-WEB/src/components/code-dialog-page/referConfigFormDialog.vue | 1 +
Source/UBCS-WEB/src/components/code-dialog-page/cloneRuleDialog.vue | 1 +
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeClassifyValueMapper.java | 2 ++
Source/UBCS-WEB/src/components/code-dialog-page/referConfigCrudDialog.vue | 1 +
10 files changed, 25 insertions(+), 11 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/code-dialog-page/cloneOtherBasicSecDialog.vue b/Source/UBCS-WEB/src/components/code-dialog-page/cloneOtherBasicSecDialog.vue
index 5a85239..2338530 100644
--- a/Source/UBCS-WEB/src/components/code-dialog-page/cloneOtherBasicSecDialog.vue
+++ b/Source/UBCS-WEB/src/components/code-dialog-page/cloneOtherBasicSecDialog.vue
@@ -1,5 +1,6 @@
<template>
<el-dialog
+ :close-on-click-modal="false"
:visible.sync="cloneOtherCodeRuleSettingBox"
append-to-body
class="avue-dialog avue-dialog--top"
diff --git a/Source/UBCS-WEB/src/components/code-dialog-page/cloneRuleDialog.vue b/Source/UBCS-WEB/src/components/code-dialog-page/cloneRuleDialog.vue
index 897c547..c58274e 100644
--- a/Source/UBCS-WEB/src/components/code-dialog-page/cloneRuleDialog.vue
+++ b/Source/UBCS-WEB/src/components/code-dialog-page/cloneRuleDialog.vue
@@ -1,5 +1,6 @@
<template>
<el-dialog
+ :close-on-click-modal="false"
:visible.sync="cloneSettingBox"
append-to-body
class="avue-dialog avue-dialog--top"
diff --git a/Source/UBCS-WEB/src/components/code-dialog-page/formulaEditor.vue b/Source/UBCS-WEB/src/components/code-dialog-page/formulaEditor.vue
index 965e500..14c0691 100644
--- a/Source/UBCS-WEB/src/components/code-dialog-page/formulaEditor.vue
+++ b/Source/UBCS-WEB/src/components/code-dialog-page/formulaEditor.vue
@@ -3,6 +3,7 @@
<el-dialog
title="鍏紡缂栬緫妗�"
append-to-body
+ :close-on-click-modal="false"
:visible.sync="isShowformulaEdit"
@close="closeFormulaEdit"
width="75%"
diff --git a/Source/UBCS-WEB/src/components/code-dialog-page/referBtmTypeCrudDialog.vue b/Source/UBCS-WEB/src/components/code-dialog-page/referBtmTypeCrudDialog.vue
index 14ea0a5..8e21b44 100644
--- a/Source/UBCS-WEB/src/components/code-dialog-page/referBtmTypeCrudDialog.vue
+++ b/Source/UBCS-WEB/src/components/code-dialog-page/referBtmTypeCrudDialog.vue
@@ -1,5 +1,6 @@
<template>
<el-dialog
+ :close-on-click-modal="false"
title="涓恒�愬弬鐓у紩鐢ㄧ殑涓氬姟绫诲瀷銆戦�夊彇鍊�"
append-to-body
:visible.sync="referBtmDialogParams.isShowDialog"
diff --git a/Source/UBCS-WEB/src/components/code-dialog-page/referConfigCrudDialog.vue b/Source/UBCS-WEB/src/components/code-dialog-page/referConfigCrudDialog.vue
index 0d5e6f2..5b0c3f7 100644
--- a/Source/UBCS-WEB/src/components/code-dialog-page/referConfigCrudDialog.vue
+++ b/Source/UBCS-WEB/src/components/code-dialog-page/referConfigCrudDialog.vue
@@ -1,5 +1,6 @@
<template>
<el-dialog
+ :close-on-click-modal="false"
title="閫夋嫨鍙傜収閰嶇疆"
append-to-body
:visible.sync="isShowReferConfigCrud"
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 134682f..9e75512 100644
--- a/Source/UBCS-WEB/src/components/code-dialog-page/referConfigFormDialog.vue
+++ b/Source/UBCS-WEB/src/components/code-dialog-page/referConfigFormDialog.vue
@@ -1,6 +1,7 @@
<template>
<!-- 绗簩灞傚璇濇,灞炴�х爜娈碉紝鍏紡缂栬緫妗嗗脊绐� -->
<el-dialog
+ :close-on-click-modal="false"
title="鍙傜収閰嶇疆"
append-to-body
:visible.sync="isShowReferConfigForm"
diff --git a/Source/UBCS-WEB/src/components/code-dialog-page/referSelectBtmAttrDialog.vue b/Source/UBCS-WEB/src/components/code-dialog-page/referSelectBtmAttrDialog.vue
index 10c166d..ef651fa 100644
--- a/Source/UBCS-WEB/src/components/code-dialog-page/referSelectBtmAttrDialog.vue
+++ b/Source/UBCS-WEB/src/components/code-dialog-page/referSelectBtmAttrDialog.vue
@@ -1,5 +1,6 @@
<template>
<el-dialog
+ :close-on-click-modal="false"
:title="options.title"
append-to-body
:visible.sync="crudParams.isShowDialog"
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeClassifyValueMapper.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeClassifyValueMapper.java
index a8047ce..e9f569b 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeClassifyValueMapper.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeClassifyValueMapper.java
@@ -16,6 +16,8 @@
List<String> selectAllLevelChildOid(@Param("oid") String oid);
+ List<String> selectChildOid(@Param("oid") String oid);
+
Long countAllLevelChildOid(@Param("oid") String oid);
String getClassifyValueStr(@Param("oid") String oid);
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyValueServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyValueServiceImpl.java
index 9c1f965..a586780 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyValueServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyValueServiceImpl.java
@@ -130,11 +130,15 @@
BeanUtilForVCI.copyPropertiesIgnoreCase(codeClassifyValueDTO,codeClassifyValueDO);
//濉厖涓�浜涢粯璁ゅ��
DefaultAttrAssimtUtil.addDefaultAttrAssimt(codeClassifyValueDO, MdmBtmTypeConstant.CODE_CLASSIFY_VALUE);
+ LambdaQueryWrapper<CodeClassifyValue> wrapper = Wrappers.<CodeClassifyValue>query()
+ .lambda().eq(CodeClassifyValue::getCodeClassifySecOid, codeClassifyValueDO.getCodeClassifySecOid());
+ if(Func.isEmpty(codeClassifyValueDO.getParentClassifyValueOid())){
+ wrapper.isNull(CodeClassifyValue::getParentClassifyValueOid);
+ }else{
+ wrapper.eq(CodeClassifyValue::getParentClassifyValueOid, codeClassifyValueDO.getParentClassifyValueOid());
+ }
//鏌ヨ
- List<CodeClassifyValue> existList = codeClassifyValueMapper.selectList(Wrappers.<CodeClassifyValue>query()
- .lambda().eq(CodeClassifyValue::getCodeClassifySecOid, codeClassifyValueDO.getCodeClassifySecOid())
- .eq(CodeClassifyValue::getParentClassifyValueOid, codeClassifyValueDO.getParentClassifyValueOid())
- );
+ List<CodeClassifyValue> existList = codeClassifyValueMapper.selectList(wrapper);
codeClassifyValueDO.setOrderNum(existList.size() + 1);
boolean resBoolean = codeClassifyValueMapper.insert(codeClassifyValueDO) > 0;
return resBoolean;
@@ -244,19 +248,17 @@
VciBaseUtil.alertNotNull(codeClassifyValueDTO,"鍒嗙被鐮佹鐨勭爜鍊兼暟鎹璞�",codeClassifyValueDTO.getOid(),"鍒嗙被鐮佹鐨勭爜鍊肩殑涓婚敭");
CodeClassifyValue codeClassifyValueDO = selectByOid(codeClassifyValueDTO.getOid());
R baseResult = checkIsCanDeleteForDO(codeClassifyValueDTO,codeClassifyValueDO);
- if(!baseResult.isSuccess()) {
- //鎵句笅绾х殑锛岃繖涓槸鍙互鍒犻櫎鐨勬椂鍊橰
- List<String> childrenOids = codeClassifyValueMapper.selectAllLevelChildOid(codeClassifyValueDO.getOid().trim());
+ if(baseResult.isSuccess()) {
+ //鍏堝垹闄や笅绾х爜鍊硷紝鎵句笅绾х殑锛岃繖涓槸鍙互鍒犻櫎鐨勬椂鍊�
+ List<String> childrenOids = codeClassifyValueMapper.selectChildOid(codeClassifyValueDO.getOid().trim());
if (!CollectionUtils.isEmpty(childrenOids)) {
Collection<Collection<String>> childrenCollections = VciBaseUtil.switchCollectionForOracleIn(childrenOids);
for(Collection<String> s : childrenCollections){
- codeClassifyValueMapper.delete(Wrappers.<CodeClassifyValue>query().lambda().eq(CodeClassifyValue::getOid,s));
+ codeClassifyValueMapper.deleteBatchIds(s);
}
}
- }else{
- return baseResult;
}
- //鎵ц鍒犻櫎鎿嶄綔
+ //鎵ц鍒犻櫎鎿嶄綔锛屽啀鍒犻櫎鐖剁殑鐮佸��
boolean resBoolean = codeClassifyValueMapper.deleteById(codeClassifyValueDO.getOid()) > 0;
return R.status(resBoolean);
}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeClassifyValueMapper.xml b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeClassifyValueMapper.xml
index 402eb75..25fe4da 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeClassifyValueMapper.xml
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeClassifyValueMapper.xml
@@ -9,6 +9,9 @@
CONNECT BY PRIOR PARENTCLASSIFYVALUEOID = OID
</select>
+ <select id="selectChildOid" resultType="java.lang.String">
+ select OID from PL_CODE_CLASSIFYVALUE where PARENTCLASSIFYVALUEOID =#{oid}
+ </select>
<select id="countAllLevelChildOid" resultType="java.lang.Long">
select count(OID) countsize
--
Gitblit v1.9.3