From ce567eb11cd0cdbd826214c355d1a8caff175dca Mon Sep 17 00:00:00 2001 From: ludc Date: 星期三, 15 十一月 2023 14:25:22 +0800 Subject: [PATCH] bug列表：181（修复新增，修改，删除接口，新增时没设置默认值，导致在建分类时无法查询到，关键属性查重规则）183（历史数据导入模板下载，过滤掉模板中配置的默认属性） --- Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeClassifyService.java | 84 ++++++++++++++++++++++++++++++++++++++---- 1 files changed, 76 insertions(+), 8 deletions(-) diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeClassifyService.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeClassifyService.java index ac972bf..01d750c 100644 --- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeClassifyService.java +++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeClassifyService.java @@ -5,15 +5,14 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.vci.ubcs.code.bo.CodeClassifyFullInfoBO; import com.vci.ubcs.code.entity.CodeClassify; -import com.vci.ubcs.code.vo.CodeOsattributeVO; import com.vci.ubcs.code.vo.pagemodel.CodeClassifyVO; +import com.vci.ubcs.omd.vo.BtmTypeAttributeVO; import com.vci.ubcs.starter.exception.VciBaseException; import com.vci.ubcs.starter.revision.model.TreeQueryObject; import com.vci.ubcs.starter.web.pagemodel.BaseQueryObject; -import com.vci.ubcs.starter.web.pagemodel.DataGrid; -import com.vci.ubcs.starter.web.pagemodel.Tree; +import com.vci.ubcs.starter.web.pagemodel.DataGrid;import com.vci.ubcs.starter.web.pagemodel.Tree; +import org.springblade.core.log.exception.ServiceException; import org.springblade.core.tool.api.R; - import java.io.File; import java.util.Collection; import java.util.List; @@ -34,6 +33,13 @@ List<CodeClassify> selectByWrapper(Wrapper wrapper); /** + * 浣跨敤鏌ヨ灏佽鍣ㄦ潵鏌ヨ + * @param wrapper 鏌ヨ灏佽鍣� + * @return 鏁版嵁瀵硅薄 + */ + List<String> select1(Wrapper wrapper); + + /** * 鑷畾涔夊垎椤� * * @param page @@ -47,14 +53,15 @@ * @param codeClassifyEntity 涓婚搴撳垎绫绘暟鎹紶杈撳璞� * @return 鎵ц缁撴灉 */ - R addSave(CodeClassify codeClassifyEntity) ; + R addSave(CodeClassify codeClassifyEntity); /** * 淇敼涓婚搴撳垎绫� * @param codeClassifyEntity 涓婚搴撳垎绫绘暟鎹紶杈撳璞� * @return 鎵ц缁撴灉 */ - R editSave(CodeClassify codeClassifyEntity) ; + R editSave(CodeClassify codeClassifyEntity); + /** * 妫�鏌� 涓婚搴撳垎绫绘槸鍚﹀垹闄� * @param codeClassify 涓婚搴撳垎绫绘暟鎹紶杈撳璞★紝蹇呴』瑕佹湁oid鍜宼s灞炴�� @@ -127,6 +134,7 @@ * @return 涓婚搴撳垎绫绘樉绀烘爲 */ List<Tree> referTree(TreeQueryObject treeQueryObject); + /** * 鏌ヨ涓婚搴撳垎绫� 鏍� * @param treeQueryObject 鏍戞煡璇㈠璞� @@ -169,7 +177,7 @@ * @param baseQueryObject 鏌ヨ瀵硅薄锛屽繀椤绘湁codeClassifyOid锛屾敮鎸乮d鍜宯ame涓ょ鏌ヨ鏉′欢 * @return 灞炴�х殑淇℃伅锛屽寘鍚粯璁ょ殑灞炴�� */ - DataGrid<CodeOsattributeVO> listClassifyLinkAttr(BaseQueryObject baseQueryObject); + DataGrid<BtmTypeAttributeVO> listClassifyLinkAttr(BaseQueryObject baseQueryObject) throws ServiceException; /** * 鑾峰彇褰撳墠鍒嗙被鐨勯《灞傚垎绫� @@ -192,7 +200,6 @@ * @return 鍒嗙被鐨勬樉绀哄璞� */ CodeClassifyVO getObjectByIdPath(String idPath); - /** * 涓婚搴撶殑鏍� @@ -228,4 +235,65 @@ * @return 鍒嗙被涓婄骇锛屼笅绾х殑淇℃伅 */ CodeClassifyFullInfoBO getClassifyFullInfo(String codeClassifyOid); + + /** + * 浣跨敤缂栧彿鐨勮矾寰勮幏鍙栧璞� + * @param clsfNamePath 鍒嗙被鍚嶇О鐨勮矾寰勶紝涓�瀹氳浠庢渶椤跺眰鑺傜偣寮�濮嬶紝鏍煎紡涓簒xx/yyy/zz 杩欐牱 + * @return 鍒嗙被鐨勬樉绀哄璞� + */ + CodeClassifyVO getObjectByClsfNamePath(String clsfNamePath); + + /*** + * 鏍规嵁涓婄骇鑺傜偣鑾峰彇涓嬬骇鑺傜偣浠ｅ彿璺緞鍜屽悕绉拌矾寰� + * @param classifyId + * @param enable + * @return + */ + public List<CodeClassifyVO> getIdPathToNamePathByParentId(String classifyId,boolean enable); + /** + * 鏍规嵁鏍戝舰鏌ヨ瀵硅薄鏉ユ煡璇㈡暟鎹璞� + * + * @param treeQueryObject 鏍戝舰鏌ヨ瀵硅薄 + * @return 鏌ヨ缁撴灉,鏁版嵁瀵硅薄 + */ + List<CodeClassifyVO> selectCodeClassifyDOByTree(TreeQueryObject treeQueryObject); + + /** + * 缁熻瀛愯妭鐐圭殑涓暟 + * + * @param codeClassifyOid 鍒嗙被鐨勪富閿� + * @return 涓暟 + */ + int countChildrenByClassifyOid(String codeClassifyOid); + + /*** + * 鏍规嵁鐖惰妭鐐规煡璇笅绾у彾瀛愯妭鐐� + * @param parentId + * @return + */ + List<CodeClassifyVO> selectCodeClassifyVOByParentId(String parentId); + + /*** + * 鏍规嵁搴撹妭鐐瑰悕绉拌幏鍙栧垎绫� + * @param libName + * @return + */ + List<CodeClassifyVO> getRMLibByName(String libName); + + /*** + * 鏍规嵁鍒嗙被鎻忚堪澶囨敞鍜屽簱鑺傜偣鏌ヨ鍒嗙被淇℃伅 + * @param desc + * @param codeLibName + * @return + */ + List<CodeClassifyVO> getRMTypeByDescAndLib(String desc,String codeLibName); + + /** + * 鏍规嵁鍒嗙被鎻忚堪澶囨敞鍜屽簱鑺傜偣鏌ヨ鍒嗙被淇℃伅 + * @param oid + * @param fieldInPath + * @return + */ + List<CodeClassifyVO> selectAllClassifyByOid(String oid, String fieldInPath); + } -- Gitblit v1.9.3