quarterlyplan 增加departmentId

src/main/kotlin/com/yaoxiang/planning/action/QuarterlyAction.kt

@@ -21,20 +21,29 @@ class QuarterlyAction {
     private lateinit var quarterlyPlanService: QuarterlyPlanService
 
     @ApiOperation("添加季度计划")
-    @ApiImplicitParams(ApiImplicitParam(name = "name", value = "名称", paramType = "query"),
-            ApiImplicitParam(name = "content", value = "计划内容", paramType = "query"),
-            ApiImplicitParam(name = "year", value = "年份", paramType = "query"),
-            ApiImplicitParam(name = "quarter", value = "季度", paramType = "query"))
+    @ApiImplicitParams(
+        ApiImplicitParam(name = "name", value = "名称", paramType = "query"),
+        ApiImplicitParam(name = "content", value = "计划内容", paramType = "query"),
+        ApiImplicitParam(name = "year", value = "年份", paramType = "query"),
+        ApiImplicitParam(name = "quarter", value = "季度", paramType = "query"),
+        ApiImplicitParam(name = "departmentId", value = "部门Id", paramType = "query")
+    )
     @PostMapping("add")
-    fun add(name: String, content: String, year: Int, quarter: Int): Reply<Any> {
-        val result = quarterlyPlanService.add(name, content, year, quarter)
+    fun add(
+        name: String, content: String, year: Int, quarter: Int,
+        @RequestParam(required = false) departmentId: Long?
+    ): Reply<Any> {
+        val result = quarterlyPlanService.add(name, content, year, quarter, departmentId)
         return Reply(result)
     }
 
     @ApiOperation("更新季度计划")
     @PostMapping("update")
-    fun update(id: Long, name: String, content: String, year: Int, quarter: Int, status: Int): Reply<Any> {
-        val result = quarterlyPlanService.update(id, name, content, year, quarter, status)
+    fun update(
+        id: Long, name: String, content: String, year: Int, quarter: Int, status: Int,
+        @RequestParam(required = false) departmentId: Long?
+    ): Reply<Any> {
+        val result = quarterlyPlanService.update(id, name, content, year, quarter, status, departmentId)
         return Reply(result)
     }
 
@@ -48,9 +57,10 @@ class QuarterlyAction {
     @ApiOperation("获取季度计划")
     @ApiImplicitParam(name = "year", value = "year", paramType = "query")
     @GetMapping("list")
-    fun list(@RequestParam(required = false) year: Int? = null): Reply<List<QuarterlyPlan>> {
+    fun list(@RequestParam(required = false) year: Int? = null,
+             @RequestParam(required = false) departmentId: Long?): Reply<List<QuarterlyPlan>> {
         val y: Int = year ?: DateUtils.year(Date())
-        val result = quarterlyPlanService.list(y)
+        val result = quarterlyPlanService.list(y,departmentId)
         return Reply.ok(result)
     }
 

src/main/kotlin/com/yaoxiang/planning/domain/QuarterlyPlan.kt

@@ -25,4 +25,8 @@ class QuarterlyPlan() : Planning() {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     var endTime: Date? = null
 
+    @ApiModelProperty("部门Id")
+    @Column(columnDefinition = "int(20) COMMENT '部门Id'")
+    var departmentId: Long? = null
+
 }

src/main/kotlin/com/yaoxiang/planning/repository/QuarterlyPlanRepo.kt

@@ -9,5 +9,7 @@ import java.util.*
 interface QuarterlyPlanRepo : JpaRepository<QuarterlyPlan, Long> {
     fun findFirstByYearAndQuarter(year: Int, quarter: Int): Optional<QuarterlyPlan>
 
-    fun findByYear(year: Int):List<QuarterlyPlan>
+    fun findByYear(year: Int): List<QuarterlyPlan>
+
+    fun findByYearAndDepartmentId(year: Int, departmentId: Long): List<QuarterlyPlan>
 }

src/main/kotlin/com/yaoxiang/planning/service/QuarterlyPlanService.kt

@@ -17,7 +17,7 @@ class QuarterlyPlanService {
     private lateinit var planningService: PlanningService
 
 
-    fun add(name: String, content: String, year: Int, quarter: Int): Boolean {
+    fun add(name: String, content: String, year: Int, quarter: Int,departmentId:Long?): Boolean {
         if (exists(year, quarter)) {
             return false
         }
@@ -26,11 +26,12 @@ class QuarterlyPlanService {
         planning.type = PlanType.QUARTERLY.ordinal
         planning.startTime = Date()
         planning.endTime = Date()
+        planning.departmentId = departmentId
         planningService.add(name, content, year, planning)
         return true
     }
 
-    fun update(id: Long, name: String, content: String, year: Int, quarter: Int, status: Int): Boolean {
+    fun update(id: Long, name: String, content: String, year: Int, quarter: Int, status: Int,departmentId: Long?): Boolean {
         val optional = get(id)
         if (!optional.isPresent) {
             return false
@@ -41,6 +42,7 @@ class QuarterlyPlanService {
         planning.year = year
         planning.quarter = quarter
         planning.status = status
+        planning.departmentId = departmentId
         quarterlyPlanRepo.save(planning)
         return true
     }
@@ -67,8 +69,11 @@ class QuarterlyPlanService {
         return true
     }
 
-    fun list(year: Int): List<QuarterlyPlan> {
-        return quarterlyPlanRepo.findByYear(year)
+    fun list(year: Int,departmentId: Long?): List<QuarterlyPlan> {
+        if(departmentId == null){
+            return quarterlyPlanRepo.findByYear(year)
+        }
+        return quarterlyPlanRepo.findByYearAndDepartmentId(year,departmentId!!)
     }