donate-console

donate-console/src/main/java/com/uas/console/donate/Application.java

@@ -2,19 +2,16 @@ package com.uas.console.donate;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.web.bind.annotation.RequestMapping;
+
 import org.springframework.web.bind.annotation.RestController;
 
 @SpringBootApplication
 @RestController
-public class Application {
 
-//    @RequestMapping("/")
-//    public String greeting() {
-//        return "Index Page Of donate-console！";
-//    }
+public class Application {
 
-    public static void main(String[] args) {
-        SpringApplication.run(Application.class, args);
+    public static void main(String[] args){
+        SpringApplication application=new SpringApplication(Application.class);
+        application.run(args);
     }
 }

donate-console/src/main/java/com/uas/console/donate/Impl/ActivityRecodeServiceImpl.java

@@ -27,8 +27,4 @@ public class ActivityRecodeServiceImpl implements ActivityRecodeService {
         return activityRecodeDao.findByUuid(uuid);
     }
 
-   /* public ActivityRecode extract(Long activityId){
-
-        return activityRecodeDao.extract(activityId);
-    }*/
 }

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

@@ -26,6 +26,8 @@ public class ActivityServiceImpl implements ActivityService{
         Date date = new Date();
         activity.setSubmitTime(date);
         activity.setCode(date.toString());
+        activity.setStatus(1);
+        activity.setPriority(1);
         List<Award> awardList = activity.getAwards();
         activity = activityDao.saveAndFlush(activity);
         if(!CollectionUtils.isEmpty(awardList)) {
@@ -36,4 +38,19 @@ public class ActivityServiceImpl implements ActivityService{
         }
         return activity;
     }
+
+    public Activity submit(Long id){
+        Activity activity= activityDao.findOne(id);
+        activity.setStatus(2);
+
+        return activityDao.save(activity);
+    }
+
+    public Activity up(Long id){
+        Integer max=activityDao.findMAxPrioruty();
+        max++;
+        Activity activity=activityDao.findOne(id);
+        activity.setPriority(max);
+        return activityDao.save(activity);
+    }
 }

donate-console/src/main/java/com/uas/console/donate/Impl/AwardServiceImpl.java

@@ -6,6 +6,8 @@ import com.uas.console.donate.service.AwardService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 @Service
 public class AwardServiceImpl implements AwardService{
 
@@ -16,4 +18,9 @@ public class AwardServiceImpl implements AwardService{
 
        return awardDao.saveAndFlush(award);
     }
+
+    public List<Award> findByActivityId(Long activityId){
+        return awardDao.findByActivityId(activityId);
+    }
+
 }

donate-console/src/main/java/com/uas/console/donate/Impl/OrgServiceImpl.java

@@ -0,0 +1,66 @@
+package com.uas.console.donate.Impl;
+
+
+import com.uas.console.donate.dao.OrgDao;
+import com.uas.console.donate.model.Org;
+import com.uas.console.donate.service.OrgService;
+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.List;
+
+@Service
+public class OrgServiceImpl implements OrgService {
+
+    @Autowired
+    private OrgDao orgDao;
+
+    public Org save(Org org){
+        return orgDao.save(org);
+    }
+
+    public Page<Org> findAll(Pageable pageable){
+
+        return orgDao.findAll(pageable);
+    }
+
+    public Page<Org> findUnnotify(Pageable pageable){
+        return orgDao.findUnnotify(pageable);
+    }
+
+    public Page<Org> findChecked(Pageable pageable){
+        return orgDao.findChecked(pageable);
+    }
+
+    public Page<Org> findRefused(Pageable pageable){
+        return orgDao.findRefused(pageable);
+    }
+
+    public Org approve(Long id){
+        Org org=orgDao.findOne(id);
+        org.setStatus(1);
+        return orgDao.save(org);
+    }
+
+    public Org unapprove(Long id,String refuse){
+        Org org=orgDao.findOne(id);
+        org.setStatus(2);
+        org.setRefuse(refuse);
+        return orgDao.save(org);
+    }
+
+    public List<Org> findByTypeAndMajorArea(Integer type,Integer majorArea){
+        return orgDao.findByTypeAndMajorArea(type,majorArea);
+    }
+
+    public List<Org> findByType(Integer type){
+        return orgDao.findByType(type);
+    }
+
+    public List<Org> findByMajorArea(Integer majorArea){
+        return orgDao.findByMajorArea(majorArea);
+    }
+
+}

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

@@ -0,0 +1,17 @@
+package com.uas.console.donate.Impl;
+
+import com.uas.console.donate.dao.ProjectConcludeDao;
+import com.uas.console.donate.model.ProjectConclude;
+import com.uas.console.donate.service.ProjectConcludeService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class ProjectConcludeServiceImpl implements ProjectConcludeService{
+    @Autowired
+    private ProjectConcludeDao projectConcludeDao;
+
+    public ProjectConclude save(ProjectConclude projectConclude){
+        return projectConcludeDao.save(projectConclude);
+    }
+}

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

@@ -0,0 +1,18 @@
+package com.uas.console.donate.Impl;
+
+import com.uas.console.donate.dao.ProjectEvolveDao;
+import com.uas.console.donate.model.ProjectEvolve;
+import com.uas.console.donate.service.ProjectEvolveService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class ProjectEvolveServiceImpl implements ProjectEvolveService{
+    @Autowired
+    private ProjectEvolveDao projectEvolveDao;
+
+    @Override
+    public ProjectEvolve save(ProjectEvolve projectEvolve) {
+        return projectEvolveDao.save(projectEvolve);
+    }
+}

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

@@ -0,0 +1,28 @@
+package com.uas.console.donate.Impl;
+
+import com.uas.console.donate.dao.ProjectFinanceDao;
+import com.uas.console.donate.model.FileUpload;
+import com.uas.console.donate.model.ProjectFinance;
+import com.uas.console.donate.service.ProjectFinanceService;
+import com.uas.dfs.service.FileClient;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.web.servlet.ServletComponentScan;
+import org.springframework.stereotype.Service;
+
+@Service
+@ServletComponentScan(basePackages = {"com.uas.dfs.service"})
+public class ProjectFinanceServiceImpl implements ProjectFinanceService{
+
+    @Autowired
+    private ProjectFinanceDao projectFinanceDao;
+
+/*    @Autowired
+    private FileClient fileClient;*/
+
+    /*public ProjectFinance save(ProjectFinance projectFinance, FileUpload file) {
+        String path = fileClient.upload(file.getFile().getBytes(), file.getFile().getSize(), file.getFile().getOriginalFilename(), null);
+        System.out.println(path);
+        return projectFinanceDao.save(projectFinance);
+    }*/
+
+}

donate-console/src/main/java/com/uas/console/donate/Impl/ProjectReportServiceImpl.java

@@ -0,0 +1,19 @@
+package com.uas.console.donate.Impl;
+
+
+import com.uas.console.donate.dao.ProjectReportDao;
+import com.uas.console.donate.model.ProjectReport;
+import com.uas.console.donate.service.ProjectReportService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class ProjectReportServiceImpl implements ProjectReportService{
+
+    @Autowired
+    ProjectReportDao projectReportDao;
+
+    public ProjectReport save(ProjectReport projectReport){
+        return projectReportDao.save(projectReport);
+    }
+}

donate-console/src/main/java/com/uas/console/donate/Impl/ProjectServiceImpl.java

@@ -0,0 +1,36 @@
+package com.uas.console.donate.Impl;
+
+
+import com.uas.console.donate.dao.ProjectDao;
+import com.uas.console.donate.model.Project;
+import com.uas.console.donate.service.ProjectService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.stereotype.Service;
+
+@Service
+public class ProjectServiceImpl implements ProjectService {
+
+    @Autowired
+    private ProjectDao projectDao;
+
+    public Page<Project> findAll(Pageable pageable){
+
+        return projectDao.findAll(pageable);
+    }
+
+    public Project approve(Long id){
+        Project project=projectDao.findOne(id);
+        project.setStatus(1);
+        return projectDao.save(project);
+    }
+
+    public Project unapprove(Long id,String refuse){
+        Project project=projectDao.findOne(id);
+        project.setRefuse(refuse);
+        project.setStatus(2);
+        return projectDao.save(project);
+    }
+
+}

donate-console/src/main/java/com/uas/console/donate/Impl/UserServiceImpl.java

@@ -0,0 +1,20 @@
+package com.uas.console.donate.Impl;
+
+import com.uas.console.donate.dao.UserDao;
+import com.uas.console.donate.model.User;
+import com.uas.console.donate.service.UserService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class UserServiceImpl implements UserService{
+
+    @Autowired
+    private UserDao userDao;
+
+    public List<User> findAll(){
+        return userDao.findAll();
+    }
+}

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

@@ -9,6 +9,8 @@ import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
+import java.util.Date;
+
 
 @Controller
 @RequestMapping("/activity")
@@ -18,15 +20,32 @@ public class ActivityController {
     private ActivityService activityService;
 
     /**
-     * 发布活动
+     * 保存活动
      */
     @ResponseBody
     @RequestMapping("/save")
     public Activity save(String jsonStr) {
         Activity activity = JSONObject.parseObject(jsonStr, Activity.class);
+        activity.setSubmitTime(new Date());
         return activityService.save(activity);
     }
 
+    /**
+     * 发布活动
+     */
+    @ResponseBody
+    @RequestMapping("/submit")
+    public Activity submit(Long id){
+        return activityService.submit(id);
+    }
 
 
+    /**
+     * 活动置顶
+     */
+    @ResponseBody
+    @RequestMapping("/up")
+    public Activity up(Long id){
+        return activityService.up(id);
+    }
 }

donate-console/src/main/java/com/uas/console/donate/controller/ActivityRecodeController.java

@@ -2,13 +2,16 @@ package com.uas.console.donate.controller;
 
 import com.alibaba.fastjson.JSONObject;
 import com.uas.console.donate.model.ActivityRecode;
+import com.uas.console.donate.model.Award;
 import com.uas.console.donate.service.ActivityRecodeService;
+import com.uas.console.donate.service.AwardService;
 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.awt.*;
+import java.util.*;
 import java.util.List;
 
 @Controller
@@ -18,33 +21,38 @@ public class ActivityRecodeController {
     @Autowired
     private ActivityRecodeService activityRecodeService;
 
+    @Autowired
+    private AwardService awardService;
+
     /**
      * 保存活动参与人信息
      */
     @ResponseBody
     @RequestMapping("/join")
-    public ActivityRecode join(String jsonStr){
-        ActivityRecode activityRecode= JSONObject.parseObject(jsonStr, ActivityRecode.class);
-        ActivityRecode activity=activityRecodeService.save(activityRecode);
+    public ActivityRecode join(String jsonStr) {
+        ActivityRecode activityRecode = JSONObject.parseObject(jsonStr, ActivityRecode.class);
+        ActivityRecode activity = activityRecodeService.save(activityRecode);
         return activity;
     }
 
     /**
-     *查询某一用户参加过的活动
+     * 查询某一用户参加过的活动
      */
     @ResponseBody
     @RequestMapping("/queryOne")
-    public List<ActivityRecode> queryOne(Long uuid){
+    public List<ActivityRecode> queryOne(Long uuid) {
         return activityRecodeService.queryOne(uuid);
     }
+
     /**
      * 查询某一活动参与者
+     *
      * @param activityId
      * @return
      */
     @ResponseBody
     @RequestMapping("/joins")
-    public List<ActivityRecode> joins(Long activityId){
+    public List<ActivityRecode> joins(Long activityId) {
 
         return activityRecodeService.joins(activityId);
     }
@@ -52,19 +60,41 @@ public class ActivityRecodeController {
     /**
      * 抽奖
      */
-   /* @ResponseBody
+    @ResponseBody
     @RequestMapping("/extract")
-    public List<ActivityRecode> extract(Long activityId){
+    public List<ActivityRecode> extract(Long activityId) {
+
         //根据活动id查询谁参与了抽奖
-        List<ActivityRecode> list=activityRecodeService.joins(activityId);
-        //根据活动id查询有哪些奖品
+        List<ActivityRecode> activityRecodeList = activityRecodeService.joins(activityId);
 
-        List<ActivityRecode> list1=new ArrayList<ActivityRecode>();
-        for(ActivityRecode joinActivity:list){
-            ActivityRecode join= activityRecodeService.extract(joinActivity.getUuid());
-           list1.add(join);
-        }
-        return list1;
-    }*/
+        //根据活动id查询活动奖品
+        List<Award> awardList = awardService.findByActivityId(activityId);
 
-}
+        Set<Integer> set = new HashSet<Integer>();
+
+        //抽奖方法
+        for (Award award : awardList) {
+            //奖品的总数量
+            int amount = award.getAmount();
+            //参与活动人数
+            int size = activityRecodeList.size();
+
+            int list = (amount <= size) ? amount : size;
+
+            for (int i = 1; i <= list; i++) {
+                int random = (int) (Math.random() * size);
+                while (set.contains(random)) {
+                    random = (int) (Math.random() * size);
+                }
+                ActivityRecode activityRecode = activityRecodeList.get(random);
+
+                activityRecode.setAwardId(award.getId());
+                activityRecode.setReceiveTime(new Date());
+                activityRecode.setStatus(0);
+                activityRecodeService.save(activityRecode);
+                set.add(random);
+            }
+        }
+        return activityRecodeList;
+    }
+}

donate-console/src/main/java/com/uas/console/donate/controller/OrgController.java

@@ -0,0 +1,84 @@
+package com.uas.console.donate.controller;
+
+import com.uas.console.donate.model.Org;
+import com.uas.console.donate.service.OrgService;
+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.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Controller
+@RequestMapping("/org")
+public class OrgController {
+    @Autowired
+    private OrgService orgService;
+
+    /**
+     * 获取未通知的机构列表
+     */
+    @ResponseBody
+    @RequestMapping("/unnotify")
+    public Page<Org> findUnnotify(@RequestParam(value = "page",defaultValue = "0")Integer page,
+                                 @RequestParam(value = "size",defaultValue = "10")Integer size){
+        Pageable pageable=pageSort(page,size);
+
+        return orgService.findUnnotify(pageable);
+    }
+    private Pageable pageSort(Integer page,Integer size){
+        Sort.Order timeSort=new Sort.Order(Sort.Direction.DESC,"createTime");
+        List<Sort.Order> list=new ArrayList<Sort.Order>();
+        list.add(timeSort);
+        Sort sort = new Sort(list);
+        Pageable pageable=new PageRequest(page,size,sort);
+        return pageable;
+    }
+
+    /**
+     * 获取已审核的机构列表
+     */
+    @ResponseBody
+    @RequestMapping("/checked")
+    public Page<Org> findChecked(@RequestParam(value = "page",defaultValue = "0")Integer page,
+                                 @RequestParam(value = "size",defaultValue = "10")Integer size){
+        Pageable pageable=pageSort(page,size);
+        return orgService.findChecked(pageable);
+    }
+
+    /**
+     * 获取未通过的机构列表
+     */
+    @ResponseBody
+    @RequestMapping("/refused")
+    public Page<Org> findRefused(@RequestParam(value = "page",defaultValue = "0")Integer page,
+                                @RequestParam(value = "size",defaultValue = "10")Integer size){
+        Pageable pageable=pageSort(page,size);
+        return orgService.findRefused(pageable);
+    }
+
+    /**
+     * 批准机构申请
+     */
+    @ResponseBody
+    @RequestMapping("/approve")
+    public Org approve(Long id){
+        return orgService.approve(id);
+    }
+
+    /**
+     * 拒绝机构申请
+     */
+    @ResponseBody
+    @RequestMapping("/unapprove")
+    public Org unapprove(Long id,String refuse){
+        return orgService.unapprove(id,refuse);
+    }
+
+}

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

@@ -0,0 +1,11 @@
+package com.uas.console.donate.controller;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+@Controller
+@RequestMapping("/projectconclude")
+public class ProjectConcludeController {
+
+
+}

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

@@ -0,0 +1,70 @@
+package com.uas.console.donate.controller;
+
+import com.uas.console.donate.model.Project;
+import com.uas.console.donate.service.ProjectService;
+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.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Controller
+@RequestMapping("/project")
+public class ProjectController {
+
+    @Autowired
+    private ProjectService projectService ;
+
+    /**
+     * 获取所有捐款项目
+     * @param page
+     * @param size
+     * @return
+     */
+    @RequestMapping("/getProjects")
+    @ResponseBody
+    public Page<Project> findAll(@RequestParam(value = "page",defaultValue = "0")Integer page,
+                                 @RequestParam(value = "size",defaultValue = "5")Integer size){
+        Pageable pageable=pageSort(page,size);
+        return projectService.findAll(pageable);
+    }
+
+    /*审核状态正序，时间倒序排序的方式*/
+    private Pageable pageSort(Integer page,Integer size){
+        Sort.Order statusSort=new Sort.Order(Sort.Direction.ASC,"status");
+        Sort.Order timeSort=new Sort.Order(Sort.Direction.DESC,"submitTime");
+        List<Sort.Order> list=new ArrayList<Sort.Order>();
+        list.add(statusSort);
+        list.add(timeSort);
+        Sort sort = new Sort(list);
+        Pageable pageable=new PageRequest(page,size,sort);
+        return pageable;
+    }
+
+    /**
+     * 审核所有捐款项目
+     */
+    @RequestMapping("/approve")
+    @ResponseBody
+    public Project approve(Long id){
+        return projectService.approve(id);
+    }
+
+    /**
+     * 驳回所有捐款项目
+     */
+    @RequestMapping("/unapprove")
+    @ResponseBody
+    public Project unapprove(Long id,String refuse){
+        return projectService.unapprove(id,refuse);
+    }
+
+
+}

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

@@ -0,0 +1,24 @@
+package com.uas.console.donate.controller;
+
+
+import com.uas.console.donate.model.ProjectEvolve;
+import com.uas.console.donate.service.ProjectEvolveService;
+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;
+
+@Controller
+@RequestMapping("/projectEvolve")
+public class ProjectEvolveController {
+    @Autowired
+    private ProjectEvolveService projectEvolveService;
+
+    @ResponseBody
+    @RequestMapping("/save")
+    public ProjectEvolve save(ProjectEvolve projectEvolve){
+        //状态.1:保存2:提交
+        projectEvolve.setStatus(1);
+        return projectEvolveService.save(projectEvolve);
+    }
+}

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

@@ -0,0 +1,25 @@
+package com.uas.console.donate.controller;
+
+import com.uas.console.donate.model.FileUpload;
+import com.uas.console.donate.model.ProjectFinance;
+import com.uas.console.donate.service.ProjectFinanceService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+@Controller
+@RequestMapping("/projectFinance")
+public class ProjectFinanceController {
+    @Autowired
+    private ProjectFinanceService projectFinanceService;
+
+   /* @ResponseBody
+    @RequestMapping("/save")
+    public ProjectFinance save(ProjectFinance projectFinance, FileUpload fileItem){
+        //状态.1:保存2:提交
+        projectFinance.setStatus(1);
+        return projectFinanceService.save(projectFinance, fileItem);
+    }*/
+}

donate-console/src/main/java/com/uas/console/donate/controller/ProjectReportController.java

@@ -0,0 +1,31 @@
+package com.uas.console.donate.controller;
+
+import com.uas.console.donate.model.ProjectReport;
+import com.uas.console.donate.service.ProjectReportService;
+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;
+
+@Controller
+@RequestMapping("/projectReport")
+public class ProjectReportController {
+
+    @Autowired
+    private ProjectReportService projectReportService;
+
+    @ResponseBody
+    @RequestMapping("/save")
+    public ProjectReport save(ProjectReport projectReport){
+        //状态.1:保存2:提交
+        projectReport.setStatus(1);
+        return projectReportService.save(projectReport);
+    }
+
+    @ResponseBody
+    @RequestMapping("/submit")
+    public ProjectReport submit(ProjectReport projectReport){
+        projectReport.setStatus(2);
+        return projectReportService.save(projectReport);
+    }
+}

donate-console/src/main/java/com/uas/console/donate/controller/UserController.java

@@ -0,0 +1,24 @@
+package com.uas.console.donate.controller;
+
+import com.uas.console.donate.model.User;
+import com.uas.console.donate.service.UserService;
+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.List;
+
+@Controller
+@RequestMapping("/user")
+public class UserController {
+
+    @Autowired
+    private UserService userService;
+
+    @ResponseBody
+    @RequestMapping("/getUsers")
+    public List<User> getUsers(){
+        return userService.findAll();
+    }
+}

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

@@ -3,10 +3,14 @@ package com.uas.console.donate.dao;
 import com.uas.console.donate.model.Activity;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
 
 @Repository
 public interface ActivityDao extends JpaRepository<Activity,Long>,JpaSpecificationExecutor<Activity> {
 
+    Activity findOne(Long id);
 
+    @Query("select max(priority) from Activity ")
+    Integer findMAxPrioruty();
 }

donate-console/src/main/java/com/uas/console/donate/dao/ActivityRecodeDao.java

@@ -15,5 +15,4 @@ public interface ActivityRecodeDao extends JpaRepository<ActivityRecode,Long>,Jp
 
     List<ActivityRecode> findByUuid(@Param(value = "uuid")Long uuid);
 
-   /* ActivityRecode extract(Long activityId);*/
 }

donate-console/src/main/java/com/uas/console/donate/dao/AwardDao.java

@@ -3,9 +3,15 @@ package com.uas.console.donate.dao;
 import com.uas.console.donate.model.Award;
 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 AwardDao extends JpaRepository<Award,Long>,JpaSpecificationExecutor<Award>{
 
+    @Query("from Award where activityId=:activityId")
+    List<Award> findByActivityId(@Param(value="activityId") Long activityId);
 }

donate-console/src/main/java/com/uas/console/donate/dao/OrgDao.java

@@ -0,0 +1,38 @@
+package com.uas.console.donate.dao;
+
+
+import com.uas.console.donate.model.Org;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+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.PagingAndSortingRepository;
+import org.springframework.data.repository.query.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface OrgDao extends JpaRepository<Org,Long>,JpaSpecificationExecutor<Org>,PagingAndSortingRepository<Org, Long> {
+
+    @Query("from Org where type=:type")
+    List<Org> findByType(@Param("type") Integer type);
+
+    @Query("from Org where majorArea=:majorArea")
+    List<Org> findByMajorArea(@Param("majorArea") Integer majorArea);
+
+    @Query("from Org where type=:type and majorArea=:majorArea")
+    List<Org> findByTypeAndMajorArea(@Param("type") Integer type,@Param("majorArea")Integer majorArea);
+
+    Page<Org> findAll(Pageable pageable);
+
+    @Query("from Org o where o.status=0")
+    Page<Org> findUnnotify(Pageable pageable);
+
+    @Query("from Org o where o.status=1")
+    Page<Org> findChecked(Pageable pageable);
+
+    @Query("from Org o where o.status=2")
+    Page<Org> findRefused(Pageable pageable);
+}

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

@@ -0,0 +1,10 @@
+package com.uas.console.donate.dao;
+
+import com.uas.console.donate.model.ProjectConclude;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface ProjectConcludeDao extends JpaRepository<ProjectConclude,Long>,JpaSpecificationExecutor<ProjectConclude>{
+}

donate-console/src/main/java/com/uas/console/donate/dao/ProjectDao.java

@@ -0,0 +1,18 @@
+package com.uas.console.donate.dao;
+
+
+import com.uas.console.donate.model.Project;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.repository.PagingAndSortingRepository;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface ProjectDao extends JpaRepository<Project,Long>,JpaSpecificationExecutor<Project>,PagingAndSortingRepository<Project, Long> {
+
+  //  Project findOne(Long id);
+
+    Page<Project> findAll(Pageable pageable);
+}

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

@@ -0,0 +1,8 @@
+package com.uas.console.donate.dao;
+
+import com.uas.console.donate.model.ProjectEvolve;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+
+public interface ProjectEvolveDao extends JpaRepository<ProjectEvolve,Long>,JpaSpecificationExecutor<ProjectEvolve> {
+}

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

@@ -0,0 +1,11 @@
+package com.uas.console.donate.dao;
+
+import com.uas.console.donate.model.ProjectFinance;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface ProjectFinanceDao extends JpaRepository<ProjectFinance,Long>,JpaSpecificationExecutor<ProjectFinance> {
+
+}

donate-console/src/main/java/com/uas/console/donate/dao/ProjectReportDao.java

@@ -0,0 +1,11 @@
+package com.uas.console.donate.dao;
+
+import com.uas.console.donate.model.ProjectReport;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface ProjectReportDao extends JpaRepository<ProjectReport,Long>,JpaSpecificationExecutor<ProjectReport>{
+
+}

donate-console/src/main/java/com/uas/console/donate/dao/UserDao.java

@@ -0,0 +1,11 @@
+package com.uas.console.donate.dao;
+
+import com.uas.console.donate.model.User;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface UserDao extends JpaRepository<User,Long>,JpaSpecificationExecutor<User>{
+
+}

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

@@ -69,6 +69,17 @@ public class Activity implements Serializable{
     @Column(name = "act_submit")
     private Date submitTime;
 
+    /**
+     * stutus   1:已保存 2：已发布
+     */
+    @Column(name="act_status")
+    private Integer status;
+
+    /**
+     * 活动优先级
+     */
+    @Column(name="act_priority")
+    private Integer priority;
 
     public Long getId() {
         return id;
@@ -145,6 +156,14 @@ public class Activity implements Serializable{
         this.submitTime = submitTime;
     }
 
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
     @Override
     public String toString() {
         return "Activity{" +
@@ -169,4 +188,12 @@ public class Activity implements Serializable{
     public void setAwards(List<Award> awards) {
         this.awards = awards;
     }
+
+    public Integer getPriority() {
+        return priority;
+    }
+
+    public void setPriority(Integer priority) {
+        this.priority = priority;
+    }
 }

donate-console/src/main/java/com/uas/console/donate/model/ActivityRecode.java

@@ -43,7 +43,7 @@ public class ActivityRecode {
     private Long awardId;
 
     /**
-     * 领取状态
+     * 领取状态 0：初始状态 1：未领取 2：已领取 3：奖品失效
      */
     @Column(name="ar_aw_status")
     private Integer status;

donate-console/src/main/java/com/uas/console/donate/model/Attachment.java

@@ -0,0 +1,18 @@
+package com.uas.console.donate.model;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name="donate$attachment")
+public class Attachment implements Serializable{
+    private static final long serialVersionUID = 1L;
+
+    @Id
+    @GeneratedValue(strategy= GenerationType.IDENTITY)
+    @Column(name = "org_id")
+    private Long id;
+
+
+
+}

donate-console/src/main/java/com/uas/console/donate/model/Award.java

@@ -44,7 +44,7 @@ public class Award implements Serializable{
      * @return
      */
     @Column(name = "aw_amount")
-    private Long amount;
+    private Integer amount;
 
     /**
      * 奖品领取开始时间
@@ -99,11 +99,11 @@ public class Award implements Serializable{
         this.awardSummary = awardSummary;
     }
 
-    public Long getAmount() {
+    public Integer getAmount() {
         return amount;
     }
 
-    public void setAmount(Long amount) {
+    public void setAmount(Integer amount) {
         this.amount = amount;
     }
 

donate-console/src/main/java/com/uas/console/donate/model/FileUpload.java

@@ -0,0 +1,15 @@
+package com.uas.console.donate.model;
+
+import org.springframework.web.multipart.commons.CommonsMultipartFile;
+
+public class FileUpload {
+	private CommonsMultipartFile file;
+
+	public CommonsMultipartFile getFile() {
+		return file;
+	}
+
+	public void setFile(CommonsMultipartFile file) {
+		this.file = file;
+	}
+}

donate-console/src/main/java/com/uas/console/donate/model/Org.java

@@ -0,0 +1,602 @@
+package com.uas.console.donate.model;
+
+
+import javax.persistence.*;
+import java.io.Serializable;
+import java.util.Date;
+
+@Entity
+@Table(name="donate$organization")
+public class Org implements Serializable{
+
+    private static final long serialVersionUID = 1L;
+
+    @Id
+    @GeneratedValue(strategy= GenerationType.IDENTITY)
+    @Column(name = "org_id")
+    private Long id;
+
+    /**
+     * 注册编号
+     */
+    @Column(name="org_code")
+    private String code;
+
+
+    /**
+     *优软云账号
+     */
+    @Column(name="org_uuid")
+    private Long uuid;
+
+    /**
+     * 提交人姓名
+     */
+    @Column(name="org_person")
+    private String person;
+
+
+    /**
+     * 提交人时间
+     */
+    @Column(name = "org_submit")
+    private Date submitTime;
+
+
+    /**
+     * 审核状态（0:待审核1：批准2：驳回）
+     */
+    @Column(name="org_status")
+    private Integer status;
+
+    /**
+     * 驳回理由
+     */
+    @Column(name="org_refuse")
+    private String refuse;
+
+    /**
+     *机构类别（1:公募 2：非公募)
+     */
+    @Column(name = "org_type")
+    private Integer type;
+
+    /**
+     * 机构全称
+     */
+    @Column(name="org_name")
+    private String name;
+
+    /**
+     * 机构电话
+     */
+    @Column(name="org_tel")
+    private String telphone;
+
+    /**
+     * 所属省
+     */
+    @Column(name = "org_province")
+    private String province;
+
+    /**
+     * 所属市
+     */
+    @Column(name="org_city")
+    private String city;
+
+    /**
+     * 详细地址
+     */
+    @Column(name="org_address")
+    private String address;
+
+    /**
+     * 机构登记性质
+     */
+    @Column(name = "org_reg_type")
+    private String regType;
+
+    /**
+     * 主要领域：
+     1.疾病援助2.扶贫救灾
+     3.教育助学 4.环境，动物保护
+     5.其他
+     */
+    @Column(name = "org_major")
+    private Integer majorArea;
+
+    /**
+     * 年募捐额
+     */
+    @Column(name="org_year_donations")
+    private Long yearDonationAmount;
+
+    /**
+     * 全职人数
+     */
+    @Column(name="org_full_times")
+    private Long fullTimePopulation;
+
+    /**
+     * 兼职人数
+     */
+    @Column(name="org_part_times")
+    private Long partTimePopulation;
+
+    /**
+     * 志愿者人数
+     */
+    @Column(name="org_voluntaries")
+    private Long voluntaryPopulation;
+
+    /**
+     * 成立日期
+     */
+    @Column(name="org_create_time")
+    private Date createTime;
+
+    /**
+     * 官网地址
+     */
+    @Column(name="org_website")
+    private String website;
+
+    /**
+     * 机构简介
+     */
+    @Column(name="org_summary")
+    private String summary;
+
+    /**
+     * 负责人姓名
+     */
+    @Column(name="org_manager_name")
+    private String managerName;
+
+    /**
+     * 负责人身份证号
+     */
+    @Column(name="org_manager_idcard")
+    private String managerIdcard;
+
+    /**
+     * 负责人办公电话
+     */
+    @Column(name="org_manager_oph")
+    private String managerOph;
+
+    /**
+     * 负责人个人手机
+     */
+    @Column(name="org_manager_mobile")
+    private Long managerMobile;
+
+    /**
+     * 联系人姓名
+     */
+    @Column(name="org_contact_name")
+    private String contactName;
+
+    /**
+     * 联系人身份证号
+     */
+    @Column(name="org_contact_idcard")
+    private String contactIdcard;
+
+    /**
+     * 联系人电话
+     */
+    @Column(name="org_contact_tel")
+    private Long contactTel;
+
+
+    /**
+     * 联系人电子邮箱
+     */
+    @Column(name ="org_contact_email")
+    private String contactEmail;
+
+    /**
+     * 银行卡开户名称
+     */
+    @Column(name="org_bank_card_name")
+    private String bankCardName;
+
+
+    /**
+     * 开户银行
+     */
+    @Column(name="org_card_of_bank")
+    private String cardOfBank;
+
+    /**
+     * 银行卡支行信息
+     */
+    @Column(name="org_branch_message")
+    private String branchMessage;
+
+    /**
+     * 银行卡账号
+     */
+    @Column(name="org_bank_account")
+    private Long account;
+
+    /**
+     * 机构logo
+     */
+    @Column(name = "org_logo")
+    private String logo;
+
+    /**
+     * 机构证书
+     */
+    @Column(name = "org_certificate")
+    private String certificate;
+
+
+    /**
+     *慈善组织法人登记证书
+     */
+    @Column(name = "org_person_certificate")
+    private String personCertificate;
+
+
+    /**
+     *慈善组织公开募捐资格证书
+     */
+    @Column(name = "org_donate_certificate")
+    private String donateCertificate;
+
+
+    /**
+     * 法人身份证
+     */
+    @Column(name="org_legal_idcard")
+    private String legalIdCard;
+
+
+    /**
+     * 合作商户资料
+     */
+    @Column(name = "org_partner_material")
+    private String material;
+
+
+    /**
+     * 结算银行账号证明
+     */
+    @Column(name = "org_bank_certify")
+    private String certify;
+
+
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public Long getUuid() {
+        return uuid;
+    }
+
+    public void setUuid(Long uuid) {
+        this.uuid = uuid;
+    }
+
+    public String getPerson() {
+        return person;
+    }
+
+    public void setPerson(String person) {
+        this.person = person;
+    }
+
+    public Date getSubmitTime() {
+        return submitTime;
+    }
+
+    public void setSubmitTime(Date submitTime) {
+        this.submitTime = submitTime;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    public String getRefuse() {
+        return refuse;
+    }
+
+    public void setRefuse(String refuse) {
+        this.refuse = refuse;
+    }
+
+    public String getPersonCertificate() {
+        return personCertificate;
+    }
+
+    public void setPersonCertificate(String personCertificate) {
+        this.personCertificate = personCertificate;
+    }
+
+    public String getDonateCertificate() {
+        return donateCertificate;
+    }
+
+    public void setDonateCertificate(String donateCertificate) {
+        this.donateCertificate = donateCertificate;
+    }
+
+    public String getLegalIdCard() {
+        return legalIdCard;
+    }
+
+    public void setLegalIdCard(String legalIdCard) {
+        this.legalIdCard = legalIdCard;
+    }
+
+    public Integer getType() {
+        return type;
+    }
+
+    public void setType(Integer type) {
+        this.type = type;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getTelphone() {
+        return telphone;
+    }
+
+    public void setTelphone(String telphone) {
+        this.telphone = telphone;
+    }
+
+    public String getProvince() {
+        return province;
+    }
+
+    public void setProvince(String province) {
+        this.province = province;
+    }
+
+    public String getCity() {
+        return city;
+    }
+
+    public void setCity(String city) {
+        this.city = city;
+    }
+
+    public String getAddress() {
+        return address;
+    }
+
+    public void setAddress(String address) {
+        this.address = address;
+    }
+
+    public String getRegType() {
+        return regType;
+    }
+
+    public void setRegType(String regType) {
+        this.regType = regType;
+    }
+
+    public Integer getMajorArea() {
+        return majorArea;
+    }
+
+    public void setMajorArea(Integer majorArea) {
+        this.majorArea = majorArea;
+    }
+
+    public Long getYearDonationAmount() {
+        return yearDonationAmount;
+    }
+
+    public void setYearDonationAmount(Long yearDonationAmount) {
+        this.yearDonationAmount = yearDonationAmount;
+    }
+
+    public Long getFullTimePopulation() {
+        return fullTimePopulation;
+    }
+
+    public void setFullTimePopulation(Long fullTimePopulation) {
+        this.fullTimePopulation = fullTimePopulation;
+    }
+
+    public Long getPartTimePopulation() {
+        return partTimePopulation;
+    }
+
+    public void setPartTimePopulation(Long partTimePopulation) {
+        this.partTimePopulation = partTimePopulation;
+    }
+
+    public Long getVoluntaryPopulation() {
+        return voluntaryPopulation;
+    }
+
+    public void setVoluntaryPopulation(Long voluntaryPopulation) {
+        this.voluntaryPopulation = voluntaryPopulation;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getWebsite() {
+        return website;
+    }
+
+    public void setWebsite(String website) {
+        this.website = website;
+    }
+
+    public String getSummary() {
+        return summary;
+    }
+
+    public void setSummary(String summary) {
+        this.summary = summary;
+    }
+
+    public String getManagerName() {
+        return managerName;
+    }
+
+    public void setManagerName(String managerName) {
+        this.managerName = managerName;
+    }
+
+    public String getManagerIdcard() {
+        return managerIdcard;
+    }
+
+    public void setManagerIdcard(String managerIdcard) {
+        this.managerIdcard = managerIdcard;
+    }
+
+    public String getManagerOph() {
+        return managerOph;
+    }
+
+    public void setManagerOph(String managerOph) {
+        this.managerOph = managerOph;
+    }
+
+    public Long getManagerMobile() {
+        return managerMobile;
+    }
+
+    public void setManagerMobile(Long managerMobile) {
+        this.managerMobile = managerMobile;
+    }
+
+    public String getContactName() {
+        return contactName;
+    }
+
+    public void setContactName(String contactName) {
+        this.contactName = contactName;
+    }
+
+    public String getContactIdcard() {
+        return contactIdcard;
+    }
+
+    public void setContactIdcard(String contactIdcard) {
+        this.contactIdcard = contactIdcard;
+    }
+
+    public Long getContactTel() {
+        return contactTel;
+    }
+
+    public void setContactTel(Long contactTel) {
+        this.contactTel = contactTel;
+    }
+
+    public String getContactEmail() {
+        return contactEmail;
+    }
+
+    public void setContactEmail(String contactEmail) {
+        this.contactEmail = contactEmail;
+    }
+
+    public String getBankCardName() {
+        return bankCardName;
+    }
+
+    public void setBankCardName(String bankCardName) {
+        this.bankCardName = bankCardName;
+    }
+
+    public String getCardOfBank() {
+        return cardOfBank;
+    }
+
+    public void setCardOfBank(String cardOfBank) {
+        this.cardOfBank = cardOfBank;
+    }
+
+    public String getBranchMessage() {
+        return branchMessage;
+    }
+
+    public void setBranchMessage(String branchMessage) {
+        this.branchMessage = branchMessage;
+    }
+
+    public Long getAccount() {
+        return account;
+    }
+
+    public void setAccount(Long account) {
+        this.account = account;
+    }
+
+    public String getLogo() {
+        return logo;
+    }
+
+    public void setLogo(String logo) {
+        this.logo = logo;
+    }
+
+    public String getCertificate() {
+        return certificate;
+    }
+
+    public void setCertificate(String certificate) {
+        this.certificate = certificate;
+    }
+
+    public String getMaterial() {
+        return material;
+    }
+
+    public void setMaterial(String material) {
+        this.material = material;
+    }
+
+    public String getCertify() {
+        return certify;
+    }
+
+    public void setCertify(String certify) {
+        this.certify = certify;
+    }
+}
+

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

@@ -0,0 +1,366 @@
+package com.uas.console.donate.model;
+
+import javax.persistence.*;
+import java.io.Serializable;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+@Entity
+@Table(name="donate$project")
+public class Project implements Serializable{
+
+    private static final long serialVersionUID = 1L;
+    private static final SimpleDateFormat sdf = new SimpleDateFormat("yyyy.MM.dd HH:mm");
+
+
+    /**
+     * 项目编号
+     */
+    @Id
+    @GeneratedValue(strategy= GenerationType.IDENTITY)
+    @Column(name = "pro_id")
+    private Long id;
+
+
+    /**
+     * 注册编号
+     */
+    @Column(name="pro_code")
+    private String code;
+
+    /**
+     * 项目名称
+     */
+    @Column(name = "pro_name")
+    private String name;
+
+    /**
+     * 捐助领域
+     */
+    @Column(name = "pro_area")
+    private String area;
+
+    /**
+     * 项目所在省
+     */
+    @Column(name = "pro_province")
+    private String province;
+
+    /**
+     * 项目所在市
+     */
+    @Column(name = "pro_city")
+    private String city;
+
+
+    /**
+     *筹款目标
+     */
+    @Column(name = "pro_target")
+    private Long target;
+
+    /**
+     * 发起缘由
+     */
+    @Column(name = "pro_reason")
+    private String reason;
+
+
+    /**
+     *PC端主图
+     */
+    @Column(name = "pro_pc_img")
+    private String pcImg;
+
+    /**
+     * 手机端主图
+     */
+    @Column(name = "pro_mobile_img")
+    private String mobileImg;
+
+    /**
+     *手机列表图
+     */
+    @Column(name = "pro_mobile_list_img")
+    private String listImg;
+
+    /**
+     * 发起人姓名
+     */
+    @Column(name = "pro_person_name")
+    private String personName;
+
+    /**
+     * 发起人头像
+     */
+    @Column(name="pro_person_logo")
+    private String logo;
+
+
+    /**
+     * 发起人工作单位
+     */
+    @Column(name = "pro_person_workunit")
+    private String workunit;
+
+    /**
+     * 发起人简介
+     */
+    @Column(name = "pro_person_summary")
+    private String summary;
+
+    /**
+     * 项目简介
+     */
+    @Column(name = "pro_summary")
+    private String proSummary;
+
+    /**
+     * 项目介绍
+     */
+    @Column(name = "pro_introduction")
+    private String introduction;
+
+    /**
+     * 项目详情
+     */
+    @Column(name="pro_detail")
+    private String detail;
+
+    /**
+     * 核状态（0:待审核 1：批准 2：驳回）
+     */
+    @Column(name = "pro_status")
+    private Integer status;
+
+
+    /**
+     * 所属机构
+     */
+    @Column(name = "pro_org_id")
+    private Long orgId;
+
+    /**
+     * 开始时间
+     */
+    @Column(name = "pro_start_time")
+    private Date startTime;
+
+    /**
+     * 结束时间
+     */
+    @Column(name = "pro_end_time")
+    private Date endTime;
+
+    /**
+     * 提交时间
+     */
+    @Column(name="pro_submit_time")
+    private Date submitTime;
+
+    /**
+     * 驳回理由
+     */
+    @Column(name="org_refuse")
+    private String refuse;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getArea() {
+        return area;
+    }
+
+    public void setArea(String area) {
+        this.area = area;
+    }
+
+    public String getProvince() {
+        return province;
+    }
+
+    public void setProvince(String province) {
+        this.province = province;
+    }
+
+    public String getCity() {
+        return city;
+    }
+
+    public void setCity(String city) {
+        this.city = city;
+    }
+
+    public Long getTarget() {
+        return target;
+    }
+
+    public void setTarget(Long target) {
+        this.target = target;
+    }
+
+    public String getReason() {
+        return reason;
+    }
+
+    public void setReason(String reason) {
+        this.reason = reason;
+    }
+
+    public String getPcImg() {
+        return pcImg;
+    }
+
+    public void setPcImg(String pcImg) {
+        this.pcImg = pcImg;
+    }
+
+    public String getMobileImg() {
+        return mobileImg;
+    }
+
+    public void setMobileImg(String mobileImg) {
+        this.mobileImg = mobileImg;
+    }
+
+    public String getListImg() {
+        return listImg;
+    }
+
+    public void setListImg(String listImg) {
+        this.listImg = listImg;
+    }
+
+    public String getPersonName() {
+        return personName;
+    }
+
+    public void setPersonName(String personName) {
+        this.personName = personName;
+    }
+
+    public String getLogo() {
+        return logo;
+    }
+
+    public void setLogo(String logo) {
+        this.logo = logo;
+    }
+
+    public String getWorkunit() {
+        return workunit;
+    }
+
+    public void setWorkunit(String workunit) {
+        this.workunit = workunit;
+    }
+
+    public String getSummary() {
+        return summary;
+    }
+
+    public void setSummary(String summary) {
+        this.summary = summary;
+    }
+
+    public String getProSummary() {
+        return proSummary;
+    }
+
+    public void setProSummary(String proSummary) {
+        this.proSummary = proSummary;
+    }
+
+    public String getIntroduction() {
+        return introduction;
+    }
+
+    public void setIntroduction(String introduction) {
+        this.introduction = introduction;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    public Long getOrgId() {
+        return orgId;
+    }
+
+    public void setOrgId(Long orgId) {
+        this.orgId = orgId;
+    }
+
+    public String getStartTime() {
+        Date date=this.startTime;
+       return date!=null?sdf.format(this.startTime):null;
+    }
+
+    public void setAtartTime(Date atartTime) {
+        this.startTime = startTime;
+    }
+
+    public String getEndTime() {
+        Date date=this.endTime;
+        return date!=null?sdf.format(date):null;
+    }
+
+    public void setEndTime(Date endTime) {
+        this.endTime = endTime;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getDetail() {
+        return detail;
+    }
+
+    public void setDetail(String detail) {
+        this.detail = detail;
+    }
+
+    public void setStartTime(Date startTime) {
+        this.startTime = startTime;
+    }
+
+    public String getSubmitTime() {
+
+        Date date=this.submitTime;
+        return date!=null?sdf.format(date):null;
+    }
+
+    public void setSubmitTime(Date submitTime) {
+        this.submitTime = submitTime;
+    }
+
+    public String getRefuse() {
+        return refuse;
+    }
+
+    public void setRefuse(String refuse) {
+        this.refuse = refuse;
+    }
+}

donate-console/src/main/java/com/uas/console/donate/model/ProjectConclude.java

@@ -0,0 +1,68 @@
+package com.uas.console.donate.model;
+
+import javax.persistence.*;
+
+@Entity
+@Table(name="donate$projectconclude")
+public class ProjectConclude {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 编号
+     */
+    @Id
+    @GeneratedValue(strategy= GenerationType.IDENTITY)
+    @Column(name = "id")
+    private Long id;
+
+    /**
+     * 项目编号
+     */
+    @Column(name="pro_id")
+    private Long proId;
+
+
+    /**
+     * 项目结项管理描述
+     */
+    @Column(name="conclude_description")
+    private String description;
+
+    /**
+     *表单提交状态
+     */
+    @Column(name="status")
+    private Integer status;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getProId() {
+        return proId;
+    }
+
+    public void setProId(Long proId) {
+        this.proId = proId;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+}

donate-console/src/main/java/com/uas/console/donate/model/ProjectEvolve.java

@@ -0,0 +1,69 @@
+package com.uas.console.donate.model;
+
+import javax.persistence.*;
+
+@Entity
+@Table(name = "donate$projectevolve")
+public class ProjectEvolve {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 编号
+     */
+    @Id
+    @GeneratedValue(strategy= GenerationType.IDENTITY)
+    @Column(name = "id")
+    private Long id;
+
+    /**
+     * 项目编号
+     */
+    @Column(name="pro_id")
+    private Long proId;
+
+
+    /**
+     * 项目报告描述
+     */
+    @Column(name="evolve_description")
+    private String description;
+
+    /**
+     *表单提交状态
+     */
+    @Column(name="status")
+    private Integer status;
+
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getProId() {
+        return proId;
+    }
+
+    public void setProId(Long proId) {
+        this.proId = proId;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+}

donate-console/src/main/java/com/uas/console/donate/model/ProjectFinance.java

@@ -0,0 +1,69 @@
+package com.uas.console.donate.model;
+
+import javax.persistence.*;
+
+@Entity
+@Table(name = "donate$projectfinance")
+public class ProjectFinance {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 编号
+     */
+    @Id
+    @GeneratedValue(strategy= GenerationType.IDENTITY)
+    @Column(name = "id")
+    private Long id;
+
+    /**
+     * 项目编号
+     */
+    @Column(name="pro_id")
+    private Long proId;
+
+
+    /**
+     * 项目报告描述
+     */
+    @Column(name="finance_description")
+    private String description;
+
+    /**
+     *表单提交状态
+     */
+    @Column(name="status")
+    private Integer status;
+
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getProId() {
+        return proId;
+    }
+
+    public void setProId(Long proId) {
+        this.proId = proId;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+}

donate-console/src/main/java/com/uas/console/donate/model/ProjectReport.java

@@ -0,0 +1,69 @@
+package com.uas.console.donate.model;
+
+import javax.persistence.*;
+
+@Entity
+@Table(name = "donate$projectreport")
+public class ProjectReport {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 编号
+     */
+    @Id
+    @GeneratedValue(strategy= GenerationType.IDENTITY)
+    @Column(name = "id")
+    private Long id;
+
+    /**
+     * 项目编号
+     */
+    @Column(name="pro_id")
+    private Long proId;
+
+
+    /**
+     * 项目报告描述
+     */
+    @Column(name="report_description")
+    private String description;
+
+    /**
+     *表单提交状态
+     */
+    @Column(name="status")
+    private Integer status;
+
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getProId() {
+        return proId;
+    }
+
+    public void setProId(Long proId) {
+        this.proId = proId;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+}

donate-console/src/main/java/com/uas/console/donate/model/User.java

@@ -0,0 +1,57 @@
+package com.uas.console.donate.model;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name="donate$user")
+public class User implements Serializable{
+
+    private static final long serialVersionUID = 1L;
+
+    @Id
+    @GeneratedValue(strategy= GenerationType.IDENTITY)
+    @Column(name="user_id")
+    private  Long id;
+
+    @Column(name = "user_name")
+    private String name;
+
+    @Column(name = "user_tel")
+    private Long tel;
+
+    @Column(name = "user_identity")
+    private Integer identity;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public Long getTel() {
+        return tel;
+    }
+
+    public void setTel(Long tel) {
+        this.tel = tel;
+    }
+
+    public Integer getIdentity() {
+        return identity;
+    }
+
+    public void setIdentity(Integer identity) {
+        this.identity = identity;
+    }
+}

donate-console/src/main/java/com/uas/console/donate/service/ActivityRecodeService.java

@@ -12,5 +12,4 @@ public interface ActivityRecodeService {
 
     List<ActivityRecode> queryOne(Long uuid);
 
-  /*  ActivityRecode extract(Long activityId);*/
 }

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

@@ -7,5 +7,7 @@ public interface ActivityService {
 
     Activity save(Activity activity1);
 
+    Activity submit(Long id);
 
+    Activity up(Long id);
 }

donate-console/src/main/java/com/uas/console/donate/service/AwardService.java

@@ -2,6 +2,11 @@ package com.uas.console.donate.service;
 
 import com.uas.console.donate.model.Award;
 
+import java.util.List;
+
 public interface AwardService {
-     Award save(Award award);
+
+    List<Award> findByActivityId(Long activityId);
+
+    Award save(Award award);
 }

donate-console/src/main/java/com/uas/console/donate/service/OrgService.java

@@ -0,0 +1,35 @@
+package com.uas.console.donate.service;
+
+
+import com.uas.console.donate.model.Org;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+
+import java.util.List;
+
+public interface OrgService {
+
+    Page<Org> findAll(Pageable pageable);
+
+    Page<Org> findUnnotify(Pageable pageable);
+
+    Page<Org> findChecked(Pageable pageable);
+
+    Page<Org> findRefused(Pageable pageable);
+
+    //批准机构申请
+    Org approve(Long id);
+
+    //驳回机构申请
+    Org unapprove(Long id,String refuse);
+
+
+    List<Org> findByType(Integer type);
+
+    List<Org> findByMajorArea(Integer majorArea);
+
+    List<Org> findByTypeAndMajorArea(Integer type,Integer majorArea);
+
+
+
+}

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

@@ -0,0 +1,7 @@
+package com.uas.console.donate.service;
+
+import com.uas.console.donate.model.ProjectConclude;
+
+public interface ProjectConcludeService {
+    ProjectConclude save(ProjectConclude projectRepor);
+}

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

@@ -0,0 +1,7 @@
+package com.uas.console.donate.service;
+
+import com.uas.console.donate.model.ProjectEvolve;
+
+public interface ProjectEvolveService {
+    ProjectEvolve save(ProjectEvolve projectEvolve);
+}

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

@@ -0,0 +1,9 @@
+package com.uas.console.donate.service;
+import com.uas.console.donate.model.FileUpload;
+import com.uas.console.donate.model.ProjectFinance;
+
+
+public interface ProjectFinanceService {
+
+  /*  ProjectFinance save(ProjectFinance projectFinance, FileUpload upload);*/
+}

donate-console/src/main/java/com/uas/console/donate/service/ProjectReportService.java

@@ -0,0 +1,9 @@
+package com.uas.console.donate.service;
+
+import com.uas.console.donate.model.ProjectReport;
+
+
+public interface ProjectReportService {
+
+    ProjectReport save(ProjectReport projectRepor);
+}

donate-console/src/main/java/com/uas/console/donate/service/ProjectService.java

@@ -0,0 +1,19 @@
+package com.uas.console.donate.service;
+
+
+
+import com.uas.console.donate.model.Project;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+
+import java.util.List;
+
+public interface ProjectService {
+
+    Page<Project> findAll(Pageable pageable);
+
+    Project approve(Long id);
+
+    Project unapprove(Long id,String refuse);
+
+}

donate-console/src/main/java/com/uas/console/donate/service/TsetService.java

@@ -1,8 +0,0 @@
-package com.uas.console.donate.service;
-
-/**
- * Created by dongbw
- * 17/09/27 16:25.
- */
-public class TsetService {
-}

donate-console/src/main/java/com/uas/console/donate/service/UserService.java

@@ -0,0 +1,9 @@
+package com.uas.console.donate.service;
+
+import com.uas.console.donate.model.User;
+
+import java.util.List;
+
+public interface UserService {
+    List<User> findAll();
+}