diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/DispatchController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/DispatchController.cs
index c27ebd42f..1efd02f25 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/DispatchController.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/DispatchController.cs
@@ -28,7 +28,6 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
private AnnexesFileIBLL annexesFileIBLL = new AnnexesFileBLL();
private DataItemIBLL dataItemIBLL = new DataItemBLL();
private DispatchAuditIBLL dispatchAuditIBLL = new DispatchAuditBLL();
- //private MessageRindIBLL messageRindIBLL = new MessageRindBLL();
#region 视图功能
@@ -206,7 +205,9 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
///
public ActionResult ModifyStatus(string keyValue, int pastatus, string processId)
{
- dispatchIBLL.ModifyStatus(keyValue, pastatus, processId);
+ var userInfo = LoginUserInfo.Get();
+ var RealName = userInfo.realName;
+ dispatchIBLL.ModifyStatus(keyValue, pastatus, processId, RealName);
return Success("提交成功!");
}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/Index.js
index c01e1c2a1..e4e477839 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/Index.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/Index.js
@@ -180,8 +180,8 @@ var bootstrap = function ($, learun) {
{ label: "字", name: "DisWork", width: 150, align: "center" },
{ label: "号", name: "DisMark", width: 150, align: "center" },
{ label: "年", name: "DisYear", width: 100, align: "center" },
- { label: "月", name: "DisMonth", width: 100, align: "center" },
- { label: "日", name: "DisDay", width: 100, align: "center" },
+ { label: "月", name: "DisMonth", width: 50, align: "center" },
+ { label: "日", name: "DisDay", width: 50, align: "center" },
{
label: "事由", name: "Reasons", width: 500, align: "center",
formatterAsync: function (callback, value, row, op, $cell) {
@@ -209,6 +209,13 @@ var bootstrap = function ($, learun) {
});
}
},
+ { label: "发起人", name: "CreateUser", width: 100, align: "center" },
+ {
+ label: "发起时间", name: "CreateTime", width: 100, align: "center",
+ formatter: function (cellvalue) {
+ return learun.formatDate(cellvalue, 'yyyy-MM-dd hh:mm');
+ }
+ },
{
label: "审批状态", name: "FlowNo", width: 100, align: "center",
formatter: function (cellvalue, row) {
@@ -258,7 +265,7 @@ var bootstrap = function ($, learun) {
// 发起流程
var postData = {
//schemeCode: 'Dispatch',// 本地
- //schemeCode: 'DBSW',//线上
+ schemeCode: 'DBSW',//线上
title: "(" + DisFrom + ") " + Reasons,
processId: processId,
level: '1',
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/IndexXF.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/IndexXF.js
index 902fbcaea..1c6f1f519 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/IndexXF.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/IndexXF.js
@@ -180,10 +180,9 @@ var bootstrap = function ($, learun) {
{ label: "来文单位", name: "DisFrom", width: 400, align: "center" },
{ label: "字", name: "DisWork", width: 150, align: "center" },
{ label: "号", name: "DisMark", width: 150, align: "center" },
- //{ label: "份数", name: "Copies", width: 100, align: "center" },
{ label: "年", name: "DisYear", width: 100, align: "center" },
- { label: "月", name: "DisMonth", width: 100, align: "center" },
- { label: "日", name: "DisDay", width: 100, align: "center" },
+ { label: "月", name: "DisMonth", width: 50, align: "center" },
+ { label: "日", name: "DisDay", width: 50, align: "center" },
{
label: "事由", name: "Reasons", width: 500, align: "center",
formatterAsync: function (callback, value, row, op, $cell) {
@@ -205,6 +204,13 @@ var bootstrap = function ($, learun) {
});
}
},
+ { label: "发起人", name: "CreateUser", width: 100, align: "center" },
+ {
+ label: "发起时间", name: "CreateTime", width: 100, align: "center",
+ formatter: function (cellvalue) {
+ return learun.formatDate(cellvalue, 'yyyy-MM-dd hh:mm');
+ }
+ },
{
label: "审批状态", name: "FlowNo", width: 100, align: "center",
formatter: function (cellvalue, row) {
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Dispatch/DispatchBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Dispatch/DispatchBLL.cs
index 0f307c488..62c5e31fa 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Dispatch/DispatchBLL.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Dispatch/DispatchBLL.cs
@@ -153,11 +153,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
/// 审核状态
/// 流程Id
///
- public void ModifyStatus(string keyValue, int pastatus, string processId)
+ public void ModifyStatus(string keyValue, int pastatus, string processId,string RealName)
{
try
{
- dispatchService.ModifyStatus(keyValue, pastatus, processId);
+ dispatchService.ModifyStatus(keyValue, pastatus, processId, RealName);
}
catch (Exception ex)
{
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Dispatch/DispatchEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Dispatch/DispatchEntity.cs
index 616cbebab..df3705df6 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Dispatch/DispatchEntity.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Dispatch/DispatchEntity.cs
@@ -109,6 +109,18 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
///
[Column("READER")]
public string Reader { get; set; }
+ ///
+ /// 发起时间
+ ///
+ ///
+ [Column("CREATETIME")]
+ public DateTime? CreateTime { get; set; }
+ ///
+ /// 发起人
+ ///
+ ///
+ [Column("CREATEUSER")]
+ public string CreateUser { get; set; }
#endregion
#region 扩展操作
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Dispatch/DispatchIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Dispatch/DispatchIBLL.cs
index bad230755..91a51da7b 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Dispatch/DispatchIBLL.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Dispatch/DispatchIBLL.cs
@@ -51,7 +51,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
void SaveEntity(string keyValue, DispatchEntity entity);
#endregion
- void ModifyStatus(string keyValue, int pastatus, string processId);
+ void ModifyStatus(string keyValue, int pastatus, string processId, string RealName);
void ModifyStatusByProcessId(int i, string processId);
}
}
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Dispatch/DispatchService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Dispatch/DispatchService.cs
index da426c509..a6fc92c6a 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Dispatch/DispatchService.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Dispatch/DispatchService.cs
@@ -31,28 +31,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
{
var strSql = new StringBuilder();
strSql.Append("SELECT ");
- strSql.Append(@"
- t.Id,
- t.WorkName,
- t.DisTitle,
- t.DisFrom,
- t.DisWork,
- t.DisMark,
- t.Copies,
- t.DisYear,
- t.DisMonth,
- t.DisDay,
- t.Reasons,
- t.AttachmentName,
- t.Render,
- t.RenderDate,
- t.Instructions,
- t.DisOffice,
- t.FlowNo,
- t.processId,
- t.Reader,
- t.ReadPeople
- ");
+ strSql.Append(@" * ");
strSql.Append(" FROM Dispatch t ");
strSql.Append(" WHERE 1=1 ");
var queryParam = queryJson.ToJObject();
@@ -206,11 +185,13 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
#region 扩展数据
- public void ModifyStatus(string keyValue, int pastatus, string processId)
+ public void ModifyStatus(string keyValue, int pastatus, string processId, string RealName)
{
try
{
var entity = this.BaseRepository("CollegeMIS").FindEntity(a => a.Id == keyValue);
+ entity.CreateUser = RealName;
+ entity.CreateTime = DateTime.Now;
entity.processId = processId;
entity.FlowNo = pastatus.ToString();
this.BaseRepository("CollegeMIS").Update(entity);