From 4136c16e52716975ff05e3b066f6719c5b7e2bd8 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 15 十一月 2023 16:10:01 +0800
Subject: [PATCH] 增加是否参与关键属性校验相关属性
---
Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/web/pagemodel/Tree.java | 15 +++++++
Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeBasicSecMapper.xml | 4 ++
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeClassifyVO.java | 2
Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/revision/service/RevisionModelUtil.java | 7 +++
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeRule.java | 1
Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/object/ubcscode/config/CodeRule.java | 3 -
Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeCLassifyMapper.xml | 31 ++++++++++-----
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeClassifyDTO.java | 2
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeClassify.java | 2
9 files changed, 51 insertions(+), 16 deletions(-)
diff --git a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/object/ubcscode/config/CodeRule.java b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/object/ubcscode/config/CodeRule.java
index 31cf74e..aa84465 100644
--- a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/object/ubcscode/config/CodeRule.java
+++ b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/object/ubcscode/config/CodeRule.java
@@ -96,6 +96,5 @@
public void setBasicSecTypes(String basicSecTypes) {
this.basicSecTypes = basicSecTypes;
}
-
-
+
}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeClassifyDTO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeClassifyDTO.java
index 8f8ceed..7c494a1 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeClassifyDTO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeClassifyDTO.java
@@ -70,7 +70,7 @@
private String codeResembleRuleOidName;
/**
- * 鏄惁鍙備笌鏍￠獙锛�0:鍙備笌;1:涓嶅弬涓�
+ * 鏄惁鍙備笌鏍￠獙锛�0:涓嶅弬涓�;1:鍙備笌
*/
private String isParticipateCheck;
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeClassify.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeClassify.java
index 951a8d2..ddb7865 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeClassify.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeClassify.java
@@ -89,7 +89,7 @@
private String codeResembleRuleOid;
/**
- * 鏄惁鍙備笌鏍￠獙锛�0:鍙備笌;1:涓嶅弬涓�
+ * 鏄惁鍙備笌鏍￠獙锛�0:涓嶅弬涓�;1:鍙備笌
*/
private String isParticipateCheck;
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeRule.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeRule.java
index da6fbfe..9099f3d 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeRule.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeRule.java
@@ -16,7 +16,6 @@
*/
package com.vci.ubcs.code.entity;
-import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.vci.ubcs.starter.constant.CodeTableNameConstant;
import com.vci.ubcs.starter.revision.model.BaseModel;
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeClassifyVO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeClassifyVO.java
index ae62cbc..72c48c6 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeClassifyVO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeClassifyVO.java
@@ -63,7 +63,7 @@
private Integer dataLevel;
/**
- * 鏄惁鍙備笌鏍￠獙锛�0:鍙備笌;1:涓嶅弬涓�
+ * 鏄惁鍙備笌鏍￠獙锛�0:涓嶅弬涓�;1:鍙備笌
*/
private String isParticipateCheck;
diff --git a/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/revision/service/RevisionModelUtil.java b/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/revision/service/RevisionModelUtil.java
index 18c0cc2..41279d6 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/revision/service/RevisionModelUtil.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/revision/service/RevisionModelUtil.java
@@ -58,10 +58,17 @@
});
tree.setOid((String)oidValues.stream().collect(Collectors.joining(wrapperOptions.getOidValueSep())));
tree.setName((String) VciBaseUtil.getValueFromField("name", doObject));
+ // TODO:涓氬姟鏁版嵁鎬绘暟缁熻鏆傛椂娌″畬鍠�
String total = (String) VciBaseUtil.getValueFromField("total", doObject);
+ String isParticipateCheck = (String) VciBaseUtil.getValueFromField("isParticipateCheck", doObject);
if(Func.isNotEmpty(total)){
tree.setCount("銆�"+total+"銆�");
}
+ if(Func.isNotEmpty(isParticipateCheck)){
+ tree.setIsParticipateCheck(isParticipateCheck);
+ }else {
+ tree.setIsParticipateCheck("1");
+ }
if (f != null) {
tree.setText((String)f.apply(doObject));
} else {
diff --git a/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/web/pagemodel/Tree.java b/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/web/pagemodel/Tree.java
index 892c52d..2fb7bfa 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/web/pagemodel/Tree.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/web/pagemodel/Tree.java
@@ -25,10 +25,16 @@
private String parentId;
private String parentName;
private String parentBtmName;
+ /**
+ * 鏄惁鍙備笌鏍￠獙锛�0:涓嶅弬涓�;1:鍙備笌
+ */
+ private String isParticipateCheck;
private boolean expanded = false;
private String href;
private String index;
private Map<String, String> attributes = new HashMap();
+
+
public Tree() {
}
@@ -243,6 +249,15 @@
}
}
+
+ public void setIsParticipateCheck(String isParticipateCheck) {
+ this.isParticipateCheck = isParticipateCheck;
+ }
+
+ public String getIsParticipateCheck() {
+ return isParticipateCheck;
+ }
+
@Override
public String toString() {
return "Tree{oid='" + this.oid + '\'' + ", text='" + this.text + '\'' + ", leaf=" + this.leaf + ", showCheckbox=" + this.showCheckbox + ", checked=" + this.checked + ", children=" + this.children + ", icon='" + this.icon + '\'' + ", iconCls='" + this.iconCls + '\'' + ", parentId='" + this.parentId + '\'' + ", parentName='" + this.parentName + '\'' + ", parentBtmName='" + this.parentBtmName + '\'' + ", expanded=" + this.expanded + ", href='" + this.href + '\'' + ", index='" + this.index + '\'' + ", attributes=" + this.attributes + '}';
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeBasicSecMapper.xml b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeBasicSecMapper.xml
index 76c9657..7365363 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeBasicSecMapper.xml
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeBasicSecMapper.xml
@@ -69,6 +69,8 @@
<result property="referBtmName" column="REFERBTMNAME" jdbcType="VARCHAR"/>
<result property="referBtmId" column="REFERBTMID" jdbcType="VARCHAR"/>
<result property="referCodeClassifyOidName" column="c__name" jdbcType="VARCHAR"/>
+ <result property="prefixCode" column="PREFIXCODE" jdbcType="VARCHAR"/>
+ <result property="suffixCode" column="SUFFIXCODE" jdbcType="VARCHAR"/>
</resultMap>
<select id="selectCodeBasicSecPage" resultMap="CodeBasicsecMap">
@@ -135,6 +137,8 @@
PL_CODE_BASICSEC.serialdependorder,
PL_CODE_BASICSEC.nullableflag,
PL_CODE_BASICSEC.codefilllimit,
+ PL_CODE_BASICSEC.prefixcode,
+ PL_CODE_BASICSEC.suffixcode,
btm_codebasicsec_1.name as b__name,
platformbtm_codeclassify.name as c__name,
COUNT(*) OVER () "##VCI_COUNT_VCI##"
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeCLassifyMapper.xml b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeCLassifyMapper.xml
index a604bf7..26d4caa 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeCLassifyMapper.xml
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeCLassifyMapper.xml
@@ -37,6 +37,7 @@
<result column="CODERULEOID" property="codeRuleOid"/>
<result column="CODEKEYATTRREPEATOID" property="codeKeyAttrRepeatOid"/>
<result column="CODERESEMBLERULEOID" property="codeResembleRuleOid"/>
+ <result column="ISPARTICIPATECHECK" property="isParticipateCheck"/>
<result column="TENANT_ID" property="tenantId"/>
<result column="TOTAL" property="total"/>
</resultMap>
@@ -88,7 +89,8 @@
codeclassify0.TENANT_ID as tenantId ,
coderuleoid.name as codeRuleOidName,
codekeyattrrepeatoid.name as codeKeyAttrRepeatOidName,
- coderesembleruleoid.name as codeResembleRuleOidName
+ coderesembleruleoid.name as codeResembleRuleOidName,
+ codeclassify0.ISPARTICIPATECHECK as isParticipateCheck
from pl_code_classify codeclassify0
left join pl_code_rule coderuleoid
on codeclassify0.codeRuleOid = coderuleoid.oid
@@ -132,6 +134,7 @@
codeclassify0.CODERESEMBLERULEOID as coderesembleruleoid,
codeclassify0.LCSTATUS as lcstatus,
codeclassify0.TS as ts,
+ codeclassify0.ISPARTICIPATECHECK as isParticipateCheck,
coderuleoid.name as codeRuleOidName,
codekeyattrrepeatoid.name as codeKeyAttrRepeatOidName,
coderesembleruleoid.name as codeResembleRuleOidName,
@@ -213,8 +216,9 @@
codeclassify0.CODERESEMBLERULEOID as coderesembleruleoid,
codeclassify0.LCSTATUS as lcstatus,
codeclassify0.TS as ts,
- codeclassify0.namePath as namepath,
- codeclassify0.idPath as idpath
+ codeclassify0.namePath as namepath,
+ codeclassify0.idPath as idpath,
+ codeclassify0.ISPARTICIPATECHECK as isParticipateCheck
from (select plcodeclassify.*,
SYS_CONNECT_BY_PATH(name, '#') as namePath,
SYS_CONNECT_BY_PATH(id, '#') as idPath
@@ -243,7 +247,8 @@
codeclassify0.CODERESEMBLERULEOID as coderesembleruleoid,
codeclassify0.LCSTATUS as lcstatus,
codeclassify0.TS as ts,
- codeclassify0.paths as paths
+ codeclassify0.paths as paths,
+ codeclassify0.ISPARTICIPATECHECK as isParticipateCheck
from (select plcodeclassify.*,
<choose>
<when test='fieldName=="name"'>
@@ -296,10 +301,11 @@
codeclassify0.CODERESEMBLERULEOID as coderesembleruleoid,
codeclassify0.LCSTATUS as lcstatus,
codeclassify0.TS as ts,
- codeclassify0.TENANT_ID as tenantId ,
+ codeclassify0.TENANT_ID as tenantId,
+ codeclassify0.ISPARTICIPATECHECK as isParticipateCheck,
coderuleoid.name as codeRuleOidName,
codekeyattrrepeatoid.name as codeKeyAttrRepeatOidName,
- coderesembleruleoid.name as codeResembleRuleOidName
+ coderesembleruleoid.name as codeResembleRuleOidName,
from pl_code_classify codeclassify0
left join pl_code_rule coderuleoid
on codeclassify0.codeRuleOid = coderuleoid.oid
@@ -359,7 +365,8 @@
codeclassify0.TENANT_ID as tenantId ,
coderuleoid.name as codeRuleOidName,
codekeyattrrepeatoid.name as codeKeyAttrRepeatOidName,
- coderesembleruleoid.name as codeResembleRuleOidName
+ coderesembleruleoid.name as codeResembleRuleOidName,
+ codeclassify0.ISPARTICIPATECHECK as isParticipateCheck
from pl_code_classify codeclassify0
left join pl_code_rule coderuleoid
on codeclassify0.codeRuleOid = coderuleoid.oid
@@ -381,7 +388,7 @@
</select>
<select id="getRMLibByName" resultMap="plCodeClassifyResultMap">
- select codeclassify0.OWNER as owner,
+ select codeclassify0.OWNER as owner,
codeclassify0.BTMTYPEID as btmtypeid,
codeclassify0.CREATOR as creator,
codeclassify0.CREATETIME as createtime,
@@ -401,9 +408,10 @@
codeclassify0.LCSTATUS as lcstatus,
codeclassify0.TS as ts,
codeclassify0.TENANT_ID as tenantId ,
+ codeclassify0.ISPARTICIPATECHECK as isParticipateCheck,
coderuleoid.name as codeRuleOidName,
codekeyattrrepeatoid.name as codeKeyAttrRepeatOidName,
- coderesembleruleoid.name as codeResembleRuleOidName
+ coderesembleruleoid.name as codeResembleRuleOidName,
from pl_code_classify codeclassify0
left join pl_code_rule coderuleoid
on codeclassify0.codeRuleOid = coderuleoid.oid
@@ -446,6 +454,7 @@
codeclassify0.LCSTATUS as lcstatus,
codeclassify0.TS as ts,
codeclassify0.TENANT_ID as tenantId ,
+ codeclassify0.ISPARTICIPATECHECK as isParticipateCheck,
coderuleoid.name as codeRuleOidName,
codekeyattrrepeatoid.name as codeKeyAttrRepeatOidName,
coderesembleruleoid.name as codeResembleRuleOidName
@@ -488,6 +497,7 @@
codeclassify0.LCSTATUS as lcstatus,
codeclassify0.TS as ts,
codeclassify0.TENANT_ID as tenantId ,
+ codeclassify0.ISPARTICIPATECHECK as isParticipateCheck,
coderuleoid.name as codeRuleOidName,
codekeyattrrepeatoid.name as codeKeyAttrRepeatOidName,
coderesembleruleoid.name as codeResembleRuleOidName
@@ -531,7 +541,8 @@
codeclassify0.CODERESEMBLERULEOID as coderesembleruleoid,
codeclassify0.LCSTATUS as lcstatus,
codeclassify0.TS as ts,
- codeclassify0.TENANT_ID as tenantId ,
+ codeclassify0.TENANT_ID as tenantId,
+ codeclassify0.ISPARTICIPATECHECK as isParticipateCheck,
coderuleoid.name as codeRuleOidName,
codekeyattrrepeatoid.name as codeKeyAttrRepeatOidName,
coderesembleruleoid.name as codeResembleRuleOidName
--
Gitblit v1.9.3