From e50b37ea73d82149cd52646464389bf6010b1d22 Mon Sep 17 00:00:00 2001 From: ludc Date: 星期二, 12 十二月 2023 10:49:19 +0800 Subject: [PATCH] map对象大小写导致code返回为空问题 --- Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeTempphaseService.java | 34 +++++++++++++++++++++------------- 1 files changed, 21 insertions(+), 13 deletions(-) diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeTempphaseService.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeTempphaseService.java index 9653220..3fc3854 100644 --- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeTempphaseService.java +++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeTempphaseService.java @@ -16,16 +16,17 @@ */ package com.vci.ubcs.code.service; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import com.vci.ubcs.code.dto.CodeTemplatePhaseDTO; -import com.vci.ubcs.code.entity.CodeClstempattrEntity; +import com.vci.ubcs.code.entity.CodeClassifyTemplateAttr; +import com.vci.ubcs.code.entity.CodeClassifyTemplateAttr; import com.vci.ubcs.code.entity.CodeTemplatePhase; import com.vci.ubcs.code.vo.pagemodel.CodeClassifyTemplateAttrVO; import com.vci.ubcs.code.vo.pagemodel.CodeTemplatePhaseVO; import com.vci.ubcs.starter.exception.VciBaseException; import com.vci.ubcs.starter.web.pagemodel.DataGrid; import com.vci.ubcs.starter.web.pagemodel.PageHelper; -import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; import java.util.Collection; @@ -42,12 +43,12 @@ /** * 鏌ヨ鎵�鏈夌殑妯℃澘闃舵 - * @param codeTemplatePhaseVO 鏌ヨ鏉′欢 - * @param query 鍒嗛〉鍜屾帓搴� + * @param conditionMap 鏌ヨ鏉′欢 + * @param pageHelper 鍒嗛〉鍜屾帓搴� * @return 鎵ц缁撴灉 * @throws VciBaseException 鏌ヨ鏉′欢鍜屽垎椤靛嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父 */ - DataGrid<CodeTemplatePhaseVO> gridCodeTemplatePhase(CodeTemplatePhaseVO codeTemplatePhaseVO, Query query) throws VciBaseException; + IPage<CodeTemplatePhaseVO> gridCodeTemplatePhase(Map<String, String> conditionMap, PageHelper pageHelper) throws VciBaseException; /** * 妯℃澘鍒犻櫎鐨勬椂鍊欒Е鍙� @@ -61,23 +62,23 @@ * @param codeClassifyTemplateAttrDOInsert 灞炴�х殑鏁版嵁瀵硅薄 * @return 鍙楀奖鍝嶇殑鏁版嵁 */ - List<CodeClstempattrEntity> codeTemplateAttrModifyTrigger(List<CodeClstempattrEntity> codeClassifyTemplateAttrDOInsert); + List<CodeClassifyTemplateAttr> codeTemplateAttrModifyTrigger(List<CodeClassifyTemplateAttr> codeClassifyTemplateAttrDOInsert); /** * 鎵归噺鏁版嵁瀵硅薄杞崲涓烘樉绀哄璞� - * @param codeTemplatePhaseDOs 鏁版嵁瀵硅薄鍒楄〃 + * @param codeTemplatePhaseEntityDOS 鏁版嵁瀵硅薄鍒楄〃 * @return 鏄剧ず瀵硅薄 * @throws VciBaseException 鍙傛暟涓虹┖鎴栬�呬笉瀛樺湪鐨勬椂鍊欎細鎶涘嚭寮傚父 */ - List<CodeTemplatePhaseVO> codeTemplatePhaseDO2VOs(Collection<CodeTemplatePhase> codeTemplatePhaseDOs) throws VciBaseException; + List<CodeTemplatePhaseVO> codeTemplatePhaseDO2VOs(Collection<CodeTemplatePhase> codeTemplatePhaseEntityDOS) throws VciBaseException; /** * 鏁版嵁瀵硅薄杞崲涓烘樉绀哄璞� - * @param codeTemplatePhaseDO 鏁版嵁瀵硅薄 + * @param codeTemplatePhaseEntityDO 鏁版嵁瀵硅薄 * @return 鏄剧ず瀵硅薄 * @throws VciBaseException 鎷疯礉灞炴�у嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父 */ - CodeTemplatePhaseVO codeTemplatePhaseDO2VO(CodeTemplatePhase codeTemplatePhaseDO) throws VciBaseException; + CodeTemplatePhaseVO codeTemplatePhaseDO2VO(CodeTemplatePhase codeTemplatePhaseEntityDO) throws VciBaseException; /** * 澧炲姞妯℃澘闃舵 @@ -94,6 +95,13 @@ * @throws VciBaseException 鍙傛暟涓虹┖锛屽敮涓�椤癸紝蹇呰緭椤逛笉閫氳繃鏃朵細鎶涘嚭寮傚父 */ CodeTemplatePhaseVO editSave(CodeTemplatePhaseDTO codeTemplatePhaseDTO) throws VciBaseException; + + /** + * 妯℃澘灞炴�у垹闄ょ殑鏃跺�欒Е鍙� + * @param attrDOList 灞炴�х殑鏁版嵁瀵硅薄 + * @return 鍙楀奖鍝嶇殑鏁版嵁 + */ + R codeTemplateAttrDeleteTrigger(List<CodeClassifyTemplateAttr> attrDOList); /** * 鍒犻櫎妯℃澘闃舵 @@ -126,7 +134,7 @@ * @return 妯℃澘闃舵鏄剧ず瀵硅薄鍒楄〃锛岀敓鏁堢殑鍐呭 * @throws VciBaseException 鏌ヨ鏉′欢鍜屽垎椤靛嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父 */ - DataGrid<CodeTemplatePhaseVO> refDataGridCodeTemplatePhase(Map<String, String> conditionMap, PageHelper pageHelper) throws VciBaseException; + IPage<CodeTemplatePhaseVO> refDataGridCodeTemplatePhase(Map<String, String> conditionMap, PageHelper pageHelper) throws VciBaseException; /** * 闃舵涓嶅寘鍚殑灞炴�� @@ -134,7 +142,7 @@ * @param pageHelper 鍒嗛〉瀵硅薄 * @return 灞炴�х殑淇℃伅 */ - DataGrid<CodeClassifyTemplateAttrVO> gridUnUsedAttribute(Map<String, String> conditionMap, PageHelper pageHelper) throws VciBaseException; + IPage<CodeClassifyTemplateAttrVO> gridUnUsedAttribute(Map<String, String> conditionMap, PageHelper pageHelper) throws VciBaseException; /** * 闃舵鍖呭惈鐨勫睘鎬� @@ -142,6 +150,6 @@ * @param pageHelper 鍒嗛〉瀵硅薄 * @return 灞炴�х殑淇℃伅 */ - DataGrid<CodeClassifyTemplateAttrVO> gridUsedAttribute(Map<String, String> conditionMap, PageHelper pageHelper) throws VciBaseException; + IPage<CodeClassifyTemplateAttrVO> gridUsedAttribute(Map<String, String> conditionMap, PageHelper pageHelper) throws VciBaseException; } -- Gitblit v1.9.3