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

update

Browse Source
This commit is contained in:
ky_yusj
2021-06-09 16:34:42 +08:00
parent b37e3a403f
commit 760797ea56
7 changed files with 42 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Api/Ewide.Application/Entity/BsHouseInfo.cs
View File

@@ -358,7 +358,7 @@ namespace Ewide.Application
/// </summary> /// </summary>
[Comment("竣工验收备案")] [Comment("竣工验收备案")]
[MaxLength(2000)] [MaxLength(2000)]
public string CompletedRecord { get; set; } public string CompletionRecord { get; set; }
/// <summary> /// <summary>
/// 监理资料 /// 监理资料

6
Api/Ewide.Application/Ewide.Application.xml
View File

@@ -269,7 +269,7 @@
规划许可 规划许可
</summary> </summary>
</member> </member>
<member name="P:Ewide.Application.BsHouseInfo.CompletedRecord"> <member name="P:Ewide.Application.BsHouseInfo.CompletionRecord">
<summary> <summary>
竣工验收备案 竣工验收备案
</summary> </summary>
@@ -949,7 +949,7 @@
规划许可 规划许可
</summary> </summary>
</member> </member>
<member name="P:Ewide.Application.HouseInfoInput.CompletedRecord"> <member name="P:Ewide.Application.HouseInfoInput.CompletionRecord">
<summary> <summary>
竣工验收备案 竣工验收备案
</summary> </summary>
@@ -1174,7 +1174,7 @@
规划许可 规划许可
</summary> </summary>
</member> </member>
<member name="P:Ewide.Application.HouseInfoOutput.CompletedRecord"> <member name="P:Ewide.Application.HouseInfoOutput.CompletionRecord">
<summary> <summary>
竣工验收备案 竣工验收备案
</summary> </summary>

2
Api/Ewide.Application/Service/HouseSafety/HouseInfo/Dto/HouseInfoInput.cs
View File

@@ -224,7 +224,7 @@ namespace Ewide.Application
/// <summary> /// <summary>
/// 竣工验收备案 /// 竣工验收备案
/// </summary> /// </summary>
public string CompletedRecord { get; set; } public string CompletionRecord { get; set; }
/// <summary> /// <summary>
/// 监理资料 /// 监理资料

4
Api/Ewide.Application/Service/HouseSafety/HouseInfo/Dto/HouseInfoOutput.cs
View File

@@ -224,7 +224,7 @@ namespace Ewide.Application
/// <summary> /// <summary>
/// 竣工验收备案 /// 竣工验收备案
/// </summary> /// </summary>
public string CompletedRecord { get; set; } public string CompletionRecord { get; set; }
/// <summary> /// <summary>
/// 监理资料 /// 监理资料
@@ -248,7 +248,7 @@ namespace Ewide.Application
/// </summary> /// </summary>
public string FacadePhoto { get; set; } public string FacadePhoto { get; set; }
#endregion #endregion
public int State { get; set; }
#region 调查单位unit #region 调查单位unit
/// <summary> /// <summary>
/// 调查登记机构 /// 调查登记机构

8
Api/Ewide.Application/Service/HouseSafety/HouseInfo/HouseInfoService.cs
View File

@@ -55,20 +55,22 @@ namespace Ewide.Application.Service.HouseSafety.HouseInfo
if(houseEntity == null) if(houseEntity == null)
{ {
houseInfo.Id = Guid.NewGuid().ToString(); houseInfo.Id = Guid.NewGuid().ToString();
houseInfo.State = 0; houseInfo.State = 3;
await houseInfo.InsertAsync(); await houseInfo.InsertAsync();
} }
else else
{ {
houseInfo.Id = houseEntity.Id; 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) if(houseInfo.State != 6)
{ {
var houseTask = input.PatrolInfo.Adapt<BsHouseTask>(); var houseTask = input.PatrolInfo.Adapt<BsHouseTask>();
houseTask.HouseCodeId = input.houseCode.Id; 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);
} }
} }

2
Api/Ewide.Application/Service/HouseSafety/HouseTask/Dto/HouseTaskOutput.cs
View File

@@ -105,5 +105,7 @@ namespace Ewide.Application
/// 上报备注 /// 上报备注
/// </summary> /// </summary>
public string ReportRemark { get; set; } public string ReportRemark { get; set; }
public int Status { get; set; }
} }
} }

29
Api/Ewide.Application/Service/HouseSafety/HouseTask/HouseTaskService.cs
View File

@@ -2,10 +2,13 @@
using Ewide.Core; using Ewide.Core;
using Ewide.Core.Extension; using Ewide.Core.Extension;
using Furion.DatabaseAccessor; using Furion.DatabaseAccessor;
using Furion.DatabaseAccessor.Extensions;
using Furion.DependencyInjection; using Furion.DependencyInjection;
using Furion.DynamicApiController; using Furion.DynamicApiController;
using Furion.FriendlyException; using Furion.FriendlyException;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
using Microsoft.EntityFrameworkCore;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
@@ -22,12 +25,14 @@ namespace Ewide.Application.Service
public class HouseTaskService : IHouseTaskService, IDynamicApiController, ITransient public class HouseTaskService : IHouseTaskService, IDynamicApiController, ITransient
{ {
private readonly IRepository<BsHouseTask> _houseTaskRep; private readonly IRepository<BsHouseTask> _houseTaskRep;
private readonly IRepository<BsHouseInfo> _houseInfoRep;
private readonly IDapperRepository _dapperRepository; private readonly IDapperRepository _dapperRepository;
private readonly IUserManager _userManager; private readonly IUserManager _userManager;
public HouseTaskService(IRepository<BsHouseTask> HouseTaskRep, IDapperRepository dapperRepository, IUserManager userManager) public HouseTaskService(IRepository<BsHouseTask> HouseTaskRep, IRepository<BsHouseInfo> HouseInfoRep, IDapperRepository dapperRepository, IUserManager userManager)
{ {
_houseTaskRep = HouseTaskRep; _houseTaskRep = HouseTaskRep;
_houseInfoRep = HouseInfoRep;
_dapperRepository = dapperRepository; _dapperRepository = dapperRepository;
_userManager = userManager; _userManager = userManager;
} }
@@ -50,5 +55,27 @@ WHERE T.UserID=@UserID";
return await _dapperRepository.QueryPageDataDynamic(sql, input, param, filterFields: new string[] { "Type", "Address", "HouseCode" }); 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);
}
}
} }
} }