From da563e04088ac86c75db4b49b9499616fa04f577 Mon Sep 17 00:00:00 2001
From: "MSI\\derek" <abc@gmail.com>
Date: Mon, 13 May 2024 11:07:05 +0800
Subject: [PATCH] update

---
 .../ffii/tsms/modules/data/entity/StaffRepository.java |  2 ++
 .../com/ffii/tsms/modules/data/service/SkillService.kt |  3 +++
 .../com/ffii/tsms/modules/data/web/SkillController.kt  |  7 +++++++
 .../com/ffii/tsms/modules/data/web/StaffsController.kt | 10 ++++------
 4 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/ffii/tsms/modules/data/entity/StaffRepository.java b/src/main/java/com/ffii/tsms/modules/data/entity/StaffRepository.java
index 20066f3..46eb775 100644
--- a/src/main/java/com/ffii/tsms/modules/data/entity/StaffRepository.java
+++ b/src/main/java/com/ffii/tsms/modules/data/entity/StaffRepository.java
@@ -16,6 +16,8 @@ public interface StaffRepository extends AbstractRepository<Staff, Long> {
     List<StaffSearchInfo> findAllStaffSearchInfoByIdIn(List<Long> ids);
     Optional<Staff> findByStaffId(@Param("staffId") String staffId);
 
+    Optional<StaffSearchInfo> findStaffSearchInfoById(@Param("id") Long id);
+
     Optional<Staff> findByUserId(@Param("userId") Long userId);
     Optional<List<Staff>> findAllByTeamIdAndDeletedFalse(Long id);
 }
\ No newline at end of file
diff --git a/src/main/java/com/ffii/tsms/modules/data/service/SkillService.kt b/src/main/java/com/ffii/tsms/modules/data/service/SkillService.kt
index 434722a..1943891 100644
--- a/src/main/java/com/ffii/tsms/modules/data/service/SkillService.kt
+++ b/src/main/java/com/ffii/tsms/modules/data/service/SkillService.kt
@@ -50,6 +50,9 @@ open class SkillService(
                 + " from skill s "
                 + " where s.deleted = false "
         )
+        if (args.containsKey("id")) {
+            sql.append("and s.id = :id")
+        }
         return jdbcDao.queryForList(sql.toString(), args)
     }
     open fun combo(args: Map<String, Any>): List<Map<String, Any>> {
diff --git a/src/main/java/com/ffii/tsms/modules/data/web/SkillController.kt b/src/main/java/com/ffii/tsms/modules/data/web/SkillController.kt
index a971e65..d766752 100644
--- a/src/main/java/com/ffii/tsms/modules/data/web/SkillController.kt
+++ b/src/main/java/com/ffii/tsms/modules/data/web/SkillController.kt
@@ -19,6 +19,13 @@ class SkillController(private val skillService: SkillService)    {
     fun saveSkill(@Valid @RequestBody newSkill: NewSkillRequest): Skill {
         return skillService.saveOrUpdate(newSkill)
     }
+    @GetMapping("/{id}")
+    fun list(@Valid @PathVariable id: Long): List<Map<String, Any>> {
+        val args: MutableMap<String, Any> = HashMap()
+            args["id"] = id
+        return skillService.list(args);
+    }
+
     @GetMapping
     fun list(): List<Map<String, Any>> {
         val args: MutableMap<String, Any> = HashMap()
diff --git a/src/main/java/com/ffii/tsms/modules/data/web/StaffsController.kt b/src/main/java/com/ffii/tsms/modules/data/web/StaffsController.kt
index 2c8dd71..0eebba2 100644
--- a/src/main/java/com/ffii/tsms/modules/data/web/StaffsController.kt
+++ b/src/main/java/com/ffii/tsms/modules/data/web/StaffsController.kt
@@ -50,13 +50,11 @@ class StaffsController(private val staffsService: StaffsService) {
 
     @GetMapping("/combo")
     @Throws(ServletRequestBindingException::class)
-    fun combo(request: HttpServletRequest?): RecordsRes<Map<String, Any>> {
+    fun combo(request: HttpServletRequest?): List<Map<String, Any>> {
         println(request)
-        return RecordsRes<Map<String, Any>>(
-            staffsService.combo(
-                CriteriaArgsBuilder.withRequest(request)
-                    .build()
-            )
+        return staffsService.combo(
+            CriteriaArgsBuilder.withRequest(request)
+            .build()
         )
     }
     @PostMapping("/save")