From 41aacf110288329a6beb494ccccaeabd217a08b9 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期二, 05 十二月 2023 18:05:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeFixedValueServiceImpl.java | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 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 47d537f..fb5075c 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,5 +1,6 @@
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;
@@ -92,6 +93,18 @@
}
/**
+ * 鏍规嵁鍏宠仈鍥哄畾鐮佹涓婚敭鍒犻櫎鐮佸��
+ * @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 鎵ц缁撴灉
@@ -104,7 +117,7 @@
CodeFixedValue codeFixedValueDO = new CodeFixedValue();
BeanUtilForVCI.copyPropertiesIgnoreCase(codeFixedValueDTO,codeFixedValueDO);
//濉厖涓�浜涢粯璁ゅ��
- DefaultAttrAssimtUtil.addDefaultAttrAssimt(codeFixedValueDO, MdmBtmTypeConstant.CODE_FIXED_VALUE);
+ DefaultAttrAssimtUtil.addDefaultAttrAssimt(codeFixedValueDO, MdmBtmTypeConstant.CODE_FIXED_VALUE,null);
Long count = this.codeFixedValueMapper.selectCount(Wrappers.<CodeFixedValue>query()
.lambda().eq(CodeFixedValue::getCodeFixedSecOid, codeFixedValueDO.getCodeFixedSecOid())
)+1L;
@@ -127,7 +140,7 @@
CodeFixedValue codeFixedValueDO = selectByOid(codeFixedValueDTO.getOid());
revisionModelUtil.copyFromDTOIgnore(codeFixedValueDTO,codeFixedValueDO);
//濉厖涓�浜涢粯璁ゅ��
- DefaultAttrAssimtUtil.updateDefaultAttrAssimt(codeFixedValueDO);
+ DefaultAttrAssimtUtil.updateDefaultAttrAssimt(codeFixedValueDO,null);
boolean resBoolean = codeFixedValueMapper.updateById(codeFixedValueDO) > 0;
return resBoolean;
}
--
Gitblit v1.9.3