diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/devicecategory/DeviceCategoryController.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/devicecategory/DeviceCategoryController.java index 0c46e35..049d32b 100644 --- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/devicecategory/DeviceCategoryController.java +++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/devicecategory/DeviceCategoryController.java @@ -29,7 +29,7 @@ import cn.iocoder.yudao.module.erp.controller.admin.devicecategory.vo.*; import cn.iocoder.yudao.module.erp.dal.dataobject.devicecategory.DeviceCategoryDO; import cn.iocoder.yudao.module.erp.service.devicecategory.DeviceCategoryService; -@Tag(name = "管理后台 - 器械分类") +@Tag(name = "管理后台 - 进销存系统 - 器械分类") @RestController @RequestMapping("/erp/device-category") @Validated diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/devicecategory/vo/DeviceCategoryPageReqVO.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/devicecategory/vo/DeviceCategoryPageReqVO.java index d15fcd7..56b7976 100644 --- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/devicecategory/vo/DeviceCategoryPageReqVO.java +++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/devicecategory/vo/DeviceCategoryPageReqVO.java @@ -9,11 +9,11 @@ import java.time.LocalDateTime; import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; -@Schema(description = "管理后台 - 器械分类分页 Request VO") +@Schema(description = "管理后台 - 进销存系统 - 器械分类分页 Request VO") @Data public class DeviceCategoryPageReqVO extends PageParam { - @Schema(description = "分类名称(如 \"01 有源手术器械\"),业务核心字段,必填", example = "芋艿") + @Schema(description = "分类名称(如 \"01 有源手术器械\"),业务核心字段,必填", example = "赵六") private String categoryName; @Schema(description = "分类编号(如 \"1-8-8.2\"\"1-10-10.4\"),业务唯一标识(页面标*必填)") @@ -29,13 +29,7 @@ public class DeviceCategoryPageReqVO extends PageParam { @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private LocalDateTime[] createTime; - @Schema(description = "记录创建人(如 \"admin\"),用于追溯操作人") - private String createUser; - - @Schema(description = "记录最后更新人,数据首次创建时可为空,修改后自动填充") - private String updateUser; - - @Schema(description = "状态", example = "2") + @Schema(description = "状态", example = "1") private Integer status; } \ No newline at end of file diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/devicecategory/vo/DeviceCategoryRespVO.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/devicecategory/vo/DeviceCategoryRespVO.java index 5c39434..cc70d04 100644 --- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/devicecategory/vo/DeviceCategoryRespVO.java +++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/devicecategory/vo/DeviceCategoryRespVO.java @@ -7,16 +7,16 @@ import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; import cn.idev.excel.annotation.*; -@Schema(description = "管理后台 - 器械分类 Response VO") +@Schema(description = "管理后台 - 进销存系统 - 器械分类 Response VO") @Data @ExcelIgnoreUnannotated public class DeviceCategoryRespVO { - @Schema(description = "记录唯一标识,系统自动生成,用于数据关联和查询", requiredMode = Schema.RequiredMode.REQUIRED, example = "11153") + @Schema(description = "记录唯一标识,系统自动生成,用于数据关联和查询", requiredMode = Schema.RequiredMode.REQUIRED, example = "11049") @ExcelProperty("记录唯一标识,系统自动生成,用于数据关联和查询") private Integer id; - @Schema(description = "分类名称(如 \"01 有源手术器械\"),业务核心字段,必填", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋艿") + @Schema(description = "分类名称(如 \"01 有源手术器械\"),业务核心字段,必填", requiredMode = Schema.RequiredMode.REQUIRED, example = "赵六") @ExcelProperty("分类名称(如 \"01 有源手术器械\"),业务核心字段,必填") private String categoryName; @@ -36,15 +36,7 @@ public class DeviceCategoryRespVO { @ExcelProperty("记录创建时间,自动生成,用于数据审计") private LocalDateTime createTime; - @Schema(description = "记录创建人(如 \"admin\"),用于追溯操作人", requiredMode = Schema.RequiredMode.REQUIRED) - @ExcelProperty("记录创建人(如 \"admin\"),用于追溯操作人") - private String createUser; - - @Schema(description = "记录最后更新人,数据首次创建时可为空,修改后自动填充") - @ExcelProperty("记录最后更新人,数据首次创建时可为空,修改后自动填充") - private String updateUser; - - @Schema(description = "状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "2") + @Schema(description = "状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") @ExcelProperty("状态") private Integer status; diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/devicecategory/vo/DeviceCategorySaveReqVO.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/devicecategory/vo/DeviceCategorySaveReqVO.java index f2f50fb..182b7c0 100644 --- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/devicecategory/vo/DeviceCategorySaveReqVO.java +++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/devicecategory/vo/DeviceCategorySaveReqVO.java @@ -5,14 +5,14 @@ import lombok.*; import java.util.*; import javax.validation.constraints.*; -@Schema(description = "管理后台 - 器械分类新增/修改 Request VO") +@Schema(description = "管理后台 - 进销存系统 - 器械分类新增/修改 Request VO") @Data public class DeviceCategorySaveReqVO { - @Schema(description = "记录唯一标识,系统自动生成,用于数据关联和查询", requiredMode = Schema.RequiredMode.REQUIRED, example = "11153") + @Schema(description = "记录唯一标识,系统自动生成,用于数据关联和查询", requiredMode = Schema.RequiredMode.REQUIRED, example = "11049") private Integer id; - @Schema(description = "分类名称(如 \"01 有源手术器械\"),业务核心字段,必填", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋艿") + @Schema(description = "分类名称(如 \"01 有源手术器械\"),业务核心字段,必填", requiredMode = Schema.RequiredMode.REQUIRED, example = "赵六") @NotEmpty(message = "分类名称(如 \"01 有源手术器械\"),业务核心字段,必填不能为空") private String categoryName; @@ -27,14 +27,7 @@ public class DeviceCategorySaveReqVO { @Schema(description = "品名举例(如 \"移动式 LED 手术照明灯、LED 手术照明灯...\"),可选填") private String exampleNames; - @Schema(description = "记录创建人(如 \"admin\"),用于追溯操作人", requiredMode = Schema.RequiredMode.REQUIRED) - @NotEmpty(message = "记录创建人(如 \"admin\"),用于追溯操作人不能为空") - private String createUser; - - @Schema(description = "记录最后更新人,数据首次创建时可为空,修改后自动填充") - private String updateUser; - - @Schema(description = "状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "2") + @Schema(description = "状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") @NotNull(message = "状态不能为空") private Integer status; diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/devicecategory/DeviceCategoryDO.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/devicecategory/DeviceCategoryDO.java index 2591cf0..de57dc7 100644 --- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/devicecategory/DeviceCategoryDO.java +++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/devicecategory/DeviceCategoryDO.java @@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.annotation.*; import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; /** - * 器械分类 DO + * 进销存系统 - 器械分类 DO * * @author 芋道源码 */ @@ -43,14 +43,6 @@ public class DeviceCategoryDO extends BaseDO { * 品名举例(如 "移动式 LED 手术照明灯、LED 手术照明灯..."),可选填 */ private String exampleNames; - /** - * 记录创建人(如 "admin"),用于追溯操作人 - */ - private String createUser; - /** - * 记录最后更新人,数据首次创建时可为空,修改后自动填充 - */ - private String updateUser; /** * 状态 */ diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/devicecategory/DeviceCategoryMapper.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/devicecategory/DeviceCategoryMapper.java index 0063719..2b91b77 100644 --- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/devicecategory/DeviceCategoryMapper.java +++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/devicecategory/DeviceCategoryMapper.java @@ -24,8 +24,6 @@ public interface DeviceCategoryMapper extends BaseMapperX { .eqIfPresent(DeviceCategoryDO::getDeviceType, reqVO.getDeviceType()) .eqIfPresent(DeviceCategoryDO::getExampleNames, reqVO.getExampleNames()) .betweenIfPresent(DeviceCategoryDO::getCreateTime, reqVO.getCreateTime()) - .eqIfPresent(DeviceCategoryDO::getCreateUser, reqVO.getCreateUser()) - .eqIfPresent(DeviceCategoryDO::getUpdateUser, reqVO.getUpdateUser()) .eqIfPresent(DeviceCategoryDO::getStatus, reqVO.getStatus()) .orderByDesc(DeviceCategoryDO::getId)); } diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/devicecategory/DeviceCategoryService.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/devicecategory/DeviceCategoryService.java index f9534fc..7a33b49 100644 --- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/devicecategory/DeviceCategoryService.java +++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/devicecategory/DeviceCategoryService.java @@ -8,7 +8,7 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.pojo.PageParam; /** - * 器械分类 Service 接口 + * 进销存系统 - 器械分类 Service 接口 * * @author 芋道源码 */