报告签章已签章附件调整

src/main/java/com/jeeplus/modules/signature/projectReportSignatureWork/controller/ProjectReportSignatureWorkController.java

@@ -369,36 +369,40 @@ public class ProjectReportSignatureWorkController extends BaseController {
                     model.addAttribute("projectNotifyType", workProjectNotify.getNotifyType());
                 }
             }
-            List<WorkClientAttachment> signatureWorkAttachments = Lists.newArrayList();
-            if(StringUtils.isNotBlank(report.getSignatureUrl())){
-                WorkClientAttachment signatureAttachment = new WorkClientAttachment();
-
-                //处理文件路径
-                //如果文件路径中包含 /xg-qz 则表示文件存储在签章的对应文件库中需要单独进行处理
-                if(report.getSignatureUrl().contains("/xg-qz")){
-                    if(StringUtils.isNotBlank(report.getSignatureUrl())){
-                        String signatureUrl = report.getSignatureUrl().replace("/xg-qz","");
-                        projectReportSignature.setSignatureUrl(signatureUrl);
+            if (report.getStatus() == 5){
+                List<WorkClientAttachment> signatureWorkAttachments = Lists.newArrayList();
+
+                if(StringUtils.isNotBlank(report.getSignatureUrl())){
+                    WorkClientAttachment signatureAttachment = new WorkClientAttachment();
+
+                    //处理文件路径
+                    //如果文件路径中包含 /xg-qz 则表示文件存储在签章的对应文件库中需要单独进行处理
+                    if(report.getSignatureUrl().contains("/xg-qz")){
+                        if(StringUtils.isNotBlank(report.getSignatureUrl())){
+                            String signatureUrl = report.getSignatureUrl().replace("/xg-qz","");
+                            projectReportSignature.setSignatureUrl(signatureUrl);
+                        }
+                        signatureAttachment.setTemporaryUrl(new OSSClientUtil().getQzFileTemporaryLookUrl(aliyunUrl + projectReportSignature.getSignatureUrl()));
+                    }else{
+                        signatureAttachment.setTemporaryUrl(new OSSClientUtil().getFileTemporaryLookUrl(aliyunUrl + projectReportSignature.getSignatureUrl()));
                     }
-                    signatureAttachment.setTemporaryUrl(new OSSClientUtil().getQzFileTemporaryLookUrl(aliyunUrl + projectReportSignature.getSignatureUrl()));
-                }else{
-                    signatureAttachment.setTemporaryUrl(new OSSClientUtil().getFileTemporaryLookUrl(aliyunUrl + projectReportSignature.getSignatureUrl()));
+                    User user = UserUtils.get(report.getSignatureUploadFileUser().getId());
+                    signatureAttachment.setCreateBy(user);
+                    signatureAttachment.setUpdateBy(user);
+                    signatureAttachment.setCreateDate(report.getSignatureUploadDate());
+                    signatureAttachment.setUpdateDate(report.getSignatureUploadDate());
+                    signatureAttachment.setDelFlag("0");
+                    signatureAttachment.setAttachmentName(report.getSignatureFileName());
+                    String type = report.getSignatureUrl().substring(report.getSignatureUrl().lastIndexOf(".") + 1);
+                    signatureAttachment.setType(type);
+                    signatureWorkAttachments.add(signatureAttachment);
                 }
-                User user = UserUtils.get(report.getSignatureUploadFileUser().getId());
-                signatureAttachment.setCreateBy(user);
-                signatureAttachment.setUpdateBy(user);
-                signatureAttachment.setCreateDate(report.getSignatureUploadDate());
-                signatureAttachment.setUpdateDate(report.getSignatureUploadDate());
-                signatureAttachment.setDelFlag("0");
-                signatureAttachment.setAttachmentName(report.getSignatureFileName());
-                String type = report.getSignatureUrl().substring(report.getSignatureUrl().lastIndexOf(".") + 1);
-                signatureAttachment.setType(type);
-                signatureWorkAttachments.add(signatureAttachment);
-            }
 
-            if(signatureWorkAttachments.size()>0){
-                projectReportSignature.setSignatureWorkAttachments(signatureWorkAttachments);
+                if(signatureWorkAttachments.size()>0){
+                    projectReportSignature.setSignatureWorkAttachments(signatureWorkAttachments);
+                }
             }
+
         }
 
         //签章责任列表
@@ -446,36 +450,39 @@ public class ProjectReportSignatureWorkController extends BaseController {
                     model.addAttribute("projectNotifyType", workProjectNotify.getNotifyType());
                 }
             }
-            List<WorkClientAttachment> signatureWorkAttachments = Lists.newArrayList();
-            if(StringUtils.isNotBlank(report.getSignatureUrl())){
-                WorkClientAttachment signatureAttachment = new WorkClientAttachment();
-
-                //处理文件路径
-                //如果文件路径中包含 /xg-qz 则表示文件存储在签章的对应文件库中需要单独进行处理
-                if(report.getSignatureUrl().contains("/xg-qz")){
-                    if(StringUtils.isNotBlank(report.getSignatureUrl())){
-                        String signatureUrl = report.getSignatureUrl().replace("/xg-qz","");
-                        projectReportSignature.setSignatureUrl(signatureUrl);
+            if (report.getStatus() == 5){
+                List<WorkClientAttachment> signatureWorkAttachments = Lists.newArrayList();
+                if(StringUtils.isNotBlank(report.getSignatureUrl())){
+                    WorkClientAttachment signatureAttachment = new WorkClientAttachment();
+
+                    //处理文件路径
+                    //如果文件路径中包含 /xg-qz 则表示文件存储在签章的对应文件库中需要单独进行处理
+                    if(report.getSignatureUrl().contains("/xg-qz")){
+                        if(StringUtils.isNotBlank(report.getSignatureUrl())){
+                            String signatureUrl = report.getSignatureUrl().replace("/xg-qz","");
+                            projectReportSignature.setSignatureUrl(signatureUrl);
+                        }
+                        signatureAttachment.setTemporaryUrl(new OSSClientUtil().getQzFileTemporaryLookUrl(aliyunUrl + projectReportSignature.getSignatureUrl()));
+                    }else{
+                        signatureAttachment.setTemporaryUrl(new OSSClientUtil().getFileTemporaryLookUrl(aliyunUrl + projectReportSignature.getSignatureUrl()));
                     }
-                    signatureAttachment.setTemporaryUrl(new OSSClientUtil().getQzFileTemporaryLookUrl(aliyunUrl + projectReportSignature.getSignatureUrl()));
-                }else{
-                    signatureAttachment.setTemporaryUrl(new OSSClientUtil().getFileTemporaryLookUrl(aliyunUrl + projectReportSignature.getSignatureUrl()));
+                    User user = UserUtils.get(report.getSignatureUploadFileUser().getId());
+                    signatureAttachment.setCreateBy(user);
+                    signatureAttachment.setUpdateBy(user);
+                    signatureAttachment.setCreateDate(report.getSignatureUploadDate());
+                    signatureAttachment.setUpdateDate(report.getSignatureUploadDate());
+                    signatureAttachment.setDelFlag("0");
+                    signatureAttachment.setAttachmentName(report.getSignatureFileName());
+                    String type = report.getSignatureUrl().substring(report.getSignatureUrl().lastIndexOf(".") + 1);
+                    signatureAttachment.setType(type);
+                    signatureWorkAttachments.add(signatureAttachment);
                 }
-                User user = UserUtils.get(report.getSignatureUploadFileUser().getId());
-                signatureAttachment.setCreateBy(user);
-                signatureAttachment.setUpdateBy(user);
-                signatureAttachment.setCreateDate(report.getSignatureUploadDate());
-                signatureAttachment.setUpdateDate(report.getSignatureUploadDate());
-                signatureAttachment.setDelFlag("0");
-                signatureAttachment.setAttachmentName(report.getSignatureFileName());
-                String type = report.getSignatureUrl().substring(report.getSignatureUrl().lastIndexOf(".") + 1);
-                signatureAttachment.setType(type);
-                signatureWorkAttachments.add(signatureAttachment);
-            }
 
-            if(signatureWorkAttachments.size()>0){
-                projectReportSignature.setSignatureWorkAttachments(signatureWorkAttachments);
+                if(signatureWorkAttachments.size()>0){
+                    projectReportSignature.setSignatureWorkAttachments(signatureWorkAttachments);
+                }
             }
+
         }
 
         //签章责任列表
@@ -523,37 +530,40 @@ public class ProjectReportSignatureWorkController extends BaseController {
                     model.addAttribute("projectNotifyType", workProjectNotify.getNotifyType());
                 }
             }
-            List<WorkClientAttachment> signatureWorkAttachments = Lists.newArrayList();
-            if(StringUtils.isNotBlank(report.getSignatureUrl())){
-                WorkClientAttachment signatureAttachment = new WorkClientAttachment();
-
-                //处理文件路径
-                //如果文件路径中包含 /xg-qz 则表示文件存储在签章的对应文件库中需要单独进行处理
-                if(report.getSignatureUrl().contains("/xg-qz")){
-                    if(StringUtils.isNotBlank(report.getSignatureUrl())){
-                        String signatureUrl = report.getSignatureUrl().replace("/xg-qz","");
-                        projectReportSignature.setSignatureUrl(signatureUrl);
+            if (report.getStatus() == 5){
+                List<WorkClientAttachment> signatureWorkAttachments = Lists.newArrayList();
+                if(StringUtils.isNotBlank(report.getSignatureUrl())){
+                    WorkClientAttachment signatureAttachment = new WorkClientAttachment();
+
+                    //处理文件路径
+                    //如果文件路径中包含 /xg-qz 则表示文件存储在签章的对应文件库中需要单独进行处理
+                    if(report.getSignatureUrl().contains("/xg-qz")){
+                        if(StringUtils.isNotBlank(report.getSignatureUrl())){
+                            String signatureUrl = report.getSignatureUrl().replace("/xg-qz","");
+                            projectReportSignature.setSignatureUrl(signatureUrl);
+                        }
+                        signatureAttachment.setTemporaryUrl(new OSSClientUtil().getQzFileTemporaryLookUrl(aliyunUrl + projectReportSignature.getSignatureUrl()));
+                    }else{
+                        signatureAttachment.setTemporaryUrl(new OSSClientUtil().getFileTemporaryLookUrl(aliyunUrl + projectReportSignature.getSignatureUrl()));
                     }
-                    signatureAttachment.setTemporaryUrl(new OSSClientUtil().getQzFileTemporaryLookUrl(aliyunUrl + projectReportSignature.getSignatureUrl()));
-                }else{
-                    signatureAttachment.setTemporaryUrl(new OSSClientUtil().getFileTemporaryLookUrl(aliyunUrl + projectReportSignature.getSignatureUrl()));
+                    User user = UserUtils.get(report.getSignatureUploadFileUser().getId());
+                    signatureAttachment.setCreateBy(user);
+                    signatureAttachment.setUpdateBy(user);
+                    signatureAttachment.setCreateDate(report.getSignatureUploadDate());
+                    signatureAttachment.setUpdateDate(report.getSignatureUploadDate());
+                    signatureAttachment.setDelFlag("0");
+                    signatureAttachment.setAttachmentName(report.getSignatureFileName());
+                    String type = report.getSignatureUrl().substring(report.getSignatureUrl().lastIndexOf(".") + 1);
+                    signatureAttachment.setType(type);
+                    signatureWorkAttachments.add(signatureAttachment);
                 }
-                User user = UserUtils.get(report.getSignatureUploadFileUser().getId());
-                signatureAttachment.setCreateBy(user);
-                signatureAttachment.setUpdateBy(user);
-                signatureAttachment.setCreateDate(report.getSignatureUploadDate());
-                signatureAttachment.setUpdateDate(report.getSignatureUploadDate());
-                signatureAttachment.setDelFlag("0");
-                signatureAttachment.setAttachmentName(report.getSignatureFileName());
-                String type = report.getSignatureUrl().substring(report.getSignatureUrl().lastIndexOf(".") + 1);
-                signatureAttachment.setType(type);
-                signatureWorkAttachments.add(signatureAttachment);
-            }
 
-            if(signatureWorkAttachments.size()>0){
-                projectReportSignature.setSignatureWorkAttachments(signatureWorkAttachments);
+                if(signatureWorkAttachments.size()>0){
+                    projectReportSignature.setSignatureWorkAttachments(signatureWorkAttachments);
+                }
             }
 
+
         }
 
         //签章责任列表

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

@@ -9710,37 +9710,40 @@ public class WorkProjectNotifyController extends BaseController {
 		model.addAttribute("projectReportSignature", reportSignature);
 //
 		if (workProjectNotify.getRemarks().contains("待通知") || "view".equals(workProjectNotify.getView())) {
-			List<WorkClientAttachment> signatureWorkAttachments = Lists.newArrayList();
-			if(StringUtils.isNotBlank(reportSignature.getSignatureUrl())){
-				WorkClientAttachment signatureAttachment = new WorkClientAttachment();
-
-				//处理文件路径
-				//如果文件路径中包含 /xg-qz 则表示文件存储在签章的对应文件库中需要单独进行处理
-				if(reportSignature.getSignatureUrl().contains("/xg-qz")){
-					if(StringUtils.isNotBlank(reportSignature.getSignatureUrl())){
-						String signatureUrl = reportSignature.getSignatureUrl().replace("/xg-qz","");
-						reportSignature.setSignatureUrl(signatureUrl);
-					}
-					signatureAttachment.setTemporaryUrl(new OSSClientUtil().getQzFileTemporaryLookUrl(aliyunUrl + reportSignature.getSignatureUrl()));
-				}else{
-					signatureAttachment.setTemporaryUrl(new OSSClientUtil().getFileTemporaryLookUrl(aliyunUrl + reportSignature.getSignatureUrl()));
+			if (reportSignature.getStatus() == 5){
+				List<WorkClientAttachment> signatureWorkAttachments = Lists.newArrayList();
+				if(StringUtils.isNotBlank(reportSignature.getSignatureUrl())){
+					WorkClientAttachment signatureAttachment = new WorkClientAttachment();
+
+					//处理文件路径
+					//如果文件路径中包含 /xg-qz 则表示文件存储在签章的对应文件库中需要单独进行处理
+					if(reportSignature.getSignatureUrl().contains("/xg-qz")){
+						if(StringUtils.isNotBlank(reportSignature.getSignatureUrl())){
+							String signatureUrl = reportSignature.getSignatureUrl().replace("/xg-qz","");
+							reportSignature.setSignatureUrl(signatureUrl);
+						}
+						signatureAttachment.setTemporaryUrl(new OSSClientUtil().getQzFileTemporaryLookUrl(aliyunUrl + reportSignature.getSignatureUrl()));
+					}else{
+						signatureAttachment.setTemporaryUrl(new OSSClientUtil().getFileTemporaryLookUrl(aliyunUrl + reportSignature.getSignatureUrl()));
+					}
+					User user1 = UserUtils.get(reportSignature.getSignatureUploadFileUser().getId());
+					signatureAttachment.setCreateBy(user1);
+					signatureAttachment.setUpdateBy(user1);
+					signatureAttachment.setCreateDate(reportSignature.getSignatureUploadDate());
+					signatureAttachment.setUpdateDate(reportSignature.getSignatureUploadDate());
+					signatureAttachment.setDelFlag("0");
+					signatureAttachment.setAttachmentName(reportSignature.getSignatureFileName());
+					String type = reportSignature.getSignatureUrl().substring(reportSignature.getSignatureUrl().lastIndexOf(".") + 1);
+					signatureAttachment.setType(type);
+					signatureWorkAttachments.add(signatureAttachment);
 				}
-				User user1 = UserUtils.get(reportSignature.getSignatureUploadFileUser().getId());
-				signatureAttachment.setCreateBy(user1);
-				signatureAttachment.setUpdateBy(user1);
-				signatureAttachment.setCreateDate(reportSignature.getSignatureUploadDate());
-				signatureAttachment.setUpdateDate(reportSignature.getSignatureUploadDate());
-				signatureAttachment.setDelFlag("0");
-				signatureAttachment.setAttachmentName(reportSignature.getSignatureFileName());
-				String type = reportSignature.getSignatureUrl().substring(reportSignature.getSignatureUrl().lastIndexOf(".") + 1);
-				signatureAttachment.setType(type);
-				signatureWorkAttachments.add(signatureAttachment);
-			}
 
 
-			if(signatureWorkAttachments.size()>0){
-				reportSignature.setSignatureWorkAttachments(signatureWorkAttachments);
+				if(signatureWorkAttachments.size()>0){
+					reportSignature.setSignatureWorkAttachments(signatureWorkAttachments);
+				}
 			}
+
 			return "modules/signature/projectRerpotSignatureWork/ProjectRerpotSignatureWorkViewReport";
 		} else if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
 			//审核模板标识
@@ -9833,37 +9836,40 @@ public class WorkProjectNotifyController extends BaseController {
 		model.addAttribute("projectReportSignature", reportSignature);
 //
 		if (workProjectNotify.getRemarks().contains("待通知") || "view".equals(workProjectNotify.getView())) {
-			List<WorkClientAttachment> signatureWorkAttachments = Lists.newArrayList();
-			if(StringUtils.isNotBlank(reportSignature.getSignatureUrl())){
-				WorkClientAttachment signatureAttachment = new WorkClientAttachment();
-
-				//处理文件路径
-				//如果文件路径中包含 /xg-qz 则表示文件存储在签章的对应文件库中需要单独进行处理
-				if(reportSignature.getSignatureUrl().contains("/xg-qz")){
-					if(StringUtils.isNotBlank(reportSignature.getSignatureUrl())){
-						String signatureUrl = reportSignature.getSignatureUrl().replace("/xg-qz","");
-						reportSignature.setSignatureUrl(signatureUrl);
-					}
-					signatureAttachment.setTemporaryUrl(new OSSClientUtil().getQzFileTemporaryLookUrl(aliyunUrl + reportSignature.getSignatureUrl()));
-				}else{
-					signatureAttachment.setTemporaryUrl(new OSSClientUtil().getFileTemporaryLookUrl(aliyunUrl + reportSignature.getSignatureUrl()));
+			if (reportSignature.getStatus() == 5){
+				List<WorkClientAttachment> signatureWorkAttachments = Lists.newArrayList();
+				if(StringUtils.isNotBlank(reportSignature.getSignatureUrl())){
+					WorkClientAttachment signatureAttachment = new WorkClientAttachment();
+
+					//处理文件路径
+					//如果文件路径中包含 /xg-qz 则表示文件存储在签章的对应文件库中需要单独进行处理
+					if(reportSignature.getSignatureUrl().contains("/xg-qz")){
+						if(StringUtils.isNotBlank(reportSignature.getSignatureUrl())){
+							String signatureUrl = reportSignature.getSignatureUrl().replace("/xg-qz","");
+							reportSignature.setSignatureUrl(signatureUrl);
+						}
+						signatureAttachment.setTemporaryUrl(new OSSClientUtil().getQzFileTemporaryLookUrl(aliyunUrl + reportSignature.getSignatureUrl()));
+					}else{
+						signatureAttachment.setTemporaryUrl(new OSSClientUtil().getFileTemporaryLookUrl(aliyunUrl + reportSignature.getSignatureUrl()));
+					}
+					User user1 = UserUtils.get(reportSignature.getSignatureUploadFileUser().getId());
+					signatureAttachment.setCreateBy(user1);
+					signatureAttachment.setUpdateBy(user1);
+					signatureAttachment.setCreateDate(reportSignature.getSignatureUploadDate());
+					signatureAttachment.setUpdateDate(reportSignature.getSignatureUploadDate());
+					signatureAttachment.setDelFlag("0");
+					signatureAttachment.setAttachmentName(reportSignature.getSignatureFileName());
+					String type = reportSignature.getSignatureUrl().substring(reportSignature.getSignatureUrl().lastIndexOf(".") + 1);
+					signatureAttachment.setType(type);
+					signatureWorkAttachments.add(signatureAttachment);
 				}
-				User user1 = UserUtils.get(reportSignature.getSignatureUploadFileUser().getId());
-				signatureAttachment.setCreateBy(user1);
-				signatureAttachment.setUpdateBy(user1);
-				signatureAttachment.setCreateDate(reportSignature.getSignatureUploadDate());
-				signatureAttachment.setUpdateDate(reportSignature.getSignatureUploadDate());
-				signatureAttachment.setDelFlag("0");
-				signatureAttachment.setAttachmentName(reportSignature.getSignatureFileName());
-				String type = reportSignature.getSignatureUrl().substring(reportSignature.getSignatureUrl().lastIndexOf(".") + 1);
-				signatureAttachment.setType(type);
-				signatureWorkAttachments.add(signatureAttachment);
-			}
 
 
-			if(signatureWorkAttachments.size()>0){
-				reportSignature.setSignatureWorkAttachments(signatureWorkAttachments);
+				if(signatureWorkAttachments.size()>0){
+					reportSignature.setSignatureWorkAttachments(signatureWorkAttachments);
+				}
 			}
+
 			return "modules/signature/projectRerpotSignatureWork/ProjectRerpotSignatureWorkViewApproval2";
 		} else if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
 			//审核模板标识