From 80da77d96adf4acbf25ea5c8614ae485bc02da2d Mon Sep 17 00:00:00 2001 From: ludc Date: 星期四, 07 十二月 2023 15:48:18 +0800 Subject: [PATCH] 下载历史数据导入模板带上码段宽度 --- Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyTemplateButtonServiceImpl.java | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-) diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyTemplateButtonServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyTemplateButtonServiceImpl.java index f9223cb..c4eb529 100644 --- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyTemplateButtonServiceImpl.java +++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyTemplateButtonServiceImpl.java @@ -23,7 +23,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.yulichang.wrapper.MPJLambdaWrapper; -import com.vci.ubcs.code.constant.MdmBtmTypeConstant; + import com.vci.ubcs.code.dto.CodeClassifyTemplateButtonDTO; import com.vci.ubcs.code.entity.*; import com.vci.ubcs.code.enumpack.CodeButtonUseEnum; @@ -36,7 +36,8 @@ import com.vci.ubcs.starter.exception.VciBaseException; import com.vci.ubcs.starter.revision.service.RevisionModelUtil; import com.vci.ubcs.starter.util.DefaultAttrAssimtUtil; -import com.vci.ubcs.starter.util.Map2MPJLambdaUtil; +import com.vci.ubcs.starter.util.MdmBtmTypeConstant; +import com.vci.ubcs.starter.util.UBCSCondition; import com.vci.ubcs.starter.web.pagemodel.PageHelper; import com.vci.ubcs.starter.web.util.BeanUtil; import com.vci.ubcs.starter.web.util.BeanUtilForVCI; @@ -286,7 +287,7 @@ CodeClassifyTemplateButton codeClassifyTemplateButton = new CodeClassifyTemplateButton(); BeanMap beanMap = BeanMap.create(codeClassifyTemplateButton); beanMap.putAll(conditionMap); - MPJLambdaWrapper<CodeClassifyTemplateButton> mpjLambdaWrapper = Map2MPJLambdaUtil.getMPJLambdaWrapper(codeClassifyTemplateButton) + MPJLambdaWrapper<CodeClassifyTemplateButton> mpjLambdaWrapper = UBCSCondition.getMPJLambdaWrapper(codeClassifyTemplateButton) .selectAll(CodeClassifyTemplateButton.class) .selectAs(CodeButton::getName, CodeClassifyTemplateButton::getClassifyButtonOidName) .selectAs(CodeButton::getId, CodeClassifyTemplateButton::getClassifyButtonId) @@ -413,10 +414,10 @@ if(StringUtils.isBlank(templateOid)){ return new ArrayList<>(); } - Map<String,String> conditionMap = new HashMap<>(); - conditionMap.put("classifyTemplateOid",templateOid); - PageHelper pageHelper = new PageHelper(-1); - pageHelper.addDefaultAsc("orderNum"); +// Map<String,String> conditionMap = new HashMap<>(); +// conditionMap.put("classifyTemplateOid",templateOid); +// PageHelper pageHelper = new PageHelper(-1); +// pageHelper.addDefaultAsc("orderNum"); QueryWrapper<CodeClassifyTemplateButton> wrapper = new QueryWrapper<>(); wrapper.eq("classifyTemplateOid",templateOid); wrapper.orderByAsc("orderNum"); -- Gitblit v1.9.3