|
|
@ -828,6 +828,10 @@ namespace Myshipping.Application
|
|
|
|
taskEntity.UpdatedTime = DateTime.Now;
|
|
|
|
taskEntity.UpdatedTime = DateTime.Now;
|
|
|
|
taskEntity.UpdatedUserId = UserManager.UserId;
|
|
|
|
taskEntity.UpdatedUserId = UserManager.UserId;
|
|
|
|
taskEntity.UpdatedUserName = UserManager.Name;
|
|
|
|
taskEntity.UpdatedUserName = UserManager.Name;
|
|
|
|
|
|
|
|
taskEntity.IS_COMPLETE = 1;
|
|
|
|
|
|
|
|
taskEntity.COMPLETE_DATE = DateTime.Now;
|
|
|
|
|
|
|
|
taskEntity.COMPLETE_DEAL = "MANUAL";
|
|
|
|
|
|
|
|
taskEntity.COMPLETE_DEAL = "手工";
|
|
|
|
|
|
|
|
|
|
|
|
await _taskBaseRepository.AsUpdateable(taskEntity).UpdateColumns(it => new
|
|
|
|
await _taskBaseRepository.AsUpdateable(taskEntity).UpdateColumns(it => new
|
|
|
|
{
|
|
|
|
{
|
|
|
@ -836,7 +840,11 @@ namespace Myshipping.Application
|
|
|
|
it.UpdatedUserId,
|
|
|
|
it.UpdatedUserId,
|
|
|
|
it.UpdatedUserName,
|
|
|
|
it.UpdatedUserName,
|
|
|
|
it.RealUserId,
|
|
|
|
it.RealUserId,
|
|
|
|
it.RealUserName
|
|
|
|
it.RealUserName,
|
|
|
|
|
|
|
|
it.IS_COMPLETE,
|
|
|
|
|
|
|
|
it.COMPLETE_DATE,
|
|
|
|
|
|
|
|
it.COMPLETE_DEAL,
|
|
|
|
|
|
|
|
it.COMPLETE_DEAL_NAME
|
|
|
|
|
|
|
|
|
|
|
|
}).ExecuteCommandAsync();
|
|
|
|
}).ExecuteCommandAsync();
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -845,12 +853,20 @@ namespace Myshipping.Application
|
|
|
|
taskEntity.UpdatedTime = DateTime.Now;
|
|
|
|
taskEntity.UpdatedTime = DateTime.Now;
|
|
|
|
taskEntity.UpdatedUserId = UserManager.UserId;
|
|
|
|
taskEntity.UpdatedUserId = UserManager.UserId;
|
|
|
|
taskEntity.UpdatedUserName = UserManager.Name;
|
|
|
|
taskEntity.UpdatedUserName = UserManager.Name;
|
|
|
|
|
|
|
|
taskEntity.IS_COMPLETE = 1;
|
|
|
|
|
|
|
|
taskEntity.COMPLETE_DATE = DateTime.Now;
|
|
|
|
|
|
|
|
taskEntity.COMPLETE_DEAL = "MANUAL";
|
|
|
|
|
|
|
|
taskEntity.COMPLETE_DEAL = "手工";
|
|
|
|
|
|
|
|
|
|
|
|
await _taskBaseRepository.AsUpdateable(taskEntity).UpdateColumns(it => new
|
|
|
|
await _taskBaseRepository.AsUpdateable(taskEntity).UpdateColumns(it => new
|
|
|
|
{
|
|
|
|
{
|
|
|
|
it.UpdatedTime,
|
|
|
|
it.UpdatedTime,
|
|
|
|
it.UpdatedUserId,
|
|
|
|
it.UpdatedUserId,
|
|
|
|
it.UpdatedUserName
|
|
|
|
it.UpdatedUserName,
|
|
|
|
|
|
|
|
it.IS_COMPLETE,
|
|
|
|
|
|
|
|
it.COMPLETE_DATE,
|
|
|
|
|
|
|
|
it.COMPLETE_DEAL,
|
|
|
|
|
|
|
|
it.COMPLETE_DEAL_NAME
|
|
|
|
|
|
|
|
|
|
|
|
}).ExecuteCommandAsync();
|
|
|
|
}).ExecuteCommandAsync();
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -955,6 +971,10 @@ namespace Myshipping.Application
|
|
|
|
taskEntity.UpdatedTime = DateTime.Now;
|
|
|
|
taskEntity.UpdatedTime = DateTime.Now;
|
|
|
|
taskEntity.UpdatedUserId = UserManager.UserId;
|
|
|
|
taskEntity.UpdatedUserId = UserManager.UserId;
|
|
|
|
taskEntity.UpdatedUserName = UserManager.Name;
|
|
|
|
taskEntity.UpdatedUserName = UserManager.Name;
|
|
|
|
|
|
|
|
taskEntity.IS_COMPLETE = 1;
|
|
|
|
|
|
|
|
taskEntity.COMPLETE_DATE = DateTime.Now;
|
|
|
|
|
|
|
|
taskEntity.COMPLETE_DEAL = "MANUAL";
|
|
|
|
|
|
|
|
taskEntity.COMPLETE_DEAL = "手工";
|
|
|
|
|
|
|
|
|
|
|
|
await _taskBaseRepository.AsUpdateable(taskEntity).UpdateColumns(it => new
|
|
|
|
await _taskBaseRepository.AsUpdateable(taskEntity).UpdateColumns(it => new
|
|
|
|
{
|
|
|
|
{
|
|
|
@ -963,7 +983,11 @@ namespace Myshipping.Application
|
|
|
|
it.UpdatedUserId,
|
|
|
|
it.UpdatedUserId,
|
|
|
|
it.UpdatedUserName,
|
|
|
|
it.UpdatedUserName,
|
|
|
|
it.RealUserId,
|
|
|
|
it.RealUserId,
|
|
|
|
it.RealUserName
|
|
|
|
it.RealUserName,
|
|
|
|
|
|
|
|
it.IS_COMPLETE,
|
|
|
|
|
|
|
|
it.COMPLETE_DATE,
|
|
|
|
|
|
|
|
it.COMPLETE_DEAL,
|
|
|
|
|
|
|
|
it.COMPLETE_DEAL_NAME
|
|
|
|
|
|
|
|
|
|
|
|
}).ExecuteCommandAsync();
|
|
|
|
}).ExecuteCommandAsync();
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -972,12 +996,20 @@ namespace Myshipping.Application
|
|
|
|
taskEntity.UpdatedTime = DateTime.Now;
|
|
|
|
taskEntity.UpdatedTime = DateTime.Now;
|
|
|
|
taskEntity.UpdatedUserId = UserManager.UserId;
|
|
|
|
taskEntity.UpdatedUserId = UserManager.UserId;
|
|
|
|
taskEntity.UpdatedUserName = UserManager.Name;
|
|
|
|
taskEntity.UpdatedUserName = UserManager.Name;
|
|
|
|
|
|
|
|
taskEntity.IS_COMPLETE = 1;
|
|
|
|
|
|
|
|
taskEntity.COMPLETE_DATE = DateTime.Now;
|
|
|
|
|
|
|
|
taskEntity.COMPLETE_DEAL = "MANUAL";
|
|
|
|
|
|
|
|
taskEntity.COMPLETE_DEAL = "手工";
|
|
|
|
|
|
|
|
|
|
|
|
await _taskBaseRepository.AsUpdateable(taskEntity).UpdateColumns(it => new
|
|
|
|
await _taskBaseRepository.AsUpdateable(taskEntity).UpdateColumns(it => new
|
|
|
|
{
|
|
|
|
{
|
|
|
|
it.UpdatedTime,
|
|
|
|
it.UpdatedTime,
|
|
|
|
it.UpdatedUserId,
|
|
|
|
it.UpdatedUserId,
|
|
|
|
it.UpdatedUserName
|
|
|
|
it.UpdatedUserName,
|
|
|
|
|
|
|
|
it.IS_COMPLETE,
|
|
|
|
|
|
|
|
it.COMPLETE_DATE,
|
|
|
|
|
|
|
|
it.COMPLETE_DEAL,
|
|
|
|
|
|
|
|
it.COMPLETE_DEAL_NAME
|
|
|
|
|
|
|
|
|
|
|
|
}).ExecuteCommandAsync();
|
|
|
|
}).ExecuteCommandAsync();
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -1104,6 +1136,10 @@ namespace Myshipping.Application
|
|
|
|
taskEntity.UpdatedTime = DateTime.Now;
|
|
|
|
taskEntity.UpdatedTime = DateTime.Now;
|
|
|
|
taskEntity.UpdatedUserId = UserManager.UserId;
|
|
|
|
taskEntity.UpdatedUserId = UserManager.UserId;
|
|
|
|
taskEntity.UpdatedUserName = UserManager.Name;
|
|
|
|
taskEntity.UpdatedUserName = UserManager.Name;
|
|
|
|
|
|
|
|
taskEntity.IS_COMPLETE = 1;
|
|
|
|
|
|
|
|
taskEntity.COMPLETE_DATE = DateTime.Now;
|
|
|
|
|
|
|
|
taskEntity.COMPLETE_DEAL = "MANUAL";
|
|
|
|
|
|
|
|
taskEntity.COMPLETE_DEAL = "手工";
|
|
|
|
|
|
|
|
|
|
|
|
await _taskBaseRepository.AsUpdateable(taskEntity).UpdateColumns(it => new
|
|
|
|
await _taskBaseRepository.AsUpdateable(taskEntity).UpdateColumns(it => new
|
|
|
|
{
|
|
|
|
{
|
|
|
@ -1112,7 +1148,11 @@ namespace Myshipping.Application
|
|
|
|
it.UpdatedUserId,
|
|
|
|
it.UpdatedUserId,
|
|
|
|
it.UpdatedUserName,
|
|
|
|
it.UpdatedUserName,
|
|
|
|
it.RealUserId,
|
|
|
|
it.RealUserId,
|
|
|
|
it.RealUserName
|
|
|
|
it.RealUserName,
|
|
|
|
|
|
|
|
it.IS_COMPLETE,
|
|
|
|
|
|
|
|
it.COMPLETE_DATE,
|
|
|
|
|
|
|
|
it.COMPLETE_DEAL,
|
|
|
|
|
|
|
|
it.COMPLETE_DEAL_NAME
|
|
|
|
|
|
|
|
|
|
|
|
}).ExecuteCommandAsync();
|
|
|
|
}).ExecuteCommandAsync();
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -1121,12 +1161,20 @@ namespace Myshipping.Application
|
|
|
|
taskEntity.UpdatedTime = DateTime.Now;
|
|
|
|
taskEntity.UpdatedTime = DateTime.Now;
|
|
|
|
taskEntity.UpdatedUserId = UserManager.UserId;
|
|
|
|
taskEntity.UpdatedUserId = UserManager.UserId;
|
|
|
|
taskEntity.UpdatedUserName = UserManager.Name;
|
|
|
|
taskEntity.UpdatedUserName = UserManager.Name;
|
|
|
|
|
|
|
|
taskEntity.IS_COMPLETE = 1;
|
|
|
|
|
|
|
|
taskEntity.COMPLETE_DATE = DateTime.Now;
|
|
|
|
|
|
|
|
taskEntity.COMPLETE_DEAL = "MANUAL";
|
|
|
|
|
|
|
|
taskEntity.COMPLETE_DEAL = "手工";
|
|
|
|
|
|
|
|
|
|
|
|
await _taskBaseRepository.AsUpdateable(taskEntity).UpdateColumns(it => new
|
|
|
|
await _taskBaseRepository.AsUpdateable(taskEntity).UpdateColumns(it => new
|
|
|
|
{
|
|
|
|
{
|
|
|
|
it.UpdatedTime,
|
|
|
|
it.UpdatedTime,
|
|
|
|
it.UpdatedUserId,
|
|
|
|
it.UpdatedUserId,
|
|
|
|
it.UpdatedUserName
|
|
|
|
it.UpdatedUserName,
|
|
|
|
|
|
|
|
it.IS_COMPLETE,
|
|
|
|
|
|
|
|
it.COMPLETE_DATE,
|
|
|
|
|
|
|
|
it.COMPLETE_DEAL,
|
|
|
|
|
|
|
|
it.COMPLETE_DEAL_NAME
|
|
|
|
|
|
|
|
|
|
|
|
}).ExecuteCommandAsync();
|
|
|
|
}).ExecuteCommandAsync();
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -1146,7 +1194,7 @@ namespace Myshipping.Application
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
result.succ = true;
|
|
|
|
result.succ = true;
|
|
|
|
result.msg = "成功";
|
|
|
|
result.msg = "成功";
|
|
|
|
}
|
|
|
|
}
|
|
|
|
catch (Exception ex)
|
|
|
|
catch (Exception ex)
|
|
|
@ -1788,7 +1836,10 @@ namespace Myshipping.Application
|
|
|
|
|
|
|
|
|
|
|
|
_logger.LogInformation($"推送邮件完成,结果:{JSON.Serialize(emailRlt)}");
|
|
|
|
_logger.LogInformation($"推送邮件完成,结果:{JSON.Serialize(emailRlt)}");
|
|
|
|
|
|
|
|
|
|
|
|
if(emailRlt.succ)
|
|
|
|
//var taskBcInfo = _taskBCInfoRepository.AsQueryable().Filter(null, true)
|
|
|
|
|
|
|
|
//.First(a => a.PK_ID == taskBCInfo.PK_ID);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (emailRlt.succ)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
result.succ = true;
|
|
|
|
result.succ = true;
|
|
|
|
result.msg = "成功";
|
|
|
|
result.msg = "成功";
|
|
|
|