From b11b45122d2b6903e8970e8d55712f7a6a657e22 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 10 一月 2024 00:01:10 +0800
Subject: [PATCH] defaultReferDataGrid接口修改，实现兼容高级查询sql拼接；修改流水处理接口，增加流水处理跳出判断
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeApplySwingController.java | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 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 88db082..57afa21 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
@@ -83,13 +83,19 @@
/**
* 浣跨敤妯℃澘鐨勪富閿幏鍙栬〃鍗曠殑瀹氫箟
- * @param codeClassifyOid 浣跨敤妯℃澘鐨勫垎绫讳富閿�
+ * @param map 浼犵殑鏁版嵁
* @return UI鐩稿叧鐨勪俊鎭紙浠呭寘鍚〃鍗曪級
*/
- @GetMapping("/getFormDefineByTemplateOid")
- public MdmUIInfoVO getFormDefineByTemplateOid(String codeClassifyOid){
- CodeClassifyTemplateVO usedTemplateByClassifyOid = mdmEngineService.getUsedTemplateByClassifyOid(codeClassifyOid);
- return mdmEngineService.getFormDefineByTemplateOid(usedTemplateByClassifyOid.getOid(),codeClassifyOid);
+ @RequestMapping("/getFormDefineByTemplateOid")
+ public MdmUIInfoVO getFormDefineByTemplateOid(@RequestParam Map<String,String> map){
+// CodeClassifyTemplateVO usedTemplateByClassifyOid = mdmEngineService.getUsedTemplateByClassifyOid(codeClassifyOid);
+ CodeClassifyTemplateVO usedTemplateByClassifyOid = mdmEngineService.getUsedTemplateByClassifyOid(map.get("codeClassifyOid"));
+ MdmUIInfoVO formDefineByTemplate = mdmEngineService.getFormDefineByTemplateOid(usedTemplateByClassifyOid.getOid(), map.get("codeClassifyOid"));
+ for (UIFormItemVO item : formDefineByTemplate.getFormDefineVO().getItems()) {
+ if(map.get(item.getField()) != null){
+ item.getAddField().put("defaultValue",map.get(item.getField()));
+ }
+ }return formDefineByTemplate;
}
/**
@@ -174,7 +180,6 @@
return R.data(defaultReferTree);
}
-
/**
* 榛樿鐨勫弬鐓у垪琛�
* @param referConfigVO 鍙傜収鐨勯厤缃俊鎭�
@@ -182,7 +187,7 @@
*/
@GetMapping("/defaultReferDataGrid")
public R<IPage<BaseModelVO>> defaultReferDataGrid(UIFormReferVO referConfigVO, BaseQueryObject baseQueryObject){
- IPage<BaseModelVO> iPage= mdmEngineService.referDataGrid(referConfigVO,baseQueryObject);
+ IPage<BaseModelVO> iPage = mdmEngineService.referDataGrid(referConfigVO,baseQueryObject);
return R.data(iPage);
}
--
Gitblit v1.9.3