From 66f68a062300f4be69f6fa6a038b5c997be0fd7d Mon Sep 17 00:00:00 2001 From: guoshengxiong <1923636941@qq.com> Date: Thu, 25 Dec 2025 11:35:36 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=89=E5=85=A8=E6=95=99=E8=82=B2=EF=BC=8C?= =?UTF-8?q?=E5=8F=AF=E9=80=89=E5=85=A8=E9=83=A8=EF=BC=8C=E5=B7=B2=E5=9F=B9?= =?UTF-8?q?=E8=AE=AD=EF=BC=8C=E6=9C=AA=E5=9F=B9=E8=AE=AD=EF=BC=8C=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E9=80=89=E6=8B=A9=E5=B7=B2=E5=9F=B9=E8=AE=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SafeEducationQuestionController.java | 9 +++- .../entity/dto/WorkerSafeEducationDto.java | 14 ++++++ .../xml/SafeEducationQuestionMapper.xml | 46 +++++++++++++++---- .../ISafeEducationQuestionService.java | 3 +- .../SafeEducationQuestionServiceImpl.java | 3 +- 5 files changed, 62 insertions(+), 13 deletions(-) create mode 100644 src/main/java/com/zhgd/xmgl/modules/edu/entity/dto/WorkerSafeEducationDto.java diff --git a/src/main/java/com/zhgd/xmgl/modules/edu/controller/SafeEducationQuestionController.java b/src/main/java/com/zhgd/xmgl/modules/edu/controller/SafeEducationQuestionController.java index 8880b02e9..e4165ec47 100644 --- a/src/main/java/com/zhgd/xmgl/modules/edu/controller/SafeEducationQuestionController.java +++ b/src/main/java/com/zhgd/xmgl/modules/edu/controller/SafeEducationQuestionController.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.zhgd.annotation.OperLog; import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.jeecg.common.mybatis.EntityMap; +import com.zhgd.xmgl.modules.edu.entity.dto.WorkerSafeEducationDto; import com.zhgd.xmgl.modules.worker.entity.WorkerSafeEducation; import com.zhgd.xmgl.modules.edu.service.ISafeEducationQuestionService; import io.swagger.annotations.Api; @@ -16,6 +17,7 @@ import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; import java.util.Map; +import java.util.Objects; /** @@ -98,9 +100,11 @@ public class SafeEducationQuestionController { @ApiImplicitParam(name = "projectSn", value = "项目SN", paramType = "body", required = true, dataType = "String"), @ApiImplicitParam(name = "pageNo", value = "第几页", paramType = "body", required = true, dataType = "Integer"), @ApiImplicitParam(name = "pageSize", value = "每页显示条数", paramType = "body", required = true, dataType = "Integer"), + @ApiImplicitParam(name = "educationStatus", value = "0全部、1已培训（默认）、2未培训", paramType = "body", required = false, dataType = "Integer"), }) @PostMapping(value = "/selectWorkerEducationPage") public Result> selectWorkerEducationPage(@RequestBody Map map) { + map.putIfAbsent("educationStatus", 1); return Result.success(safeEducationQuestionService.selectWorkerEducationPage(map)); } @@ -122,7 +126,10 @@ public class SafeEducationQuestionController { @ApiImplicitParam(name = "projectSn", value = "项目SN", paramType = "query", dataType = "String"), }) @GetMapping(value = "/exportExcelWorkerEducation") - public void exportExcelWorkerEducation(HttpServletResponse response, WorkerSafeEducation workerSafeEducation ) { + public void exportExcelWorkerEducation(HttpServletResponse response, WorkerSafeEducationDto workerSafeEducation ) { + if (Objects.isNull(workerSafeEducation.getEducationStatus())) { + workerSafeEducation.setEducationStatus(1); + } safeEducationQuestionService.exportExcelWorkerEducation(response,workerSafeEducation); } diff --git a/src/main/java/com/zhgd/xmgl/modules/edu/entity/dto/WorkerSafeEducationDto.java b/src/main/java/com/zhgd/xmgl/modules/edu/entity/dto/WorkerSafeEducationDto.java new file mode 100644 index 000000000..9705f2a54 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/edu/entity/dto/WorkerSafeEducationDto.java @@ -0,0 +1,14 @@ +package com.zhgd.xmgl.modules.edu.entity.dto; + +import com.zhgd.xmgl.modules.worker.entity.WorkerSafeEducation; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class WorkerSafeEducationDto extends WorkerSafeEducation { + /** + *0全部、1已培训（默认）、2未培训 + */ + @ApiModelProperty("0全部、1已培训（默认）、2未培训") + private Integer educationStatus; +} diff --git a/src/main/java/com/zhgd/xmgl/modules/edu/mapper/xml/SafeEducationQuestionMapper.xml b/src/main/java/com/zhgd/xmgl/modules/edu/mapper/xml/SafeEducationQuestionMapper.xml index 0ea7bea35..fe4ff4dad 100644 --- a/src/main/java/com/zhgd/xmgl/modules/edu/mapper/xml/SafeEducationQuestionMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/edu/mapper/xml/SafeEducationQuestionMapper.xml @@ -31,11 +31,13 @@ diff --git a/src/main/java/com/zhgd/xmgl/modules/edu/service/ISafeEducationQuestionService.java b/src/main/java/com/zhgd/xmgl/modules/edu/service/ISafeEducationQuestionService.java index 3ee078cc8..7e1eccb94 100644 --- a/src/main/java/com/zhgd/xmgl/modules/edu/service/ISafeEducationQuestionService.java +++ b/src/main/java/com/zhgd/xmgl/modules/edu/service/ISafeEducationQuestionService.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.zhgd.jeecg.common.mybatis.EntityMap; import com.zhgd.xmgl.modules.edu.entity.SafeEducationQuestion; import com.baomidou.mybatisplus.extension.service.IService; +import com.zhgd.xmgl.modules.edu.entity.dto.WorkerSafeEducationDto; import com.zhgd.xmgl.modules.worker.entity.WorkerSafeEducation; import javax.servlet.http.HttpServletResponse; @@ -62,5 +63,5 @@ public interface ISafeEducationQuestionService extends IService list = safeEducationQuestionMapper.exportExcelWorkerEducation(workerSafeEducation); String[] heads = {"人员姓名", "培训日期", "培训类型", "培训主题", "考试分数", "是否及格"};