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

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

@@ -90,7 +90,7 @@ public class OrgController {
      */
     @ResponseBody
     @RequestMapping(value = "/submit",method = RequestMethod.POST)
-    public Org submit(@RequestParam(required = false) MultipartFile logo,
+    public ModelMap submit(@RequestParam(required = false) MultipartFile logo,
                       @RequestParam(required = false) MultipartFile certificate,
                       @RequestParam(required = false) MultipartFile personCertificate,
                       @RequestParam(required = false) MultipartFile donateCertificate,
@@ -129,7 +129,7 @@ public class OrgController {
         }
         Date date=new Date();
         //设置机构提交时间
-        org.setSubmitTime(date);
+        org.setSubmitTime(new SimpleDateFormat("yyyy.MM.dd HH:mm").format(date));
         //设置机构编号
         org.setCode(codesdf.format(date));
         return orgService.sumbit(org);

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

@@ -44,12 +44,21 @@ public class OrgServiceImpl implements OrgService {
     }
 
     //提交机构申请
-    public Org sumbit(Org org){
+    public ModelMap sumbit(Org org){
+        ModelMap map = new ModelMap();
         //设置未审核
         org.setStatus(0);
         //设置正式提交
         org.setPublish(2);
-        return orgDao.save(org);
+        try{
+            org = orgDao.save(org);
+        } catch (Exception e) {
+            map.put("error", "系统错误，请联系管理员！");
+        }
+
+        map.put("id", org.getId());
+        map.put("success", "保存成功");
+        return map;
     }
 
     //查询某一机构具体信息

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

@@ -3,6 +3,7 @@ package com.uas.console.donate.model;
 
 import javax.persistence.*;
 import java.io.Serializable;
+import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
@@ -45,7 +46,7 @@ public class Org implements Serializable{
 
 
     /**
-     * 提交人时间
+     * 提交时间
      */
     @Column(name = "org_submit")
     private Date submitTime;
@@ -322,7 +323,13 @@ public class Org implements Serializable{
         return date!=null?sdf.format(this.submitTime):null;
     }
 
-    public void setSubmitTime(Date submitTime) {
+    public void setSubmitTime(String submitTimeStr) {
+        Date submitTime = null;
+        try {
+            submitTime = sdf.parse(submitTimeStr);
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
         this.submitTime = submitTime;
     }
 

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

@@ -19,7 +19,7 @@ public interface OrgService {
     ModelMap save(Org org);
 
     //提交机构申请
-    Org sumbit(Org org);
+    ModelMap sumbit(Org org);
 
     //获取某一机构详细信息
     Org findOne(Long id);

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

@@ -412,9 +412,11 @@ define([ 'angularAMD', 'ui.router', 'ui-bootstrap', 'ngLocal', 'ngTable', 'commo
     app.controller('CertificationStep1Ctrl', ['$scope', '$http', '$rootScope', '$timeout', '$location', 'toaster', 'Organization',
         function ($scope, $http, $rootScope, $timeout, $location, toaster, Organization) {
 
+            var orgCopy;
             // 获取当前账户注册机构情况
             Organization.getByUuid({uuid : 10041166}, {}, function(data) {//10041558
                 $scope.org = data;
+                orgCopy = angular.copy($scope.org);
             }, function() {
                 toaster.pop('error', '注册情况加载失败');
             });
@@ -426,6 +428,10 @@ define([ 'angularAMD', 'ui.router', 'ui-bootstrap', 'ngLocal', 'ngTable', 'commo
                 $scope.provinces = response.data;
             });
 
+            $scope.selectMajorArea = function (index) {
+                $scope.org.majorArea = index;
+            }
+
             $scope.openDatePicker = function ($event, item, openParam) {
                 $event.preventDefault();
                 $event.stopPropagation();
@@ -434,8 +440,8 @@ define([ 'angularAMD', 'ui.router', 'ui-bootstrap', 'ngLocal', 'ngTable', 'commo
 
 
             //提交
-            $scope.saveStep1 = function (org,dirty,orgType) {
-                if (dirty == false) {
+            $scope.saveStep1 = function (org, orgType) {
+                if (orgCopy == org) {
                     if (orgType == 1) {
                         $location.path('publicOfferingCertificationStep2');
                     } else if (orgType == 2) {
@@ -485,16 +491,18 @@ define([ 'angularAMD', 'ui.router', 'ui-bootstrap', 'ngLocal', 'ngTable', 'commo
     app.controller('CertificationStep2Ctrl', ['$scope', '$http', '$rootScope', '$timeout', '$location', 'toaster', 'Organization',
         function ($scope, $http, $rootScope, $timeout, $location, toaster, Organization) {
 
+            var orgCopy;
             // 获取当前账户注册机构情况
             Organization.getByUuid({uuid : 10041166}, {}, function(data) {//10041558
                 $scope.org = data;
+                orgCopy = angular.copy($scope.org);
             }, function() {
                 toaster.pop('error', '注册情况加载失败');
             });
 
             //提交
-            $scope.saveStep2 = function (org,dirty,orgType) {
-                if (dirty == false) {
+            $scope.saveStep2 = function (org, orgType) {
+                if (orgCopy == org) {
                     if (orgType == 1) {
                         $location.path('publicOfferingCertificationStep3');
                     } else if (orgType == 2) {
@@ -537,9 +545,11 @@ define([ 'angularAMD', 'ui.router', 'ui-bootstrap', 'ngLocal', 'ngTable', 'commo
     app.controller('CertificationStep3Ctrl', ['$scope', '$http', '$rootScope', '$timeout', '$location', 'toaster', 'Organization',
         function ($scope, $http, $rootScope, $timeout, $location, toaster, Organization) {
 
+            var orgCopy;
             // 获取当前账户注册机构情况
             Organization.getByUuid({uuid : 10041166}, {}, function(data) {//10041558
                 $scope.org = data;
+                orgCopy = angular.copy($scope.org);
             }, function() {
                 toaster.pop('error', '注册情况加载失败');
             });
@@ -590,14 +600,21 @@ define([ 'angularAMD', 'ui.router', 'ui-bootstrap', 'ngLocal', 'ngTable', 'commo
                 $scope.$apply();
             }
             //提交
-            $scope.saveStep3 = function (org,dirty,orgType) {
-                if (dirty == false) {
+            $scope.saveStep3 = function (org, isDraft, orgType) {
+                if (orgCopy == org) {
                     if (orgType == 1) {
                         $location.path('publicOfferingCertificationStep4');
                     } else if (orgType == 2) {
                         $location.path('charityCertificationStep4');
                     }
                 } else {
+                    var url;
+                    if (isDraft) {
+                        url = '/org/save';
+                    } else {
+                        url = '/org/submit';
+                    }
+
                     var data = new FormData();      //以下为像后台提交图片数据
                     data.append('logo', $scope.logo);
                     data.append('personCertificate', $scope.personCertificate);
@@ -610,7 +627,7 @@ define([ 'angularAMD', 'ui.router', 'ui-bootstrap', 'ngLocal', 'ngTable', 'commo
                         method: 'POST',
                         processData: false,
                         async: false,
-                        url: '/org/save',
+                        url: url,
                         data: data,
                         params: {
                             jsonStr: org
@@ -645,9 +662,11 @@ define([ 'angularAMD', 'ui.router', 'ui-bootstrap', 'ngLocal', 'ngTable', 'commo
     app.controller('PublicCertificationStep4Ctrl', ['$scope', '$http', '$rootScope', '$timeout', '$location', 'toaster', 'Organization',
         function ($scope, $http, $rootScope, $timeout, $location, toaster, Organization) {
 
+            var orgCopy;
             // 获取当前账户注册机构情况
             Organization.getByUuid({uuid : 10041166}, {}, function(data) {//10041166  10041558
                 $scope.org = data;
+                orgCopy = angular.copy($scope.org);
             }, function() {
                 toaster.pop('error', '注册情况加载失败');
             });
@@ -663,8 +682,8 @@ define([ 'angularAMD', 'ui.router', 'ui-bootstrap', 'ngLocal', 'ngTable', 'commo
                 $scope.$apply();
             }
             //提交
-            $scope.saveStep4 = function (org, isDirty, isDraft) {
-                if (isDirty == false) {
+            $scope.saveStep4 = function (org, isDraft) {
+                if (orgCopy == org) {
                     $location.path('publicOfferingCertificationStep5');
                 } else {
                     var url;

donate-console/src/main/webapp/resources/view/user/charityCertification1.html

@@ -261,6 +261,10 @@
         font-size: 16px;
         color: #313131;
         border: 1px solid #dcdcdc;
+        cursor: pointer;
+    }
+    .detail .form-group .area span.active,.detail .form-group .area span:hover{
+        border: 1px solid #ef613b;
     }
 
     .detail .home input[type='text'] {
@@ -552,8 +556,13 @@
                                     </div>
                                     <div class="form-group clearfix">
                                         <label for="" class="fl control-label">主要领域</label>
-                                        <div class="area fl" ng-model="org.majorArea">
-                                            <span>疾病援助</span><span>扶贫/救灾</span><span>教育/助学</span><span>环境/动物保护</span><span>其他</span>
+                                        <div class="area fl" id="choose-major-area"">
+                                        <input required="true" type="text" ng-show="false" ng-model="org.majorArea">
+                                            <span ng-class="{'active': org.majorArea==1}" ng-click="selectMajorArea(1)">疾病援助</span>
+                                            <span ng-class="{'active': org.majorArea==2}" ng-click="selectMajorArea(2)">扶贫/救灾</span>
+                                            <span ng-class="{'active': org.majorArea==3}" ng-click="selectMajorArea(3)">教育/助学</span>
+                                            <span ng-class="{'active': org.majorArea==4}" ng-click="selectMajorArea(4)">环境/动物保护</span>
+                                            <span ng-class="{'active': org.majorArea==5}" ng-click="selectMajorArea(5)">其他</span>
                                         </div>
                                     </div>
                                     <div class="form-group clearfix">
@@ -632,7 +641,7 @@
                                         </div>
                                     </div>
                                     <div class="text-left submitBtn">
-                                        <button type="submit" ng-click="saveStep1(org, charityCertification1.$dirty, 2)" ng-disabled="charityCertification1.$invalid">保存，下一步</button><a href="charityCertificationStep0">返回上一页</a></div>
+                                        <button type="submit" ng-click="saveStep1(org, 2)" ng-disabled="charityCertification1.$invalid">保存，下一步</button><a href="charityCertificationStep0">返回上一页</a></div>
                                     <!--<div class="text-left submitBtn"><a href="charityCertification2">保存，下一步</a><a href="charityCertification">返回上一页</a></div>-->
                                 </form>
                             </div>
@@ -650,4 +659,17 @@
         $(this).addClass('active').siblings().removeClass('active');
         $('.right-list').eq(index).addClass('show').siblings().removeClass('show');
     });
+
+    //选择主要领域
+//    $('#choose-major-area span').on('click', function (event) {
+//        var spans = $('#choose-major-area span');
+//        var indexxx = 0
+//        for (var i=0;i<spans.length;i++) {
+//            $(spans[i]).removeClass('active');
+//            if (event.target.innerHTML == spans[i].innerHTML) {
+//                indexxx = i
+//            }
+//        }
+//        $(event.target).addClass('active');
+//    })
 </script>

donate-console/src/main/webapp/resources/view/user/charityCertification2.html

@@ -551,7 +551,7 @@
                                     <span class="control-help fl">（请填写机构当前联系人电子邮箱）</span>
                                 </div>
                                 <div class="text-left submitBtn" style="margin-top: 55px;">
-                                    <button type="submit" ng-click="saveStep2(org, charityCertification2.$dirty, 2)" ng-disabled="charityCertification2.$invalid">保存，下一步</button>
+                                    <button type="submit" ng-click="saveStep2(org, 2)" ng-disabled="charityCertification2.$invalid">保存，下一步</button>
                                     <a ui-sref="charityCertificationStep1">返回上一页</a>
                                 </div>
                             </form>

donate-console/src/main/webapp/resources/view/user/charityCertification3.html

@@ -571,8 +571,8 @@
                                     <img class="fl lookImg" src="{{org.legalIdCard}}">
                                 </div>
                                 <div class="text-left submitBtn" style="margin-top: 75px;">
-                                    <button type="submit" ng-click="saveStep3(org, charityCertification3.$dirty, 2)" ng-disabled="charityCertification3.$invalid">保存，下一步</button>
-                                    <button class="sub">提交</button>
+                                    <button type="submit" ng-click="saveStep3(org, true, 2)" ng-disabled="charityCertification3.$invalid">保存，下一步</button>
+                                    <button type="submit" ng-click="saveStep3(org, false, 2)" ng-disabled="charityCertification3.$invalid">提交</button>
                                     <a ui-sref="charityCertificationStep2">返回上一页</a>
                                 </div>
                             </div>

donate-console/src/main/webapp/resources/view/user/publicOfferingCertification1.html

@@ -270,8 +270,11 @@
         font-size: 16px;
         color: #313131;
         border: 1px solid #dcdcdc;
+        cursor: pointer;
+    }
+    .detail .form-group .area span.active,.detail .form-group .area span:hover{
+        border: 1px solid #ef613b;
     }
-
     .detail .home input[type='text'] {
         width: 540px;
         height: 34px;
@@ -589,7 +592,7 @@
                                 <div class="form-group clearfix">
                                     <label for="" class="fl control-label">主要领域</label>
                                     <div class="area fl" ng-model="org.majorArea">
-                                        <span>疾病援助</span><span>扶贫/救灾</span><span>教育/助学</span><span>环境/动物保护</span><span>其他</span>
+                                        <span class="active">疾病援助</span><span>扶贫/救灾</span><span>教育/助学</span><span>环境/动物保护</span><span>其他</span>
                                     </div>
                                 </div>
                                 <div class="form-group clearfix">
@@ -668,7 +671,7 @@
                                     </div>
                                 </div>
                                 <div class="text-left submitBtn">
-                                    <button type="submit" ng-click="saveStep1(org, publicOfferingCertification1.$dirty, 1)" ng-disabled="publicOfferingCertification1.$invalid">保存，下一步</button>
+                                    <button type="submit" ng-click="saveStep1(org, 1)" ng-disabled="publicOfferingCertification1.$invalid">保存，下一步</button>
                                     <a ui-sref="publicOfferingCertificationStep0">返回上一页</a></div>
                                 <!--<div class="text-left submitBtn"><a href="charityCertification2">保存，下一步</a><a href="charityCertification">返回上一页</a></div>-->
                             </form>

donate-console/src/main/webapp/resources/view/user/publicOfferingCertification2.html

@@ -586,7 +586,7 @@
                                     <span class="control-help fl">（请填写机构当前联系人电子邮箱）</span>
                                 </div>
                                 <div class="text-left submitBtn" style="margin-top: 55px;">
-                                    <button type="submit" ng-click="saveStep2(org, publicOfferingCertification2.$dirty, 1)" ng-disabled="publicOfferingCertification2.$invalid">保存，下一步</button>
+                                    <button type="submit" ng-click="saveStep2(org, 1)" ng-disabled="publicOfferingCertification2.$invalid">保存，下一步</button>
                                     <a ui-sref="publicOfferingCertificationStep1">返回上一页</a>
                                 </div>
                             </form>

donate-console/src/main/webapp/resources/view/user/publicOfferingCertification3.html

@@ -587,7 +587,7 @@
                                     <img class="fl lookImg" src="{{org.legalIdCard}}">
                                 </div>
                                 <div class="text-left submitBtn" style="margin-top: 75px;">
-                                    <button type="submit" ng-click="saveStep3(org, publicOfferingCertification3.$dirty, 1)" ng-disabled="publicOfferingCertification3.$invalid">保存，下一步</button>
+                                    <button type="submit" ng-click="saveStep3(org, true, 1)" ng-disabled="publicOfferingCertification3.$invalid">保存，下一步</button>
                                     <a ui-sref="publicOfferingCertificationStep2">返回上一页</a>
                                 </div>
                             </div>

donate-console/src/main/webapp/resources/view/user/publicOfferingCertification4.html

@@ -582,8 +582,8 @@
                                     <p>2、所有上传图片大小不超过1M支持jpg、png格式。</p>
                                 </div>
                                 <div class="text-left submitBtn" style="margin-top: 35px;margin-left: 375px;">
-                                    <button type="submit" ng-click="saveStep4(org, publicOfferingCertification4.$dirty, true)" ng-disabled="publicOfferingCertification4.$invalid">保存，下一步</button>
-                                    <button type="submit" ng-click="saveStep4(org, publicOfferingCertification4.$dirty, false)" ng-disabled="publicOfferingCertification4.$invalid">提交</button>
+                                    <button type="submit" ng-click="saveStep4(org, true)" ng-disabled="publicOfferingCertification4.$invalid">保存，下一步</button>
+                                    <button type="submit" ng-click="saveStep4(org, false)" ng-disabled="publicOfferingCertification4.$invalid">提交</button>
                                     <a ui-sref="publicOfferingCertificationStep3">返回上一页</a>
                                 </div>
                             </div>