From 4aba91abd9699d7aa38850506c905fdd7844ffc6 Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Mon, 22 Jun 2026 10:41:59 +0800 Subject: [PATCH] =?UTF-8?q?feat(flow):=20=E4=BF=AE=E6=94=B9=E5=8F=8D?= =?UTF-8?q?=E9=A6=88=E4=B8=8B=E5=8F=91=E5=8A=9F=E8=83=BD=E6=94=AF=E6=8C=81?= =?UTF-8?q?=E4=BC=A0=E5=85=A5=E9=83=A8=E9=97=A8=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 更新 ITsComplaintAcceptService 接口方法 feedbackDispatch，增加 deptIds 参数 - 修改 TsComplaintAcceptController 控制器，调整接口路径并接收部门ID列表参数 - 实现 TsComplaintAcceptServiceImpl 服务类，移除字典查询逻辑改为使用传入的部门ID列表 - 更新反馈下发业务逻辑，直接使用传入的部门ID创建执行反馈记录 - 移除对 flow_coil_objection 字典类型的依赖 - 调整参数验证逻辑，确保接受ID和部门ID列表均不为空 --- .../controller/TsComplaintAcceptController.java | 8 ++++---- .../flow/service/ITsComplaintAcceptService.java | 4 ++-- .../impl/TsComplaintAcceptServiceImpl.java | 16 ++++++---------- 3 files changed, 12 insertions(+), 16 deletions(-) diff --git a/klp-flow/src/main/java/com/klp/flow/controller/TsComplaintAcceptController.java b/klp-flow/src/main/java/com/klp/flow/controller/TsComplaintAcceptController.java index f53911f8..b6996062 100644 --- a/klp-flow/src/main/java/com/klp/flow/controller/TsComplaintAcceptController.java +++ b/klp-flow/src/main/java/com/klp/flow/controller/TsComplaintAcceptController.java @@ -115,9 +115,9 @@ public class TsComplaintAcceptController extends BaseController { * @param acceptId 受理单ID */ @Log(title = "反馈下发", businessType = BusinessType.UPDATE) - @PostMapping("/feedbackDispatch/{acceptId}") - public R feedbackDispatch(@NotNull(message = "主键不能为空") - @PathVariable Long acceptId) { - return toAjax(iTsComplaintAcceptService.feedbackDispatch(acceptId)); + @PostMapping("/feedbackDispatch") + public R feedbackDispatch(@RequestParam Long acceptId, + @RequestParam List deptIds) { + return toAjax(iTsComplaintAcceptService.feedbackDispatch(acceptId, deptIds)); } } diff --git a/klp-flow/src/main/java/com/klp/flow/service/ITsComplaintAcceptService.java b/klp-flow/src/main/java/com/klp/flow/service/ITsComplaintAcceptService.java index c1ab0a4a..be9a483b 100644 --- a/klp-flow/src/main/java/com/klp/flow/service/ITsComplaintAcceptService.java +++ b/klp-flow/src/main/java/com/klp/flow/service/ITsComplaintAcceptService.java @@ -53,7 +53,7 @@ public interface ITsComplaintAcceptService { Boolean opinionDispatch(Long acceptId); /** - * 反馈下发：修改flow_status=4，按字典flow_coil_objection部门创建执行反馈记录 + * 反馈下发：修改flow_status=4，按传入部门创建执行反馈记录 */ - Boolean feedbackDispatch(Long acceptId); + Boolean feedbackDispatch(Long acceptId, List deptIds); } diff --git a/klp-flow/src/main/java/com/klp/flow/service/impl/TsComplaintAcceptServiceImpl.java b/klp-flow/src/main/java/com/klp/flow/service/impl/TsComplaintAcceptServiceImpl.java index 14055776..127bb408 100644 --- a/klp-flow/src/main/java/com/klp/flow/service/impl/TsComplaintAcceptServiceImpl.java +++ b/klp-flow/src/main/java/com/klp/flow/service/impl/TsComplaintAcceptServiceImpl.java @@ -1,6 +1,7 @@ package com.klp.flow.service.impl; import cn.hutool.core.bean.BeanUtil; +import com.klp.common.core.domain.entity.SysDictData; import com.klp.common.core.page.TableDataInfo; import com.klp.common.core.domain.PageQuery; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -160,16 +161,11 @@ public class TsComplaintAcceptServiceImpl implements ITsComplaintAcceptService { /** * 反馈下发 - * 修改受理单flow_status=4，按字典flow_coil_objection的部门创建执行反馈记录 + * 修改受理单flow_status=4，按传入部门创建执行反馈记录 */ @Override - public Boolean feedbackDispatch(Long acceptId) { - if (acceptId == null) { - return false; - } - // 从sys_dict_data直查，根据dict_type=flow_coil_objection获取部门ID列表 - List dictList = sysDictDataService.selectDictDataByTypeRealtime("flow_coil_objection"); - if (dictList == null || dictList.isEmpty()) { + public Boolean feedbackDispatch(Long acceptId, List deptIds) { + if (acceptId == null || deptIds == null || deptIds.isEmpty()) { return false; } // 更新受理单流程状态为4（方案下发执行反馈中） @@ -178,10 +174,10 @@ public class TsComplaintAcceptServiceImpl implements ITsComplaintAcceptService { .set(TsComplaintAccept::getFlowStatus, 4L); baseMapper.update(null, uw); // 按部门创建执行反馈记录 - for (SysDictData dict : dictList) { + for (Long deptId : deptIds) { TsPlanExecuteRel rel = new TsPlanExecuteRel(); rel.setAcceptId(acceptId); - rel.setDeptId(Long.valueOf(dict.getDictValue())); + rel.setDeptId(deptId); rel.setExecuteStatus(0L); tsPlanExecuteRelMapper.insert(rel); }