donate-service,项目展示，活动展示，财务展示，项目进度，项目结项，功能更新。

donate-service/src/main/java/com/uas/service/donate/Impl/ActivityServiceImpl.java

@@ -1,37 +1,83 @@
 package com.uas.service.donate.Impl;
 
 import com.uas.service.donate.dao.ActivityDao;
+import com.uas.service.donate.dao.AwardDao;
 import com.uas.service.donate.model.Activity;
+import com.uas.service.donate.model.Award;
 import com.uas.service.donate.service.ActivityService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+import java.util.List;
+
 @Service
 public class ActivityServiceImpl implements ActivityService {
 
     @Autowired
     private ActivityDao activityDao;
 
+    @Autowired
+    private AwardDao awardDao;
+
+    /**
+     * 将活动关联的奖品存进活动字段
+     * @return
+     */
+    private List<Activity> getAwards(List<Activity> activityList){
+
+        List<Activity> list=new ArrayList<>();
+        for(Activity activity:activityList){
+            //通过活动id取到奖品有哪些
+            List<Award> awardList=awardDao.findByActivityId(activity.getId());
+            activity.setAwards(awardList);
+            Activity newActivity=activityDao.save(activity);
+            list.add(newActivity);
+        }
+        return list;
+    }
+
     //搜索出所有进行中和已结束的活动
-    public Page<Activity> findAll(Pageable pageable){
+    public List<Activity> findAll(){
+        //取得所有已开始和已结束的活动
+        List<Activity> activityList= activityDao.findAll();
+        //将所有活动所对应的奖品set进活动里
+        List<Activity> list=getAwards(activityList);
 
-        return activityDao.findAll(pageable);
+        return activityDao.save(list);
     }
 
     public Activity fingById(Long id){
-        return  activityDao.findOne(id);
+        //根据活动id找出活动
+        Activity activity=activityDao.findOne(id);
+        //获取活动的奖品
+        List<Award> awardList=awardDao.findByActivityId(id);
+        activity.setAwards(awardList);
+
+
+        return  activityDao.save(activity);
     }
 
     //搜索出所有正在进行的活动
-    public Page<Activity> findInProcess(Pageable pageable){
-        return activityDao.findInProcess(pageable);
+    public List<Activity> findInProcess() {
+
+        List<Activity> activityList= activityDao.findInProcess();
+        //将所有活动所对应的奖品set进活动里
+        List<Activity> list=getAwards(activityList);
+
+        return activityDao.save(list);
     }
 
     //搜索出所有已结束的活动,当前时间大于活动结束时间
-    public Page<Activity> findEndActivities(Pageable pageable){
-        return activityDao.findEndActivities(pageable);
+    public List<Activity> findEndActivities(){
+
+        List<Activity> activityList= activityDao.findEndActivities();
+        //将所有活动所对应的奖品set进活动里
+        List<Activity> list=getAwards(activityList);
+
+        return activityDao.save(list);
     }
 
     public Activity save(Activity activity){

donate-service/src/main/java/com/uas/service/donate/Impl/ProjectConcludeServiceImpl.java

@@ -6,6 +6,8 @@ import com.uas.service.donate.service.ProjectConcludeService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 @Service
 public class ProjectConcludeServiceImpl implements ProjectConcludeService {
     @Autowired
@@ -14,4 +16,9 @@ public class ProjectConcludeServiceImpl implements ProjectConcludeService {
     public ProjectConclude save(ProjectConclude projectConclude){
         return projectConcludeDao.save(projectConclude);
     }
+
+    public List<ProjectConclude> findAll(Long proId){
+        return projectConcludeDao.findAll(proId);
+    }
+
 }

donate-service/src/main/java/com/uas/service/donate/Impl/ProjectEvolveServiceImpl.java

@@ -6,6 +6,8 @@ import com.uas.service.donate.service.ProjectEvolveService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 @Service
 public class ProjectEvolveServiceImpl implements ProjectEvolveService {
     @Autowired
@@ -15,4 +17,9 @@ public class ProjectEvolveServiceImpl implements ProjectEvolveService {
     public ProjectEvolve save(ProjectEvolve projectEvolve) {
         return projectEvolveDao.save(projectEvolve);
     }
+
+    //查找某项目所有的项目进度
+    public List<ProjectEvolve> findAll(Long proId){
+        return projectEvolveDao.findAll(proId);
+    }
 }

donate-service/src/main/java/com/uas/service/donate/Impl/ProjectFinanceServiceImpl.java

@@ -8,6 +8,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.web.servlet.ServletComponentScan;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 @Service
 @ServletComponentScan(basePackages = {"com.uas.dfs.service"})
 public class ProjectFinanceServiceImpl implements ProjectFinanceService {
@@ -19,4 +21,9 @@ public class ProjectFinanceServiceImpl implements ProjectFinanceService {
         return projectFinanceDao.save(projectFinance);
     }
 
+    //查找某项目所有的财务情况
+    public List<ProjectFinance> findAll(Long proId){
+        return projectFinanceDao.findAll(proId);
+    }
+
 }

donate-service/src/main/java/com/uas/service/donate/controller/ActivityController.java

@@ -1,13 +1,17 @@
 package com.uas.service.donate.controller;
 
 import com.uas.service.donate.model.Activity;
+import com.uas.service.donate.model.Award;
 import com.uas.service.donate.service.ActivityService;
+import com.uas.service.donate.service.AwardService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Sort;
 import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
@@ -23,29 +27,19 @@ public class ActivityController {
     @Autowired
     private ActivityService activityService;
 
+    @Autowired
+    private AwardService awardService;
+
     /**
      * 展示进行中和已结束的活动列表
      * @return
      */
     @ResponseBody
     @RequestMapping("/getActivities")
-    public Page<Activity> getActivities(@RequestParam(value = "page",defaultValue = "0")Integer page,
-                                        @RequestParam(value = "size",defaultValue = "7")Integer size){
-        Pageable pageable=pageSort(page,size);
-        return activityService.findAll(pageable);
+    public List<Activity> getActivities(){
+        return activityService.findAll();
     }
 
-    /*优先级倒序，时间倒序排序的方式*/
-    private Pageable pageSort(Integer page,Integer size){
-        Sort.Order prioritySort=new Sort.Order(Sort.Direction.DESC,"priority");
-        Sort.Order timeSort=new Sort.Order(Sort.Direction.DESC,"submitTime");
-        List<Sort.Order> list=new ArrayList<Sort.Order>();
-        list.add(prioritySort);
-        list.add(timeSort);
-        Sort sort = new Sort(list);
-        Pageable pageable=new PageRequest(page,size,sort);
-        return pageable;
-    }
     /**
      * 展示某具体活动
      */
@@ -60,23 +54,18 @@ public class ActivityController {
      */
     @ResponseBody
     @RequestMapping("/inprocessActivities")
-    public Page<Activity> findInProcess(@RequestParam(value = "page",defaultValue = "0")Integer page,
-                                        @RequestParam(value = "size",defaultValue = "7")Integer size,
-                                        Pageable pageable){
-        return activityService.findInProcess(pageable);
+    public List<Activity> findInProcess(){
+        return activityService.findInProcess();
     }
 
     /**
      * 搜索出所有已结束的活动,当前时间大于活动结束时间
-     * @param pageable
      * @return
      */
     @ResponseBody
     @RequestMapping("/endActivities")
-    public Page<Activity> findEndActivities(@RequestParam(value = "page",defaultValue = "0")Integer page,
-                                            @RequestParam(value = "size",defaultValue = "7")Integer size,
-                                            Pageable pageable){
-        return activityService.findEndActivities(pageable);
+    public List<Activity> findEndActivities(){
+        return activityService.findEndActivities();
     }
 
     /**
@@ -85,8 +74,10 @@ public class ActivityController {
      * @return
      */
     @ResponseBody
-    @RequestMapping("/sumMoney")
-    public Double sumMoney(Long id){
-        return activityService.sumMoney(id);
+    @RequestMapping("/sumMoney/{id}")
+    public ModelMap sumMoney(@PathVariable("id") Long id) {
+
+        return new ModelMap("sum",activityService.sumMoney(id));
+
     }
 }

donate-service/src/main/java/com/uas/service/donate/controller/ProjectConcludeController.java

@@ -2,13 +2,17 @@ package com.uas.service.donate.controller;
 
 import com.alibaba.fastjson.JSONObject;
 import com.uas.service.donate.model.ProjectConclude;
+import com.uas.service.donate.model.ProjectFinance;
 import com.uas.service.donate.service.ProjectConcludeService;
+import com.uas.service.donate.service.ProjectFinanceService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
+import java.util.ArrayList;
 import java.util.Date;
+import java.util.List;
 
 @Controller
 @RequestMapping("/projectconclude")
@@ -17,7 +21,28 @@ public class ProjectConcludeController {
     @Autowired
     private ProjectConcludeService projectConcludeService;
 
+    @Autowired
+    private ProjectFinanceService projectFinanceService;
+
+    /**
+     * 展示某项目的项目结项和财务记录
+     * @param proId
+     * @return
+     */
     @ResponseBody
+    @RequestMapping("/conclude")
+    public List<Object> getConclude(Long proId){
+        List<ProjectConclude> projectConcludeList=projectConcludeService.findAll(proId);
+        List<ProjectFinance> projectFinanceList=projectFinanceService.findAll(proId);
+        List<Object> list=new ArrayList<Object>();
+        list.add(projectConcludeList);
+        list.add(projectFinanceList);
+        return list;
+    }
+
+
+
+    /*@ResponseBody
     @RequestMapping("/save")
     public ProjectConclude save(String jsonStr){
         ProjectConclude projectConclude= JSONObject.parseObject(jsonStr,ProjectConclude.class);
@@ -34,5 +59,5 @@ public class ProjectConcludeController {
         projectConclude.setSubmitTime(new Date());
         return projectConcludeService.save(projectConclude);
     }
-
+*/
 }

donate-service/src/main/java/com/uas/service/donate/controller/ProjectController.java

@@ -90,6 +90,11 @@ public class ProjectController {
         return projectService.findArea(area);
     }
 
+    /**
+     * 点击插看项目详情
+     * @param id
+     * @return
+     */
     @ResponseBody
     @RequestMapping("/detail")
     public Project showDetail(Long id) {

donate-service/src/main/java/com/uas/service/donate/controller/ProjectEvolveController.java

@@ -9,6 +9,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import java.util.Date;
+import java.util.List;
 
 @Controller
 @RequestMapping("/projectevolve")
@@ -16,7 +17,14 @@ public class ProjectEvolveController {
     @Autowired
     private ProjectEvolveService projectEvolveService;
 
+    //查找某项目所有的项目进度
     @ResponseBody
+    @RequestMapping("/getEvolves")
+    public List<ProjectEvolve> findAll(Long proId){
+        return projectEvolveService.findAll(proId);
+    }
+
+   /* @ResponseBody
     @RequestMapping("/save")
     public ProjectEvolve save(String jsonStr){
         ProjectEvolve projectEvolve= JSONObject.parseObject(jsonStr,ProjectEvolve.class);
@@ -33,5 +41,5 @@ public class ProjectEvolveController {
         projectEvolve.setStatus(2);
         projectEvolve.setSubmitTime(new Date());
         return projectEvolveService.save(projectEvolve);
-    }
+    }*/
 }

donate-service/src/main/java/com/uas/service/donate/controller/ProjectFinanceController.java

@@ -9,6 +9,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import java.util.Date;
+import java.util.List;
 
 @Controller
 @RequestMapping("/projectfinance")
@@ -16,7 +17,19 @@ public class ProjectFinanceController {
     @Autowired
     private ProjectFinanceService projectFinanceService;
 
+    /**
+     * 查找某项目的所有财务信息
+     * @param proId
+     * @return
+     */
     @ResponseBody
+    @RequestMapping("/findAllFinance")
+    public List<ProjectFinance> findAll(Long proId){
+        return projectFinanceService.findAll(proId);
+    }
+
+
+ /*   @ResponseBody
     @RequestMapping("/save")
     public ProjectFinance save(String jsonStr){
         ProjectFinance projectFinance= JSONObject.parseObject(jsonStr,ProjectFinance.class);
@@ -33,5 +46,5 @@ public class ProjectFinanceController {
         projectFinance.setStatus(2);
         projectFinance.setSubmitTime(new Date());
         return projectFinanceService.save(projectFinance);
-    }
+    }*/
 }

donate-service/src/main/java/com/uas/service/donate/dao/ActivityDao.java

@@ -17,19 +17,19 @@ public interface ActivityDao extends JpaRepository<Activity,Long>,JpaSpecificati
 
     //搜索出所有进行中和已结束的活动
     @Query("from Activity a where  a.publish=2 and NOW()>a.startTime")
-    Page<Activity> findAll(Pageable pageable);
+    List<Activity> findAll();
 
     //搜索出所有还未开始的活动,活动开始时间小于当前时间
     @Query("from Activity a where now()<a.startTime and publish=2")
-    Page<Activity> findNotStart(Pageable pageable);
+    List<Activity> findNotStart();
 
     //搜索出所有正在进行的活动
     @Query("from Activity a where now()>=a.startTime and now()<=a.endTime and publish=2")
-    Page<Activity> findInProcess(Pageable pageable);
+    List<Activity> findInProcess();
 
     //搜索出所有已结束的活动,当前时间大于活动结束时间
     @Query("from Activity a where NOW()>a.endTime and publish=2")
-    Page<Activity> findEndActivities(Pageable pageable);
+    List<Activity> findEndActivities();
 
     //计算与活动相关的项目筹集的总金额
     @Query("select sum(p.totalAmount) from Project p where p.id in (select pq.proId from ProjectQualification pq where pq.activityId=:activityId)")

donate-service/src/main/java/com/uas/service/donate/dao/ProjectConcludeDao.java

@@ -4,8 +4,16 @@ package com.uas.service.donate.dao;
 import com.uas.service.donate.model.ProjectConclude;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 @Repository
 public interface ProjectConcludeDao extends JpaRepository<ProjectConclude,Long>,JpaSpecificationExecutor<ProjectConclude> {
+
+    @Query("from ProjectConclude where proId=:proId")
+    List<ProjectConclude> findAll(@Param("proId")Long proId);
+
 }

donate-service/src/main/java/com/uas/service/donate/dao/ProjectEvolveDao.java

@@ -1,8 +1,17 @@
 package com.uas.service.donate.dao;
 
 import com.uas.service.donate.model.ProjectEvolve;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+
+import java.util.List;
 
 public interface ProjectEvolveDao extends JpaRepository<ProjectEvolve,Long>,JpaSpecificationExecutor<ProjectEvolve> {
+
+    //查找某项目所有的项目进度
+    @Query("from ProjectEvolve where proId=:proId")
+    List<ProjectEvolve> findAll(@Param("proId")Long proId);
 }

donate-service/src/main/java/com/uas/service/donate/dao/ProjectFinanceDao.java

@@ -3,9 +3,16 @@ package com.uas.service.donate.dao;
 import com.uas.service.donate.model.ProjectFinance;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 @Repository
 public interface ProjectFinanceDao extends JpaRepository<ProjectFinance,Long>,JpaSpecificationExecutor<ProjectFinance> {
 
+    //查找某项目所有的财务情况
+    @Query("from ProjectFinance where proId=:proId")
+    List<ProjectFinance> findAll(@Param("proId")Long proId);
 }

donate-service/src/main/java/com/uas/service/donate/service/ActivityService.java

@@ -9,16 +9,16 @@ import java.util.List;
 public interface ActivityService {
 
     //搜索出所有进行中和已结束的活动
-    Page<Activity> findAll(Pageable pageable);
+    List<Activity> findAll();
 
     //通过活动id，找到某一活动
     Activity fingById(Long id);
 
     //搜索出所有正在进行的活动
-    Page<Activity> findInProcess(Pageable pageable);
+    List<Activity> findInProcess();
 
     //搜索出所有已结束的活动,当前时间大于活动结束时间
-    Page<Activity> findEndActivities(Pageable pageable);
+    List<Activity> findEndActivities();
 
     Activity save(Activity activity);
 

donate-service/src/main/java/com/uas/service/donate/service/ProjectConcludeService.java

@@ -3,7 +3,11 @@ package com.uas.service.donate.service;
 
 import com.uas.service.donate.model.ProjectConclude;
 
+import java.util.List;
+
 public interface ProjectConcludeService {
 
     ProjectConclude save(ProjectConclude projectConclude);
+
+    List<ProjectConclude> findAll(Long proId);
 }

donate-service/src/main/java/com/uas/service/donate/service/ProjectEvolveService.java

@@ -3,6 +3,12 @@ package com.uas.service.donate.service;
 
 import com.uas.service.donate.model.ProjectEvolve;
 
+import java.util.List;
+
 public interface ProjectEvolveService {
+
     ProjectEvolve save(ProjectEvolve projectEvolve);
+
+    //查找某项目所有的项目进度
+    List<ProjectEvolve> findAll(Long proId);
 }

donate-service/src/main/java/com/uas/service/donate/service/ProjectFinanceService.java

@@ -3,7 +3,12 @@ package com.uas.service.donate.service;
 
 import com.uas.service.donate.model.ProjectFinance;
 
+import java.util.List;
+
 public interface ProjectFinanceService {
 
     ProjectFinance save(ProjectFinance projectFinance);
+
+    //查找某项目所有的财务情况
+    List<ProjectFinance> findAll(Long proId);
 }