Merge remote-tracking branch 'origin/dev' into dev

donate-service/pom.xml

@@ -54,13 +54,6 @@
             <version>0.0.1-SNAPSHOT</version>
         </dependency>
 
-
-        <dependency>
-            <groupId>com.uas.account</groupId>
-            <artifactId>account-common</artifactId>
-            <version>0.0.1-SNAPSHOT</version>
-        </dependency>
-
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>

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

@@ -262,16 +262,6 @@ public class ProjectController {
         return project;
     }
 
-    /**
-     * 查询所有项目历史参加人数和筹款金额
-     * @return
-     */
-    @RequestMapping(value = "/sumDonation", method = RequestMethod.GET)
-    @ResponseBody
-    public ModelMap getTotalDonation () {
-        return projectService.getTotalDonation();
-    }
-
 
     /**
      * 查询当前项目历史参加人数

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

@@ -72,17 +72,6 @@ public class ProjectListController {
         return projectService.getEndProjects(pageInfo, filter);
     }
 
-    /**
-     * 查询所有项目历史参加人数和筹款金额
-     * @return
-     */
-    @RequestMapping(value = "/sumDonation", method = RequestMethod.GET)
-    @ResponseBody
-    public ModelMap getTotalDonation () {
-        return projectService.getTotalDonation();
-    }
-
-
     /**
      * 查询当前项目历史参加人数
      * @param id

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

@@ -67,28 +67,14 @@ public interface ProjectDao extends JpaRepository<Project,Long>,JpaSpecification
     List<String> allArea();
 
     /**
-     * 总历史参加人数
-     * @return
+     * 查出某机构下的所有项目(已审核，项目状态是已结束或进行中)
      */
-    @Query("select count(i) from ProjectRecode i")
-    Integer findAllJoinedHistory();
-
-    /**
-     * 总历史捐款金额
-     * @return
-     */
-    @Query("select sum(p.totalAmount) from Project p where p.status = 1 and p.publish = 1")
-    Double findAllDonationHistory();
-
-    /**
-     * 查出某机构下的所有项目
-     */
-    @Query("from Project  p where p.orgId=:orgId")
+    @Query("from Project  p where p.orgId=:orgId and p.status = 1 and p.publish = 2 and now()>=p.startTime")
     List<Project> findProjectsByOrg(@Param("orgId") Long orgId);
 
     /**
-     * 获取某项目的相关项目
+     * 获取某项目的相关项目(已审核，项目状态是进行中)
      */
-    @Query("from Project p where p.area=(select p.area from Project p where p.id=:id) order by p.startTime desc ")
+    @Query("from Project p where p.area=(select p.area from Project p where p.id=:id) and p.id!=:id and  p.status = 1 and p.publish = 2 and p.startTime<=now() and p.endTime>=now() order by p.startTime desc ")
     List<Project> findSimilar(@Param("id")Long id);
 }

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

@@ -31,12 +31,6 @@ public interface ProjectService {
 
     Page<Project> findPageArea(String area,Pageable pageable);
 
-    /**
-     * 获取所有项目历史数据
-     * @return
-     */
-    ModelMap getTotalDonation();
-
     Page<Project> getAllProjects(PageInfo pageInfo, SearchFilter filter);
 
     Page<Project> getEndProjects(PageInfo pageInfo, SearchFilter filter);
@@ -46,6 +40,7 @@ public interface ProjectService {
     Page<Project> getWaitingProjects(PageInfo pageInfo, SearchFilter filter);
 
     ModelMap getThisDonation(Long id);
+
     List<Project> findProjects();
 
     //查询项目方法

donate-service/src/main/java/com/uas/service/donate/service/impl/ProjectServiceImpl.java

@@ -73,20 +73,6 @@ public class ProjectServiceImpl implements ProjectService {
         return  projectDao.findArea(area);
     }
 
-    /**
-     * 获取所有项目历史数据
-     *
-     * @return
-     */
-    @Override
-    public ModelMap getTotalDonation() {
-        ModelMap map = new ModelMap();
-        Integer joinedPersonHistory = projectDao.findAllJoinedHistory();
-        Double totalDonationsHistory = projectDao.findAllDonationHistory();
-        map.put("joinedPersonHistory", joinedPersonHistory);
-        map.put("totalDonationsHistory", totalDonationsHistory);
-        return map;
-    }
 
     @Override
     public Page<Project> getAllProjects(final PageInfo pageInfo, final SearchFilter filter) {

donate-service/src/main/resources/templates/index.ftl

@@ -1,9 +1,10 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-    <title>一元捐</title>
+    <title>优软一元捐</title>
     <meta name="keywords" content="">
     <meta name="description" content="">
+    <meta name="Robots" contect= "all">
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
@@ -322,6 +323,7 @@
             width: 360px;
             height: 200px;
             border: 1px solid #e1e1e1;
+            background: url("static/images/link.png") no-repeat;
         }
         .section2 .list-item .project-detail{
             margin: 10px 30px 0 0;
@@ -591,6 +593,7 @@
         }
 
         .pop .body .payMoeny{
+            margin-top: 30px;
             width: 200px;
             height: 40px;
             line-height: 40px;
@@ -805,9 +808,8 @@
                         </div>
                         <#if project.overdue=="已结束">
                             <a class="fr donationOver">我要捐款</a>
-                        </#if>
-                        <#if project.overdue!="已结束">
-                            <a class="fr donation" onclick="donate(this)">我要捐款</a>
+                            <#elseif project.overdue!="已结束">
+                             <a class="fr donation" onclick="donate(this)">我要捐款</a>
                         </#if>
                     </div>
                     <!--弹出窗-->

donate-service/src/main/webapp/resources/js/common/query/Project.js

@@ -41,11 +41,6 @@ define ([ 'ngResource' ], function() {
                 url: 'project/save',
                 method: 'POST'
             },
-            // 获取历史数据
-            getHistory: {
-                url: 'project/sumDonation',
-                method: 'GET'
-            },
             // 获取当前项目历史参加人数
             getJoinedHistory: {
                 url: 'project/donation/:id',

donate-service/src/main/webapp/resources/js/project/controllers/ProjectListCtrl.js

@@ -110,15 +110,6 @@ define([ 'app/app' ], function(app) {
         $scope.setMoney = function(value) {
           $scope.donation = value;
         };
-
-        // 获取历史人数、获取历史金额
-        var loadHistory = function() {
-            Project.getHistory({}, {}, function(data) {
-                $scope.joinedPersonHistory = data.joinedPersonHistory;
-                $scope.totalDonationsHistory = data.totalDonationsHistory;
-            });
-        };
-        loadHistory();
         // 确认捐款
         $scope.ensureDonate = function(id) {