From 29ab7773efe351a879ce9b3c29ab3ca50f4e62cb Mon Sep 17 00:00:00 2001 From: xiejun <xiejun@vci-tech.com> Date: 星期三, 15 一月 2025 21:36:08 +0800 Subject: [PATCH] 产品型号集成,类型转换,人员组织加日志,申请接口引用码段值校验 --- Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeApplySwingController.java | 25 ++++++++++++++++++------- 1 files changed, 18 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 69e569d..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; @@ -84,6 +79,23 @@ public R<List<CodeClassifyVO>> getRMTypeByDescAndLib(String desc,String codeLibName) { List<CodeClassifyVO> codeClassifyVOList=codeClassifyService.getRMTypeByDescAndLib(desc,codeLibName); return R.data(codeClassifyVOList) ; + } + + /** + * 浣跨敤妯℃澘鐨勪富閿幏鍙栬〃鍗曠殑瀹氫箟 + * @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; } /** @@ -168,7 +180,6 @@ return R.data(defaultReferTree); } - /** * 榛樿鐨勫弬鐓у垪琛� * @param referConfigVO 鍙傜収鐨勯厤缃俊鎭� @@ -176,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