فهرست منبع

审定单文件转oss下载功能

user5 3 سال پیش
والد
کامیت
92e9f66878

+ 8 - 0
src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralProjectMessageElectronicSealController.java

@@ -156,6 +156,14 @@ public class RuralProjectMessageElectronicSealController extends BaseController
             }else{
                 records1.setReportSignatureUrlFlag(0);
             }
+
+            if(StringUtils.isNotBlank(records1.getSignatureUrl())){
+                records1.setApprovalSignatureUrlFlag(1);
+                records1.setSignatureUrl(new OSSClientUtil().getFileTemporaryLookUrl(aliyunUrl + records1.getSignatureUrl()));
+                //处理文件路径
+            }else{
+                records1.setApprovalSignatureUrlFlag(0);
+            }
             if (records1.getWorkContractInfo() == null) {
                 projectRecordsService.queryLinkmanInfos(records1);
                 if (records1.getWorkClientLinkmanList() != null && records1.getWorkClientLinkmanList().size() > 0) {

+ 11 - 2
src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/electronicSeal/ruralProjectMessageElectronicSealList.jsp

@@ -914,7 +914,13 @@
                 }
 
                 </shiro:hasPermission>--%>
-				xml+="<a href=\"${ctx}/ruralProject/signatureCallBack/downLoadAttach?contractId="+ d.signatureContractId +"\" class=\"layui-btn  layui-btn-xs layui-bg-orange\" style='height:32px;margin-top: 5px;margin-bottom: 5px;'>审定单签章下载</a>"
+
+				if(d.approvalSignatureUrlFlag == 1){
+					xml+="<a href=\""+ d.signatureUrl +"\" class=\"layui-btn  layui-btn-xs layui-bg-orange\" style='height:32px;margin-top: 5px;margin-bottom: 5px;'>审定单签章下载</a>"
+				}else{
+					xml+="<a href=\"${ctx}/ruralProject/signatureCallBack/downLoadAttach?contractId="+ d.signatureContractId +"\" class=\"layui-btn  layui-btn-xs layui-bg-orange\" style='height:32px;margin-top: 5px;margin-bottom: 5px;'>审定单签章下载</a>"
+				}
+
 			}
 			if(d.reportSignatureStatus == 5){
 				//上传审定单进行签章
@@ -1451,7 +1457,10 @@
 					,"prsiId":"${projectRecords.prsiId}"
 					,"signatureDownloadUrl":"${projectRecords.signatureDownloadUrl}"
 					,"reportSignatureUrlFlag":"${projectRecords.reportSignatureUrlFlag}"
-					,"reportSignatureUrl":"${projectRecords.reportSignatureUrl}"
+					,"reportSignatureUrl":"${projectRecords.signatureUrl}"
+					,"signatureUrl":"${projectRecords.signatureUrl}"
+					,"approvalSignatureUrlFlag":"${projectRecords.approvalSignatureUrlFlag}"
+
 					,"falg":
 					<c:choose>
 						<c:when test="${fns:getUser().id == projectRecords.leaderIds || fns:getUser().id eq projectRecords.createBy.id}">