From acb7c4c272aa02c2ed24cde72db429defef9fb8f Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期四, 27 七月 2023 13:54:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeButtonWrapper.java | 21 +++++++++++----------
1 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeButtonWrapper.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeButtonWrapper.java
index b82e17f..c178bcd 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeButtonWrapper.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeButtonWrapper.java
@@ -16,13 +16,12 @@
*/
package com.vci.ubcs.code.wrapper;
-import com.vci.ubcs.code.entity.CodeButtonEntity;
-import com.vci.ubcs.code.vo.CodeButtonVO;
-import com.vci.ubcs.omd.cache.DictCache;
+import com.vci.ubcs.starter.web.util.BeanUtilForVCI;
+import com.vci.ubcs.system.cache.DictCache;
+import com.vci.ubcs.code.entity.CodeButton;
+import com.vci.ubcs.code.vo.pagemodel.CodeButtonVO;
import org.springblade.core.mp.support.BaseEntityWrapper;
-import org.springblade.core.tool.utils.BeanUtil;
-import java.util.List;
import java.util.Objects;
/**
@@ -31,17 +30,19 @@
* @author yuxc
* @since 2023-03-29
*/
-public class CodeButtonWrapper extends BaseEntityWrapper<CodeButtonEntity, CodeButtonVO> {
+public class CodeButtonWrapper extends BaseEntityWrapper<CodeButton, CodeButtonVO> {
public static CodeButtonWrapper build() {
return new CodeButtonWrapper();
}
@Override
- public CodeButtonVO entityVO(CodeButtonEntity codebutton) {
- CodeButtonVO codebuttonVO = Objects.requireNonNull(BeanUtil.copy(codebutton, CodeButtonVO.class));
- codebuttonVO.setUsedpositiontypeName(DictCache.getValue("codeButtonPosition", codebutton.getUsedpositiontype()));
- codebuttonVO.setLcstatusName(DictCache.getValue("codeLcstatus", codebutton.getLcstatus()));
+ public CodeButtonVO entityVO(CodeButton codebutton) {
+ CodeButtonVO codebuttonVO = new CodeButtonVO();;
+ BeanUtilForVCI.copyPropertiesIgnoreCase(codebutton,codebuttonVO);
+ Objects.requireNonNull(codebuttonVO);
+ codebuttonVO.setUsedpositiontypeText(DictCache.getValue("codeButtonPosition", codebutton.getUsedPositionType()));
+ codebuttonVO.setLcStatusText(DictCache.getValue("codeLcstatus", codebutton.getLcStatus()));
return codebuttonVO;
}
--
Gitblit v1.9.3