Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/oa/web/OaNotifyController.java

@@ -734,8 +734,9 @@ public class OaNotifyController extends BaseController {
 				ChatServerPool.sendMessageToUser(toUserConn, message);//同时向本人发送消息
 			}*/
 			oaNotify = oaNotifyService.getRecordList(oaNotify);
-			oaNotifyService.getUsers(oaNotify);
-			oaNotifyService.getOffices(oaNotify);
+			if (StringUtils.isNotBlank(oaNotify.getId())) {
+				oaNotifyService.queryDetails(oaNotify);
+			}
 			//查看登陆者访问该公告信息
 			OaNotifyView oaNotifyView = oaNotifyService.getOaNotifyView(oaNotify.getId(), UserUtils.getUser().getId());
 			//更新查看公告已看数据

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

@@ -49,6 +49,24 @@ public class PicturePreviewController extends BaseController {
 		return "modules/sys/picturePreview";
 	}
 
+	@RequestMapping("videoPreview")
+	public String videoPreview(@RequestParam("url")String url, Model model){
+		if("2".equals(uploadMode)){
+			//去除掉http前缀
+			if(url.indexOf("http://")!=-1){
+				url = url.replace("http://","");
+			}
+
+			int i = url.indexOf("/");
+			url = url.substring(i,url.length());
+			url = url.substring(0,url.lastIndexOf("?"));
+			url = aliyunUrl + url;
+			url = new OSSClientUtil().getFileTemporaryLookUrl(url);
+		}
+		model.addAttribute("url",url);
+		return "modules/sys/videoPreview";
+	}
+
 	@RequestMapping("getPreview")
 	@ResponseBody
 	public String getPreview(@RequestParam("url")String url, Model model){

src/main/webapp/static/oss/ossupload.js

@@ -216,6 +216,8 @@ function ftlMultitest (storeAs, file,attachmentId,attachmentFlag,uploadPath,divI
                                             str = str + '<a class="attention-info" href="javascript:void(0)" onclick="openPreview(\''+lookUrl+'\',1)">'+data.attachmentName+'</a>';
                                         }else if(isContains("rar,zip,jar,7z",lowerType)){
                                             str = str + '<a class="attention-info" href="javascript:void(0)" onclick="openPreview(\''+lookUrl+'\',3)">'+data.attachmentName+'</a>';
+                                        }else if(isContains("avi,wmv,mpg,mpeg,mov,rm,ram,swf,flv,mp4,rmvb",lowerType)){
+                                            str = str + '<a class="attention-info" href="javascript:void(0)" onclick="openDialogView(\'预览\',\''+ '/a/sys/picturepreview/videoPreview?url=' +lookUrl+ '\',\'90%\',\'90%\')">'+data.attachmentName+'</a>';
                                         }else {
                                             str = str + '<a class="attention-info" href="javascript:void(0)" onclick="openPreview(\''+lookUrl+'\',2)">'+data.attachmentName+'</a>';
                                         }
@@ -229,6 +231,8 @@ function ftlMultitest (storeAs, file,attachmentId,attachmentFlag,uploadPath,divI
                                     str = str + '<a class="attention-info" href="javascript:void(0)" onclick="openPreview(\''+data.url+'\',1)">'+data.attachmentName+'</a>';
                                 }else if(isContains("rar,zip,jar,7z",lowerType)){
                                     str = str + '<a class="attention-info" href="javascript:void(0)" onclick="openPreview(\''+data.url+'\',3)">'+data.attachmentName+'</a>';
+                                }else if(isContains("avi,wmv,mpg,mpeg,mov,rm,ram,swf,flv,mp4,rmvb",lowerType)){
+                                    str = str + '<a class="attention-info" href="javascript:void(0)" onclick="openDialogView(\'预览\',\''+ '/a/sys/picturepreview/videoPreview?url=' +lookUrl+ '\',\'90%\',\'90%\')">'+data.attachmentName+'</a>';
                                 }else {
                                     str = str + '<a class="attention-info" href="javascript:void(0)" onclick="openPreview(\''+data.url+'\',2)">'+data.attachmentName+'</a>';
                                 }
@@ -416,6 +420,8 @@ function multitestCollection (ossClient, storeAs, file,attachmentId,attachmentFl
                                     str = str + '<a class="attention-info" href="javascript:void(0)" onclick="openPreview(\''+lookUrl+'\',1)">'+data.attachmentName+'</a>';
                                 }else if(isContains("rar,zip,jar,7z",lowerType)){
                                     str = str + '<a class="attention-info" href="javascript:void(0)" onclick="openPreview(\''+lookUrl+'\',3)">'+data.attachmentName+'</a>';
+                                }else if(isContains("avi,wmv,mpg,mpeg,mov,rm,ram,swf,flv,mp4,rmvb",lowerType)){
+                                    str = str + '<a class="attention-info" href="javascript:void(0)" onclick="openDialogView(\'预览\',\''+ '/a/sys/picturepreview/videoPreview?url=' +lookUrl+ '\',\'90%\',\'90%\')">'+data.attachmentName+'</a>';
                                 }else {
                                     str = str + '<a class="attention-info" href="javascript:void(0)" onclick="openPreview(\''+lookUrl+'\',2)">'+data.attachmentName+'</a>';
                                 }
@@ -429,6 +435,8 @@ function multitestCollection (ossClient, storeAs, file,attachmentId,attachmentFl
                             str = str + '<a class="attention-info" href="javascript:void(0)" onclick="openPreview(\''+data.url+'\',1)">'+data.attachmentName+'</a>';
                         }else if(isContains("rar,zip,jar,7z",lowerType)){
                             str = str + '<a class="attention-info" href="javascript:void(0)" onclick="openPreview(\''+data.url+'\',3)">'+data.attachmentName+'</a>';
+                        }else if(isContains("avi,wmv,mpg,mpeg,mov,rm,ram,swf,flv,mp4,rmvb",lowerType)){
+                            str = str + '<a class="attention-info" href="javascript:void(0)" onclick="openDialogView(\'预览\',\''+ '/a/sys/picturepreview/videoPreview?url=' +lookUrl+ '\',\'90%\',\'90%\')">'+data.attachmentName+'</a>';
                         }else {
                             str = str + '<a class="attention-info" href="javascript:void(0)" onclick="openPreview(\''+data.url+'\',2)">'+data.attachmentName+'</a>';
                         }
@@ -723,6 +731,8 @@ function multitest (ossClient, storeAs, file,attachmentId,attachmentFlag,uploadP
                                     str = str + '<a class="attention-info" href="javascript:void(0)" onclick="openPreview(\''+lookUrl+'\',1)">'+data.attachmentName+'</a>';
                                 }else if(isContains("rar,zip,jar,7z",lowerType)){
                                     str = str + '<a class="attention-info" href="javascript:void(0)" onclick="openPreview(\''+lookUrl+'\',3)">'+data.attachmentName+'</a>';
+                                }else if(isContains("avi,wmv,mpg,mpeg,mov,rm,ram,swf,flv,mp4,rmvb",lowerType)){
+                                    str = str + '<a class="attention-info" href="javascript:void(0)" onclick="openDialogView(\'预览\',\''+ '/a/sys/picturepreview/videoPreview?url=' +lookUrl+ '\',\'90%\',\'90%\')">'+data.attachmentName+'</a>';
                                 }else {
                                     str = str + '<a class="attention-info" href="javascript:void(0)" onclick="openPreview(\''+lookUrl+'\',2)">'+data.attachmentName+'</a>';
                                 }
@@ -736,6 +746,8 @@ function multitest (ossClient, storeAs, file,attachmentId,attachmentFlag,uploadP
                             str = str + '<a class="attention-info" href="javascript:void(0)" onclick="openPreview(\''+data.url+'\',1)">'+data.attachmentName+'</a>';
                         }else if(isContains("rar,zip,jar,7z",lowerType)){
                             str = str + '<a class="attention-info" href="javascript:void(0)" onclick="openPreview(\''+data.url+'\',3)">'+data.attachmentName+'</a>';
+                        }else if(isContains("avi,wmv,mpg,mpeg,mov,rm,ram,swf,flv,mp4,rmvb",lowerType)){
+                            str = str + '<a class="attention-info" href="javascript:void(0)" onclick="openDialogView(\'预览\',\''+ '/a/sys/picturepreview/videoPreview?url=' +lookUrl+ '\',\'90%\',\'90%\')">'+data.attachmentName+'</a>';
                         }else {
                             str = str + '<a class="attention-info" href="javascript:void(0)" onclick="openPreview(\''+data.url+'\',2)">'+data.attachmentName+'</a>';
                         }
@@ -904,6 +916,8 @@ function multitestRecordsReported (ossClient, storeAs, file,attachmentId,attachm
                                     str = str + '<a class="attention-info" href="javascript:void(0)" onclick="openPreview(\''+lookUrl+'\',1)">'+data.attachmentName+'</a>';
                                 }else if(isContains("rar,zip,jar,7z",lowerType)){
                                     str = str + '<a class="attention-info" href="javascript:void(0)" onclick="openPreview(\''+lookUrl+'\',3)">'+data.attachmentName+'</a>';
+                                }else if(isContains("avi,wmv,mpg,mpeg,mov,rm,ram,swf,flv,mp4,rmvb",lowerType)){
+                                    str = str + '<a class="attention-info" href="javascript:void(0)" onclick="openDialogView(\'预览\',\''+ '/a/sys/picturepreview/videoPreview?url=' +lookUrl+ '\',\'90%\',\'90%\')">'+data.attachmentName+'</a>';
                                 }else {
                                     str = str + '<a class="attention-info" href="javascript:void(0)" onclick="openPreview(\''+lookUrl+'\',2)">'+data.attachmentName+'</a>';
                                 }
@@ -917,6 +931,8 @@ function multitestRecordsReported (ossClient, storeAs, file,attachmentId,attachm
                             str = str + '<a class="attention-info" href="javascript:void(0)" onclick="openPreview(\''+data.url+'\',1)">'+data.attachmentName+'</a>';
                         }else if(isContains("rar,zip,jar,7z",lowerType)){
                             str = str + '<a class="attention-info" href="javascript:void(0)" onclick="openPreview(\''+data.url+'\',3)">'+data.attachmentName+'</a>';
+                        }else if(isContains("avi,wmv,mpg,mpeg,mov,rm,ram,swf,flv,mp4,rmvb",lowerType)){
+                            str = str + '<a class="attention-info" href="javascript:void(0)" onclick="openDialogView(\'预览\',\''+ '/a/sys/picturepreview/videoPreview?url=' +lookUrl+ '\',\'90%\',\'90%\')">'+data.attachmentName+'</a>';
                         }else {
                             str = str + '<a class="attention-info" href="javascript:void(0)" onclick="openPreview(\''+data.url+'\',2)">'+data.attachmentName+'</a>';
                         }

src/main/webapp/webpage/include/head.jsp

@@ -36,7 +36,7 @@
 
 <!-- jeeplus -->
 <link href="${ctxStatic}/common/jeeplus.css" type="text/css" rel="stylesheet" />
-<script src="${ctxStatic}/common/jeeplus.js" type="text/javascript"></script>
+<script src="${ctxStatic}/common/jeeplus.js?1" type="text/javascript"></script>
 
 <!-- jquery ui -->
 <script src="${ctxStatic}/jquery-ui/jquery-ui.min.js"></script>
@@ -98,7 +98,7 @@
         {
              document.write('<script src="http://gosspublic.alicdn.com/aliyun-oss-sdk-4.4.4.min.js"><\/script>');
             document.write('<script src="${ctxStatic}/bos/node_modules/@baiducloud/sdk/dist/baidubce-sdk.bundle.min.js"><\/script>');
-            document.write('<script type="text/javascript" src="${ctxStatic}/oss/ossupload.js"><\/script>');
+            document.write('<script type="text/javascript" src="${ctxStatic}/oss/ossupload.js?1"><\/script>');
             /*document.write('<script type="text/javascript" src="${ctxStatic}/bos/bosupload.js"><\/script>');*/
         }
     }
@@ -106,7 +106,7 @@
     {
          document.write('<script src="http://gosspublic.alicdn.com/aliyun-oss-sdk-4.4.4.min.js"><\/script>');
         document.write('<script src="${ctxStatic}/bos/node_modules/@baiducloud/sdk/dist/baidubce-sdk.bundle.min.js"><\/script>');
-        document.write('<script type="text/javascript" src="${ctxStatic}/oss/ossupload.js"><\/script>');
+        document.write('<script type="text/javascript" src="${ctxStatic}/oss/ossupload.js?1"><\/script>');
         /*document.write('<script type="text/javascript" src="${ctxStatic}/bos/bosupload.js"><\/script>');*/
     }
 

src/main/webapp/webpage/modules/oa/oaNotifyAudit.jsp

@@ -377,7 +377,24 @@
                                                                     <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',3)">${workClientAttachment.attachmentName}</a></td>
                                                                 </c:when>
                                                                 <c:otherwise>
-                                                                    <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',2)">${workClientAttachment.attachmentName}</a></td>
+                                                                    <c:choose>
+                                                                        <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'avi')
+                                                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'wmv')
+                                                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'mpg')
+                                                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'mpeg')
+                                                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'mov')
+                                                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'rm')
+                                                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'ram')
+                                                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'swf')
+                                                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'flv')
+                                                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'mp4')
+                                                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'rmvb')}">
+                                                                            <td><a class="attention-info" href="javascript:void(0)" onclick="openDialogView('预览','${ctx}/sys/picturepreview/videoPreview?url=${workClientAttachment.temporaryUrl}','90%','90%')" >${workClientAttachment.attachmentName}</a></td>
+                                                                        </c:when>
+                                                                        <c:otherwise>
+                                                                            <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',2)">${workClientAttachment.attachmentName}</a></td>
+                                                                        </c:otherwise>
+                                                                    </c:choose>
                                                                 </c:otherwise>
                                                             </c:choose>
                                                         </c:otherwise>
@@ -412,7 +429,24 @@
                                                                     <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',3)">${workClientAttachment.attachmentName}</a></td>
                                                                 </c:when>
                                                                 <c:otherwise>
-                                                                    <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',2)">${workClientAttachment.attachmentName}</a></td>
+                                                                    <c:choose>
+                                                                        <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'avi')
+                                                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'wmv')
+                                                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'mpg')
+                                                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'mpeg')
+                                                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'mov')
+                                                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'rm')
+                                                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'ram')
+                                                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'swf')
+                                                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'flv')
+                                                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'mp4')
+                                                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'rmvb')}">
+                                                                            <td><a class="attention-info" href="javascript:void(0)" onclick="openDialogView('预览','${ctx}/sys/picturepreview/videoPreview?url=${workClientAttachment.temporaryUrl}','90%','90%')" >${workClientAttachment.attachmentName}</a></td>
+                                                                        </c:when>
+                                                                        <c:otherwise>
+                                                                            <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',2)">${workClientAttachment.attachmentName}</a></td>
+                                                                        </c:otherwise>
+                                                                    </c:choose>
                                                                 </c:otherwise>
                                                             </c:choose>
                                                         </c:otherwise>

src/main/webapp/webpage/modules/oa/oaNotifyForm.jsp

@@ -440,7 +440,24 @@
                                                                     <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',3)">${workClientAttachment.attachmentName}</a></td>
                                                                 </c:when>
                                                                 <c:otherwise>
-                                                                    <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',2)">${workClientAttachment.attachmentName}</a></td>
+                                                                    <c:choose>
+                                                                        <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'avi')
+                                                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'wmv')
+                                                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'mpg')
+                                                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'mpeg')
+                                                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'mov')
+                                                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'rm')
+                                                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'ram')
+                                                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'swf')
+                                                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'flv')
+                                                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'mp4')
+                                                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'rmvb')}">
+                                                                            <td><a class="attention-info" href="javascript:void(0)" onclick="openDialogView('预览','${ctx}/sys/picturepreview/videoPreview?url=${workClientAttachment.temporaryUrl}','90%','90%')" >${workClientAttachment.attachmentName}</a></td>
+                                                                        </c:when>
+                                                                        <c:otherwise>
+                                                                            <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',2)">${workClientAttachment.attachmentName}</a></td>
+                                                                        </c:otherwise>
+                                                                    </c:choose>
                                                                 </c:otherwise>
                                                             </c:choose>
                                                         </c:otherwise>
@@ -471,7 +488,24 @@
                                                                     <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',3)">${workClientAttachment.attachmentName}</a></td>
                                                                 </c:when>
                                                                 <c:otherwise>
-                                                                    <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',2)">${workClientAttachment.attachmentName}</a></td>
+                                                                    <c:choose>
+                                                                        <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'avi')
+                                                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'wmv')
+                                                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'mpg')
+                                                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'mpeg')
+                                                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'mov')
+                                                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'rm')
+                                                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'ram')
+                                                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'swf')
+                                                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'flv')
+                                                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'mp4')
+                                                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'rmvb')}">
+                                                                            <td><a class="attention-info" href="javascript:void(0)" onclick="openDialogView('预览','${ctx}/sys/picturepreview/videoPreview?url=${workClientAttachment.url}','90%','90%')" >${workClientAttachment.attachmentName}</a></td>
+                                                                        </c:when>
+                                                                        <c:otherwise>
+                                                                            <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',2)">${workClientAttachment.attachmentName}</a></td>
+                                                                        </c:otherwise>
+                                                                    </c:choose>
                                                                 </c:otherwise>
                                                             </c:choose>
                                                         </c:otherwise>

src/main/webapp/webpage/modules/oa/oaNotifyHomeView.jsp

@@ -335,7 +335,24 @@
                                                                         <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',3)">${workClientAttachment.attachmentName}</a></td>
                                                                     </c:when>
                                                                     <c:otherwise>
-                                                                        <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',2)">${workClientAttachment.attachmentName}</a></td>
+                                                                        <c:choose>
+                                                                            <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'avi')
+                                                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'wmv')
+                                                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'mpg')
+                                                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'mpeg')
+                                                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'mov')
+                                                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'rm')
+                                                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'ram')
+                                                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'swf')
+                                                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'flv')
+                                                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'mp4')
+                                                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'rmvb')}">
+                                                                                <td><a class="attention-info" href="javascript:void(0)" onclick="openDialogView('预览','${ctx}/sys/picturepreview/videoPreview?url=${workClientAttachment.temporaryUrl}','90%','90%')" >${workClientAttachment.attachmentName}</a></td>
+                                                                            </c:when>
+                                                                            <c:otherwise>
+                                                                                <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',2)">${workClientAttachment.attachmentName}</a></td>
+                                                                            </c:otherwise>
+                                                                        </c:choose>
                                                                     </c:otherwise>
                                                                 </c:choose>
                                                             </c:otherwise>
@@ -366,7 +383,24 @@
                                                                         <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',3)">${workClientAttachment.attachmentName}</a></td>
                                                                     </c:when>
                                                                     <c:otherwise>
-                                                                        <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',2)">${workClientAttachment.attachmentName}</a></td>
+                                                                        <c:choose>
+                                                                            <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'avi')
+                                                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'wmv')
+                                                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'mpg')
+                                                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'mpeg')
+                                                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'mov')
+                                                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'rm')
+                                                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'ram')
+                                                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'swf')
+                                                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'flv')
+                                                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'mp4')
+                                                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'rmvb')}">
+                                                                                <td><a class="attention-info" href="javascript:void(0)" onclick="openDialogView('预览','${ctx}/sys/picturepreview/videoPreview?url=${workClientAttachment.url}','90%','90%')" >${workClientAttachment.attachmentName}</a></td>
+                                                                            </c:when>
+                                                                            <c:otherwise>
+                                                                                <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',2)">${workClientAttachment.attachmentName}</a></td>
+                                                                            </c:otherwise>
+                                                                        </c:choose>
                                                                     </c:otherwise>
                                                                 </c:choose>
                                                             </c:otherwise>

src/main/webapp/webpage/modules/oa/oaNotifyModifyApply.jsp

@@ -414,7 +414,24 @@
                                                                 <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',3)">${workClientAttachment.attachmentName}</a></td>
                                                             </c:when>
                                                             <c:otherwise>
-                                                                <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',2)">${workClientAttachment.attachmentName}</a></td>
+                                                                <c:choose>
+                                                                    <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'avi')
+                                                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'wmv')
+                                                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'mpg')
+                                                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'mpeg')
+                                                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'mov')
+                                                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'rm')
+                                                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'ram')
+                                                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'swf')
+                                                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'flv')
+                                                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'mp4')
+                                                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'rmvb')}">
+                                                                        <td><a class="attention-info" href="javascript:void(0)" onclick="openDialogView('预览','${ctx}/sys/picturepreview/videoPreview?url=${workClientAttachment.temporaryUrl}','90%','90%')" >${workClientAttachment.attachmentName}</a></td>
+                                                                    </c:when>
+                                                                    <c:otherwise>
+                                                                        <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',2)">${workClientAttachment.attachmentName}</a></td>
+                                                                    </c:otherwise>
+                                                                </c:choose>
                                                             </c:otherwise>
                                                         </c:choose>
                                                     </c:otherwise>
@@ -445,7 +462,24 @@
                                                                 <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',3)">${workClientAttachment.attachmentName}</a></td>
                                                             </c:when>
                                                             <c:otherwise>
-                                                                <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',2)">${workClientAttachment.attachmentName}</a></td>
+                                                                <c:choose>
+                                                                    <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'avi')
+                                                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'wmv')
+                                                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'mpg')
+                                                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'mpeg')
+                                                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'mov')
+                                                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'rm')
+                                                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'ram')
+                                                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'swf')
+                                                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'flv')
+                                                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'mp4')
+                                                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'rmvb')}">
+                                                                        <td><a class="attention-info" href="javascript:void(0)" onclick="openDialogView('预览','${ctx}/sys/picturepreview/videoPreview?url=${workClientAttachment.url}','90%','90%')" >${workClientAttachment.attachmentName}</a></td>
+                                                                    </c:when>
+                                                                    <c:otherwise>
+                                                                        <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',2)">${workClientAttachment.attachmentName}</a></td>
+                                                                    </c:otherwise>
+                                                                </c:choose>
                                                             </c:otherwise>
                                                         </c:choose>
                                                     </c:otherwise>

src/main/webapp/webpage/modules/oa/oaNotifyView.jsp

@@ -312,7 +312,24 @@
                                                                 <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',3)">${workClientAttachment.attachmentName}</a></td>
                                                             </c:when>
                                                             <c:otherwise>
-                                                                <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',2)">${workClientAttachment.attachmentName}</a></td>
+                                                                <c:choose>
+                                                                    <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'avi')
+                                                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'wmv')
+                                                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'mpg')
+                                                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'mpeg')
+                                                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'mov')
+                                                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'rm')
+                                                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'ram')
+                                                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'swf')
+                                                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'flv')
+                                                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'mp4')
+                                                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'rmvb')}">
+                                                                        <td><a class="attention-info" href="javascript:void(0)" onclick="openDialogView('预览','${ctx}/sys/picturepreview/videoPreview?url=${workClientAttachment.temporaryUrl}','90%','90%')" >${workClientAttachment.attachmentName}</a></td>
+                                                                    </c:when>
+                                                                    <c:otherwise>
+                                                                        <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',2)">${workClientAttachment.attachmentName}</a></td>
+                                                                    </c:otherwise>
+                                                                </c:choose>
                                                             </c:otherwise>
                                                         </c:choose>
                                                     </c:otherwise>
@@ -347,7 +364,24 @@
                                                                 <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',3)">${workClientAttachment.attachmentName}</a></td>
                                                             </c:when>
                                                             <c:otherwise>
-                                                                <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',2)">${workClientAttachment.attachmentName}</a></td>
+                                                                <c:choose>
+                                                                    <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'avi')
+                                                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'wmv')
+                                                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'mpg')
+                                                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'mpeg')
+                                                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'mov')
+                                                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'rm')
+                                                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'ram')
+                                                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'swf')
+                                                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'flv')
+                                                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'mp4')
+                                                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'rmvb')}">
+                                                                        <td><a class="attention-info" href="javascript:void(0)" onclick="openDialogView('预览','${ctx}/sys/picturepreview/videoPreview?url=${workClientAttachment.url}','90%','90%')" >${workClientAttachment.attachmentName}</a></td>
+                                                                    </c:when>
+                                                                    <c:otherwise>
+                                                                        <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',2)">${workClientAttachment.attachmentName}</a></td>
+                                                                    </c:otherwise>
+                                                                </c:choose>
                                                             </c:otherwise>
                                                         </c:choose>
                                                     </c:otherwise>

src/main/webapp/webpage/modules/sys/videoPreview.jsp

@@ -0,0 +1,45 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<%@ include file="/webpage/include/taglib.jsp" %>
+<html>
+<head>
+    <script type="text/javascript">
+        function AutoResizeImage(maxWidth,maxHeight,objImg){
+            var img = new Image();
+            img.src = objImg.src;
+            var hRatio;
+            var wRatio;
+            var Ratio = 1;
+            var w = img.width;
+            var h = img.height;
+            wRatio = maxWidth / w;
+            hRatio = maxHeight / h;
+            if (maxWidth ==0 && maxHeight==0){
+                Ratio = 1;
+            }else if (maxWidth==0){//
+                if (hRatio<1) Ratio = hRatio;
+            }else if (maxHeight==0){
+                if (wRatio<1) Ratio = wRatio;
+            }else if (wRatio<1 || hRatio<1){
+                Ratio = (wRatio<=hRatio?wRatio:hRatio);
+            }
+            if (Ratio<1){
+                w = w * Ratio;
+                h = h * Ratio;
+            }
+            objImg.height = h;
+            objImg.width = w;
+        }
+    </script>
+</head>
+<body class="hideScroll">
+<center style="margin-top: 40px;">
+    <%--<video src="${url}" onload="AutoResizeImage(800,550,this)" controls="controls">
+    </video>--%>
+    <video src='${url}' heigth='550px' autoplay="autoplay" controls>
+        <source src='${url}' type='video/mp4'>   <!-- 当‘视频1.mp4’无法播放时，会跳转到src='视频2.mp4' -->
+        <source src='${url}' type='video/ogg'>   <!-- 当浏览器不支持MP4格式的视频时，会自动找此处ogv格式的视频 -->
+        <source src='${url}' type='video/webm'>
+    </video>
+</center>
+</body>
+</html>