Merge branch 'master' of http://www.flowbb.cn:9997/humuyu/efs

# Conflicts:
#	eladmin-system/src/main/java/me/zhengjie/archives/controller/ArchivesController.java
#	eladmin-system/src/main/java/me/zhengjie/archives/controller/OldArchivesController.java
#	eladmin-system/src/main/java/me/zhengjie/archives/dto/GzDetailDto.java
#	eladmin-system/src/main/java/me/zhengjie/archives/entity/GzArchivesEntity.java
#	eladmin-system/src/main/java/me/zhengjie/archives/service/GzArchivesService.java
#	eladmin-system/src/main/java/me/zhengjie/archives/service/impl/GzArchivesServiceImpl.java
#	eladmin-system/src/main/java/me/zhengjie/archives/vo/GzArchivesVo.java

eladmin-system/src/main/java/me/zhengjie/archives/controller/ArchivesController.java

@@ -18,7 +18,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
+<<<<<<< HEAD
 import org.springframework.security.core.userdetails.UserDetails;
+=======
+>>>>>>> 0c389bffe198548263c292beabdd50c2415fd8f3
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -80,7 +83,11 @@ public class ArchivesController {
 	@AnonymousPostMapping("/mergeSubmit")
 	public ResponseDTO<Map<String, String>> mergeSubmit(@RequestBody CasePortraitVo archives) throws Exception {
 		vadateImage(archives);
+<<<<<<< HEAD
 
+=======
+		
+>>>>>>> 0c389bffe198548263c292beabdd50c2415fd8f3
 		archivesService.mergeSubmit(archives);
 		return ResponseDTO.success();
 	}
@@ -114,7 +121,11 @@ public class ArchivesController {
 		vadateImage(archives);
 		ArchivesEntity archiveEntity = new ArchivesEntity();
 		archiveEntity.setId(archives.getId());
+<<<<<<< HEAD
 		// 0是为提交，1是以提交，2是合并中，3是暂存
+=======
+		//0是为提交，1是以提交，2是合并中，3是暂存
+>>>>>>> 0c389bffe198548263c292beabdd50c2415fd8f3
 		archiveEntity.setStatus("3");
 		archiveEntity.setImageJson(JSON.toJSONString(archives));
 		archivesService.updateById(archiveEntity);
@@ -176,7 +187,11 @@ public class ArchivesController {
 		qw.eq("annual", year);
 		qw.eq("catalog_num", catalogNum);
 		qw.select(" IFNULL(max(CAST(case_num as SIGNED)),0) caseNum");
+<<<<<<< HEAD
 
+=======
+		
+>>>>>>> 0c389bffe198548263c292beabdd50c2415fd8f3
 		Map<String, Object> map = archivesService.getMap(qw);
 		Object caseNum = map.get("caseNum");
 		if (caseNum != null) {
@@ -299,7 +314,11 @@ public class ArchivesController {
 	public ResponseDTO<ArchivesEntity> detail(@RequestBody ArchivesVo archives) {
 		ArchivesEntity entity = new ArchivesEntity();
 		entity = archivesService.getById(archives.getId());
+<<<<<<< HEAD
 
+=======
+		 
+>>>>>>> 0c389bffe198548263c292beabdd50c2415fd8f3
 		String previewPath = dictDetailService.getValueByName("file_path").get("preview_path");
 		entity.setPdfPath(previewPath + entity.getPdfPath());
 		return ResponseDTO.success(entity);

eladmin-system/src/main/java/me/zhengjie/archives/controller/OldArchivesController.java

@@ -6,7 +6,10 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+<<<<<<< HEAD
 import java.util.Set;
+=======
+>>>>>>> 0c389bffe198548263c292beabdd50c2415fd8f3
 import java.util.stream.Collectors;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
@@ -14,7 +17,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
+<<<<<<< HEAD
 import org.springframework.security.core.userdetails.UserDetails;
+=======
+>>>>>>> 0c389bffe198548263c292beabdd50c2415fd8f3
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -24,7 +30,11 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import cn.hutool.core.img.ImgUtil;
 import me.zhengjie.annotation.rest.AnonymousGetMapping;
 import me.zhengjie.annotation.rest.AnonymousPostMapping;
+<<<<<<< HEAD
 import me.zhengjie.archives.dto.GzDetailDto;
+=======
+import me.zhengjie.archives.dto.ArchivesDto;
+>>>>>>> 0c389bffe198548263c292beabdd50c2415fd8f3
 import me.zhengjie.archives.dto.FilePreviewDto;
 import me.zhengjie.archives.dto.GzArchivesDto;
 import me.zhengjie.archives.entity.ArchivesEntity;
@@ -47,6 +57,7 @@ import me.zhengjie.archives.vo.GzPortraitVo;
 import me.zhengjie.base.ResponseDTO;
 import me.zhengjie.config.FileProperties;
 import me.zhengjie.exception.BadRequestException;
+<<<<<<< HEAD
 import me.zhengjie.modules.security.service.dto.JwtUserDto;
 import me.zhengjie.modules.system.service.DictDetailService;
 import me.zhengjie.modules.system.service.dto.RoleSmallDto;
@@ -54,6 +65,11 @@ import me.zhengjie.modules.system.service.dto.UserLoginDto;
 import me.zhengjie.utils.BeanCopyUtils;
 import me.zhengjie.utils.FileUtil;
 import me.zhengjie.utils.SecurityUtils;
+=======
+import me.zhengjie.modules.system.service.DictDetailService;
+import me.zhengjie.utils.BeanCopyUtils;
+import me.zhengjie.utils.FileUtil;
+>>>>>>> 0c389bffe198548263c292beabdd50c2415fd8f3
 import me.zhengjie.utils.UUIDGenerator;
 
 @RestController
@@ -77,6 +93,7 @@ public class OldArchivesController {
 
 	@AnonymousGetMapping("/list")
 	public ResponseEntity<Object> list(GzArchivesVo req, Pageable pageable) {
+<<<<<<< HEAD
 		
 		req.setIndex(pageable.getPageNumber());
 		req.setSize(pageable.getPageSize());
@@ -98,6 +115,10 @@ public class OldArchivesController {
 			   req.setNotary(user.getNickName().trim());
 		   }
 	    }
+=======
+		req.setIndex(pageable.getPageNumber());
+		req.setSize(pageable.getPageSize());
+>>>>>>> 0c389bffe198548263c292beabdd50c2415fd8f3
 		Map<String, Object> map = gzArchivesService.page(req);
 		return new ResponseEntity<>(map, HttpStatus.OK);
 	}
@@ -108,7 +129,11 @@ public class OldArchivesController {
 	 * @return
 	 */
 	@AnonymousPostMapping("/redo")
+<<<<<<< HEAD
 	public ResponseDTO<Map<String, Object>> redo(@RequestBody GzPortraitVo req) {
+=======
+	public ResponseDTO<Map<String, Object>> redo(@RequestBody GzArchivesVo req) {
+>>>>>>> 0c389bffe198548263c292beabdd50c2415fd8f3
 		GzArchivesExEntity gzEx = new GzArchivesExEntity();
 		gzEx.setGzArchivesId(req.getId());
 		GzArchivesExEntity entity = gzArchivesExService.getOne(gzEx);
@@ -117,13 +142,21 @@ public class OldArchivesController {
 		int gzlen = properties.getWindows().getGzPath().length();
 		if (entity != null && StringUtils.isNotBlank(entity.getImageJson())) {
 			String imageJson = entity.getImageJson();
+<<<<<<< HEAD
 			GzPortraitVo caseVo = JSONObject.parseObject(imageJson, GzPortraitVo.class);
+=======
+			CasePortraitVo caseVo = JSONObject.parseObject(imageJson, CasePortraitVo.class);
+>>>>>>> 0c389bffe198548263c292beabdd50c2415fd8f3
 			List<String> imageIds = caseVo.getImageIds();
 			// 区分是新增加的，还是老的数据，历史数据是32位，新的是22位
 			List<String> fileInfoImages = new ArrayList<>();
 			List<String> gzFileImages = new ArrayList<>();
 			// 判断
+<<<<<<< HEAD
 			for (String imageId : imageIds) {
+=======
+			for (String imageId : fileInfoImages) {
+>>>>>>> 0c389bffe198548263c292beabdd50c2415fd8f3
 				if (imageId.length() == 32) {
 					gzFileImages.add(imageId);
 				} else {
@@ -131,6 +164,7 @@ public class OldArchivesController {
 				}
 			}
 			// 这个是新的图片地址
+<<<<<<< HEAD
 			Map<String, FileInfoEntity> fileInfoMap = new HashMap<>();
 			if(CollectionUtils.isNotEmpty(fileInfoImages)) {
 				List<FileInfoEntity> fileInfo = fileInfoService.listByIds(fileInfoImages);
@@ -146,12 +180,27 @@ public class OldArchivesController {
 				for (GzFileTempEntity file : tempFiles) {
 					tempFilesMap.put(file.getId(), file);
 				}
+=======
+			List<FileInfoEntity> fileInfo = fileInfoService.listByIds(fileInfoImages);
+			Map<String, FileInfoEntity> fileInfoMap = new HashMap<>();
+			for (FileInfoEntity file : fileInfo) {
+				fileInfoMap.put(file.getId(), file);
+			}
+			// ------------------------这个是老的地址
+			QueryWrapper<GzFileTempEntity> tempFile = new QueryWrapper<>();
+			tempFile.eq("pid", req.getId());
+			List<GzFileTempEntity> tempFiles = gzFileTempService.list(tempFile);
+			Map<String, GzFileTempEntity> tempFilesMap = new HashMap<>();
+			for (GzFileTempEntity file : tempFiles) {
+				tempFilesMap.put(file.getId(), file);
+>>>>>>> 0c389bffe198548263c292beabdd50c2415fd8f3
 			}
 			String previewPath = dictDetailService.getValueByName("file_path").get("preview_path");
 			String gzPath = dictDetailService.getValueByName("file_path").get("gz_path");
 			for (String imageId : imageIds) {
 				JSONObject json = new JSONObject();
 				if (imageId.length() == 32) {
+<<<<<<< HEAD
 					if(tempFilesMap.get(imageId)!=null) {
 						GzFileTempEntity gzFileEntity = tempFilesMap.get(imageId);
 						json.put("imageId", imageId);
@@ -166,6 +215,18 @@ public class OldArchivesController {
 						json.put("fileUrl", previewPath + fileInfoMap.get(imageId).getPath());
 						json.put("smallUrl", previewPath + fileInfoMap.get(imageId).getSmallPath());
 					}
+=======
+					json.put("imageId", imageId);
+					GzFileTempEntity gzFileEntity = tempFilesMap.get(imageId);
+					String filePath = gzFileEntity.getFilePath();
+					String tempFilePath = filePath.substring(gzlen);
+					json.put("fileUrl", gzPath + tempFilePath + gzFileEntity.getFileName());
+					json.put("smallUrl", gzPath + tempFilePath + "s-" + gzFileEntity.getFileName());
+				} else {
+					json.put("imageId", imageId);
+					json.put("fileUrl", previewPath + fileInfoMap.get(imageId).getPath());
+					json.put("smallUrl", previewPath + fileInfoMap.get(imageId).getSmallPath());
+>>>>>>> 0c389bffe198548263c292beabdd50c2415fd8f3
 				}
 				jsonObjs.add(json);
 			}
@@ -207,6 +268,7 @@ public class OldArchivesController {
 	 * @return
 	 */
 	@AnonymousPostMapping("/edit")
+<<<<<<< HEAD
 	public ResponseDTO<GzArchivesEntity> edit(@RequestBody GzArchivesVo req) {
 		
 		// 验证案卷号是否正确
@@ -216,6 +278,16 @@ public class OldArchivesController {
 
 	@AnonymousPostMapping("/detail")
 	public ResponseDTO<GzDetailDto> detail(@RequestBody GzArchivesVo req) {
+=======
+	public ResponseDTO<ArchivesEntity> edit(@RequestBody GzArchivesVo req) {
+		 
+		gzArchivesService.edit(req);
+		return ResponseDTO.success();
+	}
+
+	@AnonymousPostMapping("/detail")
+	public ResponseDTO<ArchivesDto> detail(@RequestBody GzArchivesVo req) {
+>>>>>>> 0c389bffe198548263c292beabdd50c2415fd8f3
 		return gzArchivesService.detail(req);
 	}
 
@@ -251,7 +323,10 @@ public class OldArchivesController {
 		archiveEntity.setRecflag("3");
 		GzArchivesExEntity archiveExEntity = new GzArchivesExEntity();
 		archiveExEntity.setGzArchivesId(archives.getId());
+<<<<<<< HEAD
 		gzArchivesService.updateById(archiveEntity);
+=======
+>>>>>>> 0c389bffe198548263c292beabdd50c2415fd8f3
 		GzArchivesExEntity gzEx = gzArchivesExService.getOne(archiveExEntity);
 		if (gzEx == null) {
 			gzEx = new GzArchivesExEntity();
@@ -262,8 +337,13 @@ public class OldArchivesController {
 			gzArchivesExService.save(archiveExEntity);
 		} else {
 			gzEx.setImageJson(JSON.toJSONString(archives));
+<<<<<<< HEAD
 			gzEx.setUpdateTime(LocalDateTime.now());
 			gzArchivesExService.updateById(gzEx);
+=======
+			archiveExEntity.setUpdateTime(LocalDateTime.now());
+			gzArchivesExService.updateById(archiveExEntity);
+>>>>>>> 0c389bffe198548263c292beabdd50c2415fd8f3
 		}
 		return ResponseDTO.success();
 	}

eladmin-system/src/main/java/me/zhengjie/archives/dto/GzDetailDto.java

@@ -1,5 +1,6 @@
 package me.zhengjie.archives.dto;
 
+<<<<<<< HEAD
 import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Map;
@@ -119,4 +120,8 @@ public class GzDetailDto {
 	private String imageJson;
 	//pdfPath pdf路径
 	List<Map<String, String>> filePath;
+=======
+public class GzDetailDto {
+
+>>>>>>> 0c389bffe198548263c292beabdd50c2415fd8f3
 }

eladmin-system/src/main/java/me/zhengjie/archives/entity/GzArchivesEntity.java

@@ -164,7 +164,10 @@ public class GzArchivesEntity implements Serializable {
 	/**
 	 * 受理日期
 	 */
+<<<<<<< HEAD
 	@QueryWapper(attribute = { "startTime", "endTime" }, value = { QueryKeyword.RANGE })
+=======
+>>>>>>> 0c389bffe198548263c292beabdd50c2415fd8f3
 	@TableField("acceptdate")
 	private LocalDate acceptdate;
 

eladmin-system/src/main/java/me/zhengjie/archives/service/GzArchivesService.java

@@ -4,7 +4,11 @@ import java.util.Map;
 
 import org.springframework.web.bind.annotation.RequestBody;
 
+<<<<<<< HEAD
 import me.zhengjie.archives.dto.GzDetailDto;
+=======
+import me.zhengjie.archives.dto.ArchivesDto;
+>>>>>>> 0c389bffe198548263c292beabdd50c2415fd8f3
 import me.zhengjie.archives.dto.GzArchivesDto;
 import me.zhengjie.archives.entity.ArchivesEntity;
 import me.zhengjie.archives.entity.GzArchivesEntity;
@@ -27,6 +31,11 @@ public interface GzArchivesService extends AbstractService<GzArchivesEntity> {
 
 	public void mergeSubmit(GzPortraitVo archives) throws Exception;
 
+<<<<<<< HEAD
 	public ResponseDTO<GzDetailDto> detail(GzArchivesVo req);
 	public ResponseDTO<GzArchivesEntity> edit(@RequestBody GzArchivesVo req) ;
+=======
+	public ResponseDTO<ArchivesDto> detail(GzArchivesVo req);
+	public ResponseDTO<ArchivesEntity> edit(@RequestBody GzArchivesVo req);
+>>>>>>> 0c389bffe198548263c292beabdd50c2415fd8f3
 }

eladmin-system/src/main/java/me/zhengjie/archives/service/impl/GzArchivesServiceImpl.java

@@ -1,7 +1,10 @@
 package me.zhengjie.archives.service.impl;
 
 import java.io.File;
+<<<<<<< HEAD
 import java.time.LocalDate;
+=======
+>>>>>>> 0c389bffe198548263c292beabdd50c2415fd8f3
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -24,7 +27,11 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import me.zhengjie.annotation.rest.AnonymousPostMapping;
 import me.zhengjie.archives.dao.IGzArchivesDao;
 import me.zhengjie.archives.dao.IModelDao;
+<<<<<<< HEAD
 import me.zhengjie.archives.dto.GzDetailDto;
+=======
+import me.zhengjie.archives.dto.ArchivesDto;
+>>>>>>> 0c389bffe198548263c292beabdd50c2415fd8f3
 import me.zhengjie.archives.entity.ArchivesEntity;
 import me.zhengjie.archives.entity.FileInfoEntity;
 import me.zhengjie.archives.entity.GzArchivesEntity;
@@ -47,7 +54,10 @@ import me.zhengjie.archives.vo.GzArchivesVo;
 import me.zhengjie.archives.vo.GzPortraitVo;
 import me.zhengjie.base.ResponseDTO;
 import me.zhengjie.config.FileProperties;
+<<<<<<< HEAD
 import me.zhengjie.exception.BadRequestException;
+=======
+>>>>>>> 0c389bffe198548263c292beabdd50c2415fd8f3
 import me.zhengjie.modules.system.service.DictDetailService;
 import me.zhengjie.utils.DateUtil;
 import me.zhengjie.utils.FileUtil;
@@ -153,7 +163,11 @@ public class GzArchivesServiceImpl extends AbstractServiceImpl<IGzArchivesDao, G
 		List<String> fileInfoImages = new ArrayList<>();
 		List<String> gzFileImages = new ArrayList<>();
 		// 判断
+<<<<<<< HEAD
 		for (String imageId : imageIds) {
+=======
+		for (String imageId : fileInfoImages) {
+>>>>>>> 0c389bffe198548263c292beabdd50c2415fd8f3
 			if (imageId.length() == 32) {
 				gzFileImages.add(imageId);
 			} else {
@@ -161,6 +175,7 @@ public class GzArchivesServiceImpl extends AbstractServiceImpl<IGzArchivesDao, G
 			}
 		}
 		// 这个是新的图片地址
+<<<<<<< HEAD
 		Map<String, FileInfoEntity> fileInfoMap = new HashMap<>();
 		if(CollectionUtils.isNotEmpty(fileInfoImages)) {
 			List<FileInfoEntity> fileInfo = fileInfoService.listByIds(fileInfoImages);
@@ -188,6 +203,27 @@ public class GzArchivesServiceImpl extends AbstractServiceImpl<IGzArchivesDao, G
 					files.add(new File(path + fileInfoMap.get(imageId).getPath()));
 				}
 				
+=======
+		List<FileInfoEntity> fileInfo = fileInfoService.listByIds(fileInfoImages);
+		Map<String, FileInfoEntity> fileInfoMap = new HashMap<>();
+		for (FileInfoEntity file : fileInfo) {
+			fileInfoMap.put(file.getId(), file);
+		}
+		// ------------------------这个是老的地址
+		QueryWrapper<GzFileTempEntity> tempFile = new QueryWrapper<>();
+		tempFile.eq("pid", archives.getId());
+		List<GzFileTempEntity> tempFiles = gzFileTempService.list(tempFile);
+		Map<String, GzFileTempEntity> tempFilesMap = new HashMap<>();
+		for (GzFileTempEntity file : tempFiles) {
+			tempFilesMap.put(file.getId(), file);
+		}
+		for (String imageId : imageIds) {
+			if (imageId.length() == 32) {
+				GzFileTempEntity gzFileEntity = tempFilesMap.get(imageId);
+				files.add(new File(gzFileEntity.getFilePath() + gzFileEntity.getFileName()));
+			} else {
+				files.add(new File(path + fileInfoMap.get(imageId)));
+>>>>>>> 0c389bffe198548263c292beabdd50c2415fd8f3
 			}
 		}
 
@@ -200,7 +236,11 @@ public class GzArchivesServiceImpl extends AbstractServiceImpl<IGzArchivesDao, G
 		entity = new GzArchivesEntity();
 		entity.setId(archives.getId());
 		entity.setRecflag("1");
+<<<<<<< HEAD
 		entity.setPdftime(LocalDate.now());
+=======
+		entity.setUpdatetime(LocalDateTime.now());
+>>>>>>> 0c389bffe198548263c292beabdd50c2415fd8f3
 		this.updateById(entity);
 		// -------------------
 		GzArchivesExEntity archiveEntity = new GzArchivesExEntity();
@@ -209,6 +249,7 @@ public class GzArchivesServiceImpl extends AbstractServiceImpl<IGzArchivesDao, G
 		if (gzEx == null) {
 			gzEx = new GzArchivesExEntity();
 			gzEx.setPdfPath(fileRelatePath + fileName);
+<<<<<<< HEAD
 			gzEx.setGzArchivesId(archives.getId());
 			gzEx.setImageJson(JSON.toJSONString(archives));
 			gzEx.setCreateTime(LocalDateTime.now());
@@ -223,6 +264,17 @@ public class GzArchivesServiceImpl extends AbstractServiceImpl<IGzArchivesDao, G
 			gzEx.setPdfPath(fileRelatePath+fileName);
 			gzEx.setUpdateTime(LocalDateTime.now());
 			gzArchivesExService.updateById(gzEx);
+=======
+			gzEx.setImageJson(JSON.toJSONString(archives));
+			gzEx.setCreateTime(LocalDateTime.now());
+			gzEx.setUpdateTime(LocalDateTime.now());
+			gzArchivesExService.save(gzEx);
+		} else {
+			gzEx.setPdfPath(fileRelatePath + fileName);
+			gzEx.setImageJson(JSON.toJSONString(archives));
+			gzEx.setUpdateTime(LocalDateTime.now());
+			gzArchivesExService.updateById(archiveEntity);
+>>>>>>> 0c389bffe198548263c292beabdd50c2415fd8f3
 		}
 		UpdateWrapper<FileInfoEntity> updateWrapper = new UpdateWrapper<>();
 		updateWrapper.in("id", imageIds);
@@ -233,10 +285,17 @@ public class GzArchivesServiceImpl extends AbstractServiceImpl<IGzArchivesDao, G
 	}
 
 	@AnonymousPostMapping("/detail")
+<<<<<<< HEAD
 	public ResponseDTO<GzDetailDto> detail(GzArchivesVo req) {
 		GzArchivesEntity entity = this.getById(req.getId());
 //		GzArchivesDto dto = BeanCopyUtils.convertObj(entity, GzArchivesDto.class);
 		GzDetailDto dto = new GzDetailDto();
+=======
+	public ResponseDTO<ArchivesDto> detail(GzArchivesVo req) {
+		GzArchivesEntity entity = this.getById(req.getId());
+//		GzArchivesDto dto = BeanCopyUtils.convertObj(entity, GzArchivesDto.class);
+		ArchivesDto dto = new ArchivesDto();
+>>>>>>> 0c389bffe198548263c292beabdd50c2415fd8f3
 		convertArchives(entity, dto);
 		// 先查询有没有处理过，然后再处理老的数据
 		GzArchivesExEntity gzExEntity = new GzArchivesExEntity();
@@ -244,6 +303,7 @@ public class GzArchivesServiceImpl extends AbstractServiceImpl<IGzArchivesDao, G
 		gzExEntity = gzArchivesExService.getOne(gzExEntity);
 		if (gzExEntity != null) {
 			String previewPath = dictDetailService.getValueByName("file_path").get("preview_path");
+<<<<<<< HEAD
 			Map<String,String> pdfFileName = new HashMap<>();
 			pdfFileName.put("pdfPath", previewPath + gzExEntity.getPdfPath());
 			// 卷宗号
@@ -251,6 +311,11 @@ public class GzArchivesServiceImpl extends AbstractServiceImpl<IGzArchivesDao, G
 			List<Map<String,String>> pdfList=new ArrayList<>();
 			pdfList.add(pdfFileName);
 			dto.setFilePath(pdfList);
+=======
+			List<String> pdfs = new ArrayList<>();
+			pdfs.add(previewPath + gzExEntity.getPdfPath());
+			dto.setPdfPaths(pdfs);
+>>>>>>> 0c389bffe198548263c292beabdd50c2415fd8f3
 			return ResponseDTO.success(dto);
 		}
 		QueryWrapper<GzDetailEntity> qw = new QueryWrapper<>();
@@ -262,6 +327,7 @@ public class GzArchivesServiceImpl extends AbstractServiceImpl<IGzArchivesDao, G
 		String gzPath = dictDetailService.getValueByName("file_path").get("gz_path");
 		List<GzFilepathEntity> gzFilePaths = gzFilepathService.list(gzFilepathQw);
 		if (CollectionUtils.isNotEmpty(gzFilePaths)) {
+<<<<<<< HEAD
 			List<Map<String,String>> pdfs = new ArrayList<>();
 			for (GzFilepathEntity gz : gzFilePaths) {
 				//pdfs.add(gzPath + gz.getSubpath() + gz.getFilename() + gz.getExt());
@@ -271,6 +337,13 @@ public class GzArchivesServiceImpl extends AbstractServiceImpl<IGzArchivesDao, G
 				pdfs.add(pdfFileName);
 			}
 			dto.setFilePath(pdfs);
+=======
+			List<String> pdfs = new ArrayList<>();
+			for (GzFilepathEntity gz : gzFilePaths) {
+				pdfs.add(gzPath + gz.getSubpath() + gz.getFilename() + gz.getExt());
+			}
+			dto.setPdfPaths(pdfs);
+>>>>>>> 0c389bffe198548263c292beabdd50c2415fd8f3
 			return ResponseDTO.success(dto);
 		}
 		return ResponseDTO.success(dto);
@@ -290,17 +363,28 @@ public class GzArchivesServiceImpl extends AbstractServiceImpl<IGzArchivesDao, G
 			map.put("endTime", endDate);
 			queryMap.setMap(map);
 		}
+<<<<<<< HEAD
 		List<String> submitTime = req.getSubmitTimes();
+=======
+		List<String> submitTime = req.getSubmitTime();
+>>>>>>> 0c389bffe198548263c292beabdd50c2415fd8f3
 		if (CollectionUtils.isNotEmpty(submitTime)) {
 			map.put("submitStartTime", submitTime.get(0));
 			map.put("submitEndTime", submitTime.get(1));
 			queryMap.setMap(map);
 		}
 		page = page(page, gzArchives, queryMap);
+<<<<<<< HEAD
 		List<GzDetailDto> list = new ArrayList<>();
 		if (page.getRecords() != null) {
 			for (GzArchivesEntity gz : page.getRecords()) {
 				GzDetailDto archivesEntity = new GzDetailDto();
+=======
+		List<ArchivesDto> list = new ArrayList<>();
+		if (page.getRecords() != null) {
+			for (GzArchivesEntity gz : page.getRecords()) {
+				ArchivesDto archivesEntity = new ArchivesDto();
+>>>>>>> 0c389bffe198548263c292beabdd50c2415fd8f3
 				convertArchives(gz, archivesEntity);
 				list.add(archivesEntity);
 			}
@@ -308,7 +392,11 @@ public class GzArchivesServiceImpl extends AbstractServiceImpl<IGzArchivesDao, G
 		return PageUtil.toPage(list, page.getTotal());
 	}
 
+<<<<<<< HEAD
 	private void convertArchives(GzArchivesEntity gz, GzDetailDto archivesEntity) {
+=======
+	private void convertArchives(GzArchivesEntity gz, ArchivesDto archivesEntity) {
+>>>>>>> 0c389bffe198548263c292beabdd50c2415fd8f3
 		StringBuffer sb = new StringBuffer();
 		sb.append(gz.getYear() + "-");
 		sb.append(gz.getNotarizationtypefull() + "-");
@@ -332,7 +420,10 @@ public class GzArchivesServiceImpl extends AbstractServiceImpl<IGzArchivesDao, G
 		archivesEntity.setSecrecyType(gz.getSecretclass());
 		archivesEntity.setNotaryFullName(gz.getNotarialOfficeFull());
 		archivesEntity.setCaseNum(gz.getFileno());
+<<<<<<< HEAD
 		archivesEntity.setStatus(gz.getRecflag());
+=======
+>>>>>>> 0c389bffe198548263c292beabdd50c2415fd8f3
 		archivesEntity.setFondsNum(gz.getFondcode());
 		archivesEntity.setCatalogNum(gz.getMenuno());
 		archivesEntity.setBoxNum(gz.getBoxnumber());
@@ -344,6 +435,7 @@ public class GzArchivesServiceImpl extends AbstractServiceImpl<IGzArchivesDao, G
 		System.out.println("1.2".split("\\.")[1]);
 	}
 
+<<<<<<< HEAD
 	public ResponseDTO<GzArchivesEntity> edit(@RequestBody GzArchivesVo req) {
 		GzArchivesEntity entity = getById(req.getId());
 		String arcno=entity.getArcno();
@@ -362,6 +454,12 @@ public class GzArchivesServiceImpl extends AbstractServiceImpl<IGzArchivesDao, G
 		this.updateById(entity);
 	
 		return ResponseDTO.success();
+=======
+	public ResponseDTO<ArchivesEntity> edit(@RequestBody GzArchivesVo req) {
+		GzArchivesEntity gz = new GzArchivesEntity();
+		convertGz(gz, req);
+		return null;
+>>>>>>> 0c389bffe198548263c292beabdd50c2415fd8f3
 	}
 
 	private void convertGz(GzArchivesEntity gz, GzArchivesVo archivesEntity) {
@@ -396,8 +494,11 @@ public class GzArchivesServiceImpl extends AbstractServiceImpl<IGzArchivesDao, G
 		if (StringUtils.isNotBlank(archivesEntity.getFilingDate())) {
 			gz.setFiledate(DateUtil.parseYmd(archivesEntity.getFilingDate()));
 		}
+<<<<<<< HEAD
 		//设置状态值
 		gz.setRecflag(archivesEntity.getStatus());
+=======
+>>>>>>> 0c389bffe198548263c292beabdd50c2415fd8f3
 		// 保管类型
 		gz.setSecretclass(archivesEntity.getSecrecyType());
 		// 保管期限

eladmin-system/src/main/java/me/zhengjie/archives/vo/GzArchivesVo.java

@@ -44,7 +44,11 @@ public class GzArchivesVo extends PageVo {
 	// 归档日期
 	private String filingDate;
 	// 提交时间
+<<<<<<< HEAD
 	private List<String> submitTimes;
+=======
+	private List<String> submitTime;
+>>>>>>> 0c389bffe198548263c292beabdd50c2415fd8f3
 	// 保密类型0：非密卷，1：密卷
 	private String secrecyType;
 	//全宗号
@@ -60,5 +64,9 @@ public class GzArchivesVo extends PageVo {
 	/**
 	 * 案卷类型
 	 */
+<<<<<<< HEAD
+=======
+	@TableField("dossier_type")
+>>>>>>> 0c389bffe198548263c292beabdd50c2415fd8f3
 	private String dossierType;
 }