From 9d96f11fb1de77d1ad4fb0be04a10ae8eb7f46c9 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期五, 04 八月 2023 17:52:08 +0800
Subject: [PATCH] 提交代码
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java
index a2ec15e..e2a1347 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java
@@ -36,7 +36,9 @@
import com.vci.ubcs.starter.revision.model.TreeWrapperOptions;
import com.vci.ubcs.starter.revision.service.RevisionModelUtil;
import com.vci.ubcs.starter.util.BladeTreeQueryObject;
+import com.vci.ubcs.starter.util.DefaultAttrAssimtUtil;
import com.vci.ubcs.starter.util.LocalFileUtil;
+import com.vci.ubcs.starter.util.MdmBtmTypeConstant;
import com.vci.ubcs.starter.web.pagemodel.BaseQueryObject;
import com.vci.ubcs.starter.web.pagemodel.DataGrid;
import com.vci.ubcs.starter.web.pagemodel.Tree;
@@ -127,9 +129,12 @@
return page.setRecords(codeClassifyMapper.selectPlCodeClassifyPage(page, plCodeClassify));
}
+ /**
+ * 涓婚搴撳畾涔夎〃 鏂板
+ * @param
+ */
@Override
public R addSave(CodeClassify codeClassifyEntity) {
-
if(StringUtils.isNotBlank(codeClassifyEntity.getParentCodeClassifyOid()) && StringUtils.isNotBlank(codeClassifyEntity.getBtmTypeId())){
return R.fail("鍙湁鍦ㄩ《灞傜殑涓婚搴撳垎绫绘墠鑳借缃笟鍔＄被鍨�");
}
@@ -145,14 +150,8 @@
codeClassifyEntity.setBtmTypeId(codeClassify.getBtmTypeId());
codeClassifyEntity.setBtmTypeName(codeClassify.getBtmTypeName());
}
- codeClassifyEntity.setCreator(String.valueOf(AuthUtil.getUser().getUserId()));
- codeClassifyEntity.setCreateTime(new Date());
- codeClassifyEntity.setTs(new Date());
- codeClassifyEntity.setOwner(String.valueOf(AuthUtil.getUser().getUserId()));
- codeClassifyEntity.setLastModifier(String.valueOf(AuthUtil.getUser().getUserId()));
- codeClassifyEntity.setLastModifyTime(new Date());
- codeClassifyEntity.setRevisionSeq(1);
- codeClassifyEntity.setVersionSeq(1);
+ DefaultAttrAssimtUtil.addDefaultAttrAssimt(codeClassifyEntity, MdmBtmTypeConstant.CODE_CLASSIFY);
+ codeClassifyEntity.setLcStatus(FRAMEWORK_DATA_ENABLED);
int insertNumber = codeClassifyMapper.insert(codeClassifyEntity);
return R.status(SqlHelper.retBool(insertNumber));
}
@@ -670,8 +669,8 @@
Map<String, CodeRuleVO> ruleVOMap = new HashMap<>();
if(!CollectionUtils.isEmpty(codeRuleOids)){
VciBaseUtil.switchCollectionForOracleIn(codeRuleOids).stream().forEach(ruleOids->{
-// Collection<CodeRuleVO> ruleVOS = codeRuleService.listCodeRuleByOids(ruleOids);
- Collection<CodeRuleVO> ruleVOS = null;
+ Collection<CodeRuleVO> ruleVOS = codeRuleService.listCodeRuleByOids(ruleOids);
+ // Collection<CodeRuleVO> ruleVOS = null;
ruleVOMap.putAll( Optional.ofNullable(ruleVOS).orElseGet(()->new ArrayList<>()).stream().collect(Collectors.toMap(s->s.getOid(),t->t)));
});
}
@@ -704,6 +703,7 @@
excelDataList.add(new WriteExcelData(0,9,"鐘舵��"));
excelDataList.add(new WriteExcelData(0,10,"鍒嗙被灞傜骇"));
excelDataList.add(new WriteExcelData(0,11,"鎻忚堪"));
+ codeClassifyVOS = codeClassifyVOS.stream().sorted(Comparator.comparing(CodeClassifyVO::getDataLevel)).collect(Collectors.toList());
for (int i = 0; i < codeClassifyVOS.size(); i++) {
CodeClassifyVO vo = codeClassifyVOS.get(i);
excelDataList.add(new WriteExcelData(i+1,0,vo.getId()));
@@ -847,7 +847,7 @@
Map<String,CodeKeyAttrRepeatRuleVO> keyRuleVOMap =Optional.ofNullable(keyOids.size()==0 ? null: iCodeKeyattrrepeatService.listCodeKeyAttrRepeatRuleByOids(keyOids)
).orElse(new ArrayList<>()).stream().collect(Collectors.toMap(s -> s.getId().toLowerCase(Locale.ROOT), t -> t,(o1,o2)->o2));
- List<String> btmOids = poList.stream().filter(s -> StringUtils.isNotBlank(s.getKeyRepeatRuleId()))
+ List<String> btmOids = poList.stream().filter(s -> StringUtils.isNotBlank(s.getBtmTypeId()))
.map(CodeClassifyPO::getBtmTypeId).collect(Collectors.toList());
Map<String, BtmTypeVO> btmVOMap = Optional
.ofNullable(btmOids.size()==0 ? null: btmTypeClient.selectByIdCollection(btmOids).getData())
--
Gitblit v1.9.3