From ee7d7c29b8d95f0adab3bd9d93fdb1af51565a2d Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 03 八月 2023 20:54:48 +0800
Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyTemplateAttrServiceImpl.java | 20 +++++---------------
1 files changed, 5 insertions(+), 15 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyTemplateAttrServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyTemplateAttrServiceImpl.java
index ec459a3..d4b6d27 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyTemplateAttrServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyTemplateAttrServiceImpl.java
@@ -40,6 +40,7 @@
import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
+import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
import org.springframework.beans.factory.annotation.Autowired;
@@ -373,6 +374,10 @@
//灏咲TO杞崲涓篋O
CodeClassifyTemplateAttr codeClassifyTemplateAttrDO = new CodeClassifyTemplateAttr();
BeanUtilForVCI.copyPropertiesIgnoreCase(codeClassifyTemplateAttrDTO,codeClassifyTemplateAttrDO);
+ codeClassifyTemplateAttrDO.setCreateTime(codeClassifyTemplateAttrDO.getCreateTime()!=null?codeClassifyTemplateAttrDO.getCreateTime():new Date());
+ codeClassifyTemplateAttrDO.setCreator(String.valueOf(AuthUtil.getUser().getUserId()));
+ codeClassifyTemplateAttrDO.setLastModifyTime(new Date());
+ codeClassifyTemplateAttrDO.setLastModifier(String.valueOf(AuthUtil.getUser().getUserId()));
codeClassifyTemplateAttrDOInsert.add(codeClassifyTemplateAttrDO);
if(StringUtils.isNotBlank(codeClassifyTemplateAttrDO.getPrefixValue())){
@@ -430,15 +435,9 @@
if(Func.isNotEmpty(codeReferConfigVO) && codeReferConfigVO.getIsPersistence()=="true"){
codeReferConfigService.insert(codeReferConfigVO);
}
-
}
- //鎵ц鏁版嵁淇濆瓨鎿嶄綔
-// WebUtil.setPersistence(false);//涓嶆墽琛屼繚瀛�
-
//鍏堥兘鍒犱簡
-// VciQueryWrapperForDO deleteAttrWrapper = new VciQueryWrapperForDO(CodeClassifyTemplateAttrDO.class);
-// deleteAttrWrapper.addQueryMap("CLASSIFYTEMPLATEOID",CLASSIFYTEMPLATEOID);
Map<String,Object> condition = new HashMap<>();
condition.put("CLASSIFYTEMPLATEOID",CLASSIFYTEMPLATEOID);
List<CodeClassifyTemplateAttr> codeClassifyTemplateAttrDODelete = baseMapper.selectByMap(condition);
@@ -448,7 +447,6 @@
for (CodeClassifyTemplateAttr codeClassifyTemplateAttrDO:codeClassifyTemplateAttrDODelete){
oids.add(codeClassifyTemplateAttrDO.getOid());
}
-// BatchCBO batchCBOTemplateDelete = new BatchCBO();
if(!CollectionUtils.isEmpty(oids)){
this.removeBatchByIds(oids);
}
@@ -463,8 +461,6 @@
}
-
-// SessionInfo sessionInfo = VciBaseUtil.getCurrentUserSessionInfo();
//澶勭悊鍙緭鍙�夌殑瀛楃
if(!CollectionUtils.isEmpty(prefix)){
for (String s : prefix) {
@@ -474,7 +470,6 @@
dictBiz.setDictValue(s);
iDictBizClient.getCheck(dictBiz) ;
}
-// .saveBySameNamespaceAndFlag(MdmBtmTypeConstant.CODE_CLASSIFY_TEMPLATE_ATTR,"prefix",prefix,sessionInfo);
}
if(!CollectionUtils.isEmpty(suffix)){
for (String s : suffix) {
@@ -484,7 +479,6 @@
dictBiz.setDictValue(s);
iDictBizClient.getCheck(dictBiz) ;
}
-// charService.saveBySameNamespaceAndFlag(MdmBtmTypeConstant.CODE_CLASSIFY_TEMPLATE_ATTR,"suffix",suffix,sessionInfo);
}
if(!CollectionUtils.isEmpty(dateFormates)){
for (String s : dateFormates) {
@@ -494,11 +488,7 @@
dictBiz.setDictValue(s);
iDictBizClient.getCheck(dictBiz) ;
}
-// charService.saveBySameNamespaceAndFlag(MdmBtmTypeConstant.CODE_CLASSIFY_TEMPLATE_ATTR,"dateFormates",dateFormates,sessionInfo);
}
-
-// WebUtil.setPersistence(true);//鎵ц淇濆瓨
-// boService.persistenceBatch(batchCBOTemplateDelete);//涓�璧锋墽琛屼繚瀛�
return codeClassifyTemplateAttrDO2VOs(codeClassifyTemplateAttrDOInsert);
}
--
Gitblit v1.9.3