XCKJ
/
irc-netcore-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of http://192.168.1.2:8033/IRaCIS_Core_Api

Uat_Study
hang 2022-03-29 14:48:44 +08:00
parent c46ba88d30 4c7fad02b2
commit ab1250a987
4 changed files with 34 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
IRaCIS.Core.Application/Service/Common/FrontAuditConfigService.cs
View File

@ -67,6 +67,7 @@ namespace IRaCIS.Core.Application.Service
OptTypeValue = leftOptTypeId.Value, OptTypeValue = leftOptTypeId.Value,
OptTypeValueCN = leftOptTypeId.ValueCN, OptTypeValueCN = leftOptTypeId.ValueCN,
UpdateUserId = data.UpdateUserId, UpdateUserId = data.UpdateUserId,
ValueCN = data.ValueCN, ValueCN = data.ValueCN,
ChildrenTypeValue = leftchildrenType.Value, ChildrenTypeValue = leftchildrenType.Value,
}; };

2
IRaCIS.Core.Application/Service/Inspection/DTO/InspectionModel.cs
View File

@ -183,7 +183,7 @@ namespace IRaCIS.Core.Application.Service.Inspection.DTO
/// <summary> /// <summary>
/// 子类 /// 子类
/// </summary> /// </summary>
public string ChildrenType { get; set; } public string ChildrenType { get; set; } = string.Empty;
/// <summary> /// <summary>
/// 修改原因 /// 修改原因

2
IRaCIS.Core.Application/Service/Inspection/InspectionService.cs
View File

@ -70,7 +70,7 @@ namespace IRaCIS.Core.Application.Service.Inspection
query = query.WhereIf(!dto.BlindName.IsNullOrEmpty(), x => x.BlindName == dto.BlindName) query = query.WhereIf(!dto.BlindName.IsNullOrEmpty(), x => x.BlindName == dto.BlindName)
.WhereIf(dto.IsSign != null, x => x.IsSign == dto.IsSign) .WhereIf(dto.IsSign != null, x => x.IsSign == dto.IsSign)
.WhereIf(dto.ChildrenType != null, x => x.ChildrenType == dto.ChildrenType) .WhereIf(!dto.ChildrenType.IsNullOrEmpty(), x => x.ChildrenType == dto.ChildrenType)
.WhereIf(!dto.ModuleType.IsNullOrEmpty(), x => x.ModuleType == dto.ModuleType) .WhereIf(!dto.ModuleType.IsNullOrEmpty(), x => x.ModuleType == dto.ModuleType)
.WhereIf(!dto.OptType.IsNullOrEmpty(), x => x.OptType == dto.OptType) .WhereIf(!dto.OptType.IsNullOrEmpty(), x => x.OptType == dto.OptType)
.WhereIf(!dto.Reason.IsNullOrEmpty(), x => x.Reason == dto.Reason) .WhereIf(!dto.Reason.IsNullOrEmpty(), x => x.Reason == dto.Reason)

31
IRaCIS.Core.Application/Service/Inspection/_MapConfig.cs Normal file
View File

@ -0,0 +1,31 @@
using AutoMapper;
using AutoMapper.EquivalencyExpression;
using IRaCIS.Application.Contracts;
using IRaCIS.Core.Application.Contracts;
using IRaCIS.Core.Application.Contracts.DTO;
using IRaCIS.Core.Application.Service.Inspection.DTO;
using IRaCIS.Core.Application.ViewModel;
using IRaCIS.Core.Domain.Models;
using IRaCIS.Core.Domain.Share;
namespace IRaCIS.Core.Application.Service
{
public class InspectionConfig : Profile
{
public InspectionConfig()
{
CreateMap<DataInspectionAddDTO, DataInspection>();
}
}
}