From 8241ddde076c3418f359e48009585a2d9aae7ed7 Mon Sep 17 00:00:00 2001
From: wujian <14790700720@163.com>
Date: 星期五, 29 三月 2024 14:19:25 +0800
Subject: [PATCH] chenge plan
---
jcdm-main/src/main/java/com/jcdm/main/em/inspectionPlanItemsProject/controller/EmInspectionPlanItemsProjectController.java | 44 ++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 42 insertions(+), 2 deletions(-)
diff --git a/jcdm-main/src/main/java/com/jcdm/main/em/inspectionPlanItemsProject/controller/EmInspectionPlanItemsProjectController.java b/jcdm-main/src/main/java/com/jcdm/main/em/inspectionPlanItemsProject/controller/EmInspectionPlanItemsProjectController.java
index 3327804..5411454 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/em/inspectionPlanItemsProject/controller/EmInspectionPlanItemsProjectController.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/em/inspectionPlanItemsProject/controller/EmInspectionPlanItemsProjectController.java
@@ -1,10 +1,17 @@
package com.jcdm.main.em.inspectionPlanItemsProject.controller;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
import javax.servlet.http.HttpServletResponse;
+import cn.hutool.core.collection.CollUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.jcdm.framework.websocket.WebSocketUsers;
+import com.jcdm.main.em.inspectionPlanTask.domain.EmInspectionPlanTask;
+import com.jcdm.main.em.inspectionPlanTask.service.IEmInspectionPlanTaskService;
import org.aspectj.weaver.loadtime.Aj;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
@@ -31,15 +38,48 @@
@Autowired
private IEmInspectionPlanItemsProjectService emInspectionPlanItemsProjectService;
+ @Autowired
+ private IEmInspectionPlanTaskService emInspectionPlanTaskService;
+
@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()));
- return AjaxResult.success(planTaskIdList);
+ .eq(EmInspectionPlanItemsProject::getPlanTaskId,emInspectionPlanItemsProject.getPlanTaskId())
+ .eq(EmInspectionPlanItemsProject::getItemsType,emInspectionPlanItemsProject.getItemsType()));
+
+ Map<String,Object> resultMap = new HashMap<>();
+ resultMap.put("planItemsProject", planTaskIdList);
+ resultMap.put("planTask",byId);
+ return AjaxResult.success(resultMap);
}
+ @PostMapping("/updateItemsProjectResults")
+ public AjaxResult updateItemsProjectResults(@RequestBody EmInspectionPlanItemsProject emInspectionPlanItemsProject)
+ {
+ EmInspectionPlanItemsProject itemsProject = emInspectionPlanItemsProjectService.getById(emInspectionPlanItemsProject.getId());
+ itemsProject.setResults(emInspectionPlanItemsProject.getResults());
+ emInspectionPlanItemsProjectService.saveOrUpdate(itemsProject);
+
+ List<EmInspectionPlanItemsProject> list = emInspectionPlanItemsProjectService.list(new LambdaQueryWrapper<EmInspectionPlanItemsProject>()
+ .eq(EmInspectionPlanItemsProject::getPlanTaskId, itemsProject.getPlanTaskId()));
+
+ 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.setState("1");
+ emInspectionPlanTaskService.saveOrUpdate(planTaskById);
+ }
+ return AjaxResult.success();
+ }
+
+
+
/**
* 鏌ヨ鐐规浠诲姟-椤圭洰鍒楄〃
*/
--
Gitblit v1.9.3