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;