diff --git a/EOM.TSHotelManager.Application/Business/Cash/CashService.cs b/EOM.TSHotelManager.Application/Business/Cash/CashService.cs
index bff8f9d997922027a2f8e0251dbc4ae608c95751..53bd6f90d68181590bdb1c32f3269f6c53a64765 100644
--- a/EOM.TSHotelManager.Application/Business/Cash/CashService.cs
+++ b/EOM.TSHotelManager.Application/Business/Cash/CashService.cs
@@ -89,7 +89,7 @@ namespace EOM.TSHotelManager.Application
cs.ForEach(source =>
{
var dept = depts.FirstOrDefault(a => a.dept_no.Equals(source.CashClub));
- source.DeptName = dept == null ? "" : dept.dept_name;
+ source.DeptName = dept == null? "" : dept.dept_name;
var worker = workers.FirstOrDefault(a => a.WorkerId.Equals(source.CashPerson));
source.PersonName = worker == null ? "" : worker.WorkerName;
diff --git a/EOM.TSHotelManager.Application/Business/Customer/CustoService.cs b/EOM.TSHotelManager.Application/Business/Customer/CustoService.cs
index 88a4ecb3a776f195a5e01f0f23d199099d67e0f4..3faa40bd0f7298131b25769a4699176d065bb0f3 100644
--- a/EOM.TSHotelManager.Application/Business/Customer/CustoService.cs
+++ b/EOM.TSHotelManager.Application/Business/Customer/CustoService.cs
@@ -96,8 +96,8 @@ namespace EOM.TSHotelManager.Application
///
public bool InsertCustomerInfo(Custo custo)
{
- string? NewID = encrypt.Encryption(custo.CustoID,EncryptionLevel.Enhanced);
- string? NewTel = encrypt.Encryption(custo.CustoTel, EncryptionLevel.Enhanced);
+ string NewID = encrypt.Encryption(custo.CustoID,EncryptionLevel.Enhanced);
+ string NewTel = encrypt.Encryption(custo.CustoTel, EncryptionLevel.Enhanced);
custo.CustoID = NewID;
custo.CustoTel = NewTel;
return custoRepository.Insert(custo);
@@ -111,8 +111,8 @@ namespace EOM.TSHotelManager.Application
///
public bool UpdCustomerInfoByCustoNo(Custo custo)
{
- string? NewID = encrypt.Encryption(custo.CustoID);
- string? NewTel = encrypt.Encryption(custo.CustoTel);
+ string NewID = encrypt.Encryption(custo.CustoID);
+ string NewTel = encrypt.Encryption(custo.CustoTel);
custo.CustoID = NewID;
custo.CustoTel = NewTel;
return custoRepository.Update(a => new Custo()
@@ -136,7 +136,7 @@ namespace EOM.TSHotelManager.Application
///
///
///
- public bool UpdCustomerTypeByCustoNo(string? custoNo,int userType)
+ public bool UpdCustomerTypeByCustoNo(string custoNo,int userType)
{
return custoRepository.Update(a => new Custo()
{
@@ -176,7 +176,7 @@ namespace EOM.TSHotelManager.Application
/// 查询所有客户信息
///
///
- public OSelectCustoAllDto SelectCustoAll(SelectCustoAll selectCustoAll)
+ public OSelectCustoAllDto SelectCustoAll(int? pageIndex,int? pageSize)
{
OSelectCustoAllDto oSelectCustoAllDto = new OSelectCustoAllDto();
@@ -192,35 +192,38 @@ namespace EOM.TSHotelManager.Application
//查询出所有客户信息
List custos = new List();
- var where = Expressionable.Create();
+ //var where = Expressionable.Create();
- where = where.And(a => a.delete_mk != 1);
+ //where = where.And(a => a.delete_mk != 1);
- if (!selectCustoAll.CustoNo.IsNullOrEmpty())
- {
- where = where.And(a => a.CustoNo.Contains(selectCustoAll.CustoNo));
- }
- if (!selectCustoAll.CustoName.IsNullOrEmpty())
- {
- where = where.And(a => a.CustoName.Contains(selectCustoAll.CustoName));
- }
- if (!selectCustoAll.delete_mk.IsNullOrEmpty())
- {
- where = where.And(a => a.delete_mk == selectCustoAll.delete_mk);
- }
+ //if (!selectCustoAll.CustoNo.IsNullOrEmpty())
+ //{
+ // where = where.And(a => a.CustoNo.Contains(selectCustoAll.CustoNo));
+ //}
+ //if (!selectCustoAll.CustoName.IsNullOrEmpty())
+ //{
+ // where = where.And(a => a.CustoName.Contains(selectCustoAll.CustoName));
+ //}
+ //if (!selectCustoAll.delete_mk.IsNullOrEmpty())
+ //{
+ // where = where.And(a => a.delete_mk == selectCustoAll.delete_mk);
+ //}
var count = 0;
- if (!selectCustoAll.pageIndex.IsNullOrEmpty() && !selectCustoAll.pageSize.IsNullOrEmpty())
+
+ if (!pageIndex.IsNullOrEmpty() && !pageSize.IsNullOrEmpty())
{
- custos = custoRepository.GetPageList(where.ToExpression(),
- new PageModel { TotalCount = count, PageIndex = (int)selectCustoAll.pageIndex - 1, PageSize = (int)selectCustoAll.pageSize });
- count = custoRepository.Count(where.ToExpression());
+ custos = custoRepository.AsQueryable().ToPageList((int)pageIndex, (int)pageSize, ref count);
}
else
{
- custos = custoRepository.GetList(where.ToExpression()).OrderByDescending(a => a.datains_date).ToList();
- count = custos.Count();
+ custos = custoRepository.AsQueryable().ToList();
}
+ //else
+ //{
+ // custos = custoRepository.GetList(where.ToExpression());
+ // count = custos.Count();
+ //}
custos.ForEach(source =>
{
@@ -298,7 +301,7 @@ namespace EOM.TSHotelManager.Application
///
///
///
- public Custo SelectCardInfoByCustoNo(string? CustoNo)
+ public Custo SelectCardInfoByCustoNo(string CustoNo)
{
Custo c = custoRepository.GetSingle(a => a.CustoNo.Contains(CustoNo));
if (c.IsNullOrEmpty())
diff --git a/EOM.TSHotelManager.Application/Business/Customer/ICustoService.cs b/EOM.TSHotelManager.Application/Business/Customer/ICustoService.cs
index 75b95ec271dcfbed31a56d22e8d7ff90ee08c5f1..e288f3e314985101da716480fbcd67e33a644b27 100644
--- a/EOM.TSHotelManager.Application/Business/Customer/ICustoService.cs
+++ b/EOM.TSHotelManager.Application/Business/Customer/ICustoService.cs
@@ -51,7 +51,7 @@ namespace EOM.TSHotelManager.Application
///
///
///
- bool UpdCustomerTypeByCustoNo(string? custoNo, int userType);
+ bool UpdCustomerTypeByCustoNo(string custoNo, int userType);
///
/// 查询酒店盈利情况
@@ -63,7 +63,7 @@ namespace EOM.TSHotelManager.Application
/// 查询所有客户信息
///
///
- OSelectCustoAllDto SelectCustoAll(SelectCustoAll selectCustoAll);
+ OSelectCustoAllDto SelectCustoAll(int? pageIndex, int? pageSize);
///
/// 查询指定客户信息
@@ -76,7 +76,7 @@ namespace EOM.TSHotelManager.Application
///
///
///
- Custo SelectCardInfoByCustoNo(string? CustoNo);
+ Custo SelectCardInfoByCustoNo(string CustoNo);
}
}
\ No newline at end of file
diff --git a/EOM.TSHotelManager.Application/Business/Customer/SelectCustoAll.cs b/EOM.TSHotelManager.Application/Business/Customer/SelectCustoAll.cs
index 35e3dee746429e04190324f1f6c3d71bba2ce742..d5ec9e67bf531ad694bd156d1da5fd32b82293d2 100644
--- a/EOM.TSHotelManager.Application/Business/Customer/SelectCustoAll.cs
+++ b/EOM.TSHotelManager.Application/Business/Customer/SelectCustoAll.cs
@@ -29,25 +29,13 @@ namespace EOM.TSHotelManager.Application
///
public class SelectCustoAll
{
- ///
- /// 删除标记
- ///
- public int? delete_mk { get; set; }
- ///
- /// 用户编号
- ///
- public string? CustoNo { get; set; }
- ///
- /// 用户名字
- ///
- public string? CustoName { get; set; }
///
/// 当前页数
///
- public int? pageIndex { get; set; }
+ public int pageIndex { get; set; }
///
/// 当前页总数
///
- public int? pageSize { get; set; }
+ public int pageSize { get; set; }
}
}
\ No newline at end of file
diff --git a/EOM.TSHotelManager.Application/Business/Reser/IReserService.cs b/EOM.TSHotelManager.Application/Business/Reser/IReserService.cs
index 16293c34e9cf142c1ee7b9ff4ed9840d468781a1..e86bee9fc78bf561c1cc2c5bd2cd5d038adb6a79 100644
--- a/EOM.TSHotelManager.Application/Business/Reser/IReserService.cs
+++ b/EOM.TSHotelManager.Application/Business/Reser/IReserService.cs
@@ -43,7 +43,7 @@ namespace EOM.TSHotelManager.Application
///
///
///
- Reser SelectReserInfoByRoomNo(string? no);
+ Reser SelectReserInfoByRoomNo(string no);
///
/// 删除预约信息
diff --git a/EOM.TSHotelManager.Application/Business/Reser/ReserService.cs b/EOM.TSHotelManager.Application/Business/Reser/ReserService.cs
index a005a6ac5032ee11ca8ef77b3b11c2b9990164b2..f64f765c70479b1f1d3989e23a5ab87bbe7239fc 100644
--- a/EOM.TSHotelManager.Application/Business/Reser/ReserService.cs
+++ b/EOM.TSHotelManager.Application/Business/Reser/ReserService.cs
@@ -77,7 +77,7 @@ namespace EOM.TSHotelManager.Application
///
///
///
- public Reser SelectReserInfoByRoomNo(string? no)
+ public Reser SelectReserInfoByRoomNo(string no)
{
Reser res = null;
res = reserRepository.GetSingle(a => a.ReserRoom == no && a.delete_mk != 1);
diff --git a/EOM.TSHotelManager.Application/Business/Room/IRoomService.cs b/EOM.TSHotelManager.Application/Business/Room/IRoomService.cs
index a9552969d594db4ecdc3b8bdda9ec737cdadc679..027cd1661f3f69a685a7fc8f720a78474ea72629 100644
--- a/EOM.TSHotelManager.Application/Business/Room/IRoomService.cs
+++ b/EOM.TSHotelManager.Application/Business/Room/IRoomService.cs
@@ -61,7 +61,7 @@ namespace EOM.TSHotelManager.Application
/// 获取房间分区的信息
///
///
- List SelectRoomByTypeName(string? TypeName);
+ List SelectRoomByTypeName(string TypeName);
#endregion
#region 根据房间编号查询房间信息
@@ -70,7 +70,7 @@ namespace EOM.TSHotelManager.Application
///
///
///
- Room SelectRoomByRoomNo(string? no);
+ Room SelectRoomByRoomNo(string no);
#endregion
#region 根据房间编号退房(退房)
@@ -79,7 +79,7 @@ namespace EOM.TSHotelManager.Application
///
///
///
- bool UpdateRoomByRoomNo(string? room);
+ bool UpdateRoomByRoomNo(string room);
#endregion
#region 根据房间编号查询截止到今天住了多少天
@@ -88,7 +88,7 @@ namespace EOM.TSHotelManager.Application
///
///
///
- object DayByRoomNo(string? roomno);
+ object DayByRoomNo(string roomno);
#endregion
#region 根据房间编号修改房间信息(入住)
@@ -130,7 +130,7 @@ namespace EOM.TSHotelManager.Application
/// 根据房间编号查询房间价格
///
///
- object SelectRoomByRoomPrice(string? r);
+ object SelectRoomByRoomPrice(string r);
#endregion
#region 查询脏房数量
@@ -164,7 +164,7 @@ namespace EOM.TSHotelManager.Application
///
///
///
- bool UpdateRoomStateByRoomNo(string? roomno, int stateid);
+ bool UpdateRoomStateByRoomNo(string roomno, int stateid);
#endregion
#region 添加房间
@@ -198,7 +198,7 @@ namespace EOM.TSHotelManager.Application
///
///
///
- object SelectRoomStateIdByRoomNo(string? roomno);
+ object SelectRoomStateIdByRoomNo(string roomno);
#endregion
}
}
\ No newline at end of file
diff --git a/EOM.TSHotelManager.Application/Business/Room/IRoomTypeService.cs b/EOM.TSHotelManager.Application/Business/Room/IRoomTypeService.cs
index 2a446bcf24f94d6a1e1093aafe67d53b7c3ab7d5..e213798bfe0dc26ae274c4aae30d9b36ce942857 100644
--- a/EOM.TSHotelManager.Application/Business/Room/IRoomTypeService.cs
+++ b/EOM.TSHotelManager.Application/Business/Room/IRoomTypeService.cs
@@ -42,6 +42,6 @@ namespace EOM.TSHotelManager.Application
///
///
///
- RoomType SelectRoomTypeByRoomNo(string? no);
+ RoomType SelectRoomTypeByRoomNo(string no);
}
}
\ No newline at end of file
diff --git a/EOM.TSHotelManager.Application/Business/Room/RoomService.cs b/EOM.TSHotelManager.Application/Business/Room/RoomService.cs
index d9965f45a9a458828fe18506bc55104a040009f5..cc4699189c61d5ace8378b3b522df32da353f278 100644
--- a/EOM.TSHotelManager.Application/Business/Room/RoomService.cs
+++ b/EOM.TSHotelManager.Application/Business/Room/RoomService.cs
@@ -159,7 +159,7 @@ namespace EOM.TSHotelManager.Application
/// 获取房间分区的信息
///
///
- public List SelectRoomByTypeName(string? TypeName)
+ public List SelectRoomByTypeName(string TypeName)
{
List roomStates = new List();
roomStates = roomStateRepository.GetList(a => a.delete_mk != 1);
@@ -192,7 +192,7 @@ namespace EOM.TSHotelManager.Application
///
///
///
- public Room SelectRoomByRoomNo(string? no)
+ public Room SelectRoomByRoomNo(string no)
{
List roomStates = new List();
roomStates = roomStateRepository.GetList(a => a.delete_mk != 1);
@@ -210,7 +210,7 @@ namespace EOM.TSHotelManager.Application
///
///
///
- public bool UpdateRoomByRoomNo(string? room)
+ public bool UpdateRoomByRoomNo(string room)
{
return roomRepository.Update(a => new Room()
{
@@ -228,7 +228,7 @@ namespace EOM.TSHotelManager.Application
///
///
///
- public object DayByRoomNo(string? roomno)
+ public object DayByRoomNo(string roomno)
{
return Math.Abs(((TimeSpan)(roomRepository.GetSingle(a => a.RoomNo == roomno).CheckTime - DateTime.Now)).Days);
}
@@ -295,7 +295,7 @@ namespace EOM.TSHotelManager.Application
/// 根据房间编号查询房间价格
///
///
- public object SelectRoomByRoomPrice(string? r)
+ public object SelectRoomByRoomPrice(string r)
{
return roomRepository.GetSingle(a => a.RoomNo == r).RoomMoney;
}
@@ -341,7 +341,7 @@ namespace EOM.TSHotelManager.Application
///
///
///
- public bool UpdateRoomStateByRoomNo(string? roomno, int stateid)
+ public bool UpdateRoomStateByRoomNo(string roomno, int stateid)
{
return roomRepository.Update(a => new Room()
{
@@ -414,7 +414,7 @@ namespace EOM.TSHotelManager.Application
///
///
///
- public object SelectRoomStateIdByRoomNo(string? roomno)
+ public object SelectRoomStateIdByRoomNo(string roomno)
{
return roomRepository.GetSingle(a => a.RoomNo == roomno).RoomStateId;
}
diff --git a/EOM.TSHotelManager.Application/Business/Room/RoomTypeService.cs b/EOM.TSHotelManager.Application/Business/Room/RoomTypeService.cs
index a250587bd39ad4d91adc62e8a9a2e3bbd114b1f8..04f4daaa01e29012f17ffb91565385f2d048c8b2 100644
--- a/EOM.TSHotelManager.Application/Business/Room/RoomTypeService.cs
+++ b/EOM.TSHotelManager.Application/Business/Room/RoomTypeService.cs
@@ -72,7 +72,7 @@ namespace EOM.TSHotelManager.Application
///
///
///
- public RoomType SelectRoomTypeByRoomNo(string? no)
+ public RoomType SelectRoomTypeByRoomNo(string no)
{
RoomType roomtype = new RoomType();
Room room = new Room();
diff --git a/EOM.TSHotelManager.Application/Business/Sellthing/ISellService.cs b/EOM.TSHotelManager.Application/Business/Sellthing/ISellService.cs
index 4bc21c90a8608b3fbc8504add29357b1de5767f5..3315fcee8e8909830b80f5121bc8129206caac43 100644
--- a/EOM.TSHotelManager.Application/Business/Sellthing/ISellService.cs
+++ b/EOM.TSHotelManager.Application/Business/Sellthing/ISellService.cs
@@ -44,7 +44,7 @@ namespace EOM.TSHotelManager.Application
///
///
///
- bool UpdateSellThing(string? stock, string? sellNo);
+ bool UpdateSellThing(string stock, string sellNo);
///
/// 修改商品信息
@@ -60,14 +60,14 @@ namespace EOM.TSHotelManager.Application
///
///
///
- bool DeleteSellThing(string? roomNo, string? custoNo, string? sellName);
+ bool DeleteSellThing(string roomNo, string custoNo, string sellName);
///
/// 根据商品编号删除商品信息
///
///
///
- bool DeleteSellThingBySellNo(string? sellNo);
+ bool DeleteSellThingBySellNo(string sellNo);
///
/// 根据商品名称和价格查询商品编号
@@ -75,7 +75,7 @@ namespace EOM.TSHotelManager.Application
///
///
///
- SellThing SelectSellThingByNameAndPrice(string? name, string? price);
+ SellThing SelectSellThingByNameAndPrice(string name, string price);
///
@@ -83,7 +83,7 @@ namespace EOM.TSHotelManager.Application
///
///
///
- SellThing SelectSellInfoBySellNo(string? SellNo);
+ SellThing SelectSellInfoBySellNo(string SellNo);
#region 添加商品
///
diff --git a/EOM.TSHotelManager.Application/Business/Sellthing/SellService.cs b/EOM.TSHotelManager.Application/Business/Sellthing/SellService.cs
index 39fc493db0c93693fdbace1170dc51c5b301b11c..e7844ee0f0d11f72d52c806aff06a7b17de60204 100644
--- a/EOM.TSHotelManager.Application/Business/Sellthing/SellService.cs
+++ b/EOM.TSHotelManager.Application/Business/Sellthing/SellService.cs
@@ -99,7 +99,7 @@ namespace EOM.TSHotelManager.Application
///
///
///
- public bool UpdateSellThing(string? stock, string? sellNo)
+ public bool UpdateSellThing(string stock, string sellNo)
{
return sellThingRepository.Update(a => new SellThing()
{
@@ -132,7 +132,7 @@ namespace EOM.TSHotelManager.Application
///
///
///
- public bool DeleteSellThing(string? roomNo, string? custoNo, string? sellName)
+ public bool DeleteSellThing(string roomNo, string custoNo, string sellName)
{
return spendRepository.Update(a => new Spend()
{
@@ -149,7 +149,7 @@ namespace EOM.TSHotelManager.Application
///
///
///
- public bool DeleteSellThingBySellNo(string? sellNo)
+ public bool DeleteSellThingBySellNo(string sellNo)
{
return sellThingRepository.Update(a => new SellThing()
{
@@ -165,7 +165,7 @@ namespace EOM.TSHotelManager.Application
///
///
///
- public SellThing SelectSellThingByNameAndPrice(string? name,string? price)
+ public SellThing SelectSellThingByNameAndPrice(string name,string price)
{
SellThing sellThing = null;
sellThing = sellThingRepository.GetSingle(a => a.SellName == name && a.SellPrice == Convert.ToDecimal(price));
@@ -178,7 +178,7 @@ namespace EOM.TSHotelManager.Application
///
///
///
- public SellThing SelectSellInfoBySellNo(string? SellNo)
+ public SellThing SelectSellInfoBySellNo(string SellNo)
{
SellThing st = null;
st = sellThingRepository.GetSingle(a => a.SellNo == SellNo && a.delete_mk != 1);
diff --git a/EOM.TSHotelManager.Application/Business/Spend/ISpendService.cs b/EOM.TSHotelManager.Application/Business/Spend/ISpendService.cs
index 7152fc8e98c6d69f435ecdea5d3a83c8cc3c1342..c5dc29bc5767c1103fa1e787e4c22c35d21d0536 100644
--- a/EOM.TSHotelManager.Application/Business/Spend/ISpendService.cs
+++ b/EOM.TSHotelManager.Application/Business/Spend/ISpendService.cs
@@ -47,7 +47,7 @@ namespace EOM.TSHotelManager.Application
///
///
///
- List SelectSpendByCustoNo(string? No);
+ List SelectSpendByCustoNo(string No);
#endregion
#region 根据房间编号查询消费信息
@@ -56,7 +56,7 @@ namespace EOM.TSHotelManager.Application
///
///
///
- List SelectSpendByRoomNo(string? No);
+ List SelectSpendByRoomNo(string No);
#endregion
#region 根据客户编号查询历史消费信息
@@ -65,7 +65,7 @@ namespace EOM.TSHotelManager.Application
///
///
///
- List SeletHistorySpendInfoAll(string? custoNo);
+ List SeletHistorySpendInfoAll(string custoNo);
#endregion
#region 查询消费的所有信息
@@ -81,7 +81,7 @@ namespace EOM.TSHotelManager.Application
/// 根据房间号查询消费的所有信息
///
///
- List SelectSpendInfoRoomNo(string? RoomNo);
+ List SelectSpendInfoRoomNo(string RoomNo);
#endregion
#region 根据房间编号、入住时间到当前时间查询消费总金额
@@ -91,7 +91,7 @@ namespace EOM.TSHotelManager.Application
///
///
///
- object SelectMoneyByRoomNoAndTime(string? roomno, string? custono);
+ object SelectMoneyByRoomNoAndTime(string roomno, string custono);
#endregion
#region 根据房间编号、入住时间和当前时间修改结算状态
@@ -101,7 +101,7 @@ namespace EOM.TSHotelManager.Application
///
///
///
- bool UpdateMoneyState(string? roomno, string? checktime);
+ bool UpdateMoneyState(string roomno, string checktime);
#endregion
#region 将转房前的未结算记录一同转移到新房间
diff --git a/EOM.TSHotelManager.Application/Business/Spend/SpendService.cs b/EOM.TSHotelManager.Application/Business/Spend/SpendService.cs
index fc92da3258e93fd8bee06725f9052bbf15866319..75cd2d7e1608e683569a66fb5e165842f7b2a75a 100644
--- a/EOM.TSHotelManager.Application/Business/Spend/SpendService.cs
+++ b/EOM.TSHotelManager.Application/Business/Spend/SpendService.cs
@@ -66,7 +66,7 @@ namespace EOM.TSHotelManager.Application
///
///
///
- public List SelectSpendByCustoNo(string? No)
+ public List SelectSpendByCustoNo(string No)
{
List ls = new List();
ls = spendRepository.GetList(a => a.CustoNo == No && a.MoneyState.Equals(SpendConsts.UnSettle) && a.delete_mk != 1);
@@ -91,7 +91,7 @@ namespace EOM.TSHotelManager.Application
///
///
///
- public List SeletHistorySpendInfoAll(string? custoNo)
+ public List SeletHistorySpendInfoAll(string custoNo)
{
List ls = new List();
ls = spendRepository.GetList(a => a.CustoNo == custoNo && a.MoneyState.Equals(SpendConsts.Settled) && a.delete_mk != 1);
@@ -116,7 +116,7 @@ namespace EOM.TSHotelManager.Application
///
///
///
- public List SelectSpendByRoomNo(string? No)
+ public List SelectSpendByRoomNo(string No)
{
List ls = new List();
ls = spendRepository.GetList(a => a.RoomNo == No && a.MoneyState.Equals(SpendConsts.UnSettle) && a.delete_mk != 1);
@@ -164,7 +164,7 @@ namespace EOM.TSHotelManager.Application
/// 根据房间号查询消费的所有信息
///
///
- public List SelectSpendInfoRoomNo(string? RoomNo)
+ public List SelectSpendInfoRoomNo(string RoomNo)
{
List ls = new List();
ls = spendRepository.GetList(a => a.RoomNo == RoomNo && a.delete_mk != 1 && a.MoneyState.Equals(SpendConsts.UnSettle));
@@ -190,7 +190,7 @@ namespace EOM.TSHotelManager.Application
///
///
///
- public object SelectMoneyByRoomNoAndTime(string? roomno,string? custono)
+ public object SelectMoneyByRoomNoAndTime(string roomno,string custono)
{
return spendRepository.GetList(a => a.RoomNo == roomno && a.CustoNo == custono && a.MoneyState.Equals(SpendConsts.UnSettle)).Sum(a => a.SpendMoney);
}
@@ -203,7 +203,7 @@ namespace EOM.TSHotelManager.Application
///
///
///
- public bool UpdateMoneyState(string? roomno, string? checktime)
+ public bool UpdateMoneyState(string roomno, string checktime)
{
return spendRepository.Update(a => new Spend()
{
diff --git a/EOM.TSHotelManager.Application/Business/Wti/IWtiService.cs b/EOM.TSHotelManager.Application/Business/Wti/IWtiService.cs
index c1bdcc9015402d451a32ffd3b252fb02cfb9021e..3f4950081c2aaa5eb04c3aff7934c66025ef2558 100644
--- a/EOM.TSHotelManager.Application/Business/Wti/IWtiService.cs
+++ b/EOM.TSHotelManager.Application/Business/Wti/IWtiService.cs
@@ -37,7 +37,7 @@ namespace EOM.TSHotelManager.Application
///
///
///
- Wti SelectWtiInfoByRoomNo(string? roomNo);
+ Wti SelectWtiInfoByRoomNo(string roomNo);
#endregion
#region 根据房间编号、使用时间查询水电费信息
@@ -48,7 +48,7 @@ namespace EOM.TSHotelManager.Application
///
///
///
- Wti SelectWtiInfoByRoomNoAndTime(string? roomno, string? usedate, string? enddate);
+ Wti SelectWtiInfoByRoomNoAndTime(string roomno, string usedate, string enddate);
#endregion
#region 获取所有水电费信息
@@ -92,7 +92,7 @@ namespace EOM.TSHotelManager.Application
///
///
///
- //bool DeleteWtiInfo(string? roomno);
+ //bool DeleteWtiInfo(string roomno);
#endregion
#region 根据房间编号、使用时间删除水电费信息
@@ -103,7 +103,7 @@ namespace EOM.TSHotelManager.Application
///
///
///
- bool DeleteWtiInfoByRoomNoAndDateTime(string? roomno, string? usedate, string? enddate);
+ bool DeleteWtiInfoByRoomNoAndDateTime(string roomno, string usedate, string enddate);
#endregion
#region 根据房间编号获取该房间所有水电费信息
@@ -111,7 +111,7 @@ namespace EOM.TSHotelManager.Application
/// 获取所有水电费信息
///
///
- List ListWtiInfoByRoomNo(string? roomno);
+ List ListWtiInfoByRoomNo(string roomno);
#endregion
}
}
\ No newline at end of file
diff --git a/EOM.TSHotelManager.Application/Business/Wti/WtiService.cs b/EOM.TSHotelManager.Application/Business/Wti/WtiService.cs
index 0e4d6262c745ec8f092c5927ff0f67d7c09fc374..0761ddb6e9b6c26fb66d27274d9e8019370fb1b3 100644
--- a/EOM.TSHotelManager.Application/Business/Wti/WtiService.cs
+++ b/EOM.TSHotelManager.Application/Business/Wti/WtiService.cs
@@ -53,7 +53,7 @@ namespace EOM.TSHotelManager.Application
///
///
///
- public Wti SelectWtiInfoByRoomNo(string? roomNo)
+ public Wti SelectWtiInfoByRoomNo(string roomNo)
{
Wti w = new Wti();
w = wtiRepository.GetSingle(a => a.RoomNo.Contains(roomNo) && a.delete_mk != 1);
@@ -69,7 +69,7 @@ namespace EOM.TSHotelManager.Application
///
///
///
- public Wti SelectWtiInfoByRoomNoAndTime(string? roomno, string? usedate, string? enddate)
+ public Wti SelectWtiInfoByRoomNoAndTime(string roomno, string usedate, string enddate)
{
Wti w = null;
w = wtiRepository.GetSingle(a => a.RoomNo == roomno && a.UseDate >= Convert.ToDateTime(usedate) && a.EndDate >= Convert.ToDateTime(enddate));
@@ -95,7 +95,7 @@ namespace EOM.TSHotelManager.Application
/// 获取所有水电费信息
///
///
- public List ListWtiInfoByRoomNo(string? roomno)
+ public List ListWtiInfoByRoomNo(string roomno)
{
List wti = new List();
wti = wtiRepository.GetList(a => a.delete_mk != 1 && a.RoomNo.Equals(roomno));
@@ -163,7 +163,7 @@ namespace EOM.TSHotelManager.Application
///
///
///
- //public bool DeleteWtiInfo(string? roomno)
+ //public bool DeleteWtiInfo(string roomno)
//{
// return base.Update(a => new Wti()
// {
@@ -182,10 +182,10 @@ namespace EOM.TSHotelManager.Application
///
///
///
- public bool DeleteWtiInfoByRoomNoAndDateTime(string? roomno, string? usedate, string? enddate)
+ public bool DeleteWtiInfoByRoomNoAndDateTime(string roomno, string usedate, string enddate)
{
- //string? sql = "delete from WTINFO where RoomNo='{0}' and UseDate='{1}' and EndDate='{2}'";
- //sql = string?.Format(sql, roomno, usedate, enddate);
+ //string sql = "delete from WTINFO where RoomNo='{0}' and UseDate='{1}' and EndDate='{2}'";
+ //sql = string.Format(sql, roomno, usedate, enddate);
return wtiRepository.Update(a => new Wti()
{
delete_mk = 1,
diff --git a/EOM.TSHotelManager.Application/EOM.TSHotelManager.Application.csproj b/EOM.TSHotelManager.Application/EOM.TSHotelManager.Application.csproj
index 8449846e34a3301e068a29e28f48aea4f85ec9b9..5ced6c2aa73cde0dc71bba070c5aac933adf57e8 100644
--- a/EOM.TSHotelManager.Application/EOM.TSHotelManager.Application.csproj
+++ b/EOM.TSHotelManager.Application/EOM.TSHotelManager.Application.csproj
@@ -3,7 +3,7 @@
net6.0
enable
- enable
+ disable
True
diff --git a/EOM.TSHotelManager.Application/Worker/Check/IWorkerCheckService.cs b/EOM.TSHotelManager.Application/Worker/Check/IWorkerCheckService.cs
index 98fe435745ae60bce79427387ca013c35ca77ba0..d069bfca300b4a03511a67badfa303400284c515 100644
--- a/EOM.TSHotelManager.Application/Worker/Check/IWorkerCheckService.cs
+++ b/EOM.TSHotelManager.Application/Worker/Check/IWorkerCheckService.cs
@@ -36,21 +36,21 @@ namespace EOM.TSHotelManager.Application
///
///
///
- List SelectCheckInfoByWorkerNo(string? wid);
+ List SelectCheckInfoByWorkerNo(string wid);
///
/// 查询员工签到天数
///
///
///
- object SelectWorkerCheckDaySumByWorkerNo(string? wkn);
+ object SelectWorkerCheckDaySumByWorkerNo(string wkn);
///
/// 查询今天员工是否已签到
///
///
///
- object SelectToDayCheckInfoByWorkerNo(string? wkn);
+ object SelectToDayCheckInfoByWorkerNo(string wkn);
///
/// 添加员工打卡数据
diff --git a/EOM.TSHotelManager.Application/Worker/Check/WorkerCheckService.cs b/EOM.TSHotelManager.Application/Worker/Check/WorkerCheckService.cs
index 71d980c1ca8e9d26d0087f03dab5d081c2df10c1..25b1261da1333bee814a76f1b9614542e078a1cc 100644
--- a/EOM.TSHotelManager.Application/Worker/Check/WorkerCheckService.cs
+++ b/EOM.TSHotelManager.Application/Worker/Check/WorkerCheckService.cs
@@ -53,7 +53,7 @@ namespace EOM.TSHotelManager.Application
///
///
///
- public List SelectCheckInfoByWorkerNo(string? wid)
+ public List SelectCheckInfoByWorkerNo(string wid)
{
List workerChecks = new List();
workerChecks = workerCheckRepository.GetList(a => a.WorkerNo == wid && a.delete_mk != 1);
@@ -70,7 +70,7 @@ namespace EOM.TSHotelManager.Application
///
///
///
- public object SelectWorkerCheckDaySumByWorkerNo(string? wkn)
+ public object SelectWorkerCheckDaySumByWorkerNo(string wkn)
{
return workerCheckRepository.GetList(a => a.WorkerNo == wkn && a.delete_mk != 1).Count;
}
@@ -81,9 +81,9 @@ namespace EOM.TSHotelManager.Application
///
///
///
- public object SelectToDayCheckInfoByWorkerNo(string? wkn)
+ public object SelectToDayCheckInfoByWorkerNo(string wkn)
{
- //string? sql = "select Count(*) from WORKERCHECK where WorkerNo = '"+wkn+ "' and DATEDIFF(CURRENT_DATE(),workercheck.CheckTime)";
+ //string sql = "select Count(*) from WORKERCHECK where WorkerNo = '"+wkn+ "' and DATEDIFF(CURRENT_DATE(),workercheck.CheckTime)";
var listCheckInfo = workerCheckRepository.GetList(a => a.WorkerNo == wkn && a.delete_mk != 1);
var count = listCheckInfo.Where(a => a.CheckTime.ToShortDateString() == DateTime.Now.ToShortDateString()).Count() > 0 ? 1 : 0;
return count;
diff --git a/EOM.TSHotelManager.Application/Worker/GoodBad/IWorkerGoodBadService.cs b/EOM.TSHotelManager.Application/Worker/GoodBad/IWorkerGoodBadService.cs
index 1bfd29c137edf9d18e0a28bdae12e20518732c26..59c4cfa4006dee0335eb037de5a8a77815fa0b20 100644
--- a/EOM.TSHotelManager.Application/Worker/GoodBad/IWorkerGoodBadService.cs
+++ b/EOM.TSHotelManager.Application/Worker/GoodBad/IWorkerGoodBadService.cs
@@ -43,6 +43,6 @@ namespace EOM.TSHotelManager.Application
///
///
///
- List SelectAllGoodBadByWorkNo(string? wn);
+ List SelectAllGoodBadByWorkNo(string wn);
}
}
\ No newline at end of file
diff --git a/EOM.TSHotelManager.Application/Worker/GoodBad/WorkerGoodBadService.cs b/EOM.TSHotelManager.Application/Worker/GoodBad/WorkerGoodBadService.cs
index ad5a1b5fd54e77f0df2a497bf460e0a7440fcfce..8eb38b04524bebeff4cdffa0cbe39271ace5aa1b 100644
--- a/EOM.TSHotelManager.Application/Worker/GoodBad/WorkerGoodBadService.cs
+++ b/EOM.TSHotelManager.Application/Worker/GoodBad/WorkerGoodBadService.cs
@@ -79,7 +79,7 @@ namespace EOM.TSHotelManager.Application
///
///
///
- public List SelectAllGoodBadByWorkNo(string? wn)
+ public List SelectAllGoodBadByWorkNo(string wn)
{
//查询所有超级管理员
List admins = new List();
diff --git a/EOM.TSHotelManager.Application/Worker/History/IWorkerHistoryService.cs b/EOM.TSHotelManager.Application/Worker/History/IWorkerHistoryService.cs
index 66cbb498b9f27da5e0095364ac72eeb9314c374f..a8c53fb6936ea5e76d98659a4848a7f964059854 100644
--- a/EOM.TSHotelManager.Application/Worker/History/IWorkerHistoryService.cs
+++ b/EOM.TSHotelManager.Application/Worker/History/IWorkerHistoryService.cs
@@ -43,6 +43,6 @@ namespace EOM.TSHotelManager.Application
///
///
///
- List SelectHistoryByWorkerId(string? wid);
+ List SelectHistoryByWorkerId(string wid);
}
}
\ No newline at end of file
diff --git a/EOM.TSHotelManager.Application/Worker/History/WorkerHistoryService.cs b/EOM.TSHotelManager.Application/Worker/History/WorkerHistoryService.cs
index 438f15317881d55e485d712a854ba53ac14ff552..9cc0b982f6ebe6264c1e2bafd9b4bfd2b2dd1e12 100644
--- a/EOM.TSHotelManager.Application/Worker/History/WorkerHistoryService.cs
+++ b/EOM.TSHotelManager.Application/Worker/History/WorkerHistoryService.cs
@@ -62,7 +62,7 @@ namespace EOM.TSHotelManager.Application
///
///
///
- public List SelectHistoryByWorkerId(string? wid)
+ public List SelectHistoryByWorkerId(string wid)
{
List why = new List();
why = workerHistoryRepository.GetList(a => a.delete_mk != 1 && a.WorkerId == wid);
diff --git a/EOM.TSHotelManager.Application/Worker/IWorkerService.cs b/EOM.TSHotelManager.Application/Worker/IWorkerService.cs
index 8c005d7a85c356f7940ac6ba0fb89bec8e9b2fd3..5f2fe7aa1d5b4ac0c18e7d68a2e48ea223e304c5 100644
--- a/EOM.TSHotelManager.Application/Worker/IWorkerService.cs
+++ b/EOM.TSHotelManager.Application/Worker/IWorkerService.cs
@@ -78,7 +78,7 @@ namespace EOM.TSHotelManager.Application
///
///
///
- Worker SelectWorkerInfoByWorkerId(string? workerId);
+ Worker SelectWorkerInfoByWorkerId(string workerId);
#endregion
#region 根据登录名称、密码查询员工信息
diff --git a/EOM.TSHotelManager.Application/Worker/Picture/WorkerPicService.cs b/EOM.TSHotelManager.Application/Worker/Picture/WorkerPicService.cs
index ae42b8b095aec90a87830371fe7f9fe5ac148d05..2303649edec2f1fde04bf0a84031ec889f125803 100644
--- a/EOM.TSHotelManager.Application/Worker/Picture/WorkerPicService.cs
+++ b/EOM.TSHotelManager.Application/Worker/Picture/WorkerPicService.cs
@@ -48,7 +48,7 @@ namespace EOM.TSHotelManager.Application
workerPicSource = workerPicRepository.GetSingle(a => a.WorkerId.Equals(workerPic.WorkerId));
- //workerPicSource.Pic = workerPicSource == null || string.IsNullOrEmpty(workerPicSource.Pic) ? "" : workerPicSource.Pic;
+ //workerPicSource.Pic = workerPicSource == null || string.IsNullOrEmpty(workerPicSource.Pic) "" : workerPicSource.Pic;
return workerPicSource;
}
diff --git a/EOM.TSHotelManager.Application/Worker/WorkerService.cs b/EOM.TSHotelManager.Application/Worker/WorkerService.cs
index bb9d724c3434885e61f39d92ec4d1137b7c89a5b..2b937b9a94833eeb4001f2eda3f0e4dd3b04d332 100644
--- a/EOM.TSHotelManager.Application/Worker/WorkerService.cs
+++ b/EOM.TSHotelManager.Application/Worker/WorkerService.cs
@@ -169,8 +169,8 @@ namespace EOM.TSHotelManager.Application
///
public bool AddWorker(Worker worker)
{
- string? NewID = encrypt.Encryption(worker.CardId);
- string? NewTel = encrypt.Encryption(worker.WorkerTel);
+ string NewID = encrypt.Encryption(worker.CardId);
+ string NewTel = encrypt.Encryption(worker.WorkerTel);
worker.CardId = NewID;
worker.WorkerTel = NewTel;
return workerRepository.Insert(worker);
@@ -237,7 +237,7 @@ namespace EOM.TSHotelManager.Application
///
///
///
- public Worker SelectWorkerInfoByWorkerId(string? workerId)
+ public Worker SelectWorkerInfoByWorkerId(string workerId)
{
Worker w = new Worker();
w = workerRepository.GetSingle(a => a.WorkerId == workerId);
@@ -317,7 +317,7 @@ namespace EOM.TSHotelManager.Application
///
public bool UpdWorkerPwdByWorkNo(Worker worker)
{
- string? NewPwd = encrypt.Decryption(worker.WorkerPwd);
+ string NewPwd = encrypt.Decryption(worker.WorkerPwd);
return workerRepository.Update(a => new Worker()
{
WorkerPwd = NewPwd,
diff --git a/EOM.TSHotelManager.Application/Zero/Admin/AdminService.cs b/EOM.TSHotelManager.Application/Zero/Admin/AdminService.cs
index b3df4ecf7ab31e990290bf6231f5b278711c19fa..5958033317cc6203678c9ac1e093e421ce28e252 100644
--- a/EOM.TSHotelManager.Application/Zero/Admin/AdminService.cs
+++ b/EOM.TSHotelManager.Application/Zero/Admin/AdminService.cs
@@ -105,11 +105,11 @@ namespace EOM.TSHotelManager.Application
///
///
///
- public Admin SelectAdminPwdByAccount(string? account)
+ public Admin SelectAdminPwdByAccount(string account)
{
Admin admin = new Admin();
admin = adminRepository.GetSingle(a => a.AdminAccount == account);
- //admin.AdminPassword = admin.AdminPassword.Contains(":") ? encrypt.DeEncryptStr(admin.AdminPassword) : admin.AdminPassword;
+ //admin.AdminPassword = admin.AdminPassword.Contains(":") encrypt.DeEncryptStr(admin.AdminPassword) : admin.AdminPassword;
return admin;
}
#endregion
diff --git a/EOM.TSHotelManager.Application/Zero/Admin/IAdminService.cs b/EOM.TSHotelManager.Application/Zero/Admin/IAdminService.cs
index f4319f3429a009880bc3895624a7977057cbc3dc..c407cdca77ee4ef2f97122bc70a1eb1cb06074cc 100644
--- a/EOM.TSHotelManager.Application/Zero/Admin/IAdminService.cs
+++ b/EOM.TSHotelManager.Application/Zero/Admin/IAdminService.cs
@@ -47,7 +47,7 @@ namespace EOM.TSHotelManager.Application
///
///
///
- Admin SelectAdminPwdByAccount(string? account);
+ Admin SelectAdminPwdByAccount(string account);
#endregion
///
diff --git a/EOM.TSHotelManager.Application/Zero/Notice/NoticeService.cs b/EOM.TSHotelManager.Application/Zero/Notice/NoticeService.cs
index 279c1af713eba846985fd6657f93687b12e59e6a..6384c60ad86523e6223d6c120fdc57f446f6a003 100644
--- a/EOM.TSHotelManager.Application/Zero/Notice/NoticeService.cs
+++ b/EOM.TSHotelManager.Application/Zero/Notice/NoticeService.cs
@@ -77,7 +77,7 @@ namespace EOM.TSHotelManager.Application
///
///
///
- public Notice SelectNoticeByNoticeNo(string? noticeId)
+ public Notice SelectNoticeByNoticeNo(string noticeId)
{
Notice notice = new Notice();
notice = noticeRepository.GetSingle(a => a.NoticeNo == noticeId);
diff --git a/EOM.TSHotelManager.Core/Business/Cash/Cash.cs b/EOM.TSHotelManager.Core/Business/Cash/Cash.cs
index e1b9919013a663e1f98b40d7069ac7254d954a8c..e80a4e97354f2126e65e06f1c8f6f62ba733755f 100644
--- a/EOM.TSHotelManager.Core/Business/Cash/Cash.cs
+++ b/EOM.TSHotelManager.Core/Business/Cash/Cash.cs
@@ -34,11 +34,11 @@ namespace EOM.TSHotelManager.Core
///
/// 资产编号
///
- public string? CashNo { get; set; }
+ public string CashNo { get; set; }
///
/// 资产名称
///
- public string? CashName { get; set; }
+ public string CashName { get; set; }
///
/// 资产总值
///
@@ -47,33 +47,33 @@ namespace EOM.TSHotelManager.Core
/// 资产总值描述
///
[SqlSugar.SugarColumn(IsIgnore = true)]
- public string? CashPriceStr { get; set; }
+ public string CashPriceStr { get; set; }
///
/// 所属部门
///
- public string? CashClub { get; set; }
+ public string CashClub { get; set; }
///
/// 所属部门描述
///
[SqlSugar.SugarColumn(IsIgnore = true)]
- public string? DeptName { get; set; }
+ public string DeptName { get; set; }
///
/// 入库时间
///
- public DateTime? CashTime { get; set; }
+ public DateTime CashTime { get; set; }
///
/// 资产来源
///
- public string? CashSource { get; set; }
+ public string CashSource { get; set; }
///
/// 资产经办人
///
- public string? CashPerson { get; set; }
+ public string CashPerson { get; set; }
///
/// 资产经办人
///
[SqlSugar.SugarColumn(IsIgnore = true)]
- public string? PersonName { get; set; }
+ public string PersonName { get; set; }
///
/// 删除标记
///
@@ -81,19 +81,19 @@ namespace EOM.TSHotelManager.Core
///
/// 资料创建人
///
- public string? datains_usr { get; set; }
+ public string datains_usr { get; set; }
///
/// 资料创建时间
///
- public DateTime? datains_date { get; set; }
+ public DateTime datains_date { get; set; }
///
/// 资料更新人
///
- public string? datachg_usr { get; set; }
+ public string datachg_usr { get; set; }
///
/// 资料更新时间
///
- public DateTime? datachg_date { get; set; }
+ public DateTime datachg_date { get; set; }
}
}
diff --git a/EOM.TSHotelManager.Core/Business/Customer/Custo.cs b/EOM.TSHotelManager.Core/Business/Customer/Custo.cs
index f2105eb1be3dc66d7fe169278813536267357e9f..da572f164f1c520214be41264e871315bf6e0b51 100644
--- a/EOM.TSHotelManager.Core/Business/Customer/Custo.cs
+++ b/EOM.TSHotelManager.Core/Business/Customer/Custo.cs
@@ -41,12 +41,12 @@ namespace EOM.TSHotelManager.Core
/// 客户编号
///
[SqlSugar.SugarColumn(ColumnName = "custo_no", IsPrimaryKey = true)]
- public string? CustoNo { get; set; }
+ public string CustoNo { get; set; }
///
/// 客户名称
///
[SqlSugar.SugarColumn(ColumnName = "custo_name", IsNullable = false)]
- public string? CustoName { get; set; }
+ public string CustoName { get; set; }
///
/// 客户性别
///
@@ -56,7 +56,7 @@ namespace EOM.TSHotelManager.Core
/// 客户电话
///
[SqlSugar.SugarColumn(ColumnName = "custo_tel", IsNullable = false)]
- public string? CustoTel { get; set; }
+ public string CustoTel { get; set; }
///
/// 证件类型
///
@@ -66,17 +66,17 @@ namespace EOM.TSHotelManager.Core
/// 证件号码
///
[SqlSugar.SugarColumn(ColumnName = "passport_id", IsNullable = false)]
- public string? CustoID { get; set; }
+ public string CustoID { get; set; }
///
/// 居住地址
///
[SqlSugar.SugarColumn(ColumnName = "custo_address", IsNullable = true)]
- public string? CustoAdress { get; set; }
+ public string CustoAdress { get; set; }
///
/// 出生日期
///
[SqlSugar.SugarColumn(ColumnName = "custo_birth", IsNullable = true)]
- public DateTime? CustoBirth { get; set; }
+ public DateTime CustoBirth { get; set; }
///
/// 客户类型
///
@@ -86,17 +86,17 @@ namespace EOM.TSHotelManager.Core
/// 客户类型
///
[SqlSugar.SugarColumn(IsIgnore = true)]
- public string? typeName { get; set; }
+ public string typeName { get; set; }
///
/// 证件类型
///
[SqlSugar.SugarColumn(IsIgnore = true)]
- public string? PassportName { get; set; }
+ public string PassportName { get; set; }
///
/// 性别
///
[SqlSugar.SugarColumn(IsIgnore = true)]
- public string? SexName { get; set; }
+ public string SexName { get; set; }
///
/// 删除标记
///
@@ -104,19 +104,19 @@ namespace EOM.TSHotelManager.Core
///
/// 资料创建人
///
- public string? datains_usr { get; set; }
+ public string datains_usr { get; set; }
///
/// 资料创建时间
///
- public DateTime? datains_date { get; set; }
+ public DateTime datains_date { get; set; }
///
/// 资料更新人
///
- public string? datachg_usr { get; set; }
+ public string datachg_usr { get; set; }
///
/// 资料更新时间
///
- public DateTime? datachg_date { get; set; }
+ public DateTime datachg_date { get; set; }
}
}
diff --git a/EOM.TSHotelManager.Core/Business/Customer/CustoSpend.cs b/EOM.TSHotelManager.Core/Business/Customer/CustoSpend.cs
index 8ec8bcfa8a2be3c4f452dd64ed1b7eae62dc6d19..4ab87e0c3d9d6daf75ce9f6d9c56d23f5941c3b4 100644
--- a/EOM.TSHotelManager.Core/Business/Customer/CustoSpend.cs
+++ b/EOM.TSHotelManager.Core/Business/Customer/CustoSpend.cs
@@ -32,7 +32,7 @@ namespace EOM.TSHotelManager.Core
///
/// 年
///
- public string? Years { get; set; }
+ public string Years { get; set; }
///
/// 总金额
///
diff --git a/EOM.TSHotelManager.Core/Business/Customer/CustoType.cs b/EOM.TSHotelManager.Core/Business/Customer/CustoType.cs
index d1b5de1db9c153ec28d52f3c1e266fa03264dbc3..e73385d54e4cd60de5bb88ff94f29f85b07c32f8 100644
--- a/EOM.TSHotelManager.Core/Business/Customer/CustoType.cs
+++ b/EOM.TSHotelManager.Core/Business/Customer/CustoType.cs
@@ -39,7 +39,7 @@ namespace EOM.TSHotelManager.Core
///
/// 类型名字
///
- public string? TypeName { get; set; }
+ public string TypeName { get; set; }
///
/// 删除标记
///
@@ -47,18 +47,18 @@ namespace EOM.TSHotelManager.Core
///
/// 资料创建人
///
- public string? datains_usr { get; set; }
+ public string datains_usr { get; set; }
///
/// 资料创建时间
///
- public DateTime? datains_date { get; set; }
+ public DateTime datains_date { get; set; }
///
/// 资料更新人
///
- public string? datachg_usr { get; set; }
+ public string datachg_usr { get; set; }
///
/// 资料更新时间
///
- public DateTime? datachg_date { get; set; }
+ public DateTime datachg_date { get; set; }
}
}
diff --git a/EOM.TSHotelManager.Core/Business/Customer/PassPortType.cs b/EOM.TSHotelManager.Core/Business/Customer/PassPortType.cs
index f9760dc8a79b1e81898f30fdd9e056c3e8461c29..bf6aec2d7d09893da709133376cd60f292794e1a 100644
--- a/EOM.TSHotelManager.Core/Business/Customer/PassPortType.cs
+++ b/EOM.TSHotelManager.Core/Business/Customer/PassPortType.cs
@@ -44,7 +44,7 @@ namespace EOM.TSHotelManager.Core
///
/// 证件名称
///
- public string? PassportName { get; set; }
+ public string PassportName { get; set; }
///
/// 删除标记
///
@@ -52,18 +52,18 @@ namespace EOM.TSHotelManager.Core
///
/// 资料创建人
///
- public string? datains_usr { get; set; }
+ public string datains_usr { get; set; }
///
/// 资料创建时间
///
- public DateTime? datains_date { get; set; }
+ public DateTime datains_date { get; set; }
///
/// 资料更新人
///
- public string? datachg_usr { get; set; }
+ public string datachg_usr { get; set; }
///
/// 资料更新时间
///
- public DateTime? datachg_date { get; set; }
+ public DateTime datachg_date { get; set; }
}
}
diff --git a/EOM.TSHotelManager.Core/Business/Customer/SexType.cs b/EOM.TSHotelManager.Core/Business/Customer/SexType.cs
index 69ae8d78104e759b450c08380023262a097a0936..4cea876087a58063043e2f743e13be6f4b2e0c27 100644
--- a/EOM.TSHotelManager.Core/Business/Customer/SexType.cs
+++ b/EOM.TSHotelManager.Core/Business/Customer/SexType.cs
@@ -44,7 +44,7 @@ namespace EOM.TSHotelManager.Core
///
/// 性别名称
///
- public string? sexName { get; set; }
+ public string sexName { get; set; }
///
/// 删除标记
@@ -53,18 +53,18 @@ namespace EOM.TSHotelManager.Core
///
/// 资料创建人
///
- public string? datains_usr { get; set; }
+ public string datains_usr { get; set; }
///
/// 资料创建时间
///
- public DateTime? datains_date { get; set; }
+ public DateTime datains_date { get; set; }
///
/// 资料更新人
///
- public string? datachg_usr { get; set; }
+ public string datachg_usr { get; set; }
///
/// 资料更新时间
///
- public DateTime? datachg_date { get; set; }
+ public DateTime datachg_date { get; set; }
}
}
diff --git a/EOM.TSHotelManager.Core/Business/Fonts/Fonts.cs b/EOM.TSHotelManager.Core/Business/Fonts/Fonts.cs
index 04909a73640a0e4ee821d8598b27a99ae92d36a9..055c616a16d237d872ac14d31a79809978f211e1 100644
--- a/EOM.TSHotelManager.Core/Business/Fonts/Fonts.cs
+++ b/EOM.TSHotelManager.Core/Business/Fonts/Fonts.cs
@@ -38,6 +38,6 @@ namespace EOM.TSHotelManager.Core
///
/// 宣传内容
///
- public string? FontsMess { get; set; }
+ public string FontsMess { get; set; }
}
}
diff --git a/EOM.TSHotelManager.Core/Business/Reser/Reser.cs b/EOM.TSHotelManager.Core/Business/Reser/Reser.cs
index 55ef39f8e9d3cdeb6a00c434f1a83c9de73b7dc3..0a7ddf3c9bef383404ac3041f148a20a1c1086a2 100644
--- a/EOM.TSHotelManager.Core/Business/Reser/Reser.cs
+++ b/EOM.TSHotelManager.Core/Business/Reser/Reser.cs
@@ -35,31 +35,31 @@ namespace EOM.TSHotelManager.Core
///
/// 预约编号
///
- public string? ReserId { get; set; }
+ public string ReserId { get; set; }
///
/// 客户名称
///
- public string? CustoName { get; set; }
+ public string CustoName { get; set; }
///
/// 预约电话
///
- public string? CustoTel { get; set; }
+ public string CustoTel { get; set; }
///
/// 预约渠道
///
- public string? ReserWay { get; set; }
+ public string ReserWay { get; set; }
///
/// 预约房号
///
- public string? ReserRoom { get; set; }
+ public string ReserRoom { get; set; }
///
/// 预约起始
///
- public DateTime? ReserDate { get; set; }
+ public DateTime ReserDate { get; set; }
///
/// 预约止日
///
- public DateTime? ReserEndDay { get; set; }
+ public DateTime ReserEndDay { get; set; }
///
/// 删除标记
///
@@ -67,19 +67,19 @@ namespace EOM.TSHotelManager.Core
///
/// 资料创建人
///
- public string? datains_usr { get; set; }
+ public string datains_usr { get; set; }
///
/// 资料创建时间
///
- public DateTime? datains_date { get; set; }
+ public DateTime datains_date { get; set; }
///
/// 资料更新人
///
- public string? datachg_usr { get; set; }
+ public string datachg_usr { get; set; }
///
/// 资料更新时间
///
- public DateTime? datachg_date { get; set; }
+ public DateTime datachg_date { get; set; }
}
}
diff --git a/EOM.TSHotelManager.Core/Business/Room/Room.cs b/EOM.TSHotelManager.Core/Business/Room/Room.cs
index 5d1d9611a9176b95477d12f2876d22eaeab4af2e..7a69e13f293e8fad831be2a61288c7fe755fdb36 100644
--- a/EOM.TSHotelManager.Core/Business/Room/Room.cs
+++ b/EOM.TSHotelManager.Core/Business/Room/Room.cs
@@ -37,7 +37,7 @@ namespace EOM.TSHotelManager.Core
/// 房间编号
///
[SqlSugar.SugarColumn(ColumnName = "room_no", IsPrimaryKey = true)]
- public string? RoomNo { get; set; }
+ public string RoomNo { get; set; }
///
/// 房间类型
///
@@ -47,12 +47,12 @@ namespace EOM.TSHotelManager.Core
/// 客户编号
///
[SqlSugar.SugarColumn(ColumnName = "custo_no")]
- public string? CustoNo { get; set; }
+ public string CustoNo { get; set; }
///
/// 客户姓名
///
[SqlSugar.SugarColumn(IsIgnore = true)]
- public string? CustoName { get; set; }
+ public string CustoName { get; set; }
///
/// 最后一次入住时间
///
@@ -62,7 +62,7 @@ namespace EOM.TSHotelManager.Core
/// 最后一次退房时间
///
[SqlSugar.SugarColumn(ColumnName = "check_out_time")]
- public DateTime? CheckOutTime { get; set; }
+ public DateTime CheckOutTime { get; set; }
///
/// 房间状态ID
///
@@ -72,7 +72,7 @@ namespace EOM.TSHotelManager.Core
/// 房间状态
///
[SqlSugar.SugarColumn(IsIgnore = true)]
- public string? RoomState { get; set; }
+ public string RoomState { get; set; }
///
/// 房间单价
///
@@ -87,22 +87,22 @@ namespace EOM.TSHotelManager.Core
/// 房间位置
///
[SqlSugar.SugarColumn(ColumnName = "room_position")]
- public string? RoomPosition { get; set; }
+ public string RoomPosition { get; set; }
///
/// 客户类型名称
///
[SqlSugar.SugarColumn(IsIgnore = true)]
- public string? typeName { get; set; }
+ public string typeName { get; set; }
///
/// 房间名称
///
[SqlSugar.SugarColumn(IsIgnore = true)]
- public string? RoomName { get; set; }
+ public string RoomName { get; set; }
///
/// 最后一次入住时间
///
[SqlSugar.SugarColumn(IsIgnore = true)]
- public string? CheckTimeFormat { get; set; }
+ public string CheckTimeFormat { get; set; }
///
/// 删除标记
///
@@ -110,19 +110,19 @@ namespace EOM.TSHotelManager.Core
///
/// 资料创建人
///
- public string? datains_usr { get; set; }
+ public string datains_usr { get; set; }
///
/// 资料创建时间
///
- public DateTime? datains_date { get; set; }
+ public DateTime datains_date { get; set; }
///
/// 资料更新人
///
- public string? datachg_usr { get; set; }
+ public string datachg_usr { get; set; }
///
/// 资料更新时间
///
- public DateTime? datachg_date { get; set; }
+ public DateTime datachg_date { get; set; }
}
}
diff --git a/EOM.TSHotelManager.Core/Business/Room/RoomState.cs b/EOM.TSHotelManager.Core/Business/Room/RoomState.cs
index 8b3d4152f8c1f13aa739e489b7bd2612b632b5a7..fd4465ad852c93e154d4577ddd0825b747df013e 100644
--- a/EOM.TSHotelManager.Core/Business/Room/RoomState.cs
+++ b/EOM.TSHotelManager.Core/Business/Room/RoomState.cs
@@ -40,7 +40,7 @@ namespace EOM.TSHotelManager.Core
/// 房间状态
///
[SqlSugar.SugarColumn(ColumnName = "RoomState")]
- public string? RoomStateName { get; set; }
+ public string RoomStateName { get; set; }
///
/// 删除标记
///
@@ -48,18 +48,18 @@ namespace EOM.TSHotelManager.Core
///
/// 资料创建人
///
- public string? datains_usr { get; set; }
+ public string datains_usr { get; set; }
///
/// 资料创建时间
///
- public DateTime? datains_date { get; set; }
+ public DateTime datains_date { get; set; }
///
/// 资料更新人
///
- public string? datachg_usr { get; set; }
+ public string datachg_usr { get; set; }
///
/// 资料更新时间
///
- public DateTime? datachg_date { get; set; }
+ public DateTime datachg_date { get; set; }
}
}
diff --git a/EOM.TSHotelManager.Core/Business/Room/RoomType.cs b/EOM.TSHotelManager.Core/Business/Room/RoomType.cs
index eb33ef6fd0ff782f971665765d0f9e0dc52f389e..af3355b6d2874833f9841aafdfa721054fc91551 100644
--- a/EOM.TSHotelManager.Core/Business/Room/RoomType.cs
+++ b/EOM.TSHotelManager.Core/Business/Room/RoomType.cs
@@ -40,7 +40,7 @@ namespace EOM.TSHotelManager.Core
///
/// 房间类型
///
- public string? RoomName { get; set; }
+ public string RoomName { get; set; }
///
/// 删除标记
@@ -49,18 +49,18 @@ namespace EOM.TSHotelManager.Core
///
/// 资料创建人
///
- public string? datains_usr { get; set; }
+ public string datains_usr { get; set; }
///
/// 资料创建时间
///
- public DateTime? datains_date { get; set; }
+ public DateTime datains_date { get; set; }
///
/// 资料更新人
///
- public string? datachg_usr { get; set; }
+ public string datachg_usr { get; set; }
///
/// 资料更新时间
///
- public DateTime? datachg_date { get; set; }
+ public DateTime datachg_date { get; set; }
}
}
diff --git a/EOM.TSHotelManager.Core/Business/Sellthing/SellThing.cs b/EOM.TSHotelManager.Core/Business/Sellthing/SellThing.cs
index 8b2c542b3088367123a58387dee1794618006075..2e277a102d4f01394897ef1616dd7bdc70281f07 100644
--- a/EOM.TSHotelManager.Core/Business/Sellthing/SellThing.cs
+++ b/EOM.TSHotelManager.Core/Business/Sellthing/SellThing.cs
@@ -36,11 +36,11 @@ namespace EOM.TSHotelManager.Core
///
/// 商品编号
///
- public string? SellNo { get; set; }
+ public string SellNo { get; set; }
///
/// 商品名称
///
- public string? SellName { get; set; }
+ public string SellName { get; set; }
///
/// 商品价格
///
@@ -49,11 +49,11 @@ namespace EOM.TSHotelManager.Core
/// 商品价格描述
///
[SqlSugar.SugarColumn(IsIgnore = true)]
- public string? SellPriceStr { get; set; }
+ public string SellPriceStr { get; set; }
///
/// 规格型号
///
- public string? format { get; set; }
+ public string format { get; set; }
///
/// 库存
///
@@ -65,18 +65,18 @@ namespace EOM.TSHotelManager.Core
///
/// 资料创建人
///
- public string? datains_usr { get; set; }
+ public string datains_usr { get; set; }
///
/// 资料创建时间
///
- public DateTime? datains_date { get; set; }
+ public DateTime datains_date { get; set; }
///
/// 资料更新人
///
- public string? datachg_usr { get; set; }
+ public string datachg_usr { get; set; }
///
/// 资料更新时间
///
- public DateTime? datachg_date { get; set; }
+ public DateTime datachg_date { get; set; }
}
}
diff --git a/EOM.TSHotelManager.Core/Business/Spend/Spend.cs b/EOM.TSHotelManager.Core/Business/Spend/Spend.cs
index 32279b94bb3b6ee3e033e9355a88b00527f2ec74..81f2de36bb49a40bb6b0ab1447e695df39164759 100644
--- a/EOM.TSHotelManager.Core/Business/Spend/Spend.cs
+++ b/EOM.TSHotelManager.Core/Business/Spend/Spend.cs
@@ -35,15 +35,15 @@ namespace EOM.TSHotelManager.Core
///
/// 房间编号
///
- public string? RoomNo { get; set; }
+ public string RoomNo { get; set; }
///
/// 客户编号
///
- public string? CustoNo { get; set; }
+ public string CustoNo { get; set; }
///
/// 商品名称
///
- public string? SpendName { get; set; }
+ public string SpendName { get; set; }
///
/// 消费数量
///
@@ -56,7 +56,7 @@ namespace EOM.TSHotelManager.Core
/// 商品单价描述
///
[SqlSugar.SugarColumn(IsIgnore = true)]
- public string? SpendPriceStr { get; set; }
+ public string SpendPriceStr { get; set; }
///
/// 消费金额
///
@@ -65,15 +65,15 @@ namespace EOM.TSHotelManager.Core
/// 消费金额描述
///
[SqlSugar.SugarColumn(IsIgnore = true)]
- public string? SpendMoneyStr { get; set; }
+ public string SpendMoneyStr { get; set; }
///
/// 消费时间
///
- public DateTime? SpendTime { get; set; }
+ public DateTime SpendTime { get; set; }
///
/// 结算状态
///
- public string? MoneyState { get; set; }
+ public string MoneyState { get; set; }
///
/// 删除标记
///
@@ -81,24 +81,24 @@ namespace EOM.TSHotelManager.Core
///
/// 资料创建人
///
- public string? datains_usr { get; set; }
+ public string datains_usr { get; set; }
///
/// 资料创建时间
///
- public DateTime? datains_date { get; set; }
+ public DateTime datains_date { get; set; }
///
/// 资料更新人
///
- public string? datachg_usr { get; set; }
+ public string datachg_usr { get; set; }
///
/// 资料更新时间
///
- public DateTime? datachg_date { get; set; }
+ public DateTime datachg_date { get; set; }
///
/// 结算状态描述
///
[SqlSugar.SugarColumn(IsIgnore = true)]
- public string? SpendStateNm { get; set; }
+ public string SpendStateNm { get; set; }
}
}
diff --git a/EOM.TSHotelManager.Core/Business/Spend/SpendConsts.cs b/EOM.TSHotelManager.Core/Business/Spend/SpendConsts.cs
index 4aba97b4c0d64ae43fb32861bf443ac7c2d4325d..ea924ccb8ee36a695956e0bc89723db36b6624c4 100644
--- a/EOM.TSHotelManager.Core/Business/Spend/SpendConsts.cs
+++ b/EOM.TSHotelManager.Core/Business/Spend/SpendConsts.cs
@@ -38,11 +38,11 @@ namespace EOM.TSHotelManager.Core
///
/// 已结算状态常量
///
- public const string? Settled = "Settled";
+ public const string Settled = "Settled";
///
/// 未结算状态常量
///
- public const string? UnSettle = "UnSettle";
+ public const string UnSettle = "UnSettle";
}
}
diff --git a/EOM.TSHotelManager.Core/Business/Wti/Wti.cs b/EOM.TSHotelManager.Core/Business/Wti/Wti.cs
index c0754fcd33c3cffaaf9c296e8d32caf280a779bc..53f8d8752b83fc13ebdf77389702dc5ca80b7472 100644
--- a/EOM.TSHotelManager.Core/Business/Wti/Wti.cs
+++ b/EOM.TSHotelManager.Core/Business/Wti/Wti.cs
@@ -41,17 +41,17 @@ namespace EOM.TSHotelManager.Core
/// 房间编号
///
[SqlSugar.SugarColumn(ColumnName = "RoomNo")]
- public string? RoomNo { get; set; }
+ public string RoomNo { get; set; }
///
/// 开始使用时间
///
[SqlSugar.SugarColumn(ColumnName = "UseDate")]
- public DateTime? UseDate { get; set; }
+ public DateTime UseDate { get; set; }
///
/// 结束使用时间
///
[SqlSugar.SugarColumn(ColumnName = "EndDate")]
- public DateTime? EndDate { get; set; }
+ public DateTime EndDate { get; set; }
///
/// 水费
///
@@ -66,12 +66,12 @@ namespace EOM.TSHotelManager.Core
/// 记录员
///
[SqlSugar.SugarColumn(ColumnName = "Record")]
- public string? Record { get; set; }
+ public string Record { get; set; }
///
/// 客户编号
///
[SqlSugar.SugarColumn(ColumnName = "CustoNo")]
- public string? CustoNo { get; set; }
+ public string CustoNo { get; set; }
///
/// 删除标记
///
@@ -80,19 +80,19 @@ namespace EOM.TSHotelManager.Core
///
/// 资料创建人
///
- public string? datains_usr { get; set; }
+ public string datains_usr { get; set; }
///
/// 资料创建时间
///
- public DateTime? datains_date { get; set; }
+ public DateTime datains_date { get; set; }
///
/// 资料更新人
///
- public string? datachg_usr { get; set; }
+ public string datachg_usr { get; set; }
///
/// 资料更新时间
///
- public DateTime? datachg_date { get; set; }
+ public DateTime datachg_date { get; set; }
}
diff --git a/EOM.TSHotelManager.Core/EOM.TSHotelManager.Core.csproj b/EOM.TSHotelManager.Core/EOM.TSHotelManager.Core.csproj
index 83fcd0668026fe3959a2369932d0da0dc6b42c43..663f63a1dd1a3dc5a8f6da9920997b847318e009 100644
--- a/EOM.TSHotelManager.Core/EOM.TSHotelManager.Core.csproj
+++ b/EOM.TSHotelManager.Core/EOM.TSHotelManager.Core.csproj
@@ -3,7 +3,7 @@
net6.0
enable
- enable
+ disable
True
diff --git a/EOM.TSHotelManager.Core/Sys/NavBar/NavBar.cs b/EOM.TSHotelManager.Core/Sys/NavBar/NavBar.cs
index 13f46f566701963d1a546c0d9615701c398a3a8d..e1c9097e184446020d484f65b5ffe4726bcaa810 100644
--- a/EOM.TSHotelManager.Core/Sys/NavBar/NavBar.cs
+++ b/EOM.TSHotelManager.Core/Sys/NavBar/NavBar.cs
@@ -20,7 +20,7 @@ namespace EOM.TSHotelManager.Core
///
/// 导航控件名称
///
- public string? nav_name { get; set; }
+ public string nav_name { get; set; }
///
/// 导航控件排序
///
@@ -28,11 +28,11 @@ namespace EOM.TSHotelManager.Core
///
/// 导航控件图片
///
- public string? nav_pic { get; set; }
+ public string nav_pic { get; set; }
///
/// 导航控件事件
///
- public string? nav_event { get; set; }
+ public string nav_event { get; set; }
///
/// 导航控件事件
///
@@ -44,18 +44,18 @@ namespace EOM.TSHotelManager.Core
///
/// 新增人
///
- public string? datains_usr { get; set; }
+ public string datains_usr { get; set; }
///
/// 新增时间
///
- public DateTime? datains_date { get; set; }
+ public DateTime datains_date { get; set; }
///
/// 修改人
///
- public string? datachg_usr { get; set; }
+ public string datachg_usr { get; set; }
///
/// 修改时间
///
- public DateTime? datachg_date { get; set; }
+ public DateTime datachg_date { get; set; }
}
}
diff --git a/EOM.TSHotelManager.Core/Util/ApplicationVersion.cs b/EOM.TSHotelManager.Core/Util/ApplicationVersion.cs
index 71c9f469e33b2bacfe8b25c64d6c34528e5e9673..7e50266d9560d343b416e423a1fa51ba4fd7023e 100644
--- a/EOM.TSHotelManager.Core/Util/ApplicationVersion.cs
+++ b/EOM.TSHotelManager.Core/Util/ApplicationVersion.cs
@@ -23,6 +23,6 @@ namespace EOM.TSHotelManager.Core
/// 版本号
///
[SugarColumn(ColumnName = "base_version")]//数据库是自增才配自增
- public string? base_version { get; set; }
+ public string base_version { get; set; }
}
}
diff --git a/EOM.TSHotelManager.Core/Util/OperationLog.cs b/EOM.TSHotelManager.Core/Util/OperationLog.cs
index 1e360c45223533962ef95ddd2e1efea13a6ac1d3..94169c7de9a0cb1183bf905a237867f181c06fb8 100644
--- a/EOM.TSHotelManager.Core/Util/OperationLog.cs
+++ b/EOM.TSHotelManager.Core/Util/OperationLog.cs
@@ -57,17 +57,17 @@ namespace EOM.TSHotelManager.Core
/// 操作时间
///
[SqlSugar.SugarColumn(ColumnName = "OperationTime")]
- public DateTime? OperationTime { get; set; }
+ public DateTime OperationTime { get; set; }
///
/// 操作信息
///
[SqlSugar.SugarColumn(ColumnName = "LogContent")]
- public string? LogContent { get; set; }
+ public string LogContent { get; set; }
///
/// 操作账号
///
[SqlSugar.SugarColumn(ColumnName = "OperationAccount")]
- public string? OperationAccount { get; set; }
+ public string OperationAccount { get; set; }
///
/// 日志等级
///
@@ -82,33 +82,33 @@ namespace EOM.TSHotelManager.Core
/// 软件版本
///
[SqlSugar.SugarColumn(ColumnName = "SoftwareVersion")]
- public string? SoftwareVersion { get; set; }
+ public string SoftwareVersion { get; set; }
///
/// 登录IP
///
[SqlSugar.SugarColumn(ColumnName = "login_ip")]
- public string? login_ip { get; set; }
+ public string login_ip { get; set; }
/// 资料创建人
///
- public string? datains_usr { get; set; }
+ public string datains_usr { get; set; }
///
/// 资料创建时间
///
- public DateTime? datains_date { get; set; }
+ public DateTime datains_date { get; set; }
///
/// 资料更新人
///
- public string? datachg_usr { get; set; }
+ public string datachg_usr { get; set; }
///
/// 资料更新时间
///
- public DateTime? datachg_date { get; set; }
+ public DateTime datachg_date { get; set; }
///
/// 日志等级
///
[SqlSugar.SugarColumn(IsIgnore = true)]
- public string? OperationLevelNm { get; set; }
+ public string OperationLevelNm { get; set; }
}
}
diff --git a/EOM.TSHotelManager.Core/Worker/GBType.cs b/EOM.TSHotelManager.Core/Worker/GBType.cs
index 32858c612168e346181f95fe2a3e71a86ead5d6e..46b00eb74e865d54e36e164ca75cb9b98053a59d 100644
--- a/EOM.TSHotelManager.Core/Worker/GBType.cs
+++ b/EOM.TSHotelManager.Core/Worker/GBType.cs
@@ -40,7 +40,7 @@ namespace EOM.TSHotelManager.Application
///
/// 奖惩名称
///
- public string? GBName { get; set; }
+ public string GBName { get; set; }
///
/// 删除标记
@@ -50,21 +50,21 @@ namespace EOM.TSHotelManager.Application
///
/// 资料新增人
///
- public string? datains_usr { get; set; }
+ public string datains_usr { get; set; }
///
/// 资料新增日期
///
- public DateTime? datains_date { get; set; }
+ public DateTime datains_date { get; set; }
///
/// 资料更新人
///
- public string? datachg_usr { get; set; }
+ public string datachg_usr { get; set; }
///
/// 资料更新日期
///
- public DateTime? datachg_date { get; set; }
+ public DateTime datachg_date { get; set; }
}
}
\ No newline at end of file
diff --git a/EOM.TSHotelManager.Core/Worker/Worker.cs b/EOM.TSHotelManager.Core/Worker/Worker.cs
index e517ad313b88870203875dcd79c9176bb320ce32..ac17c4eea85f5f6c54db04bffaecf21aa5fb275c 100644
--- a/EOM.TSHotelManager.Core/Worker/Worker.cs
+++ b/EOM.TSHotelManager.Core/Worker/Worker.cs
@@ -36,17 +36,17 @@ namespace EOM.TSHotelManager.Core
/// 员工账号/工号
///
[SqlSugar.SugarColumn(ColumnName = "WorkerId")]
- public string? WorkerId { get; set; }
+ public string WorkerId { get; set; }
///
/// 员工姓名
///
[SqlSugar.SugarColumn(ColumnName = "WorkerName")]
- public string? WorkerName { get; set; }
+ public string WorkerName { get; set; }
///
/// 出生日期
///
[SqlSugar.SugarColumn(ColumnName = "WorkerBirthday")]
- public DateTime? WorkerBirthday { get; set; }
+ public DateTime WorkerBirthday { get; set; }
///
/// 员工性别
///
@@ -56,79 +56,79 @@ namespace EOM.TSHotelManager.Core
/// 员工性别(名称描述)
///
[SqlSugar.SugarColumn(IsIgnore = true)]
- public string? WorkerSexName { get; set; }
+ public string WorkerSexName { get; set; }
///
/// 民族类型
///
[SqlSugar.SugarColumn(ColumnName = "WorkerNation")]
- public string? WorkerNation { get; set; }
+ public string WorkerNation { get; set; }
///
/// 民族名称
///
[SqlSugar.SugarColumn(IsIgnore = true)]
- public string? NationName { get; set; }
+ public string NationName { get; set; }
///
/// 员工电话
///
[SqlSugar.SugarColumn(ColumnName = "WorkerTel")]
- public string? WorkerTel { get; set; }
+ public string WorkerTel { get; set; }
///
/// 所属部门
///
[SqlSugar.SugarColumn(ColumnName = "WorkerClub")]
- public string? WorkerClub { get; set; }
+ public string WorkerClub { get; set; }
///
/// 部门名称
///
[SqlSugar.SugarColumn(IsIgnore = true)]
- public string? ClubName { get; set; }
+ public string ClubName { get; set; }
///
/// 居住地址
///
[SqlSugar.SugarColumn(ColumnName = "WorkerAddress")]
- public string? WorkerAddress { get; set; }
+ public string WorkerAddress { get; set; }
///
/// 员工职位
///
[SqlSugar.SugarColumn(ColumnName = "WorkerPosition")]
- public string? WorkerPosition { get; set; }
+ public string WorkerPosition { get; set; }
///
/// 职位名称
///
[SqlSugar.SugarColumn(IsIgnore = true)]
- public string? PositionName { get; set; }
+ public string PositionName { get; set; }
///
/// 证件号码
///
[SqlSugar.SugarColumn(ColumnName = "CardID")]
- public string? CardId { get; set; }
+ public string CardId { get; set; }
///
/// 员工密码
///
[SqlSugar.SugarColumn(IsOnlyIgnoreInsert = true)]
- public string? WorkerPwd { get; set; }
+ public string WorkerPwd { get; set; }
///
/// 员工入职时间
///
- public DateTime? WorkerTime { get; set; }
+ public DateTime WorkerTime { get; set; }
///
/// 员工面貌
///
- public string? WorkerFace { get; set; }
+ public string WorkerFace { get; set; }
///
/// 群众面貌描述
///
[SqlSugar.SugarColumn(IsIgnore = true)]
- public string? FaceName { get; set; }
+ public string FaceName { get; set; }
///
/// 教育程度
///
- public string? WorkerEducation { get; set; }
+ public string WorkerEducation { get; set; }
///
/// 教育程度名称
///
[SqlSugar.SugarColumn(IsIgnore = true)]
- public string? EducationName { get; set; }
+ public string EducationName { get; set; }
///
/// 删除标记
///
@@ -136,18 +136,18 @@ namespace EOM.TSHotelManager.Core
///
/// 资料创建人
///
- public string? datains_usr { get; set; }
+ public string datains_usr { get; set; }
///
/// 资料创建时间
///
- public DateTime? datains_date { get; set; }
+ public DateTime datains_date { get; set; }
///
/// 资料更新人
///
- public string? datachg_usr { get; set; }
+ public string datachg_usr { get; set; }
///
/// 资料更新时间
///
- public DateTime? datachg_date { get; set; }
+ public DateTime datachg_date { get; set; }
}
}
diff --git a/EOM.TSHotelManager.Core/Worker/WorkerCheck.cs b/EOM.TSHotelManager.Core/Worker/WorkerCheck.cs
index 1606942b1f84acb7c5a336cbe5819e37503fffb6..98af799fd6757a2ff2d2e79b5a920f6d436d5c04 100644
--- a/EOM.TSHotelManager.Core/Worker/WorkerCheck.cs
+++ b/EOM.TSHotelManager.Core/Worker/WorkerCheck.cs
@@ -40,7 +40,7 @@ namespace EOM.TSHotelManager.Core
///
/// 工号
///
- public string? WorkerNo { get; set; }
+ public string WorkerNo { get; set; }
///
/// 打卡时间
///
@@ -48,7 +48,7 @@ namespace EOM.TSHotelManager.Core
///
/// 打卡方式
///
- public string? CheckWay { get; set; }
+ public string CheckWay { get; set; }
///
/// 打卡状态
///
@@ -58,7 +58,7 @@ namespace EOM.TSHotelManager.Core
/// 打卡状态
///
[SqlSugar.SugarColumn(IsIgnore = true)]
- public string? CheckStateNm { get; set; }
+ public string CheckStateNm { get; set; }
///
/// 删除标记
///
@@ -66,19 +66,19 @@ namespace EOM.TSHotelManager.Core
///
/// 资料创建人
///
- public string? datains_usr { get; set; }
+ public string datains_usr { get; set; }
///
/// 资料创建时间
///
- public DateTime? datains_date { get; set; }
+ public DateTime datains_date { get; set; }
///
/// 资料更新人
///
- public string? datachg_usr { get; set; }
+ public string datachg_usr { get; set; }
///
/// 资料更新时间
///
- public DateTime? datachg_date { get; set; }
+ public DateTime datachg_date { get; set; }
}
}
diff --git a/EOM.TSHotelManager.Core/Worker/WorkerGoodBad.cs b/EOM.TSHotelManager.Core/Worker/WorkerGoodBad.cs
index 8910dc543e8af697a0c3ac271276ac4f0a626eed..ac50167e272361daf37d8d7cbcaa9820347af7b1 100644
--- a/EOM.TSHotelManager.Core/Worker/WorkerGoodBad.cs
+++ b/EOM.TSHotelManager.Core/Worker/WorkerGoodBad.cs
@@ -44,11 +44,11 @@ namespace EOM.TSHotelManager.Core
///
/// 工号
///
- public string? WorkNo { get; set; }
+ public string WorkNo { get; set; }
///
/// 奖惩信息
///
- public string? GBInfo { get; set; }
+ public string GBInfo { get; set; }
///
/// 奖惩类型
///
@@ -56,21 +56,21 @@ namespace EOM.TSHotelManager.Core
///
/// 奖惩操作人
///
- public string? GBOperation { get; set; }
+ public string GBOperation { get; set; }
///
/// 奖惩操作人
///
[SqlSugar.SugarColumn(IsIgnore = true)]
- public string? OperationName { get; set; }
+ public string OperationName { get; set; }
///
/// 奖惩时间
///
- public DateTime? GBTime { get; set; }
+ public DateTime GBTime { get; set; }
///
/// 类型名称
///
[SqlSugar.SugarColumn(IsIgnore = true)]
- public string? TypeName { get; set; }
+ public string TypeName { get; set; }
///
/// 删除标记
///
@@ -78,18 +78,18 @@ namespace EOM.TSHotelManager.Core
///
/// 资料创建人
///
- public string? datains_usr { get; set; }
+ public string datains_usr { get; set; }
///
/// 资料创建时间
///
- public DateTime? datains_date { get; set; }
+ public DateTime datains_date { get; set; }
///
/// 资料更新人
///
- public string? datachg_usr { get; set; }
+ public string datachg_usr { get; set; }
///
/// 资料更新时间
///
- public DateTime? datachg_date { get; set; }
+ public DateTime datachg_date { get; set; }
}
}
diff --git a/EOM.TSHotelManager.Core/Worker/WorkerHistory.cs b/EOM.TSHotelManager.Core/Worker/WorkerHistory.cs
index 73abc23f362fabb52e599a1fad574b4756e60896..8d348ac2e8f9a3b78f7df2f9c67b19446e6b5d7b 100644
--- a/EOM.TSHotelManager.Core/Worker/WorkerHistory.cs
+++ b/EOM.TSHotelManager.Core/Worker/WorkerHistory.cs
@@ -40,23 +40,23 @@ namespace EOM.TSHotelManager.Core
///
/// 工号
///
- public string? WorkerId { get; set; }
+ public string WorkerId { get; set; }
///
/// 开始时间
///
- public DateTime? StartDate { get; set; }
+ public DateTime StartDate { get; set; }
///
/// 结束时间
///
- public DateTime? EndDate { get; set; }
+ public DateTime EndDate { get; set; }
///
/// 职位
///
- public string? Position { get; set; }
+ public string Position { get; set; }
///
/// 公司
///
- public string? Company { get; set; }
+ public string Company { get; set; }
///
/// 删除标记
///
@@ -64,18 +64,18 @@ namespace EOM.TSHotelManager.Core
///
/// 资料创建人
///
- public string? datains_usr { get; set; }
+ public string datains_usr { get; set; }
///
/// 资料创建时间
///
- public DateTime? datains_date { get; set; }
+ public DateTime datains_date { get; set; }
///
/// 资料更新人
///
- public string? datachg_usr { get; set; }
+ public string datachg_usr { get; set; }
///
/// 资料更新时间
///
- public DateTime? datachg_date { get; set; }
+ public DateTime datachg_date { get; set; }
}
}
diff --git a/EOM.TSHotelManager.Core/Worker/WorkerPic.cs b/EOM.TSHotelManager.Core/Worker/WorkerPic.cs
index e77a6ede79101651d82e89f9eee4f4dca29b923b..b50fcadd5b7f59ad552aabf12717de2e7c770c2f 100644
--- a/EOM.TSHotelManager.Core/Worker/WorkerPic.cs
+++ b/EOM.TSHotelManager.Core/Worker/WorkerPic.cs
@@ -22,12 +22,12 @@ namespace EOM.TSHotelManager.Core
/// 工号
///
[SqlSugar.SugarColumn(ColumnName = "WorkerId")]
- public string? WorkerId { get; set; }
+ public string WorkerId { get; set; }
///
/// 照片路径
///
[SqlSugar.SugarColumn(ColumnName = "Pic")]
- public string? Pic { get; set; }
+ public string Pic { get; set; }
}
}
diff --git a/EOM.TSHotelManager.Core/Zero/Admin.cs b/EOM.TSHotelManager.Core/Zero/Admin.cs
index 58848ee68ed9c46270b05727b7fb2054d8c328ef..fb829b6157a0ae6ba56d67eedc00a4e693dd6112 100644
--- a/EOM.TSHotelManager.Core/Zero/Admin.cs
+++ b/EOM.TSHotelManager.Core/Zero/Admin.cs
@@ -42,30 +42,30 @@ namespace EOM.TSHotelManager.Core
///
public int Id { get; set; }
- private string? _AdminAccount;
+ private string _AdminAccount;
///
/// 管理员账号
///
[SqlSugar.SugarColumn(IsPrimaryKey = true)]
- public string? AdminAccount { get { return this._AdminAccount; } set { this._AdminAccount = value; } }
+ public string AdminAccount { get { return this._AdminAccount; } set { this._AdminAccount = value; } }
- private string? _AdminPassword;
+ private string _AdminPassword;
///
/// 管理员密码
///
- public string? AdminPassword { get { return this._AdminPassword; } set { this._AdminPassword = value; } }
+ public string AdminPassword { get { return this._AdminPassword; } set { this._AdminPassword = value; } }
- private string? _AdminType;
+ private string _AdminType;
///
/// 管理员类型
///
- public string? AdminType { get { return this._AdminType; } set { this._AdminType = value; } }
+ public string AdminType { get { return this._AdminType; } set { this._AdminType = value; } }
- private string? _AdminName;
+ private string _AdminName;
///
/// 管理员名称
///
- public string? AdminName { get { return this._AdminName; } set { this._AdminName = value; } }
+ public string AdminName { get { return this._AdminName; } set { this._AdminName = value; } }
private System.Int32 _IsAdmin;
///
@@ -79,47 +79,47 @@ namespace EOM.TSHotelManager.Core
///
public System.Int32 DeleteMk { get { return this._DeleteMk; } set { this._DeleteMk = value; } }
- private string? _datains_usr;
+ private string _datains_usr;
///
/// 资料新增人
///
- public string? datains_usr { get { return this._datains_usr; } set { this._datains_usr = value; } }
+ public string datains_usr { get { return this._datains_usr; } set { this._datains_usr = value; } }
- private System.DateTime? _datains_time;
+ private System.DateTime _datains_time;
///
/// 资料新增时间
///
- public System.DateTime? datains_time { get { return this._datains_time; } set { this._datains_time = value; } }
+ public System.DateTime datains_time { get { return this._datains_time; } set { this._datains_time = value; } }
- private string? _datachg_usr;
+ private string _datachg_usr;
///
/// 资料更新人
///
- public string? datachg_usr { get { return this._datachg_usr; } set { this._datachg_usr = value; } }
+ public string datachg_usr { get { return this._datachg_usr; } set { this._datachg_usr = value; } }
- private System.DateTime? _datachg_time;
+ private System.DateTime _datachg_time;
///
/// 资料更新时间
///
- public System.DateTime? datachg_time { get { return this._datachg_time; } set { this._datachg_time = value; } }
+ public System.DateTime datachg_time { get { return this._datachg_time; } set { this._datachg_time = value; } }
///
/// 管理员类型描述
///
[SqlSugar.SugarColumn(IsIgnore = true)]
- public string? IsAdminNm { get; set; }
+ public string IsAdminNm { get; set; }
///
/// 管理员类型
///
[SqlSugar.SugarColumn(IsIgnore = true)]
- public string? TypeName { get; set; }
+ public string TypeName { get; set; }
///
/// 删除标记描述
///
[SqlSugar.SugarColumn(IsIgnore = true)]
- public string? DeleteNm { get; set; }
+ public string DeleteNm { get; set; }
}
}
diff --git a/EOM.TSHotelManager.Core/Zero/AdminType.cs b/EOM.TSHotelManager.Core/Zero/AdminType.cs
index 509f5c5345d0b78448d897ff9b33576e9c0f682e..3195a2d02dcd7e2ad428de9120b960a249d38155 100644
--- a/EOM.TSHotelManager.Core/Zero/AdminType.cs
+++ b/EOM.TSHotelManager.Core/Zero/AdminType.cs
@@ -44,12 +44,12 @@ namespace EOM.TSHotelManager.Core
///
/// 管理员类型
///
- public string? type_id { get; set; }
+ public string type_id { get; set; }
///
/// 类型名称
///
- public string? type_name { get; set; }
+ public string type_name { get; set; }
///
/// 删除标记
@@ -59,18 +59,18 @@ namespace EOM.TSHotelManager.Core
///
/// 新增人
///
- public string? datains_usr { get; set; }
+ public string datains_usr { get; set; }
///
/// 新增时间
///
- public DateTime? datains_date { get; set; }
+ public DateTime datains_date { get; set; }
///
/// 修改人
///
- public string? datachg_usr { get; set; }
+ public string datachg_usr { get; set; }
///
/// 修改时间
///
- public DateTime? datachg_date { get; set; }
+ public DateTime datachg_date { get; set; }
}
}
diff --git a/EOM.TSHotelManager.Core/Zero/Base.cs b/EOM.TSHotelManager.Core/Zero/Base.cs
index d89ea14d0f1046e44b5c2bf0a1debfa26e811f4f..48ca40255fe316eac0f71d294bd0ae00c75f0306 100644
--- a/EOM.TSHotelManager.Core/Zero/Base.cs
+++ b/EOM.TSHotelManager.Core/Zero/Base.cs
@@ -44,6 +44,6 @@ namespace EOM.TSHotelManager.Core
///
/// 地址
///
- public string? url_addr { get; set; }
+ public string url_addr { get; set; }
}
}
diff --git a/EOM.TSHotelManager.Core/Zero/CheckInfo.cs b/EOM.TSHotelManager.Core/Zero/CheckInfo.cs
index a1e9022e22eee09add0a256ad1cdfe4b26b4baad..76f99176a3341089137555b377f92a620f3fa49a 100644
--- a/EOM.TSHotelManager.Core/Zero/CheckInfo.cs
+++ b/EOM.TSHotelManager.Core/Zero/CheckInfo.cs
@@ -35,19 +35,19 @@ namespace EOM.TSHotelManager.Core
///
/// 监管统计编号
///
- public string? CheckNo { get; set; }
+ public string CheckNo { get; set; }
///
/// 监管部门
///
- public string? CheckClub { get; set; }
+ public string CheckClub { get; set; }
///
/// 监管进度
///
- public string? CheckProgres { get; set; }
+ public string CheckProgres { get; set; }
///
///
///
- public string? CheckCash { get; set; }
+ public string CheckCash { get; set; }
///
///
///
@@ -55,11 +55,11 @@ namespace EOM.TSHotelManager.Core
///
///
///
- public string? CheckPerson { get; set; }
+ public string CheckPerson { get; set; }
///
///
///
- public string? CheckAdvice { get; set; }
+ public string CheckAdvice { get; set; }
///
/// 删除标记
@@ -68,18 +68,18 @@ namespace EOM.TSHotelManager.Core
///
/// 资料创建人
///
- public string? datains_usr { get; set; }
+ public string datains_usr { get; set; }
///
/// 资料创建时间
///
- public DateTime? datains_date { get; set; }
+ public DateTime datains_date { get; set; }
///
/// 资料更新人
///
- public string? datachg_usr { get; set; }
+ public string datachg_usr { get; set; }
///
/// 资料更新时间
///
- public DateTime? datachg_date { get; set; }
+ public DateTime datachg_date { get; set; }
}
}
diff --git a/EOM.TSHotelManager.Core/Zero/Dept.cs b/EOM.TSHotelManager.Core/Zero/Dept.cs
index 60b6a61cf6956c2fb3c42ed0887064e4a98353c7..e8d64ef6513fb177574e1e73223aacc7dd711835 100644
--- a/EOM.TSHotelManager.Core/Zero/Dept.cs
+++ b/EOM.TSHotelManager.Core/Zero/Dept.cs
@@ -40,42 +40,42 @@ namespace EOM.TSHotelManager.Core
/// 部门编号
///
[SqlSugar.SugarColumn(ColumnName = "dept_no")]
- public string? dept_no { get; set; }
+ public string dept_no { get; set; }
///
/// 部门名称
///
[SqlSugar.SugarColumn(ColumnName = "dept_name")]
- public string? dept_name { get; set; }
+ public string dept_name { get; set; }
///
/// 部门描述
///
[SqlSugar.SugarColumn(ColumnName = "dept_desc")]
- public string? dept_desc { get; set; }
+ public string dept_desc { get; set; }
///
/// 创建时间(部门)
///
[SqlSugar.SugarColumn(ColumnName = "dept_date")]
- public DateTime? dept_date { get; set; }
+ public DateTime dept_date { get; set; }
///
/// 部门主管
///
[SqlSugar.SugarColumn(ColumnName = "dept_leader")]
- public string? dept_leader { get; set; }
+ public string dept_leader { get; set; }
///
/// 部门主管
///
[SqlSugar.SugarColumn(IsIgnore = true)]
- public string? leader_name { get; set; }
+ public string leader_name { get; set; }
///
/// 上级部门
///
[SqlSugar.SugarColumn(ColumnName = "dept_parent")]
- public string? dept_parent { get; set; }
+ public string dept_parent { get; set; }
///
/// 上级部门
///
[SqlSugar.SugarColumn(IsIgnore = true)]
- public string? parent_name { get; set; }
+ public string parent_name { get; set; }
///
/// 删除标记
///
@@ -85,22 +85,22 @@ namespace EOM.TSHotelManager.Core
/// 资料创建人
///
[SqlSugar.SugarColumn(ColumnName = "datains_usr")]
- public string? datains_usr { get; set; }
+ public string datains_usr { get; set; }
///
/// 资料创建时间
///
[SqlSugar.SugarColumn(ColumnName = "datains_date")]
- public DateTime? datains_date { get; set; }
+ public DateTime datains_date { get; set; }
///
/// 资料更新人
///
[SqlSugar.SugarColumn(ColumnName = "datachg_usr")]
- public string? datachg_usr { get; set; }
+ public string datachg_usr { get; set; }
///
/// 资料更新时间
///
[SqlSugar.SugarColumn(ColumnName = "datachg_date")]
- public DateTime? datachg_date { get; set; }
+ public DateTime datachg_date { get; set; }
}
}
diff --git a/EOM.TSHotelManager.Core/Zero/Education.cs b/EOM.TSHotelManager.Core/Zero/Education.cs
index c75d00387abd78346dfbca20e5b32dd285308c44..8bdbf29e9e1e0f1cddc6d35db7555ff88fb343c2 100644
--- a/EOM.TSHotelManager.Core/Zero/Education.cs
+++ b/EOM.TSHotelManager.Core/Zero/Education.cs
@@ -39,11 +39,11 @@ namespace EOM.TSHotelManager.Core
///
/// 学历编号
///
- public string? education_no { get; set; }
+ public string education_no { get; set; }
///
/// 学历名称
///
- public string? education_name { get; set; }
+ public string education_name { get; set; }
///
/// 删除标记
///
@@ -51,19 +51,19 @@ namespace EOM.TSHotelManager.Core
///
/// 资料创建人
///
- public string? datains_usr { get; set; }
+ public string datains_usr { get; set; }
///
/// 资料创建时间
///
- public DateTime? datains_date { get; set; }
+ public DateTime datains_date { get; set; }
///
/// 资料更新人
///
- public string? datachg_usr { get; set; }
+ public string datachg_usr { get; set; }
///
/// 资料更新时间
///
- public DateTime? datachg_date { get; set; }
+ public DateTime datachg_date { get; set; }
}
}
diff --git a/EOM.TSHotelManager.Core/Zero/Module.cs b/EOM.TSHotelManager.Core/Zero/Module.cs
index 04779f77ae1125a46c0fc97b4b540e2402fb8a39..b45444b9fc143a34e372a1383cdad56da2fd1a3a 100644
--- a/EOM.TSHotelManager.Core/Zero/Module.cs
+++ b/EOM.TSHotelManager.Core/Zero/Module.cs
@@ -20,12 +20,12 @@ namespace EOM.TSHotelManager.Core
///
/// 模块名称
///
- public string? module_name { get; set; }
+ public string module_name { get; set; }
///
/// 模块描述
///
- public string? module_desc { get; set; }
+ public string module_desc { get; set; }
///
/// 删除标记
@@ -35,21 +35,21 @@ namespace EOM.TSHotelManager.Core
///
/// 资料创建人
///
- public string? datains_usr { get; set; }
+ public string datains_usr { get; set; }
///
/// 资料创建时间
///
- public DateTime? datains_time { get; set; }
+ public DateTime datains_time { get; set; }
///
/// 资料更新人
///
- public string? datachg_usr { get; set; }
+ public string datachg_usr { get; set; }
///
/// 资料更新时间
///
- public DateTime? datachg_time { get; set; }
+ public DateTime datachg_time { get; set; }
}
}
diff --git a/EOM.TSHotelManager.Core/Zero/ModuleConsts.cs b/EOM.TSHotelManager.Core/Zero/ModuleConsts.cs
index 45ce18097b8b70ac2f296f5fd269ed0d6c2f4b08..b4834430ba60a023ba0620a12492a98ecf7950bb 100644
--- a/EOM.TSHotelManager.Core/Zero/ModuleConsts.cs
+++ b/EOM.TSHotelManager.Core/Zero/ModuleConsts.cs
@@ -38,42 +38,42 @@ namespace EOM.TSHotelManager.Core
///
/// 基础信息
///
- public const string? BaseInfo = "BaseInfo";
+ public const string BaseInfo = "BaseInfo";
///
/// 财务信息
///
- public const string? CashInfo = "CashInfo";
+ public const string CashInfo = "CashInfo";
///
/// 水电管理
///
- public const string? WtiInfo = "WtiInfo";
+ public const string WtiInfo = "WtiInfo";
///
/// 监管统计
///
- public const string? CheckInfo = "CheckInfo";
+ public const string CheckInfo = "CheckInfo";
///
/// 客房管理
///
- public const string? RoomManager = "RoomManager";
+ public const string RoomManager = "RoomManager";
///
/// 客户管理
///
- public const string? CustomerManager = "CustomerManager";
+ public const string CustomerManager = "CustomerManager";
///
/// 人事管理
///
- public const string? HumanResourcesManager = "HumanResourcesManager";
+ public const string HumanResourcesManager = "HumanResourcesManager";
///
/// 物资管理
///
- public const string? MaterialManager = "MaterialManager";
+ public const string MaterialManager = "MaterialManager";
///
/// 员工操作日志
///
- public const string? OperationLogManager = "OperationLogManager";
+ public const string OperationLogManager = "OperationLogManager";
///
/// 系统管理
///
- public const string? AdminManager = "AdminManager";
+ public const string AdminManager = "AdminManager";
}
}
diff --git a/EOM.TSHotelManager.Core/Zero/ModuleZero.cs b/EOM.TSHotelManager.Core/Zero/ModuleZero.cs
index 7c7e3d9a2c4aa0af0ae4c4b83a3d86e6720792a0..00a7f5692e7837e36835bfdd57069aaf422ed793 100644
--- a/EOM.TSHotelManager.Core/Zero/ModuleZero.cs
+++ b/EOM.TSHotelManager.Core/Zero/ModuleZero.cs
@@ -22,12 +22,12 @@ namespace EOM.TSHotelManager.Core
/// 管理员账号
///
[SqlSugar.SugarColumn(ColumnName = "admin_account")]
- public string? admin_account { get; set; }
+ public string admin_account { get; set; }
///
/// 模块名称
///
[SqlSugar.SugarColumn(ColumnName = "module_name")]
- public string? module_name { get; set; }
+ public string module_name { get; set; }
///
/// 是否开启
///
diff --git a/EOM.TSHotelManager.Core/Zero/Nation.cs b/EOM.TSHotelManager.Core/Zero/Nation.cs
index d67a5524ad1bc69b57b485479c3c227498838496..e65b7463f046ecb551423d1622a4104bbbe03406 100644
--- a/EOM.TSHotelManager.Core/Zero/Nation.cs
+++ b/EOM.TSHotelManager.Core/Zero/Nation.cs
@@ -39,11 +39,11 @@ namespace EOM.TSHotelManager.Core
///
/// 民族编号
///
- public string? nation_no { get; set; }
+ public string nation_no { get; set; }
///
/// 民族名称
///
- public string? nation_name { get; set; }
+ public string nation_name { get; set; }
///
/// 删除标记
///
@@ -51,19 +51,19 @@ namespace EOM.TSHotelManager.Core
///
/// 资料创建人
///
- public string? datains_usr { get; set; }
+ public string datains_usr { get; set; }
///
/// 资料创建时间
///
- public DateTime? datains_date { get; set; }
+ public DateTime datains_date { get; set; }
///
/// 资料更新人
///
- public string? datachg_usr { get; set; }
+ public string datachg_usr { get; set; }
///
/// 资料更新时间
///
- public DateTime? datachg_date { get; set; }
+ public DateTime datachg_date { get; set; }
}
}
diff --git a/EOM.TSHotelManager.Core/Zero/Notice.cs b/EOM.TSHotelManager.Core/Zero/Notice.cs
index 07ef6627fa67036dc977725c0fcd18728698770b..c30d2a8e588f4da47c53fbf9579da34a54feee4f 100644
--- a/EOM.TSHotelManager.Core/Zero/Notice.cs
+++ b/EOM.TSHotelManager.Core/Zero/Notice.cs
@@ -36,37 +36,37 @@ namespace EOM.TSHotelManager.Core
/// 公告编号
///
[SqlSugar.SugarColumn(ColumnName = "NoticeNo")]
- public string? NoticeNo { get; set; }
+ public string NoticeNo { get; set; }
///
/// 公告主题
///
[SqlSugar.SugarColumn(ColumnName = "Noticetheme")]
- public string? Noticetheme { get; set; }
+ public string Noticetheme { get; set; }
///
/// 公告类型
///
[SqlSugar.SugarColumn(ColumnName = "NoticeType")]
- public string? NoticeType { get; set; }
+ public string NoticeType { get; set; }
///
/// 公告类型(描述)
///
[SqlSugar.SugarColumn(IsIgnore = true)]
- public string? NoticeTypeName { get; set; }
+ public string NoticeTypeName { get; set; }
///
/// 公告时间
///
[SqlSugar.SugarColumn(ColumnName = "NoticeTime")]
- public DateTime? NoticeTime { get; set; }
+ public DateTime NoticeTime { get; set; }
///
/// 公告正文
///
[SqlSugar.SugarColumn(ColumnName = "NoticeContent")]
- public string? NoticeContent { get; set; }
+ public string NoticeContent { get; set; }
///
/// 发文部门
///
[SqlSugar.SugarColumn(ColumnName = "NoticeClub")]
- public string? NoticeClub { get; set; }
+ public string NoticeClub { get; set; }
///
/// 删除标记
///
@@ -75,19 +75,19 @@ namespace EOM.TSHotelManager.Core
///
/// 资料创建人
///
- public string? datains_usr { get; set; }
+ public string datains_usr { get; set; }
///
/// 资料创建时间
///
- public DateTime? datains_date { get; set; }
+ public DateTime datains_date { get; set; }
///
/// 资料更新人
///
- public string? datachg_usr { get; set; }
+ public string datachg_usr { get; set; }
///
/// 资料更新时间
///
- public DateTime? datachg_date { get; set; }
+ public DateTime datachg_date { get; set; }
}
}
diff --git a/EOM.TSHotelManager.Core/Zero/VipRule.cs b/EOM.TSHotelManager.Core/Zero/VipRule.cs
index ae7faaaaa462a40ea1d0d9eecc1199244abef2e7..3400c90c2506515fd8b5886cbcdcd62d99ed6979 100644
--- a/EOM.TSHotelManager.Core/Zero/VipRule.cs
+++ b/EOM.TSHotelManager.Core/Zero/VipRule.cs
@@ -44,12 +44,12 @@ namespace EOM.TSHotelManager.Core
///
/// 会员规则流水号
///
- public string? rule_id { get; set; }
+ public string rule_id { get; set; }
///
/// 会员规则名称
///
- public string? rule_name { get; set; }
+ public string rule_name { get; set; }
///
/// 预设数值(历史消费总额)
@@ -68,25 +68,25 @@ namespace EOM.TSHotelManager.Core
///
/// 新增人
///
- public string? datains_usr { get; set; }
+ public string datains_usr { get; set; }
///
/// 新增时间
///
- public DateTime? datains_date { get; set; }
+ public DateTime datains_date { get; set; }
///
/// 修改人
///
- public string? datachg_usr { get; set; }
+ public string datachg_usr { get; set; }
///
/// 修改时间
///
- public DateTime? datachg_date { get; set; }
+ public DateTime datachg_date { get; set; }
///
/// 会员等级描述
///
[SqlSugar.SugarColumn(IsIgnore = true)]
- public string? type_name { get; set; }
+ public string type_name { get; set; }
}
}
diff --git a/EOM.TSHotelManager.Core/Zero/position.cs b/EOM.TSHotelManager.Core/Zero/position.cs
index b1be022262b72f583387a4d87deace10593378d3..4289c55bcd604cca2d6aac62aea73145cf166a5d 100644
--- a/EOM.TSHotelManager.Core/Zero/position.cs
+++ b/EOM.TSHotelManager.Core/Zero/position.cs
@@ -39,11 +39,11 @@ namespace EOM.TSHotelManager.Core
///
/// 职位编号
///
- public string? position_no { get; set; }
+ public string position_no { get; set; }
///
/// 职位名称
///
- public string? position_name { get; set; }
+ public string position_name { get; set; }
///
/// 删除标记
///
@@ -51,19 +51,19 @@ namespace EOM.TSHotelManager.Core
///
/// 资料创建人
///
- public string? datains_usr { get; set; }
+ public string datains_usr { get; set; }
///
/// 资料创建时间
///
- public DateTime? datains_date { get; set; }
+ public DateTime datains_date { get; set; }
///
/// 资料更新人
///
- public string? datachg_usr { get; set; }
+ public string datachg_usr { get; set; }
///
/// 资料更新时间
///
- public DateTime? datachg_date { get; set; }
+ public DateTime datachg_date { get; set; }
}
}
diff --git a/EOM.TSHotelManager.EntityFramework/AppSettingsJson.cs b/EOM.TSHotelManager.EntityFramework/AppSettingsJson.cs
index 00c80dde57fec35f6abd66f3e1cee7207172537c..77f118fae41cccf81ff30a06d4021bb17e00b0ec 100644
--- a/EOM.TSHotelManager.EntityFramework/AppSettingsJson.cs
+++ b/EOM.TSHotelManager.EntityFramework/AppSettingsJson.cs
@@ -10,7 +10,7 @@ namespace EOM.TSHotelManager.EntityFramework
{
public class AppSettingsJson
{
- public static string? ApplicationExeDirectory()
+ public static string ApplicationExeDirectory()
{
var location = System.Reflection.Assembly.GetExecutingAssembly().Location;
var appRoot = Path.GetDirectoryName(location);
@@ -18,7 +18,7 @@ namespace EOM.TSHotelManager.EntityFramework
}
public static IConfigurationRoot GetAppSettings()
{
- string? applicationExeDirectory = ApplicationExeDirectory();
+ string applicationExeDirectory = ApplicationExeDirectory();
var builder = new ConfigurationBuilder()
.SetBasePath(applicationExeDirectory)
.AddJsonFile("appsettings.json");
diff --git a/EOM.TSHotelManager.EntityFramework/EOM.TSHotelManager.EntityFramework.csproj b/EOM.TSHotelManager.EntityFramework/EOM.TSHotelManager.EntityFramework.csproj
index a08a5317592515e8bba4d98a6df5426ad2292d2b..8a8dac13ff069d6e18b43863f2f98fee3a70c80a 100644
--- a/EOM.TSHotelManager.EntityFramework/EOM.TSHotelManager.EntityFramework.csproj
+++ b/EOM.TSHotelManager.EntityFramework/EOM.TSHotelManager.EntityFramework.csproj
@@ -3,7 +3,7 @@
net6.0
enable
- enable
+ disable
diff --git a/EOM.TSHotelManager.WebApi/Controllers/Business/Customer/CustoController.cs b/EOM.TSHotelManager.WebApi/Controllers/Business/Customer/CustoController.cs
index bbb7ab255eae6f7ee74654717c7687b6f514470b..4eaef9d7b6218cbb9b8b5ac3c88d191b693e6fcc 100644
--- a/EOM.TSHotelManager.WebApi/Controllers/Business/Customer/CustoController.cs
+++ b/EOM.TSHotelManager.WebApi/Controllers/Business/Customer/CustoController.cs
@@ -74,17 +74,17 @@ namespace EOM.TSHotelManager.WebApi.Controllers
///
///
[HttpGet]
- public OSelectCustoAllDto SelectCustoAll([FromQuery]SelectCustoAll selectCustoAll)
+ public OSelectCustoAllDto SelectCustoAll([FromQuery] int pageIndex, int pageSize)
{
- return customerService.SelectCustoAll(selectCustoAll);
+ return customerService.SelectCustoAll(pageIndex,pageSize);
}
///
/// 查询指定客户信息
///
///
- [HttpGet]
- public List SelectCustoByInfo([FromQuery] Custo custo)
+ [HttpPost]
+ public List SelectCustoByInfo([FromBody]Custo custo)
{
return customerService.SelectCustoByInfo(custo);
}
@@ -95,7 +95,7 @@ namespace EOM.TSHotelManager.WebApi.Controllers
///
///
[HttpGet]
- public Custo SelectCardInfoByCustoNo([FromQuery] string? CustoNo)
+ public Custo SelectCardInfoByCustoNo([FromQuery] string CustoNo)
{
return customerService.SelectCardInfoByCustoNo(CustoNo);
}
diff --git a/EOM.TSHotelManager.WebApi/Controllers/Business/Reser/ReserController.cs b/EOM.TSHotelManager.WebApi/Controllers/Business/Reser/ReserController.cs
index d7bd0a52a67669378275d908ff2b48ade025e327..d51edbfe806b0a41fdf78ba529227372edd63fed 100644
--- a/EOM.TSHotelManager.WebApi/Controllers/Business/Reser/ReserController.cs
+++ b/EOM.TSHotelManager.WebApi/Controllers/Business/Reser/ReserController.cs
@@ -42,7 +42,7 @@ namespace EOM.TSHotelManager.WebApi.Controllers
///
///
[HttpGet]
- public Reser SelectReserInfoByRoomNo([FromQuery]string? no)
+ public Reser SelectReserInfoByRoomNo([FromQuery]string no)
{
return reserService.SelectReserInfoByRoomNo(no);
}
diff --git a/EOM.TSHotelManager.WebApi/Controllers/Business/Room/RoomController.cs b/EOM.TSHotelManager.WebApi/Controllers/Business/Room/RoomController.cs
index 1f679d97da779038eee7025c372510f8a0d3b062..9f094b6e7306e55d767cd043a9722467e36d3668 100644
--- a/EOM.TSHotelManager.WebApi/Controllers/Business/Room/RoomController.cs
+++ b/EOM.TSHotelManager.WebApi/Controllers/Business/Room/RoomController.cs
@@ -61,7 +61,7 @@ namespace EOM.TSHotelManager.WebApi.Controllers
///
///
[HttpGet]
- public List SelectRoomByTypeName([FromQuery] string? TypeName)
+ public List SelectRoomByTypeName([FromQuery] string TypeName)
{
return roomService.SelectRoomByTypeName(TypeName);
}
@@ -72,7 +72,7 @@ namespace EOM.TSHotelManager.WebApi.Controllers
///
///
[HttpGet]
- public Room SelectRoomByRoomNo([FromQuery] string? no)
+ public Room SelectRoomByRoomNo([FromQuery] string no)
{
return roomService.SelectRoomByRoomNo(no);
}
@@ -83,7 +83,7 @@ namespace EOM.TSHotelManager.WebApi.Controllers
///
///
[HttpGet]
- public bool UpdateRoomByRoomNo([FromQuery] string? room)
+ public bool UpdateRoomByRoomNo([FromQuery] string room)
{
return roomService.UpdateRoomByRoomNo(room);
}
@@ -94,7 +94,7 @@ namespace EOM.TSHotelManager.WebApi.Controllers
///
///
[HttpGet]
- public object DayByRoomNo([FromQuery] string? roomno)
+ public object DayByRoomNo([FromQuery] string roomno)
{
return roomService.DayByRoomNo(roomno);
}
@@ -146,7 +146,7 @@ namespace EOM.TSHotelManager.WebApi.Controllers
///
///
[HttpGet]
- public object SelectRoomByRoomPrice([FromQuery]string? r)
+ public object SelectRoomByRoomPrice([FromQuery]string r)
{
return roomService.SelectRoomByRoomPrice(r);
}
@@ -188,7 +188,7 @@ namespace EOM.TSHotelManager.WebApi.Controllers
///
///
[HttpGet]
- public bool UpdateRoomStateByRoomNo([FromQuery]string? roomno, int stateid)
+ public bool UpdateRoomStateByRoomNo([FromQuery]string roomno, int stateid)
{
return roomService.UpdateRoomStateByRoomNo(roomno,stateid);
}
@@ -230,7 +230,7 @@ namespace EOM.TSHotelManager.WebApi.Controllers
///
///
[HttpGet]
- public object SelectRoomStateIdByRoomNo([FromQuery]string? roomno)
+ public object SelectRoomStateIdByRoomNo([FromQuery]string roomno)
{
return roomService.SelectRoomStateIdByRoomNo(roomno);
}
diff --git a/EOM.TSHotelManager.WebApi/Controllers/Business/Room/RoomTypeController.cs b/EOM.TSHotelManager.WebApi/Controllers/Business/Room/RoomTypeController.cs
index ca25303b86ac1921961748ec1e2da311059563b1..92968a9140fc67f6d2f57dc4235f06835ca97338 100644
--- a/EOM.TSHotelManager.WebApi/Controllers/Business/Room/RoomTypeController.cs
+++ b/EOM.TSHotelManager.WebApi/Controllers/Business/Room/RoomTypeController.cs
@@ -41,7 +41,7 @@ namespace EOM.TSHotelManager.WebApi.Controllers
///
///
[HttpGet]
- public RoomType SelectRoomTypeByRoomNo([FromQuery]string? no)
+ public RoomType SelectRoomTypeByRoomNo([FromQuery]string no)
{
return roomTypeService.SelectRoomTypeByRoomNo(no);
}
diff --git a/EOM.TSHotelManager.WebApi/Controllers/Business/Sellthing/SellthingController.cs b/EOM.TSHotelManager.WebApi/Controllers/Business/Sellthing/SellthingController.cs
index 52b94dbb72dde63ce22a528ed7de50501362f427..d9d2f5b347bffa4f19a673db9997a5addb3b8fce 100644
--- a/EOM.TSHotelManager.WebApi/Controllers/Business/Sellthing/SellthingController.cs
+++ b/EOM.TSHotelManager.WebApi/Controllers/Business/Sellthing/SellthingController.cs
@@ -44,7 +44,7 @@ namespace EOM.TSHotelManager.WebApi.Controllers
///
///
[HttpPost]
- public bool UpdateSellThing([FromBody]string? stock, string? sellNo)
+ public bool UpdateSellThing([FromBody]string stock, string sellNo)
{
return sellService.UpdateSellThing(stock, sellNo);
}
@@ -68,7 +68,7 @@ namespace EOM.TSHotelManager.WebApi.Controllers
///
///
[HttpGet]
- public bool DeleteSellThing([FromQuery] string? roomNo, string? custoNo, string? sellName)
+ public bool DeleteSellThing([FromQuery] string roomNo, string custoNo, string sellName)
{
return sellService.DeleteSellThing(roomNo, custoNo, sellName);
}
@@ -79,7 +79,7 @@ namespace EOM.TSHotelManager.WebApi.Controllers
///
///
[HttpGet]
- public bool DeleteSellThingBySellNo([FromQuery]string? sellNo)
+ public bool DeleteSellThingBySellNo([FromQuery]string sellNo)
{
return sellService.DeleteSellThingBySellNo(sellNo);
}
@@ -91,7 +91,7 @@ namespace EOM.TSHotelManager.WebApi.Controllers
///
///
[HttpGet]
- public SellThing SelectSellThingByNameAndPrice([FromQuery]string? name, string? price)
+ public SellThing SelectSellThingByNameAndPrice([FromQuery]string name, string price)
{
return sellService.SelectSellThingByNameAndPrice(name, price);
}
@@ -103,7 +103,7 @@ namespace EOM.TSHotelManager.WebApi.Controllers
///
///
[HttpGet]
- public SellThing SelectSellInfoBySellNo([FromQuery]string? SellNo)
+ public SellThing SelectSellInfoBySellNo([FromQuery]string SellNo)
{
return sellService.SelectSellInfoBySellNo(SellNo);
}
diff --git a/EOM.TSHotelManager.WebApi/Controllers/Business/Spend/SpendController.cs b/EOM.TSHotelManager.WebApi/Controllers/Business/Spend/SpendController.cs
index aa8bb6c7e17144f8ccf7225a1dd70613af98d1dd..1ceff4247b332db984ee49edc6fd6a071fbecbe2 100644
--- a/EOM.TSHotelManager.WebApi/Controllers/Business/Spend/SpendController.cs
+++ b/EOM.TSHotelManager.WebApi/Controllers/Business/Spend/SpendController.cs
@@ -43,7 +43,7 @@ namespace EOM.TSHotelManager.WebApi.Controllers
///
///
[HttpGet]
- public List SelectSpendByCustoNo([FromQuery]string? No)
+ public List SelectSpendByCustoNo([FromQuery]string No)
{
return spendService.SelectSpendByCustoNo(No);
}
@@ -54,7 +54,7 @@ namespace EOM.TSHotelManager.WebApi.Controllers
///
///
[HttpGet]
- public List SelectSpendByRoomNo([FromQuery]string? No)
+ public List SelectSpendByRoomNo([FromQuery]string No)
{
return spendService.SelectSpendByRoomNo(No);
}
@@ -65,7 +65,7 @@ namespace EOM.TSHotelManager.WebApi.Controllers
///
///
[HttpGet]
- public List SeletHistorySpendInfoAll([FromQuery]string? custoNo)
+ public List SeletHistorySpendInfoAll([FromQuery]string custoNo)
{
return spendService.SeletHistorySpendInfoAll(custoNo);
}
@@ -85,7 +85,7 @@ namespace EOM.TSHotelManager.WebApi.Controllers
///
///
[HttpGet]
- public List SelectSpendInfoRoomNo([FromQuery]string? RoomNo)
+ public List SelectSpendInfoRoomNo([FromQuery]string RoomNo)
{
return spendService.SelectSpendInfoRoomNo(RoomNo);
}
@@ -97,7 +97,7 @@ namespace EOM.TSHotelManager.WebApi.Controllers
///
///
[HttpGet]
- public object SelectMoneyByRoomNoAndTime([FromQuery]string? roomno, string? custono)
+ public object SelectMoneyByRoomNoAndTime([FromQuery]string roomno, string custono)
{
return spendService.SelectMoneyByRoomNoAndTime(roomno, custono);
}
@@ -109,7 +109,7 @@ namespace EOM.TSHotelManager.WebApi.Controllers
///
///
[HttpGet]
- public bool UpdateMoneyState([FromQuery] string? roomno, string? checktime)
+ public bool UpdateMoneyState([FromQuery] string roomno, string checktime)
{
return spendService.UpdateMoneyState(roomno, checktime);
}
diff --git a/EOM.TSHotelManager.WebApi/Controllers/Business/Wti/WtiController.cs b/EOM.TSHotelManager.WebApi/Controllers/Business/Wti/WtiController.cs
index e196f02050599994d9c6c6bcad10797e4ab1583a..1f63514f89ff455242193e9e8366e0c69515af2f 100644
--- a/EOM.TSHotelManager.WebApi/Controllers/Business/Wti/WtiController.cs
+++ b/EOM.TSHotelManager.WebApi/Controllers/Business/Wti/WtiController.cs
@@ -31,7 +31,7 @@ namespace EOM.TSHotelManager.WebApi.Controllers
///
///
[HttpGet]
- public Wti SelectWtiInfoByRoomNo([FromQuery]string? roomNo)
+ public Wti SelectWtiInfoByRoomNo([FromQuery]string roomNo)
{
return this.wtiService.SelectWtiInfoByRoomNo(roomNo);
}
@@ -44,7 +44,7 @@ namespace EOM.TSHotelManager.WebApi.Controllers
///
///
[HttpGet]
- public Wti SelectWtiInfoByRoomNoAndTime([FromQuery]string? roomno, string? usedate, string? enddate)
+ public Wti SelectWtiInfoByRoomNoAndTime([FromQuery]string roomno, string usedate, string enddate)
{
return this.wtiService.SelectWtiInfoByRoomNoAndTime(roomno, usedate, enddate);
}
@@ -97,7 +97,7 @@ namespace EOM.TSHotelManager.WebApi.Controllers
///
///
///
- //bool DeleteWtiInfo(string? roomno);
+ //bool DeleteWtiInfo(string roomno);
///
/// 根据房间编号、使用时间删除水电费信息
@@ -107,7 +107,7 @@ namespace EOM.TSHotelManager.WebApi.Controllers
///
///
[HttpPost]
- public bool DeleteWtiInfoByRoomNoAndDateTime([FromBody]string? roomno, string? usedate, string? enddate)
+ public bool DeleteWtiInfoByRoomNoAndDateTime([FromBody]string roomno, string usedate, string enddate)
{
return this.wtiService.DeleteWtiInfoByRoomNoAndDateTime(roomno, usedate, enddate);
}
@@ -117,7 +117,7 @@ namespace EOM.TSHotelManager.WebApi.Controllers
///
///
[HttpGet]
- public List ListWtiInfoByRoomNo([FromQuery]string? roomno)
+ public List ListWtiInfoByRoomNo([FromQuery]string roomno)
{
return this.wtiService.ListWtiInfoByRoomNo(roomno);
}
diff --git a/EOM.TSHotelManager.WebApi/Controllers/Worker/Check/WorkerCheckController.cs b/EOM.TSHotelManager.WebApi/Controllers/Worker/Check/WorkerCheckController.cs
index 1832d807abda00635438033557f0a64a7bd58d2f..38965a6f044a4cdebe1941b9d0fc93b3988b339d 100644
--- a/EOM.TSHotelManager.WebApi/Controllers/Worker/Check/WorkerCheckController.cs
+++ b/EOM.TSHotelManager.WebApi/Controllers/Worker/Check/WorkerCheckController.cs
@@ -31,7 +31,7 @@ namespace EOM.TSHotelManager.WebApi.Controllers
///
///
[HttpGet]
- public List SelectCheckInfoByWorkerNo([FromQuery]string? wid)
+ public List SelectCheckInfoByWorkerNo([FromQuery]string wid)
{
return workerCheckService.SelectCheckInfoByWorkerNo(wid);
}
@@ -42,7 +42,7 @@ namespace EOM.TSHotelManager.WebApi.Controllers
///
///
[HttpGet]
- public object SelectWorkerCheckDaySumByWorkerNo([FromQuery]string? wkn)
+ public object SelectWorkerCheckDaySumByWorkerNo([FromQuery]string wkn)
{
return workerCheckService.SelectWorkerCheckDaySumByWorkerNo(wkn);
}
@@ -53,7 +53,7 @@ namespace EOM.TSHotelManager.WebApi.Controllers
///
///
[HttpGet]
- public object SelectToDayCheckInfoByWorkerNo([FromQuery] string? wkn)
+ public object SelectToDayCheckInfoByWorkerNo([FromQuery] string wkn)
{
return workerCheckService.SelectToDayCheckInfoByWorkerNo(wkn);
}
diff --git a/EOM.TSHotelManager.WebApi/Controllers/Worker/GoodBad/WorkerGoodBadController.cs b/EOM.TSHotelManager.WebApi/Controllers/Worker/GoodBad/WorkerGoodBadController.cs
index e10609a08c2aa53227333e197173d2bd43217a58..1283f47d22f55a7decd6467a939d2adc71d6db8e 100644
--- a/EOM.TSHotelManager.WebApi/Controllers/Worker/GoodBad/WorkerGoodBadController.cs
+++ b/EOM.TSHotelManager.WebApi/Controllers/Worker/GoodBad/WorkerGoodBadController.cs
@@ -42,7 +42,7 @@ namespace EOM.TSHotelManager.WebApi.Controllers
///
///
[HttpGet]
- public List SelectAllGoodBadByWorkNo([FromQuery]string? wn)
+ public List SelectAllGoodBadByWorkNo([FromQuery]string wn)
{
return workerGoodBadService.SelectAllGoodBadByWorkNo(wn);
}
diff --git a/EOM.TSHotelManager.WebApi/Controllers/Worker/History/WorkerHistoryController.cs b/EOM.TSHotelManager.WebApi/Controllers/Worker/History/WorkerHistoryController.cs
index 7a644d7d224211946d00281084f055f163c4af07..2d3a605cf83c6b36f400e65b505eb64e1193d346 100644
--- a/EOM.TSHotelManager.WebApi/Controllers/Worker/History/WorkerHistoryController.cs
+++ b/EOM.TSHotelManager.WebApi/Controllers/Worker/History/WorkerHistoryController.cs
@@ -42,7 +42,7 @@ namespace EOM.TSHotelManager.WebApi.Controllers
///
///
[HttpGet]
- public List SelectHistoryByWorkerId([FromQuery]string? wid)
+ public List SelectHistoryByWorkerId([FromQuery]string wid)
{
return workerHistoryService.SelectHistoryByWorkerId(wid);
}
diff --git a/EOM.TSHotelManager.WebApi/Controllers/Worker/WorkerController.cs b/EOM.TSHotelManager.WebApi/Controllers/Worker/WorkerController.cs
index 8a9c04221bc88d0a4fcd748980936655e7bb8d19..f0d5ea1b687492b40d725fc586a8ba41690903ff 100644
--- a/EOM.TSHotelManager.WebApi/Controllers/Worker/WorkerController.cs
+++ b/EOM.TSHotelManager.WebApi/Controllers/Worker/WorkerController.cs
@@ -86,7 +86,7 @@ namespace EOM.TSHotelManager.WebApi.Controllers
///
///
[HttpGet]
- public Worker SelectWorkerInfoByWorkerId([FromQuery]string? workerId)
+ public Worker SelectWorkerInfoByWorkerId([FromQuery]string workerId)
{
return workerService.SelectWorkerInfoByWorkerId(workerId);
}
diff --git a/EOM.TSHotelManager.WebApi/Controllers/Zero/Admin/AdminController.cs b/EOM.TSHotelManager.WebApi/Controllers/Zero/Admin/AdminController.cs
index 181f163996bea8d17f4400c7f37a5d614b2428a5..c9c2f506887ae2e1f093795354f44cac91c7d3d8 100644
--- a/EOM.TSHotelManager.WebApi/Controllers/Zero/Admin/AdminController.cs
+++ b/EOM.TSHotelManager.WebApi/Controllers/Zero/Admin/AdminController.cs
@@ -44,7 +44,7 @@ namespace EOM.TSHotelManager.WebApi.Controllers
///
///
[HttpGet]
- public Admin SelectAdminPwdByAccount([FromQuery]string? account)
+ public Admin SelectAdminPwdByAccount([FromQuery]string account)
{
return adminService.SelectAdminPwdByAccount(account);
}
diff --git a/EOM.TSHotelManager.WebApi/EOM.TSHotelManager.WebApi.csproj b/EOM.TSHotelManager.WebApi/EOM.TSHotelManager.WebApi.csproj
index 09cc55b167c34c5b9a420a95bd71cf6e6b9ed693..9fdb9e7231408138f7cf2249725f9de81651646c 100644
--- a/EOM.TSHotelManager.WebApi/EOM.TSHotelManager.WebApi.csproj
+++ b/EOM.TSHotelManager.WebApi/EOM.TSHotelManager.WebApi.csproj
@@ -1,12 +1,13 @@
- net6.0-windows8.0
+ net6.0
EOM.TSHotelManager.WebApi.Program
+ True
- EOM.TSHotelManager.WebApi.xml
+
Off
1701;1702;1591;
diff --git a/EOM.TSHotelManager.WebApi/EOM.TSHotelManager.WebApi.xml b/EOM.TSHotelManager.WebApi/EOM.TSHotelManager.WebApi.xml
deleted file mode 100644
index 18a0fb22a90a9e9449543c7c5f273815dd17b1b3..0000000000000000000000000000000000000000
--- a/EOM.TSHotelManager.WebApi/EOM.TSHotelManager.WebApi.xml
+++ /dev/null
@@ -1,1474 +0,0 @@
-
-
-
- EOM.TSHotelManager.WebApi
-
-
-
-
- 资产信息控制器
-
-
-
-
- 资产信息
-
-
-
-
-
-
-
-
-
-
- 添加资产信息
-
-
-
-
-
-
- 查询资产信息
-
-
-
-
-
- 用户信息控制器
-
-
-
-
- 用户信息
-
-
-
-
-
-
-
-
-
-
- 添加客户信息
-
-
-
-
-
-
- 更新客户信息
-
-
-
-
-
-
- 更新客户类型(即会员等级)
-
-
-
-
-
-
-
- 查询酒店盈利情况
-
-
-
-
-
- 查询所有客户信息
-
-
-
-
-
- 查询指定客户信息
-
-
-
-
-
- 根据客户编号查询客户信息
-
-
-
-
-
-
- 酒店宣传联动内容控制器
-
-
-
-
- 酒店宣传联动内容
-
-
-
-
-
-
-
-
-
-
- 查询所有宣传联动内容(跑马灯)
-
-
-
-
-
- 预约信息控制器
-
-
-
-
- 预约信息
-
-
-
-
-
-
-
-
-
-
- 获取所有预约信息
-
-
-
-
-
- 根据房间编号获取预约信息
-
-
-
-
-
-
- 删除预约信息
-
-
-
-
-
-
- 添加预约信息
-
-
-
-
-
-
- 房间信息控制器
-
-
-
-
- 房间信息
-
-
-
-
-
-
-
-
-
-
- 根据房间状态获取相应状态的房间信息
-
-
-
-
-
-
- 根据房间状态来查询可使用的房间
-
-
-
-
-
- 获取所有房间信息
-
-
-
-
-
- 获取房间分区的信息
-
-
-
-
-
- 根据房间编号查询房间信息
-
-
-
-
-
-
- 根据房间编号退房(退房)
-
-
-
-
-
-
- 根据房间编号查询截止到今天住了多少天
-
-
-
-
-
-
- 根据房间编号修改房间信息(入住)
-
-
-
-
-
-
- 根据房间编号修改房间信息(预约)
-
-
-
-
-
-
- 查询可入住房间数量
-
-
-
-
-
- 查询已入住房间数量
-
-
-
-
-
- 根据房间编号查询房间价格
-
-
-
-
-
- 查询脏房数量
-
-
-
-
-
- 查询维修房数量
-
-
-
-
-
- 查询预约房数量
-
-
-
-
-
- 根据房间编号更改房间状态
-
-
-
-
-
-
-
- 添加房间
-
-
-
-
-
-
- 查询所有可消费(已住)房间
-
-
-
-
-
- 获取所有房间状态
-
-
-
-
-
- 根据房间编号查询房间状态编号
-
-
-
-
-
-
- 房间类型控制器
-
-
-
-
- 房间类型
-
-
-
-
-
-
-
-
-
-
- 获取所有房间类型
-
-
-
-
-
- 根据房间编号查询房间类型名称
-
-
-
-
-
-
- 商品消费控制器
-
-
-
-
- 商品消费
-
-
-
-
-
-
-
-
-
-
- 查询所有商品
-
-
-
-
-
- 修改商品
-
-
-
-
-
-
-
- 修改商品信息
-
-
-
-
-
-
- 撤回客户消费信息
-
-
-
-
-
-
-
-
- 根据商品编号删除商品信息
-
-
-
-
-
-
- 根据商品名称和价格查询商品编号
-
-
-
-
-
-
-
- 根据商品编号查询商品信息
-
-
-
-
-
-
- 添加商品
-
-
-
-
-
-
- 消费信息控制器
-
-
-
-
- 消费信息
-
-
-
-
-
-
-
-
-
-
- 添加消费信息
-
-
-
-
-
-
- 根据客户编号查询消费信息
-
-
-
-
-
-
- 根据房间编号查询消费信息
-
-
-
-
-
-
- 根据客户编号查询历史消费信息
-
-
-
-
-
-
- 查询消费的所有信息
-
-
-
-
-
- 根据房间号查询消费的所有信息
-
-
-
-
-
- 根据房间编号、入住时间到当前时间查询消费总金额
-
-
-
-
-
-
-
- 根据房间编号、入住时间和当前时间修改结算状态
-
-
-
-
-
-
-
- 将转房前的未结算记录一同转移到新房间
-
-
-
-
-
-
- 更新消费信息
-
-
-
-
-
-
- 水电信息控制器
-
-
-
-
- 水电信息
-
-
-
-
-
-
-
-
-
-
- 根据房间编号查询水电费信息
-
-
-
-
-
-
- 根据房间编号、使用时间查询水电费信息
-
-
-
-
-
-
-
-
- 获取所有水电费信息
-
-
-
-
-
- 添加水电费信息
-
-
-
-
-
-
- 修改水电费信息(根据房间编号)
-
-
-
-
-
-
- 根据房间信息、使用时间修改水电费
-
-
-
-
-
-
- 根据房间编号、使用时间删除水电费信息
-
-
-
-
-
-
-
-
- 获取所有水电费信息
-
-
-
-
-
- 导航控件模块控制器
-
-
-
-
- 导航控件
-
-
-
-
-
-
-
-
-
-
- 导航控件列表
-
-
-
-
-
- 工具类控制器
-
-
-
-
- 工具
-
-
-
-
-
-
-
-
-
-
- 查询身份证号码
-
-
-
-
-
-
- 检测版本号
-
-
-
-
-
- 添加操作日志
-
-
-
-
-
-
- 查询所有操作日志
-
-
-
-
-
- 员工打卡控制器
-
-
-
-
- 员工打卡
-
-
-
-
-
-
-
-
-
-
- 根据员工编号查询其所有的打卡记录
-
-
-
-
-
-
- 查询员工签到天数
-
-
-
-
-
-
- 查询今天员工是否已签到
-
-
-
-
-
-
- 添加员工打卡数据
-
-
-
-
-
-
- 奖惩信息控制器
-
-
-
-
- 奖惩信息
-
-
-
-
-
-
-
-
-
-
- 添加员工奖惩记录
-
-
-
-
-
-
- 根据工号查找所有的奖惩记录信息
-
-
-
-
-
-
- 员工履历控制器
-
-
-
-
- 员工履历
-
-
-
-
-
-
-
-
-
-
- 根据工号添加员工履历
-
-
-
-
-
-
- 根据工号查询履历信息
-
-
-
-
-
-
- 照片控制器
-
-
-
-
- 照片
-
-
-
-
-
-
-
-
-
-
- 查询员工照片
-
-
-
-
-
-
- 添加员工照片
-
-
-
-
-
-
- 删除员工照片
-
-
-
-
-
-
- 更新员工照片
-
-
-
-
-
-
- 员工信息控制器
-
-
-
-
- 员工信息
-
-
-
-
-
-
-
-
-
-
- 修改员工信息
-
-
-
-
-
-
- 员工账号禁/启用
-
-
-
-
-
-
- 更新员工职位和部门
-
-
-
-
-
-
- 添加员工信息
-
-
-
-
-
-
- 获取所有工作人员信息
-
-
-
-
-
- 根据登录名称查询员工信息
-
-
-
-
-
-
- 根据登录名称、密码查询员工信息
-
-
-
-
-
-
- 根据员工编号和密码修改密码
-
-
-
-
-
-
- 管理员控制器
-
-
-
-
- 管理员模块
-
-
-
-
-
-
-
-
-
-
- 根据超管密码查询员工类型和权限
-
-
-
-
-
-
- 根据超管账号查询对应的密码
-
-
-
-
-
-
- 获取所有管理员列表
-
-
-
-
-
- 修改密码
-
-
-
-
-
-
- 获取管理员列表
-
-
-
-
-
- 添加管理员
-
-
-
-
-
-
- 获取管理员信息
-
-
-
-
-
-
- 获取所有管理员类型
-
-
-
-
-
- 批量更新管理员账户
-
-
-
-
-
-
- 基础信息控制器
-
-
-
-
- 基础信息
-
-
-
-
-
-
-
-
-
-
- 查询所有性别类型
-
-
-
-
-
- 查询性别类型
-
-
-
-
-
- 添加性别类型
-
-
-
-
-
-
- 删除性别类型
-
-
-
-
-
-
- 更新性别类型
-
-
-
-
-
-
- 查询所有职位类型
-
-
-
-
-
- 查询职位类型
-
-
-
-
-
- 添加职位类型
-
-
-
-
-
-
- 删除职位类型
-
-
-
-
-
-
- 更新职位类型
-
-
-
-
-
-
- 查询所有民族类型
-
-
-
-
-
- 查询民族类型
-
-
-
-
-
- 添加民族类型
-
-
-
-
-
-
- 删除民族类型
-
-
-
-
-
-
- 更新民族类型
-
-
-
-
-
-
- 查询所有学历类型
-
-
-
-
-
- 查询学历类型
-
-
-
-
-
- 添加学历类型
-
-
-
-
-
-
- 删除学历类型
-
-
-
-
-
-
- 更新学历类型
-
-
-
-
-
-
- 查询所有部门类型(可用)
-
-
-
-
-
- 查询所有部门类型
-
-
-
-
-
- 查询部门类型
-
-
-
-
-
- 添加部门类型
-
-
-
-
-
-
- 删除部门类型
-
-
-
-
-
-
- 更新部门类型
-
-
-
-
-
-
- 查询所有客户类型(可用)
-
-
-
-
-
- 查询所有客户类型
-
-
-
-
-
- 根据客户类型ID查询类型名称
-
-
-
-
-
-
- 添加客户类型
-
-
-
-
-
-
- 删除客户类型
-
-
-
-
-
-
- 更新客户类型
-
-
-
-
-
-
- 查询所有证件类型(可用)
-
-
-
-
-
- 查询所有证件类型
-
-
-
-
-
- 根据证件类型ID查询类型名称
-
-
-
-
-
-
- 添加证件类型
-
-
-
-
-
-
- 删除证件类型
-
-
-
-
-
-
- 更新证件类型
-
-
-
-
-
-
- 查询所有奖惩类型(可用)
-
-
-
-
-
- 查询所有奖惩类型
-
-
-
-
-
- 根据奖惩类型ID查询类型名称
-
-
-
-
-
-
- 添加奖惩类型
-
-
-
-
-
-
- 删除奖惩类型
-
-
-
-
-
-
- 更新奖惩类型
-
-
-
-
-
-
- 基础URL
-
-
-
-
-
- 监管统计控制器
-
-
-
-
- 监管统计
-
-
-
-
-
-
-
-
-
-
- 查询所有监管统计信息
-
-
-
-
-
- 系统模块控制器
-
-
-
-
- 系统模块
-
-
-
-
-
-
-
-
-
-
- 获取所有模块
-
-
-
-
-
- 根据账号获取对应模块
-
-
-
-
-
-
- 批量添加模块
-
-
-
-
-
-
- 批量删除模块
-
-
-
-
-
-
- 公告控制器
-
-
-
-
- 公告
-
-
-
-
-
-
-
-
-
-
- 获取所有公告信息
-
-
-
-
-
- 查询公告
-
-
-
-
-
-
- 上传公告信息
-
-
-
-
-
-
- 会员规则控制器
-
-
-
-
- 会员规则
-
-
-
-
-
-
-
-
-
-
- 查询会员等级规则列表
-
-
-
-
-
- 查询会员等级规则
-
-
-
-
-
-
- 添加会员等级规则
-
-
-
-
-
-
- 删除会员等级规则
-
-
-
-
-
-
- 更新会员等级规则
-
-
-
-
-
-
- Action方法调用之前执行
-
-
-
-
-
- Action 方法调用后,Result 方法调用前执行
-
-
-
-
-
- Result 方法调用前执行
-
-
-
-
-
- Result 方法调用后执行
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Mvc扩展方法
-
-
-
-
- 扩展方法
-
-
-
-
-
-
- 全局路由前缀配置
-
-
-
-
- 定义一个路由前缀变量
-
-
-
-
- 调用时传入指定的路由前缀
-
-
-
-
-
- AutoFac
-
-
-
-
-
diff --git a/EOM.TSHotelManager.WebApi/Program.cs b/EOM.TSHotelManager.WebApi/Program.cs
index 3cf7d8bc44b6d1ade7cad7083efaaf6948cdf19c..a1734455a360d799d4b76092403c82c7f4abad48 100644
--- a/EOM.TSHotelManager.WebApi/Program.cs
+++ b/EOM.TSHotelManager.WebApi/Program.cs
@@ -21,7 +21,7 @@ namespace EOM.TSHotelManager.WebApi
///
///
///
- public static void Main(string?[] args)
+ public static void Main(string[] args)
{
CreateHostBuilder(args).Build().Run();
}
@@ -31,7 +31,7 @@ namespace EOM.TSHotelManager.WebApi
///
///
///
- public static IHostBuilder CreateHostBuilder(string?[] args) =>
+ public static IHostBuilder CreateHostBuilder(string[] args) =>
Host.CreateDefaultBuilder(args)
.UseServiceProviderFactory(new AutofacServiceProviderFactory())//滻Ĭ
.ConfigureWebHostDefaults(webBuilder =>
diff --git a/EOM.TSHotelManager.WebApi/Startup.cs b/EOM.TSHotelManager.WebApi/Startup.cs
index 6466977647d26056057d29c26e62c6a1701d9984..250d884c4342e957d5699ab888f2e279f8e70ee1 100644
--- a/EOM.TSHotelManager.WebApi/Startup.cs
+++ b/EOM.TSHotelManager.WebApi/Startup.cs
@@ -39,7 +39,7 @@ namespace EOM.TSHotelManager.WebApi
public void ConfigureServices(IServiceCollection services)
{
//services.AddControllers();
- services.AddControllers().AddJsonOptions(opts =>
+ services.AddControllers().AddJsonOptions(opts =>
{
opts.JsonSerializerOptions.Encoder = JavaScriptEncoder.Create(UnicodeRanges.All);
opts.JsonSerializerOptions.PropertyNamingPolicy = null;
diff --git a/Library/Library.csproj b/Library/Library.csproj
index 132c02c59c23649c0b1ecd3906af6a82a3852d7a..141e38ffe4bf1059f02e59d81a363606ad8b555a 100644
--- a/Library/Library.csproj
+++ b/Library/Library.csproj
@@ -3,7 +3,7 @@
net6.0
enable
- enable
+ disable