Browse Source

增加评价方法

Feick 4 years ago
parent
commit
c84a496120

+ 2 - 2
src/main/kotlin/com/yaoxiang/planning/action/AnnualAction.kt

@@ -69,8 +69,8 @@ class AnnualAction {
 
     @ApiOperation("评价")
     @PostMapping("evaluate")
-    fun evaluate(id: Long, evaluate: String): Reply<Any> {
-        val result = annualPlanService.evaluate(id, evaluate)
+    fun evaluate(id: Long, evaluation: String): Reply<Any> {
+        val result = annualPlanService.evaluate(id, evaluation)
         return Reply(result)
     }
 }

+ 20 - 6
src/main/kotlin/com/yaoxiang/planning/action/PlanningItemAction.kt

@@ -8,10 +8,7 @@ import io.swagger.annotations.ApiImplicitParam
 import io.swagger.annotations.ApiImplicitParams
 import io.swagger.annotations.ApiOperation
 import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.web.bind.annotation.PostMapping
-import org.springframework.web.bind.annotation.RequestBody
-import org.springframework.web.bind.annotation.RequestMapping
-import org.springframework.web.bind.annotation.RestController
+import org.springframework.web.bind.annotation.*
 
 @Api(tags = ["分计划"])
 @RestController
@@ -35,6 +32,21 @@ class PlanningItemAction {
         return Reply(result)
     }
 
+    @ApiOperation("更新子计划项")
+    @PostMapping("update")
+    fun update(id: Long, name: String, content: String, status: Int,
+        @RequestParam(required = false) remark: String?): Reply<Any> {
+        val result = planningItemService.update(id, name, content, status, remark)
+        return Reply(result)
+    }
+
+    @ApiOperation("更新子计划状态")
+    @PostMapping("evaluate")
+    fun evaluate(id: Long, evaluation: String): Reply<Any> {
+        val result = planningItemService.evaluate(id,evaluation)
+        return Reply(result)
+    }
+
     @ApiOperation("查找给定年度计划或者季度计划的所有分计划")
     @PostMapping("findByPlanningIdAndType")
     fun findByPlanningIdAndType(planningId: Long, type: Int): Reply<List<PlanningItem>> {
@@ -58,8 +70,10 @@ class PlanningItemAction {
 
     @ApiOperation("删除给定年度计划或者季度计划的所有分计划")
     @PostMapping("deleteByPlanningIdAndType")
-    @ApiImplicitParams(ApiImplicitParam(name = "planningId", value = "计划Id", paramType = "query"),
-            ApiImplicitParam(name = "type", value = "计划类型", paramType = "query"))
+    @ApiImplicitParams(
+        ApiImplicitParam(name = "planningId", value = "计划Id", paramType = "query"),
+        ApiImplicitParam(name = "type", value = "计划类型", paramType = "query")
+    )
     fun deleteItem(planningId: Long, type: Int): Reply<Any> {
         val result = planningItemService.deleteByPlanningIdAndType(planningId, type)
         return Reply(result)

+ 8 - 2
src/main/kotlin/com/yaoxiang/planning/service/AnnualPlanService.kt

@@ -86,9 +86,15 @@ class AnnualPlanService {
         return annualPlanRepo.findAll()
     }
 
-    fun evaluate(id: Long, evaluate: String): Boolean {
+    fun evaluate(id: Long, evaluation: String): Boolean {
+        val optional = get(id);
+        if(optional.isPresent){
+            val plan = optional.get()
+            plan.evaluation = evaluation
+            annualPlanRepo.save(plan)
+            return true
+        }
         return false
     }
 
-
 }

+ 31 - 0
src/main/kotlin/com/yaoxiang/planning/service/PlanningItemService.kt

@@ -60,4 +60,35 @@ class PlanningItemService {
         list.forEach { planningItemRepo.delete(it) }
         return true
     }
+
+    fun get(id: Long): Optional<PlanningItem> {
+        return planningItemRepo.findById(id)
+    }
+
+    fun update(id: Long, name: String, content: String, status: Int, remark: String?): Boolean {
+        val optional = get(id)
+        if (optional.isPresent) {
+            val item = optional.get()
+            item.name = name
+            item.content = content
+            item.status = status
+            item.remark = remark
+            planningItemRepo.save(item)
+            return true
+        }
+        return false
+    }
+
+    fun evaluate(id: Long, evaluation: String): Boolean {
+        val optional = get(id)
+        if (optional.isPresent) {
+            val item = optional.get()
+            item.evaluation = evaluation
+            planningItemRepo.save(item)
+            return true
+        }
+        return false
+    }
+
+
 }