|
@@ -6,6 +6,7 @@ import com.uas.platform.core.model.Constant;
|
|
|
import com.uas.platform.core.model.Status;
|
|
import com.uas.platform.core.model.Status;
|
|
|
import org.codehaus.jackson.annotate.JsonIgnore;
|
|
import org.codehaus.jackson.annotate.JsonIgnore;
|
|
|
import org.springframework.util.CollectionUtils;
|
|
import org.springframework.util.CollectionUtils;
|
|
|
|
|
+import org.springframework.util.StringUtils;
|
|
|
|
|
|
|
|
import javax.persistence.*;
|
|
import javax.persistence.*;
|
|
|
import java.util.*;
|
|
import java.util.*;
|
|
@@ -583,7 +584,11 @@ public class PurchaseInquiryItem extends AbstractOrderProduct {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
public Short getOverdue() {
|
|
public Short getOverdue() {
|
|
|
- return check(this.inquiry.getEndDate());
|
|
|
|
|
|
|
+ if (StringUtils.isEmpty(this.inquiry.getEndDate())) {
|
|
|
|
|
+ return 0;
|
|
|
|
|
+ } else {
|
|
|
|
|
+ return check(this.inquiry.getEndDate());
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
public void setOverdue(Short overdue) {
|
|
public void setOverdue(Short overdue) {
|
|
@@ -591,7 +596,11 @@ public class PurchaseInquiryItem extends AbstractOrderProduct {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
public Short getInvalid() {
|
|
public Short getInvalid() {
|
|
|
- return check(this.toDate);
|
|
|
|
|
|
|
+ if(StringUtils.isEmpty(this.toDate)) {
|
|
|
|
|
+ return 0;
|
|
|
|
|
+ } else {
|
|
|
|
|
+ return check(this.toDate);
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
public void setInvalid(Short invalid) {
|
|
public void setInvalid(Short invalid) {
|