From d7eba1786ed1fba2b3674f9da3af4fbf1a3f8692 Mon Sep 17 00:00:00 2001
From: fujunling <2984387807@qq.com>
Date: 星期四, 01 六月 2023 18:49:05 +0800
Subject: [PATCH] 解决冲突
---
Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/controller/DockingPreApplyCodeController.java | 71 +++++++++++++++++++++++++++++++++--
1 files changed, 66 insertions(+), 5 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/controller/DockingPreApplyCodeController.java b/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/controller/DockingPreApplyCodeController.java
index 22951d0..08eebfe 100644
--- a/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/controller/DockingPreApplyCodeController.java
+++ b/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/controller/DockingPreApplyCodeController.java
@@ -3,15 +3,15 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import com.vci.ubcs.code.feign.ICodeClassifyClient;
+import com.vci.ubcs.code.vo.pagemodel.CodeClassifyTemplateAttrVO;
import com.vci.ubcs.code.webservice.service.*;
+import com.vci.ubcs.code.webservice.vo.*;
import com.vci.ubcs.code.webservice.wrapper.DockingPreApplyFormWrapper;
+import com.vci.ubcs.starter.exception.VciBaseException;
import com.vci.ubcs.starter.revision.model.TreeQueryObject;
import com.vci.ubcs.starter.web.pagemodel.Tree;
import com.vci.ubcs.code.webservice.entity.DockingPreApplyForm;
-import com.vci.ubcs.code.webservice.vo.BaseModelVO;
-import com.vci.ubcs.code.webservice.vo.DockingPreApplyFormVO;
-import com.vci.ubcs.code.webservice.vo.DockingPreAttrMappingVO;
-import com.vci.ubcs.code.webservice.vo.DockingPreAttrRangeVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
@@ -62,7 +62,18 @@
private final IDockingPreApplyFormService dockingPreApplyFormService;
+ /***
+ * 灞炴�ф灇涓捐寖鍥存湇鍔�
+ */
+ private final IDockingPreViewModelService dockingPreViewModelService;
+
+
+ /***
+ * 灞炴�ф灇涓捐寖鍥存湇鍔�
+ */
+
+ private final ICodeClassifyClient codeClassifyClient;
/**
* 鏍规嵁涓绘暟鎹紪鐮乷id鑾峰彇闆嗗洟灞炴�ф槧灏勪俊鎭�
@@ -122,12 +133,44 @@
/**
* 鍙傜収鏍� 闆嗗洟鍒嗙被锛堟槸鍚﹀寘鍚睘鎬э級
* @param treeQueryObject 鏍戝舰鏌ヨ瀵硅薄 conditionMap 瀛樹笂 codeclsfid=涓绘暟鎹殑鍒嗙被oid
- * @return 涓婚搴撳垎绫绘樉绀烘爲
+ * @return 闆嗗洟鍒嗙被鏄剧ず鏍�
*/
@GetMapping("/referTree")
public List<Tree> referTree(TreeQueryObject treeQueryObject) {
return dockingPreClassifyService.treeCompanyGroupClassify(treeQueryObject);
}
+
+
+ /**
+ * 鍙傜収鏍� 涓绘暟鎹ā鏉垮睘鎬т俊鎭�
+ * @param classifyId 涓绘暟鎹垎绫讳富閿�
+ * @return 涓婚搴撳垎绫绘ā鏉垮睘鎬�
+ */
+ @GetMapping("/listViewModelAttributeByClassId")
+ public R listViewModelAttributeByClassId(String classifyId) {
+ return R.data(dockingPreViewModelService.selectDockingPreViewModelByClassId(classifyId,true));
+ }
+
+ /**
+ * 鍙傜収鏍� 涓绘暟鎹垎绫�
+ * @param treeQueryObject 鏍戝舰鏌ヨ瀵硅薄 conditionMap 瀛樹笂 codeclsfid=涓绘暟鎹殑鍒嗙被oid
+ * @return 涓婚搴撳垎绫绘樉绀烘爲
+ */
+ @GetMapping("/referCodeClassifyTree")
+ public List<Tree> referCodeClassifyTree(TreeQueryObject treeQueryObject) {
+ return codeClassifyClient.referCodeClassifyTree(treeQueryObject);
+ }
+
+ /**
+ * 鍙傜収鏍� 涓绘暟鎹ā鏉垮睘鎬т俊鎭�
+ * @param codeClassifyId 涓绘暟鎹垎绫讳富閿�
+ * @return 涓婚搴撳垎绫绘ā鏉垮睘鎬�
+ */
+ @GetMapping("/listCodeAttributeByClassId")
+ public R listCodeAttributeByClassId(String codeClassifyId) {
+ return R.data(codeClassifyClient.listCodeAttributeByClassId(codeClassifyId));
+ }
+
/***
* 鐢宠闆嗗洟缂栫爜
@@ -144,4 +187,22 @@
return R.fail("闆嗗洟鐮佺敵璇峰け璐ワ細"+e.getMessage());
}
}
+
+
+ /***
+ * 鍚屾闆嗗洟妯″瀷瑙嗗浘
+ * @return 杩斿洖鎵ц缁撴灉淇℃伅
+ */
+ @PostMapping( "/syncClassifyModel")
+ @ApiOperationSupport(order = 2)
+ @ApiOperation(value = "鍚屾闆嗗洟妯″瀷瑙嗗浘", notes = "鍚屾闆嗗洟妯″瀷瑙嗗浘->all:鍚屾闆嗗洟涓绘ā鍨�,one:鍚屾闆嗗洟妯″瀷璇︾粏淇℃伅")
+ public R syncClassifyModel(String classifyId,String operationType){
+ try {
+ return groupMdmInterService.syncClassifyModel(classifyId,operationType);
+ }catch (VciBaseException e){
+ return R.fail("鍚屾闆嗗洟妯″瀷瑙嗗浘澶辫触锛�"+e.getMessage());
+ }
+
+ }
+
}
--
Gitblit v1.9.3