From e70fb4b691d0411cb6de676256160255a153cada Mon Sep 17 00:00:00 2001
From: admin <15939171744@163.com>
Date: 星期四, 18 四月 2024 09:45:19 +0800
Subject: [PATCH] -
---
jcdm-main/src/main/java/com/jcdm/main/em/inspectionPlanItemsProject/controller/EmInspectionPlanItemsProjectController.java | 38 +++++++++++++++++++++++++-------------
1 files changed, 25 insertions(+), 13 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 ecaa8ea..454ac28 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
@@ -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();
--
Gitblit v1.9.3