parent
68c8335860
commit
70d02cb1c2
|
|
@ -128,29 +128,11 @@ namespace OpenAuth.App.ServiceApp
|
|||
// 提交事务
|
||||
if (db.Commit())
|
||||
{
|
||||
var content = new
|
||||
return new Response<string>
|
||||
{
|
||||
queryid = insTaskInfo.Id,
|
||||
message = "有新创建的任务"
|
||||
Result = "添加成功",
|
||||
Message = "添加成功"
|
||||
};
|
||||
var contents = Json.ToJson(content);
|
||||
try
|
||||
{
|
||||
await _immsgApp.SendMsgAll("InsTask", contents, insTaskInfo.Id);
|
||||
return new Response<string>
|
||||
{
|
||||
Result = "添加成功",
|
||||
Message = "添加成功"
|
||||
};
|
||||
}
|
||||
catch
|
||||
{
|
||||
return new Response<string>
|
||||
{
|
||||
Result = "添加成功",
|
||||
Message = "数据存储成功,推送失败"
|
||||
};
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
@ -406,14 +388,33 @@ namespace OpenAuth.App.ServiceApp
|
|||
UpdateUserName = user.Name,
|
||||
|
||||
}, r => r.Id == id); ;
|
||||
|
||||
// 提交事务
|
||||
if (db.Commit())
|
||||
{
|
||||
return new Response<string>
|
||||
var content = new
|
||||
{
|
||||
Result = "发布成功",
|
||||
Message = "发布成功"
|
||||
queryid = insTaskInfo.Id,
|
||||
message = "有新发布的任务"
|
||||
};
|
||||
var contents = Json.ToJson(content);
|
||||
try
|
||||
{
|
||||
await _immsgApp.SendMsgAll("InsTask", contents, insTaskInfo.Id);
|
||||
return new Response<string>
|
||||
{
|
||||
Result = "发布成功",
|
||||
Message = "发布成功"
|
||||
};
|
||||
}
|
||||
catch
|
||||
{
|
||||
return new Response<string>
|
||||
{
|
||||
Result = "发布成功",
|
||||
Message = "数据存储成功,推送失败"
|
||||
};
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@ namespace OpenAuth.App.ServiceApp.InsTaskHallManager
|
|||
/// <returns></returns>
|
||||
public async Task<List<dynamic>> GetTaskList()
|
||||
{
|
||||
var query = await client.Queryable<InsTask>().Where(r => r.State!=2)
|
||||
var query = await client.Queryable<InsTask>().Where(r => r.State!=2&&r.State!=3)
|
||||
.LeftJoin<InsAishp>((r, p) => r.ShpId == p.Id)
|
||||
.OrderByDescending(r=>r.CreateTime)
|
||||
.Select<dynamic>((r, p) => new
|
||||
|
|
|
|||
Loading…
Reference in New Issue