!89 fix(dqinspecttask): 台账VO和mapper补充缺失的chargeLeaderId字段,修复分管所领导不显示

* fix(dqinspecttask): 台账VO和mapper补充缺失的chargeLeaderId字段,修复分管所领导不显示
* feat(bqtakepulse): 牵头部门/协办部门筛选支持多选,FIND_IN_SET AND 逻辑
* feat(xispeak): 牵头部门筛选支持多选,FIND_IN_SET AND 逻辑
This commit is contained in:
wsm
2026-07-23 08:00:11 +00:00
parent 8b747dccda
commit a3ff3d66e7
4 changed files with 49 additions and 6 deletions
@@ -83,12 +83,25 @@ public class BgXiSpeakController extends JeecgController<BgXiSpeak, IBgXiSpeakSe
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
String hasQuery = req.getParameter("hasQuery");
if(hasQuery != null && "true".equals(hasQuery)){
QueryWrapper<BgXiSpeak> queryWrapper = QueryGenerator.initQueryWrapper(bgXiSpeak, req.getParameterMap());
List<BgXiSpeak> list = bgXiSpeakService.queryTreeListNoPage(queryWrapper);
IPage<BgXiSpeak> 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<BgXiSpeak> 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<BgXiSpeak> list = bgXiSpeakService.queryTreeListNoPage(queryWrapper);
IPage<BgXiSpeak> pageList = new Page<>(1, 10, list.size());
pageList.setRecords(list);
return Result.OK(pageList);
}else{
String parentId = bgXiSpeak.getPid();
if (oConvertUtils.isEmpty(parentId)) {
@@ -86,7 +86,32 @@ public class BgTakepulseController extends JeecgController<BgTakepulse, IBgTakep
// 自定义多选的查询规则为:LIKE_WITH_OR
customeRuleMap.put("year", QueryRuleEnum.LIKE_WITH_OR);
customeRuleMap.put("taskType", QueryRuleEnum.LIKE_WITH_OR);
// 牵头部门和协办部门支持多选 FIND_IN_SET AND 逻辑
String responDeptParam = req.getParameter("responDeptid");
String assistDeptParam = req.getParameter("assistDeptid");
if (oConvertUtils.isNotEmpty(responDeptParam)) {
bgTakepulse.setResponDeptid(null);
}
if (oConvertUtils.isNotEmpty(assistDeptParam)) {
bgTakepulse.setAssistDeptid(null);
}
QueryWrapper<BgTakepulse> 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<BgTakepulse> page = new Page<BgTakepulse>(pageNo, pageSize);
IPage<BgTakepulse> pageList = bgTakepulseService.page(page, queryWrapper);
return Result.OK(pageList);
@@ -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,
@@ -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;