|
|
|
@ -174,7 +174,7 @@ public class HighDangerController { |
|
|
|
diffHours = Math.abs(diffHours); |
|
|
|
diffHours = Math.abs(diffHours); |
|
|
|
|
|
|
|
|
|
|
|
int comparison = nowDate.compareTo(pcEndTime); |
|
|
|
int comparison = nowDate.compareTo(pcEndTime); |
|
|
|
if (comparison < 0) { // 超期逻辑
|
|
|
|
if (comparison > 0) { // 超期逻辑
|
|
|
|
if (diffHours < 1) { |
|
|
|
if (diffHours < 1) { |
|
|
|
base.setDeadlineStatus("超期不足一小时"); |
|
|
|
base.setDeadlineStatus("超期不足一小时"); |
|
|
|
base.setDeadlineType("1"); |
|
|
|
base.setDeadlineType("1"); |
|
|
|
@ -192,7 +192,7 @@ public class HighDangerController { |
|
|
|
base.setDeadline(diffDays); |
|
|
|
base.setDeadline(diffDays); |
|
|
|
base.setDeadlineStatus("超期" + diffDays + "天" + remainingHours + "小时"); |
|
|
|
base.setDeadlineStatus("超期" + diffDays + "天" + remainingHours + "小时"); |
|
|
|
base.setDeadlineType("1"); |
|
|
|
base.setDeadlineType("1"); |
|
|
|
} else if (comparison > 0 && diffDays <= 3) { // 临期逻辑
|
|
|
|
} else if (comparison < 0 && diffDays <= 3) { // 临期逻辑
|
|
|
|
if (diffHours < 1) { |
|
|
|
if (diffHours < 1) { |
|
|
|
base.setDeadlineStatus("临期不足一小时"); |
|
|
|
base.setDeadlineStatus("临期不足一小时"); |
|
|
|
base.setDeadlineType("2"); |
|
|
|
base.setDeadlineType("2"); |
|
|
|
@ -233,7 +233,7 @@ public class HighDangerController { |
|
|
|
diffHours = Math.abs(diffHours); |
|
|
|
diffHours = Math.abs(diffHours); |
|
|
|
|
|
|
|
|
|
|
|
int comparison = nowDate.compareTo(pcStartTime); |
|
|
|
int comparison = nowDate.compareTo(pcStartTime); |
|
|
|
if (comparison < 0) { // 超期
|
|
|
|
if (comparison > 0) { // 超期
|
|
|
|
if (diffHours < 1) { |
|
|
|
if (diffHours < 1) { |
|
|
|
base.setDeadlineStatus("超期不足一小时"); |
|
|
|
base.setDeadlineStatus("超期不足一小时"); |
|
|
|
base.setDeadlineType("1"); |
|
|
|
base.setDeadlineType("1"); |
|
|
|
@ -251,7 +251,7 @@ public class HighDangerController { |
|
|
|
base.setDeadline(diffDays); |
|
|
|
base.setDeadline(diffDays); |
|
|
|
base.setDeadlineStatus("超期" + diffDays + "天" + remainingHours + "小时"); |
|
|
|
base.setDeadlineStatus("超期" + diffDays + "天" + remainingHours + "小时"); |
|
|
|
base.setDeadlineType("1"); |
|
|
|
base.setDeadlineType("1"); |
|
|
|
} else if (comparison > 0 && diffDays <= termTime) { // 临期
|
|
|
|
} else if (comparison < 0 && diffDays <= termTime) { // 临期
|
|
|
|
if (diffHours < 1) { |
|
|
|
if (diffHours < 1) { |
|
|
|
base.setDeadlineStatus("临期不足一小时"); |
|
|
|
base.setDeadlineStatus("临期不足一小时"); |
|
|
|
base.setDeadlineType("2"); |
|
|
|
base.setDeadlineType("2"); |
|
|
|
|