发起项目保存第一步方法修改；imid获取User方法修改。

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

@@ -286,7 +286,7 @@ public class ProjectController {
     @ResponseBody
     public Project saveBaseInfo(@RequestBody String json) {
         Project project = JSONObject.parseObject(json, Project.class);
-        return projectService.save(project);
+        return projectService.saveBaseInfo(project);
     }
 
     /**

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

@@ -503,7 +503,7 @@ public class Project implements Serializable{
         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) {
+        if (now.compareTo(start) >=0 && now.compareTo(end) <0) {
             return "执行中";
         } else if(now.compareTo(start)<0){
             return "筹备中";

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

@@ -101,4 +101,11 @@ public interface ProjectService {
      * @return
      */
     Page<Project> getNotEndProjects(PageInfo pageInfo, SearchFilter filter);
+
+    /**
+     * 保存基础信息
+     * @param project
+     * @return
+     */
+    Project saveBaseInfo(Project project);
 }

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

@@ -42,6 +42,7 @@ public class ProjectServiceImpl implements ProjectService {
     private ProjectConcludeDao projectConcludeDao;
 
     //项目发起，有草稿则取出草稿
+    @Override
     public Project show(){
         if(projectDao.getDraft()==null){
             return null;
@@ -51,6 +52,7 @@ public class ProjectServiceImpl implements ProjectService {
     }
 
     //保存项目草稿
+    @Override
     public Project save(Project project){
         //TODO 登录session获取机构id
         project.setOrgId(15L);
@@ -69,6 +71,7 @@ public class ProjectServiceImpl implements ProjectService {
     }
 
     //提交项目
+    @Override
     public Project submit(Project project) {
         //TODO 登录session获取机构id
         project.setOrgId(15L);
@@ -90,17 +93,20 @@ public class ProjectServiceImpl implements ProjectService {
     }
 
     //取出某项目的机构信息
+    @Override
     public Org findOrgInfo(Long id){
         return projectDao.findOrgInfo(id);
     }
 
     //取出某项目的具体信息
+    @Override
     public Project findOne(Long id){
         return projectDao.findOne(id);
     }
 
 
     //查出所有项目
+    @Override
     public Page<Project> findAll(Pageable pageable){
 
         return projectDao.findAll(pageable);
@@ -108,6 +114,7 @@ public class ProjectServiceImpl implements ProjectService {
 
 
     //批注项目
+    @Override
     public ModelMap approve(Long id){
         try{
             Project project=projectDao.findOne(id);
@@ -120,6 +127,7 @@ public class ProjectServiceImpl implements ProjectService {
     }
 
     //驳回项目
+    @Override
     public ModelMap unapprove(Long id,String refuse){
         try{
             Project project=projectDao.findOne(id);
@@ -132,22 +140,26 @@ public class ProjectServiceImpl implements ProjectService {
         }
     }
 
+    @Override
     public List<Project> getProjects(){
         return projectDao.getProjects();
     }
 
 
     //查询某领域以及某状态下的项目
+    @Override
     public List<Project> queryProjects(String area,Integer status){
         return projectDao.queryProjects(area,status);
     }
 
     //查询某状态下的所有项目
+    @Override
     public List<Project> findByStatus(Integer status){
         return projectDao.findByStatus(status);
     }
 
     //项目列表搜索框查询
+    @Override
     public List<Project> search(String search){
         return projectDao.search(search);
     }
@@ -216,6 +228,12 @@ public class ProjectServiceImpl implements ProjectService {
         return getAllProjects(pageInfo, filter);
     }
 
+    @Override
+    public Project saveBaseInfo(Project project) {
+        project.setUserUU(SystemSession.getUser().getUserUU());
+        return save(project);
+    }
+
     @Override
     public ModelMap saveFinance(ProjectFinance finance, Long proId) {
         ModelMap map = new ModelMap();

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

@@ -1,7 +1,6 @@
 package com.uas.service.donate.controller;
 
 import com.alibaba.fastjson.JSONObject;
-import com.uas.account.util.AccountUtils;
 import com.uas.service.donate.model.*;
 import com.uas.service.donate.service.*;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -107,15 +106,15 @@ public class AppController {
     @ResponseBody
     @RequestMapping(value = "/donateDetail/{imid}",method = RequestMethod.GET)
     public ModelMap projectRecodeList(@PathVariable("imid") String imid)throws Exception{
-        Long uuid=AccountUtils.getUserUUByImId(Long.parseLong(imid));
+        User user= userService.getUserByImId(Long.valueOf(imid));
         ModelMap modelMap=new ModelMap();
-        List<ProjectRecode> projectRecodeList=projectRecodeService.findByuuid(uuid);
+        List<ProjectRecode> projectRecodeList=projectRecodeService.findByuuid(user.getUserUU());
         modelMap.put("projectRecodeList",projectRecodeList);
         //计算参与的项目总数
-        Long sumJoin=projectRecodeService.sumJoin(uuid);
+        Long sumJoin=projectRecodeService.sumJoin(user.getUserUU());
         modelMap.put("sumJoin",sumJoin);
         //捐赠的善款总数
-        Long sumMoney=projectRecodeService.sumMoney(uuid);
+        Long sumMoney=projectRecodeService.sumMoney(user.getUserUU());
         modelMap.put("sumMoney",sumMoney);
         return modelMap;
     }
@@ -126,12 +125,12 @@ public class AppController {
     @ResponseBody
     @RequestMapping(value = "/joinActivity/{imid}",method = RequestMethod.GET)
     public ModelMap queryOne(@PathVariable("imid")String imid)throws Exception{
-        Long uuid=AccountUtils.getUserUUByImId(Long.parseLong(imid));
+        User user= userService.getUserByImId(Long.valueOf(imid));
         ModelMap modelMap=new ModelMap();
-        List<ActivityRecode> activityRecodeList=activityRecodeService.queryOne(uuid);
+        List<ActivityRecode> activityRecodeList=activityRecodeService.queryOne(user.getUserUU());
         modelMap.put("activityRecodeList",activityRecodeList);
         //计算某人参与的活动总数
-        Long sumJoin=activityRecodeService.sumJoin(uuid);
+        Long sumJoin=activityRecodeService.sumJoin(user.getUserUU());
         modelMap.put("sumJoin",sumJoin);
         return modelMap;
     }
@@ -142,19 +141,17 @@ public class AppController {
     @ResponseBody
     @RequestMapping(value = "/center",method = RequestMethod.GET)
     public ModelMap center(String imid) throws Exception {
-        Long uuid=AccountUtils.getUserUUByImId(Long.parseLong(imid));
+        User user= userService.getUserByImId(Long.valueOf(imid));
         ModelMap modelMap=new ModelMap();
-        //获取个人账户信息
-        User user=userService.findOne(uuid);
         modelMap.put("user",user);
         //捐赠的善款总数
-        Long sumMoney=projectRecodeService.sumMoney(uuid);
+        Long sumMoney=projectRecodeService.sumMoney(user.getUserUU());
         modelMap.put("sumMoney",sumMoney);
         //计算某人参与的活动总数
-        Long sumActJoin=activityRecodeService.sumJoin(uuid);
+        Long sumActJoin=activityRecodeService.sumJoin(user.getUserUU());
         modelMap.put("sumActJoin",sumActJoin);
         //计算参与的项目总数
-        Long sumProJoin=projectRecodeService.sumJoin(uuid);
+        Long sumProJoin=projectRecodeService.sumJoin(user.getUserUU());
         modelMap.put("sumProJoin",sumProJoin);
         return modelMap;
 

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

@@ -5,7 +5,6 @@ import com.alibaba.fastjson.JSONObject;
 import com.uas.platform.core.model.PageInfo;
 import com.uas.platform.core.model.PageParams;
 import com.uas.platform.core.web.bind.RequestState;
-import com.uas.service.donate.model.Activity;
 import com.uas.service.donate.model.Project;
 import com.uas.service.donate.model.SearchFilter;
 import com.uas.service.donate.service.ProjectService;
@@ -160,8 +159,6 @@ public class ProjectController {
 
     /**
      * 查询所有已结束的活动
-     * @param
-     * @return
      */
     @ResponseBody
     @RequestMapping(value = "/endproject",method = RequestMethod.GET)
@@ -310,8 +307,8 @@ public class ProjectController {
      */
     @RequestMapping(value = "/getJoinedActivity/{id}",method = RequestMethod.GET)
     @ResponseBody
-    public Activity getJoinedActivity(@PathVariable("id") Long id){
-        return projectService.getJoinedActivity(id);
+    public ModelMap getJoinedActivity(@PathVariable("id") Long id){
+        return new ModelMap("activity", projectService.getJoinedActivity(id));
     }
 
 }

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

@@ -494,7 +494,7 @@ public class Project implements Serializable{
         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) {
+        if (now.compareTo(start) >=0 && now.compareTo(end) <0) {
             return "进行中";
         } else if(now.compareTo(start)<0){
             return "筹备中";

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

@@ -35,6 +35,13 @@ public class ProjectRecode implements Serializable{
     @Column(name="pr_uuid")
     private Long uuid;
 
+    /**
+     * 用户信息
+     */
+    @OneToOne(cascade = CascadeType.REFRESH)
+    @JoinColumn(name = "pr_uuid", insertable = false, updatable = false)
+    private User user;
+
 
     /**
      * 捐款额
@@ -185,4 +192,12 @@ public class ProjectRecode implements Serializable{
     public void setQrcodeUrl(String qrcodeUrl) {
         this.qrcodeUrl = qrcodeUrl;
     }
+
+    public User getUser() {
+        return user;
+    }
+
+    public void setUser(User user) {
+        this.user = user;
+    }
 }

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

@@ -66,6 +66,13 @@ public class User implements Serializable{
         this.setUserEmail(user.getSecondUID());
     }
 
+    public User(com.uas.account.entity.User accountUser) {
+        this.setUserUU(Long.valueOf(accountUser.getDialectUID()));
+        this.setName(accountUser.getName());
+        this.setTel(accountUser.getUid());
+        this.setUserEmail(accountUser.getSecondUID());
+    }
+
     public Long getUserUU() {
         return userUU;
     }

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

@@ -12,5 +12,5 @@ public interface UserService {
      * @param imId
      * @return
      */
-    Object getUserByImId(Long imId);
+    User getUserByImId(Long imId);
 }

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

@@ -25,13 +25,21 @@ public class UserServiceImpl implements UserService {
      * @return
      */
     @Override
-    public Long getUserByImId(Long imId) {
-        Long userUU = null;
+    public User getUserByImId(Long imId) {
+        com.uas.account.entity.User accountUser = null;
         try {
-            userUU = AccountUtils.getUserUUByImId(imId);
+            accountUser = AccountUtils.getUserByImId(imId);
+            if (null != accountUser) {
+                User user = userDao.findOne(Long.valueOf(accountUser.getDialectUID()));
+                if (null == user) {
+                    user = new User(accountUser);
+                    user = userDao.save(user);
+                }
+                return user;
+            }
         } catch (Exception e) {
             e.printStackTrace();
         }
-        return userUU;
+        return null;
     }
 }

donate-service/src/main/webapp/resources/js/mobile/controllers/MobileProjectDetailCtrl.js

@@ -27,7 +27,7 @@ define([ 'app/app' ], function(app) {
 
             // 参加的活动
             Project.getJoinedActivity({id:id}, {}, function(data) {
-                $scope.activity = data;
+                $scope.activity = data.activity;
             }, function (error) {
                 console.log(error);
             });

donate-service/src/main/webapp/resources/view/mobile/mobile_project_detail.html

@@ -567,7 +567,7 @@
 <div class="nav">
     <div class="container">
         <!--<span>详情<em></em></span><span>进度<em></em></span><span>活动<em></em></span><span class="active">机构<em></em></span>-->
-        <span class="active">详情<em></em></span><span>进度<em></em></span><span>活动<em></em></span><span>机构<em></em></span><span>结项报告<em></em></span>
+        <span class="active">详情<em></em></span><span ng-if="schedules.length != 0">进度<em></em></span><span ng-if="activity != null">活动<em></em></span><span ng-if="organization != null">机构<em></em></span><span ng-if="project.end == 1">结项报告<em></em></span>
     </div>
 </div>
 <div class="section">
@@ -576,23 +576,24 @@
         <div class="project-detail show">
             <!--banner-->
             <div class="banner">
-                <div id="myCarousel" class="carousel slide">
-                    <!-- 轮播（Carousel）指标 -->
-                    <ol class="carousel-indicators">
-                        <li data-target="#myCarousel" ng-class="{'active': $index == 0}" ng-repeat="carousel in carousels" data-slide-to="{{$index}}"></li>
-                    </ol>
-                    <!-- 轮播（Carousel）项目 -->
-                    <div class="carousel-inner">
-                        <div class="item" ng-repeat="carousel in carousels" ng-class="{'active' : $index == 0}">
-                            <a href="{{carousel.hrefUrl}}"><img src="{{carousel.pictureUrl}}" alt="项目缩略图"/></a>
-                        </div>
-                    </div>
-                    <!-- 轮播（Carousel）导航 -->
-                    <a class="carousel-control left" href="#myCarousel"
-                       data-slide="prev">&lsaquo;</a>
-                    <a class="carousel-control right" href="#myCarousel"
-                       data-slide="next">&rsaquo;</a>
-                </div>
+                <img src="{{project.mobileImg}}">
+                <!--<div id="myCarousel" class="carousel slide">-->
+                    <!--&lt;!&ndash; 轮播（Carousel）指标 &ndash;&gt;-->
+                    <!--<ol class="carousel-indicators">-->
+                        <!--<li data-target="#myCarousel" ng-class="{'active': $index == 0}" ng-repeat="carousel in carousels" data-slide-to="{{$index}}"></li>-->
+                    <!--</ol>-->
+                    <!--&lt;!&ndash; 轮播（Carousel）项目 &ndash;&gt;-->
+                    <!--<div class="carousel-inner">-->
+                        <!--<div class="item" ng-repeat="carousel in carousels" ng-class="{'active' : $index == 0}">-->
+                            <!--<a href="{{carousel.hrefUrl}}"><img src="{{carousel.pictureUrl}}" alt="项目缩略图"/></a>-->
+                        <!--</div>-->
+                    <!--</div>-->
+                    <!--&lt;!&ndash; 轮播（Carousel）导航 &ndash;&gt;-->
+                    <!--<a class="carousel-control left" href="#myCarousel"-->
+                       <!--data-slide="prev">&lsaquo;</a>-->
+                    <!--<a class="carousel-control right" href="#myCarousel"-->
+                       <!--data-slide="next">&rsaquo;</a>-->
+                <!--</div>-->
             </div>
             <div class="project-item">
                 <div class="title">
@@ -665,11 +666,11 @@
             </div>
             <div class="footer">
                 <!--<a href="" class="look"><img src="../static/images/mobile/list-ul.png" alt=""/>查看同类其他项目</a>-->
-                <a class="attend">我要捐款</a>
+                <button type="button" class="attend" ng-disabled="project.overdue == '已结束'">我要捐款</button>
             </div>
         </div>
         <!--进度-->
-        <div class="project-detail">
+        <div class="project-detail" ng-if="schedules.length != 0">
             <div class="project-intro project-first">
                 <div class="top">
                     <span>项目进度</span>
@@ -701,7 +702,7 @@
             </div>
         </div>
         <!--活动-->
-        <div class="project-detail">
+        <div class="project-detail" ng-if="activity != null">
             <div class="project-intro project-first">
                 <div class="top">
                     <span>{{activity.name}}</span>
@@ -729,11 +730,11 @@
             </div>
             <div class="footer">
                 <!--<a href="" class="look"><img src="../static/images/mobile/list-ul.png" alt=""/>查看同类其他项目</a>-->
-                <a href="" class="attend">我要捐款</a>
+                <button type="button" class="attend" ng-disabled="project.overdue == '已结束'">我要捐款</button>
             </div>
         </div>
         <!--机构-->
-        <div class="project-detail">
+        <div class="project-detail" ng-if="organization != null">
             <div class="institutions-intro">
                 <div class="institutions-img">
                     <img src="../static/images/mobile/institutions.png" alt="" class="thumb-img"/>
@@ -769,30 +770,14 @@
             </div>
             <div class="footer">
                 <!--<a href="" class="look"><img src="../static/images/mobile/list-ul.png" alt=""/>查看同类其他项目</a>-->
-                <a href="" class="attend">我要捐款</a>
+                <button type="button" class="attend" ng-disabled="project.overdue == '已结束'">我要捐款</button>
             </div>
         </div>
         <!--结项报告-->
-        <div class="project-detail" ng-if="project.overdue == 1">
+        <div class="project-detail" ng-if="project.end == 1">
             <!--banner-->
             <div class="banner">
-                <div id="myCarousels" class="carousel slide">
-                    <!-- 轮播（Carousel）指标 -->
-                    <ol class="carousel-indicators">
-                        <li data-target="#myCarousel" ng-class="{'active': $index == 0}" ng-repeat="carousel in carousels" data-slide-to="{{$index}}"></li>
-                    </ol>
-                    <!-- 轮播（Carousel）项目 -->
-                    <div class="carousel-inner">
-                        <div class="item" ng-repeat="carousel in carousels" ng-class="{'active' : $index == 0}">
-                            <a href="{{carousel.hrefUrl}}"><img src="{{carousel.pictureUrl}}" alt="项目缩略图"/></a>
-                        </div>
-                    </div>
-                    <!-- 轮播（Carousel）导航 -->
-                    <a class="carousel-control left" href="#myCarousel"
-                       data-slide="prev">&lsaquo;</a>
-                    <a class="carousel-control right" href="#myCarousel"
-                       data-slide="next">&rsaquo;</a>
-                </div>
+                <img src="{{project.mobileImg}}">
             </div>
             <div class="project-item">
                 <div class="title">