From e5bf0d08d05f5c58224fe28cdf743a1bae88e3f0 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 30 十一月 2023 16:48:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/DisposeRecordServiceImpl.java | 20 +++++++++++++++++---
1 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/DisposeRecordServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/DisposeRecordServiceImpl.java
index 3b431f8..6d44fa3 100644
--- a/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/DisposeRecordServiceImpl.java
+++ b/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/DisposeRecordServiceImpl.java
@@ -1,5 +1,7 @@
package com.ycl.service.caseHandler.impl;
+import cn.hutool.core.util.PageUtil;
+import com.alibaba.druid.sql.PagerUtils;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -70,7 +72,7 @@
public final static Short LAST_THREEMONTH = 2;
@Override
- public Page<MyBacklogVO> listMyTask(Page<MyBacklogVO> page, String num, Long userId, Short type, Short source, Short time) {
+ public Page<MyBacklogVO> listMyTask(String num, Long userId, Short type, Short source, Short time, Integer current, Integer pageSize) {
LocalDateTime alarmTimeStart = null;
LocalDateTime alarmTimeEnd = null;
if (Objects.equals(time, LAST_WEEK)) {
@@ -83,8 +85,19 @@
alarmTimeStart = LocalDateTime.now().minusMonths(3);
alarmTimeEnd = LocalDateTime.now();
}
- //TODO:鍑虹幇杩囦竴娆￠噸澶嶆暟鎹�
- return disposeRecordMapper.selectMyBackList(page, userId, num, alarmTimeStart, alarmTimeEnd, source, type);
+ Integer pageIndex = PageUtil.getStart(current - 1, pageSize);
+ List<MyBacklogVO> list = disposeRecordMapper.selectMyBackList(userId, num, alarmTimeStart, alarmTimeEnd, source, type, pageIndex, pageSize);
+ Long total = disposeRecordMapper.selectMyBackListTotal(userId, num, alarmTimeStart, alarmTimeEnd, source, type);
+
+ list.forEach(o -> {
+ if (o.getPictureList() != null && o.getPictureList().size() > 0) {
+ o.setPicture(o.getPictureList().get(0).getUrl());
+ }
+ });
+ Page<MyBacklogVO> page = new Page<>();
+ page.setRecords(list);
+ page.setTotal(total);
+ return page;
}
@Override
@@ -252,6 +265,7 @@
//璁剧疆娴佺▼鐜妭鏁版嵁
disposeRecord.setWorkflowConfigStepId(workflowConfigStep.getId());
disposeRecord.setHandlerRoleId(workflowConfigStep.getRoleId());
+
return baseMapper.insert(disposeRecord) == 1 ? true : false;
}
}
--
Gitblit v1.8.0