From e2174bfb05793645560494aafa7f4e8880ddb2c0 Mon Sep 17 00:00:00 2001 From: "1378012178@qq.com" <1378012178@qq.com> Date: Mon, 27 Oct 2025 11:20:43 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=86=E5=8A=A0=E7=9B=9F=E6=9C=BA=E6=9E=84?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E3=80=81=E6=9C=BA=E6=9E=84=E5=8A=A0=E7=9B=9F?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E3=80=81=E6=9C=BA=E6=9E=84=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E5=8F=98=E6=9B=B4=E4=B8=89=E4=B8=AA=E5=8A=9F=E8=83=BD=E4=B8=AD?= =?UTF-8?q?=E6=90=9C=E7=B4=A2=E6=9D=A1=E4=BB=B6=E8=BF=9B=E8=A1=8C=E5=8F=98?= =?UTF-8?q?=E6=9B=B4=EF=BC=9A=E4=BC=81=E4=B8=9A=E5=90=8D=E7=A7=B0=E3=80=81?= =?UTF-8?q?=E8=81=94=E7=B3=BB=E4=BA=BA=E5=90=88=E5=B9=B6=E4=B8=BA=E4=B8=80?= =?UTF-8?q?=E4=B8=AA=E6=9F=A5=E8=AF=A2=E7=BB=84=E4=BB=B6=EF=BC=8C=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=97=B6=E5=90=8C=E6=97=B6=E6=A8=A1=E7=B3=8A=E5=8C=B9?= =?UTF-8?q?=E9=85=8D=E4=BC=81=E4=B8=9A=E5=90=8D=E7=A7=B0=E3=80=81=E8=81=94?= =?UTF-8?q?=E7=B3=BB=E4=BA=BA=E3=80=81=E8=81=94=E7=B3=BB=E7=94=B5=E8=AF=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/OrgApplyInfoController.java | 13 +++++- .../orgapplyinfo/entity/OrgApplyInfo.java | 3 ++ .../mapper/xml/OrgApplyInfoMapper.xml | 40 ++++++++++--------- 3 files changed, 36 insertions(+), 20 deletions(-) diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/controller/OrgApplyInfoController.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/controller/OrgApplyInfoController.java index 9140ecf..aad9baa 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/controller/OrgApplyInfoController.java +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/controller/OrgApplyInfoController.java @@ -12,6 +12,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import com.nu.modules.orgapplyinfo.entity.OrgAllInfo; +import org.apache.commons.lang.StringUtils; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.system.query.QueryRuleEnum; @@ -79,6 +80,10 @@ public class OrgApplyInfoController extends JeecgController queryWrapper = QueryGenerator.initQueryWrapper(orgApplyInfo, req.getParameterMap(), customeRuleMap); queryWrapper.in("status", new String[]{"1", "2", "3"}); Page page = new Page(pageNo, pageSize); + if (StringUtils.isNotBlank(orgApplyInfo.getTitle())) { + String value = orgApplyInfo.getTitle(); + queryWrapper.and(c -> c.like("com_name", value).or().like("org_leader", value).or().like("org_leader_phone", value)); + } IPage pageList = orgApplyInfoService.page(page, queryWrapper); return Result.OK(pageList); } @@ -106,6 +111,10 @@ public class OrgApplyInfoController extends JeecgController queryWrapper = QueryGenerator.initQueryWrapper(orgApplyInfo, req.getParameterMap(), customeRuleMap); queryWrapper.in("status", new String[]{"4", "5"}); Page page = new Page(pageNo, pageSize); + if (StringUtils.isNotBlank(orgApplyInfo.getTitle())) { + String value = orgApplyInfo.getTitle(); + queryWrapper.and(c -> c.like("com_name", value).or().like("org_leader", value).or().like("org_leader_phone", value)); + } IPage pageList = orgApplyInfoService.page(page, queryWrapper); return Result.OK(pageList); } @@ -271,8 +280,8 @@ public class OrgApplyInfoController extends JeecgController> getOrgByOpenId(@RequestParam(value = "openId", defaultValue = "", required = false) String openId, - @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, - @RequestParam(name = "pageSize", defaultValue = "8") Integer pageSize) { + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "8") Integer pageSize) { IPage page = new Page<>(pageNo, pageSize); IPage resultPage = orgApplyInfoService.getOrgByOpenId(page, openId); return Result.OK(resultPage); diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/entity/OrgApplyInfo.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/entity/OrgApplyInfo.java index 843500a..e8d92c5 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/entity/OrgApplyInfo.java +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/entity/OrgApplyInfo.java @@ -254,5 +254,8 @@ public class OrgApplyInfo implements Serializable { private java.lang.String workOrderStatus; private java.lang.String workOrderId; + @TableField(exist = false) + private String title; + } diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/mapper/xml/OrgApplyInfoMapper.xml b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/mapper/xml/OrgApplyInfoMapper.xml index 4a8082e..7c02b9a 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/mapper/xml/OrgApplyInfoMapper.xml +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/mapper/xml/OrgApplyInfoMapper.xml @@ -57,7 +57,11 @@ - AND d.depart_name LIKE CONCAT('%', #{title}, '%') + AND ( + d.depart_name LIKE CONCAT('%', #{title}, '%') + OR o.org_leader LIKE CONCAT('%', #{title}, '%') + OR o.org_leader_phone LIKE CONCAT('%', #{title}, '%') + ) order by (d.org_code + 0) asc @@ -111,7 +115,7 @@ - and eo.apply_type in + and eo.apply_type in #{item} @@ -123,20 +127,20 @@ order by eo.create_time DESC - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + +