From 426cad0dd0eef1aefb59c6aaa2e2a2448773dc0b Mon Sep 17 00:00:00 2001 From: yuxc <653031404@qq.com> Date: 星期一, 24 七月 2023 17:29:24 +0800 Subject: [PATCH] 1、修改查询按钮时的条件,使用编码来查询。 2、增加申请编码时增加设置默认的租户编码。 3、对传入in('条件sql拼接报错问题进行了修改。 4、模板的启用前进行了对分类启用状态的一个判断工作。 --- Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/enumpack/CodeSecTypeEnum.java | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/enumpack/CodeSecTypeEnum.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/enumpack/CodeSecTypeEnum.java index 42ff3a3..07731f0 100644 --- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/enumpack/CodeSecTypeEnum.java +++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/enumpack/CodeSecTypeEnum.java @@ -1,8 +1,9 @@ package com.vci.ubcs.code.enumpack; -import com.vci.ubcs.code.annotation.BaseEnum; -import com.vci.ubcs.code.constant.MdmEnumIdConstant; -import com.vci.ubcs.com.vci.starter.annotation.VciEnum; + +import com.vci.ubcs.starter.annotation.VciEnum; +import com.vci.ubcs.starter.web.constant.MdmEnumIdConstant; +import com.vci.ubcs.starter.web.enumpck.BaseEnum; /** * 鐮佹鐨勭被鍨� @@ -21,18 +22,22 @@ * 鍙彉鐮佹 */ CODE_VARIABLE_SEC("codevariablesec","鍙彉鐮佹"), + /** * 鏃ユ湡鐮佹 */ - CODE_DATE_SEC("codedatasec","鏃ユ湡鐮佹"), + CODE_DATE_SEC("codedatesec","鏃ユ湡鐮佹"), + /** * 鍒嗙被鐮佹 */ CODE_CLASSIFY_SEC("codeclassifysec","鍒嗙被鐮佹"), + /** * 灞炴�х爜娈� */ CODE_ATTR_SEC("codeattrsec","灞炴�х爜娈�"), + /** * 娴佹按鐮佹 */ -- Gitblit v1.9.3