From 8208e8137a3d950152d358ccd2ab0a8dc08cf4de Mon Sep 17 00:00:00 2001
From: zf <1603559716@qq.com>
Date: 星期四, 14 九月 2023 17:13:20 +0800
Subject: [PATCH] 机构&&考点
---
exam-system/src/main/java/com/gkhy/exam/noncoalmine/service/impl/ViolationRegistrationServiceImpl.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/exam-system/src/main/java/com/gkhy/exam/noncoalmine/service/impl/ViolationRegistrationServiceImpl.java b/exam-system/src/main/java/com/gkhy/exam/noncoalmine/service/impl/ViolationRegistrationServiceImpl.java
index 564a9df..c851749 100644
--- a/exam-system/src/main/java/com/gkhy/exam/noncoalmine/service/impl/ViolationRegistrationServiceImpl.java
+++ b/exam-system/src/main/java/com/gkhy/exam/noncoalmine/service/impl/ViolationRegistrationServiceImpl.java
@@ -89,13 +89,20 @@
/**
* 根据身份证获取违章数据
*/
- public List<ViolationRegistrationVO> getByIdCard(String idCard){
+ public List<ViolationRegistrationVO> getByIdCard(String idCard,byte isCm){
List<ViolationRegistration> violationRegistrations = baseMapper.selectList(new LambdaQueryWrapper<ViolationRegistration>()
.eq(ViolationRegistration::getDelFlag, 0)
- .eq(ViolationRegistration::getIdCard, idCard));
+ .eq(ViolationRegistration::getIdCard, idCard)
+ .eq(idCard != null,ViolationRegistration::getIsCm,isCm));
List<ViolationRegistrationVO> list = violationRegistrations.stream().map(registration -> {
ViolationRegistrationVO violationRegistrationVO = new ViolationRegistrationVO();
BeanUtils.copyProperties(registration, violationRegistrationVO);
+ SysOperateTypeWholeNameBO operateTypeWholeName = sysOperateTypeService.getOperateTypeWholeNameById(registration.getOperateTypeId());
+ violationRegistrationVO.setJobCategory(operateTypeWholeName.getJobCategory());
+ violationRegistrationVO.setQualificationType(operateTypeWholeName.getQualificationType());
+ violationRegistrationVO.setOperationItems(operateTypeWholeName.getOperationItems());
+ //附件转换
+ violationRegistrationVO.setViolationPath(getAttachmentUrl(registration.getViolationPath()));
return violationRegistrationVO;
}).collect(Collectors.toList());
return list;
--
Gitblit v1.9.2