From 5fcf22e5e83ca3ef30be704eded5af4a833c3dcc Mon Sep 17 00:00:00 2001
From: Suh <enjoylife727@gmail.com>
Date: Thu, 25 Jan 2024 18:36:21 +0900
Subject: [PATCH] =?UTF-8?q?=EB=B9=84=EB=B0=80=EB=B2=88=ED=98=B8=20?=
 =?UTF-8?q?=EC=B4=88=EA=B8=B0=ED=99=94=EB=B0=8F=20=EC=9D=B4=EB=A6=AC?=
 =?UTF-8?q?=EC=A0=80=EB=A6=AC=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ResetPasswordController.java              |  3 +-
 .../resetpassword/ResetPasswordService.java   |  1 -
 src/main/resources/mappers/InMapper.xml       | 32 +++++++++----------
 .../WEB-INF/views/resetpassword/list.jsp      | 18 +++++------
 4 files changed, 26 insertions(+), 28 deletions(-)

diff --git a/src/main/java/com/no1/wms/resetpassword/ResetPasswordController.java b/src/main/java/com/no1/wms/resetpassword/ResetPasswordController.java
index 143527c..d9139c4 100644
--- a/src/main/java/com/no1/wms/resetpassword/ResetPasswordController.java
+++ b/src/main/java/com/no1/wms/resetpassword/ResetPasswordController.java
@@ -39,7 +39,6 @@ public class ResetPasswordController {
         List<Map<String, Object>> dto = resetPasswordService.list(searchn, search, startRow ,perPage);
 
         m.addAttribute("rlist", dto);
-
         m.addAttribute("start", startRow + 1);
 
         int pageNum = 5;//보여질 페이지 번호 수
@@ -74,6 +73,7 @@ public class ResetPasswordController {
     @DeleteMapping("/delete")
     @ResponseBody
     public int delete(ResetPasswordDto dto){
+        System.out.println(dto);
         int i = resetPasswordService.delete(dto);
 
         return i;
@@ -82,6 +82,7 @@ public class ResetPasswordController {
     @PutMapping("/update")
     @ResponseBody
     public boolean update(ResetPasswordDto dto) throws NoSuchAlgorithmException {
+        System.out.println(dto);
         AccountDto accountDto = new AccountDto();
         accountDto.setId(dto.getAccountId());
         accountDto = accountService.selectById(accountDto);
diff --git a/src/main/java/com/no1/wms/resetpassword/ResetPasswordService.java b/src/main/java/com/no1/wms/resetpassword/ResetPasswordService.java
index 1aa9174..2e935fd 100644
--- a/src/main/java/com/no1/wms/resetpassword/ResetPasswordService.java
+++ b/src/main/java/com/no1/wms/resetpassword/ResetPasswordService.java
@@ -24,7 +24,6 @@ public class ResetPasswordService {
 
     public List<Map<String, Object>> list(int searchn, String search, int start, int perPage){
 
-        System.out.println(searchn+search);
 
         Map<String, Object> m = new HashMap<String, Object>();
         m.put("searchn",searchn);
diff --git a/src/main/resources/mappers/InMapper.xml b/src/main/resources/mappers/InMapper.xml
index 2c15a48..feffd73 100644
--- a/src/main/resources/mappers/InMapper.xml
+++ b/src/main/resources/mappers/InMapper.xml
@@ -139,23 +139,23 @@
 	    </where>
 	    	ORDER BY proin.in_date desc LIMIT #{start} , #{perPage}
 	</select>
-	
+
 	<select id="inListMain" parameterType="map" resultMap="inResultMap">
-	    SELECT 
-	        proin.id, proin.group_number, proin.product_id, proin.in_date, proin.quantity, proin.warehouse_id, proin.manager_id, proin.note, proin.activation,
-	        planin.view_group_number,
-	        pro.name as product_name, 
-	        w.name as warehouse_name,
-	        a.name as account_name,
-	        (SELECT price FROM prices WHERE product_id = proin.product_id ORDER BY registration_date DESC LIMIT 1) as latest_price
-	    FROM 
-	        product_in as proin 
-	        LEFT JOIN plan_In as planin on proin.group_number = planin.group_number and proin.product_id = planin.product_id
-	        LEFT JOIN product as pro on proin.product_id = pro.id
-	        LEFT JOIN warehouse as w on proin.warehouse_id = w.id
-	        LEFT JOIN account as a on proin.manager_id = a.id
-	    WHERE proin.in_date = #{today} and proin.activation = 1
-	    ORDER BY proin.in_date desc LIMIT 5
+		SELECT
+			proin.id, proin.group_number, proin.product_id, proin.in_date, proin.quantity, proin.warehouse_id, proin.manager_id, proin.note, proin.activation,
+			planin.view_group_number,
+			pro.name as product_name,
+			w.name as warehouse_name,
+			a.name as account_name,
+			(SELECT price FROM prices WHERE product_id = proin.product_id ORDER BY registration_date DESC LIMIT 1) as latest_price
+		FROM
+			product_in as proin
+				LEFT JOIN plan_In as planin on proin.group_number = planin.group_number and proin.product_id = planin.product_id
+				LEFT JOIN product as pro on proin.product_id = pro.id
+				LEFT JOIN warehouse as w on proin.warehouse_id = w.id
+				LEFT JOIN account as a on proin.manager_id = a.id
+		WHERE proin.in_date LIKE CONCAT(#{today},'%') and proin.activation = 1
+		ORDER BY proin.in_date desc LIMIT 5
 	</select>
 	
 	
diff --git a/src/main/webapp/WEB-INF/views/resetpassword/list.jsp b/src/main/webapp/WEB-INF/views/resetpassword/list.jsp
index f3e45a8..2085f8d 100644
--- a/src/main/webapp/WEB-INF/views/resetpassword/list.jsp
+++ b/src/main/webapp/WEB-INF/views/resetpassword/list.jsp
@@ -57,13 +57,10 @@
                             <td class="col-1">${dto.email }</td>
                             <td class="col-1">${dto.note }</td>
                             <td class="col-1">
-                                <button type="button" class="btn btn-primary" data-resetpassword="${dto.id}"
-                                        id="resetpassword">확인
+                                <button type="button" class="resetpassword btn btn-primary" data-accountid='${dto.account_id}' data-resetpassword="${dto.id}">확인
                                 </button>
-                                <button type="button" class="btn btn-warning" data-resetpasswordDelete="${dto.id}"
-                                        id="resetpasswordDelete">취소
+                                <button type="button"  class="resetpasswordDelete btn btn-warning" data-id="${dto.id}">취소
                                 </button>
-                                <input type="hidden" id="id" value="${dto.id}"/>
                             </td>
                         </tr>
                     </c:forEach>
@@ -112,13 +109,15 @@
 <script>
 
     $(document).ready(function () {
-        $("#resetpassword").on("click", function(){
-            var id = $("#id").val();
+        $(".resetpassword").on("click", function(event){
+            var id = $(event.currentTarget).data("resetpassword");
+            const accountId = $(event.currentTarget).data("accountid");
             $.ajax({
                 url: "/resetpassword/update",
                 type: "put",
                 data: {
                     "id": id,
+                    "accountId" :    accountId
                 },
                 datatype:"json"
             }).done(function (data) {
@@ -146,8 +145,8 @@
             });
         });
 
-        $("#resetpasswordDelete").on("click", function(){
-            var id = $("#id").val();
+        $(".resetpasswordDelete").on("click", function(event){
+            var id = $(event.currentTarget).data("id");
             $.ajax({
                 url: "/resetpassword/delete",
                 type: "delete",
@@ -157,7 +156,6 @@
                 datatype:"json"
             }).done(function (data) {
                 if (data == true) {
-                    alert("요청을 거절하였습니다.");
                     var form = document.createElement("form");
                     form.action = "/resetpassword/list";
                     form.method = "get";