From e8d203bfecc36f289df4b2030415b1067d74a44d Mon Sep 17 00:00:00 2001
From: 懒羊羊 <15939171744@163.com>
Date: 星期五, 29 三月 2024 15:29:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
jcdm-main/src/main/java/com/jcdm/main/em/inspectionPlanItemsProject/controller/EmInspectionPlanItemsProjectController.java | 51 +++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 47 insertions(+), 4 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 d6d2384..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,9 +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;
@@ -30,13 +38,48 @@
@Autowired
private IEmInspectionPlanItemsProjectService emInspectionPlanItemsProjectService;
- @RequestMapping("/findPlanItemsProjectByPlanId")
- public AjaxResult list(@RequestParam String planId)
+ @Autowired
+ private IEmInspectionPlanTaskService emInspectionPlanTaskService;
+
+ @GetMapping("/findPlanItemsProjectByPlanId")
+ public AjaxResult list2(EmInspectionPlanItemsProject emInspectionPlanItemsProject)
{
- List<EmInspectionPlanItemsProject> planTaskIdList = emInspectionPlanItemsProjectService.list(new QueryWrapper<EmInspectionPlanItemsProject>().eq("plan_task_id", planId));
- return AjaxResult.success(planTaskIdList);
+ EmInspectionPlanTask byId = emInspectionPlanTaskService.getById(emInspectionPlanItemsProject.getPlanTaskId());
+
+ List<EmInspectionPlanItemsProject> planTaskIdList = emInspectionPlanItemsProjectService
+ .list(new LambdaQueryWrapper<EmInspectionPlanItemsProject>()
+ .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