From 3997e21d6cb117d5fb50436e8064d834cae68bc7 Mon Sep 17 00:00:00 2001 From: xiaozhou <536509503@qq.com> Date: Thu, 3 Jul 2025 20:49:08 +0800 Subject: [PATCH] =?UTF-8?q?=E8=81=94=E7=B3=BB=E5=8D=95=E7=AD=89=E5=90=84?= =?UTF-8?q?=E4=B8=AA=E5=8D=95=E6=8D=AE=E7=9A=84=E6=95=B0=E6=8D=AE=E5=BD=95?= =?UTF-8?q?=E5=85=A52?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/dromara/cory/domain/BusContactformtemplate.java | 5 +++++ .../dromara/cory/domain/bo/BusContactformtemplateBo.java | 4 ++++ .../org/dromara/cory/domain/bo/BusContactnoticeBo.java | 9 ++++++++- .../dromara/cory/domain/vo/BusContactformtemplateVo.java | 6 ++++++ .../cory/service/impl/BusContactnoticeServiceImpl.java | 3 +-- 5 files changed, 24 insertions(+), 3 deletions(-) diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cory/domain/BusContactformtemplate.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cory/domain/BusContactformtemplate.java index 7c90e55f..6b6c8c01 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cory/domain/BusContactformtemplate.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cory/domain/BusContactformtemplate.java @@ -29,6 +29,11 @@ public class BusContactformtemplate extends BaseEntity { @TableId(value = "id") private Long id; + /** + * 项目ID + */ + private String projectId; + /** * 模板名称 */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cory/domain/bo/BusContactformtemplateBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cory/domain/bo/BusContactformtemplateBo.java index 49f20313..04b9f2ef 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cory/domain/bo/BusContactformtemplateBo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cory/domain/bo/BusContactformtemplateBo.java @@ -23,6 +23,10 @@ import org.springframework.web.multipart.MultipartFile; @AutoMapper(target = BusContactformtemplate.class, reverseConvertGenerate = false) public class BusContactformtemplateBo extends BaseEntity { + /** + * 项目ID + */ + private String projectId; /** * 模板名称 diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cory/domain/bo/BusContactnoticeBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cory/domain/bo/BusContactnoticeBo.java index 956de6b1..0aabefa2 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cory/domain/bo/BusContactnoticeBo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cory/domain/bo/BusContactnoticeBo.java @@ -1,5 +1,6 @@ package org.dromara.cory.domain.bo; +import org.dromara.common.core.validate.QueryGroup; import org.dromara.cory.domain.BusContactnotice; import org.dromara.common.mybatis.core.domain.BaseEntity; import org.dromara.common.core.validate.AddGroup; @@ -9,6 +10,8 @@ import lombok.Data; import lombok.EqualsAndHashCode; import jakarta.validation.constraints.*; +import java.util.List; + /** * 联系单业务对象 bus_contactnotice * @@ -38,5 +41,9 @@ public class BusContactnoticeBo extends BaseEntity { @NotBlank(message = "文档内容不能为空", groups = { AddGroup.class, EditGroup.class }) private String detail; - + /** + * 根据模板id，获取对应模板的所有数据 + */ + @NotNull(message = "模板类型不能为空", groups = { QueryGroup.class }) + private List types; } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cory/domain/vo/BusContactformtemplateVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cory/domain/vo/BusContactformtemplateVo.java index fb6c7fcf..93d962eb 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cory/domain/vo/BusContactformtemplateVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cory/domain/vo/BusContactformtemplateVo.java @@ -36,6 +36,12 @@ public class BusContactformtemplateVo implements Serializable { @ExcelProperty(value = "自增ID") private Long id; + /** + * 项目ID + */ + @ExcelProperty(value = "项目ID") + private String projectId; + /** * 模板名称 */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cory/service/impl/BusContactnoticeServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cory/service/impl/BusContactnoticeServiceImpl.java index 2c50d8e2..bbc1ce71 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cory/service/impl/BusContactnoticeServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cory/service/impl/BusContactnoticeServiceImpl.java @@ -73,8 +73,7 @@ public class BusContactnoticeServiceImpl implements IBusContactnoticeService { LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); lqw.orderByAsc(BusContactnotice::getId); lqw.eq(bo.getProjectId() != null, BusContactnotice::getProjectId, bo.getProjectId()); - lqw.eq(bo.getType() != null, BusContactnotice::getType, bo.getType()); - lqw.eq(StringUtils.isNotBlank(bo.getDetail()), BusContactnotice::getDetail, bo.getDetail()); + lqw.in(bo.getTypes() != null, BusContactnotice::getType, bo.getTypes()); return lqw; }