From cf9fac40a8e39b25ee935a743224ae6c405bbddc Mon Sep 17 00:00:00 2001 From: lty <876263681@qq.com> Date: 星期一, 24 三月 2025 19:33:39 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/jxjdzwcs' into jxjdzwcs --- src/main/java/com/zy/asrs/mapper/TaskWrkMapper.java | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/src/main/java/com/zy/asrs/mapper/TaskWrkMapper.java b/src/main/java/com/zy/asrs/mapper/TaskWrkMapper.java index 4341661..4b924b7 100644 --- a/src/main/java/com/zy/asrs/mapper/TaskWrkMapper.java +++ b/src/main/java/com/zy/asrs/mapper/TaskWrkMapper.java @@ -32,7 +32,7 @@ TaskWrk selectCrnStaWorking(@Param("crnNo") Integer crnNo, @Param("targetPoint") String targetPoint); - TaskWrk selectCrnNoWorking(@Param("crnNo") Integer crnNo,@Param("workNo") Integer workNo); + TaskWrk selectCrnNoInWorking(@Param("crnNo") Integer crnNo,@Param("workNo") Integer workNo); List<TaskWrk> selectToBeHistoryData(); @@ -40,4 +40,6 @@ List<TaskWrk> selectWorkingTask();//鑾峰彇宸ヤ綔涓殑浠诲姟 + TaskWrk selectStaWorking(Integer wrkNo); + } -- Gitblit v1.9.1