diff --git a/src/main/java/com/ffii/fpsms/modules/master/service/ItemsService.kt b/src/main/java/com/ffii/fpsms/modules/master/service/ItemsService.kt index 5e0fdab..9dae6fe 100644 --- a/src/main/java/com/ffii/fpsms/modules/master/service/ItemsService.kt +++ b/src/main/java/com/ffii/fpsms/modules/master/service/ItemsService.kt @@ -38,18 +38,110 @@ open class ItemsService( + " concat(i.code , ' - ' , i.name) as label, " + " uc.id as uomId, " + " uc.code as uom, " - + " COALESCE(inv.onHandQty, 0) - COALESCE(inv.onHoldQty, 0) - COALESCE(inv.unavailableQty, 0) as currentStockBalance " + + " uc.udfudesc as uomDesc, " + + " COALESCE(inv.availableQty, 0) as currentStockBalance " + " from items i " + " left join item_uom iu on iu.itemId = i.id and iu.deleted = false and iu.salesUnit = true " + " left join uom_conversion uc on uc.id = iu.uomId " - + " left join inventory inv on inv.itemId = i.id " + + " left join (" + + " SELECT " + + " il.itemId, " + + " SUM(COALESCE(ill.inQty, 0) - COALESCE(ill.outQty, 0) - COALESCE(ill.holdQty, 0)) / " + + " COALESCE(MAX(iu_ratio.ratioN) / MAX(iu_ratio.ratioD), 1) as availableQty " + + " FROM inventory_lot_line ill " + + " JOIN inventory_lot il ON il.id = ill.inventoryLotId " + + " LEFT JOIN item_uom iu_ratio ON iu_ratio.itemId = il.itemId AND iu_ratio.deleted = false AND iu_ratio.salesUnit = true " + + " WHERE ill.status = 'available' " + + " AND (COALESCE(ill.inQty, 0) - COALESCE(ill.outQty, 0) - COALESCE(ill.holdQty, 0)) > 0 " + + " AND (il.expiryDate IS NULL OR il.expiryDate >= CURDATE()) " + + " GROUP BY il.itemId " + + " ) inv ON inv.itemId = i.id " + " where i.deleted = false " + " and i.type = :type " ) return jdbcDao.queryForList(sql.toString(), args); } - + open fun getPickOrderItemsByPage(args: Map): List> { + try { + println("=== Debug: getPickOrderItemsByPage in ItemsService ===") + println("Args: $args") + + val sql = StringBuilder( + """ + SELECT + CONCAT(po.id, '-', pol.itemId) as id, + po.id as pickOrderId, + po.code as pickOrderCode, + pol.itemId, + i.code as itemCode, + i.name as itemName, + pol.qty as requiredQty, + COALESCE(inv.availableQty, 0) as currentStock, + COALESCE(uc.udfudesc, 'N/A') as unit, + po.targetDate, + po.status, + po.consoCode, + po.assignTo + FROM pick_order po + JOIN pick_order_line pol ON pol.poId = po.id + JOIN items i ON i.id = pol.itemId + LEFT JOIN uom_conversion uc ON uc.id = pol.uomId + LEFT JOIN ( + SELECT + il.itemId, + SUM(COALESCE(ill.inQty, 0) - COALESCE(ill.outQty, 0) - COALESCE(ill.holdQty, 0)) / + COALESCE(MAX(iu_ratio.ratioN) / MAX(iu_ratio.ratioD), 1) as availableQty + FROM inventory_lot_line ill + JOIN inventory_lot il ON il.id = ill.inventoryLotId + LEFT JOIN item_uom iu_ratio ON iu_ratio.itemId = il.itemId AND iu_ratio.deleted = false AND iu_ratio.salesUnit = true + WHERE ill.status = 'available' + AND (COALESCE(ill.inQty, 0) - COALESCE(ill.outQty, 0) - COALESCE(ill.holdQty, 0)) > 0 + AND (il.expiryDate IS NULL OR il.expiryDate >= CURDATE()) + GROUP BY il.itemId + ) inv ON inv.itemId = pol.itemId + WHERE po.deleted = false + AND po.consoCode IS NULL + """ + ) + + if (args.containsKey("itemCode")) { + sql.append(" AND i.code LIKE :itemCode ") + } + + if (args.containsKey("itemName")) { + sql.append(" AND i.name LIKE :itemName ") + } + + if (args.containsKey("status")) { + sql.append(" AND po.status = :status ") + } + + if (args.containsKey("targetDateFrom")) { + sql.append(" AND po.targetDate >= :targetDateFrom ") + } + + if (args.containsKey("targetDateTo")) { + sql.append(" AND po.targetDate <= :targetDateTo ") + } + + sql.append(" ORDER BY po.targetDate DESC, i.name ASC ") + + val finalSql = sql.toString() + println("Final SQL: $finalSql") + println("SQL args: $args") + + val result = jdbcDao.queryForList(finalSql, args) + println("Query result size: ${result.size}") + + return result + } catch (e: Exception) { + println("Error in getPickOrderItemsByPage: ${e.message}") + e.printStackTrace() + throw e + } + } + open fun getRoughScheduleList(): List> { val now = LocalDateTime.now() val lastMonthStart = now.minusMonths(1).withDayOfMonth(1).withHour(0).withMinute(0).withSecond(0) // Start of last month diff --git a/src/main/java/com/ffii/fpsms/modules/master/web/ItemsController.kt b/src/main/java/com/ffii/fpsms/modules/master/web/ItemsController.kt index b1d114f..33ea12b 100644 --- a/src/main/java/com/ffii/fpsms/modules/master/web/ItemsController.kt +++ b/src/main/java/com/ffii/fpsms/modules/master/web/ItemsController.kt @@ -60,7 +60,40 @@ class ItemsController( return RecordsRes(paginatedList as List>, fullList.size) } - + @GetMapping("/pickOrderItems") + fun getPickOrderItemsByPage(request: HttpServletRequest): RecordsRes> { + try { + println("=== Debug: getPickOrderItemsByPage ===") + println("Request parameters: ${request.parameterMap}") + + val criteriaArgs = CriteriaArgsBuilder.withRequest(request) + .addStringLike("itemCode") + .addStringLike("itemName") + .addString("status") + .addString("targetDateFrom") + .addString("targetDateTo") + .build() + + println("Criteria args: $criteriaArgs") + + val pageSize = request.getParameter("pageSize")?.toIntOrNull() ?: 10 + val pageNum = request.getParameter("pageNum")?.toIntOrNull() ?: 1 + + println("Page size: $pageSize, Page num: $pageNum") + + val fullList = itemsService.getPickOrderItemsByPage(criteriaArgs) + println("Full list size: ${fullList.size}") + + val paginatedList = PagingUtils.getPaginatedList(fullList, pageSize, pageNum) + println("Paginated list size: ${paginatedList.size}") + + return RecordsRes(paginatedList, fullList.size) + } catch (e: Exception) { + println("Error in getPickOrderItemsByPage: ${e.message}") + e.printStackTrace() + throw e + } + } @GetMapping("/details/{id}") fun getItems(@PathVariable id: Long): ItemWithQcResponse { return itemsService.getItem(id) diff --git a/src/main/java/com/ffii/fpsms/modules/pickOrder/enums/PickOrderEnum.kt b/src/main/java/com/ffii/fpsms/modules/pickOrder/enums/PickOrderEnum.kt index 9acd613..e336d72 100644 --- a/src/main/java/com/ffii/fpsms/modules/pickOrder/enums/PickOrderEnum.kt +++ b/src/main/java/com/ffii/fpsms/modules/pickOrder/enums/PickOrderEnum.kt @@ -3,6 +3,7 @@ package com.ffii.fpsms.modules.pickOrder.enums enum class PickOrderStatus(val value: String) { PENDING ("pending"), CONSOLIDATED ("consolidated"), + ASSIGNED ("assigned"), RELEASED ("released"), PICKING ("picking"), COMPLETED ("completed"); diff --git a/src/main/java/com/ffii/fpsms/modules/pickOrder/service/PickOrderService.kt b/src/main/java/com/ffii/fpsms/modules/pickOrder/service/PickOrderService.kt index 5b52b12..a9ff50a 100644 --- a/src/main/java/com/ffii/fpsms/modules/pickOrder/service/PickOrderService.kt +++ b/src/main/java/com/ffii/fpsms/modules/pickOrder/service/PickOrderService.kt @@ -127,12 +127,11 @@ open class PickOrderService( val total = response.totalElements return RecordsRes(records, total.toInt()) } - open fun getPickOrdersWithStockBalanceByPage(request: SearchPickOrderRequest): RecordsRes { val pageable = PageRequest.of(request.pageNum ?: 0, request.pageSize ?: 10); - + // First get the basic pick order info for pagination val response = pickOrderRepository.findPickOrderInfoByConditionsAndPageable( code = request.code ?: "all", @@ -143,27 +142,27 @@ open class PickOrderService( itemName = request.itemName ?: "all", pageable = pageable ) - + val records = response.content val pickOrderIds = records.mapNotNull { it.id } - + if (pickOrderIds.isEmpty()) { return RecordsRes(emptyList(), 0) } - + // Get full pick orders with relationships val fullPickOrders = pickOrderRepository.findAllByIdIn(pickOrderIds) - + // Get all item IDs val itemIds = fullPickOrders .flatMap { it.pickOrderLines } .mapNotNull { it.item?.id } .distinct() - + // Get inventory data val today = LocalDate.now() val zero = BigDecimal.ZERO - + val inventories = if (itemIds.isNotEmpty()) { inventoryLotLineService .allInventoryLotLinesByItemIdIn(itemIds) @@ -174,12 +173,12 @@ open class PickOrderService( } else { emptyMap() } - + // Build response (removed suggestions) val pickOrderInfos = fullPickOrders.map { po -> val pickOrderLineInfos = po.pickOrderLines.map { pol -> val inventory = pol.item?.id?.let { inventories[it] } - + GetPickOrderLineInfo( id = pol.id, itemId = pol.item?.id, @@ -192,20 +191,87 @@ open class PickOrderService( suggestedList = emptyList() // Empty list since you don't need suggestions ) } - + GetPickOrderInfo( id = po.id, code = po.code, targetDate = po.targetDate, type = po.type?.value, status = po.status?.value, + assignTo = po.assignTo?.id, pickOrderLines = pickOrderLineInfos ) } - + val total = response.totalElements return RecordsRes(pickOrderInfos, total.toInt()) } + + open fun assignPickOrders(pickOrderIds: List, assignTo: Long): MessageResponse { + try { + val pickOrders = pickOrderRepository.findAllById(pickOrderIds) + val user = userService.find(assignTo).orElse(null) // 获取用户对象 + + pickOrders.forEach { pickOrder -> + pickOrder.assignTo = user // 使用 User 对象而不是 Long + pickOrder.status = PickOrderStatus.ASSIGNED // 使用枚举值 + } + + pickOrderRepository.saveAll(pickOrders) + + return MessageResponse( + id = null, + name = "Pick orders assigned successfully", + code = "SUCCESS", + type = "pickorder", + message = "Pick orders assigned successfully", + errorPosition = null + ) + } catch (e: Exception) { + return MessageResponse( + id = null, + name = "Failed to assign pick orders", + code = "ERROR", + type = "pickorder", + message = "Failed to assign pick orders: ${e.message}", + errorPosition = null + ) + } + } + + open fun releasePickOrders(pickOrderIds: List, assignTo: Long): MessageResponse { + try { + val pickOrders = pickOrderRepository.findAllById(pickOrderIds) + val user = userService.find(assignTo).orElse(null) // 获取用户对象 + + pickOrders.forEach { pickOrder -> + pickOrder.assignTo = user // 使用 User 对象而不是 Long + pickOrder.status = PickOrderStatus.RELEASED // 使用枚举值 + } + + pickOrderRepository.saveAll(pickOrders) + + return MessageResponse( + id = null, + name = "Pick orders released successfully", + code = "SUCCESS", + type = "pickorder", + message = "Pick orders released successfully", + errorPosition = null + ) + } catch (e: Exception) { + return MessageResponse( + id = null, + name = "Failed to release pick orders", + code = "ERROR", + type = "pickorder", + message = "Failed to release pick orders: ${e.message}", + errorPosition = null + ) + } + } + + open fun getConsoPickOrderList(args: MutableMap): List> { val sql = StringBuilder( "select" @@ -525,7 +591,7 @@ open class PickOrderService( itemCode = pol.item?.code, itemName = pol.item?.name, // availableQty = inventory?.availableQty, - availableQty = inventory?.sumOf { i -> (i.availableQty ?: zero) }, + availableQty = inventory?.sumOf { i -> (i.availableQty ?: zero) }, // availableQty = inventory?.sumOf { i -> (i.availableQty ?: zero) * (itemUom?.ratioN ?: one) * (itemUom?.ratioD ?: one) }, requiredQty = pol.qty, uomCode = pol.uom?.code, @@ -623,7 +689,7 @@ open class PickOrderService( itemCode = pol.item?.code, itemName = pol.item?.name, // availableQty = inventory?.availableQty, - availableQty = inventory?.sumOf { i -> (i.availableQty ?: zero) }, + availableQty = inventory?.sumOf { i -> (i.availableQty ?: zero) }, // availableQty = inventory?.sumOf { i -> (i.availableQty ?: zero) * (itemUom?.ratioN ?: one) * (itemUom?.ratioD ?: one) }, requiredQty = pol.qty, uomCode = pol.uom?.code, @@ -636,10 +702,11 @@ open class PickOrderService( // Return GetPickOrderInfo( id = po.id, - code = po.code, + code = po.code, targetDate = po.targetDate, type = po.type?.value, status = po.status?.value, + assignTo = po.assignTo?.id, pickOrderLines = releasePickOrderLineInfos ) } @@ -677,9 +744,9 @@ open class PickOrderService( val releasedPickOrderIds = allPickOrders .filter { it.status == PickOrderStatus.RELEASED } .map { it.id!! } - + println("All released pick order IDs: $releasedPickOrderIds") - + // 如果没有任何已发布的 Pick Orders，返回空结果 if (releasedPickOrderIds.isEmpty()) { return GetPickOrderInfoResponse( @@ -687,18 +754,18 @@ open class PickOrderService( items = emptyList() ) } - + // 重用现有的 getPickOrdersInfo 方法 return getPickOrdersInfo(releasedPickOrderIds) } open fun getPickOrderLineLotDetails(pickOrderLineId: Long): List> { val today = LocalDate.now() - + println("=== Debug: getPickOrderLineLotDetails ===") println("pickOrderLineId: $pickOrderLineId") println("today: $today") - + // 检查具体的数量字段值 val quantityCheckSql = """ SELECT @@ -716,13 +783,13 @@ open class PickOrderService( WHERE spl.pickOrderLineId = :pickOrderLineId AND ill.status = 'available' """.trimIndent() - + val quantityCheckResult = jdbcDao.queryForList(quantityCheckSql, mapOf("pickOrderLineId" to pickOrderLineId)) println("Quantity check result:") quantityCheckResult.forEach { row -> println("Row: $row") } - + // 检查日期条件 val dateCheckSql = """ SELECT @@ -740,13 +807,14 @@ open class PickOrderService( AND ill.status = 'available' AND (COALESCE(ill.inQty, 0) - COALESCE(ill.outQty, 0) - COALESCE(ill.holdQty, 0)) > 0 """.trimIndent() - - val dateCheckResult = jdbcDao.queryForList(dateCheckSql, mapOf("pickOrderLineId" to pickOrderLineId, "today" to today)) + + val dateCheckResult = + jdbcDao.queryForList(dateCheckSql, mapOf("pickOrderLineId" to pickOrderLineId, "today" to today)) println("Date check result:") dateCheckResult.forEach { row -> println("Row: $row") } - + // 检查 warehouse JOIN val warehouseCheckSql = """ SELECT @@ -764,13 +832,14 @@ open class PickOrderService( AND (COALESCE(ill.inQty, 0) - COALESCE(ill.outQty, 0) - COALESCE(ill.holdQty, 0)) > 0 AND (il.expiryDate IS NULL OR il.expiryDate >= :today) """.trimIndent() - - val warehouseCheckResult = jdbcDao.queryForList(warehouseCheckSql, mapOf("pickOrderLineId" to pickOrderLineId, "today" to today)) + + val warehouseCheckResult = + jdbcDao.queryForList(warehouseCheckSql, mapOf("pickOrderLineId" to pickOrderLineId, "today" to today)) println("Warehouse check result count: ${warehouseCheckResult.size}") warehouseCheckResult.forEach { row -> println("Warehouse Row: $row") } - + // 检查 uom_conversion JOIN - 使用 LEFT JOIN 并检查 stockItemUomId val uomCheckSql = """ SELECT @@ -789,13 +858,14 @@ open class PickOrderService( AND (COALESCE(ill.inQty, 0) - COALESCE(ill.outQty, 0) - COALESCE(ill.holdQty, 0)) > 0 AND (il.expiryDate IS NULL OR il.expiryDate >= :today) """.trimIndent() - - val uomCheckResult = jdbcDao.queryForList(uomCheckSql, mapOf("pickOrderLineId" to pickOrderLineId, "today" to today)) + + val uomCheckResult = + jdbcDao.queryForList(uomCheckSql, mapOf("pickOrderLineId" to pickOrderLineId, "today" to today)) println("UOM check result count: ${uomCheckResult.size}") uomCheckResult.forEach { row -> println("UOM Row: $row") } - + // 修改查询，通过 item_uom 表获取 UOM 信息 val sql = """ SELECT @@ -833,27 +903,22 @@ open class PickOrderService( END, il.expiryDate ASC """.trimIndent() - + val params = mapOf( "pickOrderLineId" to pickOrderLineId, "today" to today ) - + val result = jdbcDao.queryForList(sql, params) println("Final result count: ${result.size}") result.forEach { row -> println("Final Row: $row") } - + return result } - - - - - @Transactional(rollbackFor = [java.lang.Exception::class]) open fun releaseConsoPickOrderAction(request: ReleaseConsoPickOrderRequest): ReleasePickOrderInfoResponse { val zero = BigDecimal.ZERO @@ -908,6 +973,94 @@ open class PickOrderService( return releaseConsoPickOrderInfo(request.consoCode) } + @Transactional(rollbackFor = [java.lang.Exception::class]) + open fun releaseAssignedPickOrders(pickOrderIds: List, assignTo: Long): MessageResponse { + try { + val zero = BigDecimal.ZERO + val releasedBy = SecurityUtils.getUser().getOrNull() + val user = userService.find(assignTo).orElse(null) + + + val pickOrders = pickOrderRepository.findAllByIdInAndStatus(pickOrderIds, PickOrderStatus.ASSIGNED) + + if (pickOrders.isEmpty()) { + return MessageResponse( + id = null, + name = "No assigned pick orders found", + code = "ERROR", + type = "pickorder", + message = "No assigned pick orders found with the provided IDs", + errorPosition = null + ) + } + + + pickOrders.forEach { pickOrder -> + pickOrder.apply { + this.releasedBy = releasedBy + status = PickOrderStatus.RELEASED + this.assignTo = user + } + } + + + val suggestions = suggestedPickLotService.suggestionForPickOrders( + SuggestedPickLotForPoRequest(pickOrders = pickOrders) + ) + + + val currUser = SecurityUtils.getUser().orElseThrow() + val stockOut = StockOut().apply { + this.type = "job" + this.consoPickOrderCode = null // 单个 pick orders 没有 consoCode + this.status = StockOutStatus.PENDING.status + this.handler = currUser.id + } + stockOutRepository.save(stockOut) + + + val saveSuggestedPickLots = suggestedPickLotService.saveAll(suggestions.suggestedList) + + pickOrderRepository.saveAll(pickOrders) + + + val inventoryLotLines = inventoryLotLineRepository.findAllByIdIn( + saveSuggestedPickLots.mapNotNull { it.suggestedLotLine?.id } + ) + + saveSuggestedPickLots.forEach { lot -> + if (lot.suggestedLotLine != null && lot.suggestedLotLine?.id != null && lot.suggestedLotLine!!.id!! > 0) { + val lineIndex = inventoryLotLines.indexOf(lot.suggestedLotLine) + if (lineIndex >= 0) { + inventoryLotLines[lineIndex].holdQty = + (inventoryLotLines[lineIndex].holdQty ?: zero).plus(lot.qty ?: zero) + } + } + } + + inventoryLotLineRepository.saveAll(inventoryLotLines) + + return MessageResponse( + id = null, + name = "Pick orders released successfully with inventory management", + code = "SUCCESS", + type = "pickorder", + message = "Pick orders released successfully with inventory management", + errorPosition = null + ) + + } catch (e: Exception) { + return MessageResponse( + id = null, + name = "Failed to release pick orders", + code = "ERROR", + type = "pickorder", + message = "Failed to release pick orders: ${e.message}", + errorPosition = null + ) + } + } + @Throws(IOException::class) @Transactional open fun completeStockOut(consoCode: String): MessageResponse { @@ -939,8 +1092,8 @@ open class PickOrderService( } else { return MessageResponse( id = stockOut.id, - name = stockOut.consoPickOrderCode ?: stockOut.deliveryOrderCode, - code = stockOut.consoPickOrderCode ?: stockOut.deliveryOrderCode, + name = stockOut.consoPickOrderCode ?: stockOut.deliveryOrderCode, // 修复：使用 stockOut 而不是 savedStockOut + code = stockOut.consoPickOrderCode ?: stockOut.deliveryOrderCode, // 修复：使用 stockOut 而不是 savedStockOut type = stockOut.type, message = "not completed", errorPosition = null, diff --git a/src/main/java/com/ffii/fpsms/modules/pickOrder/web/PickOrderController.kt b/src/main/java/com/ffii/fpsms/modules/pickOrder/web/PickOrderController.kt index 9d927e5..9b6db8a 100644 --- a/src/main/java/com/ffii/fpsms/modules/pickOrder/web/PickOrderController.kt +++ b/src/main/java/com/ffii/fpsms/modules/pickOrder/web/PickOrderController.kt @@ -63,7 +63,20 @@ class PickOrderController( val paginatedList = PagingUtils.getPaginatedList(fullList,pageSize, pageNum) return RecordsRes(paginatedList, fullList.size) } + @PostMapping("/assign") + fun assignPickOrders(@RequestBody request: Map): MessageResponse { + val pickOrderIds = (request["pickOrderIds"] as List<*>).map { it.toString().toLong() } + val assignTo = request["assignTo"].toString().toLong() + return pickOrderService.assignPickOrders(pickOrderIds, assignTo) + } + // Release Pick Orders (without consoCode) + @PostMapping("/release") + fun releasePickOrders(@RequestBody request: Map): MessageResponse { + val pickOrderIds = (request["pickOrderIds"] as List<*>).map { it.toString().toLong() } + val assignTo = request["assignTo"].toString().toLong() + return pickOrderService.releasePickOrders(pickOrderIds, assignTo) + } @GetMapping("/get-pickorder-line-byPage") fun getPickOrderLine(request: HttpServletRequest): RecordsRes> { val criteriaArgs = CriteriaArgsBuilder.withRequest(request) @@ -112,7 +125,12 @@ class PickOrderController( fun releaseConsoPickOrderAction(@Valid @RequestBody request: ReleaseConsoPickOrderRequest): ReleasePickOrderInfoResponse { return pickOrderService.releaseConsoPickOrderAction(request) } - + @PostMapping("/release-assigned") + fun releaseAssignedPickOrders(@RequestBody request: Map): MessageResponse { + val pickOrderIds = (request["pickOrderIds"] as List<*>).map { it.toString().toLong() } + val assignTo = request["assignTo"].toString().toLong() + return pickOrderService.releaseAssignedPickOrders(pickOrderIds, assignTo) + } // Start Pick Order @GetMapping("/pickConso/{consoCode}") fun pickConsoPickOrderInfo(@PathVariable consoCode: String): ReleasePickOrderInfoResponse { diff --git a/src/main/java/com/ffii/fpsms/modules/pickOrder/web/models/ConsoPickOrderResponse.kt b/src/main/java/com/ffii/fpsms/modules/pickOrder/web/models/ConsoPickOrderResponse.kt index ac811c3..efb7d1a 100644 --- a/src/main/java/com/ffii/fpsms/modules/pickOrder/web/models/ConsoPickOrderResponse.kt +++ b/src/main/java/com/ffii/fpsms/modules/pickOrder/web/models/ConsoPickOrderResponse.kt @@ -34,6 +34,7 @@ data class GetPickOrderInfo( val targetDate: LocalDateTime?, val type: String?, val status: String?, + val assignTo: Long?, val pickOrderLines: List ) diff --git a/src/main/java/com/ffii/fpsms/modules/user/web/UserController.java b/src/main/java/com/ffii/fpsms/modules/user/web/UserController.java index 8fc4b50..88137d4 100644 --- a/src/main/java/com/ffii/fpsms/modules/user/web/UserController.java +++ b/src/main/java/com/ffii/fpsms/modules/user/web/UserController.java @@ -9,7 +9,6 @@ import com.ffii.fpsms.modules.user.entity.projections.UserCombo; import com.ffii.fpsms.modules.user.service.pojo.UserRecord; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.hibernate.mapping.Any; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.security.access.prepost.PreAuthorize; @@ -91,6 +90,21 @@ public class UserController{ .toList(); return ResponseEntity.ok(namelist); } + @GetMapping("/new-name-list") + public ResponseEntity>> newnamelist() { + SearchUserReq req = new SearchUserReq(); + List> newnamelist = userService.search(req).stream() + .map(user -> { + Map map = new HashMap<>(); + map.put("id", user.getId()); + map.put("name", user.getName()); + map.put("title", user.getTitle()); + map.put("department", user.getDepartment()); + return map; + }) + .toList(); + return ResponseEntity.ok(newnamelist); + } // @Operation(summary = "load user data", responses = { @ApiResponse(responseCode = "200"), // @ApiResponse(responseCode = "404", content = @Content) }) @GetMapping("/{id}")