Commit b85f2bcf by fudahua

fix:逾期状态类型

parent 49d0b047
...@@ -5,7 +5,7 @@ package com.gic.haoban.manage.api.enums; ...@@ -5,7 +5,7 @@ package com.gic.haoban.manage.api.enums;
*/ */
public enum PendingStatusFlagEnum { public enum PendingStatusFlagEnum {
NORMAL(1, "正常"), NORMAL(1, "正常"),
PRE_OVERDUE(2, "逾期"), PRE_OVERDUE(2, "即将逾期"),
OVERDUE(3, "逾期"), OVERDUE(3, "逾期"),
PRE_INVALID(4, "即将失效"); PRE_INVALID(4, "即将失效");
private int type; private int type;
......
...@@ -93,8 +93,10 @@ public class PendingTaskApiServiceImpl implements PendingTaskApiService { ...@@ -93,8 +93,10 @@ public class PendingTaskApiServiceImpl implements PendingTaskApiService {
if (betweenInvalidDay == 1 || betweenInvalidDay == 0) { if (betweenInvalidDay == 1 || betweenInvalidDay == 0) {
dto.setStatusFlag(PendingStatusFlagEnum.PRE_INVALID.getType()); dto.setStatusFlag(PendingStatusFlagEnum.PRE_INVALID.getType());
} else if (betweenOverdueDay == 0 || betweenOverdueDay == 1) { } else if (betweenOverdueDay == 0 || betweenOverdueDay == 1) {
dto.setStatusFlag(dto.getOverdueFlag() == 1 ? PendingStatusFlagEnum.OVERDUE.getType() : PendingStatusFlagEnum.PRE_INVALID.getType()); dto.setStatusFlag(dto.getOverdueFlag() == 1 ? PendingStatusFlagEnum.OVERDUE.getType() : PendingStatusFlagEnum.PRE_OVERDUE.getType());
} else { } else if (betweenOverdueDay > 1) {
dto.setStatusFlag(PendingStatusFlagEnum.OVERDUE.getType());
}else{
dto.setStatusFlag(PendingStatusFlagEnum.NORMAL.getType()); dto.setStatusFlag(PendingStatusFlagEnum.NORMAL.getType());
} }
dto.setTitle(taskTypeEnum.getName()); dto.setTitle(taskTypeEnum.getName());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment