From 6e28f6f2fc350e40cf85feeb9622e7d466919d09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Mon, 8 Jun 2026 08:29:29 +0800 Subject: [PATCH] =?UTF-8?q?feat(todo):=20=E6=9B=B4=E6=96=B0=E5=B7=A5?= =?UTF-8?q?=E5=8D=95=E5=BE=85=E5=8A=9E=E4=BA=8B=E9=A1=B9=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BB=A5=E6=94=AF=E6=8C=81=E6=96=B0=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在 IQmsIssueTicketToDoService 中更新 search 方法参数类型 - 在 QmsIssueTicketTodoController 中更新接口参数类型 - 在 QmsIssueTicketTodoControllerService 中更新服务层参数类型 - 新增 QmsIssueTicketTodoItemSearchQO 查询对象类 - 在 QmsIssueTicketToDoMapper 中更新数据库查询方法参数 - 在 QmsIssueTicketToDoServiceImpl 中更新实现方法参数类型 --- .../QmsIssueTicketTodoController.java | 3 ++- .../QmsIssueTicketTodoControllerService.java | 3 ++- .../qo/QmsIssueTicketTodoItemSearchQO.java | 22 +++++++++++++++++++ .../mapper/QmsIssueTicketToDoMapper.java | 3 ++- .../service/IQmsIssueTicketToDoService.java | 3 ++- .../impl/QmsIssueTicketToDoServiceImpl.java | 3 ++- 6 files changed, 32 insertions(+), 5 deletions(-) create mode 100644 nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsIssueTicketTodoItemSearchQO.java diff --git a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/controller/QmsIssueTicketTodoController.java b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/controller/QmsIssueTicketTodoController.java index 86dd2a58..30aa33da 100644 --- a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/controller/QmsIssueTicketTodoController.java +++ b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/controller/QmsIssueTicketTodoController.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.nflg.qms.admin.service.QmsIssueTicketTodoControllerService; import com.nflg.wms.common.pojo.ApiResult; import com.nflg.wms.common.pojo.PageData; +import com.nflg.wms.common.pojo.qo.QmsIssueTicketTodoItemSearchQO; import com.nflg.wms.common.pojo.qo.QmsTodoItemSearchQO; import com.nflg.wms.common.pojo.vo.IssueTicketTodoNotReadNumVO; import com.nflg.wms.common.pojo.vo.QmsIssueTicketToDoVO; @@ -26,7 +27,7 @@ public class QmsIssueTicketTodoController extends BaseController { * 查询 */ @PostMapping("search") - public ApiResult> search(@Valid @RequestBody QmsTodoItemSearchQO request) { + public ApiResult> search(@Valid @RequestBody QmsIssueTicketTodoItemSearchQO request) { IPage page = qmsIssueTicketTodoControllerService.search(request); return ApiResult.success(page); } diff --git a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsIssueTicketTodoControllerService.java b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsIssueTicketTodoControllerService.java index 033fa204..025d8bea 100644 --- a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsIssueTicketTodoControllerService.java +++ b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsIssueTicketTodoControllerService.java @@ -3,6 +3,7 @@ package com.nflg.qms.admin.service; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.nflg.wms.common.pojo.qo.QmsIssueTicketTodoItemSearchQO; import com.nflg.wms.common.pojo.qo.QmsTodoItemSearchQO; import com.nflg.wms.common.pojo.vo.IssueTicketTodoNotReadNumVO; import com.nflg.wms.common.pojo.vo.QmsIssueTicketToDoVO; @@ -28,7 +29,7 @@ public class QmsIssueTicketTodoControllerService { /** * 分页查询待办事项列表 */ - public IPage search(QmsTodoItemSearchQO request) { + public IPage search(QmsIssueTicketTodoItemSearchQO request) { IPage pageData = issueTicketToDoService.search(request); if (CollectionUtil.isNotEmpty(pageData.getRecords())) { pageData.getRecords().forEach(item -> { diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsIssueTicketTodoItemSearchQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsIssueTicketTodoItemSearchQO.java new file mode 100644 index 00000000..c6f7ca05 --- /dev/null +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsIssueTicketTodoItemSearchQO.java @@ -0,0 +1,22 @@ +package com.nflg.wms.common.pojo.qo; + +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 工单待办事项 列表查询参数 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class QmsIssueTicketTodoItemSearchQO extends SearchBaseQO { + + /** + * 标题 + */ + private String title; + + /** + * 来源类型：0=IQC检测任务，1=PDI检测任务，2=巡检，3=PQC检测任务 + */ + private Integer sourceType; +} diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/QmsIssueTicketToDoMapper.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/QmsIssueTicketToDoMapper.java index 3ac073c5..e18ea632 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/QmsIssueTicketToDoMapper.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/QmsIssueTicketToDoMapper.java @@ -3,6 +3,7 @@ package com.nflg.wms.repository.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.nflg.wms.common.pojo.qo.QmsIssueTicketTodoItemSearchQO; import com.nflg.wms.common.pojo.qo.QmsTodoItemSearchQO; import com.nflg.wms.common.pojo.vo.IssueTicketTodoNotReadNumVO; import com.nflg.wms.common.pojo.vo.QmsIssueTicketToDoVO; @@ -13,7 +14,7 @@ import com.nflg.wms.repository.entity.QmsIssueTicketToDo; */ public interface QmsIssueTicketToDoMapper extends BaseMapper { - IPage search(QmsTodoItemSearchQO request, Long userId, Page page); + IPage search(QmsIssueTicketTodoItemSearchQO request, Long userId, Page page); IssueTicketTodoNotReadNumVO getCount(Long userId); diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IQmsIssueTicketToDoService.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IQmsIssueTicketToDoService.java index d0b1a281..e8551e71 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IQmsIssueTicketToDoService.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IQmsIssueTicketToDoService.java @@ -2,6 +2,7 @@ package com.nflg.wms.repository.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; +import com.nflg.wms.common.pojo.qo.QmsIssueTicketTodoItemSearchQO; import com.nflg.wms.common.pojo.qo.QmsTodoItemSearchQO; import com.nflg.wms.common.pojo.vo.IssueTicketTodoNotReadNumVO; import com.nflg.wms.common.pojo.vo.QmsIssueTicketToDoVO; @@ -15,7 +16,7 @@ public interface IQmsIssueTicketToDoService extends IService /** * 分页查询待办事项列表 */ - IPage search(QmsTodoItemSearchQO request); + IPage search(QmsIssueTicketTodoItemSearchQO request); void processed(Long id); diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/QmsIssueTicketToDoServiceImpl.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/QmsIssueTicketToDoServiceImpl.java index 710ed868..087f7de0 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/QmsIssueTicketToDoServiceImpl.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/QmsIssueTicketToDoServiceImpl.java @@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.nflg.wms.common.pojo.qo.QmsIssueTicketTodoItemSearchQO; import com.nflg.wms.common.pojo.qo.QmsTodoItemSearchQO; import com.nflg.wms.common.pojo.vo.IssueTicketTodoNotReadNumVO; import com.nflg.wms.common.pojo.vo.QmsIssueTicketToDoVO; @@ -24,7 +25,7 @@ public class QmsIssueTicketToDoServiceImpl implements IQmsIssueTicketToDoService { @Override - public IPage search(QmsTodoItemSearchQO request) { + public IPage search(QmsIssueTicketTodoItemSearchQO request) { IPage pageData = baseMapper.search(request, UserUtil.getUserId(), new Page<>(request.getPage(), request.getPageSize())); if (CollectionUtil.isNotEmpty(pageData.getRecords())) { List ticketIds = pageData.getRecords()