From 9bda2cbbefbe0da7a70c88cbae4e6df8a6a0a145 Mon Sep 17 00:00:00 2001 From: YBP Date: Sat, 28 Feb 2026 17:05:46 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=87=E4=BB=B6=E8=AE=B0=E5=BD=95=E7=94=B3?= =?UTF-8?q?=E8=AF=B7-=E4=BF=AE=E6=94=B9=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/admin/recordapply/vo/RecordApplyPageReqVO.java | 4 ++-- .../controller/admin/recordapply/vo/RecordApplyRespVO.java | 4 ++-- .../controller/admin/recordapply/vo/RecordApplySaveReqVO.java | 4 ++-- .../record/dal/dao/recordapply/RecordApplyMapper.java | 3 ++- .../record/dal/dataobject/recordapply/RecordApplyDO.java | 2 +- 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/controller/admin/recordapply/vo/RecordApplyPageReqVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/controller/admin/recordapply/vo/RecordApplyPageReqVO.java index b80f2bbd..e6def553 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/controller/admin/recordapply/vo/RecordApplyPageReqVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/controller/admin/recordapply/vo/RecordApplyPageReqVO.java @@ -26,10 +26,10 @@ public class RecordApplyPageReqVO extends PageParam { private String applyUserName; @Schema(description = "部门id") - private Long departmentId; + private Long applyDepartmentId; @Schema(description = "部门名称", example = "研发部") - private String departmentName; + private String applyDepartmentName; @Schema(description = "评审范围") private String reviewRange; diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/controller/admin/recordapply/vo/RecordApplyRespVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/controller/admin/recordapply/vo/RecordApplyRespVO.java index 1086c268..9ce41dce 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/controller/admin/recordapply/vo/RecordApplyRespVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/controller/admin/recordapply/vo/RecordApplyRespVO.java @@ -34,11 +34,11 @@ public class RecordApplyRespVO { @Schema(description = "部门id", requiredMode = Schema.RequiredMode.REQUIRED) @ExcelProperty("部门id") - private Long departmentId; + private Long applyDepartmentId; @Schema(description = "部门名称", example = "研发部") @ExcelProperty("部门名称") - private String departmentName; + private String applyDepartmentName; @Schema(description = "评审范围") @ExcelProperty("评审范围") diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/controller/admin/recordapply/vo/RecordApplySaveReqVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/controller/admin/recordapply/vo/RecordApplySaveReqVO.java index 77de6b06..55d988b9 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/controller/admin/recordapply/vo/RecordApplySaveReqVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/controller/admin/recordapply/vo/RecordApplySaveReqVO.java @@ -33,11 +33,11 @@ public class RecordApplySaveReqVO { @Schema(description = "部门id", requiredMode = Schema.RequiredMode.REQUIRED) @NotNull(message = "部门id不能为空") - private Long departmentId; + private Long applyDepartmentId; @Schema(description = "部门名称", example = "研发部") @ExcelProperty("部门名称") - private String departmentName; + private String applyDepartmentName; @Schema(description = "评审范围") private String reviewRange; diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/dal/dao/recordapply/RecordApplyMapper.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/dal/dao/recordapply/RecordApplyMapper.java index 4856d3b5..1d3cf9d9 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/dal/dao/recordapply/RecordApplyMapper.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/dal/dao/recordapply/RecordApplyMapper.java @@ -21,7 +21,8 @@ public interface RecordApplyMapper extends BaseMapperX { .eqIfPresent(RecordApplyDO::getBusinessType, reqVO.getBusinessType()) .eqIfPresent(RecordApplyDO::getApplyUserId, reqVO.getApplyUserId()) .likeIfPresent(RecordApplyDO::getApplyUserName, reqVO.getApplyUserName()) - .eqIfPresent(RecordApplyDO::getDepartmentCode, reqVO.getDepartmentCode()) + .eqIfPresent(RecordApplyDO::getApplyDepartmentName, reqVO.getApplyDepartmentName()) + .eqIfPresent(RecordApplyDO::getApplyDepartmentId, reqVO.getApplyDepartmentId()) .eqIfPresent(RecordApplyDO::getReviewRange, reqVO.getReviewRange()) .likeIfPresent(RecordApplyDO::getReviewUserName, reqVO.getReviewUserName()) .eqIfPresent(RecordApplyDO::getReviewUserIds, reqVO.getReviewUserIds()) diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/dal/dataobject/recordapply/RecordApplyDO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/dal/dataobject/recordapply/RecordApplyDO.java index c2085331..12dd4415 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/dal/dataobject/recordapply/RecordApplyDO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/dal/dataobject/recordapply/RecordApplyDO.java @@ -57,7 +57,7 @@ public class RecordApplyDO extends BusinessBaseDO { * 部门id */ @TableField("APL_DEPT_ID") - private Long applyDepartmentCode; + private Long applyDepartmentId; /** * 部门名称 */