LK/income_payments_management
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/branch2022-1-4' into branch2022-1-4

Browse Source
This commit is contained in:
zhaoxiao
2022-01-07 09:42:32 +08:00
parent a7e562f6ae d92a626d73
commit 0d7845d789
5 changed files with 52 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupDataFileController.java
+15 -16
View File
@@ -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<PayWorking
throw new JeroBootException("数据权限不足！");
}
}
// Step.1 组装查询条件
QueryWrapper<PayWorkingGroupDataFile> queryWrapper = QueryGenerator.initQueryWrapper(payWorkingGroupDataFile, request.getParameterMap());
if(!StringUtils.isBlank(payWorkingGroupDataFile.getFileName())){
payWorkingGroupDataFile.setFileName(oConvertUtils.replaceAllPercent(payWorkingGroupDataFile.getFileName()));
}
// Step.2 获取导出数据
List<PayWorkingGroupDataFile> pageList = payWorkingGroupDataFileService.list(queryWrapper);
List<PayWorkingGroupDataFile> pageList = payWorkingGroupDataFileService.queryListExport(payWorkingGroupDataFile);
List<PayWorkingGroupDataFile> exportList = null;
// 过滤选中数据
jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupDataFileMapper.java
+10
View File
@@ -35,4 +35,14 @@ public interface PayWorkingGroupDataFileMapper extends BaseMapper<PayWorkingGrou
* @Exception
*/
List<PayWorkingGroupDataFile> queryList(@Param("projectId") String projectId,@Param("projectType") Integer projectType);
/**
* @Description 分页列表
* @Author lqt
* @Date 2021/9/16
* @Param
* @Return
* @Exception
*/
List<PayWorkingGroupDataFile> queryListExport(@Param("payWorkingGroupDataFile") PayWorkingGroupDataFile payWorkingGroupDataFile);
}
jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupDataFileMapper.xml
+12 -1
View File
@@ -37,4 +37,15 @@
LEFT JOIN oss_file osf ON pwgdf.file_id = osf.id
WHERE project_id = #{projectId} AND project_type = #{projectType}
</select>
</mapper>
<select id="queryListExport" resultType="com.jero.project.entity.PayWorkingGroupDataFile">
SELECT
pwgdf.id,
pwgdf.file_id
FROM pay_working_group_data_file pwgdf
LEFT JOIN oss_file osf ON pwgdf.file_id = osf.id
where project_id = #{payWorkingGroupDataFile.projectId} AND project_type = #{payWorkingGroupDataFile.projectType}
<if test="payWorkingGroupDataFile.fileName != null and payWorkingGroupDataFile.fileName != ''">
AND osf.file_name LIKE CONCAT('%',CONCAT(#{payWorkingGroupDataFile.fileName},'%'))
</if>
</select>
</mapper>
jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupDataFileService.java
+10
View File
@@ -43,4 +43,14 @@ public interface IPayWorkingGroupDataFileService extends IService<PayWorkingGrou
*/
void wxDownloadFile(String fileId,String userId);
/**
* @Description 列表导出
* @Author lqt
* @Date 2021/9/16
* @Param
* @Return
* @Exception
*/
List<PayWorkingGroupDataFile> queryListExport(PayWorkingGroupDataFile payWorkingGroupDataFile);
}
jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupDataFileServiceImpl.java
+5
View File
@@ -128,4 +128,9 @@ public class PayWorkingGroupDataFileServiceImpl extends ServiceImpl<PayWorkingGr
updateOSSFile.set(OSSFile::getDownloadNumber,downloadNumber);
iossFileService.update(updateOSSFile);
}
@Override
public List<PayWorkingGroupDataFile> queryListExport(PayWorkingGroupDataFile payWorkingGroupDataFile) {
return payWorkingGroupDataFileMapper.queryListExport(payWorkingGroupDataFile);
}
}