项目管理附件处理

src/main/java/com/jeeplus/common/oss/OSSClientUtil.java

@@ -771,6 +771,7 @@ public class OSSClientUtil {
 
         } catch (Exception e) {
             e.printStackTrace();
+            return "";
         }
         return url.toString();
     }

src/main/java/com/jeeplus/common/service/CrudService.java

@@ -6,6 +6,7 @@ package com.jeeplus.common.service;
 import java.util.Collection;
 import java.util.List;
 
+import com.jeeplus.common.config.Global;
 import com.jeeplus.common.utils.IdGen;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
@@ -21,7 +22,9 @@ import com.jeeplus.common.persistence.Page;
  */
 @Transactional(readOnly = true)
 public abstract class CrudService<D extends CrudDao<T>, T extends DataEntity<T>> extends BaseService {
-	
+
+	/** 文件存储方式（0：本地服务器存储。1：百度云存储；2：阿里云存储） */
+	protected final static String uploadMode = Global.getConfig("remoteServer.uploadMode");
 	/**
 	 * 持久层对象
 	 */

src/main/java/com/jeeplus/common/web/BaseController.java

@@ -15,6 +15,7 @@ import javax.validation.ConstraintViolationException;
 import javax.validation.ValidationException;
 import javax.validation.Validator;
 
+import com.jeeplus.common.config.Global;
 import org.apache.commons.lang3.StringEscapeUtils;
 import org.apache.shiro.authc.AuthenticationException;
 import org.slf4j.Logger;
@@ -40,6 +41,8 @@ import com.jeeplus.common.utils.RequestUtils;
  */
 public abstract class BaseController {
 
+	/** 文件存储方式（0：本地服务器存储。1：云端存储） */
+	protected final static String uploadMode = Global.getConfig("remoteServer.uploadMode");
 	/**
 	 * 日志对象
 	 */

src/main/java/com/jeeplus/modules/oa/service/OaNotifyService.java

@@ -106,6 +106,10 @@ public class OaNotifyService extends CrudService<OaNotifyDao, OaNotify> {
             List<Workattachment> attachmentList = workattachmentService.getListByAttachmentIdAndFlag(id, "79");
             oaNotify.setWorkAttachments(attachmentList);
         }
+        //添加当前文件服务器类型
+        oaNotify.setUploadMode(uploadMode);
+        //数据处理（如果为阿里云文件服务器，则对查看的路径进行处理）
+        workattachmentService.attachmentManageOnUrl(oaNotify.getWorkAttachments());
         return oaNotify;
     }
 
@@ -685,11 +689,9 @@ public class OaNotifyService extends CrudService<OaNotifyDao, OaNotify> {
                     workattachment.setAttachmentFlag("79");
                     workattachment.setAttachmentUser(UserUtils.getUser().getId());
                     if (StringUtils.isBlank(workattachment.getId()) || "null".equals(workattachment.getId())) {
-                        workattachment.preInsert();
-                        workattachmentService.insert(workattachment);
+                        workattachmentService.insertOnWorkAttachment(workattachment);
                     } else {
-                        workattachment.preUpdate();
-                        workattachmentService.save(workattachment);
+                        workattachmentService.updateOnWorkAttachment(workattachment);
                     }
                 } else {
                     workattachmentService.delete(workattachment);

src/main/java/com/jeeplus/modules/projectAccessory/service/ProjectAccessoryService.java

@@ -271,12 +271,10 @@ public class ProjectAccessoryService extends TreeService<ProjectAccessoryDao, Pr
                     workClientAttachment.setAttachmentUser(UserUtils.getUser().getId());
                     if (StringUtils.isBlank(workClientAttachment.getId()) || "null".equals(workClientAttachment.getId())) {
                         //新增附件信息
-                        workClientAttachment.preInsert();
-                        workClientAttachmentDao.insert(workClientAttachment);
+                        workattachmentService.insertOnWorkClientAttachment(workClientAttachment);
                     } else {
                         //修改附件信息
-                        workClientAttachment.preUpdate();
-                        workClientAttachmentDao.update(workClientAttachment);
+                        workattachmentService.updateOnWorkClientAttachment(workClientAttachment);
                     }
                 } else {
                     //删除附件信息

src/main/java/com/jeeplus/modules/projectAccessory/service/ProjectTemplateService.java

@@ -296,7 +296,9 @@ public class ProjectTemplateService extends TreeService<ProjectTemplateDao, Proj
             WorkClientAttachment attchment = new WorkClientAttachment();
             attchment.setProjectId(projectTemplateInfo.getId());
             attchment.setAttachmentId(info.getId());
-            List<WorkClientAttachment> attachments = workClientAttachmentDao.getList(attchment);
+            List<WorkClientAttachment> attachments = workattachmentService.getList(attchment);
+            //数据处理（如果为阿里云文件服务器，则对查看的路径进行处理）
+            workattachmentService.clientAttachmentManageOnUrl(attachments);
             info.setWorkAttachments(attachments);
             //判断是否为必填项，若为必填项则添加必填判定字段
             if(info.getRequiredStage() == projectTemplateInfo.getRequiredStage()){
@@ -311,7 +313,9 @@ public class ProjectTemplateService extends TreeService<ProjectTemplateDao, Proj
             WorkClientAttachment attchment = new WorkClientAttachment();
             attchment.setProjectId(projectTemplateInfo.getId());
             attchment.setAttachmentId(otherInfo.getId());
-            List<WorkClientAttachment> attachments = workClientAttachmentDao.getList(attchment);
+            List<WorkClientAttachment> attachments = workattachmentService.getList(attchment);
+            //数据处理（如果为阿里云文件服务器，则对查看的路径进行处理）
+            workattachmentService.clientAttachmentManageOnUrl(attachments);
             if(attachments.size()>0){
                 otherInfo.setWorkAttachments(attachments);
 

src/main/java/com/jeeplus/modules/projectrecord/service/ProjectPlanService.java

@@ -43,6 +43,7 @@ public class ProjectPlanService extends CrudService<ProjectPlanDao, ProjectPlanI
         attchment.setAttachmentId(projectId);
         attchment.setAttachmentFlag("131");
         List<WorkClientAttachment> attachments = workattachmentService.getAttachmentList(attchment);
+        workattachmentService.clientAttachmentManageOnUrl(attachments);
         return attachments;
     }
 
@@ -131,11 +132,9 @@ public class ProjectPlanService extends CrudService<ProjectPlanDao, ProjectPlanI
                 workClientAttachment.setAttachmentFlag("131");
                 workClientAttachment.setAttachmentUser(UserUtils.getUser().getId());
                 if (StringUtils.isBlank(workClientAttachment.getId()) || "null".equals(workClientAttachment.getId())){
-                    workClientAttachment.preInsert();
-                    workClientAttachmentDao.insert(workClientAttachment);
+                    workattachmentService.insertOnWorkClientAttachment(workClientAttachment);
                 }else{
-                    workClientAttachment.preUpdate();
-                    workClientAttachmentDao.update(workClientAttachment);
+                    workattachmentService.updateOnWorkClientAttachment(workClientAttachment);
                 }
             }else{
                 workClientAttachmentDao.delete(workClientAttachment);

src/main/java/com/jeeplus/modules/projectrecord/web/ProjectPlanController.java

@@ -164,6 +164,7 @@ public class ProjectPlanController extends BaseController {
         List<WorkClientAttachment> workAttachmentList = projectPlanService.getWorkAttachment(projectRecords.getId());
         projectRecords.setProjectPlanList(projectPlanList);
         projectRecords.setWorkAttachments(workAttachmentList);
+        projectRecords.setUploadMode(uploadMode);
         model.addAttribute("projectRecords", projectRecords);
         if(flag){
             return "modules/projectrecord/plan/projectPlanView";

src/main/java/com/jeeplus/modules/ruralprojectrecords/service/RuralProjectRecordsService.java

@@ -167,7 +167,9 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 	private static byte[] SYN_BYTE = new byte[0];
 
 	public RuralProjectRecords get(String id) {
-		return super.get(id);
+		RuralProjectRecords ruralProjectRecords = super.get(id);
+		ruralProjectRecords.setUploadMode(uploadMode);
+		return ruralProjectRecords;
 	}
 	public ProjectRecords getProjectRecords(String id) {
 		return dao.getProjectRecords(id);
@@ -1761,6 +1763,8 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 
 		}
 
+		//添加当前文件服务器类型
+		projectcontentinfo.setUploadMode(uploadMode);
 		return projectcontentinfo;
 	}
 
@@ -1778,7 +1782,9 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 			WorkClientAttachment attchment = new WorkClientAttachment();
 			attchment.setProjectId(projectTemplateInfo.getId());
 			attchment.setAttachmentId(info.getId());
-			List<WorkClientAttachment> attachments = workClientAttachmentDao.getList(attchment);
+			List<WorkClientAttachment> attachments = workattachmentService.getList(attchment);
+			//数据处理（如果为阿里云文件服务器，则对查看的路径进行处理）
+			workattachmentService.clientAttachmentManageOnUrl(attachments);
 			info.setWorkAttachments(attachments);
 			//判断是否为必填项，若为必填项则添加必填判定字段
 			info.setMustFlag(0);
@@ -1794,7 +1800,9 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 			WorkClientAttachment attchment = new WorkClientAttachment();
 			attchment.setProjectId(projectTemplateInfo.getId());
 			attchment.setAttachmentId(otherInfo.getId());
-			List<WorkClientAttachment> attachments = workClientAttachmentDao.getList(attchment);
+			List<WorkClientAttachment> attachments = workattachmentService.getList(attchment);
+			//数据处理（如果为阿里云文件服务器，则对查看的路径进行处理）
+			workattachmentService.clientAttachmentManageOnUrl(attachments);
 			if(attachments.size()>0){
 				otherInfo.setWorkAttachments(attachments);
 

src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralCostProjectMessageController.java

@@ -238,6 +238,8 @@ public class RuralCostProjectMessageController extends BaseController {
             }
         /*}*/
 
+        //添加当前文件服务器类型
+        projectcontentinfo.setUploadMode(uploadMode);
         //查询总审人员信息
         List<User> auditUserList = userService.getAuditUserList();
         records.setBzshbUserList(auditUserList);
@@ -528,6 +530,8 @@ public class RuralCostProjectMessageController extends BaseController {
 
             }
         /*}*/
+        //添加当前文件服务器类型
+        projectcontent.setUploadMode(uploadMode);
         //查询总审人员信息
         List<User> auditUserList = userService.getAuditUserList();
         ruralProjectRecords.setBzshbUserList(auditUserList);
@@ -936,6 +940,7 @@ public class RuralCostProjectMessageController extends BaseController {
         projectRecords.setWorkContractInfo(projectContractInfo);
         reportData.setProject(projectRecords);
         projectReportRecord.setReport(reportData);
+        projectReportRecord.setUploadMode(uploadMode);
         model.addAttribute("projectReportRecord", projectReportRecord);
         model.addAttribute("project", projectReportRecord.getReport().getProject());
 

src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralProjectMessageController.java

@@ -271,6 +271,8 @@ public class RuralProjectMessageController extends BaseController {
         if(null == projectcontentinfo.getProjectReportData().getPrincipal()){
             projectcontentinfo.getProjectReportData().setPrincipal(UserUtils.getUser());
         }
+        //添加当前文件服务器类型
+        projectcontentinfo.setUploadMode(uploadMode);
         model.addAttribute("projectRecords", records);
         model.addAttribute("projectcontentinfo", projectcontentinfo);
         model.addAttribute("projectReportData", projectcontentinfo.getProjectReportData());
@@ -548,6 +550,8 @@ public class RuralProjectMessageController extends BaseController {
             }
         /*}*/
 
+        //添加当前文件服务器类型
+        projectcontent.setUploadMode(uploadMode);
         //查询总审人员信息
         List<User> auditUserList = userService.getAuditUserList();
         ruralProjectRecords.setBzshbUserList(auditUserList);
@@ -959,6 +963,7 @@ public class RuralProjectMessageController extends BaseController {
         projectRecords.setWorkContractInfo(projectContractInfo);
         reportData.setProject(projectRecords);
         projectReportRecord.setReport(reportData);
+        projectReportRecord.setUploadMode(uploadMode);
         model.addAttribute("projectReportRecord", projectReportRecord);
         model.addAttribute("project", projectReportRecord.getReport().getProject());
         if(null != projectContractInfo){

src/main/java/com/jeeplus/modules/sys/entity/Workattachment.java

@@ -23,6 +23,7 @@ public class Workattachment extends DataEntity<Workattachment> {
 	private String companyId;           //企业id
 	private String attachmentFlag;     //附件类别(0:评价汇总表、1:标书方案编制表)
 	private String divIdType;//判定条件
+	private String temporaryUrl;		// 附件地址(临时地址)
 
 	private String reportDataName;//成果文件名称
 	private Integer quoteResult;//是否为引用文件判定
@@ -128,4 +129,12 @@ public class Workattachment extends DataEntity<Workattachment> {
 	public void setQuoteId(String quoteId) {
 		this.quoteId = quoteId;
 	}
+
+	public String getTemporaryUrl() {
+		return temporaryUrl;
+	}
+
+	public void setTemporaryUrl(String temporaryUrl) {
+		this.temporaryUrl = temporaryUrl;
+	}
 }

src/main/java/com/jeeplus/modules/sys/service/WorkattachmentService.java

@@ -37,8 +37,6 @@ import java.util.*;
 @Transactional(readOnly = true)
 public class WorkattachmentService extends CrudService<WorkattachmentDao, Workattachment> {
 
-	/** 文件存储方式（0：本地服务器存储。1：百度云存储；2：阿里云存储） */
-	private final static String uploadMode = Global.getConfig("remoteServer.uploadMode");
 	/**
 	 * 阿里云文件服务器前缀
 	 */
@@ -280,6 +278,26 @@ public class WorkattachmentService extends CrudService<WorkattachmentDao, Workat
 	 * @param workattachment
 	 */
 	@Transactional(readOnly = false)
+	public void insertOnWorkAttachment(Workattachment workattachment) {
+		//
+		switch (uploadMode){
+			case "1":
+				workattachment.setUrl(workattachment.getUrl().replace(bosUrl,""));
+				break;
+			case "2":
+				workattachment.setUrl(workattachment.getUrl().replace(aliyunUrl,""));
+				break;
+		}
+		workattachment.preInsert();
+		this.insert(workattachment);
+	}
+
+
+	/**
+	 * 新增附件
+	 * @param workattachment
+	 */
+	@Transactional(readOnly = false)
 	public void insertOnWorkClientAttachment(WorkClientAttachment workattachment) {
 		//
 		switch (uploadMode){
@@ -299,6 +317,25 @@ public class WorkattachmentService extends CrudService<WorkattachmentDao, Workat
 	 * @param workattachment
 	 */
 	@Transactional(readOnly = false)
+	public void updateOnWorkAttachment(Workattachment workattachment) {
+		//
+		switch (uploadMode){
+			case "1":
+				workattachment.setUrl(workattachment.getUrl().replace(bosUrl,""));
+				break;
+			case "2":
+				workattachment.setUrl(workattachment.getUrl().replace(aliyunUrl,""));
+				break;
+		}
+		workattachment.preUpdate();
+		this.update(workattachment);
+	}
+
+	/**
+	 * 修改附件
+	 * @param workattachment
+	 */
+	@Transactional(readOnly = false)
 	public void updateOnWorkClientAttachment(WorkClientAttachment workattachment) {
 		//
 		switch (uploadMode){
@@ -406,4 +443,43 @@ public class WorkattachmentService extends CrudService<WorkattachmentDao, Workat
 			}
 		}
 	}
+
+
+	/**
+	 * 数据处理（如果为阿里云文件服务器，则对查看的路径进行处理）
+	 * @param list
+	 */
+	public static void clientAttachmentManageOnUrl(List<WorkClientAttachment> list){
+		// 判断文件存储方式（0：本地服务器存储。1：云端存储）
+		for (WorkClientAttachment info : list) {
+			switch (uploadMode){
+				case "1":
+
+					break;
+				case "2":
+					info.setTemporaryUrl(new OSSClientUtil().getFileTemporaryLookUrl(info.getUrl()));
+					break;
+
+			}
+		}
+	}
+
+	/**
+	 * 数据处理（如果为阿里云文件服务器，则对查看的路径进行处理）
+	 * @param list
+	 */
+	public static void attachmentManageOnUrl(List<Workattachment> list){
+		// 判断文件存储方式（0：本地服务器存储。1：云端存储）
+		for (Workattachment info : list) {
+			switch (uploadMode){
+				case "1":
+
+					break;
+				case "2":
+					info.setTemporaryUrl(new OSSClientUtil().getFileTemporaryLookUrl(info.getUrl()));
+					break;
+
+			}
+		}
+	}
 }

src/main/java/com/jeeplus/modules/sys/web/WorkattachmentController.java

@@ -44,8 +44,6 @@ import java.util.Map;
 @Controller
 @RequestMapping(value = "${adminPath}/sys/workattachment")
 public class WorkattachmentController extends BaseController {
-	/** 文件存储方式（0：本地服务器存储。1：云端存储） */
-	private final static String uploadMode = Global.getConfig("remoteServer.uploadMode");
 
 	@Autowired
 	private WorkattachmentService workattachmentService;

src/main/java/com/jeeplus/modules/workclientinfo/service/WorkClientInfoService.java

@@ -106,6 +106,11 @@ public class WorkClientInfoService extends CrudService<WorkClientInfoDao, WorkCl
             attchment.setAttachmentId(workClientInfo.getId());
             List<WorkClientAttachment> attachments = workattachmentService.getAttachmentList(attchment);
             workClientInfo.setWorkAttachments(attachments);
+
+            //添加当前文件服务器类型
+            workClientInfo.setUploadMode(uploadMode);
+            //数据处理（如果为阿里云文件服务器，则对查看的路径进行处理）
+            workattachmentService.clientAttachmentManageOnUrl(workClientInfo.getWorkAttachments());
         }
 		return workClientInfo;
 	}
@@ -410,11 +415,9 @@ public class WorkClientInfoService extends CrudService<WorkClientInfoDao, WorkCl
                 workClientAttachment.setAttachmentFlag("44");
                 workClientAttachment.setAttachmentUser(UserUtils.getUser().getId());
                 if (StringUtils.isBlank(workClientAttachment.getId()) || "null".equals(workClientAttachment.getId())){
-                    workClientAttachment.preInsert();
-                    workClientAttachmentDao.insert(workClientAttachment);
+                    workattachmentService.insertOnWorkClientAttachment(workClientAttachment);
                 }else{
-                    workClientAttachment.preUpdate();
-                    workClientAttachmentDao.update(workClientAttachment);
+                    workattachmentService.updateOnWorkClientAttachment(workClientAttachment);
                 }
             }else{
                 workClientAttachmentDao.delete(workClientAttachment);

src/main/java/com/jeeplus/modules/workcontractinfo/service/WorkContractInfoService.java

@@ -84,8 +84,6 @@ import java.util.List;
 @Transactional(readOnly = true)
 public class WorkContractInfoService extends CrudService<WorkContractInfoDao, WorkContractInfo> {
 
-	/** 文件存储方式（0：本地服务器存储。1：云端存储） */
-	private final static String uploadMode = Global.getConfig("remoteServer.uploadMode");
 	@Autowired
 	private AlterInfoService alterInfoService;
 	@Autowired
@@ -149,7 +147,6 @@ public class WorkContractInfoService extends CrudService<WorkContractInfoDao, Wo
 
 	public WorkContractInfo get(String id) {
 		WorkContractInfo workContractInfo = super.get(id);
-		workContractInfo.setUploadMode(uploadMode);
 		/*合同投标项目，则查投标。不是投标项目，不去查*/
 		if (workContractInfo != null && "0".equals(workContractInfo.getExt()) && workContractInfo.getProject()!=null && StringUtils.isNotBlank(workContractInfo.getProject().getId())) {
 			WorkBidProject workBidProject = workBidProjectDao.get(workContractInfo.getProject().getId());
@@ -231,11 +228,11 @@ public class WorkContractInfoService extends CrudService<WorkContractInfoDao, Wo
 				}
 			}
 			workContractInfo.setWorkClientInfoList(list2);
-		}
-		if("2".equals(uploadMode)){
-			for (WorkClientAttachment attachment: workContractInfo.getWorkAttachments()) {
-				attachment.setTemporaryUrl(new OSSClientUtil().getFileTemporaryLookUrl(attachment.getUrl()));
-			}
+
+			//添加当前文件服务器类型
+			workContractInfo.setUploadMode(uploadMode);
+			//数据处理（如果为阿里云文件服务器，则对查看的路径进行处理）
+			workattachmentService.clientAttachmentManageOnUrl(workContractInfo.getWorkAttachments());
 		}
 		return workContractInfo;
 	}
@@ -547,7 +544,6 @@ public class WorkContractInfoService extends CrudService<WorkContractInfoDao, Wo
 					workattachmentService.insertOnWorkClientAttachment(workClientAttachment);
 					signatureDocumentService.createIsignature(workClientAttachment.getUrl(),workClientAttachment.getAttachmentName(),workClientAttachment.getId(),workContractInfo.getName());
 				}else{
-					workClientAttachment.preUpdate();
 					workattachmentService.updateOnWorkClientAttachment(workClientAttachment);
 				}
 			}else{

src/main/java/com/jeeplus/modules/workcontractinfo/web/WorkContractInfoController.java

@@ -89,8 +89,6 @@ import java.util.*;
 @RequestMapping(value = "${adminPath}/workcontractinfo/workContractInfo")
 public class WorkContractInfoController extends BaseController {
 
-    /** 文件存储方式（0：本地服务器存储。1：云端存储） */
-    private final static String uploadMode = Global.getConfig("remoteServer.uploadMode");
 
 
     @Autowired

src/main/java/com/jeeplus/modules/workcontractrecord/service/WorkContractRecordService.java

@@ -9,6 +9,8 @@ import java.util.List;
 import java.util.Map;
 
 import com.google.common.collect.Maps;
+import com.jeeplus.common.config.Global;
+import com.jeeplus.common.oss.OSSClientUtil;
 import com.jeeplus.common.utils.MenuStatusEnum;
 import com.jeeplus.common.utils.StringUtils;
 import com.jeeplus.common.websocket.onchat.ChatServerPool;
@@ -105,6 +107,10 @@ public class WorkContractRecordService extends CrudService<WorkContractRecordDao
 				}
 			}
 		}
+		//添加当前文件服务器类型
+		workContractRecord.setUploadMode(uploadMode);
+		//数据处理（如果为阿里云文件服务器，则对查看的路径进行处理）
+		workattachmentService.clientAttachmentManageOnUrl(workContractRecord.getWorkAttachments());
 		return workContractRecord;
 	}
 	
@@ -285,11 +291,9 @@ public class WorkContractRecordService extends CrudService<WorkContractRecordDao
 				workClientAttachment.setAttachmentFlag("85");
 				workClientAttachment.setAttachmentUser(UserUtils.getUser().getId());
 				if (StringUtils.isBlank(workClientAttachment.getId()) || "null".equals(workClientAttachment.getId())) {
-					workClientAttachment.preInsert();
-					workClientAttachmentDao.insert(workClientAttachment);
+					workattachmentService.insertOnWorkClientAttachment(workClientAttachment);
 				} else {
-					workClientAttachment.preUpdate();
-					workClientAttachmentDao.update(workClientAttachment);
+					workattachmentService.updateOnWorkClientAttachment(workClientAttachment);
 				}
 			} else {
 				workClientAttachmentDao.delete(workClientAttachment);

src/main/java/com/jeeplus/modules/workfullmanage/web/WorkFullManageController.java

@@ -79,8 +79,6 @@ import freemarker.template.Template;
 @RequestMapping(value = "${adminPath}/workfullmanage/workFullManage")
 public class WorkFullManageController extends BaseController {
 
-	/** 文件存储方式（0：本地服务器存储。1：云端存储） */
-	private final static String uploadMode = Global.getConfig("remoteServer.uploadMode");
 
 	@Autowired
 	private WorkFullManageService workFullManageService;

src/main/java/com/jeeplus/modules/workprojectnotify/web/WorkProjectNotifyController.java

@@ -1879,6 +1879,8 @@ public class WorkProjectNotifyController extends BaseController {
 					projectReportData.setAct(act);
 					Projectcontentinfo projectcontentinfo = projectcontentinfoService.getByInfoId(projectReportData.getId());
 					projectcontentinfo.setProjectReportData(projectReportData);
+					//添加当前文件服务器类型
+					projectcontentinfo.setUploadMode(uploadMode);
 					List<MainDictDetail> achievementTypes = DictUtils.getMainDictList("achievement_type");
 					if(null != achievementTypes){
 						for (MainDictDetail achievementType:achievementTypes) {
@@ -2199,7 +2201,7 @@ public class WorkProjectNotifyController extends BaseController {
 
 						}
 					//}
-
+					projectReportRecord.setUploadMode(uploadMode);
 					model.addAttribute("projectReportRecord", projectReportRecord);
 					model.addAttribute("project", projectReportRecord.getReport().getProject());
 					if (workProjectNotify.getRemarks().contains("待通知") || "view".equals(workProjectNotify.getView())) {

src/main/java/com/jeeplus/modules/workreimbursement/service/WorkReimbursementService.java

@@ -5,6 +5,7 @@ package com.jeeplus.modules.workreimbursement.service;
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
+import com.jeeplus.common.config.Global;
 import com.jeeplus.common.persistence.Page;
 import com.jeeplus.common.service.CrudService;
 import com.jeeplus.common.utils.Collections3;
@@ -214,6 +215,10 @@ public class WorkReimbursementService extends CrudService<WorkReimbursementDao,
             }
             workReimbursement.setReimbursementBackList( workReimbursementBackDao.findList(workReimbursementBack));
         }
+        //添加当前文件服务器类型
+        workReimbursement.setUploadMode(uploadMode);
+        //数据处理（如果为阿里云文件服务器，则对查看的路径进行处理）
+        workattachmentService.clientAttachmentManageOnUrl(workReimbursement.getWorkAttachments());
         return workReimbursement;
     }
 
@@ -603,11 +608,9 @@ public class WorkReimbursementService extends CrudService<WorkReimbursementDao,
                     workClientAttachment.setAttachmentFlag(VarStr.attachmentFlag[1]);
                     workClientAttachment.setAttachmentUser(UserUtils.getUser().getId());
                     if (StringUtils.isBlank(workClientAttachment.getId()) || "null".equals(workClientAttachment.getId())) {
-                        workClientAttachment.preInsert();
-                        workClientAttachmentDao.insert(workClientAttachment);
+                        workattachmentService.insertOnWorkClientAttachment(workClientAttachment);
                     } else {
-                        workClientAttachment.preUpdate();
-                        workClientAttachmentDao.update(workClientAttachment);
+                        workattachmentService.updateOnWorkClientAttachment(workClientAttachment);
                     }
                 } else {
                     workClientAttachmentDao.delete(workClientAttachment);