|
@@ -385,10 +385,15 @@ public class IndustryApplication : IIndustryApplication, IScopeDependency
|
|
|
public ISugarQueryable<VolunteerReportItemsOutDto> GetVolunteerReportItems(VolunteerReportItemsInDto dto)
|
|
|
{
|
|
|
var query = _volunteerReportRepository.Queryable()
|
|
|
+ .LeftJoin<SystemDicData>((volunteer, dic) => volunteer.JobType == dic.Id)
|
|
|
.WhereIF(dto.Name.NotNullOrEmpty(), m => m.Name.Contains(dto.Name))
|
|
|
.WhereIF(dto.PhoneNumber.NotNullOrEmpty(), m => m.PhoneNumber.Contains(dto.PhoneNumber))
|
|
|
.OrderByDescending(m => m.CreationTime)
|
|
|
- .Select<VolunteerReportItemsOutDto>();
|
|
|
+ .Select((volunteer, dic) => new VolunteerReportItemsOutDto
|
|
|
+ {
|
|
|
+ JobType = dic.DicDataName,
|
|
|
+ FullAddress = volunteer.Address + volunteer.FullAddress
|
|
|
+ }, true);
|
|
|
return query;
|
|
|
}
|
|
|
|