From fab8208b83a3c710cdfc3805655f04f0b7466be5 Mon Sep 17 00:00:00 2001 From: xiejun <xiejun@vci-tech.com> Date: 星期三, 08 一月 2025 11:26:00 +0800 Subject: [PATCH] 产品型号集成,类型转换,人员组织加日志,申请接口引用码段值校验 --- Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeShowFieldConfigServiceImpl.java | 60 ++++-------------------------------------------------------- 1 files changed, 4 insertions(+), 56 deletions(-) diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeShowFieldConfigServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeShowFieldConfigServiceImpl.java index f779e61..6328a12 100644 --- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeShowFieldConfigServiceImpl.java +++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeShowFieldConfigServiceImpl.java @@ -1,29 +1,15 @@ package com.vci.ubcs.code.service.impl; -<<<<<<< Updated upstream -======= -import com.baomidou.mybatisplus.core.conditions.Wrapper; ->>>>>>> Stashed changes import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.baomidou.mybatisplus.extension.toolkit.SqlHelper; import com.vci.ubcs.code.entity.CodeShowFieldConfig; import com.vci.ubcs.code.mapper.CodeShowFieldConfigMapper; -<<<<<<< Updated upstream import com.vci.ubcs.code.service.ICodeShowFieldConfigService; import com.vci.ubcs.code.vo.CodeShowFieldConfigVO; import com.vci.ubcs.code.wrapper.CodeShowFieldConfigWraper; import org.springframework.stereotype.Service; -======= -import com.vci.ubcs.code.service.CodeShowFieldConfigService; -import com.vci.ubcs.code.vo.CodeShowFieldConfigVO; -import com.vci.ubcs.code.wrapper.CodeShowFieldConfigWraper; -import org.springblade.core.mp.support.Query; -import org.springframework.stereotype.Service; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.PageImpl; -import org.springframework.data.domain.PageRequest; ->>>>>>> Stashed changes import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; @@ -36,30 +22,12 @@ * @since 2023-05-19 17:58:56 */ @Service("CodeShowFieldConfigService") -<<<<<<< Updated upstream public class CodeShowFieldConfigServiceImpl extends ServiceImpl<CodeShowFieldConfigMapper,CodeShowFieldConfig> implements ICodeShowFieldConfigService { -======= -public class CodeShowFieldConfigServiceImpl extends ServiceImpl<CodeShowFieldConfigMapper,CodeShowFieldConfig> implements CodeShowFieldConfigService { ->>>>>>> Stashed changes @Resource private CodeShowFieldConfigMapper codeShowFieldConfigMapper; /** -<<<<<<< Updated upstream -======= - * 閫氳繃ID鏌ヨ鍗曟潯鏁版嵁 - * - * @param oid 涓婚敭 - * @return 瀹炰緥瀵硅薄 - */ - @Override - public CodeShowFieldConfig queryById(String oid) { - return this.codeShowFieldConfigMapper.queryById(oid); - } - - /** ->>>>>>> Stashed changes * 鏂板鏁版嵁 * * @param codeShowFieldConfig 瀹炰緥瀵硅薄 @@ -67,36 +35,16 @@ */ @Override public boolean insert(CodeShowFieldConfig codeShowFieldConfig) { - return this.codeShowFieldConfigMapper.insert(codeShowFieldConfig)>0; + return SqlHelper.retBool(this.codeShowFieldConfigMapper.insert(codeShowFieldConfig)); } @Override @Transactional(rollbackFor = Exception.class) -<<<<<<< Updated upstream public boolean insertBatch(List<CodeShowFieldConfigVO> codeShowFieldConfigVOS, String oid) { List<CodeShowFieldConfig> codeShowFieldConfigs = CodeShowFieldConfigWraper.build().listDO(codeShowFieldConfigVOS,oid); boolean b = this.saveOrUpdateBatch(codeShowFieldConfigs); return b; } -======= - public boolean insertBatch(List<CodeShowFieldConfigVO> codeShowFieldConfigVOS) { - List<CodeShowFieldConfig> codeShowFieldConfigs = CodeShowFieldConfigWraper.build().listDO(codeShowFieldConfigVOS); - boolean b = this.saveOrUpdateBatch(codeShowFieldConfigs); - return b; - } - - /** - * 淇敼鏁版嵁 - * - * @param codeShowFieldConfig 瀹炰緥瀵硅薄 - * @return 瀹炰緥瀵硅薄 - */ - @Override - @Transactional(rollbackFor = Exception.class) - public boolean update(CodeShowFieldConfig codeShowFieldConfig) { - return this.codeShowFieldConfigMapper.update(codeShowFieldConfig)>0; - } ->>>>>>> Stashed changes @Override public boolean updateBatch(List<CodeShowFieldConfigVO> codeShowFieldConfigVOS) { @@ -112,7 +60,7 @@ */ @Override public boolean deleteById(String oid) { - return this.codeShowFieldConfigMapper.deleteById(oid) > 0; + return SqlHelper.retBool(this.codeShowFieldConfigMapper.deleteById(oid)); } @Override @@ -120,7 +68,7 @@ LambdaQueryWrapper<CodeShowFieldConfig> lambdaQueryWrapper = Wrappers.<CodeShowFieldConfig>query() .lambda() .eq(CodeShowFieldConfig::getReferConfigOid, oid); - return this.codeShowFieldConfigMapper.delete(lambdaQueryWrapper) > 0; + return SqlHelper.retBool(this.codeShowFieldConfigMapper.delete(lambdaQueryWrapper)); } } -- Gitblit v1.9.3