From 240ad5bb577aa8f5fb686d68f79886e7871f51d8 Mon Sep 17 00:00:00 2001
From: yjz <3131811435@qq.com>
Date: Mon, 18 Dec 2023 17:08:31 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E7=A8=BD=E6=9F=A5=E5=BB=B6=E6=9C=9F?=
 =?UTF-8?q?=E7=94=B3=E8=AF=B7=E6=B5=81=E7=A8=8B):=2079405?=
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 | 5 +++++
 2 files changed, 12 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 b8d56c54..97f1863a 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
@@ -145,4 +145,11 @@ public class EnterpriseStandardInspectVo {
     @ApiModelProperty(value = "创建日期 查询用")
     @TableField(exist = false)
     private String createDate;
+
+    /**
+     * 企标编号/企标名称 查询用
+     */
+    @ApiModelProperty(value = "企标编号/企标名称 查询用")
+    @TableField(exist = false)
+    private String inspectNoOrName;
 }
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 47ccb843..61f52f9f 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
@@ -232,6 +232,11 @@ public class EnterpriseStandardInspectServiceImpl extends ServiceImpl<Enterprise
             String[] date = enterpriseStandardInspectVo.getCreateDate().split(",");
             queryWrapper.between("create_time", date[0], date[1]);
         }
+        if (StringUtils.isNotBlank(enterpriseStandardInspectVo.getInspectNoOrName())){
+            queryWrapper.and(qw ->
+                    qw.eq("inspect_no", enterpriseStandardInspectVo.getInspectNoOrName())
+                            .or().eq("inspect_name", enterpriseStandardInspectVo.getInspectNoOrName()));
+        }
         queryWrapper.eq(StringUtils.isNotBlank(enterpriseStandardInspectVo.getBelongDept()), "belong_dept", enterpriseStandardInspectVo.getBelongDept());
         queryWrapper.eq(StringUtils.isNotBlank(enterpriseStandardInspectVo.getInspectNo()), "inspect_no", enterpriseStandardInspectVo.getInspectNo());
         queryWrapper.eq(StringUtils.isNotBlank(enterpriseStandardInspectVo.getInspectName()), "inspect_name", enterpriseStandardInspectVo.getInspectName());