From cffd3d06a2f69e4a15aa9465d36c0495247f88ab Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期五, 13 十月 2023 12:24:29 +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 | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 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 69e569d..88db082 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
@@ -1,13 +1,9 @@
package com.vci.ubcs.code.controller;
-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;
-import com.vci.ubcs.code.enumpack.CodeClassifyProcessUseEnum;
import com.vci.ubcs.code.service.ICodeClassifyService;
import com.vci.ubcs.code.service.ICodeClassifyTemplateAttrService;
import com.vci.ubcs.code.service.ICodeClassifyValueService;
@@ -16,7 +12,6 @@
import com.vci.ubcs.code.vo.ComponentRule;
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;
import com.vci.ubcs.starter.web.pagemodel.*;
import io.swagger.annotations.Api;
@@ -87,6 +82,17 @@
}
/**
+ * 浣跨敤妯℃澘鐨勪富閿幏鍙栬〃鍗曠殑瀹氫箟
+ * @param codeClassifyOid 浣跨敤妯℃澘鐨勫垎绫讳富閿�
+ * @return UI鐩稿叧鐨勪俊鎭紙浠呭寘鍚〃鍗曪級
+ */
+ @GetMapping("/getFormDefineByTemplateOid")
+ public MdmUIInfoVO getFormDefineByTemplateOid(String codeClassifyOid){
+ CodeClassifyTemplateVO usedTemplateByClassifyOid = mdmEngineService.getUsedTemplateByClassifyOid(codeClassifyOid);
+ return mdmEngineService.getFormDefineByTemplateOid(usedTemplateByClassifyOid.getOid(),codeClassifyOid);
+ }
+
+ /**
* 涓婚搴撳垎绫绘爲
* @param parentId 鏍戝舰鏌ヨ瀵硅薄
* @return 涓婚搴撳垎绫绘樉绀烘爲
--
Gitblit v1.9.3