diff --git a/src/main/java/com/zhgd/xmgl/modules/checking/service/impl/CheckingPointInfoServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/checking/service/impl/CheckingPointInfoServiceImpl.java index e15570fe3..5f42854a6 100644 --- a/src/main/java/com/zhgd/xmgl/modules/checking/service/impl/CheckingPointInfoServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/checking/service/impl/CheckingPointInfoServiceImpl.java @@ -2,6 +2,7 @@ package com.zhgd.xmgl.modules.checking.service.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.date.DateUtil; +import cn.hutool.core.text.CharSequenceUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; @@ -10,6 +11,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.zhgd.jeecg.common.execption.OpenAlertException; +import com.zhgd.jeecg.common.execption.OpenPromptException; import com.zhgd.xmgl.modules.basicdata.entity.SystemUser; import com.zhgd.xmgl.modules.basicdata.mapper.SystemUserMapper; import com.zhgd.xmgl.modules.basicdata.service.INoticeService; @@ -87,43 +89,52 @@ public class CheckingPointInfoServiceImpl extends ServiceImpl checkingPoints = checkingPointService.selectCheckingPointList(qo); + int allSize = checkingPoints.size(); + int normalSize = checkingPoints.stream().filter(checkingPoint1 -> checkingPoint1.getInspectStatus() == 1).collect(Collectors.toList()).size(); + int abnormalSize = checkingPoints.stream().filter(checkingPoint1 -> checkingPoint1.getInspectStatus() == 2).collect(Collectors.toList()).size(); + int isInspect = allSize == (normalSize + abnormalSize) ? 1 : 0; xzCheckingRouteTaskMapper.update(null, new LambdaUpdateWrapper() - .set(XzCheckingRouteTask::getIsInspect, 1) - .set(XzCheckingRouteTask::getCheckingPointNum, checkingPoints.size()) - .set(XzCheckingRouteTask::getNormalCheckingPointNum, checkingPoints.stream().filter(checkingPoint1 -> checkingPoint1.getInspectStatus() == 1).collect(Collectors.toList()).size()) - .set(XzCheckingRouteTask::getAbnormalCheckingPointNum, checkingPoints.stream().filter(checkingPoint1 -> checkingPoint1.getInspectStatus() == 2).collect(Collectors.toList()).size()) + .set(XzCheckingRouteTask::getIsInspect, isInspect) + .set(XzCheckingRouteTask::getCheckingPointNum, allSize) + .set(XzCheckingRouteTask::getNormalCheckingPointNum, normalSize) + .set(XzCheckingRouteTask::getAbnormalCheckingPointNum, abnormalSize) .eq(XzCheckingRouteTask::getId, xzCheckingRouteTaskId) ); - - XzCheckingRouteTask task = xzCheckingRouteTaskService.queryById(xzCheckingRouteTaskId); - noticeUserIds = task.getXzCheckingRoute().getNoticeUserIds(); } else { - checkingPointInfoMapper.insert(checkingPointInfo); + checkingPointInfoMapper.insert(info); noticeUserIds = checkingPoint.getInspectUserIds(); } @@ -133,7 +144,7 @@ public class CheckingPointInfoServiceImpl extends ServiceImpl