项目实体修改

donate-service/src/main/java/com/uas/service/donate/model/Activity.java

@@ -314,6 +314,9 @@ public class Activity implements Serializable{
 
     @SuppressWarnings("deprecation")
     public Short getStage() {
+        if (null == endTime || null == luckyTime || null == receiveStartTime || null == receiveEndTime) {
+            return 0;
+        }
         Date date = new Date();
         Calendar now = Calendar.getInstance();
         now.set(Calendar.YEAR, date.getYear());

donate-service/src/main/java/com/uas/service/donate/model/Project.java

@@ -4,8 +4,12 @@ package com.uas.service.donate.model;
 import javax.persistence.*;
 import java.io.Serializable;
 import java.text.SimpleDateFormat;
+import java.util.Calendar;
 import java.util.Date;
 
+/**
+ * 项目实体
+ */
 @Entity
 @Table(name="donate$project")
 public class Project implements Serializable{
@@ -36,6 +40,10 @@ public class Project implements Serializable{
 
     /**
      * 捐助领域
+     * 0 环保/保护动物
+     * 1 疾病救助
+     * 2 扶贫/救灾
+     * 3 教育/助学
      */
     @Column(name = "pro_area")
     private Integer area;
@@ -90,6 +98,12 @@ public class Project implements Serializable{
     @Column(name = "pro_person_name")
     private String personName;
 
+    /**
+     * 发起人电话号码
+     */
+    @Column(name = "pro_person_tel")
+    private String personTel;
+
     /**
      * 发起人头像
      */
@@ -171,7 +185,7 @@ public class Project implements Serializable{
     private String refuse;
 
     /**
-     * 是否是提交状态
+     * 是否是提交状态 (1 为提交  0为未提交)
      * @return
      */
     @Column(name = "pro_publish")
@@ -185,6 +199,25 @@ public class Project implements Serializable{
     @Column(name = "pro_total_amount")
     private Double totalAmount;
 
+    /**
+     * 执行计划
+     */
+    @Column(name = "pro_executionplan")
+    private String executionPlan;
+
+    /**
+     * 资助人群
+     */
+    @Column(name = "pro_population")
+    private String population;
+
+    /**
+     * 是否已结束 (1已过期，0未过期)
+     * @return
+     */
+    @Transient
+    private Short overdue;
+
     public Long getId() {
         return id;
     }
@@ -408,4 +441,57 @@ public class Project implements Serializable{
     public void setTotalAmount(Double totalAmount) {
         this.totalAmount = totalAmount;
     }
+
+    @SuppressWarnings("deprecation")
+    public Short getOverdue() {
+        if (null == startTime || null == endTime) {
+            return 0;
+        }
+        Date date = new Date();
+        Calendar now = Calendar.getInstance();
+        now.set(Calendar.YEAR, date.getYear());
+        now.set(Calendar.MONTH, date.getMonth());
+        now.set(Calendar.DAY_OF_MONTH, date.getDate());
+        Calendar start = Calendar.getInstance();
+        start.set(Calendar.YEAR, startTime.getYear());
+        start.set(Calendar.MONTH, startTime.getMonth());
+        start.set(Calendar.DAY_OF_MONTH, startTime.getDate());
+        Calendar end = Calendar.getInstance();
+        end.set(Calendar.YEAR, endTime.getYear());
+        end.set(Calendar.MONTH, endTime.getMonth());
+        end.set(Calendar.DAY_OF_MONTH, endTime.getDate());
+        if (now.compareTo(start) > 0 && now.compareTo(end) < 0) {
+            return 0;
+        } else {
+            return 1;
+        }
+    }
+
+    public void setOverdue(Short overdue) {
+        this.overdue = overdue;
+    }
+
+    public String getExecutionPlan() {
+        return executionPlan;
+    }
+
+    public void setExecutionPlan(String executionPlan) {
+        this.executionPlan = executionPlan;
+    }
+
+    public String getPopulation() {
+        return population;
+    }
+
+    public void setPopulation(String population) {
+        this.population = population;
+    }
+
+    public String getPersonTel() {
+        return personTel;
+    }
+
+    public void setPersonTel(String personTel) {
+        this.personTel = personTel;
+    }
 }