diff --git a/ccic-entity/src/main/java/com/ccic/safeliab/entity/ExamSchedule.java b/ccic-entity/src/main/java/com/ccic/safeliab/entity/ExamSchedule.java index b2dd579..31ac3af 100644 --- a/ccic-entity/src/main/java/com/ccic/safeliab/entity/ExamSchedule.java +++ b/ccic-entity/src/main/java/com/ccic/safeliab/entity/ExamSchedule.java @@ -14,7 +14,7 @@ import java.sql.Timestamp; @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) @TableName("ex_exam_info") -public class ExamSchedule{ +public class ExamSchedule extends BaseEntity{ private static final long serialVersionUID = 1L; /** @@ -31,12 +31,4 @@ public class ExamSchedule{ private String validTo; private Integer publishStatus; private String remark; - private Long createUser; - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - private Timestamp createTime; - private Long updateUser; - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - private Timestamp updateTime; - private Integer status; - private Integer isDeleted; } diff --git a/ccic-exam/src/main/java/com/ccic/safeliab/dao/ExamScheduleMapper.java b/ccic-exam/src/main/java/com/ccic/safeliab/dao/ExamScheduleMapper.java index 3554315..0b77843 100644 --- a/ccic-exam/src/main/java/com/ccic/safeliab/dao/ExamScheduleMapper.java +++ b/ccic-exam/src/main/java/com/ccic/safeliab/dao/ExamScheduleMapper.java @@ -2,6 +2,7 @@ package com.ccic.safeliab.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.ccic.safeliab.entity.ExamSchedule; +import com.ccic.safeliab.entity.Industry; import org.apache.ibatis.annotations.Mapper; import java.util.List; @@ -10,4 +11,6 @@ import java.util.Map; @Mapper public interface ExamScheduleMapper extends BaseMapper { List selectExamSchedule(Map param); + List> getIndustry(); + List> getPaper(); } \ No newline at end of file diff --git a/ccic-exam/src/main/java/com/ccic/safeliab/service/ExamScheduleService.java b/ccic-exam/src/main/java/com/ccic/safeliab/service/ExamScheduleService.java index 0212201..b2fcf2d 100644 --- a/ccic-exam/src/main/java/com/ccic/safeliab/service/ExamScheduleService.java +++ b/ccic-exam/src/main/java/com/ccic/safeliab/service/ExamScheduleService.java @@ -2,10 +2,14 @@ package com.ccic.safeliab.service; import com.baomidou.mybatisplus.extension.service.IService; import com.ccic.safeliab.entity.ExamSchedule; +import com.ccic.safeliab.entity.Industry; +import com.ccic.safeliab.support.BaseService; import java.util.List; import java.util.Map; -public interface ExamScheduleService extends IService { +public interface ExamScheduleService extends BaseService { public List selectExamSchedule(Map param); + public List> getIndustry(); + public List> getPaper(); } diff --git a/ccic-exam/src/main/java/com/ccic/safeliab/service/ExamScheduleServiceImpl.java b/ccic-exam/src/main/java/com/ccic/safeliab/service/ExamScheduleServiceImpl.java index f4d05bc..2d081be 100644 --- a/ccic-exam/src/main/java/com/ccic/safeliab/service/ExamScheduleServiceImpl.java +++ b/ccic-exam/src/main/java/com/ccic/safeliab/service/ExamScheduleServiceImpl.java @@ -1,16 +1,30 @@ package com.ccic.safeliab.service; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ccic.safeliab.dao.ExamScheduleMapper; import com.ccic.safeliab.entity.ExamSchedule; +import com.ccic.safeliab.entity.Industry; +import com.ccic.safeliab.support.BaseServiceImpl; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; import java.util.Map; @Service -public class ExamScheduleServiceImpl extends ServiceImpl implements ExamScheduleService { +public class ExamScheduleServiceImpl extends BaseServiceImpl implements ExamScheduleService { + public List selectExamSchedule(Map param){ return baseMapper.selectExamSchedule(param); } + + public List> getIndustry(){ + return baseMapper.getIndustry(); + } + + public List> getPaper(){ + return baseMapper.getPaper(); + } + } diff --git a/ccic-exam/src/main/java/com/ccic/safeliab/web/ExamScheduleController.java b/ccic-exam/src/main/java/com/ccic/safeliab/web/ExamScheduleController.java index 5b44275..7836aff 100644 --- a/ccic-exam/src/main/java/com/ccic/safeliab/web/ExamScheduleController.java +++ b/ccic-exam/src/main/java/com/ccic/safeliab/web/ExamScheduleController.java @@ -15,7 +15,7 @@ import java.util.List; import java.util.Map; @RestController -@RequestMapping("/exam-schedule") +@RequestMapping("/ex/exam-schedule") public class ExamScheduleController { @Autowired private ExamScheduleService service; @@ -54,15 +54,29 @@ public class ExamScheduleController { } @PostMapping("/update") public R update(@RequestBody ExamScheduleVO examSchedule) { + examSchedule.setPublishStatus(0); boolean result = service.saveOrUpdate(examSchedule); return R.ok().data("success."); } @PostMapping("/insert") public R insert(@RequestBody ExamScheduleVO examSchedule) { + examSchedule.setPublishStatus(0); boolean result = service.save(examSchedule); return R.ok().data("success."); } + @GetMapping("/getIndustry") + public R getIndustry(){ + return R.ok().data(service.getIndustry()); + } + + @GetMapping("/getPaper") + public R getPaper(){ + List> results = new ArrayList<>(); + results.addAll(service.getPaper()); + return R.ok().data(results); + } + @GetMapping("/show") public R show() { diff --git a/ccic-exam/src/main/resources/mappers/ExamScheduleMapper.xml b/ccic-exam/src/main/resources/mappers/ExamScheduleMapper.xml index 446d018..7c62d00 100644 --- a/ccic-exam/src/main/resources/mappers/ExamScheduleMapper.xml +++ b/ccic-exam/src/main/resources/mappers/ExamScheduleMapper.xml @@ -30,4 +30,21 @@ AND #{date} BETWEEN info.valid_from AND info.valid_to + + \ No newline at end of file