From 358e12a2225270badfa00a31ebd5c55d41cfeead Mon Sep 17 00:00:00 2001
From: khj0414 <khj0414@local-host.co.kr>
Date: Mon, 3 Feb 2025 15:09:30 +0900
Subject: [PATCH 1/4] =?UTF-8?q?=EC=9C=A0=EC=A0=80=20=EB=AA=A9=EB=A1=9D=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/common/UserController.java      | 11 +++++++----
 src/main/resources/mapper/netmemberMapper.xml  | 18 ++++++++++++------
 2 files changed, 19 insertions(+), 10 deletions(-)

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 604463e..5ee4e07 100644
--- a/src/main/java/io/company/localhost/controller/common/UserController.java
+++ b/src/main/java/io/company/localhost/controller/common/UserController.java
@@ -206,13 +206,16 @@ public class UserController {
      */
     @ParameterCheck
     @GetMapping("/allUserList")
-    public ApiResponse<List<MapDto>> getallUserList() {
+    public ApiResponse<MapDto> getallUserList() {
         List<MapDto> allUserList = netmemberservice.getallUserList();
-        return ApiResponse.ok(allUserList);
+    	MemberVo user = AuthUtil.getUser();
+    	
+    	MapDto outData = new MapDto();
+    	outData.put("allUserList", allUserList);
+    	outData.put("user", user);
+        return ApiResponse.ok(outData);
     }
 
- 
-
 	@Guest
 	@GetMapping("get1")
 	public ApiResponse<?> getAuthTest1() {
diff --git a/src/main/resources/mapper/netmemberMapper.xml b/src/main/resources/mapper/netmemberMapper.xml
index e79edec..25c68d5 100644
--- a/src/main/resources/mapper/netmemberMapper.xml
+++ b/src/main/resources/mapper/netmemberMapper.xml
@@ -94,17 +94,23 @@
 	    FROM netmember
 	    WHERE MEMBERIDS = #{memberIds}
 	</select>
-	
+	<!-- 전체 회원 목록 -->
 	<select id="getallUserList" resultType="Map">
-		SELECT *
+		SELECT 
+			m.*
+			,c.CMNCODNAM usercolor
 		FROM 
-			netmember
+			netmember m
+		left join 
+			commoncod c 
+		on 
+			M.MEMBERCOL = C.CMNCODVAL 
 		WHERE 
-			MEMBERDEL = "N"
+			m.MEMBERDEL = "N"
 		AND 
-			MEMBERPRM = "Y"
+			m.MEMBERPRM = "Y"
 		AND 
-			MEMBERLEA ="N"
+			m.MEMBERLEA ="N"
 	</select>
 
 

From 849b99e475d26b3c63d7734b31920791491450a4 Mon Sep 17 00:00:00 2001
From: dyhj625 <dyhj625@local-host.co.kr>
Date: Mon, 3 Feb 2025 15:33:02 +0900
Subject: [PATCH 2/4] =?UTF-8?q?=EB=B3=B4=EB=93=9C=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../localhost/controller/api/BoardController.java  | 14 +++++++++++++-
 .../controller/api/VacationController.java         | 12 ++++--------
 .../company/localhost/mapper/commoncodMapper.java  |  2 ++
 .../company/localhost/mapper/localvacaMapper.java  |  2 +-
 .../localhost/service/commoncodService.java        |  5 ++++-
 .../localhost/service/localbordService.java        |  2 +-
 .../localhost/service/localvacaService.java        |  8 ++++----
 src/main/resources/mapper/commoncodMapper.xml      |  5 +++++
 src/main/resources/mapper/localbordMapper.xml      |  2 +-
 src/main/resources/mapper/localvacaMapper.xml      |  2 +-
 10 files changed, 36 insertions(+), 18 deletions(-)

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 d545e55..3cb1643 100644
--- a/src/main/java/io/company/localhost/controller/api/BoardController.java
+++ b/src/main/java/io/company/localhost/controller/api/BoardController.java
@@ -27,6 +27,7 @@ import io.company.localhost.common.annotation.ParameterCheck;
 import io.company.localhost.common.annotation.ReqMap;
 import io.company.localhost.common.dto.ApiResponse;
 import io.company.localhost.common.dto.MapDto;
+import io.company.localhost.service.commoncodService;
 import io.company.localhost.service.localbordService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -38,6 +39,7 @@ import lombok.extern.slf4j.Slf4j;
 public class BoardController {
 
     private final localbordService boardService;
+    private final commoncodService commoncodService;
 
     /**
      * 공지사항 목록 조회
@@ -74,7 +76,7 @@ public class BoardController {
     @PostMapping
     public ApiResponse<BigInteger> createBoard(@ReqMap MapDto map) {
     	//임시
-    	 map.put("MEMBERSEQ", 1);
+    	map.put("MEMBERSEQ", 1);
         return ApiResponse.ok(boardService.createBoard(map));
     }
 
@@ -230,4 +232,14 @@ public class BoardController {
     public ApiResponse<Boolean> checkBoardPassword(@PathVariable("boardId") int boardId, @ReqMap MapDto map) {
         return ApiResponse.ok(boardService.getBoardPassword(boardId).equals(map.getString("LOCBRDPWD")));
     }
+    
+    /**
+     * 카테고리 목록 조회
+     * @return 카테고리 리스트
+     */
+    @GetMapping("/categories")
+    public ApiResponse<List<MapDto>> getCategories() {
+        List<MapDto> categories = commoncodService.getCategoryList();
+        return ApiResponse.ok(categories);
+    }
 }
\ No newline at end of file
diff --git a/src/main/java/io/company/localhost/controller/api/VacationController.java b/src/main/java/io/company/localhost/controller/api/VacationController.java
index 60dda49..e8d110a 100644
--- a/src/main/java/io/company/localhost/controller/api/VacationController.java
+++ b/src/main/java/io/company/localhost/controller/api/VacationController.java
@@ -23,13 +23,9 @@ public class VacationController {
     private final localvacaService localVacaService;
 
     @PostMapping
-    public ApiResponse<String> saveVacations(@RequestBody List<MapDto> vacationRequests) {
-        // 요청 데이터 유효성 검사
-    if (vacationRequests == null || vacationRequests.isEmpty()) {
-        throw new IllegalArgumentException("휴가 요청 데이터가 비어 있습니다.");
-    }
+    public ApiResponse<String> saveVacations(@RequestBody List<MapDto> map) {
 
-    for (MapDto request : vacationRequests) {
+    for (MapDto request : map) {
         // 각 요청 데이터의 필수 값 검증
         Integer employeeId = (Integer) request.get("employeeId");
         String date = request.getString("date");
@@ -51,10 +47,10 @@ public class VacationController {
      * 휴가 정보를 조회하여 프론트엔드로 전달
      */
     @GetMapping("/list")
-    public ApiResponse<List<MapDto>> getVacationList() {
+    public ApiResponse<List<MapDto>> getVacationList(@ReqMap MapDto map) {
 
         // 서비스 호출을 통해 데이터 조회
-        List<MapDto> vacationList = localVacaService.getVacationList();
+        List<MapDto> vacationList = localVacaService.getVacationList(map);
 
         return ApiResponse.ok(vacationList);
     }
diff --git a/src/main/java/io/company/localhost/mapper/commoncodMapper.java b/src/main/java/io/company/localhost/mapper/commoncodMapper.java
index 46255a6..daf7eea 100644
--- a/src/main/java/io/company/localhost/mapper/commoncodMapper.java
+++ b/src/main/java/io/company/localhost/mapper/commoncodMapper.java
@@ -32,4 +32,6 @@ public interface commoncodMapper {
 	List<MapDto> getMbtiList();
 	
 	int updateColorYon(String color);
+	
+	List<MapDto> getCategories();
 }
diff --git a/src/main/java/io/company/localhost/mapper/localvacaMapper.java b/src/main/java/io/company/localhost/mapper/localvacaMapper.java
index b6bca47..21bb469 100644
--- a/src/main/java/io/company/localhost/mapper/localvacaMapper.java
+++ b/src/main/java/io/company/localhost/mapper/localvacaMapper.java
@@ -12,7 +12,7 @@ import io.company.localhost.common.dto.MapDto;
 public interface localvacaMapper {
     void insertVacation(MapDto map);
     
-    List<MapDto> findVacations();
+    List<MapDto> findVacations(MapDto map);
 }
 
 
diff --git a/src/main/java/io/company/localhost/service/commoncodService.java b/src/main/java/io/company/localhost/service/commoncodService.java
index 2db79e1..2ea168b 100644
--- a/src/main/java/io/company/localhost/service/commoncodService.java
+++ b/src/main/java/io/company/localhost/service/commoncodService.java
@@ -43,6 +43,9 @@ public class commoncodService {
 	public List<MapDto> getMbtiList() {
 		return commoncodmapper.getMbtiList();
 	}
-
+	
+	public List<MapDto> getCategoryList() {
+        return commoncodmapper.getCategories();
+    }
 
 }
diff --git a/src/main/java/io/company/localhost/service/localbordService.java b/src/main/java/io/company/localhost/service/localbordService.java
index 71e4b77..5e28d64 100644
--- a/src/main/java/io/company/localhost/service/localbordService.java
+++ b/src/main/java/io/company/localhost/service/localbordService.java
@@ -33,7 +33,7 @@ public class localbordService {
 
     public PageInfo<MapDto> getGeneralPosts(MapDto map) {
         int page = map.getString("page") != null ? Integer.parseInt(map.getString("page")) : 1;
-        int size = map.getString("size") != null ? Integer.parseInt(map.getString("size")) : 10;
+        int size = map.getString("size") != null ? Integer.parseInt(map.getString("size")) : 12;
 
         String orderBy = map.getString("orderBy");
         if (orderBy == null || (!orderBy.equals("date") && !orderBy.equals("views"))) {
diff --git a/src/main/java/io/company/localhost/service/localvacaService.java b/src/main/java/io/company/localhost/service/localvacaService.java
index 91086c3..b932f60 100644
--- a/src/main/java/io/company/localhost/service/localvacaService.java
+++ b/src/main/java/io/company/localhost/service/localvacaService.java
@@ -14,12 +14,12 @@ public class localvacaService {
     private final localvacaMapper localvacaMapper;
 
 
-    public void insertVacation(MapDto vacationRequest) {
-    	localvacaMapper.insertVacation(vacationRequest);
+    public void insertVacation(MapDto map) {
+    	localvacaMapper.insertVacation(map);
     }
     
-    public List<MapDto> getVacationList() {
-        return localvacaMapper.findVacations();
+    public List<MapDto> getVacationList(MapDto map) {
+        return localvacaMapper.findVacations(map);
     }
     
 }
diff --git a/src/main/resources/mapper/commoncodMapper.xml b/src/main/resources/mapper/commoncodMapper.xml
index 710c47e..a4c7c92 100644
--- a/src/main/resources/mapper/commoncodMapper.xml
+++ b/src/main/resources/mapper/commoncodMapper.xml
@@ -62,5 +62,10 @@
 	    WHERE CMNCODVAL = #{color};
 	</update>
 	
+	<select id="getCategories" resultType="Map">
+		SELECT CMNCODVAL, CMNCODNAM FROM commoncod
+		WHERE CMNCODVAL BETWEEN 300101 AND 300103
+	</select>
+	
 
 </mapper>
diff --git a/src/main/resources/mapper/localbordMapper.xml b/src/main/resources/mapper/localbordMapper.xml
index 7d451c4..de7e078 100644
--- a/src/main/resources/mapper/localbordMapper.xml
+++ b/src/main/resources/mapper/localbordMapper.xml
@@ -62,7 +62,7 @@
 	
 	<!-- 게시물 상세정보 조회 -->
     <select id="selectBoardDetail" resultType="io.company.localhost.common.dto.MapDto">
-        SELECT LOCBRDSEQ AS id, LOCBRDTTL AS title, LOCBRDCON AS content, LOCBRDUDT AS date, LOCBRDTYP AS type
+        SELECT LOCBRDSEQ AS id, LOCBRDTTL AS title, LOCBRDCON AS content, LOCBRDUDT AS date, LOCBRDTYP AS type, LOCBRDCNT AS cnt
         FROM localbord
         WHERE LOCBRDSEQ = #{boardId}
     </select>
diff --git a/src/main/resources/mapper/localvacaMapper.xml b/src/main/resources/mapper/localvacaMapper.xml
index a926273..6138a15 100644
--- a/src/main/resources/mapper/localvacaMapper.xml
+++ b/src/main/resources/mapper/localvacaMapper.xml
@@ -9,7 +9,7 @@
     </insert>
     
     <!-- 직원 ID로 휴가 정보 조회 -->
-    <select id="findVacationsByEmployeeId" parameterType="int" resultType="map">
+    <select id="findVacations" parameterType="io.company.localhost.common.dto.MapDto">
         SELECT 
             MEMBERSEQ
             LOCVACUDT,

From 50d3787a69a4e6dd42b1249ad7f22b12efcb30dc Mon Sep 17 00:00:00 2001
From: dyhj625 <dyhj625@local-host.co.kr>
Date: Mon, 3 Feb 2025 16:16:46 +0900
Subject: [PATCH 3/4] =?UTF-8?q?=EA=B3=B5=ED=86=B5=EC=BD=94=EB=93=9C?=
 =?UTF-8?q?=EC=82=AC=EC=9A=A9=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/mapper/localbordMapper.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/mapper/localbordMapper.xml b/src/main/resources/mapper/localbordMapper.xml
index de7e078..9230de1 100644
--- a/src/main/resources/mapper/localbordMapper.xml
+++ b/src/main/resources/mapper/localbordMapper.xml
@@ -11,7 +11,7 @@
             LOCBRDUDT AS date,
             LOCBRDCNT AS cnt
         FROM localbord
-        WHERE LOCBRDTYP = 'N'
+        WHERE LOCBRDTYP = '300103'
         <if test="searchKeyword != null and searchKeyword != ''">
 	        AND LOCBRDTTL LIKE CONCAT('%', #{searchKeyword}, '%')
 	      </if>
@@ -27,7 +27,7 @@
 	        LOCBRDUDT AS date,
 	        LOCBRDCNT AS cnt
 	    FROM localbord
-	    WHERE LOCBRDTYP IN ('F', 'S')
+	    WHERE LOCBRDTYP IN ('300101', '300102')
 	      <if test="searchKeyword != null and searchKeyword != ''">
 	        AND LOCBRDTTL LIKE CONCAT('%', #{searchKeyword}, '%')
 	      </if>

From 7dea6891650339b7a03511516f7f62481815091d Mon Sep 17 00:00:00 2001
From: dyhj625 <dyhj625@local-host.co.kr>
Date: Tue, 4 Feb 2025 16:08:03 +0900
Subject: [PATCH 4/4] =?UTF-8?q?=EA=B2=8C=EC=8B=9C=ED=8C=90=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/io/company/localhost/service/localbordService.java   | 3 ++-
 src/main/resources/mapper/localvacaMapper.xml                 | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main/java/io/company/localhost/service/localbordService.java b/src/main/java/io/company/localhost/service/localbordService.java
index 5e28d64..7e6550a 100644
--- a/src/main/java/io/company/localhost/service/localbordService.java
+++ b/src/main/java/io/company/localhost/service/localbordService.java
@@ -32,8 +32,9 @@ public class localbordService {
     }
 
     public PageInfo<MapDto> getGeneralPosts(MapDto map) {
+    	System.out.println(map);
         int page = map.getString("page") != null ? Integer.parseInt(map.getString("page")) : 1;
-        int size = map.getString("size") != null ? Integer.parseInt(map.getString("size")) : 12;
+        int size = map.getString("size") != null ? Integer.parseInt(map.getString("size")) : 10;
 
         String orderBy = map.getString("orderBy");
         if (orderBy == null || (!orderBy.equals("date") && !orderBy.equals("views"))) {
diff --git a/src/main/resources/mapper/localvacaMapper.xml b/src/main/resources/mapper/localvacaMapper.xml
index 6138a15..e4b4694 100644
--- a/src/main/resources/mapper/localvacaMapper.xml
+++ b/src/main/resources/mapper/localvacaMapper.xml
@@ -8,10 +8,10 @@
         VALUES (#{employeeId}, #{date}, #{type}, NOW())
     </insert>
     
-    <!-- 직원 ID로 휴가 정보 조회 -->
+    <!-- 휴가 정보 조회 -->
     <select id="findVacations" parameterType="io.company.localhost.common.dto.MapDto">
         SELECT 
-            MEMBERSEQ
+            MEMBERSEQ,
             LOCVACUDT,
             LOCVACTYP
         FROM