swspkmas.git - Gitblit

			@@ -12,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;
			@@ -91,9 +92,9 @@
			*/
			public List<ViolationRegistrationVO> getByIdCard(String idCard,byte isCm){
			List<ViolationRegistration> violationRegistrations = baseMapper.selectList(new LambdaQueryWrapper<ViolationRegistration>()
			.eq(ViolationRegistration::getDelFlag, 0)
			.eq(ViolationRegistration::getDelFlag, (byte)0)
			.eq(ViolationRegistration::getIdCard, idCard)
			.eq(idCard != null,ViolationRegistration::getIsCm,isCm));
			.eq(ViolationRegistration::getIsCm,isCm));
			List<ViolationRegistrationVO> list = violationRegistrations.stream().map(registration -> {
			ViolationRegistrationVO violationRegistrationVO = new ViolationRegistrationVO();
			BeanUtils.copyProperties(registration, violationRegistrationVO);
			@@ -123,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));