修改签证

eladmin-system/src/main/java/me/zhengjie/appapi/vo/FileVo.java

@@ -30,5 +30,5 @@ public class FileVo {
 	// 传输类型，8
 	private String fileType;
 	private String fileName;
-
+	private String imageId;
 }

eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/NotaryOrderServiceImpl.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import me.zhengjie.appapi.config.AppConfigInfo;
 import me.zhengjie.appapi.entity.CityEntity;
+import me.zhengjie.appapi.entity.FileInfoEntity;
 import me.zhengjie.appapi.entity.ProvinceEntity;
 import me.zhengjie.appapi.entity.SysUserEntity;
 import me.zhengjie.appapi.entity.response.BaseResponse;
@@ -13,6 +14,7 @@ import me.zhengjie.appapi.entity.response.ResultData;
 import me.zhengjie.appapi.mapper.ICityDao;
 import me.zhengjie.appapi.mapper.IProvinceDao;
 import me.zhengjie.appapi.mapper.ISysUserDao;
+import me.zhengjie.appapi.service.FileInfoService;
 import me.zhengjie.appapi.service.OrderService;
 import me.zhengjie.appapi.service.impl.NotaryNoteServiceImpl;
 import me.zhengjie.appapi.util.*;
@@ -96,7 +98,10 @@ public class NotaryOrderServiceImpl extends ServiceImpl<NotaryOrderMapper, Notar
 	IProvinceDao provinceDao;
 	@Autowired
 	ICityDao cityDao;
-
+	
+	@Autowired
+	FileInfoService fileInfoService;
+	
 	@Override
 	public BaseResponse<List<NotaryOrderQueryRsp>> query(NotaryOrderQueryReq req) {
 		BaseResponse<List<NotaryOrderQueryRsp>> response = new BaseResponse<>();
@@ -667,13 +672,11 @@ public class NotaryOrderServiceImpl extends ServiceImpl<NotaryOrderMapper, Notar
 	@Transactional(rollbackFor = Exception.class)
 	public BaseResponse uploadNotarization(FileVo file) {
 		BaseResponse response = new BaseResponse<>();
-		String path = file.getBusinessNo()+ "/" + StatusEnum.StepStatusEnum.getType(file.getContractId()) + "/" ;
-		file.setFilePath(path);
-		String filePath = FileUploadUtil.upload(file);
+		FileInfoEntity fileInfoEntity=fileInfoService.getById(file.getImageId());
 		OrderFileEntity notaryOrderFile = new OrderFileEntity();
 		notaryOrderFile.setBusinessNo(file.getBusinessNo());
 		notaryOrderFile.setContractId(file.getContractId());
-		notaryOrderFile.setSignedPdfUrl(filePath);
+		notaryOrderFile.setSignedPdfUrl(fileInfoEntity.getPath());
 		notaryOrderFile.setCreateTime(new Date());
 		notaryOrderFile.setCreatorId(SecurityUtils.getCurrentUserId());
 		orderFileMapper.insert(notaryOrderFile);