实施前期、项目计划附件处理

src/main/java/com/jeeplus/modules/projectType/service/ProjectResultsFileTemplateService.java

@@ -32,11 +32,16 @@ public class ProjectResultsFileTemplateService  extends CrudService<ProjectResul
     private ProjectResultsFileTemplateDao dao;
     @Autowired
     private WorkClientAttachmentDao workClientAttachmentDao;
+    @Autowired
+    private WorkattachmentService workattachmentService;
 
     public ProjectTemplateType getProjectType(String id) {
         ProjectTemplateType projectType = dao.get(id);
         List<WorkClientAttachment> list = dao.getAttachmentByProjectTypeId(projectType.getId());
-        workClientAttachmentManage(list);
+        workattachmentService.workClientAttachmentManage(list);
+        workattachmentService.clientAttachmentManageOnUrl(list);
+        //workClientAttachmentManage(list);
+
         projectType.setWorkAttachments(list);
         return projectType;
     }
@@ -105,11 +110,9 @@ public class ProjectResultsFileTemplateService  extends CrudService<ProjectResul
                     workClientAttachment.setAttachmentFlag("133");
                     workClientAttachment.setAttachmentUser(UserUtils.getUser().getId());
                     if (org.apache.commons.lang3.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);
@@ -151,7 +154,9 @@ public class ProjectResultsFileTemplateService  extends CrudService<ProjectResul
     public List<WorkClientAttachment> getWorkClientAttachmentList(String typeId) {
         //根据父节点查询对应的附件信息
         List<WorkClientAttachment> list = dao.getWorkClientAttachmentList(typeId);
-        workClientAttachmentManage(list);
+        workattachmentService.workClientAttachmentManage(list);
+        workattachmentService.clientAttachmentManageOnUrl(list);
+        //workClientAttachmentManage(list);
         return list;
     }
 

src/main/java/com/jeeplus/modules/projectcontentinfo/entity/ProjectBasedData.java

@@ -43,6 +43,7 @@ public class ProjectBasedData extends DataEntity<ProjectBasedData> {
     private String fileType;
     private String fileName;
     private String fileUrl;
+	private String temporaryUrl;		// 附件地址(临时地址)
     private String fileAttachmentFlag;
     private String fileAttachmentId;
 
@@ -240,4 +241,12 @@ public class ProjectBasedData extends DataEntity<ProjectBasedData> {
 	public void setNature(String nature) {
 		this.nature = nature;
 	}
+
+	public String getTemporaryUrl() {
+		return temporaryUrl;
+	}
+
+	public void setTemporaryUrl(String temporaryUrl) {
+		this.temporaryUrl = temporaryUrl;
+	}
 }

src/main/java/com/jeeplus/modules/projectcontentinfo/service/ProjectReportRecordService.java

@@ -541,7 +541,7 @@ public class ProjectReportRecordService extends CrudService<ProjectReportRecordD
 		List<User> users = new ArrayList<>();
 		List<User> userList = new ArrayList<>();
 		//获取项目信息
-		RuralProjectRecords record = ruralProjectRecordsService.get(reportRecord.getReport().getProject().getId());
+		RuralProjectRecords record = ruralProjectRecordsService.getById(reportRecord.getReport().getProject().getId());
 
 		if (!state) {
 //            str = "yes".equals(flag)?"您的报销单审核：已通过":"您的报销单审核：未通过";

src/main/java/com/jeeplus/modules/projectcontentinfo/service/ProjectcontentinfoService.java

@@ -329,7 +329,9 @@ public class ProjectcontentinfoService extends CrudService<ProjectcontentinfoDao
 							workattachment.preInsert();
 							workattachment.setDivIdType(projectContentData.getId());
 							workattachment.setCreateBy(UserUtils.getUser());
-							workattachmentDao.insert(workattachment);
+							//新增
+							workattachmentService.insertOnWorkAttachment(workattachment);
+							//workattachmentDao.insert(workattachment);
 							//添加依据性资料和附件信息关系
 							ProjectAttachmentInfo projectAttachmentInfo = new ProjectAttachmentInfo();
 							projectAttachmentInfo.setAttachmentId(workattachment.getId());

src/main/java/com/jeeplus/modules/projectcontentinfo/web/ProjectcontentinfoController.java

@@ -27,6 +27,7 @@ import com.jeeplus.modules.projectrecord.service.early.ProjectEarlyReviewService
 import com.jeeplus.modules.sys.entity.MainDictDetail;
 import com.jeeplus.modules.sys.entity.User;
 import com.jeeplus.modules.sys.service.DictService;
+import com.jeeplus.modules.sys.service.WorkattachmentService;
 import com.jeeplus.modules.sys.utils.DictUtils;
 import com.jeeplus.modules.sys.utils.UserUtils;
 import com.jeeplus.modules.workclientinfo.entity.WorkClientLinkman;
@@ -65,6 +66,8 @@ import java.util.*;
 public class ProjectcontentinfoController extends BaseController {
 
 	@Autowired
+	private WorkattachmentService workattachmentService;
+	@Autowired
 	private ProjectcontentinfoService projectcontentinfoService;
 	@Autowired
 	private ProjectRecordsService projectRecordsService;
@@ -688,6 +691,13 @@ public class ProjectcontentinfoController extends BaseController {
 							projectBasedData.setNature("必填");
 						}
 					}
+					for (ProjectBasedData info : projectBasedDataList) {
+						if(StringUtils.isNotBlank(info.getFileUrl())){
+							String newUrl = workattachmentService.fileUrlManageOnPrefix(info.getFileUrl());
+							info.setFileUrl(newUrl);
+							info.setTemporaryUrl(workattachmentService.fileUrlManage(info.getFileUrl()));
+						}
+					}
 					projectContentData.getProjectBasedDataList().addAll(projectBasedDataList);
 				}
 			}
@@ -796,6 +806,13 @@ public class ProjectcontentinfoController extends BaseController {
 						projectBasedData.setUploadUser(UserUtils.get(projectBasedData.getFileAttachmentId()));
 					}
 				}
+				for (ProjectBasedData info : projectBasedDataList) {
+					if(StringUtils.isNotBlank(info.getFileUrl())){
+						String newUrl = workattachmentService.fileUrlManageOnPrefix(info.getFileUrl());
+						info.setFileUrl(newUrl);
+						info.setTemporaryUrl(workattachmentService.fileUrlManage(info.getFileUrl()));
+					}
+				}
 				for (ProjectBasedData projectBasedData: projectReportData.getProjectBasedDataList()) {
 					projectBasedData.setType(dictService.dictLabel("project_document_type",projectBasedData.getType()));
 				}
@@ -2037,6 +2054,13 @@ public class ProjectcontentinfoController extends BaseController {
 				}*/
 			}
 		}
+		for (ProjectBasedData info : projectBasedDataList) {
+			if(StringUtils.isNotBlank(info.getFileUrl())){
+				String newUrl = workattachmentService.fileUrlManageOnPrefix(info.getFileUrl());
+				info.setFileUrl(newUrl);
+				info.setTemporaryUrl(workattachmentService.fileUrlManage(info.getFileUrl()));
+			}
+		}
 		map.put("projectBasedDataList",projectBasedDataList);
 		return map;
 	}

src/main/java/com/jeeplus/modules/projectrecord/service/monthly/MonthlyConsultationReportService.java

@@ -131,12 +131,10 @@ public class MonthlyConsultationReportService extends CrudService<MonthlyConsult
                     workattachment.setAttachmentUser(UserUtils.getUser().getId());
                     if (StringUtils.isBlank(workattachment.getId()) || "null".equals(workattachment.getId())) {
                         //新增
-                        workattachment.preInsert();
-                        workattachmentDao.insert(workattachment);
+                        workattachmentService.insertOnWorkAttachment(workattachment);
                     } else {
                         //修改
-                        workattachment.preUpdate();
-                        workattachmentDao.update(workattachment);
+                        workattachmentService.updateOnWorkAttachment(workattachment);
                     }
                 } else {
                     //删除
@@ -181,6 +179,7 @@ public class MonthlyConsultationReportService extends CrudService<MonthlyConsult
             Workattachment workattachment = new Workattachment();
             workattachment.setAttachmentId(monthly.getId());
             List<Workattachment> list = workattachmentService.findList(workattachment);
+            workattachmentService.attachmentManageOnUrl(list);
             return list;
         }
         return null;

src/main/java/com/jeeplus/modules/projectrecord/web/completion/ProjectCompletionReviewController.java

@@ -20,6 +20,7 @@ import com.jeeplus.modules.projectrecord.entity.ProjectRecords;
 import com.jeeplus.modules.projectrecord.service.ProjectRecordsService;
 import com.jeeplus.modules.projectrecord.service.early.ProjectEarlyReviewService;
 import com.jeeplus.modules.sys.entity.User;
+import com.jeeplus.modules.sys.service.WorkattachmentService;
 import com.jeeplus.modules.sys.utils.UserUtils;
 import com.jeeplus.modules.workclientinfo.entity.WorkClientLinkman;
 import com.jeeplus.modules.workcontractinfo.entity.WorkContractInfo;
@@ -44,6 +45,8 @@ import java.util.*;
 @RequestMapping(value = "${adminPath}/project/projectCompletionReview")
 public class ProjectCompletionReviewController extends BaseController {
     @Autowired
+    private WorkattachmentService workattachmentService;
+    @Autowired
     private ProjectEarlyReviewService projectEarlyReviewService;
     @Autowired
     private ProjectRecordsService projectRecordsService;
@@ -270,6 +273,12 @@ public class ProjectCompletionReviewController extends BaseController {
             if (StringUtils.isNotBlank(projectBasedData.getFileAttachmentId())) {
                 projectBasedData.setUploadUser(UserUtils.get(projectBasedData.getFileAttachmentId()));
             }
+
+            if(StringUtils.isNotBlank(projectBasedData.getFileUrl())){
+                String newUrl = workattachmentService.fileUrlManageOnPrefix(projectBasedData.getFileUrl());
+                projectBasedData.setFileUrl(newUrl);
+                projectBasedData.setTemporaryUrl(workattachmentService.fileUrlManage(projectBasedData.getFileUrl()));
+            }
         }
         /*if(projectBasedDataList.size()>0){
             for (ProjectBasedData projectBasedData: projectBasedDataList) {

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

@@ -482,4 +482,50 @@ public class WorkattachmentService extends CrudService<WorkattachmentDao, Workat
 			}
 		}
 	}
+
+	/**
+	 * 数据处理（如果为阿里云文件服务器，则对查看的路径进行处理）
+	 * @param url
+	 */
+	public static String fileUrlManage(String url){
+		String newUrl = null;
+		// 判断文件存储方式（0：本地服务器存储。1：云端存储）
+			switch (uploadMode){
+				case "1":
+
+					break;
+				case "2":
+					newUrl = new OSSClientUtil().getFileTemporaryLookUrl(url);
+					break;
+
+			}
+			return newUrl;
+	}
+
+	/**
+	 * 数据处理
+	 * @param url
+	 */
+	public static String fileUrlManageOnPrefix(String url){
+		ViewFileUtil viewFileUtil = new ViewFileUtil();
+		// 判断文件存储方式（0：本地服务器存储。1：云端存储）
+		switch (uploadMode){
+			case "1":
+				url = bosUrl + url;
+				break;
+			case "2":
+				url = aliyunUrl + url;
+				break;
+			default:
+				//获取本地服务器ip和端口号
+				String serverIPAndPort = viewFileUtil.getServerIPAndPort();
+				//创建展示附件访问方法路径
+				String methodAccessPath = "/a/viewFile/viewFile/getUploadFile?uploadFilePath=";
+				String newUrl = serverIPAndPort + methodAccessPath + url;
+				//变更新的文件查看地址
+				url = newUrl;
+				break;
+		}
+		return url;
+	}
 }

src/main/webapp/webpage/modules/projectrecord/monthly/monthlyContentForm.jsp

@@ -438,6 +438,7 @@
                 elem: '#monthlyDate',
                 event: 'focus',
                 type: 'month'
+                ,trigger: 'click'
             });
         })
     </script>