From 6a5cc80261552d6f9ba6a59b8067665f4a429ee9 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 19 七月 2023 11:42:52 +0800
Subject: [PATCH] 代码提交
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyValueServiceImpl.java | 15 +++++++++++++++
Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeClassifyValueMapper.xml | 10 ++++++++++
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeClassifyValueService.java | 7 +++++++
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeRuleServiceImpl.java | 6 ++++--
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeClassifyValueMapper.java | 4 +++-
5 files changed, 39 insertions(+), 3 deletions(-)
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 f3405dc..a8047ce 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
@@ -14,8 +14,10 @@
*/
public interface CodeClassifyValueMapper extends BaseMapper<CodeClassifyValue> {
- List<String> selectAllLevelChildOid(@Param("oid") String oid);
+ List<String> selectAllLevelChildOid(@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/ICodeClassifyValueService.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeClassifyValueService.java
index 6597a5d..52a5ed5 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeClassifyValueService.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeClassifyValueService.java
@@ -123,6 +123,13 @@
List<CodeClassifyValueVO> listCodeClassifyValueBySecOid(String classifySecOid, String parentClassifyValueOid);
/**
+ * 鏍规嵁涓婚敭鑾峰彇鐮佸�煎瓧绗︿覆
+ * @param oid
+ * @return
+ */
+ String getClassifyValueStr(String oid);
+
+ /**
* 鏁版嵁瀵硅薄杞崲涓烘樉绀哄璞�
* @param codeClassifyValueDO 鏁版嵁瀵硅薄
* @return 鏄剧ず瀵硅薄
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 62f4143..b8df9b8 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
@@ -25,6 +25,7 @@
import com.vci.ubcs.starter.web.util.VciBaseUtil;
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.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.http.ResponseEntity;
@@ -393,6 +394,20 @@
}
/**
+ * 鏍规嵁涓婚敭鑾峰彇鐮佸�煎瓧绗︿覆
+ * @param oid
+ * @return
+ */
+ @Override
+ public String getClassifyValueStr(String oid){
+ if(Func.isEmpty(oid)){
+ return "";
+ }
+ String classifyValueStr = this.codeClassifyValueMapper.getClassifyValueStr(oid);
+ return Func.isEmpty(classifyValueStr) ? "":classifyValueStr;
+ }
+
+ /**
* 鎵归噺鏁版嵁瀵硅薄杞崲涓烘樉绀哄璞�
* @param codeClassifyValueDOs 鏁版嵁瀵硅薄鍒楄〃
* @return 鏄剧ず瀵硅薄
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeRuleServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeRuleServiceImpl.java
index fce6239..9201f79 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeRuleServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeRuleServiceImpl.java
@@ -564,7 +564,9 @@
break;
// 鍒嗙被鐮佹姣斿鎸夊崌搴忔帓搴忕爜鍊�
case "codeclassifysec":
- if(!releasedBasicSec.getReferCodeClassifyOid().equals(releaseBasicSec.getReferCodeClassifyOid())){
+ String classifyValueStr = this.iCodeClassifyValueService.getClassifyValueStr(releasedBasicSec.getOid());
+ String classifyValueStr1 = this.iCodeClassifyValueService.getClassifyValueStr(releaseBasicSec.getOid());
+ if(classifyValueStr.equals(classifyValueStr1)){
flag = false;
}
break;
@@ -596,7 +598,7 @@
}
break;
}
- if (flag) {
+ if (!flag) {
break;
}
}
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 0cdf898..402eb75 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
@@ -18,4 +18,14 @@
</select>
+ <select id="getClassifyValueStr" resultType="java.lang.String">
+ SELECT
+ listagg(PCC.ID,'-') WITHIN GROUP(ORDER BY PCC.ORDERNUM ASC)
+ FROM
+ PL_CODE_CLASSIFYVALUE PCC
+ WHERE
+ PCC.CODECLASSIFYSECOID = #{oid}
+ </select>
+
+
</mapper>
--
Gitblit v1.9.3