!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:
+13
@@ -84,7 +84,20 @@ public class BgXiSpeakController extends JeecgController<BgXiSpeak, IBgXiSpeakSe
|
|||||||
HttpServletRequest req) {
|
HttpServletRequest req) {
|
||||||
String hasQuery = req.getParameter("hasQuery");
|
String hasQuery = req.getParameter("hasQuery");
|
||||||
if(hasQuery != null && "true".equals(hasQuery)){
|
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());
|
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);
|
List<BgXiSpeak> list = bgXiSpeakService.queryTreeListNoPage(queryWrapper);
|
||||||
IPage<BgXiSpeak> pageList = new Page<>(1, 10, list.size());
|
IPage<BgXiSpeak> pageList = new Page<>(1, 10, list.size());
|
||||||
pageList.setRecords(list);
|
pageList.setRecords(list);
|
||||||
|
|||||||
+25
@@ -86,7 +86,32 @@ public class BgTakepulseController extends JeecgController<BgTakepulse, IBgTakep
|
|||||||
// 自定义多选的查询规则为:LIKE_WITH_OR
|
// 自定义多选的查询规则为:LIKE_WITH_OR
|
||||||
customeRuleMap.put("year", QueryRuleEnum.LIKE_WITH_OR);
|
customeRuleMap.put("year", QueryRuleEnum.LIKE_WITH_OR);
|
||||||
customeRuleMap.put("taskType", 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);
|
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);
|
Page<BgTakepulse> page = new Page<BgTakepulse>(pageNo, pageSize);
|
||||||
IPage<BgTakepulse> pageList = bgTakepulseService.page(page, queryWrapper);
|
IPage<BgTakepulse> pageList = bgTakepulseService.page(page, queryWrapper);
|
||||||
return Result.OK(pageList);
|
return Result.OK(pageList);
|
||||||
|
|||||||
+1
@@ -17,6 +17,7 @@
|
|||||||
t.improve_measure as improveMeasure,
|
t.improve_measure as improveMeasure,
|
||||||
t.deadline,
|
t.deadline,
|
||||||
t.target_node as targetNode,
|
t.target_node as targetNode,
|
||||||
|
t.charge_leader_id as chargeLeaderId,
|
||||||
t.measure_res_leader as measureResLeader,
|
t.measure_res_leader as measureResLeader,
|
||||||
t.measure_res_dept as measureResDept,
|
t.measure_res_dept as measureResDept,
|
||||||
t.rectification_evidence as rectificationEvidence,
|
t.rectification_evidence as rectificationEvidence,
|
||||||
|
|||||||
+4
@@ -59,6 +59,10 @@ public class DqInspectTaskLedgerVo implements Serializable {
|
|||||||
@Schema(description = "目标节点")
|
@Schema(description = "目标节点")
|
||||||
private String targetNode;
|
private String targetNode;
|
||||||
|
|
||||||
|
@Dict(dictTable = "sys_user", dicText = "realname", dicCode = "username")
|
||||||
|
@Schema(description = "分管所领导")
|
||||||
|
private String chargeLeaderId;
|
||||||
|
|
||||||
@Dict(dictTable = "sys_user", dicText = "realname", dicCode = "username")
|
@Dict(dictTable = "sys_user", dicText = "realname", dicCode = "username")
|
||||||
@Schema(description = "措施责任领导")
|
@Schema(description = "措施责任领导")
|
||||||
private String measureResLeader;
|
private String measureResLeader;
|
||||||
|
|||||||
Reference in New Issue
Block a user