From 1713fac8ca97c63924d2f1ed08ef520a7b4a4439 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 06 二月 2026 17:34:24 +0800
Subject: [PATCH] 修改分页

---
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java |    6 ++----
 smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml                       |   26 ++++++++++----------------
 2 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java
index ef2e27a..6bdfa50 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java
@@ -86,15 +86,13 @@
      * 鏌ヨ鎮ｈ�呴殢璁夸俊鎭�
      */
     @ApiOperation("鏌ヨ鎮ｈ�呴殢璁夸俊鎭�")
-    //@PreAuthorize("@ss.hasPermi('system:taskcall:list')")
-//    @Cacheable(value = "patItem", key = "T(org.springframework.util.DigestUtils).md5DigestAsHex(#serviceSubtaskVO.toString().getBytes())", unless = "#result == null or #result.isEmpty()")
     @PostMapping("/patItem")
     public Map<String, Object> patItem(@RequestBody ServiceSubtaskVO serviceSubtaskVO) {
         if (serviceSubtaskVO.getLeavehospitaldistrictcodes() != null && serviceSubtaskVO.getLeavehospitaldistrictcodes().size() > 10) {
-            throw new BaseException("鐥呭尯鏌ヨ鏁版嵁涓嶈兘瓒呰繃10涓�");
+            throw new BaseException("鐥呭尯鏌ヨ鏁伴噺涓嶈兘瓒呰繃10涓�");
         }
         if (serviceSubtaskVO.getLeaveldeptcodes() != null && serviceSubtaskVO.getLeaveldeptcodes().size() > 10) {
-            throw new BaseException("绉戝鏌ヨ鏁版嵁涓嶈兘瓒呰繃10涓�");
+            throw new BaseException("绉戝鏌ヨ鏁伴噺涓嶈兘瓒呰繃10涓�");
         }
 
         serviceSubtaskVO.setPageNum(PageUtils.getOffset(serviceSubtaskVO.getPageNum(), serviceSubtaskVO.getPageSize()));
diff --git a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
index 2ed1573..954b1c9 100644
--- a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
@@ -230,15 +230,15 @@
             resultMap="ServiceSubtaskResult">
         <include refid="selectServiceSubtaskVo"/>
         where 1=1
-            and del_flag = 0
-            <if test="orgid != null and orgid != ''">
-                and orgid = #{orgid}
-            </if>
-            <if test="taskid != null ">and taskid = #{taskid}</if>
-            <if test="visitTime != null">
-                AND date_format(visit_time,'%y%m%d') &lt;= date_format(#{visitTime},'%y%m%d')
-            </if>
-            <if test="sendstate != null ">and sendstate = #{sendstate}</if>
+        and del_flag = 0
+        <if test="orgid != null and orgid != ''">
+            and orgid = #{orgid}
+        </if>
+        <if test="taskid != null ">and taskid = #{taskid}</if>
+        <if test="visitTime != null">
+            AND date_format(visit_time,'%y%m%d') &lt;= date_format(#{visitTime},'%y%m%d')
+        </if>
+        <if test="sendstate != null ">and sendstate = #{sendstate}</if>
 
     </select>
 
@@ -382,7 +382,6 @@
         <if test="excep != null ">and excep = #{excep}</if>
         <if test="nurseName != null ">and nurse_name = #{nurseName}</if>
         <if test="score != null">and score = #{score}</if>
-        <!--            <if test="visitCount != null">and visit_count = #{visitCount}</if>-->
         <if test="visitCount != null and visitCount == 1">
             AND visit_count = 1
         </if>
@@ -395,10 +394,6 @@
         <if test="taskGuid != null">and task_guid = #{taskGuid}</if>
         <if test="isabnormal != null">and isabnormal = #{isabnormal}</if>
         <if test="isVisitAgain != null">and is_visit_again = #{isVisitAgain}</if>
-        <!--            <if test="dateLimit != null and dateLimit = '1'"> and CURDATE() + 1 > long_send_time</if>-->
-        <!-- <if test="visitTime != null">and visit_time = #{visitTime}</if> -->
-        <!--<if test="visitDeptCode != null">and visit_dept_code = #{visitDeptCode}</if>
-        <if test="visitDeptName != null">and visit_dept_name = #{visitDeptName}</if>-->
         <if test="visitCount != null and visitCount > 1 and visitDeptCodes != null and visitDeptCodes.size() > 0">
             AND visit_dept_code IN
             <foreach collection="visitDeptCodes" item="visitDeptCodes" open="("
@@ -415,8 +410,7 @@
         <if test="sort != null  and sort==6">order by admindate desc</if>
         <if test="sort != null  and sort==7">order by visit_time asc</if>
         <if test="sort != null  and sort==8">order by visit_time desc</if>
-
-        <!-- order by update_time desc,id desc -->
+        <if test="pageSize != null  and pageNum != null">limit ${pageSize} OFFSET ${pageNum}</if>
     </select>
     <select id="getCompensateServiceSubtaskList" parameterType="com.smartor.domain.ServiceSubtaskVO"
             resultMap="ServiceSubtaskResult">

--
Gitblit v1.9.3