Merge remote-tracking branch 'origin/2.0.1' into 2.0.1

jiangping

2025-06-06 77946261ec663aa1fe7f6f97e550532ed879f982

 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)