From c819c46860fa95b5f0183aa48004f1c017401d98 Mon Sep 17 00:00:00 2001 From: zhangqinlin <1500920753@qq.com> Date: Wed, 29 Sep 2021 16:42:42 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=A8=E6=89=80=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...kingGroupDistributionRecordController.java | 39 +++++++++++----- .../project/entity/DownloadFileRecord.java | 32 ++++++++++++++ ...yWorkingGroupDistributionRecordMapper.java | 11 +++++ ...ayWorkingGroupDistributionRecordMapper.xml | 44 +++++++++++++++++++ ...WorkingGroupDistributionRecordService.java | 11 +++++ ...ingGroupDistributionRecordServiceImpl.java | 14 ++++-- 6 files changed, 136 insertions(+), 15 deletions(-) create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/project/entity/DownloadFileRecord.java diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupDistributionRecordController.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupDistributionRecordController.java index 9ac9e1af..1fd4fb16 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupDistributionRecordController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupDistributionRecordController.java @@ -20,6 +20,7 @@ import com.jero.data.entity.PayCaseCommitteeSubitem; import com.jero.data.service.IPayCaseCommitteeSubitemService; import com.jero.modules.message.handle.impl.EmailSendMsgHandle; import com.jero.project.common.PayProjectCommon; +import com.jero.project.entity.DownloadFileRecord; import com.jero.project.entity.PayWorkingGroupDistributionRecord; import com.jero.project.entity.PayWorkingGroupSubItem; import com.jero.project.service.IPayWorkingGroupDistributionRecordService; @@ -53,23 +54,33 @@ public class PayWorkingGroupDistributionRecordController extends JeroController< private IPayCaseCommitteeSubitemService payCaseCommitteeSubitemService; /** - * 分页列表查询 + * 企业端-资料下载列表查询 * - * @param payWorkingGroupDistributionRecord + * @param fileName * @param pageNo * @param pageSize - * @param req + * @param * @return */ -// @ApiOperation(value="资料分发-分页列表查询", notes="资料分发-分页列表查询") -// @GetMapping(value = "/list") - public Result queryPageList(PayWorkingGroupDistributionRecord payWorkingGroupDistributionRecord, + @ApiOperation(value="企业端-资料下载列表查询", notes="企业端-资料下载列表查询") + @GetMapping(value = "/listForFile") + public Result queryPageList(@RequestParam(name="fileName",required = false) String fileName, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - HttpServletRequest req) { - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(payWorkingGroupDistributionRecord, req.getParameterMap()); - Page page = new Page(pageNo, pageSize); - IPage pageList = payWorkingGroupDistributionRecordService.page(page, queryWrapper); + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize + ) { + Page page = new Page(pageNo, pageSize); + IPage pageList = payWorkingGroupDistributionRecordService.pageFileList(page,fileName); + if(!pageList.getRecords().isEmpty()) { + for (DownloadFileRecord s : pageList.getRecords()) { + if (s.getFileType().equals("1")) { + s.setFileType("工作组"); + } else if (s.getFileType().equals("2")) { + s.setFileType("分标委"); + } else { + s.setFileType("会议"); + } + } + } return Result.OK(pageList); } @@ -127,6 +138,7 @@ public class PayWorkingGroupDistributionRecordController extends JeroController< * @param payWorkingGroupDistributionRecord * @return */ + @AutoLog(value = "资料分发-分发") @RequiresPermissions("fileMaintenance:distribute") @ApiOperation(value="资料分发-分发", notes="资料分发-分发") @PostMapping(value = "/add") @@ -141,6 +153,7 @@ public class PayWorkingGroupDistributionRecordController extends JeroController< * @param payWorkingGroupDistributionRecord * @return */ + @AutoLog(value = "资料分发-批量分发") @RequiresPermissions("fileMaintenance:batchDistribute") @ApiOperation(value="资料分发-分发", notes="资料分发-批量分发") @PostMapping(value = "/addBatch") @@ -155,6 +168,7 @@ public class PayWorkingGroupDistributionRecordController extends JeroController< * @param payWorkingGroupDistributionRecord * @return */ +// @AutoLog(value = "资料分发-编辑") // @ApiOperation(value="资料分发-编辑", notes="资料分发-编辑") // @PutMapping(value = "/edit") public Result edit(@RequestBody PayWorkingGroupDistributionRecord payWorkingGroupDistributionRecord) { @@ -168,6 +182,7 @@ public class PayWorkingGroupDistributionRecordController extends JeroController< * @param id * @return */ +// @AutoLog(value = "资料分发-通过id删除") // @ApiOperation(value="资料分发-通过id删除", notes="资料分发-通过id删除") // @DeleteMapping(value = "/delete") public Result delete(@RequestParam(name="id") String id) { @@ -181,6 +196,7 @@ public class PayWorkingGroupDistributionRecordController extends JeroController< * @param ids * @return */ +// @AutoLog(value = "资料分发-批量删除") // @ApiOperation(value="资料分发-批量删除", notes="资料分发-批量删除") // @DeleteMapping(value = "/deleteBatch") public Result deleteBatch(@RequestParam(name="ids") String ids) { @@ -194,6 +210,7 @@ public class PayWorkingGroupDistributionRecordController extends JeroController< * @param id * @return */ +// @AutoLog(value = "资料分发-通过id查询") // @ApiOperation(value="资料分发-通过id查询", notes="资料分发-通过id查询") // @GetMapping(value = "/queryById") public Result queryById(@RequestParam(name="id") String id) { diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/DownloadFileRecord.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/DownloadFileRecord.java new file mode 100644 index 00000000..ec2c5df9 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/DownloadFileRecord.java @@ -0,0 +1,32 @@ +package com.jero.project.entity; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * @author zql + * @date 2021/9/29 10:34 + */ +@Data +@ApiModel(value="资料下载列表文件", description="资料下载列表文件") +public class DownloadFileRecord { + + @ApiModelProperty(value = "文件id") + private String fileId; + + @ApiModelProperty(value = "文件名") + private String fileName; + + @ApiModelProperty(value = "文件类型") + private String fileType; + + @ApiModelProperty(value = "文件来源") + private String fileCome; + + @ApiModelProperty(value = "上传时间") + private Date uploadTime; + +} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupDistributionRecordMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupDistributionRecordMapper.java index 66fe04d0..8f65a82f 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupDistributionRecordMapper.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupDistributionRecordMapper.java @@ -1,7 +1,11 @@ package com.jero.project.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.jero.project.entity.DownloadFileRecord; import com.jero.project.entity.PayWorkingGroupDistributionRecord; +import org.apache.ibatis.annotations.Param; /** * @Description: pay_working_group_distribution_record @@ -11,4 +15,11 @@ import com.jero.project.entity.PayWorkingGroupDistributionRecord; */ public interface PayWorkingGroupDistributionRecordMapper extends BaseMapper { + /** + * 企业端资料下载分页列表查询 + * @param page + * @param fileName + * @return + */ + IPage pageFileList(Page page,@Param("fileName") String fileName); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupDistributionRecordMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupDistributionRecordMapper.xml index bef1ff90..2acef09c 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupDistributionRecordMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupDistributionRecordMapper.xml @@ -1,5 +1,49 @@ + \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupDistributionRecordService.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupDistributionRecordService.java index 8dd7b1cc..2ce66db1 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupDistributionRecordService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupDistributionRecordService.java @@ -1,7 +1,10 @@ package com.jero.project.service; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; +import com.jero.project.entity.DownloadFileRecord; import com.jero.project.entity.PayWorkingGroupDistributionRecord; import org.springframework.web.bind.annotation.RequestBody; @@ -31,4 +34,12 @@ public interface IPayWorkingGroupDistributionRecordService extends IService pageFileList(Page page, String fileName); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupDistributionRecordServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupDistributionRecordServiceImpl.java index 1540a464..64febebd 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupDistributionRecordServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupDistributionRecordServiceImpl.java @@ -3,6 +3,8 @@ package com.jero.project.service.impl; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.common.dto.SendMessageDTO; import com.jero.common.enums.CompanyMessageEnums; @@ -19,10 +21,7 @@ import com.jero.data.service.IPayCaseCommitteeSubitemService; import com.jero.modules.oss.entity.OSSFile; import com.jero.modules.oss.service.IOSSFileService; import com.jero.project.common.PayProjectCommon; -import com.jero.project.entity.PayWorkingGroup; -import com.jero.project.entity.PayWorkingGroupDataFile; -import com.jero.project.entity.PayWorkingGroupDistributionRecord; -import com.jero.project.entity.PayWorkingGroupSubItem; +import com.jero.project.entity.*; import com.jero.project.mapper.PayWorkingGroupDistributionRecordMapper; import com.jero.project.service.IPayWorkingGroupDataFileService; import com.jero.project.service.IPayWorkingGroupDistributionRecordService; @@ -72,6 +71,8 @@ public class PayWorkingGroupDistributionRecordServiceImpl extends ServiceImpl pageFileList(Page page, String fileName) { + return payWorkingGroupDistributionRecordMapper.pageFileList(page,fileName); + } }