diff --git a/src/main/java/com/zhgd/xmgl/modules/exam/controller/ExamTrainController.java b/src/main/java/com/zhgd/xmgl/modules/exam/controller/ExamTrainController.java index b72c07731..4cbd93b13 100644 --- a/src/main/java/com/zhgd/xmgl/modules/exam/controller/ExamTrainController.java +++ b/src/main/java/com/zhgd/xmgl/modules/exam/controller/ExamTrainController.java @@ -89,6 +89,7 @@ public class ExamTrainController { @PostMapping(value = "/list") public Result> queryList(@RequestBody ExamTrain examTrain) { QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(examTrain); + queryWrapper.orderByDesc("create_time"); List list = examTrainService.pageList(new Page(-1, -1), queryWrapper).getRecords(); return Result.success(list); } diff --git a/src/main/java/com/zhgd/xmgl/modules/exam/controller/ExamWorkerController.java b/src/main/java/com/zhgd/xmgl/modules/exam/controller/ExamWorkerController.java index 095aab3f4..edf4e3b5d 100644 --- a/src/main/java/com/zhgd/xmgl/modules/exam/controller/ExamWorkerController.java +++ b/src/main/java/com/zhgd/xmgl/modules/exam/controller/ExamWorkerController.java @@ -122,10 +122,14 @@ public class ExamWorkerController { if (examTrainRecordEntity == null) { result.error500("未找到对应实体"); } else { - examTrainRecordEntity.setStartExamTime(new Date()); - examTrainRecordEntity.setExamCount(examTrainRecordEntity.getExamCount() - 1); - result.setResult(examTrainRecordService.updateById(examTrainRecordEntity)); - result.setSuccess(true); + if (examTrainRecordEntity.getExamCount() == 0) { + result.error500("您已没有考试的次数!"); + } else { + examTrainRecordEntity.setStartExamTime(new Date()); + examTrainRecordEntity.setExamCount(examTrainRecordEntity.getExamCount() - 1); + result.setResult(examTrainRecordService.updateById(examTrainRecordEntity)); + result.setSuccess(true); + } } return result; } diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/entity/XzVisitorManageRecord.java b/src/main/java/com/zhgd/xmgl/modules/xz/entity/XzVisitorManageRecord.java index 5c5ad2cf3..cd83140a7 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/entity/XzVisitorManageRecord.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/entity/XzVisitorManageRecord.java @@ -103,4 +103,34 @@ public class XzVisitorManageRecord implements Serializable { @Excel(name = "车牌号", width = 15) @ApiModelProperty(value = "车牌号") private String carNumber; + /** + * 来访人单位 + */ + @Excel(name = "来访人单位", width = 15) + @ApiModelProperty(value = "来访人单位") + private String visitUnit; + /** + * 接送人姓名 + */ + @Excel(name = "接送人姓名", width = 15) + @ApiModelProperty(value = "接送人姓名") + private String takeName; + /** + * 接送人手机号 + */ + @Excel(name = "接送人手机号", width = 15) + @ApiModelProperty(value = "接送人手机号") + private String takePhone; + /** + * 接送人单位 + */ + @Excel(name = "接送人单位", width = 15) + @ApiModelProperty(value = "接送人单位") + private String takeUnit; + /** + * 接送人职务 + */ + @Excel(name = "接送人职务", width = 15) + @ApiModelProperty(value = "接送人职务") + private String takeJob; }