From 2ff35f6283de417c96b3faa9dd2b5ad6aad3f992 Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Sat, 18 Oct 2025 15:11:09 +0800 Subject: [PATCH] =?UTF-8?q?feat(oa):=20=E6=9B=B4=E6=96=B0=E4=BB=93?= =?UTF-8?q?=E5=BA=93=E4=B8=BB=E8=A1=A8remark=E4=BF=AE=E6=94=B9=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E5=8F=8A=E5=85=B3=E8=81=94=E9=9C=80=E6=B1=82=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 修改 updateRemark 接口，增加 requirementId 和 masterNum 参数 - 在 SysOaWarehouseMaster 实体中新增 requirementId 字段- 在 SysOaWarehouseMasterBo 业务对象中新增 requirementId 字段 - 在 SysOaWarehouseMasterVo 视图对象中新增 requirementId 和 requirementName 字段- 更新 Mapper XML 文件，增加 requirement_id 和 requirementName 的映射 - 在查询条件中增加对 requirementId 的过滤支持 - 关联 oa_requirements 表以获取 requirementName 数据 --- .../oa/controller/SysOaWarehouseMasterController.java | 7 +++++-- .../java/com/ruoyi/oa/domain/SysOaWarehouseMaster.java | 1 + .../com/ruoyi/oa/domain/bo/SysOaWarehouseMasterBo.java | 2 ++ .../com/ruoyi/oa/domain/vo/SysOaWarehouseMasterVo.java | 3 ++- .../ruoyi/oa/service/ISysOaWarehouseMasterService.java | 2 +- .../oa/service/impl/SysOaWarehouseMasterServiceImpl.java | 5 ++++- .../resources/mapper/oa/SysOaWarehouseMasterMapper.xml | 9 ++++++--- 7 files changed, 21 insertions(+), 8 deletions(-) diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/controller/SysOaWarehouseMasterController.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/controller/SysOaWarehouseMasterController.java index e4671ea..240731f 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/controller/SysOaWarehouseMasterController.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/controller/SysOaWarehouseMasterController.java @@ -173,7 +173,10 @@ public class SysOaWarehouseMasterController extends BaseController { * 单独修改remark */ @PutMapping("/updateRemark") - public R updateRemark(@RequestParam Long masterId, @RequestParam(required = false) String remark) { - return toAjax(iSysOaWarehouseMasterService.updateRemark(masterId, remark)); + public R updateRemark(@RequestParam Long masterId, + @RequestParam(required = false) String remark, + @RequestParam(required = false) Long requirementId, + @RequestParam(required = false) String masterNum) { + return toAjax(iSysOaWarehouseMasterService.updateRemark(masterId, remark, requirementId, masterNum)); } } diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/SysOaWarehouseMaster.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/SysOaWarehouseMaster.java index 7a54821..3c632af 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/SysOaWarehouseMaster.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/SysOaWarehouseMaster.java @@ -62,4 +62,5 @@ public class SysOaWarehouseMaster extends BaseEntity { private Integer returnType; private Integer withdrawLock; + private Long requirementId; } diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaWarehouseMasterBo.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaWarehouseMasterBo.java index 082c7b5..f343121 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaWarehouseMasterBo.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaWarehouseMasterBo.java @@ -78,4 +78,6 @@ public class SysOaWarehouseMasterBo extends BaseEntity { private Integer withdrawLock; + private Long requirementId; + } diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaWarehouseMasterVo.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaWarehouseMasterVo.java index b4ddda2..b5e43ac 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaWarehouseMasterVo.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaWarehouseMasterVo.java @@ -88,6 +88,7 @@ public class SysOaWarehouseMasterVo { */ private Integer logCount; private Integer withdrawLock; - + private Long requirementId; + private String requirementName; } diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/ISysOaWarehouseMasterService.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/ISysOaWarehouseMasterService.java index 1ec0640..ba3984d 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/ISysOaWarehouseMasterService.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/ISysOaWarehouseMasterService.java @@ -85,7 +85,7 @@ public interface ISysOaWarehouseMasterService { /** * 单独修改remark */ - Boolean updateRemark(Long masterId, String remark); + Boolean updateRemark(Long masterId, String remark, Long requirementId,String masterNum); int updateReturnType(Long masterId, Integer returnType); diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaWarehouseMasterServiceImpl.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaWarehouseMasterServiceImpl.java index 24683bb..1ad26bb 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaWarehouseMasterServiceImpl.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaWarehouseMasterServiceImpl.java @@ -89,6 +89,7 @@ public class SysOaWarehouseMasterServiceImpl implements ISysOaWarehouseMasterSer .eq(bo.getProjectId()!= null, "sowm.project_id", bo.getProjectId()) .eq(bo.getReturnType() != null, "sowm.return_type", bo.getReturnType()) .eq(bo.getWithdrawLock()!= null, "sowm.withdraw_lock", bo.getWithdrawLock()) + .eq(bo.getRequirementId() != null, "sowm.requirement_id", bo.getRequirementId()) // 其他过滤…… .eq("sowm.del_flag",0) .orderByDesc("sowm.update_time"); @@ -317,11 +318,13 @@ public class SysOaWarehouseMasterServiceImpl implements ISysOaWarehouseMasterSer } @Override - public Boolean updateRemark(Long masterId, String remark) { + public Boolean updateRemark(Long masterId, String remark,Long requirementId,String masterNum) { if (masterId == null) return false; SysOaWarehouseMaster update = new SysOaWarehouseMaster(); update.setMasterId(masterId); update.setRemark(remark); + update.setRequirementId(requirementId); + update.setMasterNum(masterNum); return baseMapper.updateById(update) > 0; } // 2. 修改returnType diff --git a/ruoyi-oa/src/main/resources/mapper/oa/SysOaWarehouseMasterMapper.xml b/ruoyi-oa/src/main/resources/mapper/oa/SysOaWarehouseMasterMapper.xml index eb5f09a..7437fd7 100644 --- a/ruoyi-oa/src/main/resources/mapper/oa/SysOaWarehouseMasterMapper.xml +++ b/ruoyi-oa/src/main/resources/mapper/oa/SysOaWarehouseMasterMapper.xml @@ -24,6 +24,8 @@ + +