From 1b8120cacac0037fcb1f8ae747c2f54eb735368b Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 09 五月 2023 18:50:51 +0800
Subject: [PATCH] 代码整合
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyTemplateAttrServiceImpl.java | 69 +++++++++++++++++++++++++++-------
1 files changed, 54 insertions(+), 15 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyTemplateAttrServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyTemplateAttrServiceImpl.java
index eaf2cf6..157a9c3 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyTemplateAttrServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyTemplateAttrServiceImpl.java
@@ -1,13 +1,21 @@
package com.vci.ubcs.code.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+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.entity.CodeClassifyTemplateAttr;
+import com.vci.ubcs.code.entity.CodeClstemplateEntity;
import com.vci.ubcs.code.mapper.CodeClassifyTemplateAttrMapper;
import com.vci.ubcs.code.service.ICodeClassifyTemplateAttrService;
import com.vci.ubcs.code.vo.pagemodel.CodeClassifyTemplateAttrVO;
+import com.vci.ubcs.code.wrapper.CodeClstempattrWrapper;
+import com.vci.ubcs.common.utils.PageDO2PageVO;
import com.vci.ubcs.starter.exception.VciBaseException;
+import com.vci.ubcs.starter.util.Map2MPLLambdaUtil;
+import com.vci.ubcs.starter.util.MybatisParameterUtil;
import com.vci.ubcs.starter.web.enumpck.VciFieldTypeEnum;
import com.vci.ubcs.starter.web.pagemodel.DataGrid;
import com.vci.ubcs.starter.web.pagemodel.PageHelper;
@@ -37,19 +45,16 @@
/**
* 鏌ヨ鎵�鏈夌殑涓婚搴撳垎绫荤殑妯℃澘灞炴��
- * @param lambdaQueryWrapper 鏌ヨ鏉′欢
+ * @param mpjLambdaWrapper 鏌ヨ鏉′欢
* @param pageHelper 鍒嗛〉鍜屾帓搴�
* @return 鎵ц缁撴灉
* @throws VciBaseException 鏌ヨ鏉′欢鍜屽垎椤靛嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
*/
@Override
- public DataGrid<CodeClassifyTemplateAttrVO> gridCodeClassifyTemplateAttr(LambdaQueryWrapper<CodeClassifyTemplateAttr> lambdaQueryWrapper , PageHelper pageHelper) throws VciBaseException {
- DataGrid<CodeClassifyTemplateAttrVO> dataGrid=new DataGrid<>();
+ public IPage<CodeClassifyTemplateAttrVO> gridCodeClassifyTemplateAttr(MPJLambdaWrapper<CodeClassifyTemplateAttr> mpjLambdaWrapper , PageHelper pageHelper) throws VciBaseException {
//娌℃湁浼犻�掑弬鏁帮紝灏变笉鎵ц鏌ヨ閫昏緫
- if(lambdaQueryWrapper == null){
- dataGrid.setData(new ArrayList<>());
- dataGrid.setTotal(0);
- return dataGrid;
+ if(mpjLambdaWrapper == null){
+ return new Page<>();
}
Query query = new Query();
if (pageHelper == null) {
@@ -61,13 +66,14 @@
}
//pageHelper.addDefaultAsc("ordernum");
query.setAscs("ordernum");
-
- IPage<CodeClassifyTemplateAttr> doList = codeClassifyTemplateAttrMapper.selectPage(Condition.getPage(query), lambdaQueryWrapper);
+ //杩欏効鏄釜杩炶〃鏌ヨ
+ IPage<CodeClassifyTemplateAttr> doList = codeClassifyTemplateAttrMapper.selectPage(Condition.getPage(query), mpjLambdaWrapper);
+ IPage<CodeClassifyTemplateAttrVO> voList = new Page<>();
if (!CollectionUtils.isEmpty(doList.getRecords())) {
- dataGrid.setData(codeClassifyTemplateAttrDO2VOs(doList.getRecords()));
- dataGrid.setTotal(VciBaseUtil.getInt(String.valueOf(codeClassifyTemplateAttrMapper.selectCount(lambdaQueryWrapper))));
+ voList.setRecords(CodeClstempattrWrapper.build().listVO(doList.getRecords()));
+ PageDO2PageVO.pageDO2PageVO(doList,voList);
}
- return dataGrid;
+ return voList;
}
/**
@@ -78,11 +84,42 @@
* @throws VciBaseException 鏌ヨ鏉′欢鍜屽垎椤靛嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
*/
@Override
- public DataGrid<CodeClassifyTemplateAttrVO> refDataGridCodeClassifyTemplateAttr(Map<String, Object> conditionMap, PageHelper pageHelper) throws VciBaseException{
+ public IPage<CodeClassifyTemplateAttrVO> refDataGridCodeClassifyTemplateAttr(Map<String, Object> conditionMap, PageHelper pageHelper) throws VciBaseException{
if(conditionMap == null){
conditionMap = new HashMap<String, Object>();
}
- return gridCodeClassifyTemplateAttr(Condition.getQueryWrapper(conditionMap,CodeClassifyTemplateAttr.class).lambda(),pageHelper);
+ return gridCodeClassifyTemplateAttr(Map2MPLLambdaUtil.getMPJLambdaWrapper(conditionMap, CodeClassifyTemplateAttr.class),pageHelper);
+ }
+
+ @Override
+ public IPage<CodeClassifyTemplateAttrVO> selectCodeClstempattrPage(IPage<CodeClassifyTemplateAttrVO> page, CodeClassifyTemplateAttrVO CodeClstempattr) {
+ return page.setRecords(baseMapper.selectCodeClstempattrPage(page, CodeClstempattr));
+ }
+
+ /**
+ * 浣跨敤妯℃澘鐨勪富閿幏鍙栨ā鏉跨殑灞炴��--鎵归噺
+ *
+ * @param templateOidCollection 妯℃澘鐨勪富閿�
+ * @return 灞炴�х殑淇℃伅
+ */
+ @Override
+ public List<CodeClassifyTemplateAttrVO> listCodeClassifyTemplateAttrByTemplateOids(Collection<String> templateOidCollection) {
+ if(CollectionUtils.isEmpty(templateOidCollection)){
+ return new ArrayList<>();
+ }
+ List<CodeClassifyTemplateAttr> attrDOList = new ArrayList<>();
+ VciBaseUtil.switchCollectionForOracleIn(templateOidCollection).stream().forEach(templateOids->{
+// Map<String,String> conditionMap = new HashMap<>();
+// conditionMap.put("classifytemplateoid", QueryOptionConstant.IN + "(" + VciBaseUtil.toInSql(templateOids.toArray(new String[0])) + ")");
+// PageHelper pageHelper = new PageHelper(-1);
+// pageHelper.addDefaultAsc("orderNum");
+ List<CodeClassifyTemplateAttr> attrDOS = baseMapper.selectByClassifytemplateoid(VciBaseUtil.toInSql(templateOids.toArray(new String[0])));
+
+ if(!CollectionUtils.isEmpty(attrDOS)){
+ attrDOList.addAll(attrDOS);
+ }
+ });
+ return codeClassifyTemplateAttrDO2VOs(attrDOList);
}
/**
@@ -117,9 +154,11 @@
if(codeClassifyTemplateAttrDO != null){
BeanUtilForVCI.copyPropertiesIgnoreCase(codeClassifyTemplateAttrDO,vo);
//濡傛灉鏈塴cstatus鐨勭被鐨勮瘽
- vo.setAttributeDataTypeText(VciFieldTypeEnum.getTextByValue(vo.getAttributedatatype()));
+ vo.setAttributeDataTypeText(VciFieldTypeEnum.getTextByValue(vo.getAttributeDataType()));
}
return vo;
}
+
+
}
--
Gitblit v1.9.3