资料库调用

src/main/java/com/jeeplus/modules/oa/service/OaNotifyService.java

@@ -40,6 +40,7 @@ import com.jeeplus.modules.workactivity.service.ActivityService;
 import com.jeeplus.modules.workactivity.service.WorkActivityProcessService;
 import com.jeeplus.modules.workactivitymenu.entity.WorkActivityMenu;
 import com.jeeplus.modules.workactivitymenu.service.WorkActivityMenuService;
+import com.jeeplus.modules.workclientinfo.entity.WorkClientAttachment;
 import com.jeeplus.modules.workprojectnotify.entity.WorkProjectNotify;
 import com.jeeplus.modules.workprojectnotify.service.WorkProjectNotifyService;
 import com.jeeplus.modules.workprojectnotify.util.UtilNotify;
@@ -1496,6 +1497,20 @@ public class OaNotifyService extends CrudService<OaNotifyDao, OaNotify> {
         if(oaNotify==null)return;
         oaNotify.setOfficeList(this.queryOfficeList(oaNotify));
         oaNotify.setUserList(this.queryUserList(oaNotify));
+        WorkClientAttachment attchment = new WorkClientAttachment();
+        attchment.setAttachmentId(oaNotify.getId());
+        attchment.setAttachmentFlag("79");
+        List<WorkClientAttachment> attachments = workattachmentService.getAttachmentList(attchment);
+        for (WorkClientAttachment clientAttachment:attachments){
+            if (clientAttachment.getCollectFlag().equals("1")){
+                for (Workattachment workattachment:oaNotify.getWorkAttachments()){
+                    if (clientAttachment.getId().equals(workattachment.getId())){
+                        workattachment.setCollectFlag("1");
+                        break;
+                    }
+                }
+            }
+        }
     }
 
     private List<Office> queryOfficeList(OaNotify oaNotify) {

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

@@ -187,20 +187,6 @@ public class OaNotifyController extends BaseController {
 		if (StringUtils.isNotBlank(oaNotify.getId())){
 			oaNotify = oaNotifyService.getRecordList2(oaNotify);
             oaNotifyService.queryDetails(oaNotify);
-			WorkClientAttachment attchment = new WorkClientAttachment();
-			attchment.setAttachmentId(oaNotify.getId());
-			attchment.setAttachmentFlag("79");
-			List<WorkClientAttachment> attachments = workattachmentService.getAttachmentList(attchment);
-			for (WorkClientAttachment clientAttachment:attachments){
-				if (clientAttachment.getCollectFlag().equals("1")){
-					for (Workattachment workattachment:oaNotify.getWorkAttachments()){
-						if (clientAttachment.getId().equals(workattachment.getId())){
-							workattachment.setCollectFlag("1");
-							break;
-						}
-					}
-				}
-			}
 		}else{
 			oaNotify.setExt(0);
 		}

src/main/java/com/jeeplus/modules/sys/entity/Workattachment.java

@@ -30,6 +30,7 @@ public class Workattachment extends DataEntity<Workattachment> {
 	private String quoteId;//被引用文件id
 
 	private String collectFlag;		// 收藏判定
+	private String fileSize;	//文件大小
 
 
 	public String getDivIdType() {
@@ -148,4 +149,12 @@ public class Workattachment extends DataEntity<Workattachment> {
 	public void setCollectFlag(String collectFlag) {
 		this.collectFlag = collectFlag;
 	}
+
+	public String getFileSize() {
+		return fileSize;
+	}
+
+	public void setFileSize(String fileSize) {
+		this.fileSize = fileSize;
+	}
 }

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

@@ -189,6 +189,7 @@ public class WorkattachmentController extends BaseController {
 			map.put("attachmentFlag", workattachment.getAttachmentFlag());
 			map.put("id", workattachment.getId());
 			map.put("divIdType", workattachment.getDivIdType());
+			map.put("fileSize", workattachment.getFileSize());
 		}catch (Exception e){
 			map.put("status","Fail");
 		}

src/main/java/com/jeeplus/modules/workclientinfo/entity/WorkClientAttachment.java

@@ -25,6 +25,7 @@ public class WorkClientAttachment extends DataEntity<WorkClientAttachment> {
 	private String projectId; //项目id
 	private String temporaryUrl;		// 附件地址(临时地址)
 	private String collectFlag;		// 收藏判定
+	private String fileSize;	//文件大小
 
 	public WorkClientAttachment() {
 		super();
@@ -118,4 +119,12 @@ public class WorkClientAttachment extends DataEntity<WorkClientAttachment> {
 	public void setCollectFlag(String collectFlag) {
 		this.collectFlag = collectFlag;
 	}
+
+	public String getFileSize() {
+		return fileSize;
+	}
+
+	public void setFileSize(String fileSize) {
+		this.fileSize = fileSize;
+	}
 }

src/main/resources/mappings/modules/sys/WorkattachmentDao.xml

@@ -18,6 +18,7 @@
 		a.company_id AS "companyId",
 		a.attachment_flag AS "attachmentFlag",
 		a.div_id_type AS "divIdType",
+		a.file_size AS "fileSize",
 		createBy.name AS "createBy.name"
 	</sql>
 
@@ -52,12 +53,13 @@
 		a.company_id AS "companyId",
 		a.attachment_flag AS "attachmentFlag",
 		a.div_id_type AS "divIdType",
+		a.file_size AS "fileSize",
 		createByName AS "createBy.name",
 		quoteResult
 		from(
 		select
 		p.id ,p.create_by ,p.create_date ,p.update_by ,p.update_date ,p.remarks ,p.del_flag ,
-		p.url,p.type,p.attachment_id,p.attachment_user,p.attachment_name,p.company_id,p.attachment_flag,p.div_id_type,
+		p.url,p.type,p.attachment_id,p.attachment_user,p.attachment_name,p.company_id,p.attachment_flag,p.div_id_type,p.file_size,
 		createBy.name AS "createByName",0 as "quoteResult"
 		from work_attachment p
 		LEFT JOIN sys_user createBy on createBy.id = p.create_by
@@ -266,7 +268,8 @@
 			attachment_name,
 			company_id,
 			attachment_flag,
-			div_id_type
+			div_id_type,
+		    file_size
 		) VALUES (
 			#{id},
 			#{createBy.id},
@@ -282,7 +285,8 @@
 			#{attachmentName},
 			#{companyId},
 			#{attachmentFlag},
-			#{divIdType}
+			#{divIdType},
+		    #{fileSize}
 		)
 	</insert>
 

src/main/resources/mappings/modules/workclientinfo/WorkClientAttachmentDao.xml

@@ -17,6 +17,7 @@
         a.attachment_name AS "attachmentName",
         a.attachment_flag AS "attachmentFlag",
         a.company_id AS "companyId",
+        a.file_size AS "fileSize",
         createBy.name AS "createBy.name"
     </sql>
 
@@ -95,6 +96,7 @@
         <if test="projectId != null and projectId != ''">
             ,project_id
         </if>
+        ,file_size
         ) VALUES (
         #{id},
         #{createBy.id},
@@ -113,6 +115,7 @@
         <if test="projectId != null and projectId != ''">
             ,#{projectId}
         </if>
+        ,#{fileSize}
         )
     </insert>
 

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

@@ -266,11 +266,11 @@ function ftlMultitest (storeAs, file,attachmentId,attachmentFlag,uploadPath,divI
         }
     })
 };
-function collectingAccessory(obj,url,fileUrl,uploadUserId) {
+function collectingAccessory(obj,url,fileUrl,uploadUserId,fileSize) {
     $.ajax({
         type: "post",
         url: url,
-        data: {"url": fileUrl, "type": "1", "collectType": 1, "collectUserId": uploadUserId},
+        data: {"url": fileUrl, "type": "1", "collectType": 1, "collectUserId": uploadUserId,"fileSize":fileSize},
         success: function (data) {
             if (data.success) {
                 $(obj).hide()
@@ -286,6 +286,7 @@ function multipartUploadWithStsCollection(storeAs, file,attachmentId,attachmentF
     console.log("-----------------------"+realPath);
     var fileUrl=file.linUrl;
     var url=file.url;
+    var fileSize=file.fileSize;
     file.fileName.replace(" ","")
     file.fileName.replace(/—/g,"")
     var fileName = file.fileName;
@@ -336,11 +337,11 @@ function multipartUploadWithStsCollection(storeAs, file,attachmentId,attachmentF
         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);
+            multitestCollection(client, storeAs, file,attachmentId,attachmentFlag,uploadPath.replace('http://dmtest-test.oss-cn-shanghai.aliyuncs.com', result.AliyunUrl),divId,size, cpt,fileUrl,fileSize);
     })
 
 };
-function multitestCollection (ossClient, storeAs, file,attachmentId,attachmentFlag,uploadPath,divId, size,cpt,fileUrl) {
+function multitestCollection (ossClient, storeAs, file,attachmentId,attachmentFlag,uploadPath,divId, size,cpt,fileUrl,fileSize) {
 
     var names =  storeAs.split("/");
     var name = names[names.length-1];
@@ -375,6 +376,7 @@ function multitestCollection (ossClient, storeAs, file,attachmentId,attachmentFl
                 "attachmentName":file['name'],
                 "attachmentId":attachmentId,
                 "attachmentFlag":attachmentFlag,
+                "fileSize":fileSize,
                 "url":storeAs
             },
             success:function(data){
@@ -426,6 +428,7 @@ function multitestCollection (ossClient, storeAs, file,attachmentId,attachmentFl
                         '<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+'"/>'+
+                        '<input name="workAttachments['+lenght+'].fileSize" type="hidden" readonly="readonly" maxlength="20" style="width:140px;" class="form-control" value="'+data.fileSize+'"/>'+
                         '</td>'+
                         '<td class="op-td">'+
                         '<div class="op-btn-box">';
@@ -676,6 +679,7 @@ function multitest (ossClient, storeAs, file,attachmentId,attachmentFlag,uploadP
                 "attachmentName":file['name'],
                 "attachmentId":attachmentId,
                 "attachmentFlag":attachmentFlag,
+                "fileSize":file['size'],
                 "url":"/"+storeAs
             },
             success:function(data){
@@ -727,6 +731,7 @@ function multitest (ossClient, storeAs, file,attachmentId,attachmentFlag,uploadP
                         '<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+'"/>'+
+                        '<input name="workAttachments['+lenght+'].fileSize" type="hidden" readonly="readonly" maxlength="20" style="width:140px;" class="form-control" value="'+data.fileSize+'"/>'+
                         '</td>'+
                         '<td class="op-td">'+
                         '<div class="op-btn-box">';

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

@@ -485,7 +485,7 @@
                                             <a href="javascript:void(0)" onclick="deleteFileFromAliyun(this,'${ctx}/sys/workattachment/deleteFileFromAliyun?url=${workClientAttachment.url}&id=${workClientAttachment.id}&type=2','addFile')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;删除</a>
                                         </c:if>
                                         <c:if test="${workClientAttachment.collectFlag != 1}">
-                                            <a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${workClientAttachment.url}','${workClientAttachment.createBy.id}')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;收藏</a>
+                                            <a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${workClientAttachment.url}','${workClientAttachment.createBy.id}','${workClientAttachment.fileSize}')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;收藏</a>
                                         </c:if>
                                     </div>
                                 </td>

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

@@ -460,8 +460,8 @@
                                         <c:if test="${workClientAttachment.createBy.id eq fns:getUser().id}">
                                             <a href="javascript:void(0)" onclick="deleteFileFromAliyun(this,'${ctx}/sys/workattachment/deleteFileFromAliyun?url=${workClientAttachment.url}&id=${workClientAttachment.id}&type=2','addFile')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;删除</a>
                                         </c:if>
-                                        <c:if test="${workClientAttachment.collectFlag != 1}">
-                                            <a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${workClientAttachment.url}','${workClientAttachment.createBy.id}')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;收藏</a>
+                                        <c:if test="${workClientAttachment.collectFlag != 1 && workClientAttachment.collectFlag!=''}">
+                                            <a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${workClientAttachment.url}','${workClientAttachment.createBy.id}','${workClientAttachment.fileSize}')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;收藏</a>
                                         </c:if>
                                     </div>
                                 </td>

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

@@ -262,7 +262,7 @@
 											</c:otherwise>
 										</c:choose>
 										<c:if test="${workClientAttachment.collectFlag != 1}">
-											<a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${workClientAttachment.url}','${workClientAttachment.createBy.id}')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;收藏</a>
+											<a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${workClientAttachment.url}','${workClientAttachment.createBy.id}','${workClientAttachment.fileSize}')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;收藏</a>
 										</c:if>
 									</div>
 								</td>
@@ -277,11 +277,11 @@
 </div>
 <script>
 
-		function collectingAccessory(obj,url,fileUrl,uploadUserId){
+		function collectingAccessory(obj,url,fileUrl,uploadUserId,fileSize){
 		$.ajax({
 			type:"post",
 			url:url,
-			data: {"url":fileUrl,"type":"1","collectType":1,"collectUserId":uploadUserId},
+			data: {"url":fileUrl,"type":"1","collectType":1,"collectUserId":uploadUserId,"fileSize":fileSize},
 			success:function(data){
 				if(data.success){
 					$(obj).hide()

src/main/webapp/webpage/modules/projectrecord/plan/projectPlanConsultingForm.jsp

@@ -373,7 +373,7 @@
                                         </c:choose>
                                         <a href="javascript:void(0)" onclick="deleteFileFromAliyun(this,'${ctx}/sys/workattachment/deleteFileFromAliyun?url=${workClientAttachment.url}&id=${workClientAttachment.id}&type=2','addFile')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;删除</a>
                                         <c:if test="${workClientAttachment.collectFlag != 1}">
-                                            <a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${workClientAttachment.url}','${workClientAttachment.createBy.id}')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;收藏</a>
+                                            <a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${workClientAttachment.url}','${workClientAttachment.createBy.id}','${workClientAttachment.fileSize}')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;收藏</a>
                                         </c:if>
 
                                     </div>

src/main/webapp/webpage/modules/projectrecord/plan/projectPlanCostForm.jsp

@@ -374,7 +374,7 @@
                                         </c:choose>
                                         <a href="javascript:void(0)" onclick="deleteFileFromAliyun(this,'${ctx}/sys/workattachment/deleteFileFromAliyun?url=${workClientAttachment.url}&id=${workClientAttachment.id}&type=2','addFile')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;删除</a>
                                         <c:if test="${workClientAttachment.collectFlag != 1}">
-                                            <a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${workClientAttachment.url}','${workClientAttachment.createBy.id}')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;收藏</a>
+                                            <a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${workClientAttachment.url}','${workClientAttachment.createBy.id}','${workClientAttachment.fileSize}')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;收藏</a>
                                         </c:if>
                                     </div>
                                 </td>

src/main/webapp/webpage/modules/ruralprojectrecords/check/ruralProjectRecordsModify.jsp

@@ -443,10 +443,10 @@
                                             <c:otherwise>
                                                 <c:choose>
                                                     <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
-                                                        <td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workClientAttachment.temporaryUrl}','90%','90%','1')">${workClientAttachment.attachmentName}</a></td>
+                                                        <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',1)">${workClientAttachment.attachmentName}</a></td>
                                                     </c:when>
                                                     <c:otherwise>
-                                                        <td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workClientAttachment.temporaryUrl}','90%','90%')">${workClientAttachment.attachmentName}</a></td>
+                                                        <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',2)">${workClientAttachment.attachmentName}</a></td>
                                                     </c:otherwise>
                                                 </c:choose>
                                             </c:otherwise>
@@ -464,10 +464,10 @@
                                             <c:otherwise>
                                                 <c:choose>
                                                     <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
-                                                        <td><a href="javascript:void(0)" onclick="preview('预览','${workClientAttachment.url}','95%','95%','1')">${workClientAttachment.attachmentName}</a></td>
+                                                        <td><a href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',1)">${workClientAttachment.attachmentName}</a></td>
                                                     </c:when>
                                                     <c:otherwise>
-                                                        <td><a href="javascript:void(0)" onclick="preview('预览','${workClientAttachment.url}','95%','95%')">${workClientAttachment.attachmentName}</a></td>
+                                                        <td><a href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',2)">${workClientAttachment.attachmentName}</a></td>
                                                     </c:otherwise>
                                                 </c:choose>
                                             </c:otherwise>

src/main/webapp/webpage/modules/workclientinfo/workClientInfoForm.jsp

@@ -953,7 +953,7 @@
                                                class="op-btn op-btn-delete"><i class="fa fa-trash"></i>&nbsp;删除</a>
                                         </c:if>
                                         <c:if test="${workClientAttachment.collectFlag != 1}">
-                                            <a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${workClientAttachment.url}','${workClientAttachment.createBy.id}')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;收藏</a>
+                                            <a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${workClientAttachment.url}','${workClientAttachment.createBy.id}','${workClientAttachment.fileSize}')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;收藏</a>
                                         </c:if>
                                     </div>
                                 </td>

src/main/webapp/webpage/modules/workcontractinfo/workContractInfoFormAdd.jsp

@@ -920,7 +920,7 @@
 														<a href="javascript:void(0)" onclick="deleteFileFromAliyun(this,'${ctx}/sys/workattachment/deleteFileFromAliyun?url=${workClientAttachment.url}&id=${workClientAttachment.id}&type=2','addFile_attachment','_attachment')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;删除</a>
 													</c:if>
 													<c:if test="${workClientAttachment.collectFlag != 1}">
-														<a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${workClientAttachment.url}','${workClientAttachment.createBy.id}')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;收藏</a>
+														<a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${workClientAttachment.url}','${workClientAttachment.createBy.id}','${workClientAttachment.fileSize}')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;收藏</a>
 													</c:if>
 												</div>
 											</td>

src/main/webapp/webpage/modules/workcontractinfo/workContractInfoFormEdit.jsp

@@ -863,7 +863,7 @@
 												<a href="javascript:void(0)" onclick="deleteFileFromAliyun(this,'${ctx}/sys/workattachment/deleteFileFromAliyun?url=${workClientAttachment.url}&id=${workClientAttachment.id}&type=2','addFile_attachment')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;删除</a>
 											</c:if>
 											<c:if test="${workClientAttachment.collectFlag != 1}">
-												<a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${workClientAttachment.url}','${workClientAttachment.createBy.id}')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;收藏</a>
+												<a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${workClientAttachment.url}','${workClientAttachment.createBy.id}','${workClientAttachment.fileSize}')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;收藏</a>
 											</c:if>
 										</div>
 									</td>

src/main/webapp/webpage/modules/workcontractrecord/workContractRecordForm.jsp

@@ -410,7 +410,7 @@
 											<a href="javascript:void(0)" onclick="deleteFileFromAliyun(this,'${ctx}/sys/workattachment/deleteFileFromAliyun?url=${workClientAttachment.url}&id=${workClientAttachment.id}&type=2','addFile')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;删除</a>
 										</c:if>
 										<c:if test="${workClientAttachment.collectFlag != 1}">
-											<a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${workClientAttachment.url}','${workClientAttachment.createBy.id}')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;收藏</a>
+											<a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${workClientAttachment.url}','${workClientAttachment.createBy.id}','${workClientAttachment.fileSize}')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;收藏</a>
 										</c:if>
 									</div>
 								</td>

src/main/webapp/webpage/modules/workcontractrecord/workContractRecordModifyApply.jsp

@@ -375,7 +375,7 @@
 											<a href="javascript:void(0)" onclick="deleteFileFromAliyun(this,'${ctx}/sys/workattachment/deleteFileFromAliyun?url=${workClientAttachment.url}&id=${workClientAttachment.id}&type=2','addFile')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;删除</a>
 										</c:if>
 										<c:if test="${workClientAttachment.collectFlag != 1}">
-											<a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${workClientAttachment.url}','${workClientAttachment.createBy.id}')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;收藏</a>
+											<a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${workClientAttachment.url}','${workClientAttachment.createBy.id}','${workClientAttachment.fileSize}')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;收藏</a>
 										</c:if>
 									</div>
 								</td>

src/main/webapp/webpage/modules/workreimbursement/workReimbursementFormAdd.jsp

@@ -1068,7 +1068,7 @@
                                         <a href="javascript:void(0)" onclick="deleteFileFromAliyun(this,'${ctx}/sys/workattachment/deleteFileFromAliyun?url=${workClientAttachment.url}&id=${workClientAttachment.id}&type=2','addFile')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;删除</a>
                                     </c:if>
                                     <c:if test="${workClientAttachment.collectFlag != 1}">
-                                        <a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${workClientAttachment.url}','${workClientAttachment.createBy.id}')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;收藏</a>
+                                        <a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${workClientAttachment.url}','${workClientAttachment.createBy.id}','${workClientAttachment.fileSize}')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;收藏</a>
                                     </c:if>
                                 </div>
                             </td>

src/main/webapp/webpage/modules/workreimbursement/workReimbursementModifyApply.jsp

@@ -1156,7 +1156,7 @@
                                         <a href="javascript:void(0)" onclick="deleteFileFromAliyun(this,'${ctx}/sys/workattachment/deleteFileFromAliyun?url=${workClientAttachment.url}&id=${workClientAttachment.id}&type=2','addFile')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;删除</a>
                                     </c:if>
                                     <c:if test="${workClientAttachment.collectFlag != 1}">
-                                        <a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${workClientAttachment.url}','${workClientAttachment.createBy.id}')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;收藏</a>
+                                        <a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${workClientAttachment.url}','${workClientAttachment.createBy.id}','${workClientAttachment.fileSize}')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;收藏</a>
                                     </c:if>
                                 </div>
                             </td>