diff --git a/src/main/java/io/company/localhost/controller/api/BoardController.java b/src/main/java/io/company/localhost/controller/api/BoardController.java index 50b7a7e..ca78e51 100644 --- a/src/main/java/io/company/localhost/controller/api/BoardController.java +++ b/src/main/java/io/company/localhost/controller/api/BoardController.java @@ -298,7 +298,7 @@ public class BoardController { */ @GetMapping("/categories") public ApiResponse> getCategories() { - List categories = commoncodService.getCategoryList(); + List categories = commoncodService.selectCategoryList(); return ApiResponse.ok(categories); } } \ No newline at end of file diff --git a/src/main/java/io/company/localhost/controller/api/ProjectController.java b/src/main/java/io/company/localhost/controller/api/ProjectController.java index 6faad73..ed8bdc1 100644 --- a/src/main/java/io/company/localhost/controller/api/ProjectController.java +++ b/src/main/java/io/company/localhost/controller/api/ProjectController.java @@ -54,8 +54,8 @@ public class ProjectController { */ @ParameterCheck @GetMapping("/yearCategory") - public ApiResponse> getYearCategories() { - List yearCategory = commoncodservice.getYearCategories(); + public ApiResponse> selectYearCategories() { + List yearCategory = commoncodservice.selectYearCategories(); return ApiResponse.ok(yearCategory); } @@ -109,8 +109,22 @@ public class ProjectController { */ @ParameterCheck @GetMapping("/members/{projctSeq}") - public ApiResponse> getProjectMembers(@PathVariable int projctSeq) { + public ApiResponse> selectProjectMembers(@PathVariable int projctSeq) { return ApiResponse.ok(netprojctService.getProjectMembers(projctSeq)); } + + /** + * 프로젝트 log 조회 + * + * * @return ApiResponse> + * + */ + @ParameterCheck + @GetMapping("/log/{projctSeq}") + public ApiResponse> selectProjectLog(@PathVariable int projctSeq) { + + return ApiResponse.ok(netprojctService.selectProjectLog(projctSeq)); + } + } diff --git a/src/main/java/io/company/localhost/controller/api/worddictController.java b/src/main/java/io/company/localhost/controller/api/worddictController.java index 8d9d4e2..378912e 100644 --- a/src/main/java/io/company/localhost/controller/api/worddictController.java +++ b/src/main/java/io/company/localhost/controller/api/worddictController.java @@ -73,7 +73,7 @@ public class worddictController { @ParameterCheck @GetMapping("getWordCategory") public ApiResponse> getWordCategory() { - List WordCategoryList = commoncodservice.getWordCategory(); + List WordCategoryList = commoncodservice.selectWordCategory(); return ApiResponse.ok(WordCategoryList); } /** diff --git a/src/main/java/io/company/localhost/controller/common/UserController.java b/src/main/java/io/company/localhost/controller/common/UserController.java index 25e1185..5dd9790 100644 --- a/src/main/java/io/company/localhost/controller/common/UserController.java +++ b/src/main/java/io/company/localhost/controller/common/UserController.java @@ -71,8 +71,8 @@ public class UserController { */ @ParameterCheck @GetMapping("/color") - public ApiResponse> getColorList(String type) { - List ColorList = commoncodservice.getColorList(type); + public ApiResponse> selectColorList(String type) { + List ColorList = commoncodservice.selectColorList(type); return ApiResponse.ok(ColorList); } @@ -84,8 +84,8 @@ public class UserController { */ @ParameterCheck @GetMapping("/mbti") - public ApiResponse> getMbtiList() { - List MbtiList = commoncodservice.getMbtiList(); + public ApiResponse> selectMbtiList() { + List MbtiList = commoncodservice.selectMbtiList(); return ApiResponse.ok(MbtiList); } @@ -97,8 +97,8 @@ public class UserController { */ @ParameterCheck @GetMapping("/pwhint") - public ApiResponse> getPwhintList() { - List PwhintList = commoncodservice.getPwhintList(); + public ApiResponse> selectPwhintList() { + List PwhintList = commoncodservice.selectPwhintList(); return ApiResponse.ok(PwhintList); } diff --git a/src/main/java/io/company/localhost/mapper/NetmemberMapper.java b/src/main/java/io/company/localhost/mapper/NetmemberMapper.java index 4849b6e..4f764b3 100644 --- a/src/main/java/io/company/localhost/mapper/NetmemberMapper.java +++ b/src/main/java/io/company/localhost/mapper/NetmemberMapper.java @@ -39,5 +39,4 @@ public interface NetmemberMapper { int updatePassword(MapDto map); List getallUserList(); - } diff --git a/src/main/java/io/company/localhost/mapper/NetprojctMapper.java b/src/main/java/io/company/localhost/mapper/NetprojctMapper.java index b2d2a2b..5715d9b 100644 --- a/src/main/java/io/company/localhost/mapper/NetprojctMapper.java +++ b/src/main/java/io/company/localhost/mapper/NetprojctMapper.java @@ -32,4 +32,6 @@ public interface NetprojctMapper { int updateProjectMember(MapDto map); List selectProjectMembers(int projctSeq); + + List selectProjectLog(int projctSeq); } diff --git a/src/main/java/io/company/localhost/service/NetprojctService.java b/src/main/java/io/company/localhost/service/NetprojctService.java index de6246b..e784125 100644 --- a/src/main/java/io/company/localhost/service/NetprojctService.java +++ b/src/main/java/io/company/localhost/service/NetprojctService.java @@ -87,6 +87,16 @@ public class NetprojctService { public List getProjectMembers(int projctSeq) { return netprojctMapper.selectProjectMembers(projctSeq); } + + /** + * 프로젝트 log 조회 + * + * @param + * @return + */ + public List selectProjectLog(int projctSeq) { + return netprojctMapper.selectProjectLog(projctSeq); + } } diff --git a/src/main/java/io/company/localhost/service/commoncodService.java b/src/main/java/io/company/localhost/service/commoncodService.java index 971528a..c2d0965 100644 --- a/src/main/java/io/company/localhost/service/commoncodService.java +++ b/src/main/java/io/company/localhost/service/commoncodService.java @@ -28,7 +28,7 @@ public class commoncodService { private final commoncodMapper commoncodmapper; - public List getWordCategory() { + public List selectWordCategory() { return commoncodmapper.getWordCategory(); } @@ -36,23 +36,23 @@ public class commoncodService { return commoncodmapper.insertCategory(map); } - public List getColorList(String type) { + public List selectColorList(String type) { return commoncodmapper.getColorList(type); } - public List getMbtiList() { + public List selectMbtiList() { return commoncodmapper.getMbtiList(); } - public List getYearCategories() { + public List selectYearCategories() { return commoncodmapper.getYearCategories(); } - public List getPwhintList() { + public List selectPwhintList() { return commoncodmapper.getPwhintList(); } - public List getCategoryList() { + public List selectCategoryList() { return commoncodmapper.getCategories(); } } diff --git a/src/main/resources/mapper/commoncodMapper.xml b/src/main/resources/mapper/commoncodMapper.xml index 4ea7ffc..adf3726 100644 --- a/src/main/resources/mapper/commoncodMapper.xml +++ b/src/main/resources/mapper/commoncodMapper.xml @@ -30,7 +30,7 @@ CMNCODLV1 = 600; - SELECT CMNCODVAL ,CMNCODNAM @@ -48,7 +48,7 @@ - SELECT CMNCODVAL ,CMNCODNAM @@ -60,7 +60,7 @@ CMNCODODR != 0 - SELECT CMNCODVAL ,CMNCODNAM @@ -84,12 +84,24 @@ WHERE CMNCODVAL = #{color}; + + UPDATE commoncod + SET + + CMNCODYON = 0 + + + CMNCODYNP = 0 + + WHERE CMNCODVAL = #{color}; + + - SELECT CMNCODVAL ,CMNCODNAM diff --git a/src/main/resources/mapper/netprojctMapper.xml b/src/main/resources/mapper/netprojctMapper.xml index 0584d0e..26ab72f 100644 --- a/src/main/resources/mapper/netprojctMapper.xml +++ b/src/main/resources/mapper/netprojctMapper.xml @@ -4,9 +4,13 @@ @@ -63,5 +67,19 @@ WHERE pm.PROJCTSEQ = #{projctSeq} + + +