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 | 22 +++++++++++++++++-----
1 files changed, 17 insertions(+), 5 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 3df6821..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
@@ -6,11 +6,15 @@
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.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.List;
+import java.util.stream.Collectors;
/**
* (WorkRegistration)表服务实现类
@@ -22,14 +26,22 @@
public class WorkRegistrationServiceImpl extends ServiceImpl<WorkRegistrationMapper, WorkRegistration> implements WorkRegistrationService {
@Autowired
private WorkRegistrationMapper workRegistrationMapper;
+ @Autowired
+ private SysOperateTypeService sysOperateTypeService;
@Override
- public List<WorkRegistration> listByPage(WorkRegistrationQuery query) {
+ public List<WorkRegistrationVO> listByPage(WorkRegistrationQuery query) {
List<WorkRegistration> workRegistrations = workRegistrationMapper.listByPage(query);
-// workRegistrations.stream().map(workRegistration -> {
-//
-// }).collect(Collectors.toList());
- return workRegistrations;
+ 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;
}
/**
--
Gitblit v1.9.2