diff --git a/EOM.TSHotelManager.Application/Business/Customer/CustoService.cs b/EOM.TSHotelManager.Application/Business/Customer/CustoService.cs
index 3faa40bd0f7298131b25769a4699176d065bb0f3..22c65492715a0ad5dc0ccd32ac925427845a15da 100644
--- a/EOM.TSHotelManager.Application/Business/Customer/CustoService.cs
+++ b/EOM.TSHotelManager.Application/Business/Customer/CustoService.cs
@@ -125,8 +125,7 @@ namespace EOM.TSHotelManager.Application
CustoID = custo.CustoID,
CustoTel = custo.CustoTel,
PassportType = custo.PassportType,
- datachg_usr = custo.datachg_usr,
- datachg_date = DateTime.Now
+ datachg_usr = custo.datachg_usr
},a => a.CustoNo == custo.CustoNo);
}
@@ -303,7 +302,7 @@ namespace EOM.TSHotelManager.Application
///
public Custo SelectCardInfoByCustoNo(string CustoNo)
{
- Custo c = custoRepository.GetSingle(a => a.CustoNo.Contains(CustoNo));
+ Custo c = custoRepository.GetSingle(a => a.CustoNo.Equals(CustoNo));
if (c.IsNullOrEmpty())
{
return null;
diff --git a/EOM.TSHotelManager.Application/Business/Reser/ReserService.cs b/EOM.TSHotelManager.Application/Business/Reser/ReserService.cs
index f64f765c70479b1f1d3989e23a5ab87bbe7239fc..a70011742bf71b25f633e349f5262e629f47a8da 100644
--- a/EOM.TSHotelManager.Application/Business/Reser/ReserService.cs
+++ b/EOM.TSHotelManager.Application/Business/Reser/ReserService.cs
@@ -97,8 +97,7 @@ namespace EOM.TSHotelManager.Application
return reserRepository.Update(a => new Reser()
{
delete_mk = 1,
- datachg_usr = string.Empty,
- datachg_date = DateTime.Now
+ datachg_usr = string.Empty
},a => a.ReserId == reser.ReserId);
}
diff --git a/EOM.TSHotelManager.Application/Business/Room/RoomService.cs b/EOM.TSHotelManager.Application/Business/Room/RoomService.cs
index cc4699189c61d5ace8378b3b522df32da353f278..b0e77c4acbe345c06148e50e049aaeeb5631a7ae 100644
--- a/EOM.TSHotelManager.Application/Business/Room/RoomService.cs
+++ b/EOM.TSHotelManager.Application/Business/Room/RoomService.cs
@@ -200,6 +200,8 @@ namespace EOM.TSHotelManager.Application
room = roomRepository.GetSingle(a => a.delete_mk != 1 && a.RoomNo == no);
var roomSate = roomStates.FirstOrDefault(a => a.RoomStateId == room.RoomStateId);
room.RoomState = string.IsNullOrEmpty(roomSate.RoomStateName) ? "" : roomSate.RoomStateName;
+ var roomType = roomTypeRepository.GetSingle(a => a.Roomtype == room.RoomType);
+ room.RoomName = string.IsNullOrEmpty(roomType.RoomName) ? "" : roomType.RoomName;
return room;
}
#endregion
@@ -262,8 +264,7 @@ namespace EOM.TSHotelManager.Application
return roomRepository.Update(a => new Room()
{
RoomStateId = r.RoomStateId,
- datachg_usr = string.Empty,
- datachg_date = DateTime.Now
+ datachg_usr = r.datachg_usr
}, a => a.RoomNo == r.RoomNo);
}
#endregion
@@ -345,9 +346,7 @@ namespace EOM.TSHotelManager.Application
{
return roomRepository.Update(a => new Room()
{
- RoomStateId = stateid,
- datains_usr = string.Empty,
- datachg_date = DateTime.Now
+ RoomStateId = stateid
},a => a.RoomNo == roomno);
}
#endregion
diff --git a/EOM.TSHotelManager.Application/Business/Sellthing/SellService.cs b/EOM.TSHotelManager.Application/Business/Sellthing/SellService.cs
index e7844ee0f0d11f72d52c806aff06a7b17de60204..d1c870b96b6b93c6d475e624e4b5e4c0081225ab 100644
--- a/EOM.TSHotelManager.Application/Business/Sellthing/SellService.cs
+++ b/EOM.TSHotelManager.Application/Business/Sellthing/SellService.cs
@@ -104,8 +104,6 @@ namespace EOM.TSHotelManager.Application
return sellThingRepository.Update(a => new SellThing()
{
Stock = Convert.ToInt32(stock),
- datachg_usr = string.Empty,
- datachg_date = DateTime.Now
},a => a.SellNo == sellNo);
}
@@ -137,8 +135,6 @@ namespace EOM.TSHotelManager.Application
return spendRepository.Update(a => new Spend()
{
delete_mk = 1,
- datachg_usr = string.Empty,
- datachg_date = DateTime.Now
},a => a.MoneyState.Equals(SpendConsts.UnSettle) && a.RoomNo == roomNo && a.CustoNo == custoNo
&& a.SpendName == sellName);
@@ -153,9 +149,7 @@ namespace EOM.TSHotelManager.Application
{
return sellThingRepository.Update(a => new SellThing()
{
- delete_mk = 1,
- datachg_usr = string.Empty,
- datachg_date = DateTime.Now
+ delete_mk = 1
}, a => a.SellNo == sellNo);
}
diff --git a/EOM.TSHotelManager.Application/Business/Spend/SpendService.cs b/EOM.TSHotelManager.Application/Business/Spend/SpendService.cs
index 75cd2d7e1608e683569a66fb5e165842f7b2a75a..14e50359873bbda0a28ba235683fb5dd63699e03 100644
--- a/EOM.TSHotelManager.Application/Business/Spend/SpendService.cs
+++ b/EOM.TSHotelManager.Application/Business/Spend/SpendService.cs
@@ -207,9 +207,7 @@ namespace EOM.TSHotelManager.Application
{
return spendRepository.Update(a => new Spend()
{
- MoneyState = SpendConsts.Settled,
- datachg_usr = string.Empty,
- datachg_date = DateTime.Now
+ MoneyState = SpendConsts.Settled
},a => a.RoomNo == roomno && a.SpendTime >= Convert.ToDateTime(checktime) && a.SpendTime <= DateTime.Now);
}
#endregion
@@ -229,8 +227,7 @@ namespace EOM.TSHotelManager.Application
return spendRepository.Update(a => new Spend()
{
RoomNo = spend.RoomNo,
- datachg_usr = string.Empty,
- datachg_date = DateTime.Now
+ datachg_usr = spend.datachg_usr
}, a => listSpendId.Contains(a.SpendName) && a.CustoNo.Equals(spend.CustoNo) && a.SpendTime >= DateTime.Now
&& a.SpendTime <= DateTime.Now);
diff --git a/EOM.TSHotelManager.Application/Business/Wti/WtiService.cs b/EOM.TSHotelManager.Application/Business/Wti/WtiService.cs
index 0761ddb6e9b6c26fb66d27274d9e8019370fb1b3..68eb411d6a4171e56717e3ac4a124ac6b0b97afc 100644
--- a/EOM.TSHotelManager.Application/Business/Wti/WtiService.cs
+++ b/EOM.TSHotelManager.Application/Business/Wti/WtiService.cs
@@ -132,7 +132,6 @@ namespace EOM.TSHotelManager.Application
Record = w.Record,
CustoNo = w.CustoNo,
datachg_usr = w.datachg_usr,
- datachg_date = w.datachg_date,
RoomNo = w.RoomNo
},a => a.WtiNo == w.WtiNo);
@@ -151,8 +150,7 @@ namespace EOM.TSHotelManager.Application
{
WaterUse = w.WaterUse,
PowerUse = w.PowerUse,
- datachg_usr = string.Empty,
- datachg_date = DateTime.Now,
+ datachg_usr = w.datachg_usr
},a => a.RoomNo == w.RoomNo && a.UseDate >= w.UseDate && a.EndDate >= w.EndDate);
}
#endregion
@@ -188,9 +186,7 @@ namespace EOM.TSHotelManager.Application
//sql = string.Format(sql, roomno, usedate, enddate);
return wtiRepository.Update(a => new Wti()
{
- delete_mk = 1,
- datachg_usr = string.Empty,
- datachg_date = DateTime.Now
+ delete_mk = 1
},a => a.RoomNo == roomno && a.UseDate >= Convert.ToDateTime(usedate) && a.EndDate >= Convert.ToDateTime(enddate));
}
#endregion
diff --git a/EOM.TSHotelManager.Application/EOM.TSHotelManager.Application.csproj b/EOM.TSHotelManager.Application/EOM.TSHotelManager.Application.csproj
index 5ced6c2aa73cde0dc71bba070c5aac933adf57e8..eafac8e0973a8f2aa52c79954b56c9f4fabf4298 100644
--- a/EOM.TSHotelManager.Application/EOM.TSHotelManager.Application.csproj
+++ b/EOM.TSHotelManager.Application/EOM.TSHotelManager.Application.csproj
@@ -15,6 +15,12 @@
1701;1702;8618;
+
+
+
+
+
+
diff --git a/EOM.TSHotelManager.Application/Worker/IWorkerService.cs b/EOM.TSHotelManager.Application/Worker/IWorkerService.cs
index 5f2fe7aa1d5b4ac0c18e7d68a2e48ea223e304c5..767b5f8762750035ee40f85e176ffbb3876c6ef1 100644
--- a/EOM.TSHotelManager.Application/Worker/IWorkerService.cs
+++ b/EOM.TSHotelManager.Application/Worker/IWorkerService.cs
@@ -70,6 +70,13 @@ namespace EOM.TSHotelManager.Application
///
///
List SelectWorkerAll();
+
+ ///
+ /// 检查指定部门下是否存在工作人员
+ ///
+ ///
+ ///
+ bool CheckWorkerBydepartment(string deptNo);
#endregion
#region 根据登录名称查询员工信息
diff --git a/EOM.TSHotelManager.Application/Worker/WorkerService.cs b/EOM.TSHotelManager.Application/Worker/WorkerService.cs
index 2b937b9a94833eeb4001f2eda3f0e4dd3b04d332..035556ee3691165ed2935a19105517ff11c4618b 100644
--- a/EOM.TSHotelManager.Application/Worker/WorkerService.cs
+++ b/EOM.TSHotelManager.Application/Worker/WorkerService.cs
@@ -21,9 +21,12 @@
*SOFTWARE.
*
*/
+using CK.Common;
using EOM.Encrypt;
using EOM.TSHotelManager.Core;
using EOM.TSHotelManager.EntityFramework;
+using SqlSugar;
+using SqlSugar.DistributedSystem.Snowflake;
using System;
using System.Collections.Generic;
using System.Linq;
@@ -124,8 +127,7 @@ namespace EOM.TSHotelManager.Application
CardId= worker.CardId,
WorkerSex = worker.WorkerSex,
WorkerBirthday = worker.WorkerBirthday,
- datachg_usr = string.Empty,
- datachg_date = DateTime.Now
+ datachg_usr = worker.datachg_usr
},a => a.WorkerId.Equals(worker.WorkerId));
}
@@ -156,8 +158,7 @@ namespace EOM.TSHotelManager.Application
{
WorkerClub = worker.WorkerClub,
WorkerPosition = worker.WorkerPosition,
- datachg_usr = string.Empty,
- datachg_date = DateTime.Now
+ datachg_usr = worker.datachg_usr
}, a => a.WorkerId == worker.WorkerId);
}
@@ -184,6 +185,10 @@ namespace EOM.TSHotelManager.Application
///
public List SelectWorkerAll()
{
+ var where = Expressionable.Create();
+
+ where = where.And(a => a.delete_mk != 1);
+
//查询所有教育程度信息
List educations = new List();
educations = educationRepository.GetList(a => a.delete_mk != 1);
@@ -201,7 +206,8 @@ namespace EOM.TSHotelManager.Application
positions = positionRepository.GetList(a => a.delete_mk != 1);
//查询所有员工信息
List workers = new List();
- workers = workerRepository.Change().GetList();
+
+ workers = workerRepository.GetList(where.ToExpression());
workers.ForEach(source =>
{
//解密身份证号码
@@ -229,6 +235,18 @@ namespace EOM.TSHotelManager.Application
return workers;
}
+
+ ///
+ /// 根据部门ID获取工作人员信息
+ ///
+ ///
+ ///
+ public bool CheckWorkerBydepartment(string deptNo)
+ {
+ var workers = workerRepository.Count(a=> a.WorkerClub.Equals(deptNo));
+
+ return workers > 0 ? true : false;
+ }
#endregion
#region 根据登录名称查询员工信息
@@ -321,8 +339,7 @@ namespace EOM.TSHotelManager.Application
return workerRepository.Update(a => new Worker()
{
WorkerPwd = NewPwd,
- datachg_usr = string.Empty,
- datachg_date = DateTime.Now
+ datachg_usr = worker.datachg_usr
},a => a.WorkerId == worker.WorkerId);
}
diff --git a/EOM.TSHotelManager.Application/Zero/Admin/AdminService.cs b/EOM.TSHotelManager.Application/Zero/Admin/AdminService.cs
index 5958033317cc6203678c9ac1e093e421ce28e252..a94ae91a28bd6f23b96263ae9b460105b7c6e356 100644
--- a/EOM.TSHotelManager.Application/Zero/Admin/AdminService.cs
+++ b/EOM.TSHotelManager.Application/Zero/Admin/AdminService.cs
@@ -148,9 +148,7 @@ namespace EOM.TSHotelManager.Application
admin.AdminPassword = encrypt.Encryption(admin.AdminPassword, EncryptionLevel.Enhanced);
return adminRepository.Update(a => new Admin()
{
- AdminPassword = admin.AdminPassword,
- datachg_usr = string.Empty,
- datachg_time = DateTime.Now
+ AdminPassword = admin.AdminPassword
}, a => a.AdminAccount == admin.AdminAccount);
}
diff --git a/EOM.TSHotelManager.Application/Zero/Base/BaseService.cs b/EOM.TSHotelManager.Application/Zero/Base/BaseService.cs
index b66e5baada8e821ae7623b50c7c640afbd09fa22..004c1aa906263ac4c2f948c4e3f52a490c8524d1 100644
--- a/EOM.TSHotelManager.Application/Zero/Base/BaseService.cs
+++ b/EOM.TSHotelManager.Application/Zero/Base/BaseService.cs
@@ -125,7 +125,8 @@ namespace EOM.TSHotelManager.Application
public List SelectSexTypeAll(SexType sexType = null)
{
var where = Expressionable.Create();
- if (sexType != null && sexType.sexName.IsNullOrEmpty())
+
+ if (sexType != null && !sexType.delete_mk.IsNullOrEmpty())
{
where = where.And(a => a.delete_mk == sexType.delete_mk);
}
@@ -167,8 +168,7 @@ namespace EOM.TSHotelManager.Application
return sexTypeRepository.Update(a => new SexType()
{
delete_mk = sexType.delete_mk,
- datachg_usr = string.Empty,
- datachg_date = DateTime.Now
+ datachg_usr = sexType.datachg_usr
}, a => a.sexId == sexType.sexId);
}
@@ -182,8 +182,7 @@ namespace EOM.TSHotelManager.Application
return sexTypeRepository.Update(a => new SexType()
{
sexName = sexType.sexName,
- datachg_usr = string.Empty,
- datachg_date = DateTime.Now
+ datachg_usr = sexType.datachg_usr,
}, a => a.sexId == sexType.sexId);
}
@@ -198,7 +197,8 @@ namespace EOM.TSHotelManager.Application
public List SelectPositionAll(Position position = null)
{
var where = Expressionable.Create();
- if (position != null && position.position_name.IsNullOrEmpty())
+
+ if (position != null && !position.delete_mk.IsNullOrEmpty())
{
where = where.And(a => a.delete_mk == position.delete_mk);
}
@@ -240,8 +240,7 @@ namespace EOM.TSHotelManager.Application
return positionRepository.Update(a => new Position()
{
delete_mk = position.delete_mk,
- datachg_usr = string.Empty,
- datachg_date = DateTime.Now
+ datachg_usr = position.datachg_usr
}, a => a.position_no == position.position_no);
}
@@ -255,8 +254,7 @@ namespace EOM.TSHotelManager.Application
return positionRepository.Update(a => new Position()
{
position_name = position.position_name,
- datachg_usr = string.Empty,
- datachg_date = DateTime.Now
+ datachg_usr = position.datachg_usr
}, a => a.position_no == position.position_no);
}
@@ -271,7 +269,8 @@ namespace EOM.TSHotelManager.Application
public List SelectNationAll(Nation nation = null)
{
var where = Expressionable.Create();
- if (nation != null && nation.nation_name.IsNullOrEmpty())
+
+ if (nation != null && !nation.delete_mk.IsNullOrEmpty())
{
where = where.And(a => a.delete_mk == nation.delete_mk);
}
@@ -313,8 +312,7 @@ namespace EOM.TSHotelManager.Application
return nationRepository.Update(a => new Nation()
{
delete_mk = nation.delete_mk,
- datachg_usr = string.Empty,
- datachg_date = DateTime.Now
+ datachg_usr = nation.datachg_usr,
}, a => a.nation_no.Equals(nation.nation_no));
}
@@ -329,8 +327,7 @@ namespace EOM.TSHotelManager.Application
return nationRepository.Update(a => new Nation()
{
nation_name = nation.nation_name,
- datachg_usr = string.Empty,
- datachg_date = DateTime.Now
+ datachg_usr = nation.datachg_usr
}, a => a.nation_no.Equals(nation.nation_no));
}
@@ -345,7 +342,8 @@ namespace EOM.TSHotelManager.Application
public List SelectEducationAll(Education education = null)
{
var where = Expressionable.Create();
- if (education != null && education.education_name.IsNullOrEmpty())
+
+ if (education != null && !education.delete_mk.IsNullOrEmpty())
{
where = where.And(a => a.delete_mk == education.delete_mk);
}
@@ -387,8 +385,7 @@ namespace EOM.TSHotelManager.Application
return educationRepository.Update(a => new Education()
{
delete_mk = education.delete_mk,
- datachg_usr = string.Empty,
- datachg_date = DateTime.Now
+ datachg_usr = education.datachg_usr
}, a => a.education_no == education.education_no);
}
@@ -402,8 +399,7 @@ namespace EOM.TSHotelManager.Application
return educationRepository.Update(a => new Education()
{
education_name = education.education_name,
- datachg_usr = string.Empty,
- datachg_date = DateTime.Now
+ datachg_usr =education.datachg_usr
}, a => a.education_no == education.education_no);
}
@@ -487,8 +483,7 @@ namespace EOM.TSHotelManager.Application
return deptRepository.Update(a => new Dept()
{
delete_mk = 1,
- datachg_usr = string.Empty,
- datachg_date = DateTime.Now
+ datachg_usr = dept.datachg_usr
}, a => a.dept_no == dept.dept_no);
}
@@ -505,8 +500,7 @@ namespace EOM.TSHotelManager.Application
dept_desc = dept.dept_desc,
dept_leader = dept.dept_leader,
dept_parent = dept.dept_parent,
- datachg_usr = string.Empty,
- datachg_date = DateTime.Now
+ datachg_usr = dept.datachg_usr
}, a => a.dept_no == dept.dept_no);
}
@@ -568,8 +562,7 @@ namespace EOM.TSHotelManager.Application
return custoTypeRepository.Update(a => new CustoType()
{
delete_mk = 1,
- datachg_usr = string.Empty,
- datachg_date = DateTime.Now
+ datachg_usr = custoType.datachg_usr
}, a => a.UserType == custoType.UserType);
}
@@ -583,8 +576,7 @@ namespace EOM.TSHotelManager.Application
return custoTypeRepository.Update(a => new CustoType()
{
TypeName = custoType.TypeName,
- datachg_usr = string.Empty,
- datachg_date = DateTime.Now
+ datachg_usr = custoType.datachg_usr
}, a => a.UserType == custoType.UserType);
}
@@ -646,8 +638,7 @@ namespace EOM.TSHotelManager.Application
return passPortTypeRepository.Update(a => new PassPortType()
{
delete_mk = 1,
- datachg_usr = string.Empty,
- datachg_date = DateTime.Now
+ datachg_usr = portType.datachg_usr,
}, a => a.PassportId == portType.PassportId);
}
@@ -661,8 +652,7 @@ namespace EOM.TSHotelManager.Application
return passPortTypeRepository.Update(a => new PassPortType()
{
PassportName = portType.PassportName,
- datachg_usr = string.Empty,
- datachg_date = DateTime.Now
+ datachg_usr = portType.datachg_usr
}, a => a.PassportId == portType.PassportId);
}
@@ -724,8 +714,7 @@ namespace EOM.TSHotelManager.Application
return goodbadTypeRepository.Update(a => new GBType()
{
delete_mk = 1,
- datachg_usr = string.Empty,
- datachg_date = DateTime.Now
+ datachg_usr = gBType.datachg_usr,
}, a => a.GBTypeId == gBType.GBTypeId);
}
@@ -739,8 +728,7 @@ namespace EOM.TSHotelManager.Application
return goodbadTypeRepository.Update(a => new GBType()
{
GBName = gBType.GBName,
- datachg_usr = string.Empty,
- datachg_date = DateTime.Now
+ datachg_usr = gBType.datachg_usr
}, a => a.GBTypeId == gBType.GBTypeId);
}
diff --git a/EOM.TSHotelManager.Application/Zero/VipRule/VipRuleAppService.cs b/EOM.TSHotelManager.Application/Zero/VipRule/VipRuleAppService.cs
index 52ece9dffdc54f855f9d250835f86297f68f241a..fce424510a18290cf95bafde79cbc12cd903738e 100644
--- a/EOM.TSHotelManager.Application/Zero/VipRule/VipRuleAppService.cs
+++ b/EOM.TSHotelManager.Application/Zero/VipRule/VipRuleAppService.cs
@@ -113,8 +113,7 @@ namespace EOM.TSHotelManager.Application
rule_value = vipRule.rule_value,
type_id = vipRule.type_id,
delete_mk = 0,
- datains_usr = string.Empty,
- datains_date = DateTime.Now
+ datains_usr = vipRule.datains_usr,
});
}
@@ -128,8 +127,7 @@ namespace EOM.TSHotelManager.Application
return vipRuleRepository.Update(a => new VipRule
{
delete_mk = 1,
- datachg_usr = string.Empty,
- datachg_date = DateTime.Now
+ datachg_usr = vipRule.datachg_usr,
},a => a.rule_id == vipRule.rule_id);
}
@@ -145,8 +143,7 @@ namespace EOM.TSHotelManager.Application
rule_name = vipRule.rule_name,
rule_value = vipRule.rule_value,
delete_mk = vipRule.delete_mk,
- datachg_usr = string.Empty,
- datachg_date = DateTime.Now
+ datachg_usr = vipRule.datachg_usr
}, a => a.rule_id == vipRule.rule_id);
}
}
diff --git a/EOM.TSHotelManager.Core/BaseDTO.cs b/EOM.TSHotelManager.Core/BaseDTO.cs
new file mode 100644
index 0000000000000000000000000000000000000000..f886090242af5cb20a805f8eed34fa8715895f66
--- /dev/null
+++ b/EOM.TSHotelManager.Core/BaseDTO.cs
@@ -0,0 +1,33 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace EOM.TSHotelManager.Core
+{
+ public class BaseDTO
+ {
+ ///
+ /// 资料创建人
+ ///
+ [SqlSugar.SugarColumn(IsOnlyIgnoreUpdate = true)]
+ public string datains_usr { get; set; }
+ ///
+ /// 资料创建时间
+ ///
+ [SqlSugar.SugarColumn(InsertServerTime = true, IsOnlyIgnoreUpdate = true)]
+ public DateTime? datains_date { get; set; }
+ ///
+ /// 资料更新人
+ ///
+ [SqlSugar.SugarColumn(IsOnlyIgnoreInsert = true)]
+ public string datachg_usr { get; set; }
+ ///
+ /// 资料更新时间
+ ///
+ [SqlSugar.SugarColumn(UpdateServerTime = true,IsOnlyIgnoreInsert = true)]
+ public DateTime? datachg_date { get; set; }
+
+ }
+}
diff --git a/EOM.TSHotelManager.Core/Business/Cash/Cash.cs b/EOM.TSHotelManager.Core/Business/Cash/Cash.cs
index e80a4e97354f2126e65e06f1c8f6f62ba733755f..cc98423fec1cb87d8a7ad90cf840aea2fec9319a 100644
--- a/EOM.TSHotelManager.Core/Business/Cash/Cash.cs
+++ b/EOM.TSHotelManager.Core/Business/Cash/Cash.cs
@@ -29,7 +29,7 @@ namespace EOM.TSHotelManager.Core
/// 资产管理
///
[SqlSugar.SugarTable("cashinfo")]
- public class Cash
+ public class Cash : BaseDTO
{
///
/// 资产编号
@@ -78,22 +78,6 @@ namespace EOM.TSHotelManager.Core
/// 删除标记
///
public int delete_mk { get; set; }
- ///
- /// 资料创建人
- ///
- public string datains_usr { get; set; }
- ///
- /// 资料创建时间
- ///
- public DateTime datains_date { get; set; }
- ///
- /// 资料更新人
- ///
- public string datachg_usr { 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 da572f164f1c520214be41264e871315bf6e0b51..61044c12c790e8269c72244ee329fddf4bceac7a 100644
--- a/EOM.TSHotelManager.Core/Business/Customer/Custo.cs
+++ b/EOM.TSHotelManager.Core/Business/Customer/Custo.cs
@@ -30,7 +30,7 @@ namespace EOM.TSHotelManager.Core
/// 客户信息
///
[SqlSugar.SugarTable("customer")]
- public class Custo
+ public class Custo : BaseDTO
{
///
/// 自增ID
@@ -101,22 +101,6 @@ namespace EOM.TSHotelManager.Core
/// 删除标记
///
public int delete_mk { get; set; }
- ///
- /// 资料创建人
- ///
- public string datains_usr { get; set; }
- ///
- /// 资料创建时间
- ///
- public DateTime datains_date { get; set; }
- ///
- /// 资料更新人
- ///
- public string datachg_usr { get; set; }
- ///
- /// 资料更新时间
- ///
- public DateTime datachg_date { get; set; }
}
}
diff --git a/EOM.TSHotelManager.Core/Business/Customer/CustoType.cs b/EOM.TSHotelManager.Core/Business/Customer/CustoType.cs
index e73385d54e4cd60de5bb88ff94f29f85b07c32f8..64443a9477b638de95f195ed6dfcd3355086095e 100644
--- a/EOM.TSHotelManager.Core/Business/Customer/CustoType.cs
+++ b/EOM.TSHotelManager.Core/Business/Customer/CustoType.cs
@@ -30,7 +30,7 @@ namespace EOM.TSHotelManager.Core
/// 客户类型
///
[SqlSugar.SugarTable("usertype")]
- public class CustoType
+ public class CustoType : BaseDTO
{
///
/// 客户类型
@@ -44,21 +44,5 @@ namespace EOM.TSHotelManager.Core
/// 删除标记
///
public int delete_mk { get; set; }
- ///
- /// 资料创建人
- ///
- public string datains_usr { get; set; }
- ///
- /// 资料创建时间
- ///
- public DateTime datains_date { get; set; }
- ///
- /// 资料更新人
- ///
- public string datachg_usr { 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 bf6aec2d7d09893da709133376cd60f292794e1a..7a68688c0bbc17bd447821b93acf98dbc50be821 100644
--- a/EOM.TSHotelManager.Core/Business/Customer/PassPortType.cs
+++ b/EOM.TSHotelManager.Core/Business/Customer/PassPortType.cs
@@ -34,7 +34,7 @@ namespace EOM.TSHotelManager.Core
/// 证件类型
///
[SqlSugar.SugarTable("passporttype")]
- public class PassPortType
+ public class PassPortType : BaseDTO
{
///
/// 证件类型
@@ -49,21 +49,5 @@ namespace EOM.TSHotelManager.Core
/// 删除标记
///
public int delete_mk { get; set; }
- ///
- /// 资料创建人
- ///
- public string datains_usr { get; set; }
- ///
- /// 资料创建时间
- ///
- public DateTime datains_date { get; set; }
- ///
- /// 资料更新人
- ///
- public string datachg_usr { 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 4cea876087a58063043e2f743e13be6f4b2e0c27..c27597c76e08372b486671d73f41652bdcf0198f 100644
--- a/EOM.TSHotelManager.Core/Business/Customer/SexType.cs
+++ b/EOM.TSHotelManager.Core/Business/Customer/SexType.cs
@@ -34,7 +34,7 @@ namespace EOM.TSHotelManager.Core
/// 性别
///
[SqlSugar.SugarTable("sextype")]
- public class SexType
+ public class SexType : BaseDTO
{
///
/// 性别ID
@@ -49,22 +49,6 @@ namespace EOM.TSHotelManager.Core
///
/// 删除标记
///
- public int delete_mk { get; set; }
- ///
- /// 资料创建人
- ///
- public string datains_usr { get; set; }
- ///
- /// 资料创建时间
- ///
- public DateTime datains_date { get; set; }
- ///
- /// 资料更新人
- ///
- public string datachg_usr { get; set; }
- ///
- /// 资料更新时间
- ///
- public DateTime datachg_date { get; set; }
+ public int? delete_mk { get; set; }
}
}
diff --git a/EOM.TSHotelManager.Core/Business/Reser/Reser.cs b/EOM.TSHotelManager.Core/Business/Reser/Reser.cs
index 0a7ddf3c9bef383404ac3041f148a20a1c1086a2..490bef870b9db1674c082b0d951415eff7cbb151 100644
--- a/EOM.TSHotelManager.Core/Business/Reser/Reser.cs
+++ b/EOM.TSHotelManager.Core/Business/Reser/Reser.cs
@@ -30,7 +30,7 @@ namespace EOM.TSHotelManager.Core
/// 预约列表
///
[SqlSugar.SugarTable("reser")]
- public class Reser
+ public class Reser : BaseDTO
{
///
/// 预约编号
@@ -64,22 +64,6 @@ namespace EOM.TSHotelManager.Core
/// 删除标记
///
public int delete_mk { get; set; }
- ///
- /// 资料创建人
- ///
- public string datains_usr { get; set; }
- ///
- /// 资料创建时间
- ///
- public DateTime datains_date { get; set; }
- ///
- /// 资料更新人
- ///
- public string datachg_usr { 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 7a69e13f293e8fad831be2a61288c7fe755fdb36..9d3866f11aee46e7842cc0a66b54f1ba58ef0cd4 100644
--- a/EOM.TSHotelManager.Core/Business/Room/Room.cs
+++ b/EOM.TSHotelManager.Core/Business/Room/Room.cs
@@ -31,7 +31,7 @@ namespace EOM.TSHotelManager.Core
/// 房间实体类
///
[SqlSugar.SugarTable("room")]
- public class Room
+ public class Room : BaseDTO
{
///
/// 房间编号
@@ -107,22 +107,6 @@ namespace EOM.TSHotelManager.Core
/// 删除标记
///
public int delete_mk { get; set; }
- ///
- /// 资料创建人
- ///
- public string datains_usr { get; set; }
- ///
- /// 资料创建时间
- ///
- public DateTime datains_date { get; set; }
- ///
- /// 资料更新人
- ///
- public string datachg_usr { 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 fd4465ad852c93e154d4577ddd0825b747df013e..5e4974f875e500dd85b2528555c498b64ae71c47 100644
--- a/EOM.TSHotelManager.Core/Business/Room/RoomState.cs
+++ b/EOM.TSHotelManager.Core/Business/Room/RoomState.cs
@@ -30,7 +30,7 @@ namespace EOM.TSHotelManager.Core
/// 房间状态
///
[SqlSugar.SugarTable("roomstate")]
- public class RoomState
+ public class RoomState : BaseDTO
{
///
/// 房间状态编号
@@ -45,21 +45,5 @@ namespace EOM.TSHotelManager.Core
/// 删除标记
///
public int delete_mk { get; set; }
- ///
- /// 资料创建人
- ///
- public string datains_usr { get; set; }
- ///
- /// 资料创建时间
- ///
- public DateTime datains_date { get; set; }
- ///
- /// 资料更新人
- ///
- public string datachg_usr { 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 af3355b6d2874833f9841aafdfa721054fc91551..32055e2ee681ad73028bc611bfe68171faba1d17 100644
--- a/EOM.TSHotelManager.Core/Business/Room/RoomType.cs
+++ b/EOM.TSHotelManager.Core/Business/Room/RoomType.cs
@@ -30,7 +30,7 @@ namespace EOM.TSHotelManager.Core
/// 房间类型
///
[SqlSugar.SugarTable("roomtype")]
- public class RoomType
+ public class RoomType: BaseDTO
{
///
/// 类型编号
@@ -43,24 +43,20 @@ namespace EOM.TSHotelManager.Core
public string RoomName { get; set; }
///
- /// 删除标记
- ///
- public int delete_mk { get; set; }
- ///
- /// 资料创建人
- ///
- public string datains_usr { get; set; }
- ///
- /// 资料创建时间
+ /// 房间租金
///
- public DateTime datains_date { get; set; }
+ [SqlSugar.SugarColumn(ColumnName = "room_rent",ColumnDataType = "decimal")]
+ public decimal RoomRent { get; set; }
+
///
- /// 资料更新人
+ /// 房间押金
///
- public string datachg_usr { get; set; }
+ [SqlSugar.SugarColumn(ColumnName = "room_deposit")]
+ public decimal RoomDeposit { get; set; }
+
///
- /// 资料更新时间
+ /// 删除标记
///
- public DateTime datachg_date { get; set; }
+ public int delete_mk { get; set; }
}
}
diff --git a/EOM.TSHotelManager.Core/Business/Sellthing/SellThing.cs b/EOM.TSHotelManager.Core/Business/Sellthing/SellThing.cs
index 2e277a102d4f01394897ef1616dd7bdc70281f07..4e7f71ba8ef76e91e8818a3777185e3fa4e0a196 100644
--- a/EOM.TSHotelManager.Core/Business/Sellthing/SellThing.cs
+++ b/EOM.TSHotelManager.Core/Business/Sellthing/SellThing.cs
@@ -31,7 +31,7 @@ namespace EOM.TSHotelManager.Core
/// 商品信息
///
[SqlSugar.SugarTable("sellthing")]
- public class SellThing
+ public class SellThing : BaseDTO
{
///
/// 商品编号
@@ -62,21 +62,5 @@ namespace EOM.TSHotelManager.Core
/// 删除标记
///
public int delete_mk { get; set; }
- ///
- /// 资料创建人
- ///
- public string datains_usr { get; set; }
- ///
- /// 资料创建时间
- ///
- public DateTime datains_date { get; set; }
- ///
- /// 资料更新人
- ///
- public string datachg_usr { 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 81f2de36bb49a40bb6b0ab1447e695df39164759..59450eb1bedd76099abcd28ce338543de594d18f 100644
--- a/EOM.TSHotelManager.Core/Business/Spend/Spend.cs
+++ b/EOM.TSHotelManager.Core/Business/Spend/Spend.cs
@@ -30,7 +30,7 @@ namespace EOM.TSHotelManager.Core
/// 消费信息
///
[SqlSugar.SugarTable("custospend")]
- public class Spend
+ public class Spend : BaseDTO
{
///
/// 房间编号
@@ -78,23 +78,6 @@ namespace EOM.TSHotelManager.Core
/// 删除标记
///
public int delete_mk { get; set; }
- ///
- /// 资料创建人
- ///
- public string datains_usr { get; set; }
- ///
- /// 资料创建时间
- ///
- public DateTime datains_date { get; set; }
- ///
- /// 资料更新人
- ///
- public string datachg_usr { get; set; }
- ///
- /// 资料更新时间
- ///
- public DateTime datachg_date { get; set; }
-
///
/// 结算状态描述
///
diff --git a/EOM.TSHotelManager.Core/Business/Wti/Wti.cs b/EOM.TSHotelManager.Core/Business/Wti/Wti.cs
index 53f8d8752b83fc13ebdf77389702dc5ca80b7472..aa3f16e52032567aa2e4a6e98a7a618c98a1375f 100644
--- a/EOM.TSHotelManager.Core/Business/Wti/Wti.cs
+++ b/EOM.TSHotelManager.Core/Business/Wti/Wti.cs
@@ -30,7 +30,7 @@ namespace EOM.TSHotelManager.Core
/// 水电信息
///
[SqlSugar.SugarTable("wtinfo")]
- public class Wti
+ public class Wti : BaseDTO
{
///
/// 信息编号
@@ -65,7 +65,7 @@ namespace EOM.TSHotelManager.Core
///
/// 记录员
///
- [SqlSugar.SugarColumn(ColumnName = "Record")]
+ [SqlSugar.SugarColumn(ColumnName = "Record",DefaultValue = "Admin")]
public string Record { get; set; }
///
/// 客户编号
@@ -77,22 +77,6 @@ namespace EOM.TSHotelManager.Core
///
[SqlSugar.SugarColumn(ColumnName = "delete_mk")]
public int delete_mk { get; set; }
- ///
- /// 资料创建人
- ///
- public string datains_usr { get; set; }
- ///
- /// 资料创建时间
- ///
- public DateTime datains_date { get; set; }
- ///
- /// 资料更新人
- ///
- public string datachg_usr { get; set; }
- ///
- /// 资料更新时间
- ///
- public DateTime datachg_date { get; set; }
}
diff --git a/EOM.TSHotelManager.Core/Sys/NavBar/NavBar.cs b/EOM.TSHotelManager.Core/Sys/NavBar/NavBar.cs
index e1c9097e184446020d484f65b5ffe4726bcaa810..2f8ad1fbe4e9d8db36d47bb0dc06a0c9c7feffd9 100644
--- a/EOM.TSHotelManager.Core/Sys/NavBar/NavBar.cs
+++ b/EOM.TSHotelManager.Core/Sys/NavBar/NavBar.cs
@@ -10,7 +10,7 @@ namespace EOM.TSHotelManager.Core
/// 导航控件实体类
///
[SqlSugar.SugarTable("nav_bar")]
- public class NavBar
+ public class NavBar : BaseDTO
{
///
/// 导航控件ID
@@ -41,21 +41,5 @@ namespace EOM.TSHotelManager.Core
/// 删除标记
///
public int delete_mk { get; set; }
- ///
- /// 新增人
- ///
- public string datains_usr { get; set; }
- ///
- /// 新增时间
- ///
- public DateTime datains_date { get; set; }
- ///
- /// 修改人
- ///
- public string datachg_usr { get; set; }
- ///
- /// 修改时间
- ///
- public DateTime datachg_date { get; set; }
}
}
diff --git a/EOM.TSHotelManager.Core/Util/OperationLog.cs b/EOM.TSHotelManager.Core/Util/OperationLog.cs
index 94169c7de9a0cb1183bf905a237867f181c06fb8..1b968a54a701d78b45e1f1e76c1de6333e84ec98 100644
--- a/EOM.TSHotelManager.Core/Util/OperationLog.cs
+++ b/EOM.TSHotelManager.Core/Util/OperationLog.cs
@@ -51,7 +51,7 @@ namespace EOM.TSHotelManager.Core
/// 操作日志
///
[SqlSugar.SugarTable("operationlog")]
- public class OperationLog
+ public class OperationLog : BaseDTO
{
///
/// 操作时间
@@ -88,21 +88,6 @@ namespace EOM.TSHotelManager.Core
///
[SqlSugar.SugarColumn(ColumnName = "login_ip")]
public string login_ip { get; set; }
- /// 资料创建人
- ///
- public string datains_usr { get; set; }
- ///
- /// 资料创建时间
- ///
- public DateTime datains_date { get; set; }
- ///
- /// 资料更新人
- ///
- public string datachg_usr { get; set; }
- ///
- /// 资料更新时间
- ///
- public DateTime datachg_date { get; set; }
///
/// 日志等级
diff --git a/EOM.TSHotelManager.Core/Worker/GBType.cs b/EOM.TSHotelManager.Core/Worker/GBType.cs
index 46b00eb74e865d54e36e164ca75cb9b98053a59d..34f8a821c9271d93f3422215f5ef22ce88a15bcb 100644
--- a/EOM.TSHotelManager.Core/Worker/GBType.cs
+++ b/EOM.TSHotelManager.Core/Worker/GBType.cs
@@ -22,6 +22,7 @@
*
*模块说明：奖惩类型类
*/
+using EOM.TSHotelManager.Core;
using System;
namespace EOM.TSHotelManager.Application
@@ -30,7 +31,7 @@ namespace EOM.TSHotelManager.Application
/// 奖惩类型实体类
///
[SqlSugar.SugarTable("gbtype")]
- public class GBType
+ public class GBType : BaseDTO
{
///
/// 奖惩编号
@@ -46,25 +47,5 @@ namespace EOM.TSHotelManager.Application
/// 删除标记
///
public int delete_mk { get; set; }
-
- ///
- /// 资料新增人
- ///
- public string datains_usr { get; set; }
-
- ///
- /// 资料新增日期
- ///
- public DateTime datains_date { get; set; }
-
- ///
- /// 资料更新人
- ///
- public string datachg_usr { 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 ac17c4eea85f5f6c54db04bffaecf21aa5fb275c..d537b1ec265f0da4e4c702d5310ff17d4aee79cc 100644
--- a/EOM.TSHotelManager.Core/Worker/Worker.cs
+++ b/EOM.TSHotelManager.Core/Worker/Worker.cs
@@ -30,7 +30,7 @@ namespace EOM.TSHotelManager.Core
/// 员工信息
///
[SqlSugar.SugarTable("worker")]
- public class Worker
+ public class Worker : BaseDTO
{
///
/// 员工账号/工号
@@ -133,21 +133,5 @@ namespace EOM.TSHotelManager.Core
/// 删除标记
///
public int delete_mk { get; set; }
- ///
- /// 资料创建人
- ///
- public string datains_usr { get; set; }
- ///
- /// 资料创建时间
- ///
- public DateTime datains_date { get; set; }
- ///
- /// 资料更新人
- ///
- public string datachg_usr { 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 98af799fd6757a2ff2d2e79b5a920f6d436d5c04..9ee77c55b86e642b7491744f4bc3b41a3670d892 100644
--- a/EOM.TSHotelManager.Core/Worker/WorkerCheck.cs
+++ b/EOM.TSHotelManager.Core/Worker/WorkerCheck.cs
@@ -30,7 +30,7 @@ namespace EOM.TSHotelManager.Core
/// 员工打卡考勤
///
[SqlSugar.SugarTable("workercheck")]
- public class WorkerCheck
+ public class WorkerCheck : BaseDTO
{
///
/// 编号
@@ -63,22 +63,6 @@ namespace EOM.TSHotelManager.Core
/// 删除标记
///
public int delete_mk { get; set; }
- ///
- /// 资料创建人
- ///
- public string datains_usr { get; set; }
- ///
- /// 资料创建时间
- ///
- public DateTime datains_date { get; set; }
- ///
- /// 资料更新人
- ///
- public string datachg_usr { 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 ac50167e272361daf37d8d7cbcaa9820347af7b1..5b4f107d1471cc05c9e078dbcc4231c16ce882c7 100644
--- a/EOM.TSHotelManager.Core/Worker/WorkerGoodBad.cs
+++ b/EOM.TSHotelManager.Core/Worker/WorkerGoodBad.cs
@@ -34,7 +34,7 @@ namespace EOM.TSHotelManager.Core
/// 员工奖罚
///
[SqlSugar.SugarTable("workergoodbad")]
- public class WorkerGoodBad
+ public class WorkerGoodBad : BaseDTO
{
///
/// 编号
@@ -75,21 +75,5 @@ namespace EOM.TSHotelManager.Core
/// 删除标记
///
public int delete_mk { get; set; }
- ///
- /// 资料创建人
- ///
- public string datains_usr { get; set; }
- ///
- /// 资料创建时间
- ///
- public DateTime datains_date { get; set; }
- ///
- /// 资料更新人
- ///
- public string datachg_usr { 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 8d348ac2e8f9a3b78f7df2f9c67b19446e6b5d7b..6c81bdca9792953c8db03c9061a9938b2ff8f483 100644
--- a/EOM.TSHotelManager.Core/Worker/WorkerHistory.cs
+++ b/EOM.TSHotelManager.Core/Worker/WorkerHistory.cs
@@ -30,7 +30,7 @@ namespace EOM.TSHotelManager.Core
/// 员工履历
///
[SqlSugar.SugarTable("workerhistory")]
- public class WorkerHistory
+ public class WorkerHistory : BaseDTO
{
///
/// 编号
@@ -61,21 +61,5 @@ namespace EOM.TSHotelManager.Core
/// 删除标记
///
public int delete_mk { get; set; }
- ///
- /// 资料创建人
- ///
- public string datains_usr { get; set; }
- ///
- /// 资料创建时间
- ///
- public DateTime datains_date { get; set; }
- ///
- /// 资料更新人
- ///
- public string datachg_usr { get; set; }
- ///
- /// 资料更新时间
- ///
- public DateTime datachg_date { get; set; }
}
}
diff --git a/EOM.TSHotelManager.Core/Zero/Admin.cs b/EOM.TSHotelManager.Core/Zero/Admin.cs
index fb829b6157a0ae6ba56d67eedc00a4e693dd6112..8123e4ac990d0da8e754c9fff827be3bd9675542 100644
--- a/EOM.TSHotelManager.Core/Zero/Admin.cs
+++ b/EOM.TSHotelManager.Core/Zero/Admin.cs
@@ -28,7 +28,7 @@ namespace EOM.TSHotelManager.Core
/// 管理员实体类
///
[SqlSugar.SugarTable("admininfo")]
- public class Admin
+ public class Admin : BaseDTO
{
///
/// 构造函数
@@ -79,30 +79,6 @@ namespace EOM.TSHotelManager.Core
///
public System.Int32 DeleteMk { get { return this._DeleteMk; } set { this._DeleteMk = value; } }
- private string _datains_usr;
- ///
- /// 资料新增人
- ///
- public string datains_usr { get { return this._datains_usr; } set { this._datains_usr = value; } }
-
- private System.DateTime _datains_time;
- ///
- /// 资料新增时间
- ///
- public System.DateTime datains_time { get { return this._datains_time; } set { this._datains_time = value; } }
-
- private string _datachg_usr;
- ///
- /// 资料更新人
- ///
- public string datachg_usr { get { return this._datachg_usr; } set { this._datachg_usr = value; } }
-
- private System.DateTime _datachg_time;
- ///
- /// 资料更新时间
- ///
- public System.DateTime datachg_time { get { return this._datachg_time; } set { this._datachg_time = value; } }
-
///
/// 管理员类型描述
///
diff --git a/EOM.TSHotelManager.Core/Zero/AdminType.cs b/EOM.TSHotelManager.Core/Zero/AdminType.cs
index 3195a2d02dcd7e2ad428de9120b960a249d38155..03936f132572e33d06ca81ef52cfa48787da3f51 100644
--- a/EOM.TSHotelManager.Core/Zero/AdminType.cs
+++ b/EOM.TSHotelManager.Core/Zero/AdminType.cs
@@ -34,7 +34,7 @@ namespace EOM.TSHotelManager.Core
/// 管理员类型
///
[SqlSugar.SugarTable("admintype")]
- public class AdminType
+ public class AdminType : BaseDTO
{
///
/// 编号
@@ -56,21 +56,5 @@ namespace EOM.TSHotelManager.Core
///
public int delete_mk { get; set; }
- ///
- /// 新增人
- ///
- public string datains_usr { get; set; }
- ///
- /// 新增时间
- ///
- public DateTime datains_date { get; set; }
- ///
- /// 修改人
- ///
- public string datachg_usr { get; set; }
- ///
- /// 修改时间
- ///
- public DateTime datachg_date { get; set; }
}
}
diff --git a/EOM.TSHotelManager.Core/Zero/CheckInfo.cs b/EOM.TSHotelManager.Core/Zero/CheckInfo.cs
index 76f99176a3341089137555b377f92a620f3fa49a..bff47c525550c0c2ec87aa3086fa69fef0289646 100644
--- a/EOM.TSHotelManager.Core/Zero/CheckInfo.cs
+++ b/EOM.TSHotelManager.Core/Zero/CheckInfo.cs
@@ -30,7 +30,7 @@ namespace EOM.TSHotelManager.Core
/// 监管统计
///
[SqlSugar.SugarTable("checkinfo")]
- public class CheckInfo
+ public class CheckInfo : BaseDTO
{
///
/// 监管统计编号
@@ -65,21 +65,5 @@ namespace EOM.TSHotelManager.Core
/// 删除标记
///
public int delete_mk { get; set; }
- ///
- /// 资料创建人
- ///
- public string datains_usr { get; set; }
- ///
- /// 资料创建时间
- ///
- public DateTime datains_date { get; set; }
- ///
- /// 资料更新人
- ///
- public string datachg_usr { 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 e8d64ef6513fb177574e1e73223aacc7dd711835..90157f49128a6912c469780dc7946f96300ba5ed 100644
--- a/EOM.TSHotelManager.Core/Zero/Dept.cs
+++ b/EOM.TSHotelManager.Core/Zero/Dept.cs
@@ -34,7 +34,7 @@ namespace EOM.TSHotelManager.Core
/// 部门表
///
[SqlSugar.SugarTable("dept")]
- public class Dept
+ public class Dept : BaseDTO
{
///
/// 部门编号
@@ -81,26 +81,6 @@ namespace EOM.TSHotelManager.Core
///
[SqlSugar.SugarColumn(ColumnName = "delete_mk")]
public int delete_mk { get; set; }
- ///
- /// 资料创建人
- ///
- [SqlSugar.SugarColumn(ColumnName = "datains_usr")]
- public string datains_usr { get; set; }
- ///
- /// 资料创建时间
- ///
- [SqlSugar.SugarColumn(ColumnName = "datains_date")]
- public DateTime datains_date { get; set; }
- ///
- /// 资料更新人
- ///
- [SqlSugar.SugarColumn(ColumnName = "datachg_usr")]
- public string datachg_usr { get; set; }
- ///
- /// 资料更新时间
- ///
- [SqlSugar.SugarColumn(ColumnName = "datachg_date")]
- public DateTime datachg_date { get; set; }
}
}
diff --git a/EOM.TSHotelManager.Core/Zero/Education.cs b/EOM.TSHotelManager.Core/Zero/Education.cs
index 8bdbf29e9e1e0f1cddc6d35db7555ff88fb343c2..bade72facc2193cd78244bc4adbd36da4c83350f 100644
--- a/EOM.TSHotelManager.Core/Zero/Education.cs
+++ b/EOM.TSHotelManager.Core/Zero/Education.cs
@@ -34,7 +34,7 @@ namespace EOM.TSHotelManager.Core
/// 学历
///
[SqlSugar.SugarTable("education")]
- public class Education
+ public class Education : BaseDTO
{
///
/// 学历编号
@@ -47,23 +47,7 @@ namespace EOM.TSHotelManager.Core
///
/// 删除标记
///
- public int delete_mk { get; set; }
- ///
- /// 资料创建人
- ///
- public string datains_usr { get; set; }
- ///
- /// 资料创建时间
- ///
- public DateTime datains_date { get; set; }
- ///
- /// 资料更新人
- ///
- public string datachg_usr { get; set; }
- ///
- /// 资料更新时间
- ///
- public DateTime datachg_date { get; set; }
+ public int? delete_mk { get; set; }
}
}
diff --git a/EOM.TSHotelManager.Core/Zero/Module.cs b/EOM.TSHotelManager.Core/Zero/Module.cs
index b45444b9fc143a34e372a1383cdad56da2fd1a3a..5e7e8f123107ec03fadb47e979c4cac96093cd6d 100644
--- a/EOM.TSHotelManager.Core/Zero/Module.cs
+++ b/EOM.TSHotelManager.Core/Zero/Module.cs
@@ -10,7 +10,7 @@ namespace EOM.TSHotelManager.Core
/// 模块实体
///
[SqlSugar.SugarTable("module")]
- public class Module
+ public class Module : BaseDTO
{
///
/// 模块ID
@@ -31,25 +31,5 @@ namespace EOM.TSHotelManager.Core
/// 删除标记
///
public int delete_mk { get; set; }
-
- ///
- /// 资料创建人
- ///
- public string datains_usr { get; set; }
-
- ///
- /// 资料创建时间
- ///
- public DateTime datains_time { get; set; }
-
- ///
- /// 资料更新人
- ///
- public string datachg_usr { get; set; }
-
- ///
- /// 资料更新时间
- ///
- public DateTime datachg_time { get; set; }
}
}
diff --git a/EOM.TSHotelManager.Core/Zero/Nation.cs b/EOM.TSHotelManager.Core/Zero/Nation.cs
index e65b7463f046ecb551423d1622a4104bbbe03406..dcc83546033b1f2209b2be8099aecc7ff550b039 100644
--- a/EOM.TSHotelManager.Core/Zero/Nation.cs
+++ b/EOM.TSHotelManager.Core/Zero/Nation.cs
@@ -34,7 +34,7 @@ namespace EOM.TSHotelManager.Core
/// 民族
///
[SqlSugar.SugarTable("nation")]
- public class Nation
+ public class Nation : BaseDTO
{
///
/// 民族编号
@@ -47,23 +47,7 @@ namespace EOM.TSHotelManager.Core
///
/// 删除标记
///
- public int delete_mk { get; set; }
- ///
- /// 资料创建人
- ///
- public string datains_usr { get; set; }
- ///
- /// 资料创建时间
- ///
- public DateTime datains_date { get; set; }
- ///
- /// 资料更新人
- ///
- public string datachg_usr { get; set; }
- ///
- /// 资料更新时间
- ///
- public DateTime datachg_date { get; set; }
+ public int? delete_mk { get; set; }
}
}
diff --git a/EOM.TSHotelManager.Core/Zero/Notice.cs b/EOM.TSHotelManager.Core/Zero/Notice.cs
index c30d2a8e588f4da47c53fbf9579da34a54feee4f..4937dd6d258aca142ef2ebeddc162b6fb82bb198 100644
--- a/EOM.TSHotelManager.Core/Zero/Notice.cs
+++ b/EOM.TSHotelManager.Core/Zero/Notice.cs
@@ -30,7 +30,7 @@ namespace EOM.TSHotelManager.Core
/// 任命公告
///
[SqlSugar.SugarTable("uploadinfo")]
- public class Notice
+ public class Notice : BaseDTO
{
///
/// 公告编号
@@ -72,22 +72,6 @@ namespace EOM.TSHotelManager.Core
///
[SqlSugar.SugarColumn(ColumnName = "delete_mk")]
public int delete_mk { get; set; }
- ///
- /// 资料创建人
- ///
- public string datains_usr { get; set; }
- ///
- /// 资料创建时间
- ///
- public DateTime datains_date { get; set; }
- ///
- /// 资料更新人
- ///
- public string datachg_usr { 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 3400c90c2506515fd8b5886cbcdcd62d99ed6979..29b4f9b5fa0468dbbc773474bedc8f136ce86c0f 100644
--- a/EOM.TSHotelManager.Core/Zero/VipRule.cs
+++ b/EOM.TSHotelManager.Core/Zero/VipRule.cs
@@ -34,7 +34,7 @@ namespace EOM.TSHotelManager.Core
/// 会员等级规则类
///
[SqlSugar.SugarTable("vip_rule")]
- public class VipRule
+ public class VipRule : BaseDTO
{
///
/// 索引ID
@@ -65,23 +65,6 @@ namespace EOM.TSHotelManager.Core
/// 删除标识
///
public int delete_mk { get; set; }
- ///
- /// 新增人
- ///
- public string datains_usr { get; set; }
-
- ///
- /// 新增时间
- ///
- public DateTime datains_date { get; set; }
- ///
- /// 修改人
- ///
- public string datachg_usr { get; set; }
- ///
- /// 修改时间
- ///
- public DateTime datachg_date { get; set; }
///
/// 会员等级描述
diff --git a/EOM.TSHotelManager.Core/Zero/position.cs b/EOM.TSHotelManager.Core/Zero/position.cs
index 4289c55bcd604cca2d6aac62aea73145cf166a5d..ed04ad3b98916f9e060aaae6d3ad6e18c0a49960 100644
--- a/EOM.TSHotelManager.Core/Zero/position.cs
+++ b/EOM.TSHotelManager.Core/Zero/position.cs
@@ -34,7 +34,7 @@ namespace EOM.TSHotelManager.Core
/// 职位
///
[SqlSugar.SugarTable("position")]
- public class Position
+ public class Position : BaseDTO
{
///
/// 职位编号
@@ -47,23 +47,7 @@ namespace EOM.TSHotelManager.Core
///
/// 删除标记
///
- public int delete_mk { get; set; }
- ///
- /// 资料创建人
- ///
- public string datains_usr { get; set; }
- ///
- /// 资料创建时间
- ///
- public DateTime datains_date { get; set; }
- ///
- /// 资料更新人
- ///
- public string datachg_usr { get; set; }
- ///
- /// 资料更新时间
- ///
- public DateTime datachg_date { get; set; }
+ public int? delete_mk { get; set; }
}
}
diff --git a/EOM.TSHotelManager.WebApi/Controllers/Worker/WorkerController.cs b/EOM.TSHotelManager.WebApi/Controllers/Worker/WorkerController.cs
index f0d5ea1b687492b40d725fc586a8ba41690903ff..e93097c45647fc5ed6186735e0a295c0e85a2ec1 100644
--- a/EOM.TSHotelManager.WebApi/Controllers/Worker/WorkerController.cs
+++ b/EOM.TSHotelManager.WebApi/Controllers/Worker/WorkerController.cs
@@ -80,6 +80,17 @@ namespace EOM.TSHotelManager.WebApi.Controllers
return workerService.SelectWorkerAll();
}
+ ///
+ /// 检查指定部门下是否存在工作人员
+ ///
+ ///
+ ///
+ [HttpGet]
+ public bool CheckWorkerBydepartment(string deptNo)
+ {
+ return workerService.CheckWorkerBydepartment(deptNo);
+ }
+
///
/// 根据登录名称查询员工信息
///
diff --git a/EOM.TSHotelManager.WebApi/EOM.TSHotelManager.WebApi.csproj b/EOM.TSHotelManager.WebApi/EOM.TSHotelManager.WebApi.csproj
index 9fdb9e7231408138f7cf2249725f9de81651646c..1c65e581e5670b36cb49eaf7ae2e64545a9bf3e9 100644
--- a/EOM.TSHotelManager.WebApi/EOM.TSHotelManager.WebApi.csproj
+++ b/EOM.TSHotelManager.WebApi/EOM.TSHotelManager.WebApi.csproj
@@ -39,4 +39,10 @@
+
+
+ Always
+
+
+
diff --git a/EOM.TSHotelManager.WebApi/Startup.cs b/EOM.TSHotelManager.WebApi/Startup.cs
index 250d884c4342e957d5699ab888f2e279f8e70ee1..a463c6d402b0da2b088399787368b76232d4a39a 100644
--- a/EOM.TSHotelManager.WebApi/Startup.cs
+++ b/EOM.TSHotelManager.WebApi/Startup.cs
@@ -38,7 +38,18 @@ namespace EOM.TSHotelManager.WebApi
// This method gets called by the runtime. Use this method to add services to the container.
public void ConfigureServices(IServiceCollection services)
{
- //services.AddControllers();
+ //services.AddCors(options =>
+ //{
+ // options.AddDefaultPolicy(builder =>
+ // {
+ // builder
+ // .AllowAnyOrigin() // κԴ
+ // .AllowAnyMethod() // κHTTP
+ // .AllowAnyHeader()// κHTTPͷֶ
+ // .AllowCredentials();
+ // });
+ //});
+
services.AddControllers().AddJsonOptions(opts =>
{
opts.JsonSerializerOptions.Encoder = JavaScriptEncoder.Create(UnicodeRanges.All);
@@ -104,6 +115,8 @@ namespace EOM.TSHotelManager.WebApi
app.UseDeveloperExceptionPage();
}
+ app.UseCors();
+
app.UseRouting();
app.UseAuthorization();