Explorar o código

项目列表页添加登记人展示

user5 %!s(int64=4) %!d(string=hai) anos
pai
achega
e437b1214e

+ 1 - 0
src/main/resources/mappings/modules/ruralprojectrecords/RuralProjectMessageDao.xml

@@ -6,6 +6,7 @@
 		distinct(a.id) AS "id",
 		distinct(a.id) AS "id",
 		a.create_by AS "createBy.id",
 		a.create_by AS "createBy.id",
 		a.create_date AS "createDate",
 		a.create_date AS "createDate",
+		(select name from sys_user user where user.id=a.create_by) AS "createBy.name",
 		a.update_by AS "updateBy.id",
 		a.update_by AS "updateBy.id",
 		a.update_date AS "updateDate",
 		a.update_date AS "updateDate",
 		a.del_flag AS "delFlag",
 		a.del_flag AS "delFlag",

+ 3 - 1
src/main/webapp/webpage/modules/ruralprojectrecords/cost/ruralCostProjectMessageList.jsp

@@ -293,6 +293,7 @@
                 ,{field:'client',align:'center', title: '委托方',  width:150,templet:function(d){
                 ,{field:'client',align:'center', title: '委托方',  width:150,templet:function(d){
                         return "<span title=\"" + d.client + "\">" + d.client + "</span>";
                         return "<span title=\"" + d.client + "\">" + d.client + "</span>";
                     }}
                     }}
+                ,{field:'createName',align:'center', title: '登记人',  width:80}
                 ,{field:'createDate',align:'center', title: '创建日期',  width:80}
                 ,{field:'createDate',align:'center', title: '创建日期',  width:80}
                 ,{align:'center', title: '报告状态',  width:70,templet:function(d){
                 ,{align:'center', title: '报告状态',  width:70,templet:function(d){
                         var st = getAuditState(d.projectReportStatus);
                         var st = getAuditState(d.projectReportStatus);
@@ -343,7 +344,7 @@
 							xml+="<a href=\"#\" style='background-color: #FFB800' onclick=\"openDialogre('下载报告模板', '${ctx}/ruralProject/ruralProjectMessage/skipDownloadFtl?id=" + d.id +"','35%', '35%','','下载,关闭')\" class=\"op-btn\" > 下载报告模板</a>";
 							xml+="<a href=\"#\" style='background-color: #FFB800' onclick=\"openDialogre('下载报告模板', '${ctx}/ruralProject/ruralProjectMessage/skipDownloadFtl?id=" + d.id +"','35%', '35%','','下载,关闭')\" class=\"op-btn\" > 下载报告模板</a>";
 							if(d.recordAdd != undefined && d.recordAdd =="1")
 							if(d.recordAdd != undefined && d.recordAdd =="1")
 							{
 							{
-								xml+="<a href=\"#\" onclick=\"openDialogre('新增归档信息', '${ctx}/ruralProject/ruralCostProjectMessage/formRecord?reportId=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" class=\"op-btn layui-bg-green\" ><i class=\"fa fa-plus\"></i> 新增归档信息</a>";
+								xml+="<a href=\"#\" onclick=\"openDialogre('新增归档信息', '${ctx}/ruralProject/ruralCostProjectMessage/formRecord?reportId=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" class=\"op-btn layui-bg-green\" ><i class=\"fa fa-plus\"></i> 归档</a>";
 							}
 							}
 							if(d.recordedit1 != undefined && d.recordedit1 =="1")
 							if(d.recordedit1 != undefined && d.recordedit1 =="1")
 							{
 							{
@@ -392,6 +393,7 @@
                     ,"contract":"${projectRecords.workContractInfo.name}"
                     ,"contract":"${projectRecords.workContractInfo.name}"
 					,"contractId":"${projectRecords.workContractInfo.id}"
 					,"contractId":"${projectRecords.workContractInfo.id}"
                     ,"client":"${projectRecords.workContractInfo.client.name}"
                     ,"client":"${projectRecords.workContractInfo.client.name}"
+                    ,"createName":"${projectRecords.createBy.name}"
                     ,"createDate":"<fmt:formatDate value="${projectRecords.createDate}" pattern="yyyy-MM-dd"/>"
                     ,"createDate":"<fmt:formatDate value="${projectRecords.createDate}" pattern="yyyy-MM-dd"/>"
                     ,"projectReportStatus":"${projectRecords.projectReportStatus}"
                     ,"projectReportStatus":"${projectRecords.projectReportStatus}"
                     ,"projectReportRecordStatus":"${projectRecords.projectReportRecordStatus}"
                     ,"projectReportRecordStatus":"${projectRecords.projectReportRecordStatus}"

+ 3 - 1
src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/ruralProjectMessageList.jsp

@@ -294,6 +294,7 @@
                 ,{field:'client',align:'center', title: '委托方',  width:150,templet:function(d){
                 ,{field:'client',align:'center', title: '委托方',  width:150,templet:function(d){
                         return "<span title=\"" + d.client + "\">" + d.client + "</span>";
                         return "<span title=\"" + d.client + "\">" + d.client + "</span>";
                     }}
                     }}
+                ,{field:'createName',align:'center', title: '登记人',  width:80}
                 ,{field:'createDate',align:'center', title: '创建日期',  width:80}
                 ,{field:'createDate',align:'center', title: '创建日期',  width:80}
                 ,{align:'center', title: '报告状态',  width:70,templet:function(d){
                 ,{align:'center', title: '报告状态',  width:70,templet:function(d){
                         var st = getAuditState(d.projectReportStatus);
                         var st = getAuditState(d.projectReportStatus);
@@ -346,7 +347,7 @@
 							xml+="<a href=\"#\" style='background-color: #FFB800' onclick=\"openDialogre('下载报告模板', '${ctx}/ruralProject/ruralProjectMessage/skipDownloadFtl?id=" + d.id +"','35%', '35%','','下载,关闭')\" class=\"op-btn\" > 下载报告模板</a>";
 							xml+="<a href=\"#\" style='background-color: #FFB800' onclick=\"openDialogre('下载报告模板', '${ctx}/ruralProject/ruralProjectMessage/skipDownloadFtl?id=" + d.id +"','35%', '35%','','下载,关闭')\" class=\"op-btn\" > 下载报告模板</a>";
 							if(d.recordAdd != undefined && d.recordAdd =="1")
 							if(d.recordAdd != undefined && d.recordAdd =="1")
 							{
 							{
-								xml+="<a href=\"#\" onclick=\"openDialogre('新增归档信息', '${ctx}/ruralProject/ruralProjectMessage/formRecord?reportId=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" class=\"op-btn layui-bg-green\" ><i class=\"fa fa-plus\"></i> 新增归档信息</a>";
+								xml+="<a href=\"#\" onclick=\"openDialogre('新增归档信息', '${ctx}/ruralProject/ruralProjectMessage/formRecord?reportId=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" class=\"op-btn layui-bg-green\" ><i class=\"fa fa-plus\"></i> 归档</a>";
 							}
 							}
 							if(d.recordedit1 != undefined && d.recordedit1 =="1")
 							if(d.recordedit1 != undefined && d.recordedit1 =="1")
 							{
 							{
@@ -391,6 +392,7 @@
                     ,"contract":"${projectRecords.workContractInfo.name}"
                     ,"contract":"${projectRecords.workContractInfo.name}"
                     ,"contractId":"${projectRecords.workContractInfo.id}"
                     ,"contractId":"${projectRecords.workContractInfo.id}"
                     ,"client":"${projectRecords.workContractInfo.client.name}"
                     ,"client":"${projectRecords.workContractInfo.client.name}"
+					,"createName":"${projectRecords.createBy.name}"
                     ,"createDate":"<fmt:formatDate value="${projectRecords.createDate}" pattern="yyyy-MM-dd"/>"
                     ,"createDate":"<fmt:formatDate value="${projectRecords.createDate}" pattern="yyyy-MM-dd"/>"
                     ,"projectReportStatus":"${projectRecords.projectReportStatus}"
                     ,"projectReportStatus":"${projectRecords.projectReportStatus}"
                     ,"projectReportRecordStatus":"${projectRecords.projectReportRecordStatus}"
                     ,"projectReportRecordStatus":"${projectRecords.projectReportRecordStatus}"