From dd5ce4bec455c91e75419debe0350d6c6995c95f Mon Sep 17 00:00:00 2001 From: zzz <1720989295@qq.com> Date: Tue, 16 Dec 2025 14:07:43 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E7=94=A8=E5=B7=A5=E5=85=B7=EF=BC=8C?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=B8=AD=E5=BF=83=E5=A2=9E=E5=8A=A0=E9=A1=B9?= =?UTF-8?q?=E7=9B=AEid?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/org/dromara/bigscreen/domain/BusSygj.java | 5 +++++ .../src/main/java/org/dromara/bigscreen/domain/BusWjzx.java | 4 ++++ .../java/org/dromara/bigscreen/domain/dto/BusSygjBo.java | 5 +++++ .../java/org/dromara/bigscreen/domain/dto/BusWjzxBo.java | 5 +++++ .../main/java/org/dromara/bigscreen/domain/vo/BusSygjVo.java | 5 +++++ .../main/java/org/dromara/bigscreen/domain/vo/BusWjzxVo.java | 5 +++++ .../dromara/bigscreen/service/impl/BusSygjServiceImpl.java | 1 + .../dromara/bigscreen/service/impl/BusWjzxServiceImpl.java | 1 + 8 files changed, 31 insertions(+) diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/domain/BusSygj.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/domain/BusSygj.java index 3c343c4c..1d16ca38 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/domain/BusSygj.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/domain/BusSygj.java @@ -37,6 +37,11 @@ public class BusSygj extends BaseEntity { */ private String gjUrl; + /** + * 项目id + */ + private Long projectId; + /** * 图片id diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/domain/BusWjzx.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/domain/BusWjzx.java index 4a270c9e..38638f70 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/domain/BusWjzx.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/domain/BusWjzx.java @@ -37,6 +37,10 @@ public class BusWjzx extends BaseEntity { */ private String wjId; + /** + * 项目id + */ + private Long projectId; /** diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/domain/dto/BusSygjBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/domain/dto/BusSygjBo.java index 396ece53..3d5a890b 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/domain/dto/BusSygjBo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/domain/dto/BusSygjBo.java @@ -36,6 +36,11 @@ public class BusSygjBo extends BaseEntity { */ private String gjUrl; + /** + * 项目id + */ + private Long projectId; + private Long imgId; /** diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/domain/dto/BusWjzxBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/domain/dto/BusWjzxBo.java index af6e7fce..9189c69f 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/domain/dto/BusWjzxBo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/domain/dto/BusWjzxBo.java @@ -31,6 +31,11 @@ public class BusWjzxBo extends BaseEntity { */ private String wjm; + /** + * 项目id + */ + private Long projectId; + /** * 文件上传路径 */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/domain/vo/BusSygjVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/domain/vo/BusSygjVo.java index 31715fdb..88b41b16 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/domain/vo/BusSygjVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/domain/vo/BusSygjVo.java @@ -46,6 +46,11 @@ public class BusSygjVo implements Serializable { @ExcelProperty(value = "工具路径") private String gjUrl; + /** + * 项目id + */ + private Long projectId; + /** * 审核标志 */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/domain/vo/BusWjzxVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/domain/vo/BusWjzxVo.java index be234e2e..9798dff1 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/domain/vo/BusWjzxVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/domain/vo/BusWjzxVo.java @@ -46,6 +46,11 @@ public class BusWjzxVo implements Serializable { @ExcelProperty(value = "文件上传路径") private String wjId; + /** + * 项目id + */ + private Long projectId; + /** * 文件描述 */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/service/impl/BusSygjServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/service/impl/BusSygjServiceImpl.java index e9811d95..79352472 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/service/impl/BusSygjServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/service/impl/BusSygjServiceImpl.java @@ -90,6 +90,7 @@ public class BusSygjServiceImpl extends ServiceImpl impl lqw.eq(StringUtils.isNotBlank(bo.getAuditStatus()), BusSygj::getAuditStatus, bo.getAuditStatus()); lqw.eq(StringUtils.isNotBlank(bo.getType()), BusSygj::getType, bo.getType()); lqw.eq(StringUtils.isNotBlank(bo.getGnms()), BusSygj::getGnms, bo.getGnms()); + lqw.eq(bo.getProjectId() != null , BusSygj::getProjectId, bo.getProjectId()); lqw.eq(bo.getCreateBy() != null, BusSygj::getCreateBy, bo.getCreateBy()); return lqw; } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/service/impl/BusWjzxServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/service/impl/BusWjzxServiceImpl.java index 0e70fa93..0c078ca5 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/service/impl/BusWjzxServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/service/impl/BusWjzxServiceImpl.java @@ -98,6 +98,7 @@ public class BusWjzxServiceImpl extends ServiceImpl impl LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); lqw.orderByDesc(BusWjzx::getId); lqw.like(StringUtils.isNotBlank(bo.getWjm()), BusWjzx::getWjm, bo.getWjm()); + lqw.eq(bo.getProjectId() != null, BusWjzx::getProjectId, bo.getProjectId()); lqw.eq(StringUtils.isNotBlank(bo.getAuditStatus()), BusWjzx::getAuditStatus, bo.getAuditStatus()); lqw.eq(bo.getCreateBy() != null, BusWjzx::getCreateBy, bo.getCreateBy()); return lqw;