fix(稽查延期申请流程): 79405

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;
 }

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());