点位订阅

hdy

2024-04-18 e2670e7912ea7316d1f9fb518d980b8a4ef94055

 jcdm-main/src/main/java/com/jcdm/main/em/inspectionPlanItemsProject/controller/EmInspectionPlanItemsProjectController.java

@@ -6,8 +6,11 @@
import java.util.stream.Collectors;
import javax.servlet.http.HttpServletResponse;

import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.jcdm.common.exception.ServiceException;
import com.jcdm.framework.websocket.WebSocketUsers;
import com.jcdm.main.em.inspectionPlanTask.domain.EmInspectionPlanTask;
import com.jcdm.main.em.inspectionPlanTask.service.IEmInspectionPlanTaskService;
@@ -43,16 +46,24 @@
    @GetMapping("/findPlanItemsProjectByPlanId")
    public AjaxResult list2(EmInspectionPlanItemsProject emInspectionPlanItemsProject)
    {
        EmInspectionPlanTask byId = emInspectionPlanTaskService.getById(emInspectionPlanItemsProject.getPlanTaskId());

        List<EmInspectionPlanItemsProject> planTaskIdList = emInspectionPlanItemsProjectService
                .list(new LambdaQueryWrapper<EmInspectionPlanItemsProject>()
                        .eq(EmInspectionPlanItemsProject::getPlanTaskId,emInspectionPlanItemsProject.getPlanTaskId())
                        .eq(EmInspectionPlanItemsProject::getItemsType,emInspectionPlanItemsProject.getItemsType()));

        if (StrUtil.isBlank(emInspectionPlanItemsProject.getPlanTaskCode())){
            throw new ServiceException("未获取到计划编号，请重试!");
        }
        Map<String,Object> resultMap = new HashMap<>();
        resultMap.put("planItemsProject", planTaskIdList);
        resultMap.put("planTask",byId);
        List<EmInspectionPlanTask> list = emInspectionPlanTaskService.list(new LambdaQueryWrapper<EmInspectionPlanTask>()
                .eq(EmInspectionPlanTask::getPlanCode, emInspectionPlanItemsProject.getPlanTaskCode()));
        if (CollUtil.isNotEmpty(list)){
            EmInspectionPlanTask byId = list.get(0);
            List<EmInspectionPlanItemsProject> planTaskIdList = emInspectionPlanItemsProjectService
                    .list(new LambdaQueryWrapper<EmInspectionPlanItemsProject>()
                            .eq(EmInspectionPlanItemsProject::getPlanTaskId,byId.getId())
                            .eq(EmInspectionPlanItemsProject::getItemsType,emInspectionPlanItemsProject.getItemsType()));

            resultMap.put("planItemsProject", planTaskIdList);
            resultMap.put("planTask",byId);
        }else {
            throw new ServiceException("未获取到计划数据!");
        }
        return AjaxResult.success(resultMap);
    }

@@ -66,11 +77,12 @@
        List<EmInspectionPlanItemsProject> list = emInspectionPlanItemsProjectService.list(new LambdaQueryWrapper<EmInspectionPlanItemsProject>()
                .eq(EmInspectionPlanItemsProject::getPlanTaskId, itemsProject.getPlanTaskId()));

        List<String> collect = list.stream().map(EmInspectionPlanItemsProject::getResults).collect(Collectors.toList());

        if(collect.stream().noneMatch(s -> s.equals("0"))){
        List<String> collect = list.stream()
                .map(EmInspectionPlanItemsProject::getResults)
                .filter(x-> !"1".equals(x)).collect(Collectors.toList());
        if(CollUtil.isEmpty(collect)){
            EmInspectionPlanTask planTaskById = emInspectionPlanTaskService.getById(itemsProject.getPlanTaskId());
            planTaskById.setResults("1");
            planTaskById.setState("1");
            emInspectionPlanTaskService.saveOrUpdate(planTaskById);
        }
        return AjaxResult.success();