资料维护部分开发
This commit is contained in:
zhangqinlin
+9
-1
@@ -13,6 +13,7 @@ import com.baomidou.mybatisplus.core.toolkit.StringUtils;
|
||||
import com.jero.common.api.vo.Result;
|
||||
import com.jero.common.aspect.annotation.AutoLog;
|
||||
import com.jero.common.system.base.controller.JeroController;
|
||||
import com.jero.common.system.vo.LoginUser;
|
||||
import com.jero.data.entity.DTO.PayDataDirectoryDTO;
|
||||
import com.jero.data.entity.PayDataDirectory;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
@@ -20,6 +21,7 @@ import com.jero.data.entity.DirectoryToTree;
|
||||
import com.jero.data.mapper.PayDataDirectoryMapper;
|
||||
import com.jero.data.service.IPayDataDirectoryService;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.apache.shiro.SecurityUtils;
|
||||
import org.springframework.beans.BeanUtils;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.util.ObjectUtils;
|
||||
@@ -46,6 +48,7 @@ public class PayDataDirectoryController extends JeroController<PayDataDirectory,
|
||||
|
||||
ArrayList<String> list = new ArrayList<>();
|
||||
ArrayList<PayDataDirectory> list2 = new ArrayList<>();
|
||||
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
||||
|
||||
/**
|
||||
* 资料目录树
|
||||
@@ -58,6 +61,7 @@ public class PayDataDirectoryController extends JeroController<PayDataDirectory,
|
||||
public Result<?> tree() {
|
||||
QueryWrapper<PayDataDirectory> queryWrapper = new QueryWrapper();
|
||||
queryWrapper.eq("type",1);
|
||||
queryWrapper.eq("create_by",sysUser.getUsername());
|
||||
List<PayDataDirectory> list = payDataDirectoryService.list(queryWrapper);
|
||||
List<DirectoryToTree> collect = list.stream()
|
||||
.filter(payDataDirectory -> "0".equals(payDataDirectory.getParentId()))
|
||||
@@ -103,6 +107,7 @@ public class PayDataDirectoryController extends JeroController<PayDataDirectory,
|
||||
LambdaQueryWrapper<PayDataDirectory> lambdaQueryWrapper = new LambdaQueryWrapper();
|
||||
lambdaQueryWrapper.eq(PayDataDirectory::getParentId, payDataDirectoryDTO.getParentId());
|
||||
lambdaQueryWrapper.eq(PayDataDirectory::getType, 1);
|
||||
lambdaQueryWrapper.eq(PayDataDirectory::getCreateBy, sysUser.getUsername());
|
||||
List<PayDataDirectory> payDataDirectories = payDataDirectoryMapper.selectList(lambdaQueryWrapper);
|
||||
for(PayDataDirectory PayDataDirectory :payDataDirectories){
|
||||
if(PayDataDirectory.getName().equals(payDataDirectoryDTO.getName())){
|
||||
@@ -123,7 +128,7 @@ public class PayDataDirectoryController extends JeroController<PayDataDirectory,
|
||||
*/
|
||||
@AutoLog(value = "资料目录管理-批量删除")
|
||||
@ApiOperation(value = "资料目录管理-批量删除", notes = "资料目录管理-批量删除")
|
||||
@PostMapping(value = "/deleteBatch")
|
||||
@GetMapping(value = "/deleteBatch")
|
||||
public Result<?> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
|
||||
List<String> ides = new ArrayList<>(Arrays.asList(ids.split(",")));
|
||||
for (String id : ides) {
|
||||
@@ -161,6 +166,7 @@ public class PayDataDirectoryController extends JeroController<PayDataDirectory,
|
||||
LambdaQueryWrapper<PayDataDirectory> lambdaQueryWrapper = new LambdaQueryWrapper();
|
||||
lambdaQueryWrapper.eq(PayDataDirectory::getParentId, id);
|
||||
lambdaQueryWrapper.eq(PayDataDirectory::getType, 1);
|
||||
lambdaQueryWrapper.eq(PayDataDirectory::getCreateBy, sysUser.getUsername());
|
||||
List<PayDataDirectory> payDataDirectories = payDataDirectoryMapper.selectList(lambdaQueryWrapper);
|
||||
//判断有无子文件夹
|
||||
if(payDataDirectories.size()>0){
|
||||
@@ -183,6 +189,7 @@ public class PayDataDirectoryController extends JeroController<PayDataDirectory,
|
||||
QueryWrapper queryWrapper = new QueryWrapper();
|
||||
queryWrapper.like(StringUtils.isNotBlank(name), "name", name);
|
||||
queryWrapper.eq("type",1);
|
||||
queryWrapper.eq("create_by",sysUser.getUsername());
|
||||
List<PayDataDirectory> byName = payDataDirectoryMapper.selectList(queryWrapper);
|
||||
for(PayDataDirectory payDataDirectory:byName) {
|
||||
list2.add(payDataDirectory);
|
||||
@@ -203,6 +210,7 @@ public class PayDataDirectoryController extends JeroController<PayDataDirectory,
|
||||
LambdaQueryWrapper<PayDataDirectory> lambdaQueryWrapper = new LambdaQueryWrapper();
|
||||
lambdaQueryWrapper.eq(PayDataDirectory::getId, payDataDirectory.getParentId());
|
||||
lambdaQueryWrapper.eq(PayDataDirectory::getType, 1);
|
||||
lambdaQueryWrapper.eq(PayDataDirectory::getCreateBy, sysUser.getUsername());
|
||||
PayDataDirectory one = payDataDirectoryService.getOne(lambdaQueryWrapper);
|
||||
if (!ObjectUtils.isEmpty(one)&&!list2.contains(one)) {
|
||||
list2.add(one);
|
||||
|
||||
+10
-4
@@ -6,6 +6,7 @@ import javax.servlet.http.HttpServletRequest;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
|
||||
import com.jero.common.api.vo.Result;
|
||||
import com.jero.common.aspect.annotation.AutoLog;
|
||||
import com.jero.common.system.base.controller.JeroController;
|
||||
@@ -49,15 +50,20 @@ public class PayDataFileController extends JeroController<PayDataFile, IPayDataF
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "资料维护（资料列表）-分页列表查询")
|
||||
@ApiOperation(value="资料维护（资料列表）-分页列表查询", notes="资料维护（资料列表）-分页列表查询")
|
||||
@AutoLog(value = "资料维护（资料列表）-根据文件夹id分页列表查询")
|
||||
@ApiOperation(value="资料维护（资料列表）-根据文件夹id分页列表查询", notes="资料维护（资料列表）-根据文件夹id分页列表查询")
|
||||
@GetMapping(value = "/list")
|
||||
public Result<?> queryPageList(
|
||||
@RequestParam(name="id",required =true) String id,
|
||||
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
|
||||
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize
|
||||
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
|
||||
@RequestParam(name="id",required =false) String fileName
|
||||
|
||||
) {
|
||||
QueryWrapper<Object> queryWrapper = new QueryWrapper<>();
|
||||
|
||||
queryWrapper.eq("pf.id",id);
|
||||
queryWrapper.eq(StringUtils.isNotBlank(fileName),"of.fileName",fileName);
|
||||
queryWrapper.orderByDesc("pf.create_time");
|
||||
Page<PayDataFile> page = new Page<>(pageNo, pageSize);
|
||||
IPage<QueryFileList2> pageList = payDataFileMapper.pageData(page, queryWrapper);
|
||||
return Result.OK(pageList);
|
||||
|
||||
+1
-84
@@ -51,83 +51,11 @@ public class PayFileDownloadRecordController extends JeroController<PayFileDownl
|
||||
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
|
||||
HttpServletRequest req) {
|
||||
QueryWrapper<PayFileDownloadRecord> queryWrapper = QueryGenerator.initQueryWrapper(payFileDownloadRecord, req.getParameterMap());
|
||||
queryWrapper.orderByDesc("createTime");
|
||||
Page<PayFileDownloadRecord> page = new Page<PayFileDownloadRecord>(pageNo, pageSize);
|
||||
IPage<PayFileDownloadRecord> pageList = payFileDownloadRecordService.page(page, queryWrapper);
|
||||
return Result.OK(pageList);
|
||||
}
|
||||
|
||||
/**
|
||||
* 添加
|
||||
*
|
||||
* @param payFileDownloadRecord
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "资料下载记录-添加")
|
||||
@ApiOperation(value="资料下载记录-添加", notes="资料下载记录-添加")
|
||||
@PostMapping(value = "/add")
|
||||
public Result<?> add(@RequestBody PayFileDownloadRecord payFileDownloadRecord) {
|
||||
payFileDownloadRecordService.save(payFileDownloadRecord);
|
||||
return Result.OK("添加成功！");
|
||||
}
|
||||
|
||||
/**
|
||||
* 编辑
|
||||
*
|
||||
* @param payFileDownloadRecord
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "资料下载记录-编辑")
|
||||
@ApiOperation(value="资料下载记录-编辑", notes="资料下载记录-编辑")
|
||||
@PutMapping(value = "/edit")
|
||||
public Result<?> edit(@RequestBody PayFileDownloadRecord payFileDownloadRecord) {
|
||||
payFileDownloadRecordService.updateById(payFileDownloadRecord);
|
||||
return Result.OK("编辑成功!");
|
||||
}
|
||||
|
||||
/**
|
||||
* 通过id删除
|
||||
*
|
||||
* @param id
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "资料下载记录-通过id删除")
|
||||
@ApiOperation(value="资料下载记录-通过id删除", notes="资料下载记录-通过id删除")
|
||||
@DeleteMapping(value = "/delete")
|
||||
public Result<?> delete(@RequestParam(name="id",required=true) String id) {
|
||||
payFileDownloadRecordService.removeById(id);
|
||||
return Result.OK("删除成功!");
|
||||
}
|
||||
|
||||
/**
|
||||
* 批量删除
|
||||
*
|
||||
* @param ids
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "资料下载记录-批量删除")
|
||||
@ApiOperation(value="资料下载记录-批量删除", notes="资料下载记录-批量删除")
|
||||
@DeleteMapping(value = "/deleteBatch")
|
||||
public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
|
||||
this.payFileDownloadRecordService.removeByIds(Arrays.asList(ids.split(",")));
|
||||
return Result.OK("批量删除成功!");
|
||||
}
|
||||
|
||||
/**
|
||||
* 通过id查询
|
||||
*
|
||||
* @param id
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "资料下载记录-通过id查询")
|
||||
@ApiOperation(value="资料下载记录-通过id查询", notes="资料下载记录-通过id查询")
|
||||
@GetMapping(value = "/queryById")
|
||||
public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
|
||||
PayFileDownloadRecord payFileDownloadRecord = payFileDownloadRecordService.getById(id);
|
||||
if(payFileDownloadRecord==null) {
|
||||
return Result.error("未找到对应数据");
|
||||
}
|
||||
return Result.OK(payFileDownloadRecord);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出excel
|
||||
@@ -140,16 +68,5 @@ public class PayFileDownloadRecordController extends JeroController<PayFileDownl
|
||||
return super.exportXls(request, payFileDownloadRecord, PayFileDownloadRecord.class, "资料下载记录");
|
||||
}
|
||||
|
||||
/**
|
||||
* 通过excel导入数据
|
||||
*
|
||||
* @param request
|
||||
* @param response
|
||||
* @return
|
||||
*/
|
||||
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
|
||||
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
|
||||
return super.importExcel(request, response, PayFileDownloadRecord.class);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -1,5 +1,14 @@
|
||||
package com.jero.util;
|
||||
|
||||
import org.apache.poi.ss.formula.functions.T;
|
||||
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
|
||||
import org.jeecgframework.poi.excel.entity.ExportParams;
|
||||
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
|
||||
import org.springframework.beans.factory.annotation.Value;
|
||||
import org.springframework.web.servlet.ModelAndView;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 金额工具类
|
||||
*
|
||||
@@ -7,6 +16,9 @@ package com.jero.util;
|
||||
* @date 2021-08-31 15:28
|
||||
*/
|
||||
public class AmountUtil {
|
||||
|
||||
@Value("${jero.path.upload}")
|
||||
private String upLoadPath;
|
||||
/**
|
||||
* 计算到账状态
|
||||
*
|
||||
@@ -30,4 +42,24 @@ public class AmountUtil {
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
/**自定义导出
|
||||
* 导出excel
|
||||
*传入 对象的list集合 对象的class对象 excel名称
|
||||
* @param
|
||||
*/
|
||||
protected ModelAndView exportListXls(List<T> object, Class<T> clazz, String title) {
|
||||
// Step.3 AutoPoi 导出Excel
|
||||
ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
|
||||
mv.addObject(NormalExcelConstants.FILE_NAME, title); //此处设置的filename无效 ,前端会重更新设置一下
|
||||
mv.addObject(NormalExcelConstants.CLASS, clazz);
|
||||
//update-begin--Author:liusq Date:20210126 for：图片导出报错，ImageBasePath未设置--------------------
|
||||
ExportParams exportParams=new ExportParams(title, title);
|
||||
exportParams.setImageBasePath(upLoadPath);
|
||||
//update-end--Author:liusq Date:20210126 for：图片导出报错，ImageBasePath未设置----------------------
|
||||
mv.addObject(NormalExcelConstants.PARAMS,exportParams);
|
||||
mv.addObject(NormalExcelConstants.DATA_LIST, null);
|
||||
return mv;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user