diff --git a/src/main/java/cn/edu/cqwu/repair/dao/RecordDao.java b/src/main/java/cn/edu/cqwu/repair/dao/RecordDao.java
index 5d74563..e881d11 100644
--- a/src/main/java/cn/edu/cqwu/repair/dao/RecordDao.java
+++ b/src/main/java/cn/edu/cqwu/repair/dao/RecordDao.java
@@ -3,8 +3,12 @@ package cn.edu.cqwu.repair.dao;
import cn.edu.cqwu.repair.entity.Record;
import cn.edu.cqwu.repair.util.PageModel;
+import java.util.ArrayList;
+
public interface RecordDao {
int add(Record record);
PageModel pageByLogname(String logname, String group, int pageSize, int pageNo);
+
+ public ArrayList findHistoryRecord(String workername);
}
diff --git a/src/main/java/cn/edu/cqwu/repair/dao/WorkerDao.java b/src/main/java/cn/edu/cqwu/repair/dao/WorkerDao.java
index d716f45..d47a431 100644
--- a/src/main/java/cn/edu/cqwu/repair/dao/WorkerDao.java
+++ b/src/main/java/cn/edu/cqwu/repair/dao/WorkerDao.java
@@ -16,4 +16,7 @@ public interface WorkerDao {
int deleteByUserName(String username);
int add(Worker worker);
+
+
+
}
diff --git a/src/main/java/cn/edu/cqwu/repair/dao/impl/RecordDaoImpl.java b/src/main/java/cn/edu/cqwu/repair/dao/impl/RecordDaoImpl.java
index 12fa108..6f3e89d 100644
--- a/src/main/java/cn/edu/cqwu/repair/dao/impl/RecordDaoImpl.java
+++ b/src/main/java/cn/edu/cqwu/repair/dao/impl/RecordDaoImpl.java
@@ -2,14 +2,17 @@ package cn.edu.cqwu.repair.dao.impl;
import cn.edu.cqwu.repair.dao.RecordDao;
import cn.edu.cqwu.repair.db.ConnectionFactory;
+import cn.edu.cqwu.repair.entity.Order;
import cn.edu.cqwu.repair.entity.Record;
import cn.edu.cqwu.repair.entity.mapper.RecordMapper;
import cn.edu.cqwu.repair.util.PageModel;
import com.mybatisflex.core.query.QueryWrapper;
import org.springframework.stereotype.Component;
+import java.util.ArrayList;
import java.util.List;
+import static cn.edu.cqwu.repair.entity.table.OrderTableDef.ORDER;
import static cn.edu.cqwu.repair.entity.table.RecordTableDef.RECORD;
/**
@@ -33,4 +36,11 @@ public class RecordDaoImpl implements RecordDao {
List recordsList = mapper.selectListByQuery(qw);
return new PageModel(pageSize, pageNo, recordsList);
}
+
+ @Override
+ public ArrayList findHistoryRecord(String workername){
+ QueryWrapper qw = new QueryWrapper();
+ qw.select(RECORD.ALL_COLUMNS).where(RECORD.LOGNAME.eq(workername));
+ return (ArrayList) mapper.selectListByQuery(qw);
+ }
}
diff --git a/src/main/java/cn/edu/cqwu/repair/dao/impl/WorkerDaoImpl.java b/src/main/java/cn/edu/cqwu/repair/dao/impl/WorkerDaoImpl.java
index d65e872..1923fcf 100644
--- a/src/main/java/cn/edu/cqwu/repair/dao/impl/WorkerDaoImpl.java
+++ b/src/main/java/cn/edu/cqwu/repair/dao/impl/WorkerDaoImpl.java
@@ -69,4 +69,6 @@ public class WorkerDaoImpl implements WorkerDao {
public int add(Worker worker) {
return MAPPER.insert(worker);
}
+
+
}
diff --git a/src/main/webapp/includes/menu.jsp b/src/main/webapp/includes/menu.jsp
index 06e231a..decd922 100644
--- a/src/main/webapp/includes/menu.jsp
+++ b/src/main/webapp/includes/menu.jsp
@@ -78,7 +78,7 @@
>> 历史维修记录
-
+
>> 历史登录记录
diff --git a/src/main/webapp/worker/worker_fixList.jsp b/src/main/webapp/worker/worker_fixList.jsp
index 0e5af47..72eedd2 100644
--- a/src/main/webapp/worker/worker_fixList.jsp
+++ b/src/main/webapp/worker/worker_fixList.jsp
@@ -112,39 +112,6 @@
-<%----%>
-<%----%>
-
-
diff --git a/src/main/webapp/worker/worker_history_fixList.jsp b/src/main/webapp/worker/worker_history_fixList.jsp
index 37c7553..fb60a4b 100644
--- a/src/main/webapp/worker/worker_history_fixList.jsp
+++ b/src/main/webapp/worker/worker_history_fixList.jsp
@@ -112,41 +112,6 @@
-
-
-<%----%>
-<%----%>
-
-
diff --git a/src/main/webapp/worker/worker_history_loginList.jsp b/src/main/webapp/worker/worker_history_loginList.jsp
index 14ef283..5cfd238 100644
--- a/src/main/webapp/worker/worker_history_loginList.jsp
+++ b/src/main/webapp/worker/worker_history_loginList.jsp
@@ -2,15 +2,70 @@
Created by IntelliJ IDEA.
User: sobear
Date: 2024/5/12
- Time: 21:44
+ Time: 21:41
To change this template use File | Settings | File Templates.
--%>
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
+<%@ page isELIgnored="false" %>
+