From d370c5b1f2c33f8599db7ece89b484613b594f60 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期五, 15 九月 2023 08:48:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeApplySwingController.java |   32 +++++++++++++++++++++++++++++---
 1 files changed, 29 insertions(+), 3 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 6ba149b..1e4f607 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;
@@ -24,6 +25,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -172,8 +174,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);
 
 	}
@@ -224,7 +226,31 @@
 	@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));
 	}
 
+	/**
+	 * 闆嗗洟/浼佷笟鐮佹鍒ゆ柇
+	 * @param classifyGroupCode 浼犲叆鏁版嵁 ,classifyGroupCode:閰嶇疆鐨勪腑鐨勫垎绫婚《鑺傜偣
+	 * @param oid 浼犲叆鏁版嵁 ,閫夋嫨鑺傜偣鐨刼id--锛宯owApplyCode锛氬綋鍓嶇敵璇风紪鐮佺殑鍒嗙被
+	 * @return 鎵ц缁撴灉
+	 */
+	@GetMapping("/checkGroupCode")
+	@VciBusinessLog(operateName = "闆嗗洟/浼佷笟鐮佹鍒ゆ柇")
+	public R checkGroupCode(String oid,String  classifyGroupCode) throws Exception {
+		Map<String,String> codtionMap=new HashMap<>();
+		codtionMap.put("oid",oid);
+		codtionMap.put("classifyGroupCode",classifyGroupCode);
+		return mdmEngineService.checkGroupCode(codtionMap);
+	}
 }

--
Gitblit v1.9.3