Merge branch 'master' of http://47.110.251.215:3000/java_org/bladex

blade-service/blade-archive/src/main/java/org/springblade/archive/controller/ArchivesAutoController.java

@@ -35,6 +35,8 @@ import org.springblade.archive.wrapper.ArchivesAutoWrapper;
 import org.springblade.archive.service.IArchivesAutoService;
 import org.springblade.core.boot.ctrl.BladeController;
 
+import java.util.List;
+
 /**
  *  控制器
  *
@@ -101,8 +103,8 @@ public class ArchivesAutoController extends BladeController {
 			@ApiImplicitParam(name = "queryValue", value = "输入框模糊搜索"),
 			@ApiImplicitParam(name = "searchType", value = "搜索类型1案卷2文件")
 	})
-	public R<IPage<ArchivesAuto>> pageByArchivesAuto(ArchivesAutoVO archivesAuto) {
-		IPage<ArchivesAuto> pages = archivesAutoService.pageByArchivesAuto(archivesAuto);
+	public R<IPage<ArchivesAutoVO>> pageByArchivesAuto(ArchivesAutoVO archivesAuto) {
+		IPage<ArchivesAutoVO> pages = archivesAutoService.pageByArchivesAuto(archivesAuto);
 		return R.data(pages);
 	}
 

blade-service/blade-archive/src/main/java/org/springblade/archive/mapper/ArchivesAutoMapper.java

@@ -57,5 +57,5 @@ public interface ArchivesAutoMapper extends BaseMapper<ArchivesAuto> {
 	 */
 	List<ArchivesAutoDTO> getListByProjectId(@Param("projectId") Long projectId);
 
-    List<ArchivesAuto> pageByArchivesAuto(IPage page, @Param("vo") ArchivesAutoVO vo);
+    List<ArchivesAutoVO> pageByArchivesAuto(IPage page, @Param("vo") ArchivesAutoVO vo);
 }

blade-service/blade-archive/src/main/java/org/springblade/archive/service/IArchivesAutoService.java

@@ -38,7 +38,7 @@ public interface IArchivesAutoService extends BaseService<ArchivesAuto> {
 	 */
 	IPage<ArchivesAutoVO> selectArchivesAutoPage(IPage<ArchivesAutoVO> page, ArchivesAutoVO archivesAuto);
 
-	IPage<ArchivesAuto> pageByArchivesAuto(ArchivesAutoVO archivesAuto);
+	IPage<ArchivesAutoVO> pageByArchivesAuto(ArchivesAutoVO archivesAuto);
 
 	IPage<ArchivesAutoVO> selectArchivesAutoFilePage(ArchivesAutoVO queryVo);
 

blade-service/blade-archive/src/main/java/org/springblade/archive/service/impl/ArchivesAutoServiceImpl.java

@@ -68,8 +68,8 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
 	}
 
 	@Override
-	public IPage<ArchivesAuto> pageByArchivesAuto(ArchivesAutoVO vo) {
-		IPage<ArchivesAuto> page = new Page<>();
+	public IPage<ArchivesAutoVO> pageByArchivesAuto(ArchivesAutoVO vo) {
+		IPage<ArchivesAutoVO> page = new Page<>();
 		if (StringUtils.isNotBlank(vo.getStorageTime())) {
 			vo.setStorageTimes(Arrays.asList(vo.getStorageTime().split(",")));
 		}
@@ -85,7 +85,16 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
 		if (StringUtils.isNotBlank(vo.getMonth())) {
 			vo.setMonths(Arrays.asList(vo.getMonth().split(",")));
 		}
-		return page.setRecords(baseMapper.pageByArchivesAuto(page,vo));
+		List<ArchivesAutoVO> archivesAutos = baseMapper.pageByArchivesAuto(page, vo);
+		archivesAutos.stream().forEach(aa->{
+			if (StringUtils.isNotBlank(aa.getStorageTime())){
+				aa.setStorageTimeValue("9999".equals(aa.getStorageTime())?"永久":("30".equals(aa.getStorageTime())?"30年":"10年"));
+			}
+			if (StringUtils.isNotBlank(aa.getSecretLevel())){
+				aa.setSecretLevelValue("1".equals(aa.getSecretLevel())?"机密":("2".equals(aa.getSecretLevel())?"绝密":"秘密"));
+			}
+		});
+		return page.setRecords(archivesAutos);
 	}
 
 	@Override