提交 2eeed067 authored 作者: 000516's avatar 000516

修改档期计划时间BUG

上级 b6495d92
...@@ -62,8 +62,6 @@ public class SalesApPromotionImplDao implements ISalesApPromotionDao { ...@@ -62,8 +62,6 @@ public class SalesApPromotionImplDao implements ISalesApPromotionDao {
if (dto.getIsActualPromotionEndDate() && Objects.nonNull(dto.getActualPromotionEndDate())){ if (dto.getIsActualPromotionEndDate() && Objects.nonNull(dto.getActualPromotionEndDate())){
Date plansDate = entityOld.getPlannedPromotionEndDate(); Date plansDate = entityOld.getPlannedPromotionEndDate();
Date sDate = dto.getActualPromotionEndDate(); Date sDate = dto.getActualPromotionEndDate();
System.out.println(DateUtils.isSameYearMonth(sDate,plansDate));
System.out.println(DateUtils.isNextMonth(sDate,plansDate));
if (!(DateUtils.isSameYearMonth(sDate,plansDate) || DateUtils.isNextMonth(plansDate,sDate))){ if (!(DateUtils.isSameYearMonth(sDate,plansDate) || DateUtils.isNextMonth(plansDate,sDate))){
throw new CheckedException(ECode.SAP_EXECUTE_MONTH_ERROR); throw new CheckedException(ECode.SAP_EXECUTE_MONTH_ERROR);
} }
......
...@@ -397,6 +397,10 @@ public class SalesApPromotion implements Serializable { ...@@ -397,6 +397,10 @@ public class SalesApPromotion implements Serializable {
* 更新时间 * 更新时间
*/ */
private Date updateTime; private Date updateTime;
@TableField(exist = false)
private boolean isActualPromotionStartDate;
@TableField(exist = false)
private boolean isActualPromotionEndDate;
@TableField(exist = false) @TableField(exist = false)
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论