From 86e842a81ae35b1bd419ca17f88dbd0b74e0e12e Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期日, 14 五月 2023 04:15:51 +0800
Subject: [PATCH] 新增应用码段下的参照配置界面，以及代码整合
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeTempphaseServiceImpl.java | 19 ++++++-------------
1 files changed, 6 insertions(+), 13 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeTempphaseServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeTempphaseServiceImpl.java
index b1f55fe..c5cd59e 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeTempphaseServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeTempphaseServiceImpl.java
@@ -17,11 +17,8 @@
package com.vci.ubcs.code.service.impl;
import com.alibaba.cloud.commons.lang.StringUtils;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
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.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -30,11 +27,11 @@
import com.vci.ubcs.code.constant.MdmBtmTypeConstant;
import com.vci.ubcs.code.dto.CodeTemplatePhaseDTO;
import com.vci.ubcs.code.entity.*;
-import com.vci.ubcs.code.mapper.CodePhaseattrMapper;
+import com.vci.ubcs.code.mapper.CodePhaseAttrMapper;
import com.vci.ubcs.code.mapper.CodeTemplatePhaseMapper;
import com.vci.ubcs.code.mapper.CommonsMapper;
import com.vci.ubcs.code.service.ICodeClassifyTemplateAttrService;
-import com.vci.ubcs.code.service.ICodePhaseattrService;
+import com.vci.ubcs.code.service.ICodePhaseAttrService;
import com.vci.ubcs.code.vo.pagemodel.CodeClassifyTemplateAttrVO;
import com.vci.ubcs.code.vo.pagemodel.CodeTemplatePhaseVO;
import com.vci.ubcs.code.wrapper.CodeTemplatePhaseWapper;
@@ -43,8 +40,6 @@
import com.vci.ubcs.starter.revision.service.RevisionModelUtil;
import com.vci.ubcs.starter.util.DefaultAttrAssimtUtil;
import com.vci.ubcs.starter.util.MybatisParameterUtil;
-import com.vci.ubcs.starter.web.constant.QueryOptionConstant;
-import com.vci.ubcs.starter.web.pagemodel.DataGrid;
import com.vci.ubcs.starter.web.pagemodel.PageHelper;
import com.vci.ubcs.starter.web.util.BeanUtil;
import com.vci.ubcs.starter.web.util.BeanUtilForVCI;
@@ -73,7 +68,7 @@
public class CodeTempphaseServiceImpl extends ServiceImpl<CodeTemplatePhaseMapper, CodeTemplatePhase> implements ICodeTempphaseService {
@Autowired(required = false)
- private CodePhaseattrMapper codePhaseAttrMapper;
+ private CodePhaseAttrMapper codePhaseAttrMapper;
@Autowired(required = false)
private CodeTemplatePhaseMapper codeTemplatePhaseMapper;
@@ -82,7 +77,7 @@
private CommonsMapper commonsMapper;
@Autowired(required = false)
- private ICodePhaseattrService codePhaseattrService;
+ private ICodePhaseAttrService codePhaseattrService;
/**
* 瀵硅薄鐨勬搷浣�
@@ -112,16 +107,14 @@
query.setSize(pageHelper.getLimit());
query.setCurrent(pageHelper.getPage());
}
- query.setDescs("createTime");
+ query.setDescs("CREATETIME");
CodeTemplatePhase codeTemplatePhase = new CodeTemplatePhase();
BeanMap beanMap = BeanMap.create(codeTemplatePhase);
beanMap.putAll(conditionMap);
IPage<CodeTemplatePhase> doList = codeTemplatePhaseMapper.selectPage(Condition.getPage(query), Condition.getQueryWrapper(codeTemplatePhase));
IPage<CodeTemplatePhaseVO> voList = new Page<>();
if (!CollectionUtils.isEmpty(doList.getRecords())) {
- voList.setRecords(CodeTemplatePhaseWapper.build().listVO(doList.getRecords()));
- //鍒嗛〉鍙傛暟杞埌pageVO瀵硅薄
- voList = PageDO2PageVO.pageDO2PageVO(doList,voList);
+ CodeTemplatePhaseWapper.build().pageVO(doList);
}
return voList;
}
--
Gitblit v1.9.3