From ae2265b47fce6358e427b467091a7cf91df93e4e Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 13 三月 2025 10:16:53 +0800
Subject: [PATCH] 代码提交
---
smartor/src/main/resources/mapper/smartor/ServiceTaskMapper.xml | 2 +-
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedOperationController.java | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedOperationController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedOperationController.java
index 52eba37..e513751 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedOperationController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedOperationController.java
@@ -42,8 +42,8 @@
*/
@ApiOperation("鏌ヨ鎮ｈ�呮墜鏈褰曞垪琛�")
//@PreAuthorize("@ss.hasPermi('smartor:operation:list')")
- @GetMapping("/list")
- public TableDataInfo list(PatMedOperation patMedOperation)
+ @PostMapping("/list")
+ public TableDataInfo list(@RequestBody PatMedOperation patMedOperation)
{
startPage();
List<PatMedOperation> list = patMedOperationService.selectPatMedOperationList(patMedOperation);
diff --git a/smartor/src/main/resources/mapper/smartor/ServiceTaskMapper.xml b/smartor/src/main/resources/mapper/smartor/ServiceTaskMapper.xml
index 72235d9..47d8fd3 100644
--- a/smartor/src/main/resources/mapper/smartor/ServiceTaskMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/ServiceTaskMapper.xml
@@ -332,7 +332,7 @@
<select id="selectServiceTaskByTaskid" parameterType="Long" resultMap="ServiceTaskResult">
<include refid="selectServiceTaskVo"/>
- where taskid = #{taskid}
+ where taskid = #{taskid} and del_flag=0
</select>
<insert id="insertServiceTask" parameterType="com.smartor.domain.ServiceTask" useGeneratedKeys="true"
--
Gitblit v1.9.3