diff --git a/src/main/java/cn/workde/module/drone/coding/vo/AttributeValueVo.java b/src/main/java/cn/workde/module/drone/coding/vo/AttributeValueVo.java new file mode 100644 index 0000000..7aa6de0 --- /dev/null +++ b/src/main/java/cn/workde/module/drone/coding/vo/AttributeValueVo.java @@ -0,0 +1,17 @@ +package cn.workde.module.drone.coding.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotBlank; +import lombok.Data; + +import java.util.List; + +@Data +public class AttributeValueVo { + + @Schema(description = "批次ID") + private String batchesId; + + @Schema(description = "属性ID集合") + private List attributeIdList; +} diff --git a/src/main/java/cn/workde/module/drone/coding/vo/AttributeVo.java b/src/main/java/cn/workde/module/drone/coding/vo/AttributeVo.java index 9ddc996..a669bb6 100644 --- a/src/main/java/cn/workde/module/drone/coding/vo/AttributeVo.java +++ b/src/main/java/cn/workde/module/drone/coding/vo/AttributeVo.java @@ -19,6 +19,6 @@ public class AttributeVo { private String attributeDescription; @Schema(description = "属性备注") - @NotBlank(message = "属性备注不能为空") +// @NotBlank(message = "属性备注不能为空") private String attributeRemarks; } diff --git a/src/main/java/cn/workde/module/drone/coding/wrapper/AttributeWrapper.java b/src/main/java/cn/workde/module/drone/coding/wrapper/AttributeWrapper.java index 75c051d..0db1a57 100644 --- a/src/main/java/cn/workde/module/drone/coding/wrapper/AttributeWrapper.java +++ b/src/main/java/cn/workde/module/drone/coding/wrapper/AttributeWrapper.java @@ -11,6 +11,7 @@ import cn.workde.module.drone.coding.service.AttributeClassificationService; import org.apache.ibatis.annotations.Param; import org.mapstruct.AfterMapping; import org.mapstruct.Mapper; +import org.mapstruct.MappingTarget; import org.mapstruct.factory.Mappers; @Mapper @@ -19,7 +20,7 @@ public interface AttributeWrapper extends BaseWrapper { AttributeWrapper INSTANCE = Mappers.getMapper(AttributeWrapper.class); @AfterMapping - default void setOtherField(@Param("obj") Attribute obj, @Param("dto") AttributeDto dto) { + default void setOtherField(@Param("obj") Attribute obj, @MappingTarget @Param("dto") AttributeDto dto) { BeanUtil.copyProperties(obj, dto); AttributeClassificationService attributeClassificationService = SpringUtil.getBean(AttributeClassificationService.class); AttributeClassification attributeClassification = attributeClassificationService.getById(obj.getAttributeClassificationId());