From 53d628adb1082d7df51dc1a2151505f17b1de9a2 Mon Sep 17 00:00:00 2001 From: ludc Date: 星期一, 11 九月 2023 14:59:07 +0800 Subject: [PATCH] bug修改,规则克隆接口修改 --- Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyValueServiceImpl.java | 48 +++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 45 insertions(+), 3 deletions(-) diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyValueServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyValueServiceImpl.java index 46ce3a2..88770ac 100644 --- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyValueServiceImpl.java +++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyValueServiceImpl.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.vci.ubcs.code.constant.MdmBtmTypeConstant; + import com.vci.ubcs.code.dto.CodeClassifyValueDTO; import com.vci.ubcs.code.entity.CodeBasicSec; import com.vci.ubcs.code.entity.CodeClassifyValue; @@ -20,11 +20,13 @@ import com.vci.ubcs.starter.revision.model.TreeWrapperOptions; 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.pagemodel.Tree; 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.api.R; +import org.springblade.core.tool.utils.Func; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.http.ResponseEntity; @@ -59,6 +61,33 @@ private static final String PARENT_FIELD_NAME = "parentClassifyValueOid"; /** + * 鍏嬮殕鍒嗙被鐮佸�� + * @param codeClassifyValues + * @return + */ + @Override + public boolean cloneCodeClassifyVaue(List<CodeClassifyValue> codeClassifyValues) { + // 鍒涘缓Map瀵硅薄锛岀敤浜庡瓨鍌ㄥ師濮媜id鍜屾柊oid鐨勬槧灏勫叧绯� + Map<String, String> oidMap = new HashMap<>(); + // 閬嶅巻瀵硅薄鏁扮粍锛屼负姣忎釜瀵硅薄鐢熸垚鏂扮殑oid锛屽苟灏嗗師濮媜id鍜屾柊oid鐨勬槧灏勫叧绯诲瓨鍌ㄥ埌Map涓� + for (CodeClassifyValue obj : codeClassifyValues) { + String originalOid = obj.getOid(); + String newOid = VciBaseUtil.getPk(); + oidMap.put(originalOid, newOid); + } + // 閬嶅巻瀵硅薄鏁扮粍锛屾洿鏂版瘡涓璞$殑oid鍜宑odeClassifySecOid灞炴�у�� + for (CodeClassifyValue obj : codeClassifyValues) { + String originalOid = obj.getOid(); + String newOid = oidMap.get(originalOid); + obj.setOid(newOid); + String originalParentClassifyValueOid = obj.getParentClassifyValueOid(); + String newParentClassifyValueOid = oidMap.get(originalParentClassifyValueOid); + obj.setParentClassifyValueOid(newParentClassifyValueOid); + } + return this.saveBatch(codeClassifyValues); + } + + /** * 鏌ヨ鍒嗙被鐮佹鐨勭爜鍊� 鏍� * @param treeQueryObject 鏍戞煡璇㈠璞� * @return 鍒嗙被鐮佹鐨勭爜鍊� 鏄剧ず鏍� @@ -66,7 +95,6 @@ */ @Override public List<Tree> treeCodeClassifyValue(TreeQueryObject treeQueryObject) throws VciBaseException { - // List<CodeClassifyValueDO> doList =selectCodeClassifyValueDOByTree(treeQueryObject); List<CodeClassifyValue> doList = selectCodeClassifyValueDO4Tree(treeQueryObject); List<CodeClassifyValueVO> voList = CodeClassifyValueWrapper.build().listVO(doList); TreeWrapperOptions treeWrapperOptions = new TreeWrapperOptions(PARENT_FIELD_NAME); @@ -101,7 +129,7 @@ CodeClassifyValue codeClassifyValueDO = new CodeClassifyValue(); BeanUtilForVCI.copyPropertiesIgnoreCase(codeClassifyValueDTO,codeClassifyValueDO); //濉厖涓�浜涢粯璁ゅ�� - DefaultAttrAssimtUtil.addDefaultAttrAssimt(codeClassifyValueDO,MdmBtmTypeConstant.CODE_CLASSIFY_VALUE); + DefaultAttrAssimtUtil.addDefaultAttrAssimt(codeClassifyValueDO, MdmBtmTypeConstant.CODE_CLASSIFY_VALUE); //鏌ヨ List<CodeClassifyValue> existList = codeClassifyValueMapper.selectList(Wrappers.<CodeClassifyValue>query() .lambda().eq(CodeClassifyValue::getCodeClassifySecOid, codeClassifyValueDO.getCodeClassifySecOid()) @@ -394,6 +422,20 @@ } /** + * 鏍规嵁涓婚敭鑾峰彇鐮佸�煎瓧绗︿覆 + * @param oid + * @return + */ + @Override + public String getClassifyValueStr(String oid){ + if(Func.isEmpty(oid)){ + return ""; + } + String classifyValueStr = this.codeClassifyValueMapper.getClassifyValueStr(oid); + return Func.isEmpty(classifyValueStr) ? "":classifyValueStr; + } + + /** * 鎵归噺鏁版嵁瀵硅薄杞崲涓烘樉绀哄璞� * @param codeClassifyValueDOs 鏁版嵁瀵硅薄鍒楄〃 * @return 鏄剧ず瀵硅薄 -- Gitblit v1.9.3