From 4494a005613728c9dc22d018bca42ef5d3ebcf69 Mon Sep 17 00:00:00 2001
From: xiejun <xiejun@vci-tech.com>
Date: 星期二, 14 一月 2025 20:41:47 +0800
Subject: [PATCH] 产品型号集成，类型转换，人员组织加日志，申请接口引用码段值校验
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeKeyAttrRepeatServiceImpl.java | 76 ++++++++++++++++++++++++++++++++++----
1 files changed, 68 insertions(+), 8 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeKeyAttrRepeatServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeKeyAttrRepeatServiceImpl.java
index 269230b..6ea1ff0 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeKeyAttrRepeatServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeKeyAttrRepeatServiceImpl.java
@@ -17,6 +17,7 @@
package com.vci.ubcs.code.service.impl;
import com.alibaba.nacos.common.utils.StringUtils;
+import com.baomidou.mybatisplus.extension.toolkit.SqlHelper;
import com.vci.ubcs.code.bo.CodeClassifyFullInfoBO;
import com.vci.ubcs.code.entity.CodeKeyAttrRepeat;
import com.vci.ubcs.code.enumpack.FrameworkDataLCStatus;
@@ -26,16 +27,22 @@
import com.vci.ubcs.code.vo.pagemodel.CodeClassifyVO;
import com.vci.ubcs.code.vo.pagemodel.CodeKeyAttrRepeatRuleVO;
import com.vci.ubcs.starter.exception.VciBaseException;
+import com.vci.ubcs.starter.util.DefaultAttrAssimtUtil;
+import com.vci.ubcs.starter.util.MdmBtmTypeConstant;
import com.vci.ubcs.starter.web.util.BeanUtilForVCI;
import com.vci.ubcs.starter.web.util.VciBaseUtil;
+import org.springblade.core.secure.utils.AuthUtil;
+import org.springblade.core.tool.utils.Func;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springframework.util.CollectionUtils;
+import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Collection;
+import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
@@ -50,12 +57,12 @@
@Service
public class CodeKeyAttrRepeatServiceImpl implements ICodeKeyAttrRepeatService {
- @Autowired
- CodeKeyAttrRepeatMapper codeKeyattrrepeatMapper;
+ @Resource
+ CodeKeyAttrRepeatMapper codeKeyAttrRepeatMapper;
@Override
public IPage<CodeKeyAttrRepeatVO> selectPlCodeKeyattrrepeatPage(IPage<CodeKeyAttrRepeatVO> page, CodeKeyAttrRepeatVO plCodeKeyattrrepeat) {
- return page.setRecords(codeKeyattrrepeatMapper.selectPlCodeKeyattrrepeatPage(page, plCodeKeyattrrepeat));
+ return page.setRecords(codeKeyAttrRepeatMapper.selectPlCodeKeyattrrepeatPage(page, plCodeKeyattrrepeat));
}
/**
@@ -100,7 +107,7 @@
if(!CollectionUtils.isEmpty(oidCollections)){
Collection<Collection<String>> oidCollectionsList = VciBaseUtil.switchCollectionForOracleIn(oidCollections);
for(Collection<String> oids: oidCollectionsList){
- List<CodeKeyAttrRepeat> tempDOList = codeKeyattrrepeatMapper.selectBatchIds(oids);
+ List<CodeKeyAttrRepeat> tempDOList = codeKeyAttrRepeatMapper.selectBatchIds(oids);
if(!CollectionUtils.isEmpty(tempDOList)){
codeKeyAttrRepeatRuleDOList.addAll(tempDOList);
}
@@ -135,7 +142,7 @@
@Override
public CodeKeyAttrRepeatVO getRuleByClassifyFullInfo(CodeClassifyFullInfoBO classifyFullInfo) {
VciBaseUtil.alertNotNull(classifyFullInfo,"涓婚搴撳垎绫荤殑淇℃伅");
- String keyAttrRuleOid = classifyFullInfo.getCurrentClassifyVO().getCodekeyattrrepeatoid();
+ String keyAttrRuleOid = classifyFullInfo.getCurrentClassifyVO().getCodeKeyAttrRepeatOid();
if(StringUtils.isBlank(keyAttrRuleOid)){
//鎴戜滑鏍规嵁涓婄骇鐨勫垎绫伙紝鎸夌収灞傜骇鍊掑簭鎺掑垪
if(!CollectionUtils.isEmpty(classifyFullInfo.getParentClassifyVOs())){
@@ -144,8 +151,8 @@
for(int i = sortedClassifyVO.size() -1;i>=0;i--){
CodeClassifyVO record = sortedClassifyVO.get(i);
- if(StringUtils.isNotBlank(record.getCodekeyattrrepeatoid())){
- keyAttrRuleOid = record.getCodekeyattrrepeatoid();
+ if(StringUtils.isNotBlank(record.getCodeKeyAttrRepeatOid())){
+ keyAttrRuleOid = record.getCodeKeyAttrRepeatOid();
break;
}
}
@@ -173,6 +180,58 @@
BeanUtils.copyProperties(codeKeyAttrRepeatRuleVO,codeKeyattrrepeatVO);
return codeKeyAttrRepeatRuleVO;
}
+
+ /**
+ * 淇敼鍏抽敭灞炴�ф煡閲嶈鍒�
+ * @param codeKeyattrrepeat
+ * @return
+ */
+ @Override
+ public boolean addSave(CodeKeyAttrRepeat codeKeyattrrepeat) {
+ // 璁剧疆榛樿鍊�
+ codeKeyattrrepeat.setCreator(AuthUtil.getUserAccount());
+ codeKeyattrrepeat.setCreatetime(new Date());
+ codeKeyattrrepeat.setLastmodifier(AuthUtil.getUserAccount());
+ codeKeyattrrepeat.setLastmodifytime(new Date());
+ codeKeyattrrepeat.setBtmname(MdmBtmTypeConstant.CODE_KEY_ATTR_REPEAT_RULE);
+ codeKeyattrrepeat.setFirstr("1");
+ codeKeyattrrepeat.setFirstv("1");
+ codeKeyattrrepeat.setLastr("1");
+ codeKeyattrrepeat.setLastv("1");
+ codeKeyattrrepeat.setLcstatus("Enabled");
+ codeKeyattrrepeat.setRevisionseq(1);
+ codeKeyattrrepeat.setRevisionoid(VciBaseUtil.getPk());
+ codeKeyattrrepeat.setRevisionvalue("1");
+ codeKeyattrrepeat.setRevisionrule("1");
+ codeKeyattrrepeat.setVersionseq(1);
+ codeKeyattrrepeat.setVersionrule("0");
+ codeKeyattrrepeat.setVersionvalue("1");
+ return SqlHelper.retBool(codeKeyAttrRepeatMapper.insert(codeKeyattrrepeat));
+ }
+
+ /**
+ * 鏂板鍏抽敭灞炴�ф煡閲嶈鍒�
+ * @param codeKeyattrrepeat
+ * @return
+ */
+ @Override
+ public boolean update(CodeKeyAttrRepeat codeKeyattrrepeat) {
+ // 璁剧疆榛樿鍊�
+ codeKeyattrrepeat.setLastmodifier(AuthUtil.getUserAccount());
+ codeKeyattrrepeat.setLastmodifytime(new Date());
+ return SqlHelper.retBool(codeKeyAttrRepeatMapper.updateById(codeKeyattrrepeat));
+ }
+
+ /**
+ * 鍒犻櫎鍏抽敭灞炴�ф煡閲嶈鍒�
+ * @param oids
+ * @return
+ */
+ @Override
+ public boolean deleteByOids(String oids) {
+ return SqlHelper.retBool(codeKeyAttrRepeatMapper.deleteById(oids));
+ }
+
/**
* 涓婚敭鏌ヨ鏁版嵁瀵硅薄
* @param oid 涓婚敭
@@ -182,11 +241,12 @@
private CodeKeyAttrRepeat selectByOid(String oid) {
VciBaseUtil.alertNotNull(oid,"涓婚敭");
- CodeKeyAttrRepeat codeKeyAttrRepeatRuleDO = codeKeyattrrepeatMapper.selectById(oid.trim());
+ CodeKeyAttrRepeat codeKeyAttrRepeatRuleDO = codeKeyAttrRepeatMapper.selectById(oid.trim());
// .selectByPrimaryKey(oid.trim());
if(codeKeyAttrRepeatRuleDO == null || StringUtils.isBlank(codeKeyAttrRepeatRuleDO.getOid())){
throw new VciBaseException(DATA_OID_NOT_EXIST);
}
return codeKeyAttrRepeatRuleDO;
}
+
}
--
Gitblit v1.9.3