diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerAbilityController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerAbilityController.java index 537a66b..6c8be9f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerAbilityController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerAbilityController.java @@ -41,7 +41,7 @@ @ApiOperation("分包方业务能力列表(分页)") @PostMapping("/listPage") @ResponseBody - public ReturnDTO> userListPage(@RequestBody @Valid OutsourcerAbilityListRequest request, BindingResult bindingResult) throws Exception { + public ReturnDTO> abilityListPage(@RequestBody @Valid OutsourcerAbilityListRequest request, BindingResult bindingResult) throws Exception { if (bindingResult.hasErrors()) { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); } @@ -52,7 +52,7 @@ @ApiOperation("分包方业务能力列表") @PostMapping("/list") @ResponseBody - public ReturnDTO> userList(@RequestBody @Valid OutsourcerAbilityListRequest request, BindingResult bindingResult) throws Exception { + public ReturnDTO> abilityList(@RequestBody @Valid OutsourcerAbilityListRequest request, BindingResult bindingResult) throws Exception { if (bindingResult.hasErrors()) { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerAbilityController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerAbilityController.java index 537a66b..6c8be9f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerAbilityController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerAbilityController.java @@ -41,7 +41,7 @@ @ApiOperation("分包方业务能力列表(分页)") @PostMapping("/listPage") @ResponseBody - public ReturnDTO> userListPage(@RequestBody @Valid OutsourcerAbilityListRequest request, BindingResult bindingResult) throws Exception { + public ReturnDTO> abilityListPage(@RequestBody @Valid OutsourcerAbilityListRequest request, BindingResult bindingResult) throws Exception { if (bindingResult.hasErrors()) { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); } @@ -52,7 +52,7 @@ @ApiOperation("分包方业务能力列表") @PostMapping("/list") @ResponseBody - public ReturnDTO> userList(@RequestBody @Valid OutsourcerAbilityListRequest request, BindingResult bindingResult) throws Exception { + public ReturnDTO> abilityList(@RequestBody @Valid OutsourcerAbilityListRequest request, BindingResult bindingResult) throws Exception { if (bindingResult.hasErrors()) { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourcerAbility.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourcerAbility.java index a209c10..6cef20a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourcerAbility.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourcerAbility.java @@ -3,8 +3,12 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; import java.io.Serializable; /** @@ -15,6 +19,7 @@ * @author wangpeng * @since 2023-03-23 */ +@ApiModel @Data @TableName("business_outsourcer_ability") public class BusinessOutsourcerAbility implements Serializable { @@ -27,36 +32,44 @@ /** * 分包方id */ + @NotNull(message = "分包方id不能为空") + @ApiModelProperty(value = "分包方id", dataType = "Long") @TableField("outsourcer_id") private Long outsourcerId; /** * 能力名称 */ + @NotBlank(message = "能力名称不能为空") + @ApiModelProperty(value = "能力名称", dataType = "String") @TableField("ability_name") private String abilityName; /** * 能力描述 */ + @ApiModelProperty(value = "能力描述", dataType = "String") @TableField("ability_desc") private String abilityDesc; /** * 报价 */ + @ApiModelProperty(value = "报价", dataType = "String") @TableField("price") private String price; /** * 创建时间 */ + @ApiModelProperty(value = "创建时间(列表返回参数)", dataType = "String") @TableField("create_time") private String createTime; /** * 更新时间 */ + @ApiModelProperty(hidden = true) @TableField("update_time") private String updateTime; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerAbilityController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerAbilityController.java index 537a66b..6c8be9f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerAbilityController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerAbilityController.java @@ -41,7 +41,7 @@ @ApiOperation("分包方业务能力列表(分页)") @PostMapping("/listPage") @ResponseBody - public ReturnDTO> userListPage(@RequestBody @Valid OutsourcerAbilityListRequest request, BindingResult bindingResult) throws Exception { + public ReturnDTO> abilityListPage(@RequestBody @Valid OutsourcerAbilityListRequest request, BindingResult bindingResult) throws Exception { if (bindingResult.hasErrors()) { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); } @@ -52,7 +52,7 @@ @ApiOperation("分包方业务能力列表") @PostMapping("/list") @ResponseBody - public ReturnDTO> userList(@RequestBody @Valid OutsourcerAbilityListRequest request, BindingResult bindingResult) throws Exception { + public ReturnDTO> abilityList(@RequestBody @Valid OutsourcerAbilityListRequest request, BindingResult bindingResult) throws Exception { if (bindingResult.hasErrors()) { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourcerAbility.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourcerAbility.java index a209c10..6cef20a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourcerAbility.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourcerAbility.java @@ -3,8 +3,12 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; import java.io.Serializable; /** @@ -15,6 +19,7 @@ * @author wangpeng * @since 2023-03-23 */ +@ApiModel @Data @TableName("business_outsourcer_ability") public class BusinessOutsourcerAbility implements Serializable { @@ -27,36 +32,44 @@ /** * 分包方id */ + @NotNull(message = "分包方id不能为空") + @ApiModelProperty(value = "分包方id", dataType = "Long") @TableField("outsourcer_id") private Long outsourcerId; /** * 能力名称 */ + @NotBlank(message = "能力名称不能为空") + @ApiModelProperty(value = "能力名称", dataType = "String") @TableField("ability_name") private String abilityName; /** * 能力描述 */ + @ApiModelProperty(value = "能力描述", dataType = "String") @TableField("ability_desc") private String abilityDesc; /** * 报价 */ + @ApiModelProperty(value = "报价", dataType = "String") @TableField("price") private String price; /** * 创建时间 */ + @ApiModelProperty(value = "创建时间(列表返回参数)", dataType = "String") @TableField("create_time") private String createTime; /** * 更新时间 */ + @ApiModelProperty(hidden = true) @TableField("update_time") private String updateTime; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourcerUserInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourcerUserInfo.java index 868adb0..e8a042d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourcerUserInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourcerUserInfo.java @@ -3,8 +3,12 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; import java.io.Serializable; /** @@ -15,6 +19,7 @@ * @author wangpeng * @since 2023-03-23 */ +@ApiModel @Data @TableName("business_outsourcer_user_info") public class BusinessOutsourcerUserInfo implements Serializable { @@ -27,48 +32,59 @@ /** * 分包方id */ + @NotNull(message = "分包方id不能为空") + @ApiModelProperty(value = "分包方id", dataType = "Long") @TableField("outsourcer_id") private Long outsourcerId; /** * 人员编号-手动输入 */ + @NotBlank(message = "人员编号不能为空") + @ApiModelProperty(value = "人员编号-手动输入", dataType = "String") @TableField("user_no") private String userNo; /** * 名称 */ + @NotBlank(message = "人员名字不能为空") + @ApiModelProperty(value = "人员名字", dataType = "String") @TableField("name") private String name; /** * 部门 */ + @ApiModelProperty(value = "部门", dataType = "String") @TableField("department") private String department; /** * 职务 */ + @ApiModelProperty(value = "职务", dataType = "String") @TableField("job") private String job; /** * 联系方式 */ + @ApiModelProperty(value = "联系方式", dataType = "String") @TableField("phone") private String phone; /** * 创建时间 */ + @ApiModelProperty(value = "创建时间(列表返回参数)", dataType = "String") @TableField("create_time") private String createTime; /** * 更新时间 */ + @ApiModelProperty(hidden = true) @TableField("update_time") private String updateTime;