From c2b6845ffd7f963d21d260708f88450e9d3213ae Mon Sep 17 00:00:00 2001 From: yjz <3131811435@qq.com> Date: Tue, 30 Jan 2024 18:42:39 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E4=BC=81=E6=A0=87=E7=A8=BD=E6=9F=A5):=20?= =?UTF-8?q?=E6=90=9C=E7=B4=A2=E8=BF=87=E6=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../enterprise/entity/vo/EnterpriseStandardInspectVo.java | 7 +++++++ .../service/impl/EnterpriseStandardInspectServiceImpl.java | 4 ++++ 2 files changed, 11 insertions(+) diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/vo/EnterpriseStandardInspectVo.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/vo/EnterpriseStandardInspectVo.java index 79e2142d..dadaac94 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/vo/EnterpriseStandardInspectVo.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/vo/EnterpriseStandardInspectVo.java @@ -209,4 +209,11 @@ public class EnterpriseStandardInspectVo { @ApiModelProperty(value = "稽查负责人 查询用") @TableField(exist = false) private String realname; + + /** + * filterIds 查询用 + */ + @ApiModelProperty(value = "filterIds 查询用") + @TableField(exist = false) + private String filterIds; } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardInspectServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardInspectServiceImpl.java index 650a04ce..cffbdbf3 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardInspectServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardInspectServiceImpl.java @@ -377,6 +377,10 @@ public class EnterpriseStandardInspectServiceImpl extends ServiceImpl list = Arrays.asList(enterpriseStandardInspectVo.getIds().split(",")); queryWrapper.in("id", list); } + if (StringUtils.isNotBlank(enterpriseStandardInspectVo.getFilterIds())){ + List list = Arrays.asList(enterpriseStandardInspectVo.getFilterIds().split(",")); + queryWrapper.notIn("id", list); + } String inspectStatus = enterpriseStandardInspectVo.getInspectStatus(); if (StringUtils.isNotBlank(inspectStatus)){ List list = Arrays.asList(inspectStatus.split(","));