From 3feb109bb6d1686c19f4da3e7443157cec1ec06b Mon Sep 17 00:00:00 2001 From: pengjie <17373303529@163.com> Date: Mon, 29 Apr 2024 09:34:54 +0800 Subject: [PATCH] =?UTF-8?q?BUG=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/government/GovEnterpriseScoreController.java | 3 +++ .../com/zhgd/xmgl/modules/safety/vo/EnterpriseScoreVo.java | 3 +++ 2 files changed, 6 insertions(+) diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovEnterpriseScoreController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovEnterpriseScoreController.java index 49a9deb..6dc58f0 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovEnterpriseScoreController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovEnterpriseScoreController.java @@ -130,6 +130,9 @@ public class GovEnterpriseScoreController { if (StringUtils.isNotBlank(enterpriseScoreVo.getEngineeringName())) { wrapper.like("engineering_name", enterpriseScoreVo.getEngineeringName()); } + if (StringUtils.isNotBlank(enterpriseScoreVo.getEnterpriseName())) { + wrapper.like("a.enterprise_name", enterpriseScoreVo.getEnterpriseName()); + } wrapper.lambda().isNotNull(EnterpriseScore::getScore); List list = enterpriseScoreService.pageList(wrapper); return Result.success(list); diff --git a/src/main/java/com/zhgd/xmgl/modules/safety/vo/EnterpriseScoreVo.java b/src/main/java/com/zhgd/xmgl/modules/safety/vo/EnterpriseScoreVo.java index ef3e14f..2fb8092 100644 --- a/src/main/java/com/zhgd/xmgl/modules/safety/vo/EnterpriseScoreVo.java +++ b/src/main/java/com/zhgd/xmgl/modules/safety/vo/EnterpriseScoreVo.java @@ -25,4 +25,7 @@ public class EnterpriseScoreVo { @ApiModelProperty(value="工程名称") private String engineeringName; + + @ApiModelProperty(value="工程名称") + private String enterpriseName; }