Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/projectcontentinfo/entity/Projectcontentinfo.java

@@ -42,6 +42,7 @@ public class Projectcontentinfo extends TreeEntity<Projectcontentinfo> {
 	private String projectContentId;  //工作内容id
 
 	private String reportType; //阶段id
+	private String reportId;
 
 	public RuralProjectRecords getProjectOnRural() {
 		return projectOnRural;
@@ -232,4 +233,12 @@ public class Projectcontentinfo extends TreeEntity<Projectcontentinfo> {
 	public void setReportType(String reportType) {
 		this.reportType = reportType;
 	}
+
+	public String getReportId() {
+		return reportId;
+	}
+
+	public void setReportId(String reportId) {
+		this.reportId = reportId;
+	}
 }

src/main/java/com/jeeplus/modules/projectcontentinfo/service/ProjectcontentinfoService.java

@@ -427,7 +427,7 @@ public class ProjectcontentinfoService extends CrudService<ProjectcontentinfoDao
 				}
 			}
 			//保存相关依据资料信息
-			/*if(projectReportData.getProjectBasedDataList()!=null&&!projectReportData.getProjectBasedDataList().isEmpty()){
+			if(projectReportData.getProjectBasedDataList()!=null&&!projectReportData.getProjectBasedDataList().isEmpty()){
 				projectReportDataService.deleteReportDataBased(projectReportData);
 				for (ProjectBasedData data:projectReportData.getProjectBasedDataList()) {
 					//判定是否为全过程管理中的项目复核模块
@@ -458,7 +458,7 @@ public class ProjectcontentinfoService extends CrudService<ProjectcontentinfoDao
 						}
 					}
 				}
-			}*/
+			}
 			//添加工作内容和报告关系
 			if("according".equals(projectcontentinfo.getCondition()) || "completion".equals(projectcontentinfo.getCondition())){
 				Integer contentAndReportCount = projectImplementEarlyService.getProjectContrntAndReport(projectReportData.getProjectContentDataList().get(0).getId(), projectReportData.getId());

src/main/java/com/jeeplus/modules/projectcontentinfo/web/ProjectcontentinfoController.java

@@ -673,7 +673,23 @@ public class ProjectcontentinfoController extends BaseController {
 				projectContentData.getProjectBasedDataList().addAll(projectBasedDataList);
 			}
 
-
+			ProjectReportData projectReportData = new ProjectReportData();
+			if (StringUtils.isNotBlank(projectcontentinfo.getReportId()) && !"null".equals(projectcontentinfo.getReportId())){
+				projectReportData = projectReportDataService.get(projectcontentinfo.getReportId());
+			}else if (projectcontentinfo.getProjectReportData()!=null && StringUtils.isNotBlank(projectcontentinfo.getProjectReportData().getId())) {
+				projectReportData = projectReportDataService.get(projectcontentinfo.getProjectReportData().getId());
+			}else {
+				projectReportData.setNumber("");
+			}
+			if("according".equals(projectcontentinfo.getCondition()) || "completion".equals(projectcontentinfo.getCondition())){
+				if(StringUtils.isNotBlank(projectReportData.getAchievementType())){
+					ProjectTemplateType projectTemplateType = projectResultsFileTemplateService.get(projectReportData.getAchievementType());
+					if(null != projectTemplateType){
+						projectReportData.setTemplateTypeName(projectTemplateType.getTypeName());
+					}
+				}
+			}
+			projectcontentinfo.setProjectReportData(projectReportData);
 			projectcontentinfo.setProjectContentData(projectContentData);
 			model.addAttribute("projectcontentinfo", projectcontentinfo);
 

src/main/java/com/jeeplus/modules/projectrecord/web/Early/ProjectEarlyReviewController.java

@@ -232,6 +232,11 @@ public class ProjectEarlyReviewController extends BaseController {
             if (StringUtils.isNotBlank(projectBasedData.getFileAttachmentId())) {
                 projectBasedData.setUploadUser(UserUtils.get(projectBasedData.getFileAttachmentId()));
             }
+            //判断是否有上传文件 如果没有上传文件则添加当前登录人信息 和当前时间作为上传时间
+            if(StringUtils.isBlank(projectBasedData.getFileUrl())){
+                projectBasedData.setUploadDate(new Date());
+                projectBasedData.setUploadUser(UserUtils.getUser());
+            }
         }
         /*for (ProjectBasedData projectBasedData: projectContentData.getProjectBasedDataList()) {
             projectBasedData.setType(dictService.dictLabel("project_document_type",projectBasedData.getType()));

src/main/webapp/static/bos/bosupload.js

@@ -63,6 +63,7 @@ function multitestFlag (storeAs, file,attachmentId,attachmentFlag,uploadPath,div
                         if(data.status=="Success"){
                             parent.layer.msg("上传成功！",{icon:1});
                             var str = '' ;
+                            var addFile = prefix+divId;
                             if (isContains("jpg,png,gif,bmp,jpeg",data.type)){
                                 str = '<img src="'+data1.url+'" width="50" height="50" title="'+data.attachmentName+'" onclick="openDialogView(\'预览\',\''+realPath+ '/a/sys/picturepreview/picturePreview?url=' +data1.url+ '\',\'90%\',\'90%\')" alt="'+data.attachmentName+'"/>';
                             }else if(isContains("pdf",data.type)){
@@ -77,7 +78,9 @@ function multitestFlag (storeAs, file,attachmentId,attachmentFlag,uploadPath,div
                             $(prefix+"_fileAttachmentFlag").val(data.attachmentFlag);
                             $(prefix+"_fileAttachmentId").val(data.attachmentId);
                             var result = '<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>';
+                            var delResult = '<a href="javascript:void(0)" onclick="deleteFileFromAliyun(this,\''+realPath+'/sys/workattachment/deleteFileFromAliyun?url='+data.url+'&id='+data.id+'&type=2\',\''+prefix+'\',\''+divId+'\')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;删除</a>';
                             $(prefix+"_operation").empty();
+                            //$(prefix+"_operation").append(delResult);
                             //$(prefix+"_operation").append(result);
                         }else {
                             parent.layer.msg("上传失败！",{icon:2});

src/main/webapp/webpage/modules/projectrecord/implementEarly/projectEarlyReviewList.jsp

@@ -314,14 +314,15 @@
                     	if(0 == d.pid){
 							return "<a class=\"attention-info pid\" title=\"" + d.projectName + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看项目', '${ctx}/project/projectRecords/view?id=" + d.id +"','95%', '95%')\">" + d.projectName + "</a>";
 						}else{
-							return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogView('查看工作内容', '${ctx}/projectcontentinfo/projectcontentinfo/form?view=contentView&condition=according&dictType=&id="+d.contentPId+"&parentIds="+d.parentIds+"&infoId="+d.id+"','95%', '95%')\">" + d.projectName + "</a>";
+							return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogView('查看工作内容', '${ctx}/projectcontentinfo/projectcontentinfo/form?view=contentView&condition=according&dictType=&id="+d.contentPId+"&parentIds="+d.parentIds+"&infoId="+d.id+"&reportId="+d.reportId+"','95%', '95%')\">" + d.projectName + "</a>";
 						}
 						}},
                     {field: 'reportName', align:'center', title: '成果文件名称',templet:function(d){
                     	if(0 == d.pid){
 							return "";
 						}else{
-							return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogView('查看工作内容', '${ctx}/projectcontentinfo/projectcontentinfo/form?view=reportView&condition=according&dictType=&id="+d.contentPId+"&parentIds="+d.parentIds+"&infoId="+d.reportId+"','95%', '95%')\">" + d.reportName + "</a>";
+							return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogView('查看工作内容', '${ctx}/projectcontentinfo/projectcontentinfo/form?view=contentView&condition=according&dictType=&id="+d.contentPId+"&parentIds="+d.parentIds+"&infoId="+d.id+"&reportId="+d.reportId+"','95%', '95%')\">" + d.reportName + "</a>";
+							/*return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogView('查看工作内容', '${ctx}/projectcontentinfo/projectcontentinfo/form?view=reportView&condition=according&dictType=&id="+d.contentPId+"&parentIds="+d.parentIds+"&infoId="+d.reportId+"','95%', '95%')\">" + d.reportName + "</a>";*/
 						}
 						}},
                     {field: 'projectLeader', align:'center', title: '项目负责人',templet: function(d){

src/main/webapp/webpage/modules/projectrecord/workContentFromAndView/reportForm.jsp

@@ -683,7 +683,7 @@
 													<a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent(encodeURIComponent('${projectBasedData.fileUrl}'));" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
 												</c:when>
 												<c:otherwise>
-													<%--<a href=javascript:void(0); onclick="accordingBtn(this, '#workBaseDataList${idx.index}','${projectBasedData.uploadUser.id}')"   class="op-btn nav-btn-add" title="添加附件"><i class="fa fa-plus"></i> 添加附件</a>--%>
+													<a href=javascript:void(0); onclick="accordingBtn(this, '#workBaseDataList${idx.index}','${projectBasedData.uploadUser.id}')"   class="op-btn nav-btn-add" title="添加附件"><i class="fa fa-plus"></i> 添加附件</a>
 												</c:otherwise>
 											</c:choose>
 
@@ -723,7 +723,9 @@
                         {{row.uploadDate}}
                     </td>
                     <td class="text-center op-td">
+                    <div id="workBaseDataList{{idx}}_operation">
                         <a href=javascript:void(0); onclick="delRowBaseData(this, '#workBaseDataList{{idx}}','{{row.uploadUser.id}}')"   class="op-btn op-btn-delete"><i class="fa fa-trash"></i> 取消</a>
+                    </div>
                     </td>
                 </tr>//-->
 				</script>
@@ -1039,7 +1041,7 @@
 				</div>
 			</div>
 
-			<div class="form-group layui-row">
+			<%--<div class="form-group layui-row">
 			<div class="form-group-label"><h2>自检</h2></div>
 			<div class="layui-item layui-col-xs12 form-table-container">
 				<table id="contentTable2" class="table details table-bordered table-condensed">
@@ -1086,7 +1088,7 @@
 					</tbody>
 				</table>
 			</div>
-		</div>
+		</div>--%>
 		<div class="form-group layui-row page-end"></div>
 		</form:form>
 	</div>

src/main/webapp/webpage/modules/projectrecord/workContentFromAndView/workContentView.jsp

@@ -539,6 +539,119 @@
                     <div id="contentDetail"></div>
                 </div>
             </div>
+            <div class="form-group layui-row first lw12">
+                <div class="form-group-label"><h2>报告信息</h2></div>
+                <div class="layui-item layui-col-sm6">
+                    <label class="layui-form-label">报告名称：</label>
+                    <div class="layui-input-block with-icon">
+                        <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectcontentinfo.projectReportData.name}"/>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6">
+                    <label class="layui-form-label">报告编号：</label>
+                    <div class="layui-input-block">
+                        <div class="input-group">
+                            <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectcontentinfo.projectReportData.number}"/>
+                            <span class="input-group-btn">
+								<label class="form-status">
+									<c:choose>
+                                        <c:when test="${not empty projectcontentinfo.projectReportData.status}">${fns:getDictLabel(projectcontentinfo.projectReportData.status, 'audit_state', '')}
+                                        </c:when>
+                                        <c:otherwise>新添</c:otherwise>
+                                    </c:choose></label>
+							 </span>
+                        </div>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6">
+                    <label class="layui-form-label">工作内容类型：</label>
+                    <div class="layui-input-block">
+                        <input  htmlEscape="false" readonly="true" class="form-control  layui-input" value="${fns:getContentTypeName(projectcontentinfo.projectReportData.type,"")}"/>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6">
+                    <label class="layui-form-label">成果类型：</label>
+                    <div class="layui-input-block">
+                        <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectcontentinfo.projectReportData.templateTypeName}"/>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6">
+                    <label class="layui-form-label">复核标准：</label>
+                    <div class="layui-input-block">
+                        <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${fns:getMainDictLabel(projectcontentinfo.projectReportData.reviewStandard, 'reviewStandard', '')}"/>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6">
+                    <label class="layui-form-label">报告日期：</label>
+                    <div class="layui-input-block">
+                        <input id="provideDate" name="projectReportData.provideDate" type="text" htmlEscape="false" readonly="true" class="laydate-icondate form-control layer-date required layui-input laydate-icon"
+                               value="<fmt:formatDate value="${projectcontentinfo.projectReportData.reportDate}" pattern="yyyy-MM-dd"/>"/>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6">
+                    <label class="layui-form-label">签章类型：</label>
+                    <div class="layui-input-block">
+                        <input  htmlEscape="false" readonly="true" class="form-control  layui-input" value="${projectcontentinfo.projectReportData.reportType}"/>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6">
+                    <label class="layui-form-label">归档状态：</label>
+                    <div class="layui-input-block">
+                        <input  htmlEscape="false" readonly="true" class="form-control  layui-input" value="${fns:getDictLabel(projectcontentinfo.projectReportData.fileStatus, 'record_state', '')}"/>
+                    </div>
+                </div>
+            </div>
+            <div class="form-group layui-row first lw12">
+                <div class="form-group-label"><h2>项目信息</h2></div>
+                <div class="layui-item layui-col-sm6">
+                    <label class="layui-form-label">送审价(元)：</label>
+                    <div class="layui-input-block with-icon">
+                        <input  id="projectReportData.reviewFee" readonly="true" class="form-control layui-input number" value="<fmt:formatNumber value="${projectcontentinfo.projectReportData.reviewFee}" pattern="#,##0.00#"/>" />
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6">
+                    <label class="layui-form-label">审定价(元)：</label>
+                    <div class="layui-input-block with-icon">
+                        <input  id="projectReportData.approvalFee" readonly="true" class="form-control layui-input number" value="<fmt:formatNumber value="${projectcontentinfo.projectReportData.approvalFee}" pattern="#,##0.00#"/>" />
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6">
+                    <label class="layui-form-label">合同价(元)：</label>
+                    <div class="layui-input-block with-icon">
+                        <input  id="projectReportData.contractFee"  readonly="true" class="form-control layui-input number" value="<fmt:formatNumber value="${projectcontentinfo.projectReportData.contractFee}" pattern="#,##0.00#"/>" />
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6">
+                    <label class="layui-form-label">核增核减额(元)：</label>
+                    <div class="layui-input-block with-icon">
+                        <input id="projectReportData.verifyFee"  readonly="true" class="form-control layui-input number" value="<fmt:formatNumber value="${projectcontentinfo.projectReportData.verifyFee}" pattern="#,##0.00#"/>" />
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6">
+                    <label class="layui-form-label">核增核减率(%)：</label>
+                    <div class="layui-input-block with-icon">
+                        <input  id="projectReportData.verifyRate"  readonly="true" class="form-control layui-input number" value="${projectcontentinfo.projectReportData.verifyRate}"/>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6">
+                    <label class="layui-form-label">咨询标的额(元)：</label>
+                    <div class="layui-input-block with-icon">
+                        <input  id="projectReportData.consultFee" readonly="true" class="form-control layui-input number" value="<fmt:formatNumber value="${projectcontentinfo.projectReportData.consultFee}" pattern="#,##0.00#"/>" />
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6">
+                    <label class="layui-form-label">土建造价(元)：</label>
+                    <div class="layui-input-block with-icon">
+                        <input  id="projectReportData.buildingFee"  readonly="true" class="form-control layui-input number" value="<fmt:formatNumber value="${projectcontentinfo.projectReportData.buildingFee}" pattern="#,##0.00#"/>" />
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6">
+                    <label class="layui-form-label">安装造价(元)：</label>
+                    <div class="layui-input-block with-icon">
+                        <input  id="projectReportData.installFee"  readonly="true" class="form-control layui-input number" value="<fmt:formatNumber value="${projectcontentinfo.projectReportData.installFee}" pattern="#,##0.00#"/>"/>
+                    </div>
+                </div>
+            </div>
             <div class="form-group layui-row">
                 <div class="form-group-label"><h2>依据性资料明细</h2></div>
                 <div class="layui-item layui-col-xs12 form-table-container">
@@ -745,6 +858,44 @@
                     return false;
                 }
             </script>
+            <div class="form-group layui-row first lw12">
+                <div class="form-group-label"><h2>依据工作内容</h2></div>
+                <!-- 表格 -->
+                <div class="layui-item layui-col-xs12" style="padding:0 16px;">
+                    <table id="contentTable" class="table table-striped table-bordered table-hover table-condensed dataTables-example dataTable">
+                        <thead>
+                        <tr>
+                            <th style="text-align: center;width:20%">工作内容编号</th>
+                            <th style="text-align: center;width:20%">工作内容名称</th>
+                            <th style="text-align: center;width:20%">工作内容类型</th>
+                            <th style="text-align: center;width:20%">负责人</th>
+                            <th style="text-align: center;width:20%">创建时间</th>
+                        </tr>
+                        </thead>
+                        <tbody id="projectContentDataList">
+                        <c:forEach items="${projectcontentinfo.projectReportData.projectContentDataList}" var="projectContentData" varStatus="index">
+                            <tr>
+                                <td style="text-align:center;">
+                                        ${projectContentData.number}
+                                </td>
+                                <td style="text-align:center;">
+                                        ${projectContentData.name}
+                                </td>
+                                <td style="text-align:center;">
+                                        ${fns:getContentTypeName(projectContentData.type,"")}
+                                </td>
+                                <td style="text-align:center;">
+                                        ${projectContentData.master.name}
+                                </td>
+                                <td style="text-align:center;">
+                                    <fmt:formatDate value="${projectContentData.createDate}" pattern="yyyy-MM-dd HH:mm:ss"/>
+                                </td>
+                            </tr>
+                        </c:forEach>
+                        </tbody>
+                    </table>
+                </div>
+            </div>
             <div class="form-group layui-row">
                 <div class="form-group-label"><h2>过程控制明细</h2></div>
                 <div class="layui-item layui-col-xs12 form-table-container">
@@ -848,6 +999,79 @@
                     </table>
                 </div>
             </div>
+            <div class="form-group layui-row">
+                <div class="form-group-label"><h2>报告文件</h2></div>
+                <div class="layui-item layui-col-xs12" style="padding:0 16px;">
+                    <table id="upTable" class="table table-bordered table-condensed details">
+                        <thead>
+                        <tr>
+                                <%-- <th>序号</th>--%>
+                            <th>文件预览</th>
+                            <th>上传人</th>
+                            <th>上传时间</th>
+                            <th width="200px">操作</th>
+                        </tr>
+                        </thead>
+                        <tbody id="file_attachment">
+                        <c:forEach items="${projectcontentinfo.projectReportData.workAttachments}" var = "workClientAttachment" varStatus="status">
+                            <tr>
+                                    <%-- <td>${status.index + 1}</td>--%>
+                                <c:choose>
+                                    <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
+                                        <td><img src="${workClientAttachment.url}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.url}','90%','90%')" alt="${workClientAttachment.attachmentName}"></td>
+                                    </c:when>
+                                    <c:otherwise>
+                                        <c:choose>
+                                            <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
+                                                <td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workClientAttachment.url}','90%','90%','1')">${workClientAttachment.attachmentName}</a></td>
+                                            </c:when>
+                                            <c:otherwise>
+                                                <td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workClientAttachment.url}','90%','90%')">${workClientAttachment.attachmentName}</a></td>
+                                            </c:otherwise>
+                                        </c:choose>
+                                    </c:otherwise>
+                                </c:choose>
+                                <td>${workClientAttachment.createBy.name}</td>
+                                <td><fmt:formatDate value="${workClientAttachment.createDate}" type="both"/></td>
+                                <td class="op-td">
+                                    <div class="op-btn-box" >
+                                        <c:set var="signflag" value="${fns:getSysParam('sign_flag',fns:getUser())}"/>
+                                        <c:choose>
+                                            <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'doc')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'docx')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'xls')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'xlsx')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'ppt')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'pptx')}">
+                                                <c:if test="${not empty gzr && gzr eq 'gzr'}">
+                                                    <a href="${ctx}/isignature/iSignatureDocument/sign?recordId=${workClientAttachment.id}&type=report" class="op-btn op-btn-sign" target="_blank">签章</a>
+                                                </c:if>
+                                                <c:choose>
+                                                    <c:when test="${signflag == '是'}">
+                                                        <a href="javascript:location.href='${ctx}/isignature/iSignatureDocument/download?recordId=${workClientAttachment.id}'" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+                                                    </c:when>
+                                                    <c:otherwise>
+                                                        <a href="javascript:location.href='${ctx}/workcontractinfo/workContractInfo/downLoadAttach?file='+encodeURIComponent(encodeURIComponent('${workClientAttachment.url}'));" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+                                                    </c:otherwise>
+                                                </c:choose>
+                                            </c:when>
+                                            <c:otherwise>
+                                                <a href="javascript:location.href='${ctx}/workcontractinfo/workContractInfo/downLoadAttach?file='+encodeURIComponent(encodeURIComponent('${workClientAttachment.url}'));" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+                                            </c:otherwise>
+                                        </c:choose>
+                                    </div>
+                                </td>
+                            </tr>
+                        </c:forEach>
+                        </tbody>
+                    </table>
+                </div>
+            </div>
         </form:form>
     </div>
 </div>