From 29ab7773efe351a879ce9b3c29ab3ca50f4e62cb Mon Sep 17 00:00:00 2001 From: xiejun <xiejun@vci-tech.com> Date: 星期三, 15 一月 2025 21:36:08 +0800 Subject: [PATCH] 产品型号集成,类型转换,人员组织加日志,申请接口引用码段值校验 --- Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeFixedValueServiceImpl.java | 55 ++++++++++++++++++++++++++++++++++++++++--------------- 1 files changed, 40 insertions(+), 15 deletions(-) diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeFixedValueServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeFixedValueServiceImpl.java index 3660668..e46394a 100644 --- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeFixedValueServiceImpl.java +++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeFixedValueServiceImpl.java @@ -1,10 +1,12 @@ package com.vci.ubcs.code.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.vci.ubcs.code.constant.MdmBtmTypeConstant; + import com.vci.ubcs.code.dto.CodeFixedValueDTO; import com.vci.ubcs.code.entity.CodeFixedValue; import com.vci.ubcs.code.mapper.CodeFixedValueMapper; @@ -13,6 +15,8 @@ import com.vci.ubcs.code.wrapper.CodeFixedValueWrapper; import com.vci.ubcs.starter.exception.VciBaseException; import com.vci.ubcs.starter.revision.service.RevisionModelUtil; +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.slf4j.Logger; @@ -22,7 +26,6 @@ import org.springblade.core.secure.utils.AuthUtil; import org.springblade.core.tool.api.R; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.domain.Page; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; @@ -72,6 +75,36 @@ } /** + * 鏍规嵁codeFixedSecOid鏌ヨ鐮佸�� + * @param codeFixedSecOids + * @return + */ + @Override + public List<CodeFixedValue> listFixedValueByCodeFixedSecOid(List<String> codeFixedSecOids){ + if(codeFixedSecOids.isEmpty()){ + return new ArrayList<CodeFixedValue>(); + } + /*List<CodeFixedValue> codeFixedValues = codeFixedValueMapper.selectList( + Wrappers.<CodeFixedValue>query().lambda() + .in(CodeFixedValue::getCodeFixedSecOid, codeFixedSecOids) + );*/ + List<CodeFixedValue> codeFixedValues = codeFixedValueMapper.selectByPageByCodeFixedSecOid(codeFixedSecOids, new Page<>(1, -1)); + return codeFixedValues; + } + + /** + * 鏍规嵁鍏宠仈鍥哄畾鐮佹涓婚敭鍒犻櫎鐮佸�� + * @param codeFixedSecOid + * @return + */ + @Override + public Boolean deleteFixedValueBySecOid(String codeFixedSecOid) { + LambdaQueryWrapper<CodeFixedValue> wrapper = Wrappers.<CodeFixedValue>query() + .lambda().eq(CodeFixedValue::getCodeFixedSecOid, codeFixedSecOid); + return codeFixedValueMapper.delete(wrapper)>0; + } + + /** * 澧炲姞鍥哄畾鐮佹鐨勭爜鍊� * @param codeFixedValueDTO 鍥哄畾鐮佹鐨勭爜鍊兼暟鎹紶杈撳璞� * @return 鎵ц缁撴灉 @@ -84,15 +117,7 @@ CodeFixedValue codeFixedValueDO = new CodeFixedValue(); BeanUtilForVCI.copyPropertiesIgnoreCase(codeFixedValueDTO,codeFixedValueDO); //濉厖涓�浜涢粯璁ゅ�� - codeFixedValueDO.setOid(VciBaseUtil.getPk()); - codeFixedValueDO.setRevisionOid(VciBaseUtil.getPk()); - codeFixedValueDO.setNameOid(VciBaseUtil.getPk()); - codeFixedValueDO.setBtmname(MdmBtmTypeConstant.CODE_FIXED_VALUE); - codeFixedValueDO.setCreateTime(new Date()); - codeFixedValueDO.setCreator(AuthUtil.getUserId().toString()); - codeFixedValueDO.setLastModifier(AuthUtil.getUserId().toString()); - codeFixedValueDO.setLastModifyTime(new Date()); - codeFixedValueDO.setTs(new Date()); + DefaultAttrAssimtUtil.addDefaultAttrAssimt(codeFixedValueDO, MdmBtmTypeConstant.CODE_FIXED_VALUE); Long count = this.codeFixedValueMapper.selectCount(Wrappers.<CodeFixedValue>query() .lambda().eq(CodeFixedValue::getCodeFixedSecOid, codeFixedValueDO.getCodeFixedSecOid()) )+1L; @@ -115,9 +140,7 @@ CodeFixedValue codeFixedValueDO = selectByOid(codeFixedValueDTO.getOid()); revisionModelUtil.copyFromDTOIgnore(codeFixedValueDTO,codeFixedValueDO); //濉厖涓�浜涢粯璁ゅ�� - codeFixedValueDO.setLastModifier(AuthUtil.getUserId().toString()); - codeFixedValueDO.setLastModifyTime(new Date()); - codeFixedValueDO.setTs(new Date()); + DefaultAttrAssimtUtil.updateDefaultAttrAssimt(codeFixedValueDO); boolean resBoolean = codeFixedValueMapper.updateById(codeFixedValueDO) > 0; return resBoolean; } @@ -320,9 +343,11 @@ List<CodeFixedValue> doList = codeFixedValueMapper.selectList(Wrappers.<CodeFixedValue>query() .lambda().eq(CodeFixedValue::getCodeFixedSecOid,codefixedsecoid) ); + if(doList.isEmpty()){ + return false; + } boolean resBoolean = codeFixedValueMapper.deleteBatchIds(doList.stream().map(CodeFixedValue::getOid).collect(Collectors.toList())) > 0; return resBoolean; } - } -- Gitblit v1.9.3