ewide/zsxt_nbzs_h5
22
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

update 流转日志展示

Browse Source
This commit is contained in:
自带大佬气场
2021-07-08 16:58:14 +08:00
parent ad50293249
commit a14ccf6399
16 changed files with 230 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Api/Ewide.Application/Service/HouseSafety/HouseSelector/HouseSelectorService.cs
View File

@@ -155,7 +155,7 @@ INNER JOIN (SELECT * FROM bs_house_member_relation WHERE SysUserId = @UserId) HM
// 选定房屋
house.ForEach(async p =>
{
var originalTask = _bsHouseTaskRep.DetachedEntities.FirstOrDefault(t =>t.HouseCodeId == p && t.TaskType == 0);
var originalTask = _bsHouseTaskRep.DetachedEntities.FirstOrDefault(t => t.HouseCodeId == p && t.TaskType == 0 && t.IsEnabled);
if (originalTask == null)
{
new BsHouseTask
@@ -173,7 +173,7 @@ INNER JOIN (SELECT * FROM bs_house_member_relation WHERE SysUserId = @UserId) HM
}
else
{
await _houseLogService.AddThenDone(p, _userManager.User, HouseLogType.SelectMember);
var sort = await _houseLogService.AddThenDone(p, _userManager.User, HouseLogType.SelectMember);
if (originalTask.Status != 6)//建档未完成，生成新建档任务分配给新的人员；原建档任务数据保留，有效性设置为false，取消巡查关系
{
var newTask = originalTask.Adapt<BsHouseTask>();
@@ -185,7 +185,7 @@ INNER JOIN (SELECT * FROM bs_house_member_relation WHERE SysUserId = @UserId) HM
originalTask.IsEnabled = false;
originalTask.Update();
await _houseLogService.Add(p, selectedUser, HouseLogType.CreateInfo);
sort = await _houseLogService.Add(p, selectedUser, HouseLogType.CreateInfo, sort: sort);
}//已建档完成，不再分配建档任务，仅更换巡查关系
else
{