From b2001a7042d511cea1c1b2000edca57253d992ad Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期六, 20 十二月 2025 16:21:51 +0800
Subject: [PATCH] 时间控制修改
---
ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/DisposeRecordServiceImpl.java | 59 +++++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 47 insertions(+), 12 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 5f11d68..f2f4c28 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
@@ -33,6 +33,7 @@
import javax.annotation.Resource;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
@@ -102,15 +103,44 @@
}
@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 CommonResult saveOrUpdateUpload(UploadDisposingResultParam uploadDisposingResultParam) {
- log.info("鍙傛暟------------------>{}",uploadDisposingResultParam);
+ log.info("鍙傛暟------------------>{}", uploadDisposingResultParam);
if (uploadDisposingResultParam.getArrivalTime() != null) {
uploadDisposingResultParam.setArrivalTime(uploadDisposingResultParam.getArrivalTime().replace("/", "-"));
}
if (uploadDisposingResultParam.getInvestigationTime() != null) {
uploadDisposingResultParam.setInvestigationTime(uploadDisposingResultParam.getInvestigationTime().replace("/", "-"));
}
+
+ List<String> pics = new ArrayList<>();
+ uploadDisposingResultParam.getPic().forEach(o -> {
+ pics.add(o.replace("/sccg/API/img?fileUrl=", ""));
+ });
+ uploadDisposingResultParam.setPic(pics);
+
+ List<String> situationPics = new ArrayList<>();
+ uploadDisposingResultParam.getSituationPic().forEach(o -> {
+ situationPics.add(o.replace("/sccg/API/img?fileUrl=", ""));
+ });
+ uploadDisposingResultParam.setSituationPic(situationPics);
AdminUserDetails user = (AdminUserDetails) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
List<ArrivalSituation> list = iArrivalSituationService.list(new LambdaQueryWrapper<ArrivalSituation>().eq(ArrivalSituation::getBaseCaseId, uploadDisposingResultParam.getCaseId()));
@@ -130,7 +160,7 @@
investigation.setBaseCaseId(uploadDisposingResultParam.getCaseId());
investigation.setPartyId(partyInfo.getId());
//TODO:鏀逛负闆嗗悎鐨勫瓧绗︿覆褰㈠紡
- investigation.setPic(uploadDisposingResultParam.getPic().toString());
+ investigation.setPic(String.join(",", uploadDisposingResultParam.getPic()));
//TODO:灏忕▼搴忓墠绔〉闈㈡病鏈夎皟鏌ユ椂闂达紝鏆傛椂涓嶅～
//investigation.setInvestigationTime(LocalDateTime.parse(uploadDisposingResultParam.getInvestigationTime(), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
investigation.setId(uploadDisposingResultParam.getInvestigationId());
@@ -143,16 +173,18 @@
arrivalSituation.setArrivalTime(LocalDateTime.parse(uploadDisposingResultParam.getArrivalTime(), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
arrivalSituation.setId(uploadDisposingResultParam.getArrivalSituationId());
//TODO:鏀逛负闆嗗悎鐨勫瓧绗︿覆褰㈠紡
- arrivalSituation.setSituationPic(uploadDisposingResultParam.getSituationPic().toString());
+ arrivalSituation.setSituationPic(String.join(",", uploadDisposingResultParam.getSituationPic()));
iArrivalSituationService.updateById(arrivalSituation);
//鏂囦功
String handType = "02";
+ iImageResourcesService.deleteByCaseId(uploadDisposingResultParam.getCaseId(), handType);
ImageResources imageResources = new ImageResources();
imageResources.setType(handType);
imageResources.setBelongToId(uploadDisposingResultParam.getCaseId());
- imageResources.setUrl(StringUtils.joinWith(",", uploadDisposingResultParam.getPic().toString(), uploadDisposingResultParam.getSituationPic().toString()));
- imageResources.setId(uploadDisposingResultParam.getImageResourcesId());
- iImageResourcesService.updateById(imageResources);
+ imageResources.setUrl(StringUtils.joinWith(",",
+ String.join(",", uploadDisposingResultParam.getPic()),
+ String.join(",", uploadDisposingResultParam.getSituationPic())));
+ iImageResourcesService.save(imageResources);
if (uploadDisposingResultParam.getWritCode() != null && uploadDisposingResultParam.getWritType() != null) {
Writ writ = new Writ();
BeanUtils.copyProperties(uploadDisposingResultParam, writ);
@@ -185,7 +217,7 @@
investigation.setBaseCaseId(uploadDisposingResultParam.getCaseId());
investigation.setCreateTime(LocalDateTime.now());
//TODO:鏀逛负闆嗗悎鐨勫瓧绗︿覆褰㈠紡
- investigation.setPic(uploadDisposingResultParam.getPic().toString());
+ investigation.setPic(String.join(",", uploadDisposingResultParam.getPic()));
investigation.setCreateUser(user.getUserId());
investigation.setPartyId(partyInfo.getId());
@@ -199,7 +231,7 @@
arrivalSituation.setCreateTime(LocalDateTime.now());
arrivalSituation.setCreateUser(user.getUserId());
//TODO:鏀逛负闆嗗悎鐨勫瓧绗︿覆褰㈠紡
- arrivalSituation.setSituationPic(uploadDisposingResultParam.getSituationPic().toString());
+ arrivalSituation.setSituationPic(String.join(",", uploadDisposingResultParam.getSituationPic()));
arrivalSituation.setArrivalTime(LocalDateTime.parse(uploadDisposingResultParam.getArrivalTime(), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
iArrivalSituationService.save(arrivalSituation);
//鏂囦功
@@ -209,7 +241,9 @@
imageResources.setBelongToId(uploadDisposingResultParam.getCaseId());
imageResources.setCreateTime(LocalDateTime.now());
imageResources.setCreateUser(user.getUserId());
- imageResources.setUrl(StringUtils.joinWith(",", uploadDisposingResultParam.getPic().toString(), uploadDisposingResultParam.getSituationPic().toString()));
+ imageResources.setUrl(StringUtils.joinWith(",",
+ String.join(",", uploadDisposingResultParam.getPic()),
+ String.join(",", uploadDisposingResultParam.getSituationPic())));
iImageResourcesService.save(imageResources);
if (uploadDisposingResultParam.getWritCode() != null && uploadDisposingResultParam.getWritType() != null) {
Writ writ = new Writ();
@@ -223,8 +257,9 @@
writ.setSendTime(LocalDateTime.parse(uploadDisposingResultParam.getSendTime(), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
iWritService.save(writ);
imageResources.setUrl(StringUtils
- .joinWith(",", uploadDisposingResultParam.getPic().toString()
- , uploadDisposingResultParam.getSituationPic().toString()
+ .joinWith(","
+ , String.join(",", uploadDisposingResultParam.getPic())
+ , String.join(",", uploadDisposingResultParam.getSituationPic())
, uploadDisposingResultParam.getOriginalPic()
, uploadDisposingResultParam.getOtherPic()
, uploadDisposingResultParam.getRectifiedPic()
@@ -267,7 +302,7 @@
disposeRecord.setWorkflowConfigStepId(workflowConfigStep.getId());
disposeRecord.setHandlerRoleId(workflowConfigStep.getRoleId());
boolean result = baseMapper.insert(disposeRecord) == 1 ? true : false;
- if(!result){
+ if (!result) {
CommonResult.failed("宸叉彁浜�,璇峰嬁閲嶅鎻愪氦");
}
return CommonResult.success("add success");
--
Gitblit v1.8.0