From 77946261ec663aa1fe7f6f97e550532ed879f982 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 06 六月 2025 13:47:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwPatrolTaskRecordServiceImpl.java | 28 +++++-----------------------
1 files changed, 5 insertions(+), 23 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwPatrolTaskRecordServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwPatrolTaskRecordServiceImpl.java
index d556571..963f7b8 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwPatrolTaskRecordServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwPatrolTaskRecordServiceImpl.java
@@ -28,9 +28,11 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
+import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.Objects;
+import java.util.stream.Collectors;
/**
* 杩愮淮宸℃浠诲姟 - 宸℃鐐逛俊鎭〃Service瀹炵幇
@@ -134,7 +136,7 @@
.selectAs(SystemUser::getRealname,YwPatrolTaskRecord::getRealname)
.selectAs(YwPatrolScheme::getTitle,YwPatrolTaskRecord::getSchemeTitle)
- .selectAs(YwPatrolTask::getTitle,YwPatrolTaskRecord::getTaskCode)
+ .selectAs(YwPatrolTask::getCode,YwPatrolTaskRecord::getTaskCode)
.selectAs(YwPatrolTask::getStartDate,YwPatrolTaskRecord::getStartDate)
.selectAs(YwPatrolTask::getEndDate,YwPatrolTaskRecord::getEndDate)
@@ -213,7 +215,8 @@
if(Objects.isNull(ywPatrolScheme)){
throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌宸℃璁″垝淇℃伅");
}
- if(!ywPatrolScheme.getUserIds().equals(loginUserInfo.getId().toString())){
+ List<String> userIdList = Arrays.asList(ywPatrolScheme.getUserIds().split(","));
+ if(userIdList.stream().filter(i->Constants.equalsInteger(Integer.valueOf(i),loginUserInfo.getId())).collect(Collectors.toList()).size()<=0){
throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"闈炴偍鐨勫贰妫�浠诲姟鏃犳硶杩涜澶勭悊");
}
YwPatrolTask ywPatrolTask = ywPatrolTaskMapper.selectById(model.getTaskId());
@@ -249,19 +252,6 @@
.set(YwPatrolTask::getEditor,loginUserInfo.getId())
);
-// if(ywPatrolTaskMapper.selectCount(new QueryWrapper<YwPatrolTask>().lambda()
-// .eq(YwPatrolTask::getSchemeId,ywPatrolTask.getSchemeId())
-// .in(YwPatrolTask::getStatus,Constants.ZERO,Constants.ONE)
-// .ne(YwPatrolTask::getId,ywPatrolTask.getId())
-// )==Constants.ZERO){
-// ywPatrolSchemeMapper.update(null,new UpdateWrapper<YwPatrolScheme>().lambda()
-// .eq(YwPatrolScheme::getId,ywPatrolScheme.getId())
-// .set(YwPatrolScheme::getStatus,Constants.TWO)
-// .set(YwPatrolScheme::getEditDate,DateUtil.getCurrDateTime())
-// .set(YwPatrolScheme::getEditor,loginUserInfo.getId())
-// );
-// }
-
//鏍囪寰呭姙宸插鐞�
noticesJoinMapper.update(null,new UpdateWrapper<Notices>().lambda()
.set(Notices::getStatus,Constants.ONE)
@@ -279,14 +269,6 @@
.set(YwPatrolTask::getEditor,loginUserInfo.getId())
);
}
-// if(Constants.equalsInteger(ywPatrolScheme.getStatus(),Constants.ZERO)){
-// ywPatrolSchemeMapper.update(null,new UpdateWrapper<YwPatrolScheme>().lambda()
-// .eq(YwPatrolScheme::getId,ywPatrolScheme.getId())
-// .set(YwPatrolScheme::getStatus,Constants.ONE)
-// .set(YwPatrolScheme::getEditDate,DateUtil.getCurrDateTime())
-// .set(YwPatrolScheme::getEditor,loginUserInfo.getId())
-// );
-// }
//鏍囪寰呭姙宸插鐞�
noticesJoinMapper.update(null,new UpdateWrapper<Notices>().lambda()
.set(Notices::getParam3,Constants.ONE)
--
Gitblit v1.9.3