From 3534b13391b2a6152d0f91b72fda343b13a947cb Mon Sep 17 00:00:00 2001
From: ludc <ludc@vci-tech.com>
Date: 星期三, 22 一月 2025 15:55:27 +0800
Subject: [PATCH] 分类码段码值管理查询去除null的情况，分类码段生成编码时去除码值为null的情况
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeApplySwingController.java | 30 +++++++++++++++++++++---------
1 files changed, 21 insertions(+), 9 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 b335410..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
@@ -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,23 @@
}
/**
+ * 浣跨敤妯℃澘鐨勪富閿幏鍙栬〃鍗曠殑瀹氫箟
+ * @param map 浼犵殑鏁版嵁
+ * @return UI鐩稿叧鐨勪俊鎭紙浠呭寘鍚〃鍗曪級
+ */
+ @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;
+ }
+
+ /**
* 涓婚搴撳垎绫绘爲
* @param parentId 鏍戝舰鏌ヨ瀵硅薄
* @return 涓婚搴撳垎绫绘樉绀烘爲
@@ -145,6 +157,7 @@
List<CodeClassifyValueVO> codeClassifyValueVOS= codeClassifyValueService.listCodeClassifyValueBySecOid(secOid,parentClassifyValueOid);
return R.data(codeClassifyValueVOS);
}
+
/**
* 涓婚搴撳垎绫绘爲
* @param treeQueryObject 鏍戝舰鏌ヨ瀵硅薄
@@ -152,7 +165,7 @@
*/
@GetMapping("/treeCodeClassify")
public R<List<Tree>> treeCodeClassify(TreeQueryObject treeQueryObject) {
- List<Tree> treeList= codeClassifyService. treeCodeClassify(treeQueryObject);
+ List<Tree> treeList = codeClassifyService.treeCodeClassify(treeQueryObject);
return R.data(treeList);
}
@@ -167,7 +180,6 @@
return R.data(defaultReferTree);
}
-
/**
* 榛樿鐨勫弬鐓у垪琛�
* @param referConfigVO 鍙傜収鐨勯厤缃俊鎭�
@@ -175,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);
}
@@ -251,6 +263,6 @@
Map<String,String> codtionMap=new HashMap<>();
codtionMap.put("oid",oid);
codtionMap.put("classifyGroupCode",classifyGroupCode);
- return R.data(mdmEngineService.checkGroupCode(codtionMap));
+ return mdmEngineService.checkGroupCode(codtionMap);
}
}
--
Gitblit v1.9.3