From ef56f943f7c056c2debe8980c8d346d00d2b163e Mon Sep 17 00:00:00 2001
From: zf <1603559716@qq.com>
Date: 星期二, 12 九月 2023 17:22:24 +0800
Subject: [PATCH] 违章

---
 exam-system/src/main/java/com/gkhy/exam/noncoalmine/service/impl/WorkRegistrationServiceImpl.java |   25 ++++++++++++-------------
 1 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/exam-system/src/main/java/com/gkhy/exam/noncoalmine/service/impl/WorkRegistrationServiceImpl.java b/exam-system/src/main/java/com/gkhy/exam/noncoalmine/service/impl/WorkRegistrationServiceImpl.java
index d10b6fe..3df6821 100644
--- a/exam-system/src/main/java/com/gkhy/exam/noncoalmine/service/impl/WorkRegistrationServiceImpl.java
+++ b/exam-system/src/main/java/com/gkhy/exam/noncoalmine/service/impl/WorkRegistrationServiceImpl.java
@@ -1,16 +1,15 @@
 package com.gkhy.exam.noncoalmine.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gkhy.exam.noncoalmine.mapper.WorkRegistrationDao;
 import com.gkhy.exam.noncoalmine.entity.WorkRegistration;
+import com.gkhy.exam.noncoalmine.mapper.WorkRegistrationMapper;
 import com.gkhy.exam.noncoalmine.model.addForm.WorkRegistrationAddForm;
 import com.gkhy.exam.noncoalmine.model.modForm.WorkRegistrationModForm;
+import com.gkhy.exam.noncoalmine.model.query.WorkRegistrationQuery;
 import com.gkhy.exam.noncoalmine.service.WorkRegistrationService;
-import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.bean.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-
-import java.util.Date;
 import java.util.List;
 
 /**
@@ -20,11 +19,17 @@
  * @since 2023-09-11 16:59:58
  */
 @Service("workRegistrationService")
-public class WorkRegistrationServiceImpl extends ServiceImpl<WorkRegistrationDao, WorkRegistration> implements WorkRegistrationService {
+public class WorkRegistrationServiceImpl extends ServiceImpl<WorkRegistrationMapper, WorkRegistration> implements WorkRegistrationService {
+	@Autowired
+	private WorkRegistrationMapper workRegistrationMapper;
 
 	@Override
-	public List<WorkRegistration> listByPage(WorkRegistration workRegistration) {
-		return null;
+	public List<WorkRegistration> listByPage(WorkRegistrationQuery query) {
+		List<WorkRegistration> workRegistrations = workRegistrationMapper.listByPage(query);
+//		workRegistrations.stream().map(workRegistration -> {
+//
+//		}).collect(Collectors.toList());
+		return workRegistrations;
 	}
 
 	/**
@@ -37,10 +42,6 @@
 		WorkRegistration workRegistration = new WorkRegistration();
 		BeanUtils.copyProperties(addForm,workRegistration);
 		workRegistration.setDelFlag((byte) 0);
-		workRegistration.setCreateBy(SecurityUtils.getUsername());
-		workRegistration.setCreateTime(new Date());
-		workRegistration.setUpdateBy(SecurityUtils.getUsername());
-		workRegistration.setUpdateTime(new Date());
 		return baseMapper.insert(workRegistration);
 	}
 	/**
@@ -52,8 +53,6 @@
 	public int mod(WorkRegistrationModForm modForm) {
 		WorkRegistration workRegistration = new WorkRegistration();
 		BeanUtils.copyProperties(modForm,workRegistration);
-		workRegistration.setUpdateBy(SecurityUtils.getUsername());
-		workRegistration.setUpdateTime(new Date());
 		return baseMapper.updateById(workRegistration);
 	}
 }

--
Gitblit v1.9.2