From 704ea6024361970e2c99f21c12d0f0d88d0f1942 Mon Sep 17 00:00:00 2001
From: zf <1603559716@qq.com>
Date: 星期四, 14 九月 2023 16:00:15 +0800
Subject: [PATCH] 违章
---
exam-system/src/main/java/com/gkhy/exam/noncoalmine/service/impl/WorkRegistrationServiceImpl.java | 37 ++++++++++++++++++++++++-------------
1 files changed, 24 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..2cfd3f6 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,17 +1,20 @@
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.model.vo.WorkRegistrationVO;
import com.gkhy.exam.noncoalmine.service.WorkRegistrationService;
-import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.bean.BeanUtils;
+import com.ruoyi.system.domain.bo.SysOperateTypeWholeNameBO;
+import com.ruoyi.system.service.SysOperateTypeService;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-
-import java.util.Date;
import java.util.List;
+import java.util.stream.Collectors;
/**
* (WorkRegistration)表服务实现类
@@ -20,11 +23,25 @@
* @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;
+ @Autowired
+ private SysOperateTypeService sysOperateTypeService;
@Override
- public List<WorkRegistration> listByPage(WorkRegistration workRegistration) {
- return null;
+ public List<WorkRegistrationVO> listByPage(WorkRegistrationQuery query) {
+ List<WorkRegistration> workRegistrations = workRegistrationMapper.listByPage(query);
+ List<WorkRegistrationVO> list = workRegistrations.stream().map(workRegistration -> {
+ WorkRegistrationVO workRegistrationVO = new WorkRegistrationVO();
+ BeanUtils.copyProperties(workRegistration, workRegistrationVO);
+ SysOperateTypeWholeNameBO operateTypeWholeName = sysOperateTypeService.getOperateTypeWholeNameById(workRegistration.getOperateTypeId());
+ workRegistrationVO.setJobCategory(operateTypeWholeName.getJobCategory());
+ workRegistrationVO.setQualificationType(operateTypeWholeName.getQualificationType());
+ workRegistrationVO.setOperationItems(operateTypeWholeName.getOperationItems());
+ return workRegistrationVO;
+ }).collect(Collectors.toList());
+ return list;
}
/**
@@ -37,10 +54,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 +65,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