diff --git a/Api/Ewide.Application/Entity/BsHouseInfo.cs b/Api/Ewide.Application/Entity/BsHouseInfo.cs
index 1a929a4..26f7fed 100644
--- a/Api/Ewide.Application/Entity/BsHouseInfo.cs
+++ b/Api/Ewide.Application/Entity/BsHouseInfo.cs
@@ -358,7 +358,7 @@ namespace Ewide.Application
///
[Comment("竣工验收备案")]
[MaxLength(2000)]
- public string CompletedRecord { get; set; }
+ public string CompletionRecord { get; set; }
///
/// 监理资料
diff --git a/Api/Ewide.Application/Ewide.Application.xml b/Api/Ewide.Application/Ewide.Application.xml
index 52e25ca..1aeea1e 100644
--- a/Api/Ewide.Application/Ewide.Application.xml
+++ b/Api/Ewide.Application/Ewide.Application.xml
@@ -269,7 +269,7 @@
规划许可
-
+
竣工验收备案
@@ -949,7 +949,7 @@
规划许可
-
+
竣工验收备案
@@ -1174,7 +1174,7 @@
规划许可
-
+
竣工验收备案
diff --git a/Api/Ewide.Application/Service/HouseSafety/HouseInfo/Dto/HouseInfoInput.cs b/Api/Ewide.Application/Service/HouseSafety/HouseInfo/Dto/HouseInfoInput.cs
index 412297c..cc7174e 100644
--- a/Api/Ewide.Application/Service/HouseSafety/HouseInfo/Dto/HouseInfoInput.cs
+++ b/Api/Ewide.Application/Service/HouseSafety/HouseInfo/Dto/HouseInfoInput.cs
@@ -224,7 +224,7 @@ namespace Ewide.Application
///
/// 竣工验收备案
///
- public string CompletedRecord { get; set; }
+ public string CompletionRecord { get; set; }
///
/// 监理资料
diff --git a/Api/Ewide.Application/Service/HouseSafety/HouseInfo/Dto/HouseInfoOutput.cs b/Api/Ewide.Application/Service/HouseSafety/HouseInfo/Dto/HouseInfoOutput.cs
index b1f225c..21322f0 100644
--- a/Api/Ewide.Application/Service/HouseSafety/HouseInfo/Dto/HouseInfoOutput.cs
+++ b/Api/Ewide.Application/Service/HouseSafety/HouseInfo/Dto/HouseInfoOutput.cs
@@ -224,7 +224,7 @@ namespace Ewide.Application
///
/// 竣工验收备案
///
- public string CompletedRecord { get; set; }
+ public string CompletionRecord { get; set; }
///
/// 监理资料
@@ -248,7 +248,7 @@ namespace Ewide.Application
///
public string FacadePhoto { get; set; }
#endregion
-
+ public int State { get; set; }
#region 调查单位unit
///
/// 调查登记机构
diff --git a/Api/Ewide.Application/Service/HouseSafety/HouseInfo/HouseInfoService.cs b/Api/Ewide.Application/Service/HouseSafety/HouseInfo/HouseInfoService.cs
index 3aed519..bb4125c 100644
--- a/Api/Ewide.Application/Service/HouseSafety/HouseInfo/HouseInfoService.cs
+++ b/Api/Ewide.Application/Service/HouseSafety/HouseInfo/HouseInfoService.cs
@@ -55,20 +55,22 @@ namespace Ewide.Application.Service.HouseSafety.HouseInfo
if(houseEntity == null)
{
houseInfo.Id = Guid.NewGuid().ToString();
- houseInfo.State = 0;
+ houseInfo.State = 3;
await houseInfo.InsertAsync();
}
else
{
houseInfo.Id = houseEntity.Id;
- await houseInfo.UpdateExcludeAsync(new[] { nameof(BsHouseInfo.State) }, true) ;
+ houseInfo.State = houseEntity.State;
+ await houseInfo.UpdateExcludeAsync(new[] { nameof(BsHouseInfo.HouseGrade) }, true) ;
}
if(houseInfo.State != 6)
{
var houseTask = input.PatrolInfo.Adapt();
houseTask.HouseCodeId = input.houseCode.Id;
- await houseTask.UpdateExcludeAsync(new string[] { }, ignoreNullValues: true);
+ houseTask.Status = 1;
+ await houseTask.UpdateExcludeAsync(new string[] { nameof(BsHouseTask.TaskType) }, ignoreNullValues: true);
}
}
diff --git a/Api/Ewide.Application/Service/HouseSafety/HouseTask/Dto/HouseTaskOutput.cs b/Api/Ewide.Application/Service/HouseSafety/HouseTask/Dto/HouseTaskOutput.cs
index 9d7cf5a..60461ff 100644
--- a/Api/Ewide.Application/Service/HouseSafety/HouseTask/Dto/HouseTaskOutput.cs
+++ b/Api/Ewide.Application/Service/HouseSafety/HouseTask/Dto/HouseTaskOutput.cs
@@ -105,5 +105,7 @@ namespace Ewide.Application
/// 上报备注
///
public string ReportRemark { get; set; }
+
+ public int Status { get; set; }
}
}
diff --git a/Api/Ewide.Application/Service/HouseSafety/HouseTask/HouseTaskService.cs b/Api/Ewide.Application/Service/HouseSafety/HouseTask/HouseTaskService.cs
index 2d5058e..7140f4c 100644
--- a/Api/Ewide.Application/Service/HouseSafety/HouseTask/HouseTaskService.cs
+++ b/Api/Ewide.Application/Service/HouseSafety/HouseTask/HouseTaskService.cs
@@ -2,10 +2,13 @@
using Ewide.Core;
using Ewide.Core.Extension;
using Furion.DatabaseAccessor;
+using Furion.DatabaseAccessor.Extensions;
using Furion.DependencyInjection;
using Furion.DynamicApiController;
using Furion.FriendlyException;
+using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
+using Microsoft.EntityFrameworkCore;
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
@@ -22,12 +25,14 @@ namespace Ewide.Application.Service
public class HouseTaskService : IHouseTaskService, IDynamicApiController, ITransient
{
private readonly IRepository _houseTaskRep;
+ private readonly IRepository _houseInfoRep;
private readonly IDapperRepository _dapperRepository;
private readonly IUserManager _userManager;
- public HouseTaskService(IRepository HouseTaskRep, IDapperRepository dapperRepository, IUserManager userManager)
+ public HouseTaskService(IRepository HouseTaskRep, IRepository HouseInfoRep, IDapperRepository dapperRepository, IUserManager userManager)
{
_houseTaskRep = HouseTaskRep;
+ _houseInfoRep = HouseInfoRep;
_dapperRepository = dapperRepository;
_userManager = userManager;
}
@@ -50,5 +55,27 @@ WHERE T.UserID=@UserID";
return await _dapperRepository.QueryPageDataDynamic(sql, input, param, filterFields: new string[] { "Type", "Address", "HouseCode" });
}
+ [HttpPost("/houseTask/submit")]
+ [UnitOfWork]
+ [AllowAnonymous]
+ public async Task Submit([Required] string taskId)
+ {
+ //获取任务实体
+ var houseTask = await _houseTaskRep.DetachedEntities.FirstOrDefaultAsync(t => t.Id == taskId);
+ if (houseTask == null) throw Oops.Oh("任务不存在");
+ houseTask.Status = 2;
+ houseTask.LastSubmitTime = DateTime.Now;
+ if (!houseTask.SubmitTime.HasValue) houseTask.SubmitTime = houseTask.LastSubmitTime;
+ await houseTask.UpdateExcludeAsync(new string[] { nameof(BsHouseTask.TaskType) }, ignoreNullValues: true);
+
+ if(houseTask.TaskType == 0)
+ {
+ var houseInfo = await _houseInfoRep.DetachedEntities.FirstOrDefaultAsync(h => h.HouseCodeId == houseTask.HouseCodeId);
+ if (houseInfo == null) throw Oops.Oh("提交审核失败:请先保存后再提交");
+
+ houseInfo.State = 5;
+ await houseInfo.UpdateExcludeAsync(new[] { nameof(BsHouseInfo.HouseGrade) }, true);
+ }
+ }
}
}