|
@@ -13,6 +13,7 @@ import com.platform.dao.dto.sb.BatchSbMeasureLog;
|
|
|
import com.platform.dao.dto.sb.SbChangeRecordDTO;
|
|
|
import com.platform.dao.dto.sb.SbInfoDTO;
|
|
|
import com.platform.dao.dto.sb.SbMeasureLogDTO;
|
|
|
+import com.platform.dao.dto.upms.SysFileDTO;
|
|
|
import com.platform.dao.entity.check.CheckProjectStandardRelation;
|
|
|
import com.platform.dao.entity.sb.SbChangeRecord;
|
|
|
import com.platform.dao.entity.sb.SbInfo;
|
|
@@ -139,7 +140,20 @@ public class SbMeasureLogServiceImpl extends BaseServiceImpl<SbMeasureLogMapper,
|
|
|
} else {
|
|
|
|
|
|
}
|
|
|
- AbstractPageResultBean<SbMeasureLog> pageInfo = new MyPage(mapper.selectList(record));
|
|
|
+ List<SbMeasureLogVO> sbMeasureLogVOS = mapper.selectList(record);
|
|
|
+ SysFileDTO sysFileDTO = new SysFileDTO();
|
|
|
+ sysFileDTO.setType(SysFileTypeEnum.SB_MEASURE_LOG_CREDENTIAL.getValue());
|
|
|
+ List<SysFile> sysFiles = sysFileService.getModelListByDTO(sysFileDTO);
|
|
|
+ for (SbMeasureLogVO sbMeasureLogVO:sbMeasureLogVOS){
|
|
|
+ List<SysFile> sysFileList = new ArrayList<>();
|
|
|
+ for (SysFile sysFile:sysFiles){
|
|
|
+ if (sysFile.getTargetId().equals(sbMeasureLogVO.getId())){
|
|
|
+ sysFileList.add(sysFile);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ sbMeasureLogVO.setSbMeasureLogCredential(sysFileList);
|
|
|
+ }
|
|
|
+ AbstractPageResultBean<SbMeasureLog> pageInfo = new MyPage(sbMeasureLogVOS);
|
|
|
return pageInfo;
|
|
|
}
|
|
|
|