github-mirrors/No1WMS
1
0
Fork 0
mirror of https://github.com/suhf/No1WMS.git synced 2026-02-04 12:13:24 +09:00
Code Issues Packages Projects Releases Wiki Activity

비밀번호 초기화및 이리저리 수정

Browse Source
This commit is contained in:
Suh
2024-01-25 18:36:21 +09:00
parent 4aeddf2fa1
commit 5fcf22e5e8
4 changed files with 26 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/no1/wms/resetpassword/ResetPasswordController.java
View File

@@ -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);

1
src/main/java/com/no1/wms/resetpassword/ResetPasswordService.java
View File

@@ -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);

30
src/main/resources/mappers/InMapper.xml
View File

@@ -141,21 +141,21 @@
</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>

18
src/main/webapp/WEB-INF/views/resetpassword/list.jsp
View File

@@ -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";