diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/EnterpriseLawEnforcementBo.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/EnterpriseLawEnforcementBo.java index 9fa03060..98e5dab0 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/EnterpriseLawEnforcementBo.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/EnterpriseLawEnforcementBo.java @@ -195,4 +195,8 @@ public class EnterpriseLawEnforcementBo extends BaseEntity { private String checkHourEnd; + /** + * 多参数查询 + */ + private String queryParam; } diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EnterpriseLawEnforcementServiceImpl.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EnterpriseLawEnforcementServiceImpl.java index e8f37f84..693e3c2c 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EnterpriseLawEnforcementServiceImpl.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EnterpriseLawEnforcementServiceImpl.java @@ -77,7 +77,15 @@ public class EnterpriseLawEnforcementServiceImpl implements IEnterpriseLawEnforc Map params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); lqw.orderByAsc(EnterpriseLawEnforcement::getId); - lqw.eq(StringUtils.isNotBlank(bo.getLawEnforcement()), EnterpriseLawEnforcement::getLawEnforcement, bo.getLawEnforcement()); + + if (bo.getQueryParam()!= null && StringUtils.isNotBlank(bo.getQueryParam())){ + lqw.and(wrapper -> wrapper + .like(EnterpriseLawEnforcement::getBureauDeptName, bo.getQueryParam()) + .or() + .like(EnterpriseLawEnforcement::getCheckItemText, bo.getQueryParam()) + ); + } + lqw.eq(StringUtils.isNotBlank(bo.getLawEnforcementId()), EnterpriseLawEnforcement::getLawEnforcementId, bo.getLawEnforcementId()); lqw.eq(StringUtils.isNotBlank(bo.getEnterpriseId()), EnterpriseLawEnforcement::getEnterpriseId, bo.getEnterpriseId()); lqw.like(StringUtils.isNotBlank(bo.getEnterpriseName()), EnterpriseLawEnforcement::getEnterpriseName, bo.getEnterpriseName()); @@ -102,7 +110,7 @@ public class EnterpriseLawEnforcementServiceImpl implements IEnterpriseLawEnforc lqw.eq(bo.getIsReg() != null, EnterpriseLawEnforcement::getIsReg, bo.getIsReg()); lqw.eq(bo.getMainDeputyOrder() != null, EnterpriseLawEnforcement::getMainDeputyOrder, bo.getMainDeputyOrder()); lqw.eq(StringUtils.isNotBlank(bo.getTmpDeptJson()), EnterpriseLawEnforcement::getTmpDeptJson, bo.getTmpDeptJson()); - lqw.eq(StringUtils.isNotBlank(bo.getCheckItemText()), EnterpriseLawEnforcement::getCheckItemText, bo.getCheckItemText()); + lqw.eq(StringUtils.isNotBlank(bo.getCheckRequireText()), EnterpriseLawEnforcement::getCheckRequireText, bo.getCheckRequireText()); lqw.eq(StringUtils.isNotBlank(bo.getBureauDeptId()), EnterpriseLawEnforcement::getBureauDeptId, bo.getBureauDeptId()); lqw.like(StringUtils.isNotBlank(bo.getBureauDeptName()), EnterpriseLawEnforcement::getBureauDeptName, bo.getBureauDeptName());