From d92a626d736b978a1538a557ed4a1c066e449fca Mon Sep 17 00:00:00 2001 From: liangqitao <12345678> Date: Fri, 7 Jan 2022 09:40:37 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug#46849?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PayWorkingGroupDataFileController.java | 31 +++++++++---------- .../mapper/PayWorkingGroupDataFileMapper.java | 10 ++++++ .../xml/PayWorkingGroupDataFileMapper.xml | 13 +++++++- .../IPayWorkingGroupDataFileService.java | 10 ++++++ .../PayWorkingGroupDataFileServiceImpl.java | 5 +++ 5 files changed, 52 insertions(+), 17 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupDataFileController.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupDataFileController.java index c67142e9..254820f8 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupDataFileController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupDataFileController.java @@ -1,15 +1,6 @@ package com.jero.project.controller; -import java.io.*; -import java.util.*; -import java.util.stream.Collectors; -import java.util.zip.ZipEntry; -import java.util.zip.ZipOutputStream; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; 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.jero.common.api.vo.Result; @@ -17,7 +8,6 @@ import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.exception.JeroBootException; import com.jero.common.service.RolePermissionService; import com.jero.common.system.base.controller.JeroController; -import com.jero.common.system.query.QueryGenerator; import com.jero.common.system.vo.LoginUser; import com.jero.common.util.ValidUtil; import com.jero.common.util.oConvertUtils; @@ -28,6 +18,8 @@ import com.jero.project.entity.PayWorkingGroup; import com.jero.project.entity.PayWorkingGroupDataFile; import com.jero.project.service.IPayWorkingGroupDataFileService; import com.jero.project.service.IPayWorkingGroupService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; @@ -37,8 +29,15 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.*; import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.*; +import java.util.*; +import java.util.stream.Collectors; +import java.util.zip.ZipEntry; +import java.util.zip.ZipOutputStream; /** * @Description: 资料维护 @@ -303,11 +302,11 @@ public class PayWorkingGroupDataFileController extends JeroController queryWrapper = QueryGenerator.initQueryWrapper(payWorkingGroupDataFile, request.getParameterMap()); - + if(!StringUtils.isBlank(payWorkingGroupDataFile.getFileName())){ + payWorkingGroupDataFile.setFileName(oConvertUtils.replaceAllPercent(payWorkingGroupDataFile.getFileName())); + } // Step.2 获取导出数据 - List pageList = payWorkingGroupDataFileService.list(queryWrapper); + List pageList = payWorkingGroupDataFileService.queryListExport(payWorkingGroupDataFile); List exportList = null; // 过滤选中数据 diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupDataFileMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupDataFileMapper.java index 061e7aad..586153e1 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupDataFileMapper.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupDataFileMapper.java @@ -35,4 +35,14 @@ public interface PayWorkingGroupDataFileMapper extends BaseMapper queryList(@Param("projectId") String projectId,@Param("projectType") Integer projectType); + + /** + * @Description 分页列表 + * @Author lqt + * @Date 2021/9/16 + * @Param + * @Return + * @Exception + */ + List queryListExport(@Param("payWorkingGroupDataFile") PayWorkingGroupDataFile payWorkingGroupDataFile); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupDataFileMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupDataFileMapper.xml index 46622c29..77b974df 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupDataFileMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupDataFileMapper.xml @@ -37,4 +37,15 @@ LEFT JOIN oss_file osf ON pwgdf.file_id = osf.id WHERE project_id = #{projectId} AND project_type = #{projectType} - \ No newline at end of file + + diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupDataFileService.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupDataFileService.java index 565e5ba2..8c50f83c 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupDataFileService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupDataFileService.java @@ -43,4 +43,14 @@ public interface IPayWorkingGroupDataFileService extends IService queryListExport(PayWorkingGroupDataFile payWorkingGroupDataFile); + } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupDataFileServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupDataFileServiceImpl.java index 84e4d0f3..f36f266d 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupDataFileServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupDataFileServiceImpl.java @@ -128,4 +128,9 @@ public class PayWorkingGroupDataFileServiceImpl extends ServiceImpl queryListExport(PayWorkingGroupDataFile payWorkingGroupDataFile) { + return payWorkingGroupDataFileMapper.queryListExport(payWorkingGroupDataFile); + } }