From 1b8120cacac0037fcb1f8ae747c2f54eb735368b Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 09 五月 2023 18:50:51 +0800
Subject: [PATCH] 代码整合
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeTempphaseService.java | 44 ++++++++++++++++++++++++++------------------
1 files changed, 26 insertions(+), 18 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 0038355..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.CodeTempphaseEntity;
+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.CodeTemplatePhaseEntityVO;
+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;
@@ -38,16 +39,16 @@
* @author yuxc
* @since 2023-04-20
*/
-public interface ICodeTempphaseService extends IService<CodeTempphaseEntity> {
+public interface ICodeTempphaseService extends IService<CodeTemplatePhase> {
/**
* 鏌ヨ鎵�鏈夌殑妯℃澘闃舵
- * @param codeTemplatePhaseVO 鏌ヨ鏉′欢
- * @param query 鍒嗛〉鍜屾帓搴�
+ * @param conditionMap 鏌ヨ鏉′欢
+ * @param pageHelper 鍒嗛〉鍜屾帓搴�
* @return 鎵ц缁撴灉
* @throws VciBaseException 鏌ヨ鏉′欢鍜屽垎椤靛嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
*/
- DataGrid<CodeTemplatePhaseEntityVO> gridCodeTemplatePhase(CodeTemplatePhaseEntityVO codeTemplatePhaseVO, Query query) throws VciBaseException;
+ IPage<CodeTemplatePhaseVO> gridCodeTemplatePhase(Map<String, String> conditionMap, PageHelper pageHelper) throws VciBaseException;
/**
* 妯℃澘鍒犻櫎鐨勬椂鍊欒Е鍙�
@@ -61,7 +62,7 @@
* @param codeClassifyTemplateAttrDOInsert 灞炴�х殑鏁版嵁瀵硅薄
* @return 鍙楀奖鍝嶇殑鏁版嵁
*/
- List<CodeClstempattrEntity> codeTemplateAttrModifyTrigger(List<CodeClstempattrEntity> codeClassifyTemplateAttrDOInsert);
+ List<CodeClassifyTemplateAttr> codeTemplateAttrModifyTrigger(List<CodeClassifyTemplateAttr> codeClassifyTemplateAttrDOInsert);
/**
* 鎵归噺鏁版嵁瀵硅薄杞崲涓烘樉绀哄璞�
@@ -69,7 +70,7 @@
* @return 鏄剧ず瀵硅薄
* @throws VciBaseException 鍙傛暟涓虹┖鎴栬�呬笉瀛樺湪鐨勬椂鍊欎細鎶涘嚭寮傚父
*/
- List<CodeTemplatePhaseEntityVO> codeTemplatePhaseDO2VOs(Collection<CodeTempphaseEntity> codeTemplatePhaseEntityDOS) throws VciBaseException;
+ List<CodeTemplatePhaseVO> codeTemplatePhaseDO2VOs(Collection<CodeTemplatePhase> codeTemplatePhaseEntityDOS) throws VciBaseException;
/**
* 鏁版嵁瀵硅薄杞崲涓烘樉绀哄璞�
@@ -77,7 +78,7 @@
* @return 鏄剧ず瀵硅薄
* @throws VciBaseException 鎷疯礉灞炴�у嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
*/
- CodeTemplatePhaseEntityVO codeTemplatePhaseDO2VO(CodeTempphaseEntity codeTemplatePhaseEntityDO) throws VciBaseException;
+ CodeTemplatePhaseVO codeTemplatePhaseDO2VO(CodeTemplatePhase codeTemplatePhaseEntityDO) throws VciBaseException;
/**
* 澧炲姞妯℃澘闃舵
@@ -85,7 +86,7 @@
* @return 鎵ц缁撴灉
* @throws VciBaseException 鍙傛暟涓虹┖锛屽敮涓�椤癸紝蹇呰緭椤逛笉閫氳繃鏃朵細鎶涘嚭寮傚父
*/
- CodeTemplatePhaseEntityVO addSave(CodeTemplatePhaseDTO codeTemplatePhaseDTO) throws VciBaseException;
+ CodeTemplatePhaseVO addSave(CodeTemplatePhaseDTO codeTemplatePhaseDTO) throws VciBaseException;
/**
* 淇敼妯℃澘闃舵
@@ -93,7 +94,14 @@
* @return 鎵ц缁撴灉
* @throws VciBaseException 鍙傛暟涓虹┖锛屽敮涓�椤癸紝蹇呰緭椤逛笉閫氳繃鏃朵細鎶涘嚭寮傚父
*/
- CodeTemplatePhaseEntityVO editSave(CodeTemplatePhaseDTO codeTemplatePhaseDTO) throws VciBaseException;
+ CodeTemplatePhaseVO editSave(CodeTemplatePhaseDTO codeTemplatePhaseDTO) throws VciBaseException;
+
+ /**
+ * 妯℃澘灞炴�у垹闄ょ殑鏃跺�欒Е鍙�
+ * @param attrDOList 灞炴�х殑鏁版嵁瀵硅薄
+ * @return 鍙楀奖鍝嶇殑鏁版嵁
+ */
+ R codeTemplateAttrDeleteTrigger(List<CodeClassifyTemplateAttr> attrDOList);
/**
* 鍒犻櫎妯℃澘闃舵
@@ -109,7 +117,7 @@
* @return 妯℃澘闃舵鏄剧ず瀵硅薄
* @throws VciBaseException 鍙傛暟涓虹┖锛屾暟鎹笉瀛樺湪鏃朵細鎶涘嚭寮傚父
*/
- CodeTemplatePhaseEntityVO getObjectByOid(String oid) throws VciBaseException;
+ CodeTemplatePhaseVO getObjectByOid(String oid) throws VciBaseException;
/**
* 涓婚敭鎵归噺鑾峰彇妯℃澘闃舵
@@ -117,7 +125,7 @@
* @return 妯℃澘闃舵鏄剧ず瀵硅薄
* @throws VciBaseException 鏌ヨ鍑虹幇寮傚父鏃朵細鎶涘嚭
*/
- Collection<CodeTemplatePhaseEntityVO> listCodeTemplatePhaseByOids(Collection<String> oidCollections) throws VciBaseException;
+ Collection<CodeTemplatePhaseVO> listCodeTemplatePhaseByOids(Collection<String> oidCollections) throws VciBaseException;
/**
* 鍙傜収妯℃澘闃舵鍒楄〃
@@ -126,7 +134,7 @@
* @return 妯℃澘闃舵鏄剧ず瀵硅薄鍒楄〃锛岀敓鏁堢殑鍐呭
* @throws VciBaseException 鏌ヨ鏉′欢鍜屽垎椤靛嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
*/
- DataGrid<CodeTemplatePhaseEntityVO> 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