diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/TaskQuestController.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/TaskQuestController.java index 99d75f204..fbd284ab7 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/TaskQuestController.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/TaskQuestController.java @@ -172,7 +172,7 @@ public class TaskQuestController extends BladeController { @GetMapping("/exportContrastStockInfo") @ApiOperationSupport(order = 1) @ApiOperation(value = "盘点任务 未盘点数据导出", notes = "传入id") - public void exportContrastStockInfo( HttpServletResponse response,QuestDetailDTO questDetailDTO,Query query){ + public void exportContrastStockInfo( HttpServletResponse response,QuestDetailDTO questDetailDTO){ // IPage page = taskQuestService.selectTaskDataInfo(questDetailDTO,Condition.getPage(query)); List data =taskQuestService.exportContrastStockInfo(questDetailDTO); diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/TaskQuestMapper.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/TaskQuestMapper.java index c2f5bde8b..b860c9ac5 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/TaskQuestMapper.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/TaskQuestMapper.java @@ -189,7 +189,7 @@ public interface TaskQuestMapper extends BaseMapper { List findStockList(@Param("param") TaskSearchDTO taskSearchDTO); - List selectContrastStockInfo(@Param("questNum") String questNum); + List selectContrastStockInfo(@Param("questNum") String questNum,@Param("questStatus")Integer questStatus); QuestDetailEntity findEntityById(@Param("questNum") String questNum,@Param("taskID") Long taskId); diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/TaskQuestMapper.xml b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/TaskQuestMapper.xml index 4fd2f582e..3ab2f39d1 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/TaskQuestMapper.xml +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/TaskQuestMapper.xml @@ -657,22 +657,28 @@