From a4cd4c2d98392cd1036f36b96c262878743a7e63 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期四, 05 九月 2024 19:52:22 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server
---
ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/DisposeRecordServiceImpl.java | 28 +++++++++++++++++++++++++---
1 files changed, 25 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 6dccd8e..9f9bc7a 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
@@ -8,6 +8,7 @@
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ycl.api.CommonResult;
import com.ycl.bo.AdminUserDetails;
import com.ycl.common.constant.BaseCaseStatus;
import com.ycl.common.constant.StepName;
@@ -101,9 +102,26 @@
}
@Override
+ public Long listMyTaskCount(String num, Long userId, Short type, Short source, Short time) {
+ LocalDateTime alarmTimeStart = null;
+ LocalDateTime alarmTimeEnd = null;
+ if (Objects.equals(time, LAST_WEEK)) {
+ alarmTimeStart = LocalDateTime.now().minusDays(7);
+ alarmTimeEnd = LocalDateTime.now();
+ } else if (Objects.equals(time, LAST_MONTH)) {
+ alarmTimeStart = LocalDateTime.now().minusMonths(1);
+ alarmTimeEnd = LocalDateTime.now();
+ } else if (Objects.equals(time, LAST_THREEMONTH)) {
+ alarmTimeStart = LocalDateTime.now().minusMonths(3);
+ alarmTimeEnd = LocalDateTime.now();
+ }
+ return disposeRecordMapper.selectMyBackListTotal(userId, num, alarmTimeStart, alarmTimeEnd, source, type);
+ }
+
+ @Override
@Transactional(rollbackFor = Exception.class)
- public Boolean saveOrUpdateUpload(UploadDisposingResultParam uploadDisposingResultParam) {
- log.info("鍙傛暟------------------>{}",uploadDisposingResultParam);
+ public CommonResult saveOrUpdateUpload(UploadDisposingResultParam uploadDisposingResultParam) {
+ log.info("鍙傛暟------------------>{}", uploadDisposingResultParam);
if (uploadDisposingResultParam.getArrivalTime() != null) {
uploadDisposingResultParam.setArrivalTime(uploadDisposingResultParam.getArrivalTime().replace("/", "-"));
}
@@ -265,6 +283,10 @@
//璁剧疆娴佺▼鐜妭鏁版嵁
disposeRecord.setWorkflowConfigStepId(workflowConfigStep.getId());
disposeRecord.setHandlerRoleId(workflowConfigStep.getRoleId());
- return baseMapper.insert(disposeRecord) == 1 ? true : false;
+ boolean result = baseMapper.insert(disposeRecord) == 1 ? true : false;
+ if (!result) {
+ CommonResult.failed("宸叉彁浜�,璇峰嬁閲嶅鎻愪氦");
+ }
+ return CommonResult.success("add success");
}
}
--
Gitblit v1.8.0