From e405b861b9521f5ea38c5402203a5b05988f9de2 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 04 十二月 2024 10:47:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/dao/impl/VciFileDocClassifyServiceImpl.java | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/VciFileDocClassifyServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/dao/impl/VciFileDocClassifyServiceImpl.java
similarity index 97%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/VciFileDocClassifyServiceImpl.java
rename to Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/dao/impl/VciFileDocClassifyServiceImpl.java
index a744a35..33601d3 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/VciFileDocClassifyServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/dao/impl/VciFileDocClassifyServiceImpl.java
@@ -1,8 +1,8 @@
-package com.vci.web.service.impl;
+package com.vci.web.dao.impl;
import com.vci.dto.VciFileDocClassifyDTO;
import com.vci.dto.VciFileDocClassifyDTOList;
-import com.vci.pagemodel.VciFileDocClassifyVO;
+import com.vci.model.VciFileDocClassifyDO;
import com.vci.pagemodel.VciFileDocClassifyVO;
import com.vci.starter.revision.service.RevisionModelUtil;
import com.vci.starter.web.annotation.bus.VciChangeDocument;
@@ -12,11 +12,10 @@
import com.vci.starter.web.pagemodel.DataGrid;
import com.vci.starter.web.pagemodel.KeyValue;
import com.vci.starter.web.pagemodel.PageHelper;
-import com.vci.starter.web.util.BeanUtil;
+import com.vci.starter.web.util.BeanUtilForVCI;
import com.vci.starter.web.util.VciBaseUtil;
import com.vci.starter.web.wrapper.VciQueryWrapperForDO;
import com.vci.web.dao.VciFileDocClassifyDaoI;
-import com.vci.model.VciFileDocClassifyDO;
import com.vci.web.service.VciFileDocClassifyServiceI;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
@@ -111,7 +110,7 @@
public VciFileDocClassifyVO vciFileDocClassifyDO2VO(VciFileDocClassifyDO vciFileDocClassifyDO) throws VciBaseException {
VciFileDocClassifyVO vo = new VciFileDocClassifyVO();
if(vciFileDocClassifyDO != null){
- BeanUtil.convert(vciFileDocClassifyDO,vo);
+ BeanUtilForVCI.convert(vciFileDocClassifyDO,vo);
//杩橀渶瑕佸鐞嗘灇涓剧瓑鍏朵粬鐨勫唴瀹�
}
return vo;
@@ -129,7 +128,7 @@
VciBaseUtil.alertNotNull(vciFileDocClassifyDTO,"闇�瑕佹坊鍔犵殑鏁版嵁瀵硅薄");
//灏咲TO杞崲涓篋O
VciFileDocClassifyDO vciFileDocClassifyDO = new VciFileDocClassifyDO();
- BeanUtil.convert(vciFileDocClassifyDTO,vciFileDocClassifyDO);
+ BeanUtilForVCI.convert(vciFileDocClassifyDTO,vciFileDocClassifyDO);
revisionModelUtil.wrapperForAdd(vciFileDocClassifyDO);
int insert = vciFileDocClassifyMapper.insert(vciFileDocClassifyDO);
@@ -332,7 +331,7 @@
//寰幆澶勭悊
dtoList.stream().forEach(dto->{
VciFileDocClassifyDO classifyDO = new VciFileDocClassifyDO();
- BeanUtil.convert(dto,classifyDO);
+ BeanUtilForVCI.convert(dto,classifyDO);
VciBaseUtil.alertNotNull(classifyDO.getId(),"鏂囦欢绫诲瀷缂栧彿",classifyDO.getName(),"鏂囦欢绫诲瀷鍚嶇О");
doList.add(classifyDO);
});
--
Gitblit v1.9.3