From 0b18e4b0ce991ec670d669f9e6b1f204fe37bfd0 Mon Sep 17 00:00:00 2001
From: TaehunPark <qkrxogns21@gmail.com>
Date: Tue, 30 Aug 2022 14:14:45 +0900
Subject: [PATCH] =?UTF-8?q?fix:=EC=99=B8=EC=82=AC=EA=B2=BD=EC=B0=B0?=
 =?UTF-8?q?=EA=B4=80=EB=A6=AC=20->=20=EC=8A=B9=EC=9D=B8=EB=8C=80=EA=B8=B0?=
 =?UTF-8?q?=EC=9E=91=EC=97=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../faisp/controller/userMgtController.java   |  8 ++-
 .../dbnt/faisp/userInfo/UserInfoService.java  | 21 ++++++-
 .../resources/static/js/userMgt/userMgt.js    | 61 +++++++++++++++----
 .../templates/adminPage/userMgt/userMgt.html  |  1 +
 4 files changed, 76 insertions(+), 15 deletions(-)

diff --git a/src/main/java/com/dbnt/faisp/controller/userMgtController.java b/src/main/java/com/dbnt/faisp/controller/userMgtController.java
index 0dcc1f53..de09b849 100644
--- a/src/main/java/com/dbnt/faisp/controller/userMgtController.java
+++ b/src/main/java/com/dbnt/faisp/controller/userMgtController.java
@@ -35,7 +35,6 @@ public class userMgtController {
     userInfo.setContentCnt(userInfoService.selectUserInfoListCnt(userInfo));
     userInfo.setPaginationInfo();
     mav.addObject("searchParams", userInfo);
-    System.out.println("@@"+userInfo);
     return mav;
   }
   
@@ -54,5 +53,12 @@ public class userMgtController {
 	 int result = userInfoService.updateUserApproval(userInfo);
     return result;
   }
+  
+  @PostMapping("/userCompanion")
+  @ResponseBody
+  public int userCompanion(@RequestBody List<UserInfo> userInfo){
+	 int result = userInfoService.updateUserCompanion(userInfo);
+    return result;
+  }
 
 }
diff --git a/src/main/java/com/dbnt/faisp/userInfo/UserInfoService.java b/src/main/java/com/dbnt/faisp/userInfo/UserInfoService.java
index 65538a9f..4380d04b 100644
--- a/src/main/java/com/dbnt/faisp/userInfo/UserInfoService.java
+++ b/src/main/java/com/dbnt/faisp/userInfo/UserInfoService.java
@@ -76,10 +76,25 @@ public class UserInfoService implements UserDetailsService {
 	 int cnt = 0;
 	for(UserInfo user: userInfo) {
 		UserInfo dbUserInfo = userInfoRepository.findById(user.getUserSeq()).orElse(null);
-		dbUserInfo.setUserStatus(user.getUserStatus());
-		cnt++;
+		if(dbUserInfo != null) {
+			dbUserInfo.setUserStatus(user.getUserStatus());
+			cnt++;
+		}
+	}
+	return cnt;
+  }
+  
+  public int updateUserCompanion(List<UserInfo> userInfo) {
+	int cnt = 0;
+	System.out.println("!!"+userInfo);
+	for(UserInfo user: userInfo) {
+		UserInfo dbUserInfo = userInfoRepository.findById(user.getUserSeq()).orElse(null);
+		if(dbUserInfo != null) {
+			dbUserInfo.setUserStatus(user.getUserStatus());
+			userInfoRepository.save(dbUserInfo);
+			cnt++;
+		}
 	}
 	return cnt;
   }
-
 }
diff --git a/src/main/resources/static/js/userMgt/userMgt.js b/src/main/resources/static/js/userMgt/userMgt.js
index b00822c0..5343ea47 100644
--- a/src/main/resources/static/js/userMgt/userMgt.js
+++ b/src/main/resources/static/js/userMgt/userMgt.js
@@ -32,15 +32,19 @@ $(document).ready( function() {
 });
 
 $(document).on('click', '#approvalBtn', function (){
-	alert("승인")
-	var checkArr = [];
-	$('input:checkbox[name=userChk]:checked').each(function (idx, el){
-      checkArr.push({});
-      const target = $(el);
-      checkArr[idx].userSeq = Number(target.parents('tr').find('.userSeq').val());
-      checkArr[idx].userStatus = "USC003"
+	if(confirm("선택한 대상을 승인처리 하시겠습니까?")){
+	 const checkArr = [];
+		$('input:checkbox[name=userChk]:checked').each(function (idx, el){
+	      checkArr.push({});
+	      const target = $(el);
+	      checkArr[idx].userSeq = Number(target.parents('tr').find('.userSeq').val());
+	      checkArr[idx].userStatus = "USC003"
     })
-	console.log('@@->'+checkArr);
+		userApproval(checkArr);
+	}	
+})
+
+function userApproval(checkArr){
 	$.ajax({
     type : 'POST',
     url : "/userMgt/userApproval",
@@ -50,10 +54,45 @@ $(document).on('click', '#approvalBtn', function (){
       xhr.setRequestHeader($("[name='_csrf_header']").val(), $("[name='_csrf']").val());
     },
     success : function(data) {
-      
+      alert(data+"건이 승인 처리되었습니다.");
+      location.reload();
     },
     error : function(xhr, status) {
-      
+      alert("승인처리에 실패하였습니다");
     }
-  })
+  })	
+}
+
+$(document).on('click', '#companionBtn', function (){
+	if(confirm("선택한 대상을 반려처리 하시겠습니까?")){
+	 const checkArr = [];
+		$('input:checkbox[name=userChk]:checked').each(function (idx, el){
+	      checkArr.push({});
+	      const target = $(el);
+	      checkArr[idx].userSeq = Number(target.parents('tr').find('.userSeq').val());
+	      checkArr[idx].userStatus = "USC005"
+    })
+		userCompanion(checkArr);
+	}	
 })
+
+function userCompanion(checkArr){
+	$.ajax({
+    type : 'POST',
+    url : "/userMgt/userCompanion",
+    data : JSON.stringify(checkArr),
+    contentType: 'application/json',
+    beforeSend: function (xhr){
+      xhr.setRequestHeader($("[name='_csrf_header']").val(), $("[name='_csrf']").val());
+    },
+    success : function(data) {
+      alert(data+"건이 반려 처리되었습니다.");
+      location.reload();
+    },
+    error : function(xhr, status) {
+      alert("반려처리에 실패하였습니다");
+    }
+  })	
+}
+
+	
\ No newline at end of file
diff --git a/src/main/resources/templates/adminPage/userMgt/userMgt.html b/src/main/resources/templates/adminPage/userMgt/userMgt.html
index 9fc10941..c962ec12 100644
--- a/src/main/resources/templates/adminPage/userMgt/userMgt.html
+++ b/src/main/resources/templates/adminPage/userMgt/userMgt.html
@@ -120,6 +120,7 @@
                   </div>
                   <div class="col-auto">
                       <input type="button" class="btn btn-success" value="승인" id="approvalBtn">
+                      <input type="button" class="btn btn-success" value="반려" id="companionBtn">
                   </div>
                   <div class="row justify-content-center">
                     <div class="col-auto">