From 2212759d051a0f60b4f0ada73d678cf150e29c84 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 04 二月 2026 18:26:02 +0800
Subject: [PATCH] 代码提交
---
ruoyi-common/src/main/java/com/ruoyi/common/utils/PageUtils.java | 9 +++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskAnswerController.java | 1
smartor/src/main/resources/mapper/smartor/ServiceTaskMapper.xml | 2
smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml | 4
smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java | 2
smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml | 2
smartor/src/main/resources/mapper/smartor/PatMedInhospMapper.xml | 2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java | 8 +-
smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java | 63 +++++++++++----------
ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java | 15 +++++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceTaskController.java | 23 +++----
ruoyi-admin/src/main/java/com/ruoyi/web/test/MQTest.java | 8 +-
smartor/src/main/java/com/smartor/service/IServiceTaskService.java | 1
smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskAnswerServiceImpl.java | 1
14 files changed, 84 insertions(+), 57 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskAnswerController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskAnswerController.java
index 13975b2..60abd62 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskAnswerController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskAnswerController.java
@@ -121,6 +121,7 @@
@ApiOperation("鎮ｈ�呴棶棰樼粨鏋滆褰曠紦瀛�(澶栭摼)")
@PostMapping("/saveQuestionCache")
public AjaxResult saveQuestionCache(@RequestBody ServiceSubTaskCacheReq serviceSubTaskCacheReq) {
+ log.info("淇濆瓨鎮ｈ�呴棶棰樼粨鏋滆褰曠紦瀛�(澶栭摼)鍏ュ弬涓猴細{}",serviceSubTaskCacheReq);
return toAjax(serviceSubtaskAnswerService.saveQuestionCache(serviceSubTaskCacheReq, 0L));
}
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 1bdbc7a..6c906c4 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
@@ -51,10 +51,11 @@
@ApiOperation("鏌ヨ鎮ｈ�呴殢璁夸俊鎭�")
//@PreAuthorize("@ss.hasPermi('system:taskcall:list')")
@PostMapping("/patItem")
- public TableDataInfo patItem(@RequestBody ServiceSubtaskVO serviceSubtaskVO) {
+ public Map<String, Object> patItem(@RequestBody ServiceSubtaskVO serviceSubtaskVO) {
List<ServiceSubtask> serviceSubtaskList = null;
if (serviceSubtaskVO != null) {
- PageUtils.startPageByPost(serviceSubtaskVO.getPageNum(), serviceSubtaskVO.getPageSize());
+ Integer offset = PageUtils.getOffset(serviceSubtaskVO.getPageNum(), serviceSubtaskVO.getPageSize());
+ serviceSubtaskVO.setPageNum(offset);
serviceSubtaskList = serviceSubtaskService.patItem(serviceSubtaskVO);
}
for (ServiceSubtask serviceSubtask : serviceSubtaskList) {
@@ -76,8 +77,7 @@
serviceSubtaskService.patItem(serviceSubtaskVO);
}
});
- return getDataTable2(total, list);
-// return getDataTable(serviceSubtaskService.patItem(ivrTaskcall));
+ return getDataTable3(total, list);
}
/**
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceTaskController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceTaskController.java
index de932ed..ffcff1b 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceTaskController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceTaskController.java
@@ -28,6 +28,7 @@
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import java.util.List;
+import java.util.Map;
import java.util.stream.Collectors;
/**
@@ -75,9 +76,9 @@
@ApiOperation("鏌ヨ浠诲姟鍒楄〃")
//@PreAuthorize("@ss.hasPermi('smartor:ServiceTask:list')")
@PostMapping("/list")
- public TableDataInfo list(@RequestBody ServiceTask serviceTask) {
- PageUtils.startPageByPost(serviceTask.getPageNum(), serviceTask.getPageSize());
-// List<ServiceTask> list = serviceTaskService.selectServiceTaskList(serviceTask);
+ public Map<String, Object> list(@RequestBody ServiceTask serviceTask) {
+ Integer offset = PageUtils.getOffset(serviceTask.getPageNum(), serviceTask.getPageSize());
+ serviceTask.setPageNum(offset);
List<ServiceTask> list = serviceTaskService.selectServiceTaskAndtaskDeptList(serviceTask);
List<ServiceTaskVO> serviceTaskVOS = DtoConversionUtils.sourceToTarget(list, ServiceTaskVO.class);
@@ -98,19 +99,13 @@
}
}
//鑾峰彇total
- long total = PageUtils.count(new ISelect() {
- @Override
- public void doSelect() {
- serviceTask.setPageNum(null);
- serviceTask.setPageSize(null);
- serviceTaskService.selectServiceTaskList(serviceTask);
- }
- });
+ serviceTask.setPageNum(null);
+ serviceTask.setPageSize(null);
+ List<ServiceTask> serviceTasks = serviceTaskService.selectServiceTaskAndtaskDeptList(serviceTask);
- return getDataTable2(total, serviceTaskVOS);
+ return getDataTable3(CollectionUtils.isNotEmpty(serviceTasks)?serviceTasks.size():0L, serviceTaskVOS);
}
-
- return getDataTable2(0, serviceTaskVOS);
+ return getDataTable3(0L, serviceTaskVOS);
}
/**
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/test/MQTest.java b/ruoyi-admin/src/main/java/com/ruoyi/web/test/MQTest.java
index 4e07259..c8f8e32 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/test/MQTest.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/test/MQTest.java
@@ -50,10 +50,10 @@
@Test
public void bb() {
RSAPublicKeyExample rsaPublicKeyExample=new RSAPublicKeyExample();
- String s1 = rsaPublicKeyExample.encryptedData("123456", "MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALQzqW1EIXBKGMu+2oEYSB5gM7Ox/ihyYTeeoE0yPX1qtt4++5yNOeTBVd6EEM4iKzVEzWj6REIWVwaSNPn/SvUCAwEAAQ==");
-
-// String s = rsaPublicKeyExample.decryptedData("J7V6yb5WHW63bQMbMyzxeT07HGesIXJwy9w77zBa6KG4PnWe7uaZh00vX21w%2Bn5FW8%2BjUAAU1HatqRWzFp7fvA%3D%3D", "MIIBUwIBADANBgkqhkiG9w0BAQEFAASCAT0wggE5AgEAAkEAtDOpbUQhcEoYy77agRhIHmAzs7H+KHJhN56gTTI9fWq23j77nI055MFV3oQQziIrNUTNaPpEQhZXBpI0+f9K9QIDAQABAkB3n0fcWfrcoMN/FU3VnrnZOEF6CzFNxkgU9P8y36QECWKZ9JhYQkNpKrMC9oXlN3VSaRigV7B+L/I/a0Rs1W+tAiEA4jx7xcXJ4y4BNwAmVHt6NNiEkzIwWnwC/0qsEu8NsOsCIQDL6MMn1D2uznC6OuOWpxDCkBh1JL1NzZTZeH2G+hj7nwIgKGAC9tjFnvWm4dn0/T7MIIJDpsFeP8fCAS2iZ/6hwuECIAS/eLvWr1EAsZNEh8QcQ8GkBU3E+ztyjAK8UX/xFt/VAiBf79/1tDErX4/DChecM8w3c3DhbBcjuE3fHZn7p6/UKg==");
- System.out.println(s1);
+// String s1 = rsaPublicKeyExample.encryptedData("123456", "MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALQzqW1EIXBKGMu+2oEYSB5gM7Ox/ihyYTeeoE0yPX1qtt4++5yNOeTBVd6EEM4iKzVEzWj6REIWVwaSNPn/SvUCAwEAAQ==");
+//System.out.println(s1);
+ String s = rsaPublicKeyExample.decryptedData("ZOgme8mSTcnU%2BrrzuvEahqhFwt%2FNmpPmGMpNHKQR0bb3Wk9%2FD2Wr92O53Iz1x9qjox69tVuMfvr26KxgHCAF8Q%3D%3D", "MIIBUwIBADANBgkqhkiG9w0BAQEFAASCAT0wggE5AgEAAkEAtDOpbUQhcEoYy77agRhIHmAzs7H+KHJhN56gTTI9fWq23j77nI055MFV3oQQziIrNUTNaPpEQhZXBpI0+f9K9QIDAQABAkB3n0fcWfrcoMN/FU3VnrnZOEF6CzFNxkgU9P8y36QECWKZ9JhYQkNpKrMC9oXlN3VSaRigV7B+L/I/a0Rs1W+tAiEA4jx7xcXJ4y4BNwAmVHt6NNiEkzIwWnwC/0qsEu8NsOsCIQDL6MMn1D2uznC6OuOWpxDCkBh1JL1NzZTZeH2G+hj7nwIgKGAC9tjFnvWm4dn0/T7MIIJDpsFeP8fCAS2iZ/6hwuECIAS/eLvWr1EAsZNEh8QcQ8GkBU3E+ztyjAK8UX/xFt/VAiBf79/1tDErX4/DChecM8w3c3DhbBcjuE3fHZn7p6/UKg==");
+ System.out.println(s);
}
public void aa(MultipartFile file) throws IOException {
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java
index a8753e2..37a0aea 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java
@@ -2,7 +2,9 @@
import java.beans.PropertyEditorSupport;
import java.util.Date;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -96,6 +98,19 @@
}
/**
+ * 鍝嶅簲璇锋眰鍒嗛〉鏁版嵁
+ */
+ @SuppressWarnings({"rawtypes", "unchecked"})
+ protected Map<String, Object> getDataTable3(long total, List<?> list) {
+ Map<String, Object> rspData = new HashMap<>();
+ rspData.put("code", HttpStatus.SUCCESS);
+ rspData.put("msg", "鏌ヨ鎴愬姛");
+ rspData.put("rows", list);
+ rspData.put("total", total);
+ return rspData;
+ }
+
+ /**
* 杩斿洖鎴愬姛
*/
public AjaxResult success() {
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/PageUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/PageUtils.java
index 2cec013..42adcf5 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/PageUtils.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/PageUtils.java
@@ -33,6 +33,15 @@
}
/**
+ * 璁＄畻鍋忕Щ閲�
+ */
+ public static Integer getOffset(Integer pageNum, Integer pageSize) {
+ if (pageNum == null || pageNum == 0) pageNum = 1;
+ if (pageSize == null) pageSize = 10;
+ return (pageNum - 1) * pageSize;
+ }
+
+ /**
* 娓呯悊鍒嗛〉鐨勭嚎绋嬪彉閲�
*/
public static void clearPage() {
diff --git a/smartor/src/main/java/com/smartor/service/IServiceTaskService.java b/smartor/src/main/java/com/smartor/service/IServiceTaskService.java
index 8cf85bf..11deedc 100644
--- a/smartor/src/main/java/com/smartor/service/IServiceTaskService.java
+++ b/smartor/src/main/java/com/smartor/service/IServiceTaskService.java
@@ -29,6 +29,7 @@
* @return 璇煶浠诲姟闆嗗悎
*/
public List<ServiceTask> selectServiceTaskList(ServiceTask ServiceTask);
+
public List<ServiceTask> selectServiceTaskAndtaskDeptList(ServiceTask serviceTask);
/**
diff --git a/smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java
index ff4bd37..1c216f3 100644
--- a/smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java
@@ -219,7 +219,7 @@
String tagname = patMedInhospMapper.getTagnameBypatid(patMedInhosp1.getPatid());
patMedInhosp1.setTagname(tagname);
}
- log.error("dealOutHospInfo闇�瑕佸鐞嗙殑鍑洪櫌鎮ｈ�呬俊鎭細{}", patMedInhosps);
+ log.info("dealOutHospInfo闇�瑕佸鐞嗙殑鍑洪櫌鎮ｈ�呬俊鎭細{}", CollectionUtils.isNotEmpty(patMedInhosps)?patMedInhosps.size():"0");
for (PatMedInhosp patMedInhosp1 : patMedInhosps) {
try {
diff --git a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskAnswerServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskAnswerServiceImpl.java
index 4df0625..09886e1 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskAnswerServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskAnswerServiceImpl.java
@@ -280,6 +280,7 @@
pid = Long.valueOf(serviceSubTaskCacheReq.getParam2());
}
// if (serviceSubTaskCacheReq.getType() != null && serviceSubTaskCacheReq.getType() == 2) {
+ log.info("saveQuestionCache---tid鐨勫�间负锛歿}锛宻aveQuestionCache--pid鐨勫�间负锛歿}", tid, pid);
if (CollectionUtils.isNotEmpty(serviceSubTaskCacheReq.getSvyLibTemplateScriptVOS()) && serviceSubTaskCacheReq.getSvyLibTemplateScriptVOS().size() > 0) {
//闂嵎
redisCache.deleteObject(pid + "-" + tid + "-WJscriptCache");
diff --git a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
index e1a9e99..d946a1d 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
@@ -255,34 +255,34 @@
List<ServiceSubtask> selectServiceSubtaskList = this.selectServiceSubtaskList(serviceSubtaskVO);
List<ServiceSubtask> serviceSubtaskList = new ArrayList<>();
//鑾峰彇鍒嗘暟
- for (ServiceSubtask serviceSubtask : selectServiceSubtaskList) {
- //璁＄畻鎮ｈ�呯殑鍒嗘暟
- if (serviceSubtask.getScore() == null || BigDecimal.ZERO.equals(serviceSubtask.getScore())) {
- //濡傛灉涓虹┖鐨勮瘽锛屽幓detail閲屾嬁鍒版瘡涓鐨勯�夐」鍒嗭紝濡傛灉鏄綔绛旈锛岀洿鎺ユ嬁棰樼洰鍒嗭紙鍓嶉锛岃妯℃澘鏄垎鏁扮被鍨嬶級
- Map<String, Object> map = getScore(serviceSubtask, serviceSubtaskVO.getDetailResult());
- serviceSubtask.setScore((BigDecimal) map.get("score"));
- serviceSubtaskMapper.updateServiceSubtask(serviceSubtask);
- if ((Boolean) map.get("isExist") == true) {
- //娴嬭瘯瀹屽垹闄わ紙搴斾粯娴嬭瘯鐢ㄧ殑锛�
- serviceSubtaskList.add(serviceSubtask);
- }
- } else {
- //娴嬭瘯瀹屽垹闄わ紙搴斾粯娴嬭瘯鐢ㄧ殑锛�
- if (!StringUtils.isEmpty(serviceSubtaskVO.getDetailResult())) {
- ServiceSubtaskDetail serviceSubtaskDetail = new ServiceSubtaskDetail();
- serviceSubtaskDetail.setSubId(serviceSubtask.getId());
- List<ServiceSubtaskDetail> serviceSubtaskDetails = serviceSubtaskDetailMapper.selectServiceSubtaskDetailList(serviceSubtaskDetail);
- for (ServiceSubtaskDetail ssd : serviceSubtaskDetails) {
- if (ssd.getAsrtext().equals(serviceSubtaskVO.getDetailResult())) {
- serviceSubtaskList.add(serviceSubtask);
- }
- }
- }else {
- serviceSubtaskList.add(serviceSubtask);
- }
- }
- }
- return serviceSubtaskList;
+// for (ServiceSubtask serviceSubtask : selectServiceSubtaskList) {
+// //璁＄畻鎮ｈ�呯殑鍒嗘暟
+// if (serviceSubtask.getScore() == null || BigDecimal.ZERO.equals(serviceSubtask.getScore())) {
+// //濡傛灉涓虹┖鐨勮瘽锛屽幓detail閲屾嬁鍒版瘡涓鐨勯�夐」鍒嗭紝濡傛灉鏄綔绛旈锛岀洿鎺ユ嬁棰樼洰鍒嗭紙鍓嶉锛岃妯℃澘鏄垎鏁扮被鍨嬶級
+// Map<String, Object> map = getScore(serviceSubtask, serviceSubtaskVO.getDetailResult());
+// serviceSubtask.setScore((BigDecimal) map.get("score"));
+// serviceSubtaskMapper.updateServiceSubtask(serviceSubtask);
+// if ((Boolean) map.get("isExist") == true) {
+// //娴嬭瘯瀹屽垹闄わ紙搴斾粯娴嬭瘯鐢ㄧ殑锛�
+// serviceSubtaskList.add(serviceSubtask);
+// }
+// } else {
+// //娴嬭瘯瀹屽垹闄わ紙搴斾粯娴嬭瘯鐢ㄧ殑锛�
+// if (!StringUtils.isEmpty(serviceSubtaskVO.getDetailResult())) {
+// ServiceSubtaskDetail serviceSubtaskDetail = new ServiceSubtaskDetail();
+// serviceSubtaskDetail.setSubId(serviceSubtask.getId());
+// List<ServiceSubtaskDetail> serviceSubtaskDetails = serviceSubtaskDetailMapper.selectServiceSubtaskDetailList(serviceSubtaskDetail);
+// for (ServiceSubtaskDetail ssd : serviceSubtaskDetails) {
+// if (ssd.getAsrtext().equals(serviceSubtaskVO.getDetailResult())) {
+// serviceSubtaskList.add(serviceSubtask);
+// }
+// }
+// }else {
+// serviceSubtaskList.add(serviceSubtask);
+// }
+// }
+// }
+ return selectServiceSubtaskList;
}
@Override
@@ -2224,12 +2224,15 @@
}
private String getOutPath(String phone, Long tid, String taskName, Long pId, Integer type) {
+ log.info("tid鐨勫�间负锛歿},pid鐨勫�间负锛歿}",tid,pId);
//瀵箄rl涓袱涓弬鏁板姞瀵�
RSAPublicKeyExample rsaPublicKeyExample = new RSAPublicKeyExample();
- String taskId = rsaPublicKeyExample.encryptedData(tid.toString(), pub_key);
+ String taskId = rsaPublicKeyExample.encryptedData(tid.toString(), pub_key).toString();
String outpath = null;
try {
- String patid = rsaPublicKeyExample.encryptedData(pId.toString(), pub_key);
+ String patid = rsaPublicKeyExample.encryptedData(pId.toString(), pub_key).toString();
+
+ log.info("tid鍔犲瘑鍚庣殑鍊间负锛歿},pid鍔犲瘑鍚庣殑鍊间负锛歿}",taskId,patid);
SendMagParam sendMagParam = new SendMagParam();
sendMagParam.setType("4");
if (type == 1) {
diff --git a/smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml b/smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml
index f1e294b..8e02f93 100644
--- a/smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml
@@ -127,7 +127,7 @@
select id,
notrequired_flag,
notrequiredreason,
- patientOverview,
+ patient_overview,
patientno,
patid_his,
age_unit,
diff --git a/smartor/src/main/resources/mapper/smartor/PatMedInhospMapper.xml b/smartor/src/main/resources/mapper/smartor/PatMedInhospMapper.xml
index 894cd2e..51ef3f1 100644
--- a/smartor/src/main/resources/mapper/smartor/PatMedInhospMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/PatMedInhospMapper.xml
@@ -177,7 +177,7 @@
<where>
a.del_flag = 0
AND b.del_flag = 0
- AND a.idcardno IS NOT NULL
+-- AND a.idcardno IS NOT NULL
<if test="tagname != null and tagname != ''">
AND EXISTS (
SELECT 1
diff --git a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
index 0ec55c8..f6310b8 100644
--- a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
@@ -99,6 +99,7 @@
inhospid,
drname,
excep,
+ tagname,
drcode,
long_send_time,
openid,
@@ -312,8 +313,7 @@
<if test="sort != null and sort==3">order by long_send_time desc</if>
<if test="sort != null and sort==5">order by admindate asc</if>
<if test="sort != null and sort==6">order by admindate desc</if>
-
- <!-- order by update_time desc,id desc -->
+ <if test="pageNum != null and pageSize != null">limit #{pageNum},#{pageSize}</if>
</select>
diff --git a/smartor/src/main/resources/mapper/smartor/ServiceTaskMapper.xml b/smartor/src/main/resources/mapper/smartor/ServiceTaskMapper.xml
index c8def03..576f213 100644
--- a/smartor/src/main/resources/mapper/smartor/ServiceTaskMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/ServiceTaskMapper.xml
@@ -322,6 +322,8 @@
</where>
order by update_time desc,taskid desc
+ <if test="pageSize != null and pageNum != null">limit ${pageSize} OFFSET ${pageNum}</if>
+
</select>
<select id="selectServiceTaskByTaskid" parameterType="Long" resultMap="ServiceTaskResult">
--
Gitblit v1.9.3