归档信息展示

src/main/java/com/jeeplus/modules/projectrecord/entity/ProjectRecordTreeData.java

@@ -28,6 +28,7 @@ public class ProjectRecordTreeData extends DataEntity<ProjectRecordTreeData> {
     private Integer operationSign;   //操作标识
     private String projectContentId;  //工作内容id
     private String recordId;
+    private String reportRecordName;   //归档信息名称
 
     public String getProjectId() {
         return projectId;
@@ -188,4 +189,12 @@ public class ProjectRecordTreeData extends DataEntity<ProjectRecordTreeData> {
     public void setRecordId(String recordId) {
         this.recordId = recordId;
     }
+
+    public String getReportRecordName() {
+        return reportRecordName;
+    }
+
+    public void setReportRecordName(String reportRecordName) {
+        this.reportRecordName = reportRecordName;
+    }
 }

src/main/resources/mappings/modules/projectcontentinfo/ProjectContentDataDao.xml

@@ -318,7 +318,8 @@
 		select a.id as "id", a.create_by as "createBy.id", a.create_date as "createDate", a.project_id as "pid",
 		a.name as "projectName", "" as projectId, "0" as projectStatus,su.name as "projectRegistrant" ,
 		pt.type_name as projectLeader, ppt.type_name as clientName,ifnull(prr.status,'10') as status,
-		prd.id as reportId,prr.id as recordId,ifnull(prd.name,'') as reportName
+		prd.id as reportId,ifnull(prr.id,'') as recordId,ifnull(prd.name,'') as reportName,
+		ifnull(prr.record_num,'') as reportRecordName
 		from project_content_data a
 		left join sys_user su on su.id = a.create_by
 		left join project_type pt on a.type = pt.type_id

src/main/webapp/webpage/modules/projectrecord/implementCompletion/projectCompletionPigeonholeList.jsp

@@ -296,13 +296,13 @@
 								return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogView('查看工作内容', '${ctx}/projectcontentinfo/projectcontentinfo/form?view=contentView&dictType=&id="+d.contentPId+"&parentIds="+d.parentIds+"&infoId="+d.id+"','95%', '95%')\">" + d.projectName + "</a>";
 							}
 						}},
-					/*{field: 'clientName', align:'center', title: '委托方/当前阶段',templet: function(d){
+					{field: 'clientName', align:'center', title: '归档名称',templet: function(d){
 							if(0 == d.pid){
-								return "<font style = 'font-size:14px;font-weight:500;'>"+d.clientName+"</font>";
+								return "";
 							}else{
-								return "<font>"+d.clientName+"</font>";
+								return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogView('查看归档信息', '${ctx}/projectcontentinfo/projectReportRecord/form?view=view&id="+d.recordId+"','95%', '95%')\">" + d.reportRecordName + "</a>";
 							}
-						}},*/
+						}},
 					{field: 'projectLeader', align:'center', title: '项目负责人',templet: function(d){
 							if(0 == d.pid){
 								return "<font style = 'font-size:14px;font-weight:500;'>"+d.projectLeader+"</font>";