Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/projectAccessory/dao/ProjectAccessoryDao.java

@@ -56,6 +56,12 @@ public interface ProjectAccessoryDao extends CrudDao<ProjectAccessoryInfo>,TreeD
      * @return
      */
     CollectAccessoryInfo getCollectAccessoryInfo(CollectAccessoryInfo collectAccessoryInfo);
+    /**
+     * 根据保存的url查询保存的附件信息1
+     * @param collectAccessoryInfo
+     * @return
+     */
+    CollectAccessoryInfo getCollectAccessoryInfo1(CollectAccessoryInfo collectAccessoryInfo);
 
     /**
      * 根据类型查询附件信息

src/main/java/com/jeeplus/modules/projectAccessory/entity/CollectAccessoryInfo.java

@@ -11,6 +11,8 @@ public class CollectAccessoryInfo extends DataEntity<CollectAccessoryInfo> {
 
     private String url;     //附件路径
     private String fileName;     //附件名称
+    private String fileSize;     //附件大小
+    private String fileType;     //附件类型
     private String userId;  //收藏人
     private String type;    //收藏类型
     private String officeId;    //部门id
@@ -136,4 +138,20 @@ public class CollectAccessoryInfo extends DataEntity<CollectAccessoryInfo> {
     public void setIndividualFlag(Integer individualFlag) {
         this.individualFlag = individualFlag;
     }
+
+    public String getFileSize() {
+        return fileSize;
+    }
+
+    public void setFileSize(String fileSize) {
+        this.fileSize = fileSize;
+    }
+
+    public String getFileType() {
+        return fileType;
+    }
+
+    public void setFileType(String fileType) {
+        this.fileType = fileType;
+    }
 }

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

@@ -394,7 +394,7 @@ public class WorkattachmentService extends CrudService<WorkattachmentDao, Workat
 		//遍历附件信息，判定改附件信息是否被收藏
 		for (WorkClientAttachment info: list) {
 			cAInfo.setUrl(info.getUrl());
-			CollectAccessoryInfo collectAccessoryInfo = projectAccessoryDao.getCollectAccessoryInfo(cAInfo);
+			CollectAccessoryInfo collectAccessoryInfo = projectAccessoryDao.getCollectAccessoryInfo1(cAInfo);
 			if(null != collectAccessoryInfo){
 				info.setCollectFlag("1");
 			}else{
@@ -420,7 +420,7 @@ public class WorkattachmentService extends CrudService<WorkattachmentDao, Workat
 		//遍历附件信息，判定改附件信息是否被收藏
 		for (WorkClientAttachment info: list) {
 			cAInfo.setUrl(info.getUrl());
-			CollectAccessoryInfo collectAccessoryInfo = projectAccessoryDao.getCollectAccessoryInfo(cAInfo);
+			CollectAccessoryInfo collectAccessoryInfo = projectAccessoryDao.getCollectAccessoryInfo1(cAInfo);
 			if(null != collectAccessoryInfo){
 				info.setCollectFlag("1");
 			}else{

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

@@ -21,6 +21,7 @@ import com.jeeplus.modules.utils.SftpClientUtil;
 import org.apache.shiro.authz.annotation.Logical;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.method.P;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.*;
@@ -145,6 +146,11 @@ public class WorkattachmentController extends BaseController {
 			SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 			String[] type = workattachment.getAttachmentName().split("\\.");
 			String url = workattachment.getUrl();
+			if (url.contains(Global.getConfig("aliyunUrl"))){
+				url=url.replace(Global.getConfig("aliyunUrl"), "");
+			}else if (url.contains(Global.getConfig("bosUrl"))){
+				url=url.replace(Global.getConfig("aliyunUrl"), "");
+			}
 			workattachment.setType(type[type.length-1]);
 			workattachment.setAttachmentUser(UserUtils.getUser().getId());
 			workattachment.setCompanyId(UserUtils.getSelectCompany().getId());

src/main/resources/mappings/modules/collectAccessory/CollectAccessoryDao.xml

@@ -17,6 +17,7 @@
 		a.company_id AS "companyId",
 		a.collect_type  AS "collectType",
 		a.collect_user_id AS "collectUser.id",
+		a.file_size AS "fileSize",
 		su.name as "createBy.name",
 		suc.name as "collectUser.name"
 	</sql>
@@ -83,7 +84,9 @@
 		  office_id,
 		  company_id,
 		  collect_type,
-		  collect_user_id
+		  collect_user_id,
+		  file_size,
+		  file_type
 		)
 		values
 		  (
@@ -100,7 +103,9 @@
 			#{officeId},
 			#{companyId},
 			#{collectType},
-			#{collectUser.id}
+			#{collectUser.id},
+			#{fileSize},
+			#{fileType}
 		  )
 	</insert>
 

src/main/resources/mappings/modules/projectAccessory/ProjectAccessoryDao.xml

@@ -224,7 +224,9 @@
 		  office_id,
 		  company_id,
 		  collect_type,
-		  collect_user_id
+		  collect_user_id,
+		  file_size,
+		  file_type
 		)
 		values
 		  (
@@ -241,7 +243,9 @@
 			#{officeId},
 			#{companyId},
 			#{collectType},
-			#{collectUser.id}
+			#{collectUser.id},
+			#{fileSize},
+			#{fileType}
 		  )
 	</insert>
 
@@ -284,6 +288,7 @@
 		  a.type as "type",
 		  a.office_id as "officeId",
 		  a.company_id as "companyId",
+		  a.file_size as "fileSize",
 		  asu.name as "createBy.name",
 		a.collect_type as "collectType"
 		from
@@ -303,4 +308,27 @@
 				and a.company_id = #{companyId} and a.type='3'
 			</if>
 	</select>
+	<select id="getCollectAccessoryInfo1"
+			resultType="com.jeeplus.modules.projectAccessory.entity.CollectAccessoryInfo">
+		select
+			a.id AS "id",
+			a.create_by AS "createBy.id",
+			a.create_date AS "createDate",
+			a.update_by AS "updateBy.id",
+			a.update_date AS "updateDate",
+			a.remarks AS "remarks",
+			a.del_flag AS "delFlag",
+			a.url as "url",
+			a.file_name as "fileName",
+			a.type as "type",
+			a.office_id as "officeId",
+			a.company_id as "companyId",
+			a.collect_type as "collectType"
+		from
+			work_collect_accessory a
+		where a.url = #{url} and a.del_flag = 0
+		  and (
+				(a.create_by = #{createBy.id} and a.type='1')
+			)
+	</select>
 </mapper>

src/main/webapp/WEB-INF/tags/sys/collectSelect.tag

@@ -38,13 +38,15 @@ function searchGrid${id}(clientId){
 	    	 if(item == "-1"){
 		    	 return;
 	    	 }
+	    	 console.log(item)
 			 /*if (item.length>1){
 			 	console.log(item)
 				 top.layer.msg("不能进行多选，请重新选择。", {icon: 0});
 				 return false;
 			 }*/
 			 top.layer.close(index);//关闭对话框。
-           	 setValuee(item);
+           	 // setValuee(item);
+			insertTitleCollection(item)
 		  },
 		  cancel: function(index){
 	       }
@@ -52,9 +54,8 @@ function searchGrid${id}(clientId){
 
 }
 </script>
-
 	<input id="${id}Id"  type="hidden" value="${value}"/>
-	<div class="input-group" style="width: 100%">
+	<div class="input-group" style="float: left;width: 30px;">
        		 <span class="input-group-btn">
 	       		 <a href=javascript:void(0); style="font-size:14px;" onclick="searchGridlinkman($('#linkmanId').val())" id="linkmanButton" class="nav-btn nav-btn-add"><i class="fa fa-search-plus"></i>
 	              收藏调用</a>

src/main/webapp/WEB-INF/tags/sys/treeselect.tag

@@ -62,23 +62,23 @@
 							}//</c:if><c:if test="${notAllowSelectRoot}">
 							if (nodes[i].level == 0){
 								//top.$.jBox.tip("不能选择根节点（"+nodes[i].name+"）请重新选择。");
-								top.layer.msg("不能选择根节点（"+nodes[i].name+"）请重新选择。", {icon: 0});
-								return false;
+								// top.layer.msg("不能选择根节点（"+nodes[i].name+"）请重新选择。", {icon: 0});
+								// return false;
 							}//</c:if><c:if test="${notAllowSelectParent}">
 							if (nodes[i].isParent){
 								//top.$.jBox.tip("不能选择父节点（"+nodes[i].name+"）请重新选择。");
 								//layer.msg('有表情地提示');
-								top.layer.msg("不能选择父节点（"+nodes[i].name+"）请重新选择。", {icon: 0});
-								return false;
+								// top.layer.msg("不能选择父节点（"+nodes[i].name+"）请重新选择。", {icon: 0});
+								// return false;
 							}//</c:if><c:if test="${not empty module && selectScopeModule}">
 							if (nodes[i].module == ""){
 								//top.$.jBox.tip("不能选择公共模型（"+nodes[i].name+"）请重新选择。");
-								top.layer.msg("不能选择公共模型（"+nodes[i].name+"）请重新选择。", {icon: 0});
-								return false;
+								// top.layer.msg("不能选择公共模型（"+nodes[i].name+"）请重新选择。", {icon: 0});
+								// return false;
 							}else if (nodes[i].module != "${module}"){
 								//top.$.jBox.tip("不能选择当前栏目以外的栏目模型，请重新选择。");
-								top.layer.msg("不能选择当前栏目以外的栏目模型，请重新选择。", {icon: 0});
-								return false;
+								// top.layer.msg("不能选择当前栏目以外的栏目模型，请重新选择。", {icon: 0});
+								// return false;
 							}//</c:if>
 							ids.push(nodes[i].id);
 							names.push(nodes[i].name);//<c:if test="${!checked}">

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

@@ -147,68 +147,6 @@ function multipartUploadWithSts(storeAs, file,attachmentId,attachmentFlag,upload
             multitest(client, storeAs, file,attachmentId,attachmentFlag,uploadPath.replace('http://dmtest-test.oss-cn-shanghai.aliyuncs.com', result.AliyunUrl),divId,size, cpt);
     })
 };
-
-function fBmultipartUploadWithSts(storeAs, file,attachmentId,attachmentFlag,uploadPath,divId,size, cpt,idx,prefix,currentUser) {
-    console.log("-----------------------start");
-    console.log("-----------------------"+realPath);
-
-    file.name.replace(" ","")
-    file.name.replace(/—/g,"")
-    var fileName = file.name;
-    // 将单引号‘’都转换成'，将双引号“”都转换成"
-    fileName = fileName.replace(/\’|\‘/g,"'").replace(/\“|\”/g,"\"");
-    // 将中括号【】转换成[]，将大括号｛｝转换成{}
-    fileName = fileName.replace(/\【/g,"(").replace(/\】/g,")").replace(/\｛/g,"(").replace(/\｝/g,")");
-    fileName = fileName.replace(/\[/g,"(").replace(/\]/g,")").replace(/\{/g,"(").replace(/\}/g,")");
-    // 将逗号，转换成,，将：转换成:
-    fileName = fileName.replace(/，/g,",").replace(/：/g,":");
-    //将中文——转换为英文-
-    fileName = fileName.replace(/—/g,"-")
-    fileName = fileName.replace("……","")
-    fileName = fileName.replace("±","")
-    var dfl=new File([file],fileName,{type:file.type});
-    file = dfl
-
-    requestUrl = realPath+"/previewController/getAccess";
-    OSS.urllib.request(requestUrl, {method: 'GET'}, function (err, response) {
-        if (err) {
-            console.log(err);
-            $.ajax({
-                type:"post",
-                url:realPath+"/previewController/saveJSError",
-                data:{object:err.toString()},
-                async: false,
-                success:function(data){
-                }
-            });
-            return alert(err);
-        }
-        try {
-            result = JSON.parse(response);
-        } catch (e) {
-            errmsg = 'parse sts response info error: ' + e.message;
-            return alert(errmsg);
-        }
-        console.log("---------result"+result);
-        client = new OSS.Wrapper({
-            accessKeyId: result.AccessKeyId,
-            accessKeySecret: result.AccessKeySecret,
-            stsToken: result.SecurityToken,
-            bucket: result.Bucket,
-            endpoint: result.Endpoint,
-            timeout:'30000'
-        });
-        storeAs = "attachment-file/" + storeAs +"/"+today+new Date().getTime()+ file.name;
-        if(cpt == 1)
-            fBmultitestFlag(client,storeAs, file,attachmentId,attachmentFlag,uploadPath.replace('http://dmtest-test.oss-cn-shanghai.aliyuncs.com', result.AliyunUrl),divId,size, cpt,idx,prefix,currentUser);
-        else
-            multitest(client, storeAs, file,attachmentId,attachmentFlag,uploadPath.replace('http://dmtest-test.oss-cn-shanghai.aliyuncs.com', result.AliyunUrl),divId,size, cpt);
-    })
-
-};
-
-
-
 function ftlMultitest (storeAs, file,attachmentId,attachmentFlag,uploadPath,divId, size,cpt) {
     var formdata = new FormData();
     formdata.append("storeAs",storeAs);
@@ -328,6 +266,177 @@ function ftlMultitest (storeAs, file,attachmentId,attachmentFlag,uploadPath,divI
         }
     })
 };
+
+function multipartUploadWithStsCollection(storeAs, file,attachmentId,attachmentFlag,uploadPath,divId,size, cpt,idx,prefix,currentUser) {
+    console.log("-----------------------start");
+    console.log("-----------------------"+realPath);
+    var fileUrl=file.linUrl;
+    var url=file.url;
+    file.fileName.replace(" ","")
+    file.fileName.replace(/—/g,"")
+    var fileName = file.fileName;
+    // 将单引号‘’都转换成'，将双引号“”都转换成"
+    fileName = fileName.replace(/\’|\‘/g,"'").replace(/\“|\”/g,"\"");
+    // 将中括号【】转换成[]，将大括号｛｝转换成{}
+    fileName = fileName.replace(/\【/g,"(").replace(/\】/g,")").replace(/\｛/g,"(").replace(/\｝/g,")");
+    fileName = fileName.replace(/\[/g,"(").replace(/\]/g,")").replace(/\{/g,"(").replace(/\}/g,")");
+    // 将逗号，转换成,，将：转换成:
+    fileName = fileName.replace(/，/g,",").replace(/：/g,":");
+    //将中文——转换为英文-
+    fileName = fileName.replace(/—/g,"-")
+    fileName = fileName.replace("……","")
+    fileName = fileName.replace("±","")
+    var dfl=new File([file],fileName,{type:file.type});
+    file = dfl
+
+    requestUrl = realPath+"/previewController/getAccess";
+    OSS.urllib.request(requestUrl, {method: 'GET'}, function (err, response) {
+        if (err) {
+            console.log(err);
+            $.ajax({
+                type:"post",
+                url:realPath+"/previewController/saveJSError",
+                data:{object:err.toString()},
+                async: false,
+                success:function(data){
+                }
+            });
+            return alert(err);
+        }
+        try {
+            result = JSON.parse(response);
+        } catch (e) {
+            errmsg = 'parse sts response info error: ' + e.message;
+            return alert(errmsg);
+        }
+        console.log("---------result"+result);
+        client = new OSS.Wrapper({
+            accessKeyId: result.AccessKeyId,
+            accessKeySecret: result.AccessKeySecret,
+            stsToken: result.SecurityToken,
+            bucket: result.Bucket,
+            endpoint: result.Endpoint,
+            timeout:'30000'
+        });
+        storeAs = url;
+        if(cpt == 1)
+            fBmultitestFlag(client,storeAs, file,attachmentId,attachmentFlag,uploadPath.replace('http://dmtest-test.oss-cn-shanghai.aliyuncs.com', result.AliyunUrl),divId,size, cpt,idx,prefix,currentUser);
+        else
+            multitestCollection(client, storeAs, file,attachmentId,attachmentFlag,uploadPath.replace('http://dmtest-test.oss-cn-shanghai.aliyuncs.com', result.AliyunUrl),divId,size, cpt,fileUrl);
+    })
+
+};
+function multitestCollection (ossClient, storeAs, file,attachmentId,attachmentFlag,uploadPath,divId, size,cpt,fileUrl) {
+
+    var names =  storeAs.split("/");
+    var name = names[names.length-1];
+    ossClient.multipartUpload(storeAs, file,{
+        partSize: 1 * 1024 * 1024,
+        parallel: 5,
+        progress: function* (percent, cpt) {
+            var p = Math.floor(percent*100);
+            $("#jindutiao"+divId).attr("style","width: "+p+"%");
+            $("#jindutiao"+divId).attr("aria-valuenow",p+"%");
+            $("#baifenbi"+divId).html(p+"%");
+            $("#fileName"+divId).html(file.name);
+            checkpoint_temp = cpt;
+        }
+    }).then(function (result) {
+        var fileLocation = "";
+        var lookUrl = "";
+        //获取文件存储位置（0：本地；1：百度云；2：阿里云）
+        $.ajax({
+            type:"get",
+            url:realPath+"/bos/getFileStorageLocation",
+            async: false,
+            success:function(data){
+                fileLocation = data.fileLocation;
+            }
+        });
+        returnUrl = realPath+"/sys/workattachment/saveAttachment";
+        $.ajax({
+            type:'post',
+            url:returnUrl,
+            data:{
+                "attachmentName":file['name'],
+                "attachmentId":attachmentId,
+                "attachmentFlag":attachmentFlag,
+                "url":storeAs
+            },
+            success:function(data){
+                var lowerType = data.type.toLowerCase();
+                if(data.status=="Success"){
+                    parent.layer.msg("上传成功！",{icon:1});
+                    var lenght =$(".trIdAdds").length;
+                    if (size != 0){
+                        lenght += size;
+                    }
+                    var addFile = "addFile"+divId;
+                    var str = '<tr class="trIdAdds">'+
+                        '<td class="text-center">' ;
+                    if(2 == fileLocation){
+                        $.ajax({
+                            type:"post",
+                            async:false,
+                            url:realPath+"/workfullmanage/workFullManage/getFileTemporaryLookUrl",
+                            data:{"file":data.url,},
+                            success:function(result){
+                                lookUrl = result.lookUrl;
+                                if (isContains("jpg,png,gif,bmp,jpeg",lowerType)){
+                                    str = str +'<img src="'+lookUrl+'" width="50" height="50" onclick="openDialogView(\'预览\',\''+ '/a/sys/picturepreview/picturePreview?url=' +lookUrl+ '\',\'90%\',\'90%\')" alt="'+data.attachmentName+'"/>';
+                                }else if(isContains("pdf",lowerType)){
+                                    str = str + '<a class="attention-info" href="javascript:void(0)" onclick="preview(\'预览\',\''+lookUrl+'\',\'90%\',\'90%\',\'1\')">'+data.attachmentName+'</a>';
+                                }else {
+                                    str = str + '<a class="attention-info" href="javascript:void(0)" onclick="preview(\'预览\',\''+lookUrl+'\',\'90%\',\'90%\')">'+data.attachmentName+'</a>';
+                                }
+                            }
+                        });
+
+                    }else{
+                        if (isContains("jpg,png,gif,bmp,jpeg",lowerType)){
+                            str = str +'<img src="'+data.url+'" width="50" height="50" onclick="openDialogView(\'预览\',\''+realPath+ '/a/sys/picturepreview/picturePreview?url=' +data.url+ '\',\'90%\',\'90%\')" alt="'+data.attachmentName+'"/>';
+                        }else if(isContains("pdf",lowerType)){
+                            str = str + '<a class="attention-info" href="javascript:void(0)" onclick="preview(\'预览\',\''+data.url+'\',\'90%\',\'90%\',\'1\')">'+data.attachmentName+'</a>';
+                        }else {
+                            str = str + '<a class="attention-info" href="javascript:void(0)" onclick="preview(\'预览\',\''+data.url+'\',\'90%\',\'90%\')">'+data.attachmentName+'</a>';
+                        }
+                    }
+                    str = str +'</td>'+
+                        '<td >'+data.createByName+'</td>'+
+                        '<td >'+data.createDate+
+                        '<input name="workAttachments['+lenght+'].id" type="hidden" readonly="readonly" maxlength="20" style="width:140px;" class="form-control" value=""/>'+
+                        '<input name="workAttachments['+lenght+'].attachmentId" type="hidden" readonly="readonly" maxlength="20" style="width:140px;" class="form-control" value="'+data.attachmentId+'"/>'+
+                        '<input name="workAttachments['+lenght+'].url" type="hidden" readonly="readonly" maxlength="20" style="width:140px;" class="form-control" value="'+data.url+'"/>'+
+                        '<input name="workAttachments['+lenght+'].temporaryUrl" type="hidden" readonly="readonly" maxlength="20" style="width:140px;" class="form-control" value="'+data.temporaryUrl+'"/>'+
+                        '<input name="workAttachments['+lenght+'].attachmentName" type="hidden" readonly="readonly" maxlength="20" style="width:140px;" class="form-control" value="'+data.attachmentName+'"/>'+
+                        '<input name="workAttachments['+lenght+'].createBy.id" type="hidden" readonly="readonly" maxlength="20" style="width:140px;" class="form-control" value="'+data.createBy+'"/>'+
+                        '<input name="workAttachments['+lenght+'].type" type="hidden" readonly="readonly" maxlength="20" style="width:140px;" class="form-control" value="'+data.type+'"/>'+
+                        '<input name="workAttachments['+lenght+'].attachmentFlag" type="hidden" readonly="readonly" maxlength="20" style="width:140px;" class="form-control" value="'+data.attachmentFlag+'"/>'+
+                        '</td>'+
+                        '<td class="op-td">'+
+                        '<div class="op-btn-box">';
+                    if(2 == fileLocation){
+                        str = str +'<a href="'+lookUrl+'" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>';
+                    }else{
+                        str = str +'<a href="javascript:location.href=\''+realPath+'/a/workfullmanage/workFullManage/downLoadAttach?file=\'+encodeURIComponent(\''+data.url+'\');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>';
+                    }
+                    str = str +'<a href="javascript:void(0)" onclick="deleteFileFromAliyun(this,\''+realPath+'/a/sys/workattachment/deleteFileFromAliyun?url='+encodeURIComponent(data.url)+'&id='+data.id+'&type=2\',\''+addFile+'\',\''+divId+'\')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;删除</a>'+
+                        /*'<a href="javascript:void(0)" onclick="ossCollectingAccessory(this,\''+realPath+'/projectAccessory/projectAccessory/ossCollectAccessory?url='+data.url+'&fileName='+data.attachmentName+'\',\''+addFile+'\',\''+divId+'\')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;收藏</a>'+*/
+                        '</div>' +
+                        '</td>'+
+                        '</tr>';
+                    $("#file"+divId).append(str);
+                }else {
+                    parent.layer.msg("上传失败！",{icon:2});
+                }
+            }
+        })
+    }).catch(function (err) {
+        console.log("err------ err:");
+        console.log(err);
+    });
+};
+
 function fBmultitestFlag (storeAs, file,attachmentId,attachmentFlag,uploadPath,divId, size,cpt,idx,prefix,currentUser) {
     var formdata = new FormData();
     formdata.append("storeAs",storeAs);
@@ -617,7 +726,7 @@ function multitest (ossClient, storeAs, file,attachmentId,attachmentFlag,uploadP
                         str = str +'<a href="javascript:location.href=\''+realPath+'/a/workfullmanage/workFullManage/downLoadAttach?file=\'+encodeURIComponent(\''+data.url+'\');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>';
                     }
                     str = str +'<a href="javascript:void(0)" onclick="deleteFileFromAliyun(this,\''+realPath+'/a/sys/workattachment/deleteFileFromAliyun?url='+encodeURIComponent(data.url)+'&id='+data.id+'&type=2\',\''+addFile+'\',\''+divId+'\')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;删除</a>'+
-                        /*'<a href="javascript:void(0)" onclick="ossCollectingAccessory(this,\''+realPath+'/projectAccessory/projectAccessory/ossCollectAccessory?url='+data.url+'&fileName='+data.attachmentName+'\',\''+addFile+'\',\''+divId+'\')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;收藏</a>'+*/
+                        '<a href="javascript:void(0)" onclick="ossCollectingAccessory(this,\''+realPath+'/projectAccessory/projectAccessory/ossCollectAccessory?url='+data.url+'&fileName='+data.attachmentName+'\',\''+addFile+'\',\''+divId+'\')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;收藏</a>'+
                         '</div>' +
                         '</td>'+
                         '</tr>';
@@ -964,6 +1073,7 @@ function collectAccessory (ossClient, storeAs, file,attachmentId,attachmentFlag,
             url:returnUrl,
             data:{
                 "fileName":file['name'],
+                "fileSize":file['size'],
                 "url":"/"+storeAs,
                 "type":"1"
             },

src/main/webapp/webpage/modules/collectAccessory/collectAccessoryList.jsp

@@ -201,7 +201,6 @@
 				var attachmentFlag = "100";
 				console.log(file);
 				var timestamp=new Date().getTime();
-
 				var storeAs = "collectAccessory";
 				var uploadPath="http://gangwan-app.oss-cn-hangzhou.aliyuncs.com/"+storeAs;/*将这段字符串存到数据库即可*/
 				var divId = "_attachment";

src/main/webapp/webpage/modules/projectAccessory/workAttachmentForm.jsp

@@ -38,6 +38,7 @@
 		function insertTitle(tValue){
 			//文件后缀名
 			var attachTypes = $("#attachTypes").val();
+			console.log("attachTypes",attachTypes)
 			//文件大小
 			var attachLength = $("#attachLength").val();
 			var suffixResult = 0;
@@ -86,6 +87,59 @@
 				$("#addFile"+divId).show();
 				multipartUploadWithSts(storeAs, file,attachmentId,attachmentFlag,uploadPath,divId,size);}
 		}
+
+		function insertTitleCollection(tValue){
+			//文件后缀名
+			console.log(tValue);
+			var attachTypes =$("#attachTypes").val();
+			console.log(attachTypes);
+			//文件大小
+			var attachLength = $("#attachLength").val();
+			var suffixResult = 0;
+			for (var i=0;i<tValue.length;i++){
+				var fileName = tValue[i].fileName.lastIndexOf(".");//获取到文件名开始到最后一个“.”的长度。
+				var fileNameLength = tValue[i].fileName.length;//获取到文件名长度
+				var suffix = tValue[i].fileName.substring(fileName + 1, fileNameLength);//截取后缀名
+				suffix = suffix.toLowerCase();//后缀名转换小写
+				attachTypes = attachTypes.toLowerCase();
+				if(attachTypes!=undefined && attachTypes !=null & attachTypes !=''){
+					var attachTypeList = attachTypes.split(",");
+					for (var x in attachTypeList) {
+						if(attachTypeList[x] == suffix){
+							suffixResult = 1;
+							break;
+						}
+					}
+					if(suffixResult == 0 ){
+						top.layer.msg("上传附件只能为："+attachTypes+" 类型文件", {icon: 0});
+						return false;
+					}
+				}
+			}
+			var list = "${workIncomingMessage.workAttachments}";
+			var size = (list.split('url')).length-1;
+			var files = tValue;
+
+			for(var i = 0;i<files.length;i++) {
+				var file = files[i];
+				var fileSize = (file.fileSize/(1024 * 1024)).toFixed(2);
+				if(attachLength !=undefined && attachLength != null && attachLength !='') {
+					if (parseFloat(fileSize) > parseFloat(attachLength)) {
+						top.layer.msg("上传附件只能上传：" + attachLength + "M以下的文件", {icon: 0});
+						return false;
+					}
+				}
+				var attachmentId = "";
+				var attachmentFlag = "100";
+				console.log(file);
+				var timestamp=new Date().getTime();
+
+				var storeAs = "workAttachment";
+				var uploadPath="http://gangwan-app.oss-cn-hangzhou.aliyuncs.com/"+storeAs;/*将这段字符串存到数据库即可*/
+				var divId = "_attachment";
+				$("#addFile"+divId).show();
+				multipartUploadWithStsCollection(storeAs, file,attachmentId,attachmentFlag,uploadPath,divId,size);}
+		}
 		function showfile(){
 			var length=$("#file_attachment tr").length;
 			var files=new Array();
@@ -116,10 +170,10 @@
 				<div class="form-group-label"><h2>附件信息</h2></div>
 				<div class="layui-item nav-btns">
 					<a id="attachment_btn" class="nav-btn nav-btn-add" title="添加附件"><i class="fa fa-plus"></i>&nbsp;添加附件</a>
-					<%--<sys:collectSelect  id="linkman" url="${ctx}/workclientinfo/workClientInfo/linkmanList"
-									  name="linkman.id"  title="选择客户"
-									  cssClass="form-control judgment" fieldLabels="联系人" fieldKeys="name"
-									  searchLabel="联系人" searchKey="fileName"></sys:collectSelect>--%>
+					<sys:collectSelect  id="linkman" url="${ctx}/workclientinfo/workClientInfo/linkmanList"
+									  name="linkman.id"  title="选择资料库"
+									  cssClass="form-control judgment" fieldLabels="资料库" fieldKeys="name"
+									  searchLabel="资料库" searchKey="fileName"></sys:collectSelect>
 				</div>
 				<div id="addFile_attachment" style="display: none" class="upload-progress">
 					<span id="fileName_attachment" ></span>
@@ -207,9 +261,9 @@
 												</shiro:hasPermission>
 											</c:otherwise>
 										</c:choose>
-										<%--<c:if test="${workClientAttachment.collectFlag != 1}">
+										<c:if test="${workClientAttachment.collectFlag != 1}">
 											<a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${workClientAttachment.url}')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;收藏</a>
-										</c:if>--%>
+										</c:if>
 									</div>
 								</td>
 							</tr>

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

@@ -32,7 +32,9 @@
                 var label2 = $(this).parent().parent().parent().find(".codelabel2").html();
                 var label3 = $(this).parent().parent().parent().find(".codelabel3").html();
                 var label5 = $(this).parent().parent().parent().find(".codelabel5").html();
-                var data= {'id':id,'fileName':label5,'createName':label2,'url':label3,};
+                var label6 = $(this).parent().parent().parent().find(".codelabel6").html();
+                var label7 = $(this).parent().parent().parent().find(".codelabel7").html();
+                var data= {'id':id,'fileName':label5,'createName':label2,'url':label3,'fileSize':label6,'linUrl':label1,'fileType':label7};
                 arr.push(data);
 			})
             return arr;
@@ -153,6 +155,8 @@
 							<td title="${obj.createDateStr}" class="codelabel4">${obj.createDateStr}</td>
 							<td style="display:none" class="codelabel3">${obj.url}</td>
 							<td style="display:none" class="codelabel5">${obj.fileName}</td>
+							<td style="display:none" class="codelabel6">${obj.fileSize}</td>
+							<td style="display:none" class="codelabel7">${obj.type}</td>
 						</tr>
 					</c:forEach>
 					</c:when>

src/main/webapp/webpage/modules/workinvoice/workInvoiceAllList.jsp

@@ -410,23 +410,18 @@
 
 					<div class="commonQuery lw9">
 						<div class="layui-item query athird">
-							<label class="layui-form-label">发票申请编号：</label>
-							<div class="layui-input-block">
-								<form:input path="number" htmlEscape="false" maxlength="64"  class=" form-control layui-input"/>
+							<label class="layui-form-label">发票号：</label>
+							<div class="layui-input-block with-icon">
+								<form:input path="widNumber" htmlEscape="false"  class=" form-control layui-input"/>
 							</div>
 						</div>
 						<div class="layui-item query athird">
-							<label class="layui-form-label">开票日期：</label>
-							<div class="layui-input-block">
-								<input id="beginContractDate" name="beginContractDate" type="text" readonly="readonly" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group" style="background-color: #fff"
-									   value="<fmt:formatDate value="${workInvoice.beginContractDate}" pattern="yyyy-MM-dd"/>"/>
-								</input>
-								<span class="group-sep">-</span>
-								<input id="endContractDate" name="endContractDate" type="text" readonly="readonly" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group" style="background-color: #fff"
-									   value="<fmt:formatDate value="${workInvoice.endContractDate}" pattern="yyyy-MM-dd"/>"/>
-								</input>
+							<label class="layui-form-label">开票金额：</label>
+							<div class="layui-input-block with-icon">
+								<form:input path="money" htmlEscape="false"  class=" form-control layui-input"/>
 							</div>
 						</div>
+
 						<%--<div class="layui-item query athird">
 							<label class="layui-form-label">项目编号：</label>
 							<div class="layui-input-block">
@@ -457,6 +452,38 @@
                                     <form:input path="project.reportData.number" htmlEscape="false" maxlength="64"  class=" form-control layui-input"/>
                                 </div>
                             </div>--%>
+								<div class="layui-item query athird">
+									<label class="layui-form-label">对账人：</label>
+									<div class="layui-input-block with-icon">
+										<sys:inquireselectUserNotReadolny id="accountCheckingUser" name="accountCheckingUserId" value="${workInvoice.accountCheckingUserId}" labelName="accountCheckingUserName" labelValue="${workInvoice.accountCheckingUserName}" cssStyle="background-color: #fff"
+																		  title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="true"/>
+									</div>
+								</div>
+								<div class="layui-item query athird">
+									<label class="layui-form-label">对账地区：</label>
+									<div class="layui-input-block  with-icon">
+										<sys:treeselectArae id="area" name="area.id" value="${workInvoice.area.id}" labelName="area.name" labelValue="${workInvoice.area.name}"
+															cssStyle="background-color:#fff" title="区域" url="/sys/area/treeData" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="false" isAll="true"/>
+									</div>
+								</div>
+								<div class="layui-item query athird">
+									<label class="layui-form-label">发票申请编号：</label>
+									<div class="layui-input-block">
+										<form:input path="number" htmlEscape="false" maxlength="64"  class=" form-control layui-input"/>
+									</div>
+								</div>
+								<div class="layui-item query athird">
+									<label class="layui-form-label">开票日期：</label>
+									<div class="layui-input-block">
+										<input id="beginContractDate" name="beginContractDate" type="text" readonly="readonly" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group" style="background-color: #fff"
+											   value="<fmt:formatDate value="${workInvoice.beginContractDate}" pattern="yyyy-MM-dd"/>"/>
+										</input>
+										<span class="group-sep">-</span>
+										<input id="endContractDate" name="endContractDate" type="text" readonly="readonly" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group" style="background-color: #fff"
+											   value="<fmt:formatDate value="${workInvoice.endContractDate}" pattern="yyyy-MM-dd"/>"/>
+										</input>
+									</div>
+								</div>
 						<div class="layui-item query athird">
 							<label class="layui-form-label">经办人部门：</label>
 							<div class="layui-input-block with-icon">
@@ -523,32 +550,8 @@
 								</form:select>
 							</div>
 						</div>
-						<div class="layui-item query athird">
-							<label class="layui-form-label">对账人：</label>
-							<div class="layui-input-block with-icon">
-								<sys:inquireselectUserNotReadolny id="accountCheckingUser" name="accountCheckingUserId" value="${workInvoice.accountCheckingUserId}" labelName="accountCheckingUserName" labelValue="${workInvoice.accountCheckingUserName}" cssStyle="background-color: #fff"
-																  title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="true"/>
-							</div>
-						</div>
-						<div class="layui-item query athird">
-							<label class="layui-form-label">对账地区：</label>
-							<div class="layui-input-block  with-icon">
-								<sys:treeselectArae id="area" name="area.id" value="${workInvoice.area.id}" labelName="area.name" labelValue="${workInvoice.area.name}"
-													cssStyle="background-color:#fff" title="区域" url="/sys/area/treeData" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="false" isAll="true"/>
-							</div>
-						</div>
-						<div class="layui-item query athird">
-							<label class="layui-form-label">发票号：</label>
-							<div class="layui-input-block with-icon">
-								<form:input path="widNumber" htmlEscape="false"  class=" form-control layui-input"/>
-							</div>
-						</div>
-						<div class="layui-item query athird">
-							<label class="layui-form-label">开票金额：</label>
-							<div class="layui-input-block with-icon">
-								<form:input path="money" htmlEscape="false"  class=" form-control layui-input"/>
-							</div>
-						</div>
+
+
 					</div>
 				</form:form>
 			</div>
@@ -617,6 +620,9 @@
 				,{field:'money',align:'center', title: '开票金额（元）',  width:110,templet:function(d){
 						return "<span title='"+ d.money +"'>" + d.money + "</span>";
 					}}
+				,{field:'widTotalMoney',align:'center', title: '发票金额（元）',  width:120,templet:function(d){
+						return "<span title='"+ d.widTotalMoney +"'>" + d.widTotalMoney + "</span>";
+					}}
 				,{field:'billingContent',align:'center', title: '开票内容',  width:90,templet:function(d){
 						return "<span title='"+ d.billingContent +"'>" + d.billingContent + "</span>";
 					}}
@@ -626,9 +632,7 @@
 				,{field:'invoiceType',align:'center', title: '发票类型',  width:90,templet:function(d){
 						return "<span title='"+ d.invoiceType +"'>" + d.invoiceType + "</span>";
 					}}
-				,{field:'widTotalMoney',align:'center', title: '发票金额（元）',  width:120,templet:function(d){
-						return "<span title='"+ d.widTotalMoney +"'>" + d.widTotalMoney + "</span>";
-					}}
+
 				,{field:'createDate',align:'center', sort:true,title: '开票日期',  width:80}
 				,{field:'receiptMoneyDate',align:'center', sort:true,title: '收款日期',  width:80}
 				,{field:'receiptMoney',align:'center', title: '是否收款',  width:80}

src/main/webapp/webpage/modules/workinvoice/workInvoiceList.jsp

@@ -467,23 +467,18 @@
 
 					<div class="commonQuery lw9">
 						<div class="layui-item query athird">
-							<label class="layui-form-label">发票申请编号：</label>
-							<div class="layui-input-block">
-								<form:input path="number" htmlEscape="false" maxlength="64"  class=" form-control layui-input"/>
+							<label class="layui-form-label">发票号：</label>
+							<div class="layui-input-block with-icon">
+								<form:input path="widNumber" htmlEscape="false"  class=" form-control layui-input"/>
 							</div>
 						</div>
 						<div class="layui-item query athird">
-							<label class="layui-form-label">开票日期：</label>
-							<div class="layui-input-block">
-								<input id="beginContractDate" name="beginContractDate" type="text" readonly="readonly" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group" style="background-color: #fff"
-									   value="<fmt:formatDate value="${workInvoice.beginContractDate}" pattern="yyyy-MM-dd"/>"/>
-								</input>
-								<span class="group-sep">-</span>
-								<input id="endContractDate" name="endContractDate" type="text" readonly="readonly" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group" style="background-color: #fff"
-									   value="<fmt:formatDate value="${workInvoice.endContractDate}" pattern="yyyy-MM-dd"/>"/>
-								</input>
+							<label class="layui-form-label">开票金额：</label>
+							<div class="layui-input-block with-icon">
+								<form:input path="money" htmlEscape="false"  class=" form-control layui-input"/>
 							</div>
 						</div>
+
 						<%--<div class="layui-item query athird">
 							<label class="layui-form-label">项目编号：</label>
 							<div class="layui-input-block">
@@ -514,6 +509,38 @@
 								<form:input path="project.reportData.number" htmlEscape="false" maxlength="64"  class=" form-control layui-input"/>
 							</div>
 						</div>--%>
+							<div class="layui-item query athird">
+								<label class="layui-form-label">对账人：</label>
+								<div class="layui-input-block with-icon">
+									<sys:inquireselectUserNotReadolny id="accountCheckingUser" name="accountCheckingUserId" value="${workInvoice.accountCheckingUserId}" labelName="accountCheckingUserName" labelValue="${workInvoice.accountCheckingUserName}" cssStyle="background-color: #fff"
+																	  title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="true"/>
+								</div>
+							</div>
+							<div class="layui-item query athird">
+								<label class="layui-form-label">对账地区：</label>
+								<div class="layui-input-block  with-icon">
+									<sys:treeselectArae id="area" name="area.id" value="${workInvoice.area.id}" labelName="area.name" labelValue="${workInvoice.area.name}"
+														cssStyle="background-color:#fff" title="区域" url="/sys/area/treeData" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="false" isAll="true"/>
+								</div>
+							</div>
+							<div class="layui-item query athird">
+								<label class="layui-form-label">发票申请编号：</label>
+								<div class="layui-input-block">
+									<form:input path="number" htmlEscape="false" maxlength="64"  class=" form-control layui-input"/>
+								</div>
+							</div>
+							<div class="layui-item query athird">
+								<label class="layui-form-label">开票日期：</label>
+								<div class="layui-input-block">
+									<input id="beginContractDate" name="beginContractDate" type="text" readonly="readonly" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group" style="background-color: #fff"
+										   value="<fmt:formatDate value="${workInvoice.beginContractDate}" pattern="yyyy-MM-dd"/>"/>
+									</input>
+									<span class="group-sep">-</span>
+									<input id="endContractDate" name="endContractDate" type="text" readonly="readonly" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group" style="background-color: #fff"
+										   value="<fmt:formatDate value="${workInvoice.endContractDate}" pattern="yyyy-MM-dd"/>"/>
+									</input>
+								</div>
+							</div>
 						<div class="layui-item query athird">
 							<label class="layui-form-label">经办人部门：</label>
 							<div class="layui-input-block with-icon">
@@ -580,32 +607,6 @@
 								</form:select>
 							</div>
 						</div>
-						<div class="layui-item query athird">
-							<label class="layui-form-label">对账人：</label>
-							<div class="layui-input-block with-icon">
-								<sys:inquireselectUserNotReadolny id="accountCheckingUser" name="accountCheckingUserId" value="${workInvoice.accountCheckingUserId}" labelName="accountCheckingUserName" labelValue="${workInvoice.accountCheckingUserName}" cssStyle="background-color: #fff"
-													   title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="true"/>
-							</div>
-						</div>
-						<div class="layui-item query athird">
-							<label class="layui-form-label">对账地区：</label>
-							<div class="layui-input-block  with-icon">
-								<sys:treeselectArae id="area" name="area.id" value="${workInvoice.area.id}" labelName="area.name" labelValue="${workInvoice.area.name}"
-													cssStyle="background-color:#fff" title="区域" url="/sys/area/treeData" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="false" isAll="true"/>
-							</div>
-						</div>
-						<div class="layui-item query athird">
-							<label class="layui-form-label">发票号：</label>
-							<div class="layui-input-block with-icon">
-								<form:input path="widNumber" htmlEscape="false"  class=" form-control layui-input"/>
-							</div>
-						</div>
-						<div class="layui-item query athird">
-							<label class="layui-form-label">开票金额：</label>
-							<div class="layui-input-block with-icon">
-								<form:input path="money" htmlEscape="false"  class=" form-control layui-input"/>
-							</div>
-						</div>
 					</div>
 				</form:form>
 			</div>
@@ -674,6 +675,9 @@
 				,{field:'money',align:'center', title: '开票金额（元）',  width:110,templet:function(d){
 						return "<span title='"+ d.money +"'>" + d.money + "</span>";
 					}}
+				,{field:'widTotalMoney',align:'center', title: '发票金额（元）',  width:120,templet:function(d){
+						return "<span title='"+ d.widTotalMoney +"'>" + d.widTotalMoney + "</span>";
+					}}
 				,{field:'billingContent',align:'center', title: '开票内容',  width:90,templet:function(d){
 						return "<span title='"+ d.billingContent +"'>" + d.billingContent + "</span>";
 					}}
@@ -683,9 +687,7 @@
 				,{field:'invoiceType',align:'center', title: '发票类型',  width:90,templet:function(d){
 						return "<span title='"+ d.invoiceType +"'>" + d.invoiceType + "</span>";
 					}}
-				,{field:'widTotalMoney',align:'center', title: '发票金额（元）',  width:120,templet:function(d){
-						return "<span title='"+ d.widTotalMoney +"'>" + d.widTotalMoney + "</span>";
-					}}
+
                 <%--,{field:'reportNumber',align:'center', title: '报告号', minWidth:150,templet:function(d){--%>
 				<%--		&lt;%&ndash;return "<a class=\"attention-info\" title=\"" + d.reportNumber + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看报告信息', '${ctx}/ruralProject/ruralProjectMessage/modify?projectId=" + d.projectId + "&view=view','95%', '95%')\">" + d.reportNumber + "</a>";&ndash;%&gt;--%>
 				<%--		return d.reportNumber;--%>