|
@@ -2,6 +2,7 @@ package com.ffii.fpsms.modules.purchaseOrder.web |
|
|
|
|
|
|
|
|
import com.ffii.core.response.RecordsRes |
|
|
import com.ffii.core.response.RecordsRes |
|
|
import com.ffii.core.support.JdbcDao |
|
|
import com.ffii.core.support.JdbcDao |
|
|
|
|
|
import com.ffii.core.utils.CriteriaArgsBuilder |
|
|
import com.ffii.fpsms.modules.master.entity.Items |
|
|
import com.ffii.fpsms.modules.master.entity.Items |
|
|
import com.ffii.fpsms.modules.master.service.ItemsService |
|
|
import com.ffii.fpsms.modules.master.service.ItemsService |
|
|
import com.ffii.fpsms.modules.master.web.models.MessageResponse |
|
|
import com.ffii.fpsms.modules.master.web.models.MessageResponse |
|
@@ -22,15 +23,29 @@ class PurchaseOrderController( |
|
|
private val purchaseOrderService: PurchaseOrderService |
|
|
private val purchaseOrderService: PurchaseOrderService |
|
|
) { |
|
|
) { |
|
|
@GetMapping("/list") |
|
|
@GetMapping("/list") |
|
|
fun getPoList(@RequestParam(required = false) pageNum: Int, @RequestParam(required = false) pageSize: Int ): RecordsRes<PurchaseOrderDataClass> { |
|
|
|
|
|
println("request") |
|
|
|
|
|
println(pageSize) |
|
|
|
|
|
println(pageNum - 1) |
|
|
|
|
|
|
|
|
fun getPoList( |
|
|
|
|
|
// @RequestParam(required = false) pageNum: Int, |
|
|
|
|
|
// @RequestParam(required = false) pageSize: Int |
|
|
|
|
|
): RecordsRes<PurchaseOrderDataClass> { |
|
|
|
|
|
// println("request") |
|
|
|
|
|
// println(pageSize) |
|
|
|
|
|
// println(pageNum - 1) |
|
|
// request pageNum starts from 1, but pagingRequest starts with 0 |
|
|
// request pageNum starts from 1, but pagingRequest starts with 0 |
|
|
val pageRequest = PagingRequest(pageSize = pageSize, pageNum = pageNum - 1,) // not start from 0 |
|
|
|
|
|
|
|
|
// val pageRequest = PagingRequest(pageSize = pageSize, pageNum = pageNum - 1,) // not start from 0 |
|
|
|
|
|
val pageRequest = PagingRequest(pageSize = null, pageNum = null) // not start from 0 |
|
|
return purchaseOrderService.getPoList(pageRequest) |
|
|
return purchaseOrderService.getPoList(pageRequest) |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@GetMapping("/testing") |
|
|
|
|
|
fun testing(request: HttpServletRequest) { |
|
|
|
|
|
val criteriaArgs = CriteriaArgsBuilder.withRequest(request) |
|
|
|
|
|
.addStringLike("code") |
|
|
|
|
|
.addStringLike("name") |
|
|
|
|
|
.build() |
|
|
|
|
|
println("criteriaArgs") |
|
|
|
|
|
println(criteriaArgs) |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
@GetMapping("/detail/{id}") // purchaseOrderId |
|
|
@GetMapping("/detail/{id}") // purchaseOrderId |
|
|
fun getDetailedPo(@PathVariable id: Long): Map<String, Any> { |
|
|
fun getDetailedPo(@PathVariable id: Long): Map<String, Any> { |
|
|
return purchaseOrderService.getDetailedPo(id) |
|
|
return purchaseOrderService.getDetailedPo(id) |
|
|