From 6732cd7a4e0fd7ea083d4ae11254bde35adb1ee4 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期五, 17 十一月 2023 01:39:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeKeyAttrRepeatServiceImpl.java |   70 ++++++++++++++++++++++++++++++++--
 1 files changed, 65 insertions(+), 5 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 760a3e1..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);
 				}
@@ -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