From a3ff3d66e7bab700f55dce3ff2f617c6648187b9 Mon Sep 17 00:00:00 2001 From: wsm <8454518+new-twice@user.noreply.gitee.com> Date: Thu, 23 Jul 2026 08:00:11 +0000 Subject: [PATCH] =?UTF-8?q?!89=20fix(dqinspecttask):=20=E5=8F=B0=E8=B4=A6V?= =?UTF-8?q?O=E5=92=8Cmapper=E8=A1=A5=E5=85=85=E7=BC=BA=E5=A4=B1=E7=9A=84ch?= =?UTF-8?q?argeLeaderId=E5=AD=97=E6=AE=B5=EF=BC=8C=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E5=88=86=E7=AE=A1=E6=89=80=E9=A2=86=E5=AF=BC=E4=B8=8D=E6=98=BE?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix(dqinspecttask): 台账VO和mapper补充缺失的chargeLeaderId字段，修复分管所领导不显示 * feat(bqtakepulse): 牵头部门/协办部门筛选支持多选，FIND_IN_SET AND 逻辑 * feat(xispeak): 牵头部门筛选支持多选，FIND_IN_SET AND 逻辑 --- .../controller/BgXiSpeakController.java | 25 ++++++++++++++----- .../controller/BgTakepulseController.java | 25 +++++++++++++++++++ .../mapper/xml/DqInspectTaskMapper.xml | 1 + .../vo/DqInspectTaskLedgerVo.java | 4 +++ 4 files changed, 49 insertions(+), 6 deletions(-) diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/controller/BgXiSpeakController.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/controller/BgXiSpeakController.java index 2916b00..8f38989 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/controller/BgXiSpeakController.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/controller/BgXiSpeakController.java @@ -83,12 +83,25 @@ public class BgXiSpeakController extends JeecgController queryWrapper = QueryGenerator.initQueryWrapper(bgXiSpeak, req.getParameterMap()); - List list = bgXiSpeakService.queryTreeListNoPage(queryWrapper); - IPage pageList = new Page<>(1, 10, list.size()); - pageList.setRecords(list); - return Result.OK(pageList); + if(hasQuery != null && "true".equals(hasQuery)){ + String implDeptParam = req.getParameter("implDept"); + if (oConvertUtils.isNotEmpty(implDeptParam)) { + bgXiSpeak.setImplDept(null); + } + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(bgXiSpeak, req.getParameterMap()); + if (oConvertUtils.isNotEmpty(implDeptParam)) { + String[] deptIds = implDeptParam.split(","); + for (String id : deptIds) { + String trimmed = id.trim(); + if (oConvertUtils.isNotEmpty(trimmed)) { + queryWrapper.apply("FIND_IN_SET({0}, impl_dept)", trimmed); + } + } + } + List list = bgXiSpeakService.queryTreeListNoPage(queryWrapper); + IPage pageList = new Page<>(1, 10, list.size()); + pageList.setRecords(list); + return Result.OK(pageList); }else{ String parentId = bgXiSpeak.getPid(); if (oConvertUtils.isEmpty(parentId)) { diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bqtakepulse/controller/BgTakepulseController.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bqtakepulse/controller/BgTakepulseController.java index 716ccaf..fdc0d3f 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bqtakepulse/controller/BgTakepulseController.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bqtakepulse/controller/BgTakepulseController.java @@ -86,7 +86,32 @@ public class BgTakepulseController extends JeecgController queryWrapper = QueryGenerator.initQueryWrapper(bgTakepulse, req.getParameterMap(),customeRuleMap); + if (oConvertUtils.isNotEmpty(responDeptParam)) { + for (String id : responDeptParam.split(",")) { + String trimmed = id.trim(); + if (oConvertUtils.isNotEmpty(trimmed)) { + queryWrapper.apply("FIND_IN_SET({0}, respon_deptid)", trimmed); + } + } + } + if (oConvertUtils.isNotEmpty(assistDeptParam)) { + for (String id : assistDeptParam.split(",")) { + String trimmed = id.trim(); + if (oConvertUtils.isNotEmpty(trimmed)) { + queryWrapper.apply("FIND_IN_SET({0}, assist_deptid)", trimmed); + } + } + } Page page = new Page(pageNo, pageSize); IPage pageList = bgTakepulseService.page(page, queryWrapper); return Result.OK(pageList); diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/mapper/xml/DqInspectTaskMapper.xml b/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/mapper/xml/DqInspectTaskMapper.xml index bba9dd6..84f8a70 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/mapper/xml/DqInspectTaskMapper.xml +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/mapper/xml/DqInspectTaskMapper.xml @@ -17,6 +17,7 @@ t.improve_measure as improveMeasure, t.deadline, t.target_node as targetNode, + t.charge_leader_id as chargeLeaderId, t.measure_res_leader as measureResLeader, t.measure_res_dept as measureResDept, t.rectification_evidence as rectificationEvidence, diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/vo/DqInspectTaskLedgerVo.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/vo/DqInspectTaskLedgerVo.java index 87e3f8d..e555250c 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/vo/DqInspectTaskLedgerVo.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/vo/DqInspectTaskLedgerVo.java @@ -59,6 +59,10 @@ public class DqInspectTaskLedgerVo implements Serializable { @Schema(description = "目标节点") private String targetNode; + @Dict(dictTable = "sys_user", dicText = "realname", dicCode = "username") + @Schema(description = "分管所领导") + private String chargeLeaderId; + @Dict(dictTable = "sys_user", dicText = "realname", dicCode = "username") @Schema(description = "措施责任领导") private String measureResLeader;