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

资料导出

Browse Source
This commit is contained in:
zhangqinlin
2021-09-02 18:17:32 +08:00
parent e5a4e25f03
commit 3eabb6cda2
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayDataDirectoryController.java
+7 -7
View File
@@ -43,12 +43,12 @@ import io.swagger.annotations.ApiOperation;
public class PayDataDirectoryController extends JeroController<PayDataDirectory, IPayDataDirectoryService> { public class PayDataDirectoryController extends JeroController<PayDataDirectory, IPayDataDirectoryService> {
@Autowired @Autowired
private IPayDataDirectoryService payDataDirectoryService; private IPayDataDirectoryService payDataDirectoryService;
@Resource // @Resource
private PayDataDirectoryMapper payDataDirectoryMapper; // private PayDataDirectoryMapper payDataDirectoryMapper;
ArrayList<String> list = new ArrayList<>(); ArrayList<String> list = new ArrayList<>();
ArrayList<PayDataDirectory> list2 = new ArrayList<>(); ArrayList<PayDataDirectory> list2 = new ArrayList<>();
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); LoginUser sysUser = null;//(LoginUser) SecurityUtils.getSubject().getPrincipal();
/** /**
* 资料目录树 * 资料目录树
@@ -108,7 +108,7 @@ public class PayDataDirectoryController extends JeroController<PayDataDirectory,
lambdaQueryWrapper.eq(PayDataDirectory::getParentId, payDataDirectoryDTO.getParentId()); lambdaQueryWrapper.eq(PayDataDirectory::getParentId, payDataDirectoryDTO.getParentId());
lambdaQueryWrapper.eq(PayDataDirectory::getType, 1); lambdaQueryWrapper.eq(PayDataDirectory::getType, 1);
lambdaQueryWrapper.eq(PayDataDirectory::getCreateBy, sysUser.getUsername()); lambdaQueryWrapper.eq(PayDataDirectory::getCreateBy, sysUser.getUsername());
List<PayDataDirectory> payDataDirectories = payDataDirectoryMapper.selectList(lambdaQueryWrapper); List<PayDataDirectory> payDataDirectories = null;//payDataDirectoryMapper.selectList(lambdaQueryWrapper);
for(PayDataDirectory PayDataDirectory :payDataDirectories){ for(PayDataDirectory PayDataDirectory :payDataDirectories){
if(PayDataDirectory.getName().equals(payDataDirectoryDTO.getName())){ if(PayDataDirectory.getName().equals(payDataDirectoryDTO.getName())){
return Result.error("同级文件名重复，请重新输入。"); return Result.error("同级文件名重复，请重新输入。");
@@ -156,7 +156,7 @@ public class PayDataDirectoryController extends JeroController<PayDataDirectory,
public Result<?> findall() { public Result<?> findall() {
LambdaQueryWrapper<PayDataDirectory> lambdaQueryWrapper = new LambdaQueryWrapper(); LambdaQueryWrapper<PayDataDirectory> lambdaQueryWrapper = new LambdaQueryWrapper();
lambdaQueryWrapper.eq(PayDataDirectory::getType, 1); lambdaQueryWrapper.eq(PayDataDirectory::getType, 1);
List<PayDataDirectory> payDataDirectories = payDataDirectoryMapper.selectList(lambdaQueryWrapper); List<PayDataDirectory> payDataDirectories = null;//payDataDirectoryMapper.selectList(lambdaQueryWrapper);
return Result.OK(payDataDirectories); return Result.OK(payDataDirectories);
} }
@@ -167,7 +167,7 @@ public class PayDataDirectoryController extends JeroController<PayDataDirectory,
lambdaQueryWrapper.eq(PayDataDirectory::getParentId, id); lambdaQueryWrapper.eq(PayDataDirectory::getParentId, id);
lambdaQueryWrapper.eq(PayDataDirectory::getType, 1); lambdaQueryWrapper.eq(PayDataDirectory::getType, 1);
lambdaQueryWrapper.eq(PayDataDirectory::getCreateBy, sysUser.getUsername()); lambdaQueryWrapper.eq(PayDataDirectory::getCreateBy, sysUser.getUsername());
List<PayDataDirectory> payDataDirectories = payDataDirectoryMapper.selectList(lambdaQueryWrapper); List<PayDataDirectory> payDataDirectories = null;//payDataDirectoryMapper.selectList(lambdaQueryWrapper);
//判断有无子文件夹 //判断有无子文件夹
if(payDataDirectories.size()>0){ if(payDataDirectories.size()>0){
for (PayDataDirectory payDataDirector : payDataDirectories) { for (PayDataDirectory payDataDirector : payDataDirectories) {
@@ -190,7 +190,7 @@ public class PayDataDirectoryController extends JeroController<PayDataDirectory,
queryWrapper.like(StringUtils.isNotBlank(name), "name", name); queryWrapper.like(StringUtils.isNotBlank(name), "name", name);
queryWrapper.eq("type",1); queryWrapper.eq("type",1);
queryWrapper.eq("create_by",sysUser.getUsername()); queryWrapper.eq("create_by",sysUser.getUsername());
List<PayDataDirectory> byName = payDataDirectoryMapper.selectList(queryWrapper); List<PayDataDirectory> byName = null;//payDataDirectoryMapper.selectList(queryWrapper);
for(PayDataDirectory payDataDirectory:byName) { for(PayDataDirectory payDataDirectory:byName) {
list2.add(payDataDirectory); list2.add(payDataDirectory);
findToTree(payDataDirectory); findToTree(payDataDirectory);
jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayDataFileController.java
+3 -2
View File
@@ -2,6 +2,7 @@ package com.jero.data.controller;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
@@ -40,10 +41,10 @@ public class PayDataFileController extends JeroController<PayDataFile, IPayDataF
@Autowired @Autowired
private IPayDataFileService payDataFileService; private IPayDataFileService payDataFileService;
@Autowired @Resource
private PayDataFileMapper payDataFileMapper; private PayDataFileMapper payDataFileMapper;
@Autowired @Resource
private OSSFileMapper ossFileMapper; private OSSFileMapper ossFileMapper;
/** /**
* 分页列表查询 * 分页列表查询