console删除项目进度

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

@@ -325,6 +325,11 @@ public class ProjectController {
         return projectService.saveReport(report, id);
     }
 
+    /**
+     * 获取项目执行日期和更新次数
+     * @param id
+     * @return
+     */
     @RequestMapping(value = "/getConclude/{id}", method = RequestMethod.GET)
     @ResponseBody
     public ModelMap getConcludeData(@PathVariable("id") Long id) {

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

@@ -338,6 +338,16 @@ define([ 'angularAMD', 'ui.router', 'ui-bootstrap', 'ngLocal', 'ngTable', 'file-
             $modalInstance.dismiss();
         };
 
+        $scope.deleteSchedule = function(scheduleId) {
+            Project.deleteSchedule({scheduleId: scheduleId}, {}, function() {
+                toaster.pop('success', '操作成功');
+                // 重新加载
+                $scope.getSchedules();
+            }, function() {
+                toaster.pop('error', '出现错误，操作失败');
+            });
+        };
+
         // true通过 false驳回
         $scope.decide = function(type) {
             var modalInstance = $modal.open({

donate-console/src/main/webapp/resources/js/index/services/Project.js

@@ -36,6 +36,14 @@ define ([ 'ngResource' ], function() {
                 url:'projectEvolve/getSchedules',
                 method: 'GET'
             },
+            // 删除项目进度
+            deleteSchedule: {
+                url:'projectEvolve/delete/:id',
+                method: 'POST',
+                params: {
+                    id: 'scheduleId'
+                }
+            },
             // 获取项目所有捐款明细
             getRecords: {
                 url:'projectrecode/getRecords',

donate-console/src/main/webapp/resources/view/project/project_detail.html

@@ -108,7 +108,6 @@
                 </div>
             </div>
         </div>
-        <div class="list-footer"><a ng-click="decide(true)">通过</a><a ng-click="decide(false)">驳回</a></div>
         <div class="list-footer" ng-if="project.status == 0"><a ng-click="decide(true)">通过</a><a ng-click="decide(false)">驳回</a></div>
         <div class="list-footer" ng-if="project.status == 2"><a ng-click="reapply()" class="again">重新申请</a></div>
     </div>

donate-console/src/main/webapp/resources/view/project/project_management.html

@@ -36,7 +36,7 @@
                 <textarea name="" ng-model="conclude.description" class="form-control" id="" cols="30" rows="10" placeholder="详细项目最终执行情况及结果..."></textarea>
             </div>
             <p class="project-tip">发布结项报告后，项目将自动结束，并且不可再编辑录入。请尽可能在执行进度为100%后再发布结项报告。</p>
-            <div class="release"><a ng-click="saveEnd()">发布</a></div>
+            <div class="release"><a ng-click="saveConclude(conclude)">发布</a></div>
         </div>
     </div>
 </aside>