From b01b199ed591996228250af3868ca6157f47123b Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Tue, 5 Nov 2024 18:03:12 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E8=B4=AD=E6=8E=A5=E5=8F=A3=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/PurchaseCheckDetailsController.java | 2 +- .../purchase/domain/dto/PurchaseCheckFileDto.java | 8 ++++++++ .../material/purchase/mapper/PurchaseCheckFileMapper.java | 4 ++-- .../purchase/service/IPurchaseCheckDetailsService.java | 2 +- .../service/impl/PurchaseCheckDetailsServiceImpl.java | 6 +++--- .../mapper/material/purchase/PurchaseCheckFileMapper.xml | 2 +- 6 files changed, 16 insertions(+), 8 deletions(-) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/controller/PurchaseCheckDetailsController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/controller/PurchaseCheckDetailsController.java index 287b0407..5152bf8f 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/controller/PurchaseCheckDetailsController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/controller/PurchaseCheckDetailsController.java @@ -121,7 +121,7 @@ public class PurchaseCheckDetailsController extends BaseController { @GetMapping("/fileList") @SysLog(title = "新购验收任务明细报告查询", businessType = OperaType.QUERY, module = "物资新购->根据任务id查询物资报告附件") public AjaxResult getFileList(PurchaseCheckFileDto purchaseCheckFileDto) { - return success(purchaseCheckDetailsService.selectPurchaseCheckFileListByTaskId(Long.valueOf(purchaseCheckFileDto.getTaskId()), purchaseCheckFileDto.getTypeId())); + return success(purchaseCheckDetailsService.selectPurchaseCheckFileListByTaskType(purchaseCheckFileDto.getTaskType(), purchaseCheckFileDto.getTypeId())); } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/dto/PurchaseCheckFileDto.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/dto/PurchaseCheckFileDto.java index 290c139b..281b6e04 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/dto/PurchaseCheckFileDto.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/dto/PurchaseCheckFileDto.java @@ -31,6 +31,14 @@ public class PurchaseCheckFileDto { @NotBlank(message = "任务ID不能为空") private String taskId; + @ApiModelProperty(value = "任务类型") + @NotBlank(message = "任务类型不能为空") + private Long taskType; + + @ApiModelProperty(value = "文件类型") + @NotBlank(message = "文件类型不能为空") + private String fileType; + @ApiModelProperty(value = "物资类型ID") @NotNull(message = "物资类型ID不能为空") private Long typeId; diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/mapper/PurchaseCheckFileMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/mapper/PurchaseCheckFileMapper.java index c4b4afc6..749f1cb3 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/mapper/PurchaseCheckFileMapper.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/mapper/PurchaseCheckFileMapper.java @@ -15,10 +15,10 @@ public interface PurchaseCheckFileMapper { /** * 根据任务id查询新购验收任务详细报告列表--Join查询 - * @param taskId 任务id + * @param taskType 任务id * @param typeId 规格id */ - List selectPurchaseCheckFileListByTaskId(@Param("taskId") Long taskId, @Param("typeId") Long typeId); + List selectPurchaseCheckFileListByTaskType(@Param("taskType") Long taskType, @Param("typeId") Long typeId); /** diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/IPurchaseCheckDetailsService.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/IPurchaseCheckDetailsService.java index 924732b3..83c73cd7 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/IPurchaseCheckDetailsService.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/IPurchaseCheckDetailsService.java @@ -34,7 +34,7 @@ public interface IPurchaseCheckDetailsService { * 根据任务ID查询报告附件列表 * @param taskId 任务id */ - List selectPurchaseCheckFileListByTaskId(Long taskId, Long typeId); + List selectPurchaseCheckFileListByTaskType(Long taskId, Long typeId); /** * 新增报告附件 diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckDetailsServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckDetailsServiceImpl.java index 55aded46..b390ab61 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckDetailsServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckDetailsServiceImpl.java @@ -54,12 +54,12 @@ public class PurchaseCheckDetailsServiceImpl implements IPurchaseCheckDetailsSer /** * 根据任务ID查询报告附件列表 * - * @param taskId 任务id + * @param taskType 任务类型 */ @Override - public List selectPurchaseCheckFileListByTaskId(Long taskId, Long typeId) { + public List selectPurchaseCheckFileListByTaskType(Long taskType, Long typeId) { try { - return purchaseCheckFileMapper.selectPurchaseCheckFileListByTaskId(taskId, typeId); + return purchaseCheckFileMapper.selectPurchaseCheckFileListByTaskType(taskType, typeId); } catch (Exception e) { throw new RuntimeException("SQL执行错误:" + e.getMessage()); } diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseCheckFileMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseCheckFileMapper.xml index 8cdd713b..88299788 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseCheckFileMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseCheckFileMapper.xml @@ -25,7 +25,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" -