From 9d421952a63447086f72577bd3a7f6104050f1da Mon Sep 17 00:00:00 2001 From: Yen Date: Wed, 9 Nov 2022 10:34:43 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../TbsActivityCenterController.java | 4 +- .../TbsActivityCenterGoodsController.java | 4 +- .../TbsActivityChannelController.java | 4 +- .../TbsActivityChannelPointController.java | 4 +- .../tbs/controller/TbsActivityController.java | 4 +- .../TbsActivityGoodsController.java | 4 +- .../TbsBudgetConditionController.java | 4 +- .../tbs/controller/TbsBudgetController.java | 4 +- .../controller/TbsCostApplyController.java | 4 +- .../tbs/controller/TbsScheduleController.java | 4 +- .../TbsScheduleItemBudgetController.java | 4 +- .../controller/TbsScheduleItemController.java | 4 +- .../modules/tbs/entity/bo/TbsActivityBo.java | 29 ++++++++++---- .../tbs/entity/bo/TbsActivityCenterBo.java | 30 +++++++++++--- .../entity/bo/TbsActivityCenterGoodsBo.java | 39 ++++++++++++++++--- .../tbs/entity/bo/TbsActivityChannelBo.java | 22 ++++++++--- .../entity/bo/TbsActivityChannelPointBo.java | 26 ++++++++++--- .../tbs/entity/bo/TbsActivityGoodsBo.java | 26 ++++++++++--- .../modules/tbs/entity/bo/TbsBudgetBo.java | 29 +++++++++++--- .../tbs/entity/bo/TbsBudgetConditionBo.java | 25 +++++++++--- .../modules/tbs/entity/bo/TbsCostApplyBo.java | 22 ++++++++--- .../modules/tbs/entity/bo/TbsScheduleBo.java | 18 ++++++--- .../tbs/entity/bo/TbsScheduleItemBo.java | 25 ++++++++---- .../entity/bo/TbsScheduleItemBudgetBo.java | 26 +++++++++---- .../entity/vo/TbsActivityCenterGoodsVo.java | 29 +------------- .../tbs/entity/vo/TbsActivityCenterVo.java | 23 ++--------- .../entity/vo/TbsActivityChannelPointVo.java | 16 +------- .../tbs/entity/vo/TbsActivityChannelVo.java | 12 +----- .../tbs/entity/vo/TbsActivityGoodsVo.java | 16 +------- .../modules/tbs/entity/vo/TbsActivityVo.java | 16 ++------ .../tbs/entity/vo/TbsBudgetConditionVo.java | 14 +------ .../modules/tbs/entity/vo/TbsBudgetVo.java | 18 +-------- .../modules/tbs/entity/vo/TbsCostApplyVo.java | 30 -------------- .../entity/vo/TbsScheduleItemBudgetVo.java | 12 +----- .../tbs/entity/vo/TbsScheduleItemVo.java | 10 +---- .../modules/tbs/entity/vo/TbsScheduleVo.java | 7 +--- 36 files changed, 289 insertions(+), 279 deletions(-) diff --git a/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityCenterController.java b/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityCenterController.java index d4053331..98629489 100644 --- a/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityCenterController.java +++ b/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityCenterController.java @@ -41,7 +41,7 @@ public class TbsActivityCenterController { */ @GetMapping("/list") @PreAuthorize("hasRole('tbs:activityCenter:query')") - public R> getPage(TbsActivityCenterVo param){ + public R> getList(TbsActivityCenterVo param){ TbsActivityCenter entity = CopierUtil.copy(param,new TbsActivityCenter()); LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(entity); PageUtil.startPage(); @@ -56,7 +56,7 @@ public class TbsActivityCenterController { */ @GetMapping("/page") @PreAuthorize("hasRole('tbs:activityCenter:query')") - public R> getPage(TbsActivityCenter param){ + public R> getPage(TbsActivityCenterVo param){ TbsActivityCenter entity = CopierUtil.copy(param,new TbsActivityCenter()); LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(entity); PageUtil.startPage(); diff --git a/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityCenterGoodsController.java b/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityCenterGoodsController.java index fbf9190f..a380f0fb 100644 --- a/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityCenterGoodsController.java +++ b/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityCenterGoodsController.java @@ -41,7 +41,7 @@ public class TbsActivityCenterGoodsController { */ @GetMapping("/list") @PreAuthorize("hasRole('tbs:activityCenterGoods:query')") - public R> getPage(TbsActivityCenterGoodsVo param){ + public R> getList(TbsActivityCenterGoodsVo param){ TbsActivityCenterGoods entity = CopierUtil.copy(param,new TbsActivityCenterGoods()); LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(entity); PageUtil.startPage(); @@ -56,7 +56,7 @@ public class TbsActivityCenterGoodsController { */ @GetMapping("/page") @PreAuthorize("hasRole('tbs:activityCenterGoods:query')") - public R> getPage(TbsActivityCenterGoods param){ + public R> getPage(TbsActivityCenterGoodsVo param){ TbsActivityCenterGoods entity = CopierUtil.copy(param,new TbsActivityCenterGoods()); LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(entity); PageUtil.startPage(); diff --git a/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityChannelController.java b/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityChannelController.java index e8df809d..b5e83773 100644 --- a/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityChannelController.java +++ b/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityChannelController.java @@ -41,7 +41,7 @@ public class TbsActivityChannelController { */ @GetMapping("/list") @PreAuthorize("hasRole('tbs:activityChannel:query')") - public R> getPage(TbsActivityChannelVo param){ + public R> getList(TbsActivityChannelVo param){ TbsActivityChannel entity = CopierUtil.copy(param,new TbsActivityChannel()); LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(entity); PageUtil.startPage(); @@ -56,7 +56,7 @@ public class TbsActivityChannelController { */ @GetMapping("/page") @PreAuthorize("hasRole('tbs:activityChannel:query')") - public R> getPage(TbsActivityChannel param){ + public R> getPage(TbsActivityChannelVo param){ TbsActivityChannel entity = CopierUtil.copy(param,new TbsActivityChannel()); LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(entity); PageUtil.startPage(); diff --git a/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityChannelPointController.java b/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityChannelPointController.java index c9cdca7e..05a6bfdc 100644 --- a/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityChannelPointController.java +++ b/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityChannelPointController.java @@ -41,7 +41,7 @@ public class TbsActivityChannelPointController { */ @GetMapping("/list") @PreAuthorize("hasRole('tbs:activityChannelPoint:query')") - public R> getPage(TbsActivityChannelPointVo param){ + public R> getList(TbsActivityChannelPointVo param){ TbsActivityChannelPoint entity = CopierUtil.copy(param,new TbsActivityChannelPoint()); LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(entity); PageUtil.startPage(); @@ -56,7 +56,7 @@ public class TbsActivityChannelPointController { */ @GetMapping("/page") @PreAuthorize("hasRole('tbs:activityChannelPoint:query')") - public R> getPage(TbsActivityChannelPoint param){ + public R> getPage(TbsActivityChannelPointVo param){ TbsActivityChannelPoint entity = CopierUtil.copy(param,new TbsActivityChannelPoint()); LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(entity); PageUtil.startPage(); diff --git a/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityController.java b/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityController.java index 971f4516..6e948044 100644 --- a/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityController.java +++ b/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityController.java @@ -41,7 +41,7 @@ public class TbsActivityController { */ @GetMapping("/list") @PreAuthorize("hasRole('tbs:activity:query')") - public R> getPage(TbsActivityVo param){ + public R> getList(TbsActivityVo param){ TbsActivity entity = CopierUtil.copy(param,new TbsActivity()); LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(entity); PageUtil.startPage(); @@ -56,7 +56,7 @@ public class TbsActivityController { */ @GetMapping("/page") @PreAuthorize("hasRole('tbs:activity:query')") - public R> getPage(TbsActivity param){ + public R> getPage(TbsActivityVo param){ TbsActivity entity = CopierUtil.copy(param,new TbsActivity()); LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(entity); PageUtil.startPage(); diff --git a/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityGoodsController.java b/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityGoodsController.java index 37d704d1..9c7e7403 100644 --- a/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityGoodsController.java +++ b/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityGoodsController.java @@ -41,7 +41,7 @@ public class TbsActivityGoodsController { */ @GetMapping("/list") @PreAuthorize("hasRole('tbs:activityGoods:query')") - public R> getPage(TbsActivityGoodsVo param){ + public R> getList(TbsActivityGoodsVo param){ TbsActivityGoods entity = CopierUtil.copy(param,new TbsActivityGoods()); LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(entity); PageUtil.startPage(); @@ -56,7 +56,7 @@ public class TbsActivityGoodsController { */ @GetMapping("/page") @PreAuthorize("hasRole('tbs:activityGoods:query')") - public R> getPage(TbsActivityGoods param){ + public R> getPage(TbsActivityGoodsVo param){ TbsActivityGoods entity = CopierUtil.copy(param,new TbsActivityGoods()); LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(entity); PageUtil.startPage(); diff --git a/src/main/java/com/qs/serve/modules/tbs/controller/TbsBudgetConditionController.java b/src/main/java/com/qs/serve/modules/tbs/controller/TbsBudgetConditionController.java index d886c1a6..4c7c0a69 100644 --- a/src/main/java/com/qs/serve/modules/tbs/controller/TbsBudgetConditionController.java +++ b/src/main/java/com/qs/serve/modules/tbs/controller/TbsBudgetConditionController.java @@ -41,7 +41,7 @@ public class TbsBudgetConditionController { */ @GetMapping("/list") @PreAuthorize("hasRole('tbs:budgetCondition:query')") - public R> getPage(TbsBudgetConditionVo param){ + public R> getList(TbsBudgetConditionVo param){ TbsBudgetCondition entity = CopierUtil.copy(param,new TbsBudgetCondition()); LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(entity); PageUtil.startPage(); @@ -56,7 +56,7 @@ public class TbsBudgetConditionController { */ @GetMapping("/page") @PreAuthorize("hasRole('tbs:budgetCondition:query')") - public R> getPage(TbsBudgetCondition param){ + public R> getPage(TbsBudgetConditionVo param){ TbsBudgetCondition entity = CopierUtil.copy(param,new TbsBudgetCondition()); LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(entity); PageUtil.startPage(); diff --git a/src/main/java/com/qs/serve/modules/tbs/controller/TbsBudgetController.java b/src/main/java/com/qs/serve/modules/tbs/controller/TbsBudgetController.java index cdf17b02..2ca49f8f 100644 --- a/src/main/java/com/qs/serve/modules/tbs/controller/TbsBudgetController.java +++ b/src/main/java/com/qs/serve/modules/tbs/controller/TbsBudgetController.java @@ -41,7 +41,7 @@ public class TbsBudgetController { */ @GetMapping("/list") @PreAuthorize("hasRole('tbs:budget:query')") - public R> getPage(TbsBudgetVo param){ + public R> getList(TbsBudgetVo param){ TbsBudget entity = CopierUtil.copy(param,new TbsBudget()); LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(entity); PageUtil.startPage(); @@ -56,7 +56,7 @@ public class TbsBudgetController { */ @GetMapping("/page") @PreAuthorize("hasRole('tbs:budget:query')") - public R> getPage(TbsBudget param){ + public R> getPage(TbsBudgetVo param){ TbsBudget entity = CopierUtil.copy(param,new TbsBudget()); LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(entity); PageUtil.startPage(); diff --git a/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyController.java b/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyController.java index 9109d48d..f36e27e9 100644 --- a/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyController.java +++ b/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyController.java @@ -41,7 +41,7 @@ public class TbsCostApplyController { */ @GetMapping("/list") @PreAuthorize("hasRole('tbs:costApply:query')") - public R> getPage(TbsCostApplyVo param){ + public R> getList(TbsCostApplyVo param){ TbsCostApply entity = CopierUtil.copy(param,new TbsCostApply()); LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(entity); PageUtil.startPage(); @@ -56,7 +56,7 @@ public class TbsCostApplyController { */ @GetMapping("/page") @PreAuthorize("hasRole('tbs:costApply:query')") - public R> getPage(TbsCostApply param){ + public R> getPage(TbsCostApplyVo param){ TbsCostApply entity = CopierUtil.copy(param,new TbsCostApply()); LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(entity); PageUtil.startPage(); diff --git a/src/main/java/com/qs/serve/modules/tbs/controller/TbsScheduleController.java b/src/main/java/com/qs/serve/modules/tbs/controller/TbsScheduleController.java index 969a9af2..1b3ff4d3 100644 --- a/src/main/java/com/qs/serve/modules/tbs/controller/TbsScheduleController.java +++ b/src/main/java/com/qs/serve/modules/tbs/controller/TbsScheduleController.java @@ -41,7 +41,7 @@ public class TbsScheduleController { */ @GetMapping("/list") @PreAuthorize("hasRole('tbs:schedule:query')") - public R> getPage(TbsScheduleVo param){ + public R> getList(TbsScheduleVo param){ TbsSchedule entity = CopierUtil.copy(param,new TbsSchedule()); LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(entity); PageUtil.startPage(); @@ -56,7 +56,7 @@ public class TbsScheduleController { */ @GetMapping("/page") @PreAuthorize("hasRole('tbs:schedule:query')") - public R> getPage(TbsSchedule param){ + public R> getPage(TbsScheduleVo param){ TbsSchedule entity = CopierUtil.copy(param,new TbsSchedule()); LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(entity); PageUtil.startPage(); diff --git a/src/main/java/com/qs/serve/modules/tbs/controller/TbsScheduleItemBudgetController.java b/src/main/java/com/qs/serve/modules/tbs/controller/TbsScheduleItemBudgetController.java index 1ac21e09..64ea7413 100644 --- a/src/main/java/com/qs/serve/modules/tbs/controller/TbsScheduleItemBudgetController.java +++ b/src/main/java/com/qs/serve/modules/tbs/controller/TbsScheduleItemBudgetController.java @@ -41,7 +41,7 @@ public class TbsScheduleItemBudgetController { */ @GetMapping("/list") @PreAuthorize("hasRole('tbs:scheduleItemBudget:query')") - public R> getPage(TbsScheduleItemBudgetVo param){ + public R> getList(TbsScheduleItemBudgetVo param){ TbsScheduleItemBudget entity = CopierUtil.copy(param,new TbsScheduleItemBudget()); LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(entity); PageUtil.startPage(); @@ -56,7 +56,7 @@ public class TbsScheduleItemBudgetController { */ @GetMapping("/page") @PreAuthorize("hasRole('tbs:scheduleItemBudget:query')") - public R> getPage(TbsScheduleItemBudget param){ + public R> getPage(TbsScheduleItemBudgetVo param){ TbsScheduleItemBudget entity = CopierUtil.copy(param,new TbsScheduleItemBudget()); LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(entity); PageUtil.startPage(); diff --git a/src/main/java/com/qs/serve/modules/tbs/controller/TbsScheduleItemController.java b/src/main/java/com/qs/serve/modules/tbs/controller/TbsScheduleItemController.java index e7649b82..143bdf93 100644 --- a/src/main/java/com/qs/serve/modules/tbs/controller/TbsScheduleItemController.java +++ b/src/main/java/com/qs/serve/modules/tbs/controller/TbsScheduleItemController.java @@ -41,7 +41,7 @@ public class TbsScheduleItemController { */ @GetMapping("/list") @PreAuthorize("hasRole('tbs:scheduleItem:query')") - public R> getPage(TbsScheduleItemVo param){ + public R> getList(TbsScheduleItemVo param){ TbsScheduleItem entity = CopierUtil.copy(param,new TbsScheduleItem()); LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(entity); PageUtil.startPage(); @@ -56,7 +56,7 @@ public class TbsScheduleItemController { */ @GetMapping("/page") @PreAuthorize("hasRole('tbs:scheduleItem:query')") - public R> getPage(TbsScheduleItem param){ + public R> getPage(TbsScheduleItemVo param){ TbsScheduleItem entity = CopierUtil.copy(param,new TbsScheduleItem()); LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(entity); PageUtil.startPage(); diff --git a/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsActivityBo.java b/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsActivityBo.java index 182b4560..adbd4b57 100644 --- a/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsActivityBo.java +++ b/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsActivityBo.java @@ -1,22 +1,24 @@ package com.qs.serve.modules.tbs.entity.bo; import java.time.LocalDate; -import java.time.LocalDateTime; import java.io.Serializable; +import java.math.BigDecimal; +import java.time.LocalDateTime; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; import org.hibernate.validator.constraints.Length; +import org.springframework.format.annotation.DateTimeFormat; import javax.validation.constraints.NotNull; import javax.validation.constraints.NotBlank; /** - * 费用活动 BO + * 费用活动 VO * @author YenHex - * @since 2022-11-08 + * @since 2022-11-09 */ @Data public class TbsActivityBo implements Serializable { @@ -27,41 +29,52 @@ public class TbsActivityBo implements Serializable { private Long id; /** 费用申请id */ + @NotNull(message = "费用申请id不能为空") private Long costApplyId; /** 活动简述及目的 */ + @NotBlank(message = "活动简述及目的不能为空") + @Length(max = 255,message = "活动简述及目的长度不能超过255字") private String actTitle; /** 客户id */ + @NotNull(message = "客户id不能为空") private Long supplierId; /** 客户编码 */ + @NotBlank(message = "客户编码不能为空") + @Length(max = 30,message = "客户编码长度不能超过30字") private String supplierCode; /** 客户名称 */ + @NotBlank(message = "客户名称不能为空") + @Length(max = 30,message = "客户名称长度不能超过30字") private String supplierName; /** 活动开始时间 */ - @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + @NotNull(message = "活动开始时间不能为空") + @DateTimeFormat(pattern = "yyyy-MM-dd") private LocalDate actStartDate; /** 活动结束时间 */ - @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + @NotNull(message = "活动结束时间不能为空") + @DateTimeFormat(pattern = "yyyy-MM-dd") private LocalDate actEndDate; /** 预计核销时间 */ - @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd") private LocalDate preCheckDate; /** 备注 */ + @Length(max = 255,message = "备注长度不能超过255字") private String remark; /** 创建时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; /** 最后更新时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime updateTime; /** 所属租户 */ diff --git a/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsActivityCenterBo.java b/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsActivityCenterBo.java index f4a27a39..83fa3fd1 100644 --- a/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsActivityCenterBo.java +++ b/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsActivityCenterBo.java @@ -1,22 +1,24 @@ package com.qs.serve.modules.tbs.entity.bo; +import java.time.LocalDate; +import java.io.Serializable; import java.math.BigDecimal; import java.time.LocalDateTime; -import java.io.Serializable; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; import org.hibernate.validator.constraints.Length; +import org.springframework.format.annotation.DateTimeFormat; import javax.validation.constraints.NotNull; import javax.validation.constraints.NotBlank; /** - * 活动成本中心项 BO + * 活动成本中心项 Bo * @author YenHex - * @since 2022-11-08 + * @since 2022-11-09 */ @Data public class TbsActivityCenterBo implements Serializable { @@ -27,50 +29,68 @@ public class TbsActivityCenterBo implements Serializable { private Long id; /** 费用申请id */ + @NotNull(message = "费用申请id不能为空") private Long costApplyId; /** 活动id */ + @NotNull(message = "活动id不能为空") private Long activityId; /** 科目id */ + @NotNull(message = "科目id不能为空") private Long subjectId; /** 科目编码 */ + @NotBlank(message = "科目编码不能为空") + @Length(max = 50,message = "科目编码长度不能超过50字") private String subjectCode; /** 科目名称 */ + @NotBlank(message = "科目名称不能为空") + @Length(max = 50,message = "科目名称长度不能超过50字") private String subjectName; /** 费用额度 */ + @NotNull(message = "费用额度不能为空") private BigDecimal amount; /** 成本中心类型 */ + @NotBlank(message = "成本中心类型不能为空") + @Length(max = 255,message = "成本中心类型长度不能超过255字") private String centerType; /** 成本中心id */ + @NotNull(message = "成本中心id不能为空") private Long centerId; /** 成本中心编码 */ + @NotBlank(message = "成本中心编码不能为空") + @Length(max = 50,message = "成本中心编码长度不能超过50字") private String centerCode; /** 成本中心名称 */ + @NotBlank(message = "成本中心名称不能为空") + @Length(max = 50,message = "成本中心名称长度不能超过50字") private String centerName; /** 场次 */ + @NotNull(message = "场次不能为空") private Integer countSession; /** 人数 */ + @NotNull(message = "人数不能为空") private Integer countPerson; /** 备注 */ + @Length(max = 255,message = "备注长度不能超过255字") private String remark; /** 创建时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; /** 最后更新时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime updateTime; /** 所属租户 */ diff --git a/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsActivityCenterGoodsBo.java b/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsActivityCenterGoodsBo.java index 0609d894..b5cccce5 100644 --- a/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsActivityCenterGoodsBo.java +++ b/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsActivityCenterGoodsBo.java @@ -1,22 +1,24 @@ package com.qs.serve.modules.tbs.entity.bo; +import java.time.LocalDate; +import java.io.Serializable; import java.math.BigDecimal; import java.time.LocalDateTime; -import java.io.Serializable; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; import org.hibernate.validator.constraints.Length; +import org.springframework.format.annotation.DateTimeFormat; import javax.validation.constraints.NotNull; import javax.validation.constraints.NotBlank; /** - * 活动成本中心配比项 BO + * 活动成本中心配比项 Bo * @author YenHex - * @since 2022-11-08 + * @since 2022-11-09 */ @Data public class TbsActivityCenterGoodsBo implements Serializable { @@ -27,71 +29,98 @@ public class TbsActivityCenterGoodsBo implements Serializable { private Long id; /** 费用申请id */ + @NotNull(message = "费用申请id不能为空") private Long costApplyId; /** 活动id */ + @NotNull(message = "活动id不能为空") private Long activityId; /** 科目id */ + @NotNull(message = "科目id不能为空") private Long subjectId; /** 科目编码 */ + @NotBlank(message = "科目编码不能为空") + @Length(max = 50,message = "科目编码长度不能超过50字") private String subjectCode; /** 科目名称 */ + @NotBlank(message = "科目名称不能为空") + @Length(max = 50,message = "科目名称长度不能超过50字") private String subjectName; /** 费用额度 */ + @NotNull(message = "费用额度不能为空") private BigDecimal amount; /** 成本中心类型 */ + @NotBlank(message = "成本中心类型不能为空") + @Length(max = 50,message = "成本中心类型长度不能超过50字") private String centerType; /** 成本中心id */ + @NotNull(message = "成本中心id不能为空") private Long centerId; /** 成本中心编码 */ + @NotBlank(message = "成本中心编码不能为空") + @Length(max = 50,message = "成本中心编码长度不能超过50字") private String centerCode; /** 成本中心名称 */ + @NotBlank(message = "成本中心名称不能为空") + @Length(max = 50,message = "成本中心名称长度不能超过50字") private String centerName; /** 费用占比 */ + @NotNull(message = "费用占比不能为空") private BigDecimal centerGoodsRate; /** 目标类型(brand、category、series、spu、sku) */ + @NotBlank(message = "目标类型(brand、category、series、spu、sku)不能为空") + @Length(max = 30,message = "目标类型(brand、category、series、spu、sku)长度不能超过30字") private String targetType; /** 目标id */ + @NotNull(message = "目标id不能为空") private Long targetId; /** 目标编码 */ + @NotBlank(message = "目标编码不能为空") + @Length(max = 30,message = "目标编码长度不能超过30字") private String targetCode; /** 目标名称 */ + @NotBlank(message = "目标名称不能为空") + @Length(max = 30,message = "目标名称长度不能超过30字") private String targetName; /** 目标父级id */ private Long targetParentId; /** 目标父级编码 */ + @Length(max = 30,message = "目标父级编码长度不能超过30字") private String targetParentCode; /** 目标父级名称 */ + @Length(max = 20,message = "目标父级名称长度不能超过20字") private String targetParentName; /** 目标等级路径 */ + @Length(max = 600,message = "目标等级路径长度不能超过600字") private String targetLevelPath; /** 备注 */ + @Length(max = 255,message = "备注长度不能超过255字") private String remark; /** 创建时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; /** 最后更新时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime updateTime; /** 所属租户 */ diff --git a/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsActivityChannelBo.java b/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsActivityChannelBo.java index 412a49bc..e3d8145a 100644 --- a/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsActivityChannelBo.java +++ b/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsActivityChannelBo.java @@ -1,22 +1,24 @@ package com.qs.serve.modules.tbs.entity.bo; +import java.time.LocalDate; +import java.io.Serializable; import java.math.BigDecimal; import java.time.LocalDateTime; -import java.io.Serializable; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; import org.hibernate.validator.constraints.Length; +import org.springframework.format.annotation.DateTimeFormat; import javax.validation.constraints.NotNull; import javax.validation.constraints.NotBlank; /** - * 活动渠道项 BO + * 活动渠道项 Bo * @author YenHex - * @since 2022-11-08 + * @since 2022-11-09 */ @Data public class TbsActivityChannelBo implements Serializable { @@ -27,35 +29,45 @@ public class TbsActivityChannelBo implements Serializable { private Long id; /** 费用申请id */ + @NotNull(message = "费用申请id不能为空") private Long costApplyId; /** 活动id */ + @NotNull(message = "活动id不能为空") private Long activityId; /** 渠道id */ + @NotNull(message = "渠道id不能为空") private Long channelId; /** 渠道编码 */ + @NotBlank(message = "渠道编码不能为空") + @Length(max = 50,message = "渠道编码长度不能超过50字") private String channelCode; /** 渠道名称 */ + @NotBlank(message = "渠道名称不能为空") + @Length(max = 50,message = "渠道名称长度不能超过50字") private String channelName; /** 渠道费用占比 */ + @NotNull(message = "渠道费用占比不能为空") private BigDecimal channelRate; /** 预计头发网点数量 */ + @NotNull(message = "预计头发网点数量不能为空") private Integer preCountPoint; /** 备注 */ + @Length(max = 255,message = "备注长度不能超过255字") private String remark; /** 创建时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; /** 最后更新时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime updateTime; /** 所属租户 */ diff --git a/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsActivityChannelPointBo.java b/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsActivityChannelPointBo.java index a7dd4660..2eac5885 100644 --- a/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsActivityChannelPointBo.java +++ b/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsActivityChannelPointBo.java @@ -1,22 +1,24 @@ package com.qs.serve.modules.tbs.entity.bo; +import java.time.LocalDate; +import java.io.Serializable; import java.math.BigDecimal; import java.time.LocalDateTime; -import java.io.Serializable; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; import org.hibernate.validator.constraints.Length; +import org.springframework.format.annotation.DateTimeFormat; import javax.validation.constraints.NotNull; import javax.validation.constraints.NotBlank; /** - * 活动网点项 BO + * 活动网点项 Bo * @author YenHex - * @since 2022-11-08 + * @since 2022-11-09 */ @Data public class TbsActivityChannelPointBo implements Serializable { @@ -27,41 +29,55 @@ public class TbsActivityChannelPointBo implements Serializable { private Long id; /** 费用申请id */ + @NotNull(message = "费用申请id不能为空") private Long costApplyId; /** 活动id */ + @NotNull(message = "活动id不能为空") private Long activityId; /** 渠道id */ + @NotNull(message = "渠道id不能为空") private Long channelId; /** 渠道编码 */ + @NotBlank(message = "渠道编码不能为空") + @Length(max = 50,message = "渠道编码长度不能超过50字") private String channelCode; /** 渠道名称 */ + @NotBlank(message = "渠道名称不能为空") + @Length(max = 50,message = "渠道名称长度不能超过50字") private String channelName; /** 网点id */ + @NotNull(message = "网点id不能为空") private Long pointId; /** 网点编码 */ + @NotBlank(message = "网点编码不能为空") + @Length(max = 50,message = "网点编码长度不能超过50字") private String pointCode; /** 网点名称 */ + @NotBlank(message = "网点名称不能为空") + @Length(max = 50,message = "网点名称长度不能超过50字") private String pointName; /** 网点费用占比 */ + @NotNull(message = "网点费用占比不能为空") private BigDecimal pointRate; /** 备注 */ + @Length(max = 255,message = "备注长度不能超过255字") private String remark; /** 创建时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; /** 最后更新时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime updateTime; /** 所属租户 */ diff --git a/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsActivityGoodsBo.java b/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsActivityGoodsBo.java index 1c569c6c..09e44fee 100644 --- a/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsActivityGoodsBo.java +++ b/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsActivityGoodsBo.java @@ -1,22 +1,24 @@ package com.qs.serve.modules.tbs.entity.bo; +import java.time.LocalDate; +import java.io.Serializable; import java.math.BigDecimal; import java.time.LocalDateTime; -import java.io.Serializable; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; import org.hibernate.validator.constraints.Length; +import org.springframework.format.annotation.DateTimeFormat; import javax.validation.constraints.NotNull; import javax.validation.constraints.NotBlank; /** - * 活动商品项 BO + * 活动商品项 Bo * @author YenHex - * @since 2022-11-08 + * @since 2022-11-09 */ @Data public class TbsActivityGoodsBo implements Serializable { @@ -27,47 +29,61 @@ public class TbsActivityGoodsBo implements Serializable { private Long id; /** 费用申请id */ + @NotNull(message = "费用申请id不能为空") private Long costApplyId; /** 活动id */ + @NotNull(message = "活动id不能为空") private Long activityId; /** 网点费用占比 */ + @NotNull(message = "网点费用占比不能为空") private BigDecimal goodsRate; /** 目标类型(brand、category、series、spu、sku) */ + @NotBlank(message = "目标类型(brand、category、series、spu、sku)不能为空") + @Length(max = 30,message = "目标类型(brand、category、series、spu、sku)长度不能超过30字") private String targetType; /** 目标id */ + @NotNull(message = "目标id不能为空") private Long targetId; /** 目标编码 */ + @NotBlank(message = "目标编码不能为空") + @Length(max = 30,message = "目标编码长度不能超过30字") private String targetCode; /** 目标名称 */ + @NotBlank(message = "目标名称不能为空") + @Length(max = 30,message = "目标名称长度不能超过30字") private String targetName; /** 目标父级id */ private Long targetParentId; /** 目标父级编码 */ + @Length(max = 30,message = "目标父级编码长度不能超过30字") private String targetParentCode; /** 目标父级名称 */ + @Length(max = 20,message = "目标父级名称长度不能超过20字") private String targetParentName; /** 目标等级路径 */ + @Length(max = 600,message = "目标等级路径长度不能超过600字") private String targetLevelPath; /** 备注 */ + @Length(max = 255,message = "备注长度不能超过255字") private String remark; /** 创建时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; /** 最后更新时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime updateTime; /** 所属租户 */ diff --git a/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsBudgetBo.java b/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsBudgetBo.java index b6314c99..1fd9c90f 100644 --- a/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsBudgetBo.java +++ b/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsBudgetBo.java @@ -1,21 +1,24 @@ package com.qs.serve.modules.tbs.entity.bo; -import java.time.LocalDateTime; +import java.time.LocalDate; import java.io.Serializable; +import java.math.BigDecimal; +import java.time.LocalDateTime; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; import org.hibernate.validator.constraints.Length; +import org.springframework.format.annotation.DateTimeFormat; import javax.validation.constraints.NotNull; import javax.validation.constraints.NotBlank; /** - * 预算 BO + * 预算 Bo * @author YenHex - * @since 2022-11-08 + * @since 2022-11-09 */ @Data public class TbsBudgetBo implements Serializable { @@ -26,41 +29,57 @@ public class TbsBudgetBo implements Serializable { private Long id; /** 科目id */ + @NotNull(message = "科目id不能为空") private Long subjectId; /** 科目编码 */ + @NotBlank(message = "科目编码不能为空") + @Length(max = 30,message = "科目编码长度不能超过30字") private String subjectCode; /** 科目名称 */ + @NotBlank(message = "科目名称不能为空") + @Length(max = 30,message = "科目名称长度不能超过30字") private String subjectName; /** 成本中心id */ + @NotNull(message = "成本中心id不能为空") private Long centerId; /** 成本中心编码 */ + @NotBlank(message = "成本中心编码不能为空") + @Length(max = 30,message = "成本中心编码长度不能超过30字") private String centerCode; /** 成本中心名称 */ + @NotBlank(message = "成本中心名称不能为空") + @Length(max = 30,message = "成本中心名称长度不能超过30字") private String centerName; /** 考核期id */ + @NotNull(message = "考核期id不能为空") private Long scheduleId; /** 考核期编码 */ + @NotBlank(message = "考核期编码不能为空") + @Length(max = 30,message = "考核期编码长度不能超过30字") private String scheduleCode; /** 考核期名称 */ + @NotBlank(message = "考核期名称不能为空") + @Length(max = 30,message = "考核期名称长度不能超过30字") private String scheduleName; /** 备注 */ + @Length(max = 255,message = "备注长度不能超过255字") private String remark; /** 创建时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; /** 最后更新时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime updateTime; /** 所属租户 */ diff --git a/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsBudgetConditionBo.java b/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsBudgetConditionBo.java index 11d8b8e8..30481552 100644 --- a/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsBudgetConditionBo.java +++ b/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsBudgetConditionBo.java @@ -1,21 +1,24 @@ package com.qs.serve.modules.tbs.entity.bo; -import java.time.LocalDateTime; +import java.time.LocalDate; import java.io.Serializable; +import java.math.BigDecimal; +import java.time.LocalDateTime; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; import org.hibernate.validator.constraints.Length; +import org.springframework.format.annotation.DateTimeFormat; import javax.validation.constraints.NotNull; import javax.validation.constraints.NotBlank; /** - * 预算条件 BO + * 预算条件 Bo * @author YenHex - * @since 2022-11-08 + * @since 2022-11-09 */ @Data public class TbsBudgetConditionBo implements Serializable { @@ -26,41 +29,53 @@ public class TbsBudgetConditionBo implements Serializable { private Long id; /** 预算id */ + @NotNull(message = "预算id不能为空") private Long budgtId; /** 目标类型(brand、category、series、spu、sku) */ + @NotBlank(message = "目标类型(brand、category、series、spu、sku)不能为空") + @Length(max = 30,message = "目标类型(brand、category、series、spu、sku)长度不能超过30字") private String targetType; /** 目标id */ + @NotNull(message = "目标id不能为空") private Long targetId; /** 目标编码 */ + @NotBlank(message = "目标编码不能为空") + @Length(max = 30,message = "目标编码长度不能超过30字") private String targetCode; /** 目标名称 */ + @NotBlank(message = "目标名称不能为空") + @Length(max = 30,message = "目标名称长度不能超过30字") private String targetName; /** 目标父级id */ private Long targetParentId; /** 目标父级编码 */ + @Length(max = 30,message = "目标父级编码长度不能超过30字") private String targetParentCode; /** 目标父级名称 */ + @Length(max = 20,message = "目标父级名称长度不能超过20字") private String targetParentName; /** 目标等级路径 */ + @Length(max = 600,message = "目标等级路径长度不能超过600字") private String targetLevelPath; /** 备注 */ + @Length(max = 255,message = "备注长度不能超过255字") private String remark; /** 创建时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; /** 最后更新时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime updateTime; /** 所属租户 */ diff --git a/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsCostApplyBo.java b/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsCostApplyBo.java index 92d05b04..a834602f 100644 --- a/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsCostApplyBo.java +++ b/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsCostApplyBo.java @@ -1,21 +1,24 @@ package com.qs.serve.modules.tbs.entity.bo; -import java.time.LocalDateTime; +import java.time.LocalDate; import java.io.Serializable; +import java.math.BigDecimal; +import java.time.LocalDateTime; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; import org.hibernate.validator.constraints.Length; +import org.springframework.format.annotation.DateTimeFormat; import javax.validation.constraints.NotNull; import javax.validation.constraints.NotBlank; /** - * 费用申请 BO + * 费用申请 Bo * @author YenHex - * @since 2022-11-08 + * @since 2022-11-09 */ @Data public class TbsCostApplyBo implements Serializable { @@ -26,29 +29,38 @@ public class TbsCostApplyBo implements Serializable { private Long id; /** 主题 */ + @NotBlank(message = "主题不能为空") + @Length(max = 60,message = "主题长度不能超过60字") private String chargeTheme; /** 客户id */ + @NotNull(message = "客户id不能为空") private Long supplierId; /** 客户编码 */ + @NotBlank(message = "客户编码不能为空") + @Length(max = 30,message = "客户编码长度不能超过30字") private String supplierCode; /** 客户名称 */ + @NotBlank(message = "客户名称不能为空") + @Length(max = 30,message = "客户名称长度不能超过30字") private String supplierName; /** 状态:0=未发布；1=待执行；2=待核销；完成； */ + @NotNull(message = "状态:0=未发布；1=待执行；2=待核销；完成；不能为空") private Integer chargeState; /** 备注 */ + @Length(max = 255,message = "备注长度不能超过255字") private String remark; /** 创建时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; /** 最后更新时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime updateTime; /** 所属租户 */ diff --git a/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsScheduleBo.java b/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsScheduleBo.java index e360c117..f18b7134 100644 --- a/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsScheduleBo.java +++ b/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsScheduleBo.java @@ -1,21 +1,24 @@ package com.qs.serve.modules.tbs.entity.bo; -import java.time.LocalDateTime; +import java.time.LocalDate; import java.io.Serializable; +import java.math.BigDecimal; +import java.time.LocalDateTime; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; import org.hibernate.validator.constraints.Length; +import org.springframework.format.annotation.DateTimeFormat; import javax.validation.constraints.NotNull; import javax.validation.constraints.NotBlank; /** - * 考核期 BO + * 考核期 Bo * @author YenHex - * @since 2022-11-08 + * @since 2022-11-09 */ @Data public class TbsScheduleBo implements Serializable { @@ -26,20 +29,25 @@ public class TbsScheduleBo implements Serializable { private Long id; /** 考核名称 */ + @NotBlank(message = "考核名称不能为空") + @Length(max = 30,message = "考核名称长度不能超过30字") private String code; /** 考核编码 */ + @NotBlank(message = "考核编码不能为空") + @Length(max = 30,message = "考核编码长度不能超过30字") private String name; /** 备注 */ + @Length(max = 255,message = "备注长度不能超过255字") private String remark; /** 创建时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; /** 最后更新时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime updateTime; /** 所属租户 */ diff --git a/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsScheduleItemBo.java b/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsScheduleItemBo.java index 318d35fc..8df8045d 100644 --- a/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsScheduleItemBo.java +++ b/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsScheduleItemBo.java @@ -1,21 +1,24 @@ package com.qs.serve.modules.tbs.entity.bo; -import java.time.LocalDateTime; +import java.time.LocalDate; import java.io.Serializable; +import java.math.BigDecimal; +import java.time.LocalDateTime; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; import org.hibernate.validator.constraints.Length; +import org.springframework.format.annotation.DateTimeFormat; import javax.validation.constraints.NotNull; import javax.validation.constraints.NotBlank; /** - * 考核时间项 BO + * 考核时间项 Bo * @author YenHex - * @since 2022-11-08 + * @since 2022-11-09 */ @Data public class TbsScheduleItemBo implements Serializable { @@ -26,28 +29,36 @@ public class TbsScheduleItemBo implements Serializable { private Long id; /** 考核id */ + @NotNull(message = "考核id不能为空") private Long scheduleId; /** 考核编码 */ + @NotBlank(message = "考核编码不能为空") + @Length(max = 30,message = "考核编码长度不能超过30字") private String itemName; /** 开始时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @NotNull(message = "开始时间不能为空") + @Length(max = 0,message = "开始时间长度不能超过0字") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime startDate; /** 结束时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @NotNull(message = "结束时间不能为空") + @Length(max = 0,message = "结束时间长度不能超过0字") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime endDate; /** 备注 */ + @Length(max = 255,message = "备注长度不能超过255字") private String remark; /** 创建时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; /** 最后更新时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime updateTime; /** 所属租户 */ diff --git a/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsScheduleItemBudgetBo.java b/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsScheduleItemBudgetBo.java index 245773cf..5633d1ce 100644 --- a/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsScheduleItemBudgetBo.java +++ b/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsScheduleItemBudgetBo.java @@ -1,22 +1,24 @@ package com.qs.serve.modules.tbs.entity.bo; +import java.time.LocalDate; +import java.io.Serializable; import java.math.BigDecimal; import java.time.LocalDateTime; -import java.io.Serializable; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; import org.hibernate.validator.constraints.Length; +import org.springframework.format.annotation.DateTimeFormat; import javax.validation.constraints.NotNull; import javax.validation.constraints.NotBlank; /** - * 预算考核期项 BO + * 预算考核期项 Bo * @author YenHex - * @since 2022-11-08 + * @since 2022-11-09 */ @Data public class TbsScheduleItemBudgetBo implements Serializable { @@ -27,34 +29,44 @@ public class TbsScheduleItemBudgetBo implements Serializable { private Long id; /** 考核id */ + @NotNull(message = "考核id不能为空") private Long scheduleId; /** 考核编码 */ + @NotBlank(message = "考核编码不能为空") + @Length(max = 30,message = "考核编码长度不能超过30字") private String itemName; /** 开始时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @NotNull(message = "开始时间不能为空") + @Length(max = 0,message = "开始时间长度不能超过0字") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime startDate; /** 结束时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @NotNull(message = "结束时间不能为空") + @Length(max = 0,message = "结束时间长度不能超过0字") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime endDate; /** 预算id */ + @NotNull(message = "预算id不能为空") private Long budgetId; /** 预算金额 */ + @NotNull(message = "预算金额不能为空") private BigDecimal budgetAmount; /** 备注 */ + @Length(max = 255,message = "备注长度不能超过255字") private String remark; /** 创建时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; /** 最后更新时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime updateTime; /** 所属租户 */ diff --git a/src/main/java/com/qs/serve/modules/tbs/entity/vo/TbsActivityCenterGoodsVo.java b/src/main/java/com/qs/serve/modules/tbs/entity/vo/TbsActivityCenterGoodsVo.java index d971cc5e..ca14fbbd 100644 --- a/src/main/java/com/qs/serve/modules/tbs/entity/vo/TbsActivityCenterGoodsVo.java +++ b/src/main/java/com/qs/serve/modules/tbs/entity/vo/TbsActivityCenterGoodsVo.java @@ -18,7 +18,7 @@ import javax.validation.constraints.NotBlank; /** * 活动成本中心配比项 VO * @author YenHex - * @since 2022-11-08 + * @since 2022-11-09 */ @Data public class TbsActivityCenterGoodsVo implements Serializable { @@ -29,90 +29,63 @@ public class TbsActivityCenterGoodsVo implements Serializable { private Long id; /** 费用申请id */ - @NotNull(message = "费用申请id不能为空") private Long costApplyId; /** 活动id */ - @NotNull(message = "活动id不能为空") private Long activityId; /** 科目id */ - @NotNull(message = "科目id不能为空") private Long subjectId; /** 科目编码 */ - @NotBlank(message = "科目编码不能为空") - @Length(max = 50,message = "科目编码长度不能超过50字") private String subjectCode; /** 科目名称 */ - @NotBlank(message = "科目名称不能为空") - @Length(max = 50,message = "科目名称长度不能超过50字") private String subjectName; /** 费用额度 */ - @NotNull(message = "费用额度不能为空") private BigDecimal amount; /** 成本中心类型 */ - @NotBlank(message = "成本中心类型不能为空") - @Length(max = 50,message = "成本中心类型长度不能超过50字") private String centerType; /** 成本中心id */ - @NotNull(message = "成本中心id不能为空") private Long centerId; /** 成本中心编码 */ - @NotBlank(message = "成本中心编码不能为空") - @Length(max = 50,message = "成本中心编码长度不能超过50字") private String centerCode; /** 成本中心名称 */ - @NotBlank(message = "成本中心名称不能为空") - @Length(max = 50,message = "成本中心名称长度不能超过50字") private String centerName; /** 费用占比 */ - @NotNull(message = "费用占比不能为空") private BigDecimal centerGoodsRate; /** 目标类型(brand、category、series、spu、sku) */ - @NotBlank(message = "目标类型(brand、category、series、spu、sku)不能为空") - @Length(max = 30,message = "目标类型(brand、category、series、spu、sku)长度不能超过30字") private String targetType; /** 目标id */ - @NotNull(message = "目标id不能为空") private Long targetId; /** 目标编码 */ - @NotBlank(message = "目标编码不能为空") - @Length(max = 30,message = "目标编码长度不能超过30字") private String targetCode; /** 目标名称 */ - @NotBlank(message = "目标名称不能为空") - @Length(max = 30,message = "目标名称长度不能超过30字") private String targetName; /** 目标父级id */ private Long targetParentId; /** 目标父级编码 */ - @Length(max = 30,message = "目标父级编码长度不能超过30字") private String targetParentCode; /** 目标父级名称 */ - @Length(max = 20,message = "目标父级名称长度不能超过20字") private String targetParentName; /** 目标等级路径 */ - @Length(max = 600,message = "目标等级路径长度不能超过600字") private String targetLevelPath; /** 备注 */ - @Length(max = 255,message = "备注长度不能超过255字") private String remark; /** 创建时间 */ diff --git a/src/main/java/com/qs/serve/modules/tbs/entity/vo/TbsActivityCenterVo.java b/src/main/java/com/qs/serve/modules/tbs/entity/vo/TbsActivityCenterVo.java index dbd35211..7998cb63 100644 --- a/src/main/java/com/qs/serve/modules/tbs/entity/vo/TbsActivityCenterVo.java +++ b/src/main/java/com/qs/serve/modules/tbs/entity/vo/TbsActivityCenterVo.java @@ -1,8 +1,9 @@ package com.qs.serve.modules.tbs.entity.vo; +import java.time.LocalDate; +import java.io.Serializable; import java.math.BigDecimal; import java.time.LocalDateTime; -import java.io.Serializable; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -17,7 +18,7 @@ import javax.validation.constraints.NotBlank; /** * 活动成本中心项 VO * @author YenHex - * @since 2022-11-08 + * @since 2022-11-09 */ @Data public class TbsActivityCenterVo implements Serializable { @@ -28,60 +29,42 @@ public class TbsActivityCenterVo implements Serializable { private Long id; /** 费用申请id */ - @NotNull(message = "费用申请id不能为空") private Long costApplyId; /** 活动id */ - @NotNull(message = "活动id不能为空") private Long activityId; /** 科目id */ - @NotNull(message = "科目id不能为空") private Long subjectId; /** 科目编码 */ - @NotBlank(message = "科目编码不能为空") - @Length(max = 50,message = "科目编码长度不能超过50字") private String subjectCode; /** 科目名称 */ - @NotBlank(message = "科目名称不能为空") - @Length(max = 50,message = "科目名称长度不能超过50字") private String subjectName; /** 费用额度 */ - @NotNull(message = "费用额度不能为空") private BigDecimal amount; /** 成本中心类型 */ - @NotBlank(message = "成本中心类型不能为空") - @Length(max = 255,message = "成本中心类型长度不能超过255字") private String centerType; /** 成本中心id */ - @NotNull(message = "成本中心id不能为空") private Long centerId; /** 成本中心编码 */ - @NotBlank(message = "成本中心编码不能为空") - @Length(max = 50,message = "成本中心编码长度不能超过50字") private String centerCode; /** 成本中心名称 */ - @NotBlank(message = "成本中心名称不能为空") - @Length(max = 50,message = "成本中心名称长度不能超过50字") private String centerName; /** 场次 */ - @NotNull(message = "场次不能为空") private Integer countSession; /** 人数 */ - @NotNull(message = "人数不能为空") private Integer countPerson; /** 备注 */ - @Length(max = 255,message = "备注长度不能超过255字") private String remark; /** 创建时间 */ diff --git a/src/main/java/com/qs/serve/modules/tbs/entity/vo/TbsActivityChannelPointVo.java b/src/main/java/com/qs/serve/modules/tbs/entity/vo/TbsActivityChannelPointVo.java index 4ffbdf3e..2bb3366a 100644 --- a/src/main/java/com/qs/serve/modules/tbs/entity/vo/TbsActivityChannelPointVo.java +++ b/src/main/java/com/qs/serve/modules/tbs/entity/vo/TbsActivityChannelPointVo.java @@ -18,7 +18,7 @@ import javax.validation.constraints.NotBlank; /** * 活动网点项 VO * @author YenHex - * @since 2022-11-08 + * @since 2022-11-09 */ @Data public class TbsActivityChannelPointVo implements Serializable { @@ -29,47 +29,33 @@ public class TbsActivityChannelPointVo implements Serializable { private Long id; /** 费用申请id */ - @NotNull(message = "费用申请id不能为空") private Long costApplyId; /** 活动id */ - @NotNull(message = "活动id不能为空") private Long activityId; /** 渠道id */ - @NotNull(message = "渠道id不能为空") private Long channelId; /** 渠道编码 */ - @NotBlank(message = "渠道编码不能为空") - @Length(max = 50,message = "渠道编码长度不能超过50字") private String channelCode; /** 渠道名称 */ - @NotBlank(message = "渠道名称不能为空") - @Length(max = 50,message = "渠道名称长度不能超过50字") private String channelName; /** 网点id */ - @NotNull(message = "网点id不能为空") private Long pointId; /** 网点编码 */ - @NotBlank(message = "网点编码不能为空") - @Length(max = 50,message = "网点编码长度不能超过50字") private String pointCode; /** 网点名称 */ - @NotBlank(message = "网点名称不能为空") - @Length(max = 50,message = "网点名称长度不能超过50字") private String pointName; /** 网点费用占比 */ - @NotNull(message = "网点费用占比不能为空") private BigDecimal pointRate; /** 备注 */ - @Length(max = 255,message = "备注长度不能超过255字") private String remark; /** 创建时间 */ diff --git a/src/main/java/com/qs/serve/modules/tbs/entity/vo/TbsActivityChannelVo.java b/src/main/java/com/qs/serve/modules/tbs/entity/vo/TbsActivityChannelVo.java index 4e78a372..e2771990 100644 --- a/src/main/java/com/qs/serve/modules/tbs/entity/vo/TbsActivityChannelVo.java +++ b/src/main/java/com/qs/serve/modules/tbs/entity/vo/TbsActivityChannelVo.java @@ -18,7 +18,7 @@ import javax.validation.constraints.NotBlank; /** * 活动渠道项 VO * @author YenHex - * @since 2022-11-08 + * @since 2022-11-09 */ @Data public class TbsActivityChannelVo implements Serializable { @@ -29,37 +29,27 @@ public class TbsActivityChannelVo implements Serializable { private Long id; /** 费用申请id */ - @NotNull(message = "费用申请id不能为空") private Long costApplyId; /** 活动id */ - @NotNull(message = "活动id不能为空") private Long activityId; /** 渠道id */ - @NotNull(message = "渠道id不能为空") private Long channelId; /** 渠道编码 */ - @NotBlank(message = "渠道编码不能为空") - @Length(max = 50,message = "渠道编码长度不能超过50字") private String channelCode; /** 渠道名称 */ - @NotBlank(message = "渠道名称不能为空") - @Length(max = 50,message = "渠道名称长度不能超过50字") private String channelName; /** 渠道费用占比 */ - @NotNull(message = "渠道费用占比不能为空") private BigDecimal channelRate; /** 预计头发网点数量 */ - @NotNull(message = "预计头发网点数量不能为空") private Integer preCountPoint; /** 备注 */ - @Length(max = 255,message = "备注长度不能超过255字") private String remark; /** 创建时间 */ diff --git a/src/main/java/com/qs/serve/modules/tbs/entity/vo/TbsActivityGoodsVo.java b/src/main/java/com/qs/serve/modules/tbs/entity/vo/TbsActivityGoodsVo.java index e190b4a7..9e0445c6 100644 --- a/src/main/java/com/qs/serve/modules/tbs/entity/vo/TbsActivityGoodsVo.java +++ b/src/main/java/com/qs/serve/modules/tbs/entity/vo/TbsActivityGoodsVo.java @@ -18,7 +18,7 @@ import javax.validation.constraints.NotBlank; /** * 活动商品项 VO * @author YenHex - * @since 2022-11-08 + * @since 2022-11-09 */ @Data public class TbsActivityGoodsVo implements Serializable { @@ -29,53 +29,39 @@ public class TbsActivityGoodsVo implements Serializable { private Long id; /** 费用申请id */ - @NotNull(message = "费用申请id不能为空") private Long costApplyId; /** 活动id */ - @NotNull(message = "活动id不能为空") private Long activityId; /** 网点费用占比 */ - @NotNull(message = "网点费用占比不能为空") private BigDecimal goodsRate; /** 目标类型(brand、category、series、spu、sku) */ - @NotBlank(message = "目标类型(brand、category、series、spu、sku)不能为空") - @Length(max = 30,message = "目标类型(brand、category、series、spu、sku)长度不能超过30字") private String targetType; /** 目标id */ - @NotNull(message = "目标id不能为空") private Long targetId; /** 目标编码 */ - @NotBlank(message = "目标编码不能为空") - @Length(max = 30,message = "目标编码长度不能超过30字") private String targetCode; /** 目标名称 */ - @NotBlank(message = "目标名称不能为空") - @Length(max = 30,message = "目标名称长度不能超过30字") private String targetName; /** 目标父级id */ private Long targetParentId; /** 目标父级编码 */ - @Length(max = 30,message = "目标父级编码长度不能超过30字") private String targetParentCode; /** 目标父级名称 */ - @Length(max = 20,message = "目标父级名称长度不能超过20字") private String targetParentName; /** 目标等级路径 */ - @Length(max = 600,message = "目标等级路径长度不能超过600字") private String targetLevelPath; /** 备注 */ - @Length(max = 255,message = "备注长度不能超过255字") private String remark; /** 创建时间 */ diff --git a/src/main/java/com/qs/serve/modules/tbs/entity/vo/TbsActivityVo.java b/src/main/java/com/qs/serve/modules/tbs/entity/vo/TbsActivityVo.java index 51c6eed1..2bac0383 100644 --- a/src/main/java/com/qs/serve/modules/tbs/entity/vo/TbsActivityVo.java +++ b/src/main/java/com/qs/serve/modules/tbs/entity/vo/TbsActivityVo.java @@ -1,8 +1,9 @@ package com.qs.serve.modules.tbs.entity.vo; import java.time.LocalDate; -import java.time.LocalDateTime; import java.io.Serializable; +import java.math.BigDecimal; +import java.time.LocalDateTime; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -17,7 +18,7 @@ import javax.validation.constraints.NotBlank; /** * 费用活动 VO * @author YenHex - * @since 2022-11-08 + * @since 2022-11-09 */ @Data public class TbsActivityVo implements Serializable { @@ -28,35 +29,25 @@ public class TbsActivityVo implements Serializable { private Long id; /** 费用申请id */ - @NotNull(message = "费用申请id不能为空") private Long costApplyId; /** 活动简述及目的 */ - @NotBlank(message = "活动简述及目的不能为空") - @Length(max = 255,message = "活动简述及目的长度不能超过255字") private String actTitle; /** 客户id */ - @NotNull(message = "客户id不能为空") private Long supplierId; /** 客户编码 */ - @NotBlank(message = "客户编码不能为空") - @Length(max = 30,message = "客户编码长度不能超过30字") private String supplierCode; /** 客户名称 */ - @NotBlank(message = "客户名称不能为空") - @Length(max = 30,message = "客户名称长度不能超过30字") private String supplierName; /** 活动开始时间 */ - @NotNull(message = "活动开始时间不能为空") @DateTimeFormat(pattern = "yyyy-MM-dd") private LocalDate actStartDate; /** 活动结束时间 */ - @NotNull(message = "活动结束时间不能为空") @DateTimeFormat(pattern = "yyyy-MM-dd") private LocalDate actEndDate; @@ -65,7 +56,6 @@ public class TbsActivityVo implements Serializable { private LocalDate preCheckDate; /** 备注 */ - @Length(max = 255,message = "备注长度不能超过255字") private String remark; /** 创建时间 */ diff --git a/src/main/java/com/qs/serve/modules/tbs/entity/vo/TbsBudgetConditionVo.java b/src/main/java/com/qs/serve/modules/tbs/entity/vo/TbsBudgetConditionVo.java index 96645582..f4b8cb1c 100644 --- a/src/main/java/com/qs/serve/modules/tbs/entity/vo/TbsBudgetConditionVo.java +++ b/src/main/java/com/qs/serve/modules/tbs/entity/vo/TbsBudgetConditionVo.java @@ -18,7 +18,7 @@ import javax.validation.constraints.NotBlank; /** * 预算条件 VO * @author YenHex - * @since 2022-11-08 + * @since 2022-11-09 */ @Data public class TbsBudgetConditionVo implements Serializable { @@ -29,45 +29,33 @@ public class TbsBudgetConditionVo implements Serializable { private Long id; /** 预算id */ - @NotNull(message = "预算id不能为空") private Long budgtId; /** 目标类型(brand、category、series、spu、sku) */ - @NotBlank(message = "目标类型(brand、category、series、spu、sku)不能为空") - @Length(max = 30,message = "目标类型(brand、category、series、spu、sku)长度不能超过30字") private String targetType; /** 目标id */ - @NotNull(message = "目标id不能为空") private Long targetId; /** 目标编码 */ - @NotBlank(message = "目标编码不能为空") - @Length(max = 30,message = "目标编码长度不能超过30字") private String targetCode; /** 目标名称 */ - @NotBlank(message = "目标名称不能为空") - @Length(max = 30,message = "目标名称长度不能超过30字") private String targetName; /** 目标父级id */ private Long targetParentId; /** 目标父级编码 */ - @Length(max = 30,message = "目标父级编码长度不能超过30字") private String targetParentCode; /** 目标父级名称 */ - @Length(max = 20,message = "目标父级名称长度不能超过20字") private String targetParentName; /** 目标等级路径 */ - @Length(max = 600,message = "目标等级路径长度不能超过600字") private String targetLevelPath; /** 备注 */ - @Length(max = 255,message = "备注长度不能超过255字") private String remark; /** 创建时间 */ diff --git a/src/main/java/com/qs/serve/modules/tbs/entity/vo/TbsBudgetVo.java b/src/main/java/com/qs/serve/modules/tbs/entity/vo/TbsBudgetVo.java index 07402d34..c767716a 100644 --- a/src/main/java/com/qs/serve/modules/tbs/entity/vo/TbsBudgetVo.java +++ b/src/main/java/com/qs/serve/modules/tbs/entity/vo/TbsBudgetVo.java @@ -18,7 +18,7 @@ import javax.validation.constraints.NotBlank; /** * 预算 VO * @author YenHex - * @since 2022-11-08 + * @since 2022-11-09 */ @Data public class TbsBudgetVo implements Serializable { @@ -29,49 +29,33 @@ public class TbsBudgetVo implements Serializable { private Long id; /** 科目id */ - @NotNull(message = "科目id不能为空") private Long subjectId; /** 科目编码 */ - @NotBlank(message = "科目编码不能为空") - @Length(max = 30,message = "科目编码长度不能超过30字") private String subjectCode; /** 科目名称 */ - @NotBlank(message = "科目名称不能为空") - @Length(max = 30,message = "科目名称长度不能超过30字") private String subjectName; /** 成本中心id */ - @NotNull(message = "成本中心id不能为空") private Long centerId; /** 成本中心编码 */ - @NotBlank(message = "成本中心编码不能为空") - @Length(max = 30,message = "成本中心编码长度不能超过30字") private String centerCode; /** 成本中心名称 */ - @NotBlank(message = "成本中心名称不能为空") - @Length(max = 30,message = "成本中心名称长度不能超过30字") private String centerName; /** 考核期id */ - @NotNull(message = "考核期id不能为空") private Long scheduleId; /** 考核期编码 */ - @NotBlank(message = "考核期编码不能为空") - @Length(max = 30,message = "考核期编码长度不能超过30字") private String scheduleCode; /** 考核期名称 */ - @NotBlank(message = "考核期名称不能为空") - @Length(max = 30,message = "考核期名称长度不能超过30字") private String scheduleName; /** 备注 */ - @Length(max = 255,message = "备注长度不能超过255字") private String remark; /** 创建时间 */ diff --git a/src/main/java/com/qs/serve/modules/tbs/entity/vo/TbsCostApplyVo.java b/src/main/java/com/qs/serve/modules/tbs/entity/vo/TbsCostApplyVo.java index 9ab601cc..e4f7962b 100644 --- a/src/main/java/com/qs/serve/modules/tbs/entity/vo/TbsCostApplyVo.java +++ b/src/main/java/com/qs/serve/modules/tbs/entity/vo/TbsCostApplyVo.java @@ -38,46 +38,16 @@ public class TbsCostApplyVo implements Serializable { private Long supplierId; /** 客户编码 */ - @NotBlank(message = "客户编码不能为空") - @Length(max = 30,message = "客户编码长度不能超过30字") private String supplierCode; /** 客户名称 */ - @NotBlank(message = "客户名称不能为空") - @Length(max = 30,message = "客户名称长度不能超过30字") private String supplierName; /** 状态:0=未发布；1=待执行；2=待核销；完成； */ - @NotNull(message = "状态:0=未发布；1=待执行；2=待核销；完成；不能为空") private Integer chargeState; /** 备注 */ - @Length(max = 255,message = "备注长度不能超过255字") private String remark; - /** 创建时间 */ - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private LocalDateTime createTime; - - /** 最后更新时间 */ - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private LocalDateTime updateTime; - - /** 所属租户 */ - @JsonIgnore - @JsonProperty - private String tenantId; - - /** 创建人 */ - private String createBy; - - /** 更新人 */ - private String updateBy; - - /** 逻辑删除标记（0：显示；1：隐藏） */ - @JsonIgnore - @JsonProperty - private String delFlag; - } diff --git a/src/main/java/com/qs/serve/modules/tbs/entity/vo/TbsScheduleItemBudgetVo.java b/src/main/java/com/qs/serve/modules/tbs/entity/vo/TbsScheduleItemBudgetVo.java index f1d8a4df..f12a6a9e 100644 --- a/src/main/java/com/qs/serve/modules/tbs/entity/vo/TbsScheduleItemBudgetVo.java +++ b/src/main/java/com/qs/serve/modules/tbs/entity/vo/TbsScheduleItemBudgetVo.java @@ -18,7 +18,7 @@ import javax.validation.constraints.NotBlank; /** * 预算考核期项 VO * @author YenHex - * @since 2022-11-08 + * @since 2022-11-09 */ @Data public class TbsScheduleItemBudgetVo implements Serializable { @@ -29,36 +29,26 @@ public class TbsScheduleItemBudgetVo implements Serializable { private Long id; /** 考核id */ - @NotNull(message = "考核id不能为空") private Long scheduleId; /** 考核编码 */ - @NotBlank(message = "考核编码不能为空") - @Length(max = 30,message = "考核编码长度不能超过30字") private String itemName; /** 开始时间 */ - @NotNull(message = "开始时间不能为空") - @Length(max = 0,message = "开始时间长度不能超过0字") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime startDate; /** 结束时间 */ - @NotNull(message = "结束时间不能为空") - @Length(max = 0,message = "结束时间长度不能超过0字") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime endDate; /** 预算id */ - @NotNull(message = "预算id不能为空") private Long budgetId; /** 预算金额 */ - @NotNull(message = "预算金额不能为空") private BigDecimal budgetAmount; /** 备注 */ - @Length(max = 255,message = "备注长度不能超过255字") private String remark; /** 创建时间 */ diff --git a/src/main/java/com/qs/serve/modules/tbs/entity/vo/TbsScheduleItemVo.java b/src/main/java/com/qs/serve/modules/tbs/entity/vo/TbsScheduleItemVo.java index 151b3370..3180fdb0 100644 --- a/src/main/java/com/qs/serve/modules/tbs/entity/vo/TbsScheduleItemVo.java +++ b/src/main/java/com/qs/serve/modules/tbs/entity/vo/TbsScheduleItemVo.java @@ -18,7 +18,7 @@ import javax.validation.constraints.NotBlank; /** * 考核时间项 VO * @author YenHex - * @since 2022-11-08 + * @since 2022-11-09 */ @Data public class TbsScheduleItemVo implements Serializable { @@ -29,28 +29,20 @@ public class TbsScheduleItemVo implements Serializable { private Long id; /** 考核id */ - @NotNull(message = "考核id不能为空") private Long scheduleId; /** 考核编码 */ - @NotBlank(message = "考核编码不能为空") - @Length(max = 30,message = "考核编码长度不能超过30字") private String itemName; /** 开始时间 */ - @NotNull(message = "开始时间不能为空") - @Length(max = 0,message = "开始时间长度不能超过0字") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime startDate; /** 结束时间 */ - @NotNull(message = "结束时间不能为空") - @Length(max = 0,message = "结束时间长度不能超过0字") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime endDate; /** 备注 */ - @Length(max = 255,message = "备注长度不能超过255字") private String remark; /** 创建时间 */ diff --git a/src/main/java/com/qs/serve/modules/tbs/entity/vo/TbsScheduleVo.java b/src/main/java/com/qs/serve/modules/tbs/entity/vo/TbsScheduleVo.java index 7d9c7b37..b9acdebb 100644 --- a/src/main/java/com/qs/serve/modules/tbs/entity/vo/TbsScheduleVo.java +++ b/src/main/java/com/qs/serve/modules/tbs/entity/vo/TbsScheduleVo.java @@ -18,7 +18,7 @@ import javax.validation.constraints.NotBlank; /** * 考核期 VO * @author YenHex - * @since 2022-11-08 + * @since 2022-11-09 */ @Data public class TbsScheduleVo implements Serializable { @@ -29,17 +29,12 @@ public class TbsScheduleVo implements Serializable { private Long id; /** 考核名称 */ - @NotBlank(message = "考核名称不能为空") - @Length(max = 30,message = "考核名称长度不能超过30字") private String code; /** 考核编码 */ - @NotBlank(message = "考核编码不能为空") - @Length(max = 30,message = "考核编码长度不能超过30字") private String name; /** 备注 */ - @Length(max = 255,message = "备注长度不能超过255字") private String remark; /** 创建时间 */