| | |
| | | import com.baomidou.mybatisplus.extension.plugins.pagination.Page; |
| | | import com.gkhy.exam.coalmine.entity.CmStaff; |
| | | import com.gkhy.exam.coalmine.model.dto.req.CmStaffAddReqDTO; |
| | | import com.gkhy.exam.coalmine.model.dto.req.CmStaffUpdateReqDTO; |
| | | import com.gkhy.exam.coalmine.model.dto.req.ExaminerManageAddReqDTO; |
| | | import com.gkhy.exam.coalmine.model.dto.resp.CmStaffByCodeRespDTO; |
| | | import com.gkhy.exam.coalmine.model.dto.resp.CmStaffPageRespDTO; |
| | | import com.gkhy.exam.coalmine.model.dto.resp.GetExaminerRespDTO; |
| | | import com.gkhy.exam.coalmine.service.CmStaffManagerService; |
| | | import com.gkhy.exam.coalmine.service.baseService.CmStaffService; |
| | | import com.ruoyi.common.core.controller.BaseController; |
| | | import com.ruoyi.common.core.page.TableDataInfo; |
| | | import io.swagger.annotations.Api; |
| | | import io.swagger.annotations.ApiImplicitParam; |
| | | import io.swagger.annotations.ApiImplicitParams; |
| | | import io.swagger.annotations.ApiOperation; |
| | |
| | | import com.ruoyi.common.core.domain.AjaxResult; |
| | | |
| | | import javax.annotation.Resource; |
| | | import javax.validation.constraints.NotNull; |
| | | import java.io.Serializable; |
| | | import java.time.LocalDateTime; |
| | | import java.util.List; |
| | |
| | | * @author hz |
| | | * @since 2023-09-14 10:37:03 |
| | | */ |
| | | @Api(tags = "人员管理") |
| | | @RestController |
| | | @RequestMapping("/cm/staff") |
| | | public class CmStaffController extends BaseController { |
| | |
| | | return getDataTable(list); |
| | | } |
| | | |
| | | @ApiOperation(value = "根据身份ID获取人员信息",httpMethod = "GET") |
| | | @GetMapping("/getByCode/{code}") |
| | | public AjaxResult selectByCode(@PathVariable @NotNull(message = "id不能为空") String code) { |
| | | return this.cmStaffManagerService.selectByCode(code); |
| | | } |
| | | |
| | | /** |
| | | * 新增数据 |
| | | */ |
| | |
| | | public AjaxResult insert(@Validated @RequestBody CmStaffAddReqDTO reqDTO) { |
| | | return this.cmStaffManagerService.saveCmStaff(reqDTO); |
| | | } |
| | | |
| | | /** |
| | | * 修改数据 |
| | | */ |
| | | @PostMapping("/edit") |
| | | @ApiOperation(value = "修改人员",httpMethod = "POST") |
| | | @ApiImplicitParams({ |
| | | @ApiImplicitParam(name = "id",dataTypeClass = Long.class, value = "id",required = true), |
| | | @ApiImplicitParam(name = "name",dataTypeClass = String.class, value = "姓名",required = true), |
| | | @ApiImplicitParam(name = "sex", dataTypeClass = String.class,value = "性别"), |
| | | @ApiImplicitParam(name = "code", dataTypeClass = String.class,value = "身份证",required = true), |
| | | @ApiImplicitParam(name = "mobilePhone", dataTypeClass = String.class,value = "手机号",required = true), |
| | | @ApiImplicitParam(name = "nationCode", dataTypeClass = String.class,value = "民族",required = true), |
| | | @ApiImplicitParam(name = "photoAttachment", dataTypeClass = Long.class,value = "证件照id"), |
| | | @ApiImplicitParam(name = "eduLevel", dataTypeClass = String.class,value = "最高学历",required = true) |
| | | }) |
| | | public AjaxResult edit(@Validated @RequestBody CmStaffUpdateReqDTO reqDTO) { |
| | | return this.cmStaffManagerService.editCmStaff(reqDTO); |
| | | } |
| | | |
| | | /** |
| | | * 删除人员 |
| | | */ |
| | | @ApiOperation(value = "根据id删除人员",httpMethod = "GET") |
| | | @ApiImplicitParam(name = "id",dataTypeClass = Long.class,value = "人员id",required = true) |
| | | @GetMapping("/del/{id}") |
| | | public AjaxResult delete(@PathVariable @NotNull(message = "id不能为空") Long id) { |
| | | return this.cmStaffManagerService.deleteCmStaff(id); |
| | | } |
| | | } |
| | | |
| | |
| | | import com.gkhy.exam.coalmine.model.dto.req.CmStaffResumeUpdateReqDTO; |
| | | import com.gkhy.exam.coalmine.service.CmStaffManagerService; |
| | | import com.gkhy.exam.coalmine.service.baseService.CmStaffExamService; |
| | | import io.swagger.annotations.Api; |
| | | import io.swagger.annotations.ApiImplicitParam; |
| | | import io.swagger.annotations.ApiImplicitParams; |
| | | import io.swagger.annotations.ApiOperation; |
| | |
| | | import javax.annotation.Resource; |
| | | import javax.validation.constraints.NotNull; |
| | | import java.io.Serializable; |
| | | import java.time.LocalDate; |
| | | import java.time.LocalDateTime; |
| | | import java.util.List; |
| | | |
| | |
| | | * @author hz |
| | | * @since 2023-09-14 10:37:03 |
| | | */ |
| | | @Api(tags = "考试经历管理") |
| | | @RestController |
| | | @RequestMapping("/cmStaffExam") |
| | | public class CmStaffExamController{ |
| | |
| | | @ApiOperation(value = "新增考试经历",httpMethod = "POST") |
| | | @ApiImplicitParams({ |
| | | @ApiImplicitParam(name = "staffId",dataTypeClass = Long.class, value = "人员id",required = true), |
| | | @ApiImplicitParam(name = "startTime", dataTypeClass = LocalDateTime.class,value = "开始时间"), |
| | | @ApiImplicitParam(name = "endTime", dataTypeClass = LocalDateTime.class,value = "结束时间",required = true), |
| | | @ApiImplicitParam(name = "examTime", dataTypeClass = LocalDate.class,value = "考试时间"), |
| | | @ApiImplicitParam(name = "examCenter", dataTypeClass = String.class,value = "考试中心",required = true), |
| | | @ApiImplicitParam(name = "subject", dataTypeClass = String.class,value = "科目",required = true), |
| | | @ApiImplicitParam(name = "result", dataTypeClass = String.class,value = "考试结果;0-通过;1-未通过",required = true) |
| | |
| | | */ |
| | | @ApiOperation(value = "根据id删除考试经历",httpMethod = "GET") |
| | | @ApiImplicitParam(name = "id",dataTypeClass = Long.class,value = "考试经历id",required = true) |
| | | @GetMapping("/del") |
| | | @GetMapping("/del/{id}") |
| | | public AjaxResult delete(@PathVariable @NotNull(message = "id不能为空") Long id) { |
| | | return this.cmStaffManagerService.deleteCmStaffExam(id); |
| | | } |
| | |
| | | @ApiImplicitParams({ |
| | | @ApiImplicitParam(name = "id",dataTypeClass = Long.class, value = "考试经历id",required = true), |
| | | @ApiImplicitParam(name = "staffId",dataTypeClass = Long.class, value = "人员id",required = true), |
| | | @ApiImplicitParam(name = "startTime", dataTypeClass = LocalDateTime.class,value = "开始时间"), |
| | | @ApiImplicitParam(name = "endTime", dataTypeClass = LocalDateTime.class,value = "结束时间",required = true), |
| | | @ApiImplicitParam(name = "examTime", dataTypeClass = LocalDate.class,value = "考试时间"), |
| | | @ApiImplicitParam(name = "examCenter", dataTypeClass = String.class,value = "考试中心",required = true), |
| | | @ApiImplicitParam(name = "subject", dataTypeClass = String.class,value = "科目",required = true), |
| | | @ApiImplicitParam(name = "result", dataTypeClass = String.class,value = "考试结果;0-通过;1-未通过",required = true) |
| | |
| | | import com.gkhy.exam.coalmine.model.dto.req.CmStaffQaUpdateReqDTO; |
| | | import com.gkhy.exam.coalmine.service.CmStaffManagerService; |
| | | import com.gkhy.exam.coalmine.service.baseService.CmStaffQaService; |
| | | import io.swagger.annotations.Api; |
| | | import io.swagger.annotations.ApiImplicitParam; |
| | | import io.swagger.annotations.ApiImplicitParams; |
| | | import io.swagger.annotations.ApiOperation; |
| | |
| | | import javax.annotation.Resource; |
| | | import javax.validation.constraints.NotNull; |
| | | import java.io.Serializable; |
| | | import java.time.LocalDate; |
| | | import java.time.LocalDateTime; |
| | | import java.util.List; |
| | | |
| | |
| | | * @author hz |
| | | * @since 2023-09-14 10:37:03 |
| | | */ |
| | | @Api(tags = "资格证书管理") |
| | | @RestController |
| | | @RequestMapping("/cmStaffQa") |
| | | public class CmStaffQaController{ |
| | |
| | | @ApiImplicitParam(name = "staffId",dataTypeClass = Long.class, value = "人员id",required = true), |
| | | @ApiImplicitParam(name = "name", dataTypeClass = String.class,value = "证书名字",required = true), |
| | | @ApiImplicitParam(name = "operateTypeId", dataTypeClass = Long.class,value = "操作类型",required = true), |
| | | @ApiImplicitParam(name = "qualificationType", dataTypeClass = String.class,value = "资格类型",required = true), |
| | | @ApiImplicitParam(name = "jobCategory", dataTypeClass = String.class,value = "作业类别",required = true), |
| | | @ApiImplicitParam(name = "operationItems", dataTypeClass = String.class,value = "操作项目",required = true), |
| | | @ApiImplicitParam(name = "expiredTime", dataTypeClass = LocalDateTime.class,value = "过期时间") |
| | | @ApiImplicitParam(name = "expiredTime", dataTypeClass = LocalDate.class,value = "过期时间") |
| | | }) |
| | | public AjaxResult insert(@Validated @RequestBody CmStaffQaAddReqDTO reqDTO) { |
| | | return this.cmStaffManagerService.saveCmStaffQa(reqDTO); |
| | |
| | | */ |
| | | @ApiOperation(value = "根据id删除资格证书",httpMethod = "GET") |
| | | @ApiImplicitParam(name = "id",dataTypeClass = Long.class,value = "资格证书id",required = true) |
| | | @GetMapping("/del") |
| | | @GetMapping("/del/{id}") |
| | | public AjaxResult delete(@PathVariable @NotNull(message = "id不能为空") Long id) { |
| | | return this.cmStaffManagerService.deleteCmStaffQa(id); |
| | | } |
| | |
| | | @ApiImplicitParam(name = "staffId",dataTypeClass = Long.class, value = "人员id",required = true), |
| | | @ApiImplicitParam(name = "name", dataTypeClass = String.class,value = "证书名字",required = true), |
| | | @ApiImplicitParam(name = "operateTypeId", dataTypeClass = Long.class,value = "操作类型",required = true), |
| | | @ApiImplicitParam(name = "qualificationType", dataTypeClass = String.class,value = "资格类型",required = true), |
| | | @ApiImplicitParam(name = "jobCategory", dataTypeClass = String.class,value = "作业类别",required = true), |
| | | @ApiImplicitParam(name = "operationItems", dataTypeClass = String.class,value = "操作项目",required = true), |
| | | @ApiImplicitParam(name = "expiredTime", dataTypeClass = LocalDateTime.class,value = "过期时间") |
| | | @ApiImplicitParam(name = "expiredTime", dataTypeClass = LocalDate.class,value = "过期时间") |
| | | }) |
| | | public AjaxResult insert(@Validated @RequestBody CmStaffQaUpdateReqDTO reqDTO) { |
| | | return this.cmStaffManagerService.updateCmStaffQa(reqDTO); |
| | |
| | | import com.gkhy.exam.coalmine.model.dto.req.CmStaffResumeUpdateReqDTO; |
| | | import com.gkhy.exam.coalmine.service.CmStaffManagerService; |
| | | import com.gkhy.exam.coalmine.service.baseService.CmStaffResumeService; |
| | | import io.swagger.annotations.Api; |
| | | import io.swagger.annotations.ApiImplicitParam; |
| | | import io.swagger.annotations.ApiImplicitParams; |
| | | import io.swagger.annotations.ApiOperation; |
| | |
| | | import javax.annotation.Resource; |
| | | import javax.validation.constraints.NotNull; |
| | | import java.io.Serializable; |
| | | import java.time.LocalDate; |
| | | import java.time.LocalDateTime; |
| | | import java.util.List; |
| | | |
| | |
| | | * @author hz |
| | | * @since 2023-09-14 10:37:03 |
| | | */ |
| | | @Api(tags = "个人履历管理") |
| | | @RestController |
| | | @RequestMapping("/cm/staffResume") |
| | | public class CmStaffResumeController{ |
| | |
| | | @ApiOperation(value = "新增个人履历",httpMethod = "POST") |
| | | @ApiImplicitParams({ |
| | | @ApiImplicitParam(name = "staffId",dataTypeClass = Long.class, value = "人员id",required = true), |
| | | @ApiImplicitParam(name = "startTime", dataTypeClass = LocalDateTime.class,value = "开始时间"), |
| | | @ApiImplicitParam(name = "endTime", dataTypeClass = LocalDateTime.class,value = "结束时间",required = true), |
| | | @ApiImplicitParam(name = "startTime", dataTypeClass = LocalDate.class,value = "开始时间"), |
| | | @ApiImplicitParam(name = "endTime", dataTypeClass = LocalDate.class,value = "结束时间",required = true), |
| | | @ApiImplicitParam(name = "unit", dataTypeClass = String.class,value = "单位",required = true) |
| | | }) |
| | | public AjaxResult insert(@Validated @RequestBody CmStaffResumeAddReqDTO reqDTO) { |
| | |
| | | */ |
| | | @ApiOperation(value = "根据id删除个人履历",httpMethod = "GET") |
| | | @ApiImplicitParam(name = "id",dataTypeClass = Long.class,value = "履历id",required = true) |
| | | @GetMapping("/del") |
| | | @GetMapping("/del/{id}") |
| | | public AjaxResult delete(@PathVariable @NotNull(message = "id不能为空") Long id) { |
| | | return this.cmStaffManagerService.deleteCmStaffResume(id); |
| | | } |
| | |
| | | @ApiImplicitParams({ |
| | | @ApiImplicitParam(name = "id",dataTypeClass = Long.class, value = "id",required = true), |
| | | @ApiImplicitParam(name = "staffId",dataTypeClass = Long.class, value = "人员id",required = true), |
| | | @ApiImplicitParam(name = "startTime", dataTypeClass = LocalDateTime.class,value = "开始时间"), |
| | | @ApiImplicitParam(name = "endTime", dataTypeClass = LocalDateTime.class,value = "结束时间",required = true), |
| | | @ApiImplicitParam(name = "startTime", dataTypeClass = LocalDate.class,value = "开始时间"), |
| | | @ApiImplicitParam(name = "endTime", dataTypeClass = LocalDate.class,value = "结束时间",required = true), |
| | | @ApiImplicitParam(name = "unit", dataTypeClass = String.class,value = "单位",required = true) |
| | | }) |
| | | public AjaxResult insert(@Validated @RequestBody CmStaffResumeUpdateReqDTO reqDTO) { |
| | |
| | | import com.gkhy.exam.coalmine.model.dto.req.CmStaffTrainUpdateReqDTO; |
| | | import com.gkhy.exam.coalmine.service.CmStaffManagerService; |
| | | import com.gkhy.exam.coalmine.service.baseService.CmStaffTrainService; |
| | | import io.swagger.annotations.Api; |
| | | import io.swagger.annotations.ApiImplicitParam; |
| | | import io.swagger.annotations.ApiImplicitParams; |
| | | import io.swagger.annotations.ApiOperation; |
| | |
| | | import javax.annotation.Resource; |
| | | import javax.validation.constraints.NotNull; |
| | | import java.io.Serializable; |
| | | import java.time.LocalDate; |
| | | import java.time.LocalDateTime; |
| | | import java.util.List; |
| | | |
| | |
| | | * @author hz |
| | | * @since 2023-09-14 10:37:03 |
| | | */ |
| | | @Api(tags = "个人培训经历管理") |
| | | @RestController |
| | | @RequestMapping("/cmStaffTrain") |
| | | public class CmStaffTrainController{ |
| | |
| | | @ApiOperation(value = "新增个人培训经历",httpMethod = "POST") |
| | | @ApiImplicitParams({ |
| | | @ApiImplicitParam(name = "staffId",dataTypeClass = Long.class, value = "人员id",required = true), |
| | | @ApiImplicitParam(name = "startTime", dataTypeClass = LocalDateTime.class,value = "开始时间"), |
| | | @ApiImplicitParam(name = "endTime", dataTypeClass = LocalDateTime.class,value = "结束时间",required = true), |
| | | @ApiImplicitParam(name = "startTime", dataTypeClass = LocalDate.class,value = "开始时间"), |
| | | @ApiImplicitParam(name = "endTime", dataTypeClass = LocalDate.class,value = "结束时间",required = true), |
| | | @ApiImplicitParam(name = "unit", dataTypeClass = String.class,value = "单位",required = true), |
| | | @ApiImplicitParam(name = "batch", dataTypeClass = String.class,value = "所属批次",required = true), |
| | | @ApiImplicitParam(name = "subject", dataTypeClass = String.class,value = "科目",required = true) |
| | |
| | | */ |
| | | @ApiOperation(value = "根据id删除个人培训经历",httpMethod = "GET") |
| | | @ApiImplicitParam(name = "id",dataTypeClass = Long.class,value = "培训经历id",required = true) |
| | | @GetMapping("/del") |
| | | @GetMapping("/del/{id}") |
| | | public AjaxResult delete(@PathVariable @NotNull(message = "id不能为空") Long id) { |
| | | return this.cmStaffManagerService.deleteCmStaffTrain(id); |
| | | } |
| | |
| | | @ApiImplicitParams({ |
| | | @ApiImplicitParam(name = "id",dataTypeClass = Long.class, value = "id",required = true), |
| | | @ApiImplicitParam(name = "staffId",dataTypeClass = Long.class, value = "人员id",required = true), |
| | | @ApiImplicitParam(name = "startTime", dataTypeClass = LocalDateTime.class,value = "开始时间"), |
| | | @ApiImplicitParam(name = "endTime", dataTypeClass = LocalDateTime.class,value = "结束时间",required = true), |
| | | @ApiImplicitParam(name = "startTime", dataTypeClass = LocalDate.class,value = "开始时间"), |
| | | @ApiImplicitParam(name = "endTime", dataTypeClass = LocalDate.class,value = "结束时间",required = true), |
| | | @ApiImplicitParam(name = "unit", dataTypeClass = String.class,value = "单位",required = true), |
| | | @ApiImplicitParam(name = "batch", dataTypeClass = String.class,value = "所属批次",required = true), |
| | | @ApiImplicitParam(name = "subject", dataTypeClass = String.class,value = "科目",required = true) |
| | |
| | | import com.gkhy.exam.coalmine.service.EmonRecordManagerService; |
| | | import com.ruoyi.common.core.controller.BaseController; |
| | | import com.ruoyi.common.core.page.TableDataInfo; |
| | | import com.ruoyi.system.service.SysDistrictService; |
| | | import io.swagger.annotations.Api; |
| | | import io.swagger.annotations.ApiImplicitParam; |
| | | import io.swagger.annotations.ApiImplicitParams; |
| | | import io.swagger.annotations.ApiOperation; |
| | |
| | | * @author hz |
| | | * @since 2023-09-13 10:13:39 |
| | | */ |
| | | @Api(tags = "监控记录接收管理") |
| | | @RestController |
| | | @RequestMapping("/emonRecord") |
| | | public class EmonRecordController extends BaseController { |
| | |
| | | */ |
| | | @ApiOperation(value = "根据id删除考场异常监控记录",httpMethod = "GET") |
| | | @ApiImplicitParam(name = "id",dataTypeClass = Long.class,value = "记录id",required = true) |
| | | @GetMapping("/exam/del") |
| | | @GetMapping("/exam/del/{id}") |
| | | public AjaxResult deleteExamRecord(@PathVariable @NotNull(message = "id不能为空") Long id) { |
| | | return this.emonRecordManagerService.deleteExamRecord(id); |
| | | } |
| | |
| | | */ |
| | | @ApiOperation(value = "根据id删除培训异常监控记录",httpMethod = "GET") |
| | | @ApiImplicitParam(name = "id",dataTypeClass = Long.class,value = "记录id",required = true) |
| | | @GetMapping("/train/del") |
| | | @GetMapping("/train/del/{id}") |
| | | public AjaxResult deleteTrainRecord(@PathVariable @NotNull(message = "id不能为空") Long id) { |
| | | return this.emonRecordManagerService.deleteTrainRecord(id); |
| | | } |
| | |
| | | */ |
| | | @ApiOperation(value = "根据id删除考评员",httpMethod = "GET") |
| | | @ApiImplicitParam(name = "id",dataTypeClass = Long.class,value = "考评员id",required = true) |
| | | @GetMapping("/del") |
| | | @GetMapping("/del/{id}") |
| | | public AjaxResult delete(@PathVariable @NotNull(message = "id不能为空") Long id) { |
| | | return this.eduResourcesManagerService.removeExaminerById(id); |
| | | } |
| | |
| | | */ |
| | | @ApiOperation(value = "根据id删除与之关联的工种信息",httpMethod = "GET") |
| | | @ApiImplicitParam(name = "id",dataTypeClass = Long.class,value = "关联的工种id",required = true) |
| | | @GetMapping("/operateType/del") |
| | | @GetMapping("/operateType/del/{id}") |
| | | public AjaxResult deleteExaminerBindOperateType(@PathVariable @NotNull(message = "id不能为空") Long id) { |
| | | return this.eduResourcesManagerService.deleteExaminerBindOperateType(id); |
| | | } |
| | |
| | | */ |
| | | @ApiOperation(value = "根据id删除教师",httpMethod = "GET") |
| | | @ApiImplicitParam(name = "id",dataTypeClass = Long.class,value = "教师id",required = true) |
| | | @GetMapping("/del") |
| | | @GetMapping("/del/{id}") |
| | | public AjaxResult delete(@PathVariable @NotNull(message = "id不能为空") Long id) { |
| | | return this.eduResourcesManagerService.removeTeacherById(id); |
| | | } |
| | |
| | | */ |
| | | @ApiOperation(value = "根据id删除与之关联的工种信息",httpMethod = "GET") |
| | | @ApiImplicitParam(name = "id",dataTypeClass = Long.class,value = "关联的工种id",required = true) |
| | | @GetMapping("/operateType/del") |
| | | @GetMapping("/operateType/del/{id}") |
| | | public AjaxResult deleteTeacherBindOperateType(@PathVariable @NotNull(message = "id不能为空") Long id) { |
| | | return this.eduResourcesManagerService.deleteTeacherBindOperateType(id); |
| | | } |
| | |
| | | package com.gkhy.exam.coalmine.entity; |
| | | |
| | | import java.time.LocalDate; |
| | | import java.time.LocalDateTime; |
| | | |
| | | import com.baomidou.mybatisplus.annotation.*; |
| | |
| | | import com.fasterxml.jackson.annotation.JsonFormat; |
| | | import lombok.Data; |
| | | import org.springframework.data.annotation.Id; |
| | | |
| | | import javax.validation.constraints.NotNull; |
| | | |
| | | @Data |
| | | @TableName("cm_staff_exam") |
| | |
| | | //人员id |
| | | private Long staffId; |
| | | |
| | | //开始时间 |
| | | private LocalDateTime startTime; |
| | | |
| | | //结束时间 |
| | | private LocalDateTime endTime; |
| | | private LocalDate examTime; |
| | | |
| | | //考试中心 |
| | | private String examCenter; |
| | |
| | | package com.gkhy.exam.coalmine.entity; |
| | | |
| | | import java.time.LocalDate; |
| | | import java.time.LocalDateTime; |
| | | |
| | | import com.baomidou.mybatisplus.annotation.*; |
| | |
| | | private String operationItems; |
| | | |
| | | //过期时间 |
| | | private LocalDateTime expiredTime; |
| | | private LocalDate expiredTime; |
| | | |
| | | //删除标志(0代表存在 2代表删除) |
| | | private Byte delFlag; |
| | |
| | | package com.gkhy.exam.coalmine.entity; |
| | | |
| | | import java.time.LocalDate; |
| | | import java.time.LocalDateTime; |
| | | |
| | | import com.baomidou.mybatisplus.annotation.*; |
| | |
| | | private Long staffId; |
| | | |
| | | //开始时间 |
| | | private LocalDateTime startTime; |
| | | private LocalDate startTime; |
| | | |
| | | //结束时间 |
| | | private LocalDateTime endTime; |
| | | private LocalDate endTime; |
| | | |
| | | //单位 |
| | | private String unit; |
| | |
| | | package com.gkhy.exam.coalmine.entity; |
| | | |
| | | import java.time.LocalDate; |
| | | import java.time.LocalDateTime; |
| | | |
| | | import com.baomidou.mybatisplus.annotation.*; |
| | |
| | | private Long staffId; |
| | | |
| | | //开始时间 |
| | | private LocalDateTime startTime; |
| | | private LocalDate startTime; |
| | | |
| | | //结束时间 |
| | | private LocalDateTime endTime; |
| | | private LocalDate endTime; |
| | | |
| | | //单位 |
| | | private String unit; |
| | |
| | | import javax.validation.constraints.NotBlank; |
| | | import javax.validation.constraints.NotNull; |
| | | import java.io.Serializable; |
| | | import java.time.LocalDate; |
| | | import java.time.LocalDateTime; |
| | | |
| | | /** |
| | |
| | | @NotNull(message = "人员id不能为空") |
| | | private Long staffId; |
| | | |
| | | //开始时间 |
| | | @NotNull(message = "开始时间不能为空") |
| | | @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") |
| | | private LocalDateTime startTime; |
| | | |
| | | //结束时间 |
| | | @NotNull(message = "结束时间不能为空") |
| | | @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") |
| | | private LocalDateTime endTime; |
| | | //考试时间 |
| | | @NotNull(message = "考试时间不能为空") |
| | | private LocalDate examTime; |
| | | |
| | | //考试中心 |
| | | @NotBlank(message = "考试中心不能为空") |
| | |
| | | import javax.validation.constraints.NotBlank; |
| | | import javax.validation.constraints.NotNull; |
| | | import java.io.Serializable; |
| | | import java.time.LocalDate; |
| | | import java.time.LocalDateTime; |
| | | |
| | | /** |
| | |
| | | @NotNull(message = "人员id不能为空") |
| | | private Long staffId; |
| | | |
| | | //开始时间 |
| | | @NotNull(message = "开始时间不能为空") |
| | | @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") |
| | | private LocalDateTime startTime; |
| | | |
| | | //结束时间 |
| | | @NotNull(message = "结束时间不能为空") |
| | | @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") |
| | | private LocalDateTime endTime; |
| | | //考试时间 |
| | | @NotNull(message = "考试时间不能为空") |
| | | private LocalDate examTime; |
| | | |
| | | //考试中心 |
| | | @NotBlank(message = "考试中心不能为空") |
| | |
| | | import javax.validation.constraints.NotBlank; |
| | | import javax.validation.constraints.NotNull; |
| | | import java.io.Serializable; |
| | | import java.time.LocalDate; |
| | | import java.time.LocalDateTime; |
| | | |
| | | /** |
| | |
| | | @NotNull(message = "操作类型不能为空") |
| | | private Long operateTypeId; |
| | | |
| | | //资格类型 |
| | | @NotBlank(message = "资格类型不能为空") |
| | | private String qualificationType; |
| | | |
| | | //作业类别 |
| | | @NotBlank(message = "作业类别不能为空") |
| | | private String jobCategory; |
| | | |
| | | //操作项目 |
| | | @NotBlank(message = "操作项目不能为空") |
| | | private String operationItems; |
| | | |
| | | //过期时间 |
| | | @NotNull(message = "操作类型不能为空") |
| | | @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") |
| | | private LocalDateTime expiredTime; |
| | | @NotNull(message = "过期时间不能为空") |
| | | @JsonFormat(pattern = "yyyy-MM-dd") |
| | | private LocalDate expiredTime; |
| | | } |
| | |
| | | import javax.validation.constraints.NotBlank; |
| | | import javax.validation.constraints.NotNull; |
| | | import java.io.Serializable; |
| | | import java.time.LocalDate; |
| | | import java.time.LocalDateTime; |
| | | |
| | | /** |
| | |
| | | @NotNull(message = "操作类型不能为空") |
| | | private Long operateTypeId; |
| | | |
| | | //资格类型 |
| | | @NotBlank(message = "资格类型不能为空") |
| | | private String qualificationType; |
| | | |
| | | //作业类别 |
| | | @NotBlank(message = "作业类别不能为空") |
| | | private String jobCategory; |
| | | |
| | | //操作项目 |
| | | @NotBlank(message = "操作项目不能为空") |
| | | private String operationItems; |
| | | |
| | | //过期时间 |
| | | @NotNull(message = "操作类型不能为空") |
| | | @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") |
| | | private LocalDateTime expiredTime; |
| | | private LocalDate expiredTime; |
| | | } |
| | |
| | | |
| | | import com.fasterxml.jackson.annotation.JsonFormat; |
| | | import lombok.Data; |
| | | import org.springframework.format.annotation.DateTimeFormat; |
| | | |
| | | import javax.validation.constraints.NotBlank; |
| | | import javax.validation.constraints.NotNull; |
| | | import java.io.Serializable; |
| | | import java.time.LocalDate; |
| | | import java.time.LocalDateTime; |
| | | |
| | | /** |
| | |
| | | |
| | | //开始时间 |
| | | @NotNull(message = "开始时间不能为空") |
| | | @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") |
| | | private LocalDateTime startTime; |
| | | private LocalDate startTime; |
| | | |
| | | //结束时间 |
| | | @NotNull(message = "结束时间不能为空") |
| | | @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") |
| | | private LocalDateTime endTime; |
| | | private LocalDate endTime; |
| | | |
| | | //单位 |
| | | @NotBlank(message = "单位不能为空") |
| | |
| | | import javax.validation.constraints.NotBlank; |
| | | import javax.validation.constraints.NotNull; |
| | | import java.io.Serializable; |
| | | import java.time.LocalDate; |
| | | import java.time.LocalDateTime; |
| | | |
| | | /** |
| | |
| | | |
| | | //开始时间 |
| | | @NotNull(message = "开始时间不能为空") |
| | | @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") |
| | | private LocalDateTime startTime; |
| | | private LocalDate startTime; |
| | | |
| | | //结束时间 |
| | | @NotNull(message = "结束时间不能为空") |
| | | @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") |
| | | private LocalDateTime endTime; |
| | | private LocalDate endTime; |
| | | |
| | | //单位 |
| | | @NotBlank(message = "单位不能为空") |
| | |
| | | import javax.validation.constraints.NotBlank; |
| | | import javax.validation.constraints.NotNull; |
| | | import java.io.Serializable; |
| | | import java.time.LocalDate; |
| | | import java.time.LocalDateTime; |
| | | |
| | | /** |
| | |
| | | |
| | | //开始时间 |
| | | @NotNull(message = "开始时间不能为空") |
| | | @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") |
| | | private LocalDateTime startTime; |
| | | private LocalDate startTime; |
| | | |
| | | //结束时间 |
| | | @NotNull(message = "结束时间不能为空") |
| | | @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") |
| | | private LocalDateTime endTime; |
| | | private LocalDate endTime; |
| | | |
| | | //单位 |
| | | @NotBlank(message = "单位不能为空") |
| | |
| | | import javax.validation.constraints.NotBlank; |
| | | import javax.validation.constraints.NotNull; |
| | | import java.io.Serializable; |
| | | import java.time.LocalDate; |
| | | import java.time.LocalDateTime; |
| | | |
| | | /** |
| | |
| | | |
| | | //开始时间 |
| | | @NotNull(message = "开始时间不能为空") |
| | | @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") |
| | | private LocalDateTime startTime; |
| | | private LocalDate startTime; |
| | | |
| | | //结束时间 |
| | | @NotNull(message = "结束时间不能为空") |
| | | @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") |
| | | private LocalDateTime endTime; |
| | | private LocalDate endTime; |
| | | |
| | | //单位 |
| | | @NotBlank(message = "单位不能为空") |
对比新文件 |
| | |
| | | package com.gkhy.exam.coalmine.model.dto.req; |
| | | |
| | | import lombok.Data; |
| | | |
| | | import javax.validation.constraints.NotBlank; |
| | | import javax.validation.constraints.NotNull; |
| | | import java.io.Serializable; |
| | | |
| | | /** |
| | | * @author Mr.huang |
| | | * @decription |
| | | * @date 2023/9/14 11:00 |
| | | */ |
| | | @Data |
| | | public class CmStaffUpdateReqDTO implements Serializable { |
| | | |
| | | @NotNull(message = "id不能为空") |
| | | private Long id; |
| | | |
| | | //姓名 |
| | | @NotBlank(message = "姓名不能为空") |
| | | private String name; |
| | | |
| | | //性别 |
| | | @NotBlank(message = "性别不能为空") |
| | | private String sex; |
| | | |
| | | //民族 |
| | | @NotBlank(message = "民族不能为空") |
| | | private String nationCode; |
| | | |
| | | //身份证 |
| | | @NotBlank(message = "身份证不能为空") |
| | | private String code; |
| | | |
| | | //手机号 |
| | | @NotBlank(message = "手机号不能为空") |
| | | private String mobilePhone; |
| | | |
| | | //最高学历 |
| | | @NotBlank(message = "最高学历不能为空") |
| | | private String eduLevel; |
| | | |
| | | //证件照 |
| | | @NotNull(message = "证件照不能为空") |
| | | private Long photoAttachment; |
| | | } |
对比新文件 |
| | |
| | | package com.gkhy.exam.coalmine.model.dto.resp; |
| | | |
| | | import com.gkhy.exam.coalmine.entity.CmStaffExam; |
| | | import com.gkhy.exam.coalmine.entity.CmStaffQa; |
| | | import com.gkhy.exam.coalmine.entity.CmStaffResume; |
| | | import com.gkhy.exam.coalmine.entity.CmStaffTrain; |
| | | import com.gkhy.exam.noncoalmine.model.vo.ViolationRegistrationVO; |
| | | import com.gkhy.exam.noncoalmine.model.vo.WorkRegistrationVO; |
| | | import com.ruoyi.file.entity.AttachmentInfo; |
| | | import lombok.Data; |
| | | |
| | | import java.io.Serializable; |
| | | import java.util.List; |
| | | |
| | | /** |
| | | * @author Mr.huang |
| | | * @decription |
| | | * @date 2023/9/14 15:57 |
| | | */ |
| | | @Data |
| | | public class CmStaffByCodeRespDTO implements Serializable { |
| | | |
| | | private Long id; |
| | | |
| | | //姓名 |
| | | private String name; |
| | | |
| | | //性别 |
| | | private String sex; |
| | | |
| | | //民族 |
| | | private String nationCode; |
| | | |
| | | //身份证 |
| | | private String code; |
| | | |
| | | //手机号 |
| | | private String mobilePhone; |
| | | |
| | | //最高学历 |
| | | private String eduLevel; |
| | | |
| | | //证件照 |
| | | private AttachmentInfo photoAttachment; |
| | | |
| | | private List<ViolationRegistrationVO> violationRegistrationVOS; |
| | | |
| | | private List<WorkRegistrationVO> workRegistrationVOS; |
| | | |
| | | private List<CmStaffResume> cmStaffResumes; |
| | | |
| | | private List<CmStaffTrain> cmStaffTrains; |
| | | |
| | | private List<CmStaffExam> cmStaffExams; |
| | | |
| | | private List<CmStaffQa> cmStaffQas; |
| | | } |
| | |
| | | package com.gkhy.exam.coalmine.service; |
| | | |
| | | import com.gkhy.exam.coalmine.model.dto.req.*; |
| | | import com.gkhy.exam.coalmine.model.dto.resp.CmStaffByCodeRespDTO; |
| | | import com.gkhy.exam.coalmine.model.dto.resp.CmStaffPageRespDTO; |
| | | import com.ruoyi.common.core.domain.AjaxResult; |
| | | |
| | |
| | | |
| | | List<CmStaffPageRespDTO> selectPage(); |
| | | |
| | | AjaxResult editCmStaff(CmStaffUpdateReqDTO reqDTO); |
| | | |
| | | AjaxResult deleteCmStaff(Long id); |
| | | |
| | | AjaxResult selectByCode(String code); |
| | | } |
| | |
| | | */ |
| | | public interface CmStaffService extends IService<CmStaff> { |
| | | |
| | | CmStaff selectByCode(String code); |
| | | |
| | | CmStaff getValidById(Long id); |
| | | } |
| | | |
| | |
| | | |
| | | EmonExamRecord findValidById(Long id); |
| | | |
| | | List<EmonExamRecord> listValid(); |
| | | List<EmonExamRecord> listValid(List<Long> childrenIds); |
| | | |
| | | } |
| | | |
| | |
| | | |
| | | EmonTrainRecord findValidById(Long id); |
| | | |
| | | List<EmonTrainRecord> listValid(); |
| | | List<EmonTrainRecord> listValid(List<Long> childrenIds); |
| | | |
| | | } |
| | | |
| | |
| | | public List<CmStaffExam> listValid(Long id) { |
| | | LambdaQueryWrapper<CmStaffExam> wrapper = new LambdaQueryWrapper<>(); |
| | | wrapper.eq(CmStaffExam::getDelFlag, DeleteStatusEnum.NO.getStatus()) |
| | | .eq(CmStaffExam::getId,id); |
| | | .eq(CmStaffExam::getStaffId,id); |
| | | return cmStaffExamMapper.selectList(wrapper); |
| | | } |
| | | } |
| | |
| | | public List<CmStaffQa> listValid(Long id) { |
| | | LambdaQueryWrapper<CmStaffQa> wrapper = new LambdaQueryWrapper<>(); |
| | | wrapper.eq(CmStaffQa::getDelFlag, DeleteStatusEnum.NO.getStatus()) |
| | | .eq(CmStaffQa::getId,id); |
| | | .eq(CmStaffQa::getStaffId,id); |
| | | return cmStaffQaMapper.selectList(wrapper); |
| | | } |
| | | } |
| | |
| | | package com.gkhy.exam.coalmine.service.baseService.impl; |
| | | |
| | | import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; |
| | | import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; |
| | | import com.gkhy.exam.coalmine.mapper.CmStaffMapper; |
| | | import com.gkhy.exam.coalmine.entity.CmStaff; |
| | | import com.gkhy.exam.coalmine.service.baseService.CmStaffService; |
| | | import com.ruoyi.common.enums.coalmineEnums.DeleteStatusEnum; |
| | | import org.springframework.stereotype.Service; |
| | | |
| | | import javax.annotation.Resource; |
| | | |
| | | /** |
| | | * @author hz |
| | |
| | | @Service("cmStaffManageServiceImpl") |
| | | public class CmStaffServiceImpl extends ServiceImpl<CmStaffMapper, CmStaff> implements CmStaffService { |
| | | |
| | | @Resource |
| | | private CmStaffMapper cmStaffMapper; |
| | | |
| | | @Override |
| | | public CmStaff selectByCode(String code) { |
| | | LambdaQueryWrapper<CmStaff> wrapper = new LambdaQueryWrapper<>(); |
| | | wrapper.eq(CmStaff::getCode,code) |
| | | .eq(CmStaff::getDelFlag, DeleteStatusEnum.NO.getStatus()); |
| | | return cmStaffMapper.selectOne(wrapper); |
| | | } |
| | | |
| | | @Override |
| | | public CmStaff getValidById(Long id) { |
| | | LambdaQueryWrapper<CmStaff> wrapper = new LambdaQueryWrapper<>(); |
| | | wrapper.eq(CmStaff::getId,id) |
| | | .eq(CmStaff::getDelFlag, DeleteStatusEnum.NO.getStatus()); |
| | | return cmStaffMapper.selectOne(wrapper); |
| | | } |
| | | } |
| | | |
| | |
| | | import com.gkhy.exam.coalmine.service.baseService.EmonExamRecordService; |
| | | import com.ruoyi.common.enums.coalmineEnums.DeleteStatusEnum; |
| | | import org.springframework.stereotype.Service; |
| | | import org.springframework.util.CollectionUtils; |
| | | |
| | | import javax.annotation.Resource; |
| | | import java.util.List; |
| | |
| | | } |
| | | |
| | | @Override |
| | | public List<EmonExamRecord> listValid() { |
| | | public List<EmonExamRecord> listValid(List<Long> childrenIds) { |
| | | LambdaQueryWrapper<EmonExamRecord> wrapper = new LambdaQueryWrapper<>(); |
| | | wrapper.eq(EmonExamRecord::getDelFlag, DeleteStatusEnum.NO.getStatus()) |
| | | .orderByDesc(EmonExamRecord::getReportTime); |
| | | if (!CollectionUtils.isEmpty(childrenIds)){ |
| | | wrapper.in(EmonExamRecord::getDistrictId,childrenIds); |
| | | } |
| | | return emonExamRecordMapper.selectList(wrapper); |
| | | } |
| | | } |
| | |
| | | |
| | | import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; |
| | | import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; |
| | | import com.gkhy.exam.coalmine.entity.EmonExamRecord; |
| | | import com.gkhy.exam.coalmine.mapper.EmonTrainRecordMapper; |
| | | import com.gkhy.exam.coalmine.entity.EmonTrainRecord; |
| | | import com.gkhy.exam.coalmine.service.baseService.EmonTrainRecordService; |
| | | import com.ruoyi.common.enums.coalmineEnums.DeleteStatusEnum; |
| | | import org.springframework.stereotype.Service; |
| | | import org.springframework.util.CollectionUtils; |
| | | |
| | | import javax.annotation.Resource; |
| | | import java.util.List; |
| | |
| | | } |
| | | |
| | | @Override |
| | | public List<EmonTrainRecord> listValid() { |
| | | public List<EmonTrainRecord> listValid(List<Long> childrenIds) { |
| | | LambdaQueryWrapper<EmonTrainRecord> wrapper = new LambdaQueryWrapper<>(); |
| | | wrapper.eq(EmonTrainRecord::getDelFlag, DeleteStatusEnum.NO.getStatus()) |
| | | .orderByDesc(EmonTrainRecord::getReportTime); |
| | | if (!CollectionUtils.isEmpty(childrenIds)){ |
| | | wrapper.in(EmonTrainRecord::getDistrictId,childrenIds); |
| | | } |
| | | return emonTrainRecordMapper.selectList(wrapper); |
| | | } |
| | | } |
| | |
| | | import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; |
| | | import com.gkhy.exam.coalmine.entity.*; |
| | | import com.gkhy.exam.coalmine.model.dto.req.*; |
| | | import com.gkhy.exam.coalmine.model.dto.resp.CmStaffByCodeRespDTO; |
| | | import com.gkhy.exam.coalmine.model.dto.resp.CmStaffPageRespDTO; |
| | | import com.gkhy.exam.coalmine.service.CmStaffManagerService; |
| | | import com.gkhy.exam.coalmine.service.baseService.*; |
| | |
| | | import com.ruoyi.common.enums.coalmineEnums.DeleteStatusEnum; |
| | | import com.ruoyi.common.exception.BusinessException; |
| | | import com.ruoyi.file.service.AttachmentInfoService; |
| | | import com.ruoyi.system.domain.bo.SysOperateTypeWholeNameBO; |
| | | import com.ruoyi.system.service.SysOperateTypeService; |
| | | import org.springframework.beans.BeanUtils; |
| | | import org.springframework.stereotype.Service; |
| | | import org.springframework.transaction.annotation.Transactional; |
| | | import org.springframework.util.CollectionUtils; |
| | | |
| | | import javax.annotation.Resource; |
| | | import java.util.ArrayList; |
| | | import java.util.List; |
| | | import java.util.stream.Collectors; |
| | | |
| | |
| | | |
| | | @Resource |
| | | private CmStaffTrainService cmStaffTrainService; |
| | | |
| | | @Resource |
| | | private SysOperateTypeService sysOperateTypeService; |
| | | |
| | | @Resource |
| | | private CmStaffResumeService cmStaffResumeService; |
| | |
| | | |
| | | @Override |
| | | public AjaxResult saveCmStaff(CmStaffAddReqDTO reqDTO) { |
| | | CmStaff staff = cmStaffService.selectByCode(reqDTO.getCode()); |
| | | if (staff != null) |
| | | throw new BusinessException(this.getClass(), ResultConstants.SYSTEM_ERROR_DATABASE_FAIL,"该身份证人员已存在"); |
| | | CmStaff cmStaff = new CmStaff(); |
| | | BeanUtils.copyProperties(reqDTO,cmStaff); |
| | | cmStaff.setDelFlag(DeleteStatusEnum.NO.getStatus()); |
| | |
| | | if (cmStaffResume == null) |
| | | return AjaxResult.success("删除履历成功"); |
| | | cmStaffResume.setDelFlag(DeleteStatusEnum.YES.getStatus()); |
| | | boolean save = cmStaffResumeService.save(cmStaffResume); |
| | | boolean save = cmStaffResumeService.updateById(cmStaffResume); |
| | | if (!save) |
| | | throw new BusinessException(this.getClass(), ResultConstants.SYSTEM_ERROR_DATABASE_FAIL,"删除履历失败"); |
| | | return AjaxResult.success("删除履历成功"); |
| | |
| | | if (cmStaffResume == null) |
| | | throw new BusinessException(this.getClass(),ResultConstants.SYSTEM_ERROR_DATABASE_FAIL,"数据不存在"); |
| | | BeanUtils.copyProperties(reqDTO,cmStaffResume,"id"); |
| | | boolean save = cmStaffResumeService.save(cmStaffResume); |
| | | boolean save = cmStaffResumeService.updateById(cmStaffResume); |
| | | if (!save) |
| | | throw new BusinessException(this.getClass(), ResultConstants.SYSTEM_ERROR_DATABASE_FAIL,"删除履历失败"); |
| | | return AjaxResult.success("删除履历成功"); |
| | |
| | | if (cmStaffTrain == null) |
| | | return AjaxResult.success("删除培训经历成功"); |
| | | cmStaffTrain.setDelFlag(DeleteStatusEnum.YES.getStatus()); |
| | | boolean save = cmStaffTrainService.save(cmStaffTrain); |
| | | boolean save = cmStaffTrainService.updateById(cmStaffTrain); |
| | | if (!save) |
| | | throw new BusinessException(this.getClass(), ResultConstants.SYSTEM_ERROR_DATABASE_FAIL,"删除培训经历失败"); |
| | | return AjaxResult.success("删除培训经历成功"); |
| | |
| | | if (cmStaffTrain == null) |
| | | throw new BusinessException(this.getClass(),ResultConstants.SYSTEM_ERROR_DATABASE_FAIL,"数据不存在"); |
| | | BeanUtils.copyProperties(reqDTO,cmStaffTrain,"id"); |
| | | boolean save = cmStaffTrainService.save(cmStaffTrain); |
| | | boolean save = cmStaffTrainService.updateById(cmStaffTrain); |
| | | if (!save) |
| | | throw new BusinessException(this.getClass(), ResultConstants.SYSTEM_ERROR_DATABASE_FAIL,"修改培训经历失败"); |
| | | return AjaxResult.success("修改培训经历成功"); |
| | |
| | | if (cmStaffExam == null) |
| | | return AjaxResult.success("删除考试经历成功"); |
| | | cmStaffExam.setDelFlag(DeleteStatusEnum.YES.getStatus()); |
| | | boolean save = cmStaffExamService.save(cmStaffExam); |
| | | boolean save = cmStaffExamService.updateById(cmStaffExam); |
| | | if (!save) |
| | | throw new BusinessException(this.getClass(), ResultConstants.SYSTEM_ERROR_DATABASE_FAIL,"删除考试经历失败"); |
| | | return AjaxResult.success("删除考试经历成功"); |
| | |
| | | if (cmStaffExam == null) |
| | | throw new BusinessException(this.getClass(),ResultConstants.SYSTEM_ERROR_DATABASE_FAIL,"数据不存在"); |
| | | BeanUtils.copyProperties(reqDTO,cmStaffExam,"id"); |
| | | boolean save = cmStaffExamService.save(cmStaffExam); |
| | | boolean save = cmStaffExamService.updateById(cmStaffExam); |
| | | if (!save) |
| | | throw new BusinessException(this.getClass(), ResultConstants.SYSTEM_ERROR_DATABASE_FAIL,"修改考试经历失败"); |
| | | return AjaxResult.success("修改考试经历成功"); |
| | |
| | | public AjaxResult saveCmStaffQa(CmStaffQaAddReqDTO reqDTO) { |
| | | CmStaffQa cmStaffQa = new CmStaffQa(); |
| | | BeanUtils.copyProperties(reqDTO,cmStaffQa); |
| | | SysOperateTypeWholeNameBO operateTypeWholeName = sysOperateTypeService.getOperateTypeWholeNameById(reqDTO.getOperateTypeId()); |
| | | if (operateTypeWholeName == null) |
| | | throw new BusinessException(this.getClass(), ResultConstants.SYSTEM_ERROR_DATABASE_FAIL,"作业与操作类型不存在"); |
| | | BeanUtils.copyProperties(operateTypeWholeName,cmStaffQa); |
| | | cmStaffQa.setDelFlag(DeleteStatusEnum.NO.getStatus()); |
| | | boolean save = cmStaffQaService.save(cmStaffQa); |
| | | if (!save) |
| | |
| | | if (cmStaffQa == null) |
| | | return AjaxResult.success("删除资格证书成功"); |
| | | cmStaffQa.setDelFlag(DeleteStatusEnum.YES.getStatus()); |
| | | boolean save = cmStaffQaService.save(cmStaffQa); |
| | | boolean save = cmStaffQaService.updateById(cmStaffQa); |
| | | if (!save) |
| | | throw new BusinessException(this.getClass(), ResultConstants.SYSTEM_ERROR_DATABASE_FAIL,"删除资格证书失败"); |
| | | return AjaxResult.success("删除资格证书成功"); |
| | |
| | | if (cmStaffQa == null) |
| | | throw new BusinessException(this.getClass(),ResultConstants.SYSTEM_ERROR_DATABASE_FAIL,"数据不存在"); |
| | | BeanUtils.copyProperties(reqDTO,cmStaffQa,"id"); |
| | | boolean save = cmStaffQaService.save(cmStaffQa); |
| | | SysOperateTypeWholeNameBO operateTypeWholeName = sysOperateTypeService.getOperateTypeWholeNameById(reqDTO.getOperateTypeId()); |
| | | if (operateTypeWholeName == null) |
| | | throw new BusinessException(this.getClass(), ResultConstants.SYSTEM_ERROR_DATABASE_FAIL,"作业与操作类型不存在"); |
| | | BeanUtils.copyProperties(operateTypeWholeName,cmStaffQa); |
| | | boolean save = cmStaffQaService.updateById(cmStaffQa); |
| | | if (!save) |
| | | throw new BusinessException(this.getClass(), ResultConstants.SYSTEM_ERROR_DATABASE_FAIL,"修改资格证书失败"); |
| | | return AjaxResult.success("修改资格证书成功"); |
| | |
| | | wrapper.eq(CmStaff::getDelFlag,DeleteStatusEnum.NO.getStatus()); |
| | | List<CmStaff> cmStaffs = cmStaffService.list(wrapper); |
| | | if (CollectionUtils.isEmpty(cmStaffs)){ |
| | | return null; |
| | | return new ArrayList<>(); |
| | | } |
| | | List<CmStaffPageRespDTO> dtos = cmStaffs.stream().map(cmStaff -> { |
| | | CmStaffPageRespDTO dto = new CmStaffPageRespDTO(); |
| | | BeanUtils.copyProperties(cmStaff,dto); |
| | | Long id = cmStaff.getId(); |
| | | dto.setPhotoAttachment(attachmentInfoService.getById(cmStaff.getPhotoAttachment())); |
| | | dto.setWorkRegistrationVOS(workRegistrationService.getByIdCard(cmStaff.getCode(), (byte) 0)); |
| | |
| | | }).collect(Collectors.toList()); |
| | | return dtos; |
| | | } |
| | | |
| | | @Override |
| | | public AjaxResult editCmStaff(CmStaffUpdateReqDTO reqDTO) { |
| | | CmStaff staff = cmStaffService.selectByCode(reqDTO.getCode()); |
| | | if (staff != null && staff.getId() != reqDTO.getId()) |
| | | throw new BusinessException(this.getClass(), ResultConstants.SYSTEM_ERROR_DATABASE_FAIL,"该身份证人员已存在"); |
| | | BeanUtils.copyProperties(reqDTO,staff); |
| | | boolean save = cmStaffService.updateById(staff); |
| | | if (!save) |
| | | throw new BusinessException(this.getClass(), ResultConstants.SYSTEM_ERROR_DATABASE_FAIL,"修改失败"); |
| | | return AjaxResult.success("修改成功"); |
| | | } |
| | | |
| | | @Override |
| | | @Transactional |
| | | public AjaxResult deleteCmStaff(Long id) { |
| | | CmStaff cmStaff = cmStaffService.getValidById(id); |
| | | if (cmStaff == null) |
| | | return AjaxResult.success("删除成功"); |
| | | cmStaff.setDelFlag(DeleteStatusEnum.YES.getStatus()); |
| | | boolean result = cmStaffService.updateById(cmStaff); |
| | | if (!result) |
| | | return AjaxResult.success("删除失败"); |
| | | List<CmStaffExam> cmStaffExams = cmStaffExamService.listValid(id); |
| | | if (!CollectionUtils.isEmpty(cmStaffExams)){ |
| | | cmStaffExams = cmStaffExams.stream().map(cmStaffExam -> { |
| | | cmStaffExam.setDelFlag(DeleteStatusEnum.YES.getStatus()); |
| | | return cmStaffExam; |
| | | }).collect(Collectors.toList()); |
| | | boolean cmStaffExamResult = cmStaffExamService.updateBatchById(cmStaffExams); |
| | | if (!cmStaffExamResult) |
| | | return AjaxResult.success("删除失败"); |
| | | } |
| | | List<CmStaffQa> cmStaffQas = cmStaffQaService.listValid(id); |
| | | if (!CollectionUtils.isEmpty(cmStaffQas)){ |
| | | cmStaffQas = cmStaffQas.stream().map(cmStaffQa -> { |
| | | cmStaffQa.setDelFlag(DeleteStatusEnum.YES.getStatus()); |
| | | return cmStaffQa; |
| | | }).collect(Collectors.toList()); |
| | | boolean cmStaffQaResult = cmStaffQaService.updateBatchById(cmStaffQas); |
| | | if (!cmStaffQaResult) |
| | | return AjaxResult.success("删除失败"); |
| | | } |
| | | List<CmStaffResume> cmStaffResumes = cmStaffResumeService.listValid(id); |
| | | if (!CollectionUtils.isEmpty(cmStaffResumes)){ |
| | | cmStaffResumes = cmStaffResumes.stream().map(cmStaffResume -> { |
| | | cmStaffResume.setDelFlag(DeleteStatusEnum.YES.getStatus()); |
| | | return cmStaffResume; |
| | | }).collect(Collectors.toList()); |
| | | boolean cmStaffResumeResult = cmStaffResumeService.updateBatchById(cmStaffResumes); |
| | | if (!cmStaffResumeResult) |
| | | return AjaxResult.success("删除失败"); |
| | | } |
| | | List<CmStaffTrain> cmStaffTrains = cmStaffTrainService.listValid(id); |
| | | if (!CollectionUtils.isEmpty(cmStaffTrains)){ |
| | | cmStaffTrains = cmStaffTrains.stream().map(cmStaffTrain -> { |
| | | cmStaffTrain.setDelFlag(DeleteStatusEnum.YES.getStatus()); |
| | | return cmStaffTrain; |
| | | }).collect(Collectors.toList()); |
| | | boolean cmStaffTrainResult = cmStaffTrainService.updateBatchById(cmStaffTrains); |
| | | if (!cmStaffTrainResult) |
| | | return AjaxResult.success("删除失败"); |
| | | } |
| | | return AjaxResult.success("删除成功"); |
| | | } |
| | | |
| | | @Override |
| | | public AjaxResult selectByCode(String code) { |
| | | LambdaQueryWrapper<CmStaff> wrapper = new LambdaQueryWrapper<>(); |
| | | wrapper.eq(CmStaff::getDelFlag,DeleteStatusEnum.NO.getStatus()) |
| | | .eq(CmStaff::getCode,code); |
| | | CmStaff cmStaff = cmStaffService.getOne(wrapper); |
| | | if (wrapper == null){ |
| | | return AjaxResult.success(); |
| | | } |
| | | CmStaffByCodeRespDTO dto = new CmStaffByCodeRespDTO(); |
| | | BeanUtils.copyProperties(cmStaff,dto); |
| | | Long id = cmStaff.getId(); |
| | | dto.setPhotoAttachment(attachmentInfoService.getById(cmStaff.getPhotoAttachment())); |
| | | dto.setWorkRegistrationVOS(workRegistrationService.getByIdCard(cmStaff.getCode(), (byte) 0)); |
| | | dto.setViolationRegistrationVOS(violationRegistrationService.getByIdCard(cmStaff.getCode(),(byte)0)); |
| | | dto.setCmStaffResumes(cmStaffResumeService.listValid(id)); |
| | | dto.setCmStaffTrains(cmStaffTrainService.listValid(id)); |
| | | dto.setCmStaffExams(cmStaffExamService.listValid(id)); |
| | | dto.setCmStaffQas(cmStaffQaService.listValid(id)); |
| | | return AjaxResult.success(dto); |
| | | } |
| | | } |
| | |
| | | wrapper.eq(ExaminerManage::getDelFlag,DeleteStatusEnum.NO.getStatus()); |
| | | List<ExaminerManage> list = examinerManageService.list(wrapper); |
| | | if (CollectionUtils.isEmpty(list)) |
| | | return null; |
| | | return new ArrayList<>(); |
| | | List<GetExaminerRespDTO> dtos = new ArrayList<>(); |
| | | for (ExaminerManage manage : list) { |
| | | GetExaminerRespDTO dto = getExaminerRespDTO(manage); |
| | |
| | | wrapper.eq(TeacherManage::getDelFlag,DeleteStatusEnum.NO.getStatus()); |
| | | List<TeacherManage> list = teacherManageService.list(wrapper); |
| | | if (CollectionUtils.isEmpty(list)) |
| | | return null; |
| | | return new ArrayList<>(); |
| | | List<GetTeacherRespDTO> dtos = new ArrayList<>(); |
| | | for (TeacherManage manage : list) { |
| | | GetTeacherRespDTO dto = getTeacherRespDTO(manage); |
| | |
| | | import com.ruoyi.common.utils.SecurityUtils; |
| | | import com.ruoyi.file.entity.AttachmentInfo; |
| | | import com.ruoyi.file.service.AttachmentService; |
| | | import com.ruoyi.system.service.SysDistrictService; |
| | | import org.apache.commons.lang3.StringUtils; |
| | | import org.springframework.beans.BeanUtils; |
| | | import org.springframework.stereotype.Service; |
| | |
| | | import org.springframework.web.multipart.MultipartFile; |
| | | |
| | | import javax.annotation.Resource; |
| | | import java.util.ArrayList; |
| | | import java.util.Arrays; |
| | | import java.util.Date; |
| | | import java.util.List; |
| | |
| | | |
| | | @Resource |
| | | private AttachmentService attachmentService; |
| | | |
| | | @Resource |
| | | private SysDistrictService sysDistrictService; |
| | | |
| | | @Resource |
| | | private EmonExamRecordService emonExamRecordService; |
| | |
| | | |
| | | @Override |
| | | public List<GetExamDataRespDTO> getExamData() { |
| | | List<EmonExamRecord> emonExamRecords = emonExamRecordService.listValid(); |
| | | Long districtId = SecurityUtils.getLoginUser().getUser().getDistrictId(); |
| | | List<Long> childrenIds = sysDistrictService.selectChildrenIdsById(districtId); |
| | | List<EmonExamRecord> emonExamRecords = emonExamRecordService.listValid(childrenIds); |
| | | if (!CollectionUtils.isEmpty(emonExamRecords)){ |
| | | List<GetExamDataRespDTO> list = emonExamRecords.stream().map(emonExamRecord -> { |
| | | GetExamDataRespDTO dto = new GetExamDataRespDTO(); |
| | |
| | | }).collect(Collectors.toList()); |
| | | return list; |
| | | } |
| | | return null; |
| | | return new ArrayList<>(); |
| | | } |
| | | |
| | | @Override |
| | | public List<GetTrainDataRespDTO> getTrainData() { |
| | | List<EmonTrainRecord> emonTrainRecords = emonTrainRecordService.listValid(); |
| | | Long districtId = SecurityUtils.getLoginUser().getUser().getDistrictId(); |
| | | List<Long> childrenIds = sysDistrictService.selectChildrenIdsById(districtId); |
| | | List<EmonTrainRecord> emonTrainRecords = emonTrainRecordService.listValid(childrenIds); |
| | | if (!CollectionUtils.isEmpty(emonTrainRecords)){ |
| | | List<GetTrainDataRespDTO> list = emonTrainRecords.stream().map(emonTrainRecord -> { |
| | | GetTrainDataRespDTO dto = new GetTrainDataRespDTO(); |
| | |
| | | }).collect(Collectors.toList()); |
| | | return list; |
| | | } |
| | | return null; |
| | | return new ArrayList<>(); |
| | | } |
| | | |
| | | @Override |
| | |
| | | |
| | | <resultMap type="com.gkhy.exam.coalmine.entity.ExaminerManageOperateTypeBind" id="ExaminerManageOperateTypeBindMap"> |
| | | <result property="id" column="id"/> |
| | | <result property="teacherManageId" column="teacher_manage_id"/> |
| | | <result property="examinerManageId" column="examiner_manage_id"/> |
| | | <result property="operateTypeId" column="operate_type_id"/> |
| | | <result property="qualificationType" column="qualification_type"/> |
| | | <result property="jobCategory" column="job_category"/> |
| | |
| | | </resultMap> |
| | | |
| | | <sql id="selectAllField"> |
| | | select id, teacher_manage_id, operate_type_id, qualification_type, job_category, operation_items, del_flag, create_by, create_time, update_by, update_time |
| | | select id, examiner_manage_id, operate_type_id, qualification_type, job_category, operation_items, del_flag, create_by, create_time, update_by, update_time |
| | | from examiner_manage_operate_type_bind |
| | | </sql> |
| | | </mapper> |
| | |
| | | private boolean enabled; |
| | | |
| | | /** 设置请求的统一前缀 */ |
| | | @Value("${swagger.pathMapping}") |
| | | //@Value("${swagger.pathMapping}") |
| | | private String pathMapping; |
| | | |
| | | /** |
| | |
| | | // 用ApiInfoBuilder进行定制 |
| | | return new ApiInfoBuilder() |
| | | // 设置标题 |
| | | .title("标题:若依管理系统_接口文档") |
| | | .title("标题:考试系统_接口文档") |
| | | // 描述 |
| | | .description("描述:用于管理集团旗下公司的人员信息,具体包括XXX,XXX模块...") |
| | | .description("描述:具体包括煤矿,非煤模块...") |
| | | // 作者信息 |
| | | .contact(new Contact(ruoyiConfig.getName(), null, null)) |
| | | // 版本 |
| | |
| | | public Object handleMethodArgumentNotValidException(MethodArgumentNotValidException e) |
| | | { |
| | | //log.error(e.getMessage(), e); |
| | | log.error(e.getBindingResult().getFieldError()+""); |
| | | //log.error(e.getBindingResult().getFieldError()+""); |
| | | String message = e.getBindingResult().getFieldError().getDefaultMessage(); |
| | | return AjaxResult.error(ResultConstants.PARAM_ERROR.getCode(),message); |
| | | } |
| | |
| | | public void resetDistrictCache(); |
| | | |
| | | List<DistrictTreeRespDTO> selectAllByTree(); |
| | | |
| | | List<Long> selectChildrenIdsById(Long id); |
| | | } |
| | | |
| | |
| | | return collect; |
| | | } |
| | | |
| | | @Override |
| | | public List<Long> selectChildrenIdsById(Long id) { |
| | | List<SysDistrict> districts = this.selectAll(); |
| | | if (CollectionUtils.isEmpty(districts)){ |
| | | throw new BusinessException(this.getClass(), ResultConstants.SYSTEM_ERROR_DATABASE_FAIL,"区划信息获取失败"); |
| | | } |
| | | List<Long> list = new ArrayList<>(); |
| | | districts.stream() |
| | | //父节点的id = 0,根据它开始进行实现。 |
| | | .filter(e -> e.getId().equals(id)) |
| | | .map(e ->{ |
| | | list.add(e.getId()); |
| | | getchildrenIds(list,e,districts); |
| | | return e; |
| | | }).collect(Collectors.toList()); |
| | | return list; |
| | | } |
| | | |
| | | private void getchildrenIds(List<Long> list,SysDistrict root,List<SysDistrict> districts){ |
| | | //root为每次最新的传递过来的数据,也就是上面过滤之后的 e ; |
| | | List<SysDistrict> collect = districts.stream() |
| | | //根据传递过来的 e ,拿到他的id,来查询出他的子节点id 这里有个特点 e.id = 子节点的父节点id |
| | | .filter(e -> Objects.equals(e.getParentcode(), root.getCode())) |
| | | .map(e -> { |
| | | list.add(e.getId()); |
| | | getchildrenIds(list,e,districts); |
| | | //递归找到他的子节点,直到找到最后一个子节点为止,饼进行封装。 |
| | | return e; |
| | | }).collect(Collectors.toList()); |
| | | } |
| | | } |
| | | |
| | |
| | | package com.ruoyi.system.service.impl; |
| | | |
| | | import com.alibaba.fastjson2.JSON; |
| | | import com.alibaba.fastjson2.TypeReference; |
| | | import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; |
| | | import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; |
| | | import com.ruoyi.common.constant.CacheConstants; |
| | |
| | | SysOperateTypeWholeNameBO nameBO = this.operateTypeWholeNameCacheById(sysOperateType.getId()); |
| | | map.put(sysOperateType.getId(),nameBO); |
| | | } |
| | | SpringUtils.getBean(RedisCache.class).setCacheObject(CacheConstants.SYS_OPERATE_TYPE_NAME_KEY, map); |
| | | String info = JSON.toJSONString(map); |
| | | SpringUtils.getBean(RedisCache.class).setCacheObject(CacheConstants.SYS_OPERATE_TYPE_NAME_KEY, info); |
| | | } |
| | | } |
| | | |
| | |
| | | |
| | | @Override |
| | | public SysOperateTypeWholeNameBO getOperateTypeWholeNameById(Long id) { |
| | | Map<Long, SysOperateTypeWholeNameBO> map = redisCache.getCacheObject(CacheConstants.SYS_OPERATE_TYPE_NAME_KEY); |
| | | String info = redisCache.getCacheObject(CacheConstants.SYS_OPERATE_TYPE_NAME_KEY); |
| | | Map<Long, SysOperateTypeWholeNameBO> map = JSON.parseObject(info, new TypeReference<Map<Long, SysOperateTypeWholeNameBO>>() {}); |
| | | if (map != null){ |
| | | return map.get(id); |
| | | } |