From 15fd75c395784afa2cc3e805774e2c8cbc5a3eb7 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期六, 06 五月 2023 13:50:39 +0800
Subject: [PATCH] 部署打包时jar中没有主清单属性问题
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyProcessTempServiceImpl.java | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyProcessTempServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyProcessTempServiceImpl.java
index b1a1ecd..f8f8a53 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyProcessTempServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyProcessTempServiceImpl.java
@@ -5,6 +5,7 @@
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.IService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.vci.ubcs.code.dto.CodeClassifyProcessTempDTO;
@@ -15,6 +16,7 @@
import com.vci.ubcs.code.mapper.CodeClassifyTemplateAttrMapper;
import com.vci.ubcs.code.service.ICodeClassifyProcessTempService;
import com.vci.ubcs.code.vo.pagemodel.CodeClassifyProcessTempVO;
+import com.vci.ubcs.common.utils.PageDO2PageVO;
import com.vci.ubcs.starter.exception.VciBaseException;
import com.vci.ubcs.starter.revision.service.RevisionModelUtil;
import com.vci.ubcs.starter.web.pagemodel.DataGrid;
@@ -59,7 +61,6 @@
@Autowired
private RevisionModelUtil revisionModelUtil;
-
/**
* 鏌ヨ鎵�鏈夌殑鍒嗙被浣跨敤鐨勬祦绋嬫ā鏉�
* @param conditionMap 鏌ヨ鏉′欢
@@ -68,7 +69,7 @@
* @throws VciBaseException 鏌ヨ鏉′欢鍜屽垎椤靛嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
*/
@Override
- public DataGrid<CodeClassifyProcessTempVO> gridCodeClassifyProcessTemp(Map<String, String> conditionMap, PageHelper pageHelper) throws VciBaseException {
+ public IPage<CodeClassifyProcessTempVO> gridCodeClassifyProcessTemp(Map<String, String> conditionMap, PageHelper pageHelper) throws VciBaseException {
Query query = new Query();
if (pageHelper == null) {
pageHelper = new PageHelper(-1);
@@ -81,14 +82,15 @@
CodeClassifyProcessTemp codeClassifyProcessTemp = new CodeClassifyProcessTemp();
BeanMap beanMap = BeanMap.create(codeClassifyProcessTemp);
beanMap.putAll(conditionMap);
-
IPage<CodeClassifyProcessTemp> doList = codeClassifyProcessTempMapper.selectPage(Condition.getPage(query), Condition.getQueryWrapper(codeClassifyProcessTemp));
- DataGrid<CodeClassifyProcessTempVO> dataGrid=new DataGrid<>();
+ IPage<CodeClassifyProcessTempVO> pageList = new Page<CodeClassifyProcessTempVO>();
+ //DataGrid<CodeClassifyProcessTempVO> dataGrid=new DataGrid<>();
if (!CollectionUtils.isEmpty(doList.getRecords())) {
- dataGrid.setData(codeClassifyProcessTempDO2VOs(doList.getRecords()));
- dataGrid.setTotal(VciBaseUtil.getInt(String.valueOf(codeClassifyProcessTempMapper.selectCount(Condition.getQueryWrapper(codeClassifyProcessTemp)))));
+ pageList.setRecords(codeClassifyProcessTempDO2VOs(doList.getRecords()));
+ //鍒嗛〉鍙傛暟杞埌pageVO瀵硅薄
+ pageList = PageDO2PageVO.pageDO2PageVO(doList,pageList);
}
- return dataGrid;
+ return pageList;
}
/**
@@ -224,7 +226,7 @@
* @throws VciBaseException 鏌ヨ鏉′欢鍜屽垎椤靛嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
*/
@Override
- public DataGrid<CodeClassifyProcessTempVO> refDataGridCodeClassifyProcessTemp(Map<String, String> conditionMap, PageHelper pageHelper) throws VciBaseException{
+ public IPage<CodeClassifyProcessTempVO> refDataGridCodeClassifyProcessTemp(Map<String, String> conditionMap, PageHelper pageHelper) throws VciBaseException{
if(conditionMap == null){
conditionMap = new HashMap<String, String>();
}
--
Gitblit v1.9.3