修改

heheng

2025-05-19 3a762add44449332d6d379e361698850f6066e16

 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;
@@ -11,6 +12,7 @@
import com.gkhy.exam.noncoalmine.model.vo.ViolationRegistrationVO;
import com.gkhy.exam.noncoalmine.model.vo.WorkRegistrationVO;
import com.gkhy.exam.noncoalmine.service.ViolationRegistrationService;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.bean.BeanUtils;
import com.ruoyi.file.entity.AttachmentInfo;
import com.ruoyi.file.mapper.AttachmentInfoMapper;
@@ -61,7 +63,6 @@
      }).collect(Collectors.toList());
      return list;
   }

   /**
    * 新增
    * @param addForm
@@ -89,16 +90,31 @@
   /**
    * 根据身份证获取违章数据
    */
   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::getDelFlag, (byte)0)
            .eq(ViolationRegistration::getIdCard, idCard)
            .eq(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);
   }


@@ -108,6 +124,9 @@
    * @return
    */
   private String getAttachmentUrl(String keys){
      if(StringUtils.isEmpty(keys)){
         return null;
      }
      String[] arry = keys.split(",");
      StringBuffer paths = new StringBuffer();
      List<AttachmentInfo> attachmentList = attachmentInfoService.findByKeys(Arrays.asList(arry));