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/controller/CodeApplySwingController.java |   23 +++++++++++++++--------
 1 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeApplySwingController.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeApplySwingController.java
index 0e51064..0634134 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeApplySwingController.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeApplySwingController.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.vci.ubcs.code.applyjtcodeservice.vo.BaseModelVO;
 import com.vci.ubcs.code.bo.CodeClassifyFullInfoBO;
 import com.vci.ubcs.code.dto.CodeOrderDTO;
 import com.vci.ubcs.code.entity.CodeClassify;
@@ -13,10 +14,7 @@
 import com.vci.ubcs.code.service.MdmEngineService;
 import com.vci.ubcs.code.service.impl.FormulaServiceImpl;
 import com.vci.ubcs.code.vo.ComponentRule;
-import com.vci.ubcs.code.vo.pagemodel.CodeClassifyTemplateVO;
-import com.vci.ubcs.code.vo.pagemodel.CodeClassifyVO;
-import com.vci.ubcs.code.vo.pagemodel.CodeClassifyValueVO;
-import com.vci.ubcs.code.vo.pagemodel.CodeRuleVO;
+import com.vci.ubcs.code.vo.pagemodel.*;
 import com.vci.ubcs.starter.annotation.VciBusinessLog;
 import com.vci.ubcs.starter.revision.model.BaseModel;
 import com.vci.ubcs.starter.revision.model.TreeQueryObject;
@@ -175,8 +173,8 @@
 	 * @return 鎵ц鐨勭粨鏋�
 	 */
 	@GetMapping("/defaultReferDataGrid")
-	public R<IPage<BaseModel>> defaultReferDataGrid(UIFormReferVO referConfigVO, BaseQueryObject baseQueryObject){
-		IPage<BaseModel> iPage=	mdmEngineService.referDataGrid(referConfigVO,baseQueryObject);
+	public R<IPage<BaseModelVO>> defaultReferDataGrid(UIFormReferVO referConfigVO, BaseQueryObject baseQueryObject){
+		IPage<BaseModelVO> iPage=	mdmEngineService.referDataGrid(referConfigVO,baseQueryObject);
 		return R.data(iPage);
 
 	}
@@ -227,7 +225,16 @@
 	@PostMapping("/addSaveCode")
 	@VciBusinessLog(operateName = "鐢宠鍗曚釜缂栫爜")
 	public R addSaveCode(@RequestBody CodeOrderDTO orderDTO) throws Exception {
-		return R.success(mdmEngineService.addSaveCode(orderDTO));
+		return R.data(mdmEngineService.addSaveCode(orderDTO));
 	}
-
+	/**
+	 * 鐢宠缂栫爜淇濆瓨
+	 * @param orderDTO 缂栫爜鐢宠鐩稿叧鐨勪俊鎭紝闇�瑕佹湁灞炴�у拰鐮佹鐩稿叧鐨勪俊鎭�
+	 * @return 鎵ц缁撴灉
+	 */
+	@PostMapping("/checkKeyAttrOnOrderFordatas")
+	@VciBusinessLog(operateName = "鐢宠鍗曚釜缂栫爜")
+	public R checkKeyAttrOnOrderFordatas(@RequestBody CodeOrderDTO orderDTO) throws Exception {
+		return R.data(mdmEngineService.checkKeyAttrOnOrderFordatas(orderDTO));
+	}
 }

--
Gitblit v1.9.3