From b169b0c298fb294adbc5bd332982908afca4e819 Mon Sep 17 00:00:00 2001
From: admin <15939171744@163.com>
Date: 星期二, 16 四月 2024 10:09:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
jcdm-main/src/main/java/com/jcdm/main/em/inspectionPlanItemsProject/controller/EmInspectionPlanItemsProjectController.java | 26 +++++++++++++++++---------
jcdm-main/src/main/java/com/jcdm/main/em/inspectionPlanItemsProject/domain/EmInspectionPlanItemsProject.java | 5 +++++
2 files changed, 22 insertions(+), 9 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 5411454..4df37a9 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
@@ -7,8 +7,10 @@
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;
@@ -44,16 +46,22 @@
@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);
+ }
return AjaxResult.success(resultMap);
}
diff --git a/jcdm-main/src/main/java/com/jcdm/main/em/inspectionPlanItemsProject/domain/EmInspectionPlanItemsProject.java b/jcdm-main/src/main/java/com/jcdm/main/em/inspectionPlanItemsProject/domain/EmInspectionPlanItemsProject.java
index 4506922..821e1dd 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/em/inspectionPlanItemsProject/domain/EmInspectionPlanItemsProject.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/em/inspectionPlanItemsProject/domain/EmInspectionPlanItemsProject.java
@@ -1,5 +1,6 @@
package com.jcdm.main.em.inspectionPlanItemsProject.domain;
+import com.baomidou.mybatisplus.annotation.TableField;
import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
@@ -12,6 +13,7 @@
* @author Yi
* @date 2024-03-23
*/
+@Data
public class EmInspectionPlanItemsProject extends BaseEntity
{
private static final long serialVersionUID = 1L;
@@ -55,6 +57,9 @@
/** 浠诲姟ID */
private Long planTaskId;
+ @TableField(exist = false)
+ private String planTaskCode;
+
public void setId(Long id)
{
this.id = id;
--
Gitblit v1.9.3