实现层包名修改

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

@@ -67,6 +67,11 @@ public class Project implements Serializable{
     @Column(name = "pro_city")
     private String city;
 
+    /**
+     * 项目所在区
+     */
+    @Column(name = "pro_district")
+    private String district;
 
     /**
      *筹款目标
@@ -540,4 +545,12 @@ public class Project implements Serializable{
     public void setClassify(String classify) {
         this.classify = classify;
     }
+
+    public String getDistrict() {
+        return district;
+    }
+
+    public void setDistrict(String district) {
+        this.district = district;
+    }
 }

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

@@ -1,4 +1,4 @@
-package com.uas.console.donate.Impl;
+package com.uas.console.donate.service.impl;
 
 import com.uas.console.donate.dao.ActivityRecodeDao;
 import com.uas.console.donate.model.ActivityRecode;

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

@@ -1,4 +1,4 @@
-package com.uas.console.donate.Impl;
+package com.uas.console.donate.service.impl;
 
 import com.uas.console.donate.dao.ActivityDao;
 import com.uas.console.donate.dao.AwardDao;

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

@@ -1,4 +1,4 @@
-package com.uas.console.donate.Impl;
+package com.uas.console.donate.service.impl;
 
 import com.uas.console.donate.dao.AwardDao;
 import com.uas.console.donate.model.Award;

donate-console/src/main/java/com/uas/console/donate/Impl/FileServiceImpl.java → donate-console/src/main/java/com/uas/console/donate/service/impl/FileServiceImpl.java

@@ -1,4 +1,4 @@
-package com.uas.console.donate.Impl;
+package com.uas.console.donate.service.impl;
 
 import com.uas.console.donate.model.FileUpload;
 import com.uas.console.donate.service.FileService;

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

@@ -1,4 +1,4 @@
-package com.uas.console.donate.Impl;
+package com.uas.console.donate.service.impl;
 
 
 import com.alibaba.fastjson.JSON;

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

@@ -1,4 +1,4 @@
-package com.uas.console.donate.Impl;
+package com.uas.console.donate.service.impl;
 
 import com.uas.console.donate.dao.ProjectConcludeDao;
 import com.uas.console.donate.model.ProjectConclude;

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

@@ -1,4 +1,4 @@
-package com.uas.console.donate.Impl;
+package com.uas.console.donate.service.impl;
 
 import com.uas.console.donate.dao.ProjectEvolveDao;
 import com.uas.console.donate.model.ProjectEvolve;

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

@@ -1,4 +1,4 @@
-package com.uas.console.donate.Impl;
+package com.uas.console.donate.service.impl;
 
 import com.uas.console.donate.dao.ProjectFinanceDao;
 import com.uas.console.donate.model.ProjectFinance;

donate-console/src/main/java/com/uas/console/donate/Impl/ProjectQualificationServiceImpl.java → donate-console/src/main/java/com/uas/console/donate/service/impl/ProjectQualificationServiceImpl.java

@@ -1,4 +1,4 @@
-package com.uas.console.donate.Impl;
+package com.uas.console.donate.service.impl;
 
 import com.uas.console.donate.dao.ProjectQualificationDao;
 import com.uas.console.donate.model.Project;

donate-console/src/main/java/com/uas/console/donate/Impl/ProjectRecodeServiceImpl.java → donate-console/src/main/java/com/uas/console/donate/service/impl/ProjectRecodeServiceImpl.java

@@ -1,4 +1,4 @@
-package com.uas.console.donate.Impl;
+package com.uas.console.donate.service.impl;
 
 import com.uas.console.donate.dao.ProjectRecodeDao;
 import com.uas.console.donate.model.ProjectRecode;

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

@@ -1,4 +1,4 @@
-package com.uas.console.donate.Impl;
+package com.uas.console.donate.service.impl;
 
 
 import com.uas.console.donate.dao.OrgDao;

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

@@ -1,4 +1,4 @@
-package com.uas.console.donate.Impl;
+package com.uas.console.donate.service.impl;
 
 import com.uas.console.donate.dao.UserDao;
 import com.uas.console.donate.model.User;

donate-console/src/main/webapp/WEB-INF/views/index.html

@@ -83,8 +83,8 @@
                         <i class="fa fa-angle-left pull-right"></i>
                     </a>
                     <ul class="treeview-menu">
-                        <li id=""><a ui-sref="project">项目列表</a></li>
-                        <li id=""><a href="launchProject">发起项目</a></li>
+                        <li id=""><a ui-sref="project">项目列表11</a></li>
+                        <li id=""><a ui-sref="launchProject1">发起项目11</a></li>
                         <!--<li id=""><a href="">捐款明细</a></li>-->
                         <li id=""><a href="projectFinancialDisclosure">项目财务披露</a></li>
                         <li id=""><a href="projectReportToFillIn">项目报告填写</a></li>

donate-console/src/main/webapp/resources/js/index/app.js

@@ -334,6 +334,55 @@ define([ 'angularAMD', 'ui.router', 'ui-bootstrap', 'ngLocal', 'ngTable', 'commo
             $modalInstance.dismiss();
         };
 
+    }]);
+
+    app.controller('ProjectNewCtrl', ['$scope', 'BaseService', 'Project', '$http',
+        function($scope, BaseService, Project, $http) {
+
+        // 捐助领域
+        $scope.areas = ['疾病援助', '扶贫/救灾', '教育/助学' , '环境/动物保护', '其他'];
+
+        // 具体分类
+        $scope.classifys = ['白血病', '早产儿', '烧烫伤', '罕见病', '癌症', '唇腭裂', '因病致贫', '尘肺病', '病情危急',
+            '尿毒症', '渐冻症', '意外受伤', '贫困大病', '视力健康', '听障', '其他'];
+
+        $scope.populations = ['第三世界', '贫困妇女', '空巢/留守老人', '孤儿/事实孤儿', '残障', '抗战老兵', '自闭症', '弱势群体',
+            '走失儿童', '失独家庭', '山区孩子', '义工志愿者', '困境儿童', '贫困家庭', '少数民族', '其他'];
+
+        $scope.project = {
+            name: null,
+            area: $scope.areas[0],
+            classify: $scope.classifys[0],
+            population: $scope.populations[0]
+
+        };
+
+        // 设置区域
+        $scope.setArea = function(index) {
+            $scope.project.area = $scope.areas[index];
+        };
+
+        // 设置具体分类
+        $scope.setClassify = function(index) {
+            $scope.project.classify = $scope.classifys[index];
+        };
+
+        // 设置受助人群
+        $scope.setPopulation = function(index) {
+            $scope.project.population = $scope.populations[index];
+        };
+
+        // 获取地址信息
+        $http.get('resources/citydata/city.json', {
+            "Accept": "application/json;charset=utf-8", "Accept-Charset": "charset=utf-8"
+        }).then(function (response) {
+            $scope.provinces = response.data;
+        });
+
+        $scope.saveAndNext = function(project) {
+            Project.save()
+        }
+
     }]);
 
 

donate-service/src/main/java/com/uas/service/donate/Impl/ActivityRecodeServiceImpl.java → donate-service/src/main/java/com/uas/service/donate/service/impl/ActivityRecodeServiceImpl.java

@@ -1,4 +1,4 @@
-package com.uas.service.donate.Impl;
+package com.uas.service.donate.service.impl;
 
 import com.uas.service.donate.dao.ActivityRecodeDao;
 import com.uas.service.donate.model.ActivityRecode;

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

@@ -1,4 +1,4 @@
-package com.uas.service.donate.Impl;
+package com.uas.service.donate.service.impl;
 
 import com.uas.service.donate.dao.ActivityDao;
 import com.uas.service.donate.dao.AwardDao;

donate-service/src/main/java/com/uas/service/donate/Impl/AwardServiceImpl.java → donate-service/src/main/java/com/uas/service/donate/service/impl/AwardServiceImpl.java

@@ -1,4 +1,4 @@
-package com.uas.service.donate.Impl;
+package com.uas.service.donate.service.impl;
 
 import com.uas.service.donate.dao.AwardDao;
 import com.uas.service.donate.model.Award;

donate-service/src/main/java/com/uas/service/donate/Impl/CarouselServiceImpl.java → donate-service/src/main/java/com/uas/service/donate/service/impl/CarouselServiceImpl.java

@@ -1,4 +1,4 @@
-package com.uas.service.donate.Impl;
+package com.uas.service.donate.service.impl;
 
 
 import com.uas.service.donate.dao.CarouselDao;

donate-service/src/main/java/com/uas/service/donate/Impl/OrgServiceImpl.java → donate-service/src/main/java/com/uas/service/donate/service/impl/OrgServiceImpl.java

@@ -1,4 +1,4 @@
-package com.uas.service.donate.Impl;
+package com.uas.service.donate.service.impl;
 
 import com.uas.service.donate.dao.OrgDao;
 import com.uas.service.donate.model.*;

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

@@ -1,4 +1,4 @@
-package com.uas.service.donate.Impl;
+package com.uas.service.donate.service.impl;
 
 import com.uas.service.donate.dao.ProjectConcludeDao;
 import com.uas.service.donate.model.ProjectConclude;

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

@@ -1,4 +1,4 @@
-package com.uas.service.donate.Impl;
+package com.uas.service.donate.service.impl;
 
 import com.uas.service.donate.dao.ProjectEvolveDao;
 import com.uas.service.donate.model.ProjectEvolve;

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

@@ -1,4 +1,4 @@
-package com.uas.service.donate.Impl;
+package com.uas.service.donate.service.impl;
 
 
 import com.uas.service.donate.dao.ProjectFinanceDao;

donate-service/src/main/java/com/uas/service/donate/Impl/ProjectRecordServiceImpl.java → donate-service/src/main/java/com/uas/service/donate/service/impl/ProjectRecordServiceImpl.java

@@ -1,4 +1,4 @@
-package com.uas.service.donate.Impl;
+package com.uas.service.donate.service.impl;
 
 import com.uas.service.donate.dao.ProjectDao;
 import com.uas.service.donate.dao.ProjectRecodeDao;

donate-service/src/main/java/com/uas/service/donate/Impl/ProjectReportServiceImpl.java → donate-service/src/main/java/com/uas/service/donate/service/impl/ProjectReportServiceImpl.java

@@ -1,4 +1,4 @@
-package com.uas.service.donate.Impl;
+package com.uas.service.donate.service.impl;
 
 import com.uas.service.donate.dao.ProjectReportDao;
 import com.uas.service.donate.model.ProjectReport;

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

@@ -1,4 +1,4 @@
-package com.uas.service.donate.Impl;
+package com.uas.service.donate.service.impl;
 
 
 import com.uas.platform.core.model.PageInfo;