yuangb/jinko.yikatong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix werk显示

Browse Source
This commit is contained in:
liguoyang
2024-09-25 21:36:52 +08:00
parent 57c1fd5a76
commit 1c2b19225c
3 changed files with 1 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Src/Dlhis.Canteen/MealSupplementRecord/Services/Implements/MealSupplementRecordService.cs
View File

@@ -58,7 +58,7 @@ public class MealSupplementRecordService : IMealSupplementRecordService
DepartmentNo = SqlFunc.IIF(SqlFunc.IsNullOrEmpty(ga.DepartmentNo), gaLeave.DepartmentNo, ga.DepartmentNo),
Factory = x.Factory,
CreateTime = x.CreateTime,
Werks = ga.Werks
Werks = SqlFunc.IIF(SqlFunc.IsNullOrEmpty(ga.Werks), gaLeave.Werks, ga.Werks)
})
.ToPageListAsync(request);

22
Src/Dlhis.Visitor/Appointment/Response/AppointmentPageResponse.cs
View File

@@ -1,22 +0,0 @@
namespace Dlhis.Visitor.Appointment.Response;
public class AppointmentPageResponse
{
public string FlowId { get; set; }
public string Title { get; set; }
public string Code { get; set; }
public string Name { get; set; }
public string Description { get; set; }
public string DepartmentNo { get; set; }
public string DepartmentName { get; set; }
public string Company { get; set; }
public DateTime ApplyTime { get; set; }
}

129
Src/Dlhis.Visitor/Appointment/Services/Implements/AppointmentService.cs
View File

@@ -1,129 +0,0 @@
// using Dlhis.Entity.Basic.Entity;
// using Dlhis.Entity.Device.Entities;
// using Dlhis.Entity.Device.Enums;
// using Dlhis.Entity.Visitor.Entity;
// using Dlhis.Entity.Visitor.Enums;
// using Dlhis.Visitor.Appointment.Request;
// using Dlhis.Visitor.Appointment.Response;
// using Kurisu.AspNetCore.CustomClass;
// using Kurisu.AspNetCore.DataAccess.Dto;
// using Kurisu.AspNetCore.DataAccess.SqlSugar.Extensions;
// using Kurisu.AspNetCore.DataAccess.SqlSugar.Services;
// using Kurisu.AspNetCore.Utils.Extensions;
// using Microsoft.AspNetCore.DataProtection;
// using Microsoft.AspNetCore.Mvc;
// using SqlSugar;
//
// namespace Dlhis.Visitor.Appointment.Services.Implements;
//
// public class AppointmentService : IAppointmentService
// {
// private readonly IDbContext _dbContext;
// private readonly IDataProtectionProvider _dataProtectionProvider;
//
// public AppointmentService(IDbContext dbContext, IDataProtectionProvider dataProtectionProvider)
// {
// _dbContext = dbContext;
// _dataProtectionProvider = dataProtectionProvider;
// }
//
// public async Task<Pagination<AppointmentPageResponse>> GetPageAsync(AppointmentPageRequest request)
// {
// return await _dbContext.Queryable<VisitorAppointmentEntity>()
// .WhereIF(request.SearchDateTimePeriod?.Start.HasValue == true && request.SearchDateTimePeriod?.End.HasValue == true,
// x => x.ApplyTime >= request.SearchDateTimePeriod.Start && x.ApplyTime <= request.SearchDateTimePeriod.End)
// .WhereIF(request.Search.IsPresent(), x => x.Code == request.Search || x.Name == request.Search)
// .Select<AppointmentPageResponse>()
// .ToPageListAsync(request);
// }
//
// public async Task<List<AppointmentDetailResponse>> GetAppointmentDetailsByIdAsync(long id)
// {
// return await _dbContext.Queryable<VisitorAppointmentDetailEntity>()
// .Where(x => x.AppointmentId == id)
// .Select<AppointmentDetailResponse>()
// .ToListAsync();
// }
//
// public async Task ConfirmAsync(AppointmentConfirmRequest request)
// {
// var detail = await _dbContext.Queryable<VisitorAppointmentDetailEntity>().Where(x => x.Id == request.Id).SingleAsync();
// detail.ThrowIfNull("预约信息不存在");
//
// var mst = await _dbContext.Queryable<VisitorAppointmentEntity>().Where(x => x.Id == detail.AppointmentId).SingleAsync();
//
// //当前分配的设备codes
// var deviceCodes = await _dbContext.Queryable<AppointmentAreaAssignmentEntity>()
// .Where(x => x.CustomCode == mst.AreaCustomCode)
// .Select(x => x.DeviceCode)
// .ToListAsync();
//
// var deviceUniqueNos = await _dbContext.Queryable<DeviceEntity>().Where(x => deviceCodes.Contains(x.Code)).Select(x => x.UniqueNo).ToListAsync();
//
// var userNo = detail.IsExternal
// ? await _dbContext.Queryable<GainfoExternalEntity>().Where(x => x.IdNo == detail.IdNo).Select(x => x.No).FirstAsync()
// : await _dbContext.Queryable<GainfoEntity>().Where(x => x.IdNo == detail.IdNo).Select(x => x.No).FirstAsync();
//
// await _dbContext.InsertAsync(deviceUniqueNos.Select(x => new DeviceTaskEntity
// {
// CancellationId = 0,
// DeviceType = DeviceTypeEnumType.Door,
// DeviceUniqueNo = x,
// Status = DeviceTaskStatusEnumType.Wait,
// UserNo = userNo,
// Type = DeviceTaskEnumType.Add,
// Priority = 100,
// Source = DeviceTaskSourceEnumType.Appointment,
// Version = 0
// }).ToList());
//
// detail.Status = AppointmentDetailEnumType.Arrived;
// await _dbContext.UpdateAsync(detail);
// }
//
//
// //********************************************************** 用户操作 *******************************************************************
//
// public async Task<AppointmentDetailResponse> GetTodayByIdNoAsync(string idNo)
// {
// var protector = _dataProtectionProvider.CreateProtector("gainfo:external:idno");
// try
// {
// idNo = protector.Unprotect(idNo);
// }
// catch (Exception)
// {
// throw new UserFriendlyException("凭证有误");
// }
//
// var detail = await _dbContext.Queryable<VisitorAppointmentDetailEntity>()
// .Where(x => x.IdNo == idNo)
// .Where(x => SqlFunc.DateIsSame(x.Start, DateTime.Today, DateType.Day))
// .OrderBy(x => x.Start)
// .Select<AppointmentDetailResponse>()
// .FirstAsync();
//
// return detail;
// }
//
// public async Task<Pagination<AppointmentDetailResponse>> GetRecordPageByIdNoAsync([FromQuery] AppointmentIdNoPageRequest request)
// {
// var protector = _dataProtectionProvider.CreateProtector("gainfo:external:idno");
// try
// {
// request.IdNo = protector.Unprotect(request.IdNo);
// }
// catch (Exception)
// {
// throw new UserFriendlyException("凭证有误");
// }
//
// var page = await _dbContext.Queryable<VisitorAppointmentDetailEntity>()
// .Where(x => x.IdNo == request.IdNo)
// .OrderBy(x => x.Start)
// .Select<AppointmentDetailResponse>()
// .ToPageListAsync(request);
//
// return page;
// }
// }