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-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeImportTemplateVO.java | 50 ++++++++++++++++---------------------------------- 1 files changed, 16 insertions(+), 34 deletions(-) diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeImportTemplateVO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeImportTemplateVO.java index a0f186f..3ea96dc 100644 --- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeImportTemplateVO.java +++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeImportTemplateVO.java @@ -1,42 +1,24 @@ package com.vci.ubcs.code.vo.pagemodel; +import lombok.Data; + import java.util.ArrayList; import java.util.List; +/**** + * 鎵归噺鐢宠redis缂撳瓨瀵硅薄 + * @author xiejun + * @date 2023-06-14 + */ +@Data public class CodeImportTemplateVO { - private List<ColumnVO> cloNamesList=new ArrayList<>(); - private CodeClassifyTemplateVO codeClassifyTemplateVO; - private CodeClassifyVO codeClassifyVO; - public List<ColumnVO> getCloNamesList() { - return cloNamesList; - } + private boolean root; + private String codeClassifyOid; + private String codeTemplateOid; + private String codeRuleOid; + private List<ColumnVO> cloNamesList=new ArrayList<>(); + private CodeRuleVO codeRuleVO; + private CodeClassifyTemplateVO codeClassifyTemplateVO; + private CodeClassifyVO codeClassifyVO; - public void setCloNamesList(List<ColumnVO> cloNamesList) { - this.cloNamesList = cloNamesList; - } - - public CodeClassifyTemplateVO getCodeClassifyTemplateVO() { - return codeClassifyTemplateVO; - } - - public void setCodeClassifyTemplateVO(CodeClassifyTemplateVO codeClassifyTemplateVO) { - this.codeClassifyTemplateVO = codeClassifyTemplateVO; - } - - public CodeClassifyVO getCodeClassifyVO() { - return codeClassifyVO; - } - - public void setCodeClassifyVO(CodeClassifyVO codeClassifyVO) { - this.codeClassifyVO = codeClassifyVO; - } - - @Override - public String toString() { - return "CodeImportTemplateVO{" + - "cloNamesList=" + cloNamesList + - ", codeClassifyTemplateVO=" + codeClassifyTemplateVO + - ", codeClassifyVO=" + codeClassifyVO + - '}'; - } } -- Gitblit v1.9.3