From c858ae26143fde37b8c77d403baeb7a050bc2ab6 Mon Sep 17 00:00:00 2001
From: zf <1603559716@qq.com>
Date: Mon, 25 Sep 2023 15:17:42 +0800
Subject: [PATCH] 非煤相关接口
---
exam-system/src/main/java/com/gkhy/exam/noncoalmine/service/impl/ViolationRegistrationServiceImpl.java | 21 ++++++++++++++++++---
1 files changed, 18 insertions(+), 3 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..12f8231 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
@@ -1,6 +1,7 @@
package com.gkhy.exam.noncoalmine.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.gkhy.exam.noncoalmine.entity.ViolationRegistration;
import com.gkhy.exam.noncoalmine.entity.WorkRegistration;
@@ -61,7 +62,6 @@
}).collect(Collectors.toList());
return list;
}
-
/**
* 新增
* @param addForm
@@ -89,18 +89,33 @@
/**
* 根据身份证获取违章数据
*/
- 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;
}
+ @Override
+ public void delBatch(List<Long> violationIds) {
+ UpdateWrapper<ViolationRegistration> updateWrapper = new UpdateWrapper<>();
+ updateWrapper.in("violation_id",violationIds)
+ .set("del_flag",(byte)2);
+ this.update(updateWrapper);
+ }
+
/**
* 附件转换
--
Gitblit v1.9.2