diff --git a/SYS.Application/Business/CashService.cs b/SYS.Application/Business/CashService.cs index 04dc244f993bd96cfac613d6acc81832de7fd4b8..5f2ba5f914f08a574c5964cb5e942cf110a1d356 100644 --- a/SYS.Application/Business/CashService.cs +++ b/SYS.Application/Business/CashService.cs @@ -1,40 +1,34 @@ using System; using System.Collections.Generic; using MySql.Data.MySqlClient; +using SYS.Common; using SYS.Core; namespace SYS.Application { - public class CashService + /// + /// 资产信息接口实现类 + /// + public class CashService:Repository, ICashService { - - public static object AddCashInfo(Cash cash) + /// + /// 添加资产信息 + /// + /// + /// + public bool AddCashInfo(Cash cash) { - string sql = "insert into cashinfo values('" + cash.CashNo + "','" + cash.CashName + "','" + cash.CashPrice + "','" + cash.CashClub + "','" + cash.CashTime + "','" + cash.CashSource + "','" + cash.CashPerson + "')"; - return DBHelper.ExecuteNonQuery(sql); + return base.Insert(cash); } - public static List SelectCashInfoAll() + /// + /// 查询资产信息 + /// + /// + public List SelectCashInfoAll() { - List cs = new List(); - string sql = "select * from CASHINFO"; - MySqlDataReader dr = DBHelper.ExecuteReader(sql); - while (dr.Read()) - { - - Cash c = new Cash(); - c.CashNo = (string)dr["CashNo"]; - c.CashName = dr["CashName"].ToString(); - c.CashPrice = (string)dr["CashPrice"]; - c.CashClub = Convert.ToString(dr["CashClub"]); - c.CashTime = DateTime.Parse(dr["CashTime"].ToString()); - c.CashSource = dr["CashSource"].ToString(); - c.CashPerson = dr["CashPerson"].ToString(); - cs.Add(c); - } - dr.Close(); - DBHelper.Closecon(); + cs = base.GetList(); return cs; } } diff --git a/SYS.Application/Business/FontsService.cs b/SYS.Application/Business/FontsService.cs index 4ae7321d6d3732a762ef69b3dad598b299a37b8c..10897c111ccc4b1b9e3d26a6a58f95a04a1e0a64 100644 --- a/SYS.Application/Business/FontsService.cs +++ b/SYS.Application/Business/FontsService.cs @@ -1,4 +1,5 @@ using MySql.Data.MySqlClient; +using SYS.Common; using SYS.Core; using System; using System.Collections.Generic; @@ -9,28 +10,18 @@ using System.Threading.Tasks; namespace SYS.Application { /// - /// 酒店宣传联动内容 + /// 酒店宣传联动内容接口实现类 /// - public class FontsService + public class FontsService:Repository,IFontsService { /// /// 查询所有宣传联动内容(跑马灯) /// /// - public static List SelectFontAll() + public List SelectFontAll() { List fonts = new List(); - string sql = "select * from Fonts"; - MySqlDataReader dr = DBHelper.ExecuteReader(sql); - while (dr.Read()) - { - Fonts font = new Fonts(); - font.FontsId = (int)dr["FontsId"]; - font.FontsMess = dr["FontsMess"].ToString(); - fonts.Add(font); - } - dr.Close(); - DBHelper.Closecon(); + fonts = base.GetList(); return fonts; } } diff --git a/SYS.Application/Business/ICashService.cs b/SYS.Application/Business/ICashService.cs new file mode 100644 index 0000000000000000000000000000000000000000..a4ca955cc21edb036941c00eaff641fd671378e8 --- /dev/null +++ b/SYS.Application/Business/ICashService.cs @@ -0,0 +1,24 @@ +using SYS.Core; +using System.Collections.Generic; + +namespace SYS.Application +{ + /// + /// 资产信息接口 + /// + public interface ICashService + { + /// + /// 添加资产信息 + /// + /// + /// + bool AddCashInfo(Cash cash); + + /// + /// 查询资产信息 + /// + /// + List SelectCashInfoAll(); + } +} \ No newline at end of file diff --git a/SYS.Application/Business/IFontsService.cs b/SYS.Application/Business/IFontsService.cs new file mode 100644 index 0000000000000000000000000000000000000000..f84e2ffcdaf54153e89a7a7ef06c4370d9d21232 --- /dev/null +++ b/SYS.Application/Business/IFontsService.cs @@ -0,0 +1,17 @@ +using SYS.Core; +using System.Collections.Generic; + +namespace SYS.Application +{ + /// + /// 酒店宣传联动内容接口 + /// + public interface IFontsService + { + /// + /// 查询所有宣传联动内容(跑马灯) + /// + /// + List SelectFontAll(); + } +} \ No newline at end of file diff --git a/SYS.Application/Business/IReserService.cs b/SYS.Application/Business/IReserService.cs new file mode 100644 index 0000000000000000000000000000000000000000..b29c032de2f2f0a394af17ed3b240d59f3b2fb1b --- /dev/null +++ b/SYS.Application/Business/IReserService.cs @@ -0,0 +1,41 @@ +using SYS.Core; +using System.Collections.Generic; + +namespace SYS.Application +{ + /// + /// 预约信息接口 + /// + public interface IReserService + { + + /// + /// 获取所有预约信息 + /// + /// + List SelectReserAll(); + + /// + /// 根据房间编号获取预约信息 + /// + /// + /// + Reser SelectReserInfoByRoomNo(string no); + + /// + /// 删除预约信息 + /// + /// + /// + bool DeleteReserInfo(string rid); + + /// + /// 添加预约信息 + /// + /// + /// + bool InserReserInfo(Reser r); + + + } +} \ No newline at end of file diff --git a/SYS.Application/Business/ISellService.cs b/SYS.Application/Business/ISellService.cs new file mode 100644 index 0000000000000000000000000000000000000000..dda53723541fcffd1d29855b14a6bc640403b494 --- /dev/null +++ b/SYS.Application/Business/ISellService.cs @@ -0,0 +1,72 @@ +using SYS.Core; +using System.Collections.Generic; + +namespace SYS.Application +{ + /// + /// 商品接口 + /// + public interface ISellService + { + /// + /// 查询所有商品 + /// + /// + List SelectSellThingAll(); + + /// + /// 根据商品ID查询 + /// + /// + /// + SellThing SelectSellThingByNo(string No); + + /// + /// 根据商品名称查询 + /// + /// + /// + List SelectSellThingByName(string Name); + + /// + /// 修改商品 + /// + /// + /// + /// + bool UpdateSellThing(string stock, string sellNo); + + /// + /// 撤回客户消费信息 + /// + /// + /// + /// + bool DeleteSellThing(string roomNo, string time); + + /// + /// 根据商品名称和价格查询商品编号 + /// + /// + /// + /// + SellThing SelectSellThingByNameAndPrice(string name, string price); + + + /// + /// 根据商品编号查询商品信息 + /// + /// + /// + SellThing SelectSellInfoBySellNo(string SellNo); + + #region 添加商品 + /// + /// 添加商品 + /// + /// + /// + bool InsertSellThing(SellThing st); + #endregion + } +} \ No newline at end of file diff --git a/SYS.Application/Business/ISpendService.cs b/SYS.Application/Business/ISpendService.cs new file mode 100644 index 0000000000000000000000000000000000000000..4638c09fb3f653d2c704f0d83581ce55a83a6cc0 --- /dev/null +++ b/SYS.Application/Business/ISpendService.cs @@ -0,0 +1,77 @@ +using SYS.Core; +using System.Collections.Generic; + +namespace SYS.Application +{ + /// + /// 消费信息接口 + /// + public interface ISpendService + { + #region 添加消费信息 + /// + /// 添加消费信息 + /// + /// + /// + bool InsertSpendInfo(Spend s); + #endregion + + #region 根据客户编号查询消费信息 + /// + /// 根据客户编号查询消费信息 + /// + /// + /// + List SelectSpendByCustoNo(string No); + #endregion + + #region 查询消费的所有信息 + /// + /// 查询消费的所有信息 + /// + /// + List SelectSpendInfoAll(); + #endregion + + #region 根据房间号查询消费的所有信息 + /// + /// 根据房间号查询消费的所有信息 + /// + /// + List SelectSpendInfoRoomNo(string RoomNo); + #endregion + + #region 根据房间编号、入住时间到当前时间查询消费总金额 + /// + /// 根据房间编号、入住时间到当前时间查询消费总金额 + /// + /// + /// + /// + object SelectMoneyByRoomNoAndTime(string roomno, string custono); + #endregion + + #region 根据房间编号、入住时间和当前时间修改结算状态 + /// + /// 根据房间编号、入住时间和当前时间修改结算状态 + /// + /// + /// + /// + bool UpdateMoneyState(string roomno, string checktime); + #endregion + + #region 将转房前的未结算记录一同转移到新房间 + /// + /// 将转房前的未结算记录一同转移到新房间 + /// + /// + /// + /// + /// + bool UpdateSpendInfoByRoomNo(string oldRoom, string newRoom, string custoNo); + #endregion + + } +} \ No newline at end of file diff --git a/SYS.Application/Business/IWtiService.cs b/SYS.Application/Business/IWtiService.cs new file mode 100644 index 0000000000000000000000000000000000000000..9ff161e5f61d856ca951462ac0f7895ddbda1e6b --- /dev/null +++ b/SYS.Application/Business/IWtiService.cs @@ -0,0 +1,86 @@ +using SYS.Core; +using System.Collections.Generic; + +namespace SYS.Application +{ + /// + /// 水电信息接口 + /// + public interface IWtiService + { + #region 根据房间编号查询水电费信息 + /// + /// 根据房间编号查询水电费信息 + /// + /// + /// + Wti SelectWtiInfoByRoomNo(string roomNo); + #endregion + + #region 根据房间编号、使用时间查询水电费信息 + /// + /// 根据房间编号、使用时间查询水电费信息 + /// + /// + /// + /// + /// + Wti SelectWtiInfoByRoomNoAndTime(string roomno, string usedate, string enddate); + #endregion + + #region 获取所有水电费信息 + /// + /// 获取所有水电费信息 + /// + /// + List SelectWtiInfoAll(); + #endregion + + #region 添加水电费信息 + /// + /// 添加水电费信息 + /// + /// + /// + bool InsertWtiInfo(Wti w); + #endregion + + #region 修改水电费信息(根据房间编号) + /// + /// 修改水电费信息(根据房间编号) + /// + /// + /// + bool UpdateWtiInfo(Wti w); + #endregion + + #region 根据房间信息、使用时间修改水电费 + /// + /// 根据房间信息、使用时间修改水电费 + /// + /// + /// + bool UpdateWtiInfoByRoomNoAndDateTime(Wti w); + #endregion + + #region 删除水电费信息:根据房间编号 + /// + /// 删除水电费信息:根据房间编号 + /// + /// + /// + bool DeleteWtiInfo(string roomno); + #endregion + + #region 根据房间编号、使用时间删除水电费信息 + /// + /// 根据房间编号、使用时间删除水电费信息 + /// + /// + /// + /// + /// + bool DeleteWtiInfoByRoomNoAndDateTime(string roomno, string usedate, string enddate); + #endregion + } +} \ No newline at end of file diff --git a/SYS.Application/Business/ReserService.cs b/SYS.Application/Business/ReserService.cs index 8f96819df9b23319491d37fd364466e1b13fc052..3ca24686d8dcde2a79a92e257f439c91d9b28ce5 100644 --- a/SYS.Application/Business/ReserService.cs +++ b/SYS.Application/Business/ReserService.cs @@ -1,83 +1,63 @@ using System; using System.Collections.Generic; using MySql.Data.MySqlClient; +using SYS.Common; using SYS.Core; namespace SYS.Application { - public class ReserService + /// + /// 预约信息接口实现类 + /// + public class ReserService:Repository,IReserService { - - public static List SelectReserAll() + /// + /// 获取所有预约信息 + /// + /// + public List SelectReserAll() { List rss = new List(); - string sql = "select * from RESER"; - MySqlDataReader dr = DBHelper.ExecuteReader(sql); - while (dr.Read()) - { - Reser rs = new Reser(); - rs.ReserId = (string)dr["ReserId"]; - rs.CustoName = dr["CustoName"].ToString(); - rs.CustoTel = (string)dr["CustoTel"]; - rs.ReserWay = (string)dr["ReserWay"]; - if (!DBNull.Value.Equals(dr["ReserRoom"])) - { - rs.ReserRoom = (string)dr["ReserRoom"]; - } - rs.ReserDate = (DateTime)dr["ReserDate"]; - if (!DBNull.Value.Equals(dr["ReserEndDate"])) - { - rs.ReserEndDay = (DateTime)dr["ReserEndDate"]; - } - rss.Add(rs); - } - dr.Close(); - DBHelper.Closecon(); + rss = base.GetList(a => a.delete_mk == 0); return rss; } - public static Reser SelectReserInfoByRoomNo(string no) + /// + /// 根据房间编号获取预约信息 + /// + /// + /// + public Reser SelectReserInfoByRoomNo(string no) { Reser res = null; - string sql = "select * from RESER r,ROOM rm where r.ReserRoom = rm.RoomNo and r.ReserRoom = '" + no + "'"; - MySqlDataReader dr = DBHelper.ExecuteReader(sql); - if (dr.Read()) - { - res = new Reser(); - res.ReserId = (string)dr["ReserId"]; - res.CustoName = dr["CustoNo"].ToString(); - res.CustoTel = (string)dr["CustoTel"]; - res.ReserWay = Convert.ToString(dr["ReserWay"]); - if (!DBNull.Value.Equals(dr["ReserDate"])) - { - res.ReserDate = DateTime.Parse(dr["ReserDate"].ToString()); - } - if (!DBNull.Value.Equals(dr["ReserEndDate"])) - { - res.ReserEndDay = DateTime.Parse(dr["ReserEndDate"].ToString()); - } - } - dr.Close(); - DBHelper.Closecon(); + res = base.GetSingle(a => a.ReserRoom == no && a.delete_mk != 1); return res; } - public static int DeleteReserInfo(string rid) + /// + /// 删除预约信息 + /// + /// + /// + public bool DeleteReserInfo(string rid) { - string sql = "delete from RESER where ReserId = '" + rid + "'"; - return DBHelper.ExecuteNonQuery(sql); + return base.Update(a => new Reser() + { + delete_mk = 1, + datachg_usr = LoginInfo.WorkerNo, + datachg_date = DateTime.Now + },a => a.ReserId == rid); } - - public static int InserReserInfo(Reser r) + /// + /// 添加预约信息 + /// + /// + /// + public bool InserReserInfo(Reser r) { - string sql = "insert RESER (ReserId,CustoName,CustoTel,ReserWay,"; - sql += "ReserRoom,ReserDate,ReserEndDate) values "; - sql += "('{0}','{1}','{2}','{3}','{4}','{5}','{6}')"; - sql = string.Format(sql, r.ReserId, r.CustoName, r.CustoTel, r.ReserWay, - r.ReserRoom, r.ReserDate, r.ReserEndDay); - return DBHelper.ExecuteNonQuery(sql); + return base.Insert(r); } diff --git a/SYS.Application/Business/SellService.cs b/SYS.Application/Business/SellService.cs index a85d31341f01ef2c7396f06fba7bd544cd5aecd6..0040966dec1e8f0d9bd94228ebb723b6a635f34e 100644 --- a/SYS.Application/Business/SellService.cs +++ b/SYS.Application/Business/SellService.cs @@ -1,34 +1,25 @@ using System; using System.Collections.Generic; using MySql.Data.MySqlClient; +using SYS.Common; using SYS.Core; namespace SYS.Application { - public class SellService + /// + /// 商品信息接口实现类 + /// + public class SellService:Repository,ISellService { /// /// 查询所有商品 /// /// - public static List SelectSellThingAll() + public List SelectSellThingAll() { - List ls = new List(); - string sql = "select * from Sellthing"; - MySqlDataReader dr = DBHelper.ExecuteReader(sql); - while (dr.Read()) - { - SellThing s = new SellThing(); - s.SellNo = dr["SellNo"].ToString(); - s.SellName = dr["SellName"].ToString(); - s.SellPrice = Convert.ToDecimal(dr["SellPrice"]); - s.format = (string)dr["format"]; - s.Stock = Convert.ToInt32(dr["Stock"]); - ls.Add(s); - } - dr.Close(); - DBHelper.Closecon(); - return ls; + List sellThings = new List(); + sellThings = base.GetList(a => a.delete_mk == 0); + return sellThings; } /// @@ -36,22 +27,10 @@ namespace SYS.Application /// /// /// - public static SellThing SelectSellThingByNo(string No) + public SellThing SelectSellThingByNo(string No) { SellThing s = new SellThing(); - string sql = "select * from Sellthing where SellNo='" + No + "'"; - MySqlDataReader dr = DBHelper.ExecuteReader(sql); - while (dr.Read()) - { - s = new SellThing(); - s.SellNo = dr["SellNo"].ToString(); - s.SellName = dr["SellName"].ToString(); - s.SellPrice = Convert.ToDecimal(dr["SellPrice"]); - s.format = (string)dr["format"]; - s.Stock = (int)dr["Stock"]; - } - dr.Close(); - DBHelper.Closecon(); + s = base.GetSingle(a => a.SellNo == No && a.delete_mk != 0); return s; } @@ -60,50 +39,44 @@ namespace SYS.Application /// /// /// - public static List SelectSellThingByName(string Name) + public List SelectSellThingByName(string Name) { - List ls = new List(); - string sql = "select * from Sellthing where SellName like '%" + Name + "%' or SellNo like '%" + Name + "%' or SellPrice like '%" + Name + "%' or format like '%" + Name + "%'"; - MySqlDataReader dr = DBHelper.ExecuteReader(sql); - while (dr.Read()) - { - SellThing s = new SellThing(); - s.SellNo = dr["SellNo"].ToString(); - s.SellName = dr["SellName"].ToString(); - s.SellPrice = Convert.ToDecimal(dr["SellPrice"]); - s.format = (string)dr["format"]; - s.Stock = (int)dr["Stock"]; - ls.Add(s); - } - dr.Close(); - DBHelper.Closecon(); - return ls; + List sellThings = new List(); + sellThings = base.GetList(a => a.SellName.Contains(Name) || a.SellNo.Contains(Name) || a.SellPrice == Convert.ToDecimal(Name) || a.format.Contains(Name)); + return sellThings; } /// /// 修改商品 /// - /// + /// + /// /// - public static int UpdateSellThing(string stock, string sellNo) + public bool UpdateSellThing(string stock, string sellNo) { - int n = 0; - string sql = "update SELLTHING set Stock='{0}' where SellNo='{1}'"; - sql = string.Format(sql, stock, sellNo); - n = DBHelper.ExecuteNonQuery(sql); - return n; + return base.Update(a => new SellThing() + { + Stock = Convert.ToInt32(stock), + datachg_usr = LoginInfo.WorkerNo, + datachg_date = DateTime.Now + },a => a.SellNo == sellNo); } /// /// 撤回客户消费信息 /// - /// + /// + /// /// - public static int DeleteSellThing(string roomNo, string time) + public bool DeleteSellThing(string roomNo, string time) { - string sql = "delete from CUSTOSPEND where RoomNo='{0}' and SpendTime='{1}'"; - sql = string.Format(sql, roomNo, time); - return DBHelper.ExecuteNonQuery(sql); + return base.Change().Update(a => new Spend() + { + delete_mk = 1, + datachg_usr = LoginInfo.WorkerNo, + datachg_date = DateTime.Now + },a => a.RoomNo == roomNo && a.SpendTime >= Convert.ToDateTime(time)); + } /// @@ -112,56 +85,35 @@ namespace SYS.Application /// /// /// - public static SellThing SelectSellThingByNameAndPrice(string name,string price) + public SellThing SelectSellThingByNameAndPrice(string name,string price) { - SellThing s = null; - string sql = "select * from SELLTHING where SellName='{0}' and SellPrice = '{1}'"; - sql = string.Format(sql, name, price); - MySqlDataReader dr = DBHelper.ExecuteReader(sql); - if (dr.Read()) - { - s = new SellThing(); - s.SellNo = dr["SellNo"].ToString(); - s.SellName = dr["SellName"].ToString(); - s.SellPrice = Convert.ToDecimal(dr["SellPrice"]); - s.format = (string)dr["format"]; - s.Stock = (int)dr["Stock"]; - } - dr.Close(); - DBHelper.Closecon(); - return s; + SellThing sellThing = null; + sellThing = base.GetSingle(a => a.SellName == name && a.SellPrice == Convert.ToDecimal(price)); + return sellThing; } - - public static SellThing SelectSellInfoBySellNo(string SellNo) + /// + /// 根据商品编号查询商品信息 + /// + /// + /// + public SellThing SelectSellInfoBySellNo(string SellNo) { SellThing st = null; - string sql = "select * from SellThing where SellNo='" + SellNo + "'"; - MySqlDataReader dr = DBHelper.ExecuteReader(sql); - if (dr.Read()) - { - st = new SellThing(); - st.SellNo = Convert.ToString(dr["SellNo"]); - st.SellName = Convert.ToString(dr["SellName"]); - st.SellPrice = Convert.ToDecimal(dr["SellPrice"]); - st.format = Convert.ToString(dr["format"]); - st.Stock = Convert.ToInt32(dr["Stock"]); - } - dr.Close(); - DBHelper.Closecon(); + st = base.GetSingle(a => a.SellNo == SellNo && a.delete_mk != 1); return st; } #region 添加商品 - public static int InsertSellThing(SellThing st) + /// + /// 添加商品 + /// + /// + /// + public bool InsertSellThing(SellThing st) { - string sql = "insert SellThing (SellNo,SellName,SellPrice,"; - sql += "format,Stock) values "; - sql += "('{0}','{1}','{2}','{3}','{4}')"; - sql = string.Format(sql, st.SellNo, st.SellName, st.SellPrice, - st.format, st.Stock); - return DBHelper.ExecuteNonQuery(sql); + return base.Insert(st); } #endregion } diff --git a/SYS.Application/Business/SpendService.cs b/SYS.Application/Business/SpendService.cs index 289a6e899bd36f1d3bb9f6d40db5e0200e42be6a..ec0bbf6120e8148f30d51d430565ba0b6305824c 100644 --- a/SYS.Application/Business/SpendService.cs +++ b/SYS.Application/Business/SpendService.cs @@ -1,11 +1,16 @@ using System; using System.Collections.Generic; +using System.Linq; using MySql.Data.MySqlClient; +using SYS.Common; using SYS.Core; namespace SYS.Application { - public class SpendService + /// + /// 商品消费接口实现类 + /// + public class SpendService:Repository, ISpendService { #region 添加消费信息 /// @@ -13,44 +18,9 @@ namespace SYS.Application /// /// /// - public static int InsertSpendInfo(Spend s) + public bool InsertSpendInfo(Spend s) { - int n = 0; - string sql = "insert CUSTOSPEND values('{0}','{1}','{2}','{3}','{4}','{5}','{6}','{7}')"; - sql = string.Format(sql, s.RoomNo, s.CustoNo, s.SpendName, s.SpendAmount, s.SpendPrice, s.SpendMoney, s.SpendTime, s.MoneyState); - n = DBHelper.ExecuteNonQuery(sql); - return n; - } - #endregion - - #region 根据客户编号查询信息 - /// - /// 根据客户编号查询信息 - /// - /// - /// - /// - public static List SelectSpendByRoomNo(string RoomNo) - { - List spends = new List(); - string sql = "select * from CUSTOSPEND inner join ROOM where CUSTOSPEND.RoomNo=ROOM.RoomNo"; - sql += " and CUSTOSPEND.RoomNo = '" + RoomNo + "' and CUSTOSPEND.SpendTime between ROOM.CheckTime AND CURRENT_DATE()"; - MySqlDataReader dr = DBHelper.ExecuteReader(sql); - while (dr.Read()) - { - Spend spend = new Spend(); - spend.RoomNo = dr["RoomNo"].ToString(); - spend.CustoNo = dr["CustoNo"].ToString(); - spend.SpendName = dr["SpendName"].ToString(); - spend.SpendAmount = (int)dr["SpendAmount"]; - spend.SpendPrice = Convert.ToDecimal(dr["SpendPrice"]); - spend.SpendMoney = Convert.ToDecimal(dr["SpendMoney"]); - spend.SpendTime = Convert.ToDateTime(dr["SpendTime"]); - spends.Add(spend); - } - dr.Close(); - DBHelper.Closecon(); - return spends; + return base.Insert(s); } #endregion @@ -60,26 +30,10 @@ namespace SYS.Application /// /// /// - public static List SelectSpendByCustoNo(string No) + public List SelectSpendByCustoNo(string No) { List ls = new List(); - string sql = "select * from CUSTOSPEND where RoomNo = '" + No + "' and MoneyState = '未结算'"; - MySqlDataReader dr = DBHelper.ExecuteReader(sql); - while (dr.Read()) - { - Spend s = new Spend(); - s.RoomNo = dr["RoomNo"].ToString(); - s.CustoNo = dr["CustoNo"].ToString(); - s.SpendName = dr["SpendName"].ToString(); - s.SpendAmount = (int)dr["SpendAmount"]; - s.SpendPrice = Convert.ToDecimal(dr["SpendPrice"]); - s.SpendMoney = Convert.ToDecimal(dr["SpendMoney"]); - s.SpendTime = Convert.ToDateTime(dr["SpendTime"]); - s.MoneyState = dr["MoneyState"].ToString(); - ls.Add(s); - } - dr.Close(); - DBHelper.Closecon(); + ls = base.GetList(a => a.CustoNo == No && a.MoneyState == "未结算" && a.delete_mk != 1); return ls; } #endregion @@ -89,26 +43,10 @@ namespace SYS.Application /// 查询消费的所有信息 /// /// - public static List SelectSpendInfoAll() + public List SelectSpendInfoAll() { List ls = new List(); - string sql = "select * from CUSTOSPEND"; - MySqlDataReader dr = DBHelper.ExecuteReader(sql); - while (dr.Read()) - { - Spend s = new Spend(); - s.RoomNo = (string)dr["RoomNo"]; - s.CustoNo = (string)dr["CustoNo"]; - s.SpendName = (string)dr["SpendName"]; - s.SpendAmount = (int)dr["SpendAmount"]; - s.SpendPrice = (decimal)dr["SpendPrice"]; - s.SpendMoney = (decimal)dr["SpendMoney"]; - s.SpendTime = (DateTime)dr["SpendTime"]; - s.MoneyState = dr["MoneyState"].ToString(); - ls.Add(s); - } - dr.Close(); - DBHelper.Closecon(); + ls = base.GetList(a => a.delete_mk != 1); return ls; } #endregion @@ -118,26 +56,10 @@ namespace SYS.Application /// 根据房间号查询消费的所有信息 /// /// - public static List SelectSpendInfoRoomNo(string RoomNo) + public List SelectSpendInfoRoomNo(string RoomNo) { List ls = new List(); - string sql = "select * from CUSTOSPEND inner join ROOM where CUSTOSPEND.RoomNo=ROOM.RoomNo and CUSTOSPEND.RoomNo = '"+ RoomNo + "' and CUSTOSPEND.MoneyState = '未结算'"; - MySqlDataReader dr = DBHelper.ExecuteReader(sql); - while (dr.Read()) - { - Spend s = new Spend(); - s.RoomNo = dr["RoomNo"].ToString(); - s.CustoNo = dr["CustoNo"].ToString(); - s.SpendName = dr["SpendName"].ToString(); - s.SpendAmount = (int)dr["SpendAmount"]; - s.SpendPrice = Convert.ToDecimal(dr["SpendPrice"]); - s.SpendMoney = Convert.ToDecimal(dr["SpendMoney"]); - s.SpendTime = Convert.ToDateTime(dr["SpendTime"]); - s.MoneyState = dr["MoneyState"].ToString(); - ls.Add(s); - } - dr.Close(); - DBHelper.Closecon(); + ls = base.GetList(a => a.RoomNo == RoomNo && a.delete_mk != 1 && a.MoneyState == "未结算"); return ls; } #endregion @@ -147,11 +69,11 @@ namespace SYS.Application /// 根据房间编号、入住时间到当前时间查询消费总金额 /// /// + /// /// - public static object SelectMoneyByRoomNoAndTime(string roomno,string custono) + public object SelectMoneyByRoomNoAndTime(string roomno,string custono) { - string sql = "select CONVERT(SUM(CUSTOSPEND.SpendMoney),DECIMAL(15,2)) from CUSTOSPEND inner join ROOM where CUSTOSPEND.RoomNo = ROOM.RoomNo and CUSTOSPEND.RoomNo = '"+roomno+"' AND ROOM.CustoNo = '"+ custono + "' and CUSTOSPEND.MoneyState = '未结算'"; - return DBHelper.ExecuteScalar(sql); + return base.GetList(a => a.RoomNo == roomno && a.CustoNo == custono && a.MoneyState == "未结算").Sum(a => a.SpendMoney); } #endregion @@ -162,11 +84,35 @@ namespace SYS.Application /// /// /// - public static int UpdateMoneyState(string roomno, string checktime) + public bool UpdateMoneyState(string roomno, string checktime) { - string sql = "update CUSTOSPEND set MoneyState='已结算' where RoomNo='{0}' and SpendTime between '{1}' AND CURRENT_DATE()"; - sql = string.Format(sql, roomno, checktime); - return DBHelper.ExecuteNonQuery(sql); + return base.Update(a => new Spend() + { + MoneyState = "已结算", + datachg_usr = LoginInfo.WorkerNo, + datachg_date = DateTime.Now + },a => a.RoomNo == roomno && a.SpendTime >= Convert.ToDateTime(checktime) && a.SpendTime <= DateTime.Now); + } + #endregion + + #region 将转房前的未结算记录一同转移到新房间 + /// + /// 将转房前的未结算记录一同转移到新房间 + /// + /// + /// + /// + /// + public bool UpdateSpendInfoByRoomNo(string oldRoom,string newRoom,string custoNo) + { + return base.Update(a => new Spend() + { + RoomNo = newRoom, + datachg_usr = LoginInfo.WorkerNo, + datachg_date = DateTime.Now + },a => a.RoomNo == oldRoom && a.CustoNo == custoNo && a.MoneyState == "未结算" && a.SpendTime >= DateTime.Now + && a.SpendTime <= DateTime.Now); + } #endregion } diff --git a/SYS.Application/Business/WtiService.cs b/SYS.Application/Business/WtiService.cs index 19505c03895ba76c3f0720becbfcfe89ecd2a6c7..82a3e2616a93cd1f05087cc6d2b32f8c55279659 100644 --- a/SYS.Application/Business/WtiService.cs +++ b/SYS.Application/Business/WtiService.cs @@ -1,37 +1,26 @@ using System; using System.Collections.Generic; using MySql.Data.MySqlClient; +using SYS.Common; using SYS.Core; namespace SYS.Application { - public class WtiService + /// + /// 水电信息接口实现类 + /// + public class WtiService:Repository, IWtiService { - #region 根据房间编号查询水电费信息 /// /// 根据房间编号查询水电费信息 /// /// /// - public static Wti SelectWtiInfoByRoomNo(string roomNo) + public Wti SelectWtiInfoByRoomNo(string roomNo) { - Wti w = null; - string sql = "select * from WTINFO where RoomNo like '%" + roomNo + "%'"; - MySqlDataReader dr = DBHelper.ExecuteReader(sql); - if (dr.Read()) - { - w = new Wti(); - w.CustoNo = dr["CustoNo"].ToString(); - w.EndDate = Convert.ToDateTime(dr["EndDate"]); - w.PowerUse = (decimal)dr["PowerUse"]; - w.Record = dr["Record"].ToString(); - w.RoomNo = dr["RoomNo"].ToString(); - w.UseDate = Convert.ToDateTime(dr["UseDate"]); - w.WaterUse = (decimal)dr["WaterUse"]; - } - dr.Close(); - DBHelper.Closecon(); + Wti w = new Wti(); + w = base.GetSingle(a => a.RoomNo.Contains(roomNo) && a.delete_mk != 1); return w; } #endregion @@ -44,25 +33,12 @@ namespace SYS.Application /// /// /// - public static Wti SelectWtiInfoByRoomNoAndTime(string roomno, string usedate, string enddate) + public Wti SelectWtiInfoByRoomNoAndTime(string roomno, string usedate, string enddate) { Wti w = null; string sql = "select * from WTINFO where RoomNo='" + roomno + "' and UseDate='" + usedate + "' and EndDate='" + enddate + "'"; - MySqlDataReader dr = DBHelper.ExecuteReader(sql); - if (dr.Read()) - { - w = new Wti(); - w.CustoNo = dr["CustoNo"].ToString(); - w.EndDate = Convert.ToDateTime(dr["EndDate"]); - w.PowerUse = (decimal)dr["PowerUse"]; - w.Record = dr["Record"].ToString(); - w.RoomNo = dr["RoomNo"].ToString(); - w.UseDate = Convert.ToDateTime(dr["UseDate"]); - w.WaterUse = (decimal)dr["WaterUse"]; - } - dr.Close(); - DBHelper.Closecon(); + w = base.GetSingle(a => a.RoomNo == roomno && a.UseDate >= Convert.ToDateTime(usedate) && a.EndDate >= Convert.ToDateTime(enddate)); return w; } #endregion @@ -72,25 +48,10 @@ namespace SYS.Application /// 获取所有水电费信息 /// /// - public static List SelectWtiInfoAll() + public List SelectWtiInfoAll() { List wti = new List(); - string sql = "select * from WTINFO"; - MySqlDataReader dr = DBHelper.ExecuteReader(sql); - while (dr.Read()) - { - Wti w = new Wti(); - w.CustoNo = dr["CustoNo"].ToString(); - w.EndDate = Convert.ToDateTime(dr["EndDate"]); - w.PowerUse = (decimal)dr["PowerUse"]; - w.Record = dr["Record"].ToString(); - w.RoomNo = dr["RoomNo"].ToString(); - w.UseDate = Convert.ToDateTime(dr["UseDate"]); - w.WaterUse = (decimal)dr["WaterUse"]; - wti.Add(w); - } - dr.Close(); - DBHelper.Closecon(); + wti = base.GetList(a => a.delete_mk != 1); return wti; } #endregion @@ -101,14 +62,9 @@ namespace SYS.Application /// /// /// - public static int InsertWtiInfo(Wti w) + public bool InsertWtiInfo(Wti w) { - string sql = "insert WTINFO (RoomNo,UseDate,EndDate,"; - sql += "WaterUse,PowerUse,Record,CustoNo) values "; - sql += "('{0}','{1}','{2}','{3}','{4}','{5}','{6}')"; - sql = string.Format(sql, w.RoomNo, w.UseDate, w.EndDate, - w.WaterUse, w.PowerUse, w.Record, w.CustoNo); - return DBHelper.ExecuteNonQuery(sql); + return base.Insert(w); } #endregion @@ -118,13 +74,18 @@ namespace SYS.Application /// /// /// - public static int UpdateWtiInfo(Wti w) + public bool UpdateWtiInfo(Wti w) { - string sql = " update WTINFO set UseDate='{1}',EndDate='{2}',"; - sql += "WaterUse ='{3}',PowerUse='{4}',Record='{5}',CustoNo='{6}'where RoomNo = '{0}'"; - sql = string.Format(sql, w.RoomNo, w.UseDate, w.EndDate, - w.WaterUse, w.PowerUse, w.Record, w.CustoNo); - return DBHelper.ExecuteNonQuery(sql); + return base.Update(a => new Wti() + { + UseDate = w.UseDate, + EndDate = w.EndDate, + WaterUse = w.WaterUse, + PowerUse = w.PowerUse, + Record = w.Record, + CustoNo = w.CustoNo + },a => a.RoomNo == w.RoomNo); + } #endregion @@ -134,12 +95,15 @@ namespace SYS.Application /// /// /// - public static int UpdateWtiInfoByRoomNoAndDateTime(Wti w) + public bool UpdateWtiInfoByRoomNoAndDateTime(Wti w) { - string sql = "update WTINFO set WaterUse='{0}',PowerUse='{1}' where "; - sql += " RoomNo='{2}' and UseDate='{3}' and EndDate='{4}'"; - sql = string.Format(sql, w.WaterUse, w.PowerUse, w.RoomNo, w.UseDate, w.EndDate); - return DBHelper.ExecuteNonQuery(sql); + return base.Update(a => new Wti() + { + WaterUse = w.WaterUse, + PowerUse = w.PowerUse, + datachg_usr = LoginInfo.WorkerNo, + datachg_date = DateTime.Now, + },a => a.RoomNo == w.RoomNo && a.UseDate >= w.UseDate && a.EndDate >= w.EndDate); } #endregion @@ -149,10 +113,14 @@ namespace SYS.Application /// /// /// - public static int DeleteWtiInfo(string roomno) + public bool DeleteWtiInfo(string roomno) { - string sql = "delete from WtiInfo where RoomNo='" + roomno + "'"; - return DBHelper.ExecuteNonQuery(sql); + return base.Update(a => new Wti() + { + delete_mk = 1, + datachg_usr = LoginInfo.WorkerNo, + datachg_date = DateTime.Now + }, a => a.WtiNo == roomno); } #endregion @@ -164,11 +132,16 @@ namespace SYS.Application /// /// /// - public static int 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}'"; + string sql = "delete from WTINFO where RoomNo='{0}' and UseDate='{1}' and EndDate='{2}'"; sql = string.Format(sql, roomno, usedate, enddate); - return DBHelper.ExecuteNonQuery(sql); + return base.Update(a => new Wti() + { + delete_mk = 1, + datachg_usr = LoginInfo.WorkerNo, + datachg_date = DateTime.Now + },a => a.RoomNo == roomno && a.UseDate >= Convert.ToDateTime(usedate) && a.EndDate >= Convert.ToDateTime(enddate)); } #endregion } diff --git a/SYS.Application/Customer/CheckInfoService.cs b/SYS.Application/Customer/CheckInfoService.cs index 725e84455f48a16df4b973c3ad6f68dc1c9f9d3a..354737b4aacb255400d2ffa81de9b373febe3332 100644 --- a/SYS.Application/Customer/CheckInfoService.cs +++ b/SYS.Application/Customer/CheckInfoService.cs @@ -2,48 +2,24 @@ using System.Collections.Generic; using System.Data.SqlClient; using MySql.Data.MySqlClient; +using SYS.Common; using SYS.Core; namespace SYS.Application { - public class CheckInfoService + /// + /// 监管统计接口实现类 + /// + public class CheckInfoService:Repository, ICheckInfoService { - - public static string CheckBaseVersion() - { - string version = null; - string sql = "select* from baseversion"; - MySqlDataReader dr = DBHelper.ExecuteReader(sql); - if (dr.Read()) - { - version = dr["base_version"].ToString(); - } - dr.Close(); - DBHelper.Closecon(); - return version; - } - - public static List SelectCheckInfoAll() + /// + /// 查询所有监管统计信息 + /// + /// + public List SelectCheckInfoAll() { - List cif = new List(); - string sql = "select * from CHECKINFO"; - MySqlDataReader dr = DBHelper.ExecuteReader(sql); - while (dr.Read()) - { - - CheckInfo ci = new CheckInfo(); - ci.CheckNo = (string)dr["CheckNo"]; - ci.CheckClub = dr["CheckClub"].ToString(); - ci.CheckProgres = (string)dr["CheckProgres"]; - ci.CheckCash = Convert.ToString(dr["CheckCash"]); - ci.CheckScore = (int)dr["CheckScore"]; - ci.CheckPerson = dr["CheckPerson"].ToString(); - ci.CheckAdvice = dr["CheckAdvice"].ToString(); - cif.Add(ci); - } - dr.Close(); - DBHelper.Closecon(); + cif = base.GetList(a => a.delete_mk != 1); return cif; } } diff --git a/SYS.Application/Customer/CustoService.cs b/SYS.Application/Customer/CustoService.cs index 0fb6c1611d21a3588d973a45400099f8c22b00c6..4c304f8edba0644b4b023935ef035ea2b6b89172 100644 --- a/SYS.Application/Customer/CustoService.cs +++ b/SYS.Application/Customer/CustoService.cs @@ -1,26 +1,38 @@ using System; using System.Collections.Generic; +using System.Linq; using MySql.Data.MySqlClient; +using SYS.Common; using SYS.Core; namespace SYS.Application { - public class CustoService + /// + /// 客户信息接口实现类 + /// + public class CustoService:Repository, ICustoService { #region 添加客户信息 - public static int InsertCustomerInfo(Custo custo) + /// + /// 添加客户信息 + /// + /// + /// + public bool InsertCustomerInfo(Custo custo) { string NewID = Md5LockedUtil.MD5Encrypt32(custo.CustoID); string NewTel = Md5LockedUtil.MD5Encrypt32(custo.CustoTel); - - string sql = "insert USERINFO(CustoNo,CustoName,CustoSex,CustoTel,PassportType,CustoID,CustoAdress,CustoBirth,CustoType)"; - sql += " values('" + custo.CustoNo + "','" + custo.CustoName + "','" + custo.CustoSex + "','" + NewTel + "','" + custo.PassportType + "','" + NewID + "','" + custo.CustoAdress + "','" + custo.CustoBirth + "','" + custo.CustoType + "') "; - - return DBHelper.ExecuteNonQuery(sql); + custo.CustoID = NewID; + custo.CustoTel = NewTel; + return base.Insert(custo); } #endregion - public static List SelectAllMoney() + /// + /// 查询酒店盈利情况 + /// + /// + public List SelectAllMoney() { List custos = new List(); string sql = "select year(spendtime) as 年份,sum(spendmoney) as 总额 from CustoSpend group by year(spendtime)"; @@ -37,132 +49,111 @@ namespace SYS.Application return custos; } - public static List SelectCustoAll() + /// + /// 查询所有客户信息 + /// + /// + public List SelectCustoAll() { + //查询出所有性别类型 + List sexTypes = new List(); + sexTypes = base.Change().GetList(); + //查询出所有证件类型 + List passPortTypes = new List(); + passPortTypes = base.Change().GetList(); + //查询出所有客户类型 + List custoTypes = new List(); + custoTypes = base.Change().GetList(); + //查询出所有客户信息 List custos = new List(); - string sql = "select * from USERINFO u,USERTYPE t,PASSPORTTYPE p,sextype s where u.CustoType=t.UserType and u.PassportType=p.PassportId and s.sexId = u.CustoSex order by u.CustoNo asc"; - MySqlDataReader dr = DBHelper.ExecuteReader(sql); - while (dr.Read()) + custos = base.GetList().OrderBy(a => a.CustoNo).ToList(); + custos.ForEach(source => { - Custo cso = new Custo(); - cso.CustoNo = (string)dr["CustoNo"]; - cso.CustoName = dr["CustoName"].ToString(); - cso.SexName = Convert.ToString(dr["SexName"]); - cso.CustoTel = Convert.ToString(dr["CustoTel"]); - cso.PassportType = Convert.ToInt32(dr["PassportType"]); - cso.CustoID = dr["CustoID"].ToString(); - if (!DBNull.Value.Equals(dr["CustoAdress"])) - { - cso.CustoAdress = (string)dr["CustoAdress"]; - } - else - { - cso.CustoAdress = ""; - } - cso.CustoBirth = DateTime.Parse(dr["CustoBirth"].ToString()); - cso.CustoType = Convert.ToInt32(dr["CustoType"]); - cso.typeName = (string)dr["TypeName"]; - cso.PassportName = (string)dr["PassportName"]; - custos.Add(cso); - } - dr.Close(); - DBHelper.Closecon(); + //性别类型 + var sexType = sexTypes.FirstOrDefault(a => a.sexId == source.CustoSex); + source.SexName = string.IsNullOrEmpty(sexType.sexName) ? "" : sexType.sexName; + //证件类型 + var passPortType = passPortTypes.FirstOrDefault(a => a.PassportId == source.PassportType); + source.PassportName = string.IsNullOrEmpty(passPortType.PassportName) ? "" : passPortType.PassportName; + //客户类型 + var custoType = custoTypes.FirstOrDefault(a => a.UserType == source.CustoType); + source.typeName = string.IsNullOrEmpty(custoType.TypeName) ? "" : custoType.TypeName; + }); return custos; } - - public static Custo SelectCardInfoByCustoNo(string CustoNo) - { - Custo c = null; - string sql = "select * from USERINFO where CustoNo='" + CustoNo + "'"; - MySqlDataReader dr = DBHelper.ExecuteReader(sql); - if (dr.Read()) - { - c = new Custo(); - c.CustoNo = Convert.ToString(dr["CustoNo"]); - c.CustoName = Convert.ToString(dr["CustoName"]); - c.CustoSex = Convert.ToInt32(dr["CustoSex"]); - c.CustoTel = Convert.ToString(dr["CustoTel"]); - c.CustoID = Convert.ToString(dr["CustoID"]); - c.CustoAdress = Convert.ToString(dr["CustoAdress"]); - c.CustoBirth = Convert.ToDateTime(dr["CustoBirth"]); - c.CustoType = Convert.ToInt32(dr["CustoType"]); - } - dr.Close(); - DBHelper.Closecon(); - return c; - } - - #region 根据客户编号查询客户信息 /// /// 根据客户编号查询客户信息 /// - /// + /// /// - public static Custo SelectCustoByCustoNo(string cno) + public Custo SelectCardInfoByCustoNo(string CustoNo) { - Custo cto = null; - MySqlConnection con = DBHelper.GetConnection(); - con.Open(); - MySqlDataReader dr = DBHelper.ExecuteReader("select * from USERINFO where CustoNo='" + cno + "'"); - if (dr.Read()) - { - cto = new Custo(); - cto.CustoNo = dr["CustoNo"].ToString(); - cto.CustoName = dr["CustoName"].ToString(); - cto.CustoSex = Convert.ToInt32(dr["CustoSex"]); - cto.CustoTel = dr["CustoTel"].ToString(); - cto.PassportType = Convert.ToInt32(dr["PassportType"].ToString()); - cto.CustoID = dr["CustoID"].ToString(); - cto.CustoAdress = dr["CustoAdress"].ToString(); - cto.CustoBirth = DateTime.Parse(dr["CustoBirth"].ToString()); - cto.CustoType = Convert.ToInt32(dr["CustoType"].ToString()); - } - dr.Close(); - DBHelper.Closecon(); - return cto; + Custo c = new Custo(); + c = base.GetSingle(a => a.CustoNo.Equals(CustoNo) && a.delete_mk != 1); + //性别类型 + var sexType = base.Change().GetSingle(a => a.sexId == c.CustoSex); + c.SexName = string.IsNullOrEmpty(sexType.sexName) ? "" : sexType.sexName; + //证件类型 + var passPortType = base.Change().GetSingle(a => a.PassportId == c.PassportType); + c.PassportName = string.IsNullOrEmpty(passPortType.PassportName) ? "" : passPortType.PassportName; + //客户类型 + var custoType = base.Change().GetSingle(a => a.UserType == c.CustoType); + c.typeName = string.IsNullOrEmpty(custoType.TypeName) ? "" : custoType.TypeName; + return c; } - #endregion - public static Custo SelectCustoInfoByCardId(string input) - { - Custo cto = null; - string sql = "select * from USERINFO u,PASSPORTTYPE p,USERTYPE ut where u.PassportType=p.PassportId and u.CustoType=ut.UserType and CustoID = '" + input + "'"; - MySqlDataReader dr = DBHelper.ExecuteReader(sql); - if (dr.Read()) - { - cto = new Custo(); - cto.CustoNo = (string)dr["CustoNo"]; - cto.CustoName = (string)dr["CustoName"]; - cto.CustoSex = Convert.ToInt32(dr["CustoSex"]); - cto.CustoTel = (string)dr["CustoTel"]; - cto.PassportType = Convert.ToInt32(dr["PassportType"]); - cto.PassportName = (string)dr["PassportName"]; - cto.CustoID = (string)dr["CustoID"]; - cto.CustoAdress = (string)dr["CustoAdress"]; - cto.CustoBirth = DateTime.Parse(dr["CustoBirth"].ToString()); - cto.CustoType = Convert.ToInt32(dr["CustoType"]); - cto.typeName = (string)dr["TypeName"]; - } - dr.Close(); - DBHelper.Closecon(); - return cto; - } + ///// + ///// + ///// + ///// + ///// + //public static Custo SelectCustoInfoByCardId(string input) + //{ + // Custo cto = new Custo(); + // string sql = "select * from USERINFO u,PASSPORTTYPE p,USERTYPE ut where u.PassportType=p.PassportId and u.CustoType=ut.UserType and u.CustoNo = '" + input + "'"; + // MySqlDataReader dr = DBHelper.ExecuteReader(sql); + // if (dr.Read()) + // { + // cto = new Custo() + // { + // CustoNo = (string)dr["CustoNo"], + // CustoName = (string)dr["CustoName"], + // CustoSex = Convert.ToInt32(dr["CustoSex"]), + // CustoTel = (string)dr["CustoTel"], + // PassportType = Convert.ToInt32(dr["PassportType"]), + // PassportName = (string)dr["PassportName"], + // CustoID = (string)dr["CustoID"], + // CustoAdress = (string)dr["CustoAdress"], + // CustoBirth = DateTime.Parse(dr["CustoBirth"].ToString()), + // CustoType = Convert.ToInt32(dr["CustoType"]), + // typeName = (string)dr["TypeName"], + // }; + + // } + // dr.Close(); + // DBHelper.Closecon(); + // return cto; + //} - public static List SelectCanUseCustoAll() - { - List custos = new List(); - string sql = "select * from USERINFO"; - MySqlDataReader dr = DBHelper.ExecuteReader(sql); - while (dr.Read()) - { - Custo custo = new Custo(); - custo.CustoNo = (string)dr["CustoNo"]; - custos.Add(custo); - } - dr.Close(); - DBHelper.Closecon(); - return custos; - } + ///// + ///// + ///// + ///// + //public static List SelectCanUseCustoAll() + //{ + // List custos = new List(); + // string sql = "select * from USERINFO"; + // MySqlDataReader dr = DBHelper.ExecuteReader(sql); + // while (dr.Read()) + // { + // Custo custo = new Custo(); + // custo.CustoNo = (string)dr["CustoNo"]; + // custos.Add(custo); + // } + // dr.Close(); + // DBHelper.Closecon(); + // return custos; + //} } } diff --git a/SYS.Application/Customer/ICheckInfoService.cs b/SYS.Application/Customer/ICheckInfoService.cs new file mode 100644 index 0000000000000000000000000000000000000000..ec2a7d2c762be0243c3b49b4d8496aac193f2133 --- /dev/null +++ b/SYS.Application/Customer/ICheckInfoService.cs @@ -0,0 +1,17 @@ +using SYS.Core; +using System.Collections.Generic; + +namespace SYS.Application +{ + /// + /// 监管统计接口 + /// + public interface ICheckInfoService + { + /// + /// 查询所有监管统计信息 + /// + /// + List SelectCheckInfoAll(); + } +} \ No newline at end of file diff --git a/SYS.Application/Customer/ICustoService.cs b/SYS.Application/Customer/ICustoService.cs new file mode 100644 index 0000000000000000000000000000000000000000..001be450e9a937644160691d38e8d9104a43d1bb --- /dev/null +++ b/SYS.Application/Customer/ICustoService.cs @@ -0,0 +1,41 @@ +using SYS.Core; +using System.Collections.Generic; + +namespace SYS.Application +{ + /// + /// 客户信息接口 + /// + public interface ICustoService + { + #region 添加客户信息 + /// + /// 添加客户信息 + /// + /// + /// + bool InsertCustomerInfo(Custo custo); + #endregion + + /// + /// 查询酒店盈利情况 + /// + /// + List SelectAllMoney(); + + /// + /// 查询所有客户信息 + /// + /// + List SelectCustoAll(); + + /// + /// 根据客户编号查询客户信息 + /// + /// + /// + Custo SelectCardInfoByCustoNo(string CustoNo); + + + } +} \ No newline at end of file diff --git a/SYS.Application/Room/IRoomService.cs b/SYS.Application/Room/IRoomService.cs new file mode 100644 index 0000000000000000000000000000000000000000..158d3fc37432d87ee4f3bc73da6f9aad3ca26500 --- /dev/null +++ b/SYS.Application/Room/IRoomService.cs @@ -0,0 +1,183 @@ +using SYS.Core; +using System.Collections.Generic; + +namespace SYS.Application +{ + /// + /// 房间信息接口 + /// + public interface IRoomService + { + #region 根据房间状态获取相应状态的房间信息 + /// + /// 根据房间状态获取相应状态的房间信息 + /// + /// + /// + List SelectRoomByRoomState(int stateid); + #endregion + + + #region 根据房间状态来查询可使用的房间 + /// + /// 根据房间状态来查询可使用的房间 + /// + /// + List SelectCanUseRoomAll(); + #endregion + + + #region 获取所有房间信息 + /// + /// 获取所有房间信息 + /// + /// + List SelectRoomAll(); + #endregion + + #region 获取房间分区的信息 + /// + /// 获取房间分区的信息 + /// + /// + List SelectRoomByTypeName(string TypeName); + #endregion + + #region 根据房间编号查询房间信息 + /// + /// 根据房间编号查询房间信息 + /// + /// + /// + Room SelectRoomByRoomNo(string no); + #endregion + + #region 根据房间编号退房（退房） + /// + /// 根据房间编号退房（退房） + /// + /// + /// + bool UpdateRoomByRoomNo(string room); + #endregion + + #region 根据房间编号查询截止到今天住了多少天 + /// + /// 根据房间编号查询截止到今天住了多少天 + /// + /// + /// + object DayByRoomNo(string roomno); + #endregion + + #region 根据房间编号修改房间信息（入住） + /// + /// 根据房间编号修改房间信息（入住） + /// + /// + /// + bool UpdateRoomInfo(Room r); + #endregion + + #region 根据房间编号修改房间信息（预约） + /// + /// 根据房间编号修改房间信息（预约） + /// + /// + /// + bool UpdateRoomInfoWithReser(Room r); + #endregion + + #region 查询可入住房间数量 + /// + /// 查询可入住房间数量 + /// + /// + object SelectCanUseRoomAllByRoomState(); + #endregion + + #region 查询已入住房间数量 + /// + /// 查询已入住房间数量 + /// + /// + object SelectNotUseRoomAllByRoomState(); + #endregion + + #region 根据房间编号查询房间价格 + /// + /// 根据房间编号查询房间价格 + /// + /// + object SelectRoomByRoomPrice(string r); + #endregion + + #region 查询脏房数量 + /// + /// 查询脏房数量 + /// + /// + object SelectNotClearRoomAllByRoomState(); + #endregion + + #region 查询维修房数量 + /// + /// 查询维修房数量 + /// + /// + object SelectFixingRoomAllByRoomState(); + #endregion + + #region 查询预约房数量 + /// + /// 查询预约房数量 + /// + /// + object SelectReseredRoomAllByRoomState(); + #endregion + + #region 根据房间编号更改房间状态 + /// + /// 根据房间编号更改房间状态 + /// + /// + /// + /// + bool UpdateRoomStateByRoomNo(string roomno, int stateid); + #endregion + + #region 添加房间 + /// + /// 添加房间 + /// + /// + /// + bool InsertRoom(Room rn); + #endregion + + #region 查询所有可消费（已住）房间 + /// + /// 查询所有可消费（已住）房间 + /// + /// + List SelectRoomByStateAll(); + #endregion + + #region 获取所有房间状态 + /// + /// 获取所有房间状态 + /// + /// + List SelectRoomStateAll(); + #endregion + + #region 根据房间编号查询房间状态编号 + /// + /// 根据房间编号查询房间状态编号 + /// + /// + /// + object SelectRoomStateIdByRoomNo(string roomno); + #endregion + } +} \ No newline at end of file diff --git a/SYS.Application/Room/IRoomTypeService.cs b/SYS.Application/Room/IRoomTypeService.cs new file mode 100644 index 0000000000000000000000000000000000000000..c1737acea79f446934d300476224ea15adcafe1f --- /dev/null +++ b/SYS.Application/Room/IRoomTypeService.cs @@ -0,0 +1,28 @@ +using SYS.Core; +using System.Collections.Generic; + +namespace SYS.Application +{ + /// + /// 客房信息接口 + /// + public interface IRoomTypeService + { + #region 获取所有房间类型 + /// + /// 获取所有房间类型 + /// + /// + List SelectRoomTypesAll(); + #endregion + + #region 根据房间编号查询房间类型名称 + /// + /// 根据房间编号查询房间类型名称 + /// + /// + /// + RoomType SelectRoomTypeByRoomNo(string no); + #endregion + } +} \ No newline at end of file diff --git a/SYS.Application/Room/RoomService.cs b/SYS.Application/Room/RoomService.cs index cc44c0cff353a109b795d7998ed75f0fe58c0f47..5c9e5468943281fd23069682178b58a2e713cc82 100644 --- a/SYS.Application/Room/RoomService.cs +++ b/SYS.Application/Room/RoomService.cs @@ -1,11 +1,16 @@ using System; using System.Collections.Generic; +using System.Linq; using MySql.Data.MySqlClient; +using SYS.Common; using SYS.Core; namespace SYS.Application { - public class RoomService + /// + /// 客房信息接口实现类 + /// + public class RoomService:Repository, IRoomService { #region 根据房间状态获取相应状态的房间信息 /// @@ -13,35 +18,21 @@ namespace SYS.Application /// /// /// - public static List SelectRoomByRoomState(int stateid) + public List SelectRoomByRoomState(int stateid) { + List roomStates = new List(); + roomStates = base.Change().GetList(a => a.delete_mk != 1); + List roomTypes = new List(); + roomTypes = base.Change().GetList(a => a.delete_mk != 1); List rooms = new List(); - string sql = "select * from ROOM r,ROOMTYPE t,ROOMSTATE rs where r.RoomType = t.RoomType and r.RoomStateId = rs.RoomStateId and r.RoomStateId = " + stateid + " order by r.RoomNo asc"; - MySqlDataReader dr = DBHelper.ExecuteReader(sql); - while (dr.Read()) + rooms = base.GetList(a => a.delete_mk != 1 && a.RoomStateId == stateid).OrderBy(a => a.RoomNo).ToList(); + rooms.ForEach(source => { - Room room = new Room(); - room.RoomNo = (string)dr["RoomNo"]; - room.CustoNo = dr["CustoNo"].ToString(); - room.RoomMoney = (decimal)dr["RoomMoney"]; - - if (!DBNull.Value.Equals(dr["CheckTime"])) - { - room.CheckTime = DateTime.Parse(dr["CheckTime"].ToString()); - } - if (!DBNull.Value.Equals(dr["CheckOutTime"])) - { - room.CheckOutTime = DateTime.Parse(dr["CheckOutTime"].ToString()); - } - room.RoomStateId = (int)dr["RoomStateId"]; - room.RoomState = (string)dr["RoomState"]; - room.RoomType = (int)dr["RoomType"]; - room.RoomPosition = (string)dr["RoomPosition"]; - room.typeName = (string)dr["RoomName"]; - rooms.Add(room); - } - dr.Close(); - DBHelper.Closecon(); + var roomState = roomStates.FirstOrDefault(a => a.RoomStateId == source.RoomStateId); + source.RoomState = string.IsNullOrEmpty(roomState.RoomStateName) ? "" : roomState.RoomStateName; + var roomType = roomTypes.FirstOrDefault(a => a.Roomtype == source.RoomType); + source.RoomName = string.IsNullOrEmpty(roomType.RoomName) ? "" : roomType.RoomName; + }); return rooms; } #endregion @@ -52,34 +43,21 @@ namespace SYS.Application /// 根据房间状态来查询可使用的房间 /// /// - public static List SelectCanUseRoomAll() + public List SelectCanUseRoomAll() { + List roomStates = new List(); + roomStates = base.Change().GetList(a => a.delete_mk != 1); + List roomTypes = new List(); + roomTypes = base.Change().GetList(a => a.delete_mk != 1); List rooms = new List(); - string sql = "select * from ROOM r,ROOMTYPE t,ROOMSTATE rs where r.RoomType=t.RoomType and r.RoomStateId=rs.RoomStateId and r.RoomStateId='0'"; - MySqlDataReader dr = DBHelper.ExecuteReader(sql); - while (dr.Read()) + rooms = base.GetList(a => a.delete_mk != 1 && a.RoomStateId == 0).OrderBy(a => a.RoomNo).ToList(); + rooms.ForEach(source => { - Room room = new Room(); - room.RoomNo = (string)dr["RoomNo"]; - room.CustoNo = dr["CustoNo"].ToString(); - room.RoomMoney = (decimal)dr["RoomMoney"]; - if (!DBNull.Value.Equals(dr["CheckTime"])) - { - room.CheckTime = DateTime.Parse(dr["CheckTime"].ToString()); - } - if (!DBNull.Value.Equals(dr["CheckOutTime"])) - { - room.CheckOutTime = DateTime.Parse(dr["CheckOutTime"].ToString()); - } - room.RoomStateId = (int)dr["RoomStateId"]; - room.RoomState = (string)dr["RoomState"]; - room.RoomType = (int)dr["RoomType"]; - room.RoomPosition = (string)dr["RoomPosition"]; - room.typeName = (string)dr["RoomName"]; - rooms.Add(room); - } - dr.Close(); - DBHelper.Closecon(); + var roomState = roomStates.FirstOrDefault(a => a.RoomStateId == source.RoomStateId); + source.RoomState = string.IsNullOrEmpty(roomState.RoomStateName) ? "" : roomState.RoomStateName; + var roomType = roomTypes.FirstOrDefault(a => a.Roomtype == source.RoomType); + source.RoomName = string.IsNullOrEmpty(roomType.RoomName) ? "" : roomType.RoomName; + }); return rooms; } #endregion @@ -90,34 +68,21 @@ namespace SYS.Application /// 获取所有房间信息 /// /// - public static List SelectRoomAll() + public List SelectRoomAll() { + List roomStates = new List(); + roomStates = base.Change().GetList(a => a.delete_mk != 1); + List roomTypes = new List(); + roomTypes = base.Change().GetList(a => a.delete_mk != 1); List rooms = new List(); - string sql = "select * from ROOM r,ROOMTYPE t,ROOMSTATE rs where r.RoomType=t.RoomType and r.RoomStateId=rs.RoomStateId order by r.RoomNo asc"; - MySqlDataReader dr = DBHelper.ExecuteReader(sql); - while (dr.Read()) + rooms = base.GetList(a => a.delete_mk != 1).OrderBy(a => a.RoomNo).ToList(); + rooms.ForEach(source => { - Room room = new Room(); - room.RoomNo = (string)dr["RoomNo"]; - room.CustoNo = dr["CustoNo"].ToString(); - room.RoomMoney = (decimal)dr["RoomMoney"]; - if (!DBNull.Value.Equals(dr["CheckTime"])) - { - room.CheckTime = DateTime.Parse(dr["CheckTime"].ToString()); - } - if (!DBNull.Value.Equals(dr["CheckOutTime"])) - { - room.CheckOutTime = DateTime.Parse(dr["CheckOutTime"].ToString()); - } - room.RoomStateId = (int)dr["RoomStateId"]; - room.RoomState = (string)dr["RoomState"]; - room.RoomType = (int)dr["RoomType"]; - room.RoomPosition = (string)dr["RoomPosition"]; - room.typeName = (string)dr["RoomName"]; - rooms.Add(room); - } - dr.Close(); - DBHelper.Closecon(); + var roomState = roomStates.FirstOrDefault(a => a.RoomStateId == source.RoomStateId); + source.RoomState = string.IsNullOrEmpty(roomState.RoomStateName) ? "" : roomState.RoomStateName; + var roomType = roomTypes.FirstOrDefault(a => a.Roomtype == source.RoomType); + source.RoomName = string.IsNullOrEmpty(roomType.RoomName) ? "" : roomType.RoomName; + }); return rooms; } #endregion @@ -127,36 +92,23 @@ namespace SYS.Application /// 获取房间分区的信息 /// /// - public static List SelectRoomByTypeName(string TypeName) + public List SelectRoomByTypeName(string TypeName) { - List rs = new List(); - string sql = "select * from ROOM r,ROOMTYPE t,ROOMSTATE rs where r.RoomType=t.RoomType and r.RoomStateId=rs.RoomStateId and t.RoomName='" + TypeName + "' order by r.RoomNo asc"; - MySqlDataReader dr = DBHelper.ExecuteReader(sql); - while (dr.Read()) + List roomStates = new List(); + roomStates = base.Change().GetList(a => a.delete_mk != 1); + List roomTypes = new List(); + roomTypes = base.Change().GetList(a => a.delete_mk != 1 && a.RoomName == TypeName); + var listTypes = roomTypes.Select(a => a.Roomtype).Distinct().ToList(); + List rooms = new List(); + rooms = base.GetList(a => a.delete_mk != 1 && listTypes.Contains(a.RoomType)).OrderBy(a => a.RoomNo).ToList(); + rooms.ForEach(source => { - Room r = new Room(); - r.RoomNo = (string)dr["RoomNo"]; - r.CustoNo = dr["CustoNo"].ToString(); - r.RoomMoney = (decimal)dr["RoomMoney"]; - if (!DBNull.Value.Equals(dr["CheckTime"])) - { - r.CheckTime = DateTime.Parse(dr["CheckTime"].ToString()); - } - if (!DBNull.Value.Equals(dr["CheckOutTime"])) - { - r.CheckOutTime = DateTime.Parse(dr["CheckOutTime"].ToString()); - } - r.RoomStateId = (int)dr["RoomStateId"]; - r.RoomState = (string)dr["RoomState"]; - r.RoomType = (int)dr["RoomType"]; - r.RoomPosition = (string)dr["RoomPosition"]; - r.typeName = (string)dr["RoomName"]; - rs.Add(r); - } - dr.Close(); - DBHelper.Closecon(); - return rs; - + var roomState = roomStates.FirstOrDefault(a => a.RoomStateId == source.RoomStateId); + source.RoomState = string.IsNullOrEmpty(roomState.RoomStateName) ? "" : roomState.RoomStateName; + var roomType = roomTypes.FirstOrDefault(a => a.Roomtype == source.RoomType); + source.RoomName = string.IsNullOrEmpty(roomType.RoomName) ? "" : roomType.RoomName; + }); + return rooms; } #endregion @@ -166,31 +118,14 @@ namespace SYS.Application /// /// /// - public static Room SelectRoomByRoomNo(string no) + public Room SelectRoomByRoomNo(string no) { - Room room = null; - string sql = "select * from room where RoomNo='" + no + "'"; - MySqlDataReader dr = DBHelper.ExecuteReader(sql); - if (dr.Read()) - { - room = new Room(); - room.RoomNo = (string)dr["RoomNo"]; - room.CustoNo = dr["CustoNo"].ToString(); - room.RoomMoney = (decimal)dr["RoomMoney"]; - if (!DBNull.Value.Equals(dr["CheckTime"])) - { - room.CheckTime = DateTime.Parse(dr["CheckTime"].ToString()); - } - if (!DBNull.Value.Equals(dr["CheckOutTime"])) - { - room.CheckOutTime = DateTime.Parse(dr["CheckOutTime"].ToString()); - } - room.RoomStateId = (int)dr["RoomStateId"]; - room.RoomType = (int)dr["RoomType"]; - room.RoomPosition = (string)dr["RoomPosition"]; - } - dr.Close(); - DBHelper.Closecon(); + List roomStates = new List(); + roomStates = base.Change().GetList(a => a.delete_mk != 1); + Room room = new Room(); + room = base.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; return room; } #endregion @@ -201,12 +136,15 @@ namespace SYS.Application /// /// /// - public static int UpdateRoomByRoomNo(string room) + public bool UpdateRoomByRoomNo(string room) { - string sql = "update ROOM set CustoNo=Null,CheckTime=null,"; - sql += "CheckOutTime =CURRENT_DATE(),"; - sql += "RoomStateId='3' where RoomNo='" + room + "'"; - return DBHelper.ExecuteNonQuery(sql); + return base.Update(a => new Room() + { + CustoNo = null, + CheckTime = null, + CheckOutTime = DateTime.Now, + RoomStateId = 3 + },a => a.RoomNo == room); } #endregion @@ -216,10 +154,9 @@ namespace SYS.Application /// /// /// - public static object DayByRoomNo(string roomno) + public object DayByRoomNo(string roomno) { - string sql = "select DATEDIFF(CURRENT_DATE(),CheckTime) as total from ROOM where RoomNo = '" + roomno + "'"; - return DBHelper.ExecuteScalar(sql); + return Math.Abs(((TimeSpan)(base.GetSingle(a => a.RoomNo == roomno).CheckTime - DateTime.Now)).Days); } #endregion @@ -229,13 +166,14 @@ namespace SYS.Application /// /// /// - public static int UpdateRoomInfo(Room r) + public bool UpdateRoomInfo(Room r) { - string sql = "update Room set CustoNo='{1}',CheckTime='{2}',CheckOutTime=Null,"; - sql += "RoomStateId ='{3}' where RoomNo='{0}'"; - sql = string.Format(sql, r.RoomNo, r.CustoNo, r.CheckTime, r.RoomStateId); - MySqlConnection con = DBHelper.GetConnection(); - return DBHelper.ExecuteNonQuery(sql); + return base.Update(a => new Room() + { + CheckTime = r.CheckTime, + RoomStateId = r.RoomStateId, + CustoNo = r.CustoNo + },a => a.RoomNo == r.RoomNo); } #endregion @@ -245,12 +183,14 @@ namespace SYS.Application /// /// /// - public static int UpdateRoomInfoWithReser(Room r) + public bool UpdateRoomInfoWithReser(Room r) { - string sql = "update Room set RoomStateId ='{1}' where RoomNo='{0}'"; - sql = string.Format(sql, r.RoomNo, r.RoomStateId); - MySqlConnection con = DBHelper.GetConnection(); - return DBHelper.ExecuteNonQuery(sql); + return base.Update(a => new Room() + { + RoomStateId = r.RoomStateId, + datachg_usr = LoginInfo.WorkerNo, + datachg_date = DateTime.Now + }, a => a.RoomNo == r.RoomNo); } #endregion @@ -259,11 +199,9 @@ namespace SYS.Application /// 查询可入住房间数量 /// /// - public static object SelectCanUseRoomAllByRoomState() + public object SelectCanUseRoomAllByRoomState() { - List rooms = new List(); - string sql = "select Count(*) from ROOM where RoomStateId='0' order by RoomNo asc"; - return DBHelper.ExecuteScalar(sql); + return base.GetList(a => a.RoomStateId == 0 && a.delete_mk != 1).OrderBy(a => a.RoomNo).Count(); } #endregion @@ -272,11 +210,9 @@ namespace SYS.Application /// 查询已入住房间数量 /// /// - public static object SelectNotUseRoomAllByRoomState() + public object SelectNotUseRoomAllByRoomState() { - List rooms = new List(); - string sql = "select Count(*) from ROOM where RoomStateId='1' order by RoomNo asc"; - return DBHelper.ExecuteScalar(sql); + return base.GetList(a => a.RoomStateId == 1 && a.delete_mk != 1).OrderBy(a => a.RoomNo).Count(); } #endregion @@ -285,12 +221,9 @@ namespace SYS.Application /// 根据房间编号查询房间价格 /// /// - public static object SelectRoomByRoomPrice(string r) + public object SelectRoomByRoomPrice(string r) { - - string sql = "select RoomMoney from Room where RoomNo='" + r + "'"; - return DBHelper.ExecuteReader(sql); - + return base.GetSingle(a => a.RoomNo == r).RoomMoney; } #endregion @@ -299,11 +232,9 @@ namespace SYS.Application /// 查询脏房数量 /// /// - public static object SelectNotClearRoomAllByRoomState() + public object SelectNotClearRoomAllByRoomState() { - List rooms = new List(); - string sql = "select Count(*) from ROOM where RoomStateId='3' order by RoomNo asc"; - return DBHelper.ExecuteScalar(sql); + return base.GetList(a => a.RoomStateId == 3 && a.delete_mk != 1).OrderBy(a => a.RoomNo).Count(); } #endregion @@ -312,11 +243,9 @@ namespace SYS.Application /// 查询维修房数量 /// /// - public static object SelectFixingRoomAllByRoomState() + public object SelectFixingRoomAllByRoomState() { - List rooms = new List(); - string sql = "select Count(*) from ROOM where RoomStateId='2' order by RoomNo asc"; - return DBHelper.ExecuteScalar(sql); + return base.GetList(a => a.RoomStateId == 2 && a.delete_mk != 1).OrderBy(a => a.RoomNo).Count(); } #endregion @@ -325,24 +254,9 @@ namespace SYS.Application /// 查询预约房数量 /// /// - public static object SelectReseredRoomAllByRoomState() + public object SelectReseredRoomAllByRoomState() { - List rooms = new List(); - string sql = "select Count(*) from ROOM where RoomStateId='4' order by RoomNo asc"; - return DBHelper.ExecuteScalar(sql); - } - #endregion - - #region 根据房间编号查询房间状态名称 - /// - /// 根据房间编号查询房间状态名称 - /// - /// - /// - public static object SelectRoomStateNameByRoomNo(string roomno) - { - string sql = "select s.RoomState from ROOMSTATE s,ROOM r where s.RoomStateId=r.RoomStateId and r.RoomNo='" + roomno + "'"; - return DBHelper.ExecuteScalar(sql); + return base.GetList(a => a.RoomStateId == 4 && a.delete_mk != 1).OrderBy(a => a.RoomNo).Count(); } #endregion @@ -353,10 +267,14 @@ namespace SYS.Application /// /// /// - public static int UpdateRoomStateByRoomNo(string roomno, int stateid) + public bool UpdateRoomStateByRoomNo(string roomno, int stateid) { - string sql = "update ROOM set RoomStateId='" + stateid + "' where RoomNo='" + roomno + "'"; - return DBHelper.ExecuteNonQuery(sql); + return base.Update(a => new Room() + { + RoomStateId = stateid, + datains_usr = LoginInfo.WorkerNo, + datachg_date = DateTime.Now + },a => a.RoomNo == roomno); } #endregion @@ -364,13 +282,11 @@ namespace SYS.Application /// /// 添加房间 /// - /// + /// /// - public static object InsertRoom(Room rn) + public bool InsertRoom(Room rn) { - string sql = "insert ROOM values('{0}','{1}',NULL,NULL,NULL,'0','{2}',NULL,'{3}')"; - sql = string.Format(sql, rn.RoomNo, rn.RoomType, rn.RoomMoney, rn.RoomPosition); - return DBHelper.ExecuteNonQuery(sql); + return base.Insert(rn); } #endregion @@ -379,34 +295,21 @@ namespace SYS.Application /// 查询所有可消费（已住）房间 /// /// - public static List SelectRoomByStateAll() + public List SelectRoomByStateAll() { + List roomStates = new List(); + roomStates = base.Change().GetList(a => a.delete_mk != 1); + List roomTypes = new List(); + roomTypes = base.Change().GetList(a => a.delete_mk != 1); List rooms = new List(); - string sql = "select * from ROOM r,ROOMTYPE t,ROOMSTATE rs where r.RoomType=t.RoomType and r.RoomStateId=rs.RoomStateId and r.RoomStateId='1'"; - MySqlDataReader dr = DBHelper.ExecuteReader(sql); - while (dr.Read()) + rooms = base.GetList(a => a.delete_mk != 1 && a.RoomStateId == 1).OrderBy(a => a.RoomNo).ToList(); + rooms.ForEach(source => { - Room room = new Room(); - room.RoomNo = (string)dr["RoomNo"]; - room.CustoNo = dr["CustoNo"].ToString(); - room.RoomMoney = (decimal)dr["RoomMoney"]; - if (!DBNull.Value.Equals(dr["CheckTime"])) - { - room.CheckTime = DateTime.Parse(dr["CheckTime"].ToString()); - } - if (!DBNull.Value.Equals(dr["CheckOutTime"])) - { - room.CheckOutTime = DateTime.Parse(dr["CheckOutTime"].ToString()); - } - room.RoomStateId = (int)dr["RoomStateId"]; - room.RoomState = (string)dr["RoomState"]; - room.RoomType = (int)dr["RoomType"]; - room.RoomPosition = (string)dr["RoomPosition"]; - room.typeName = (string)dr["RoomName"]; - rooms.Add(room); - } - dr.Close(); - DBHelper.Closecon(); + var roomState = roomStates.FirstOrDefault(a => a.RoomStateId == source.RoomStateId); + source.RoomState = string.IsNullOrEmpty(roomState.RoomStateName) ? "" : roomState.RoomStateName; + var roomType = roomTypes.FirstOrDefault(a => a.Roomtype == source.RoomType); + source.RoomName = string.IsNullOrEmpty(roomType.RoomName) ? "" : roomType.RoomName; + }); return rooms; } #endregion @@ -416,20 +319,10 @@ namespace SYS.Application /// 获取所有房间状态 /// /// - public static List SelectRoomStateAll() + public List SelectRoomStateAll() { - List rs = new List(); - string sql = "select * from ROOMSTATE"; - MySqlDataReader dr = DBHelper.ExecuteReader(sql); - while (dr.Read()) - { - Room r = new Room(); - r.RoomStateId = Convert.ToInt32(dr["RoomStateId"]); - r.RoomState = dr["RoomState"].ToString(); - rs.Add(r); - } - dr.Close(); - DBHelper.Closecon(); + List rs = new List(); + rs = base.Change().GetList(a => a.delete_mk != 1); return rs; } #endregion @@ -440,10 +333,9 @@ namespace SYS.Application /// /// /// - public static object SelectRoomStateIdByRoomNo(string roomno) + public object SelectRoomStateIdByRoomNo(string roomno) { - string sql = "select RoomStateId from ROOM where RoomNo='" + roomno + "'"; - return DBHelper.ExecuteScalar(sql); + return base.GetSingle(a => a.RoomNo == roomno).RoomStateId; } #endregion } diff --git a/SYS.Application/Room/RoomTypeService.cs b/SYS.Application/Room/RoomTypeService.cs index 74420e9d3c36edfc997d6b9a94d62207627c3d5d..c8804d8f531a1b32b0672d4f407967f1e675dee3 100644 --- a/SYS.Application/Room/RoomTypeService.cs +++ b/SYS.Application/Room/RoomTypeService.cs @@ -1,31 +1,24 @@ using System.Collections.Generic; using MySql.Data.MySqlClient; +using SYS.Common; using SYS.Core; namespace SYS.Application { - public class RoomTypeService + /// + /// 房间类型接口实现类 + /// + public class RoomTypeService:Repository, IRoomTypeService { #region 获取所有房间类型 /// /// 获取所有房间类型 /// /// - public static List SelectRoomTypesAll() + public List SelectRoomTypesAll() { List types = new List(); - string sql = "select * from ROOMTYPE"; - MySqlDataReader dr = DBHelper.ExecuteReader(sql); - while (dr.Read()) - { - RoomType type = new RoomType(); - type.Roomtype = (int)dr["Roomtype"]; - type.RoomName = dr["RoomName"].ToString(); - types.Add(type); - } - dr.Close(); - DBHelper.Closecon(); - + types = base.GetList(a => a.delete_mk != 1); return types; } #endregion @@ -36,18 +29,12 @@ namespace SYS.Application /// /// /// - public static RoomType SelectRoomTypeByRoomNo(string no) + public RoomType SelectRoomTypeByRoomNo(string no) { - RoomType roomtype = null; - string sql = "select t.RoomName from ROOMTYPE t,ROOM r where t.RoomType=r.RoomType and r.RoomNo='" + no + "'"; - MySqlDataReader dr = DBHelper.ExecuteReader(sql); - if (dr.Read()) - { - roomtype = new RoomType(); - roomtype.RoomName = dr["RoomName"].ToString(); - } - dr.Close(); - DBHelper.Closecon(); + RoomType roomtype = new RoomType(); + Room room = new Room(); + room = base.Change().GetSingle(a => a.RoomNo == no && a.delete_mk != 1); + roomtype.RoomName = base.GetSingle(a => a.Roomtype == room.RoomStateId).RoomName; return roomtype; } #endregion diff --git a/SYS.Application/SYS.Application.csproj b/SYS.Application/SYS.Application.csproj index 12ebdb8bffbc3d769b0187a6681e745d406717c9..8b7ab3adba4d07983d9dadccc5331be5219592cf 100644 --- a/SYS.Application/SYS.Application.csproj +++ b/SYS.Application/SYS.Application.csproj @@ -45,6 +45,9 @@ False ..\SYS.Library\MySql.Web.dll + + ..\packages\SqlSugar.5.0.2\lib\SqlSugar.dll + @@ -56,13 +59,30 @@ + + + + + + + + + + + + + + + + + @@ -78,6 +98,10 @@ + + {65501af6-c629-448a-847e-1bcd60665865} + SYS.Common + {cd039d0f-bd50-4fbf-b9cd-cdfab25c7dfa} SYS.Core @@ -85,5 +109,8 @@ + + + \ No newline at end of file diff --git a/SYS.Application/Worker/IWorkerCheckService.cs b/SYS.Application/Worker/IWorkerCheckService.cs new file mode 100644 index 0000000000000000000000000000000000000000..d28a921648034c0891d53cdbace6e167c73539db --- /dev/null +++ b/SYS.Application/Worker/IWorkerCheckService.cs @@ -0,0 +1,41 @@ +using SYS.Core; +using System.Collections.Generic; + +namespace SYS.Application +{ + /// + /// 员工打卡接口 + /// + public interface IWorkerCheckService + { + /// + /// 根据员工编号查询其所有的打卡记录 + /// + /// + /// + List SelectCheckInfoByWorkerNo(string wid); + + + /// + /// 查询员工签到天数 + /// + /// + /// + object SelectWorkerCheckDaySumByWorkerNo(string wkn); + + + /// + /// 查询今天员工是否已签到 + /// + /// + /// + object SelectToDayCheckInfoByWorkerNo(string wkn); + + /// + /// 添加员工打卡数据 + /// + /// + /// + bool AddCheckInfo(WorkerCheck workerCheck); + } +} \ No newline at end of file diff --git a/SYS.Application/Worker/IWorkerGoodBadService.cs b/SYS.Application/Worker/IWorkerGoodBadService.cs new file mode 100644 index 0000000000000000000000000000000000000000..d860cf808483d090da27744392398e69e7315ca0 --- /dev/null +++ b/SYS.Application/Worker/IWorkerGoodBadService.cs @@ -0,0 +1,25 @@ +using SYS.Core; +using System.Collections.Generic; + +namespace SYS.Application +{ + /// + /// 员工奖惩信息接口 + /// + public interface IWorkerGoodBadService + { + /// + /// 添加员工奖惩记录 + /// + /// + /// + bool AddGoodBad(WorkerGoodBad goodBad); + + /// + /// 根据工号查找所有的奖惩记录信息 + /// + /// + /// + List SelectAllGoodBadByWorkNo(string wn); + } +} \ No newline at end of file diff --git a/SYS.Application/Worker/IWorkerHistoryService.cs b/SYS.Application/Worker/IWorkerHistoryService.cs new file mode 100644 index 0000000000000000000000000000000000000000..70f826752cb7cfa65ea20e056a29431e67856469 --- /dev/null +++ b/SYS.Application/Worker/IWorkerHistoryService.cs @@ -0,0 +1,25 @@ +using SYS.Core; +using System.Collections.Generic; + +namespace SYS.Application +{ + /// + /// 员工履历信息接口 + /// + public interface IWorkerHistoryService + { + /// + /// 根据工号添加员工履历 + /// + /// + /// + bool AddHistoryByWorkerId(WorkerHistory workerHistory); + + /// + /// 根据工号查询履历信息 + /// + /// + /// + List SelectHistoryByWorkerId(string wid); + } +} \ No newline at end of file diff --git a/SYS.Application/Worker/IWorkerService.cs b/SYS.Application/Worker/IWorkerService.cs new file mode 100644 index 0000000000000000000000000000000000000000..bd188be7dae06196736f4cf460c31bbef43d30e4 --- /dev/null +++ b/SYS.Application/Worker/IWorkerService.cs @@ -0,0 +1,59 @@ +using SYS.Core; +using System.Collections.Generic; + +namespace SYS.Application +{ + /// + /// 员工信息接口 + /// + public interface IWorkerService + { + #region 修改员工信息 + /// + /// 修改员工信息 + /// + /// + /// + bool UpdateWorker(Worker worker); + #endregion + + + #region 添加员工信息 + /// + /// 添加员工信息 + /// + /// + /// + bool AddWorker(Worker worker); + #endregion + + #region 获取所有工作人员信息 + /// + /// 获取所有工作人员信息 + /// + /// + List SelectWorkerAll(); + #endregion + + #region 根据登录名称查询员工信息 + /// + /// 根据登录名称查询员工信息 + /// + /// + /// + Worker SelectWorkerInfoByWorkerId(string workerId); + #endregion + + #region 根据登录名称、密码查询员工信息 + /// + /// 根据登录名称、密码查询员工信息 + /// + /// + /// 登录名称 + /// + /// 登录密码 + /// + Worker SelectWorkerInfoByWorkerIdAndWorkerPwd(string id, string pwd); + #endregion + } +} \ No newline at end of file diff --git a/SYS.Application/Worker/WorkerCheckService.cs b/SYS.Application/Worker/WorkerCheckService.cs index 0b83fadc8c4612065feaa4df278c9d43a15c0752..4433bc51dcbd3474681d717b73d62b96fb2efba5 100644 --- a/SYS.Application/Worker/WorkerCheckService.cs +++ b/SYS.Application/Worker/WorkerCheckService.cs @@ -1,41 +1,29 @@ using System; using System.Collections.Generic; using MySql.Data.MySqlClient; +using SYS.Common; using SYS.Core; namespace SYS.Application { - public class WorkerCheckService + /// + /// 员工打卡接口实现类 + /// + public class WorkerCheckService:Repository, IWorkerCheckService { /// /// 根据员工编号查询其所有的打卡记录 /// /// /// - public static List SelectCheckInfoByWorkerNo(string wid) + public List SelectCheckInfoByWorkerNo(string wid) { List workerChecks = new List(); - string sql = "select * from WorkerCheck where WorkerNo = '" + wid + "'"; - DBHelper.Opencon(); - MySqlDataReader dr = DBHelper.ExecuteReader(sql); - while (dr.Read()) + workerChecks = base.GetList(a => a.WorkerNo == wid && a.delete_mk != 1); + workerChecks.ForEach(source => { - WorkerCheck workerCheck = new WorkerCheck(); - workerCheck.WorkerNo = dr["WorkerNo"].ToString(); - workerCheck.CheckTime = (DateTime)dr["CheckTime"]; - workerCheck.CheckWay = dr["CheckWay"].ToString(); - if (Convert.ToInt32(dr["CheckState"]) == 0) - { - workerCheck.CheckState = "打卡成功"; - } - else - { - workerCheck.CheckState = "打卡失败"; - } - workerChecks.Add(workerCheck); - } - dr.Close(); - DBHelper.Closecon(); + source.CheckStateNm = source.CheckState == 0 ? "打卡成功" : "打卡失败"; + }); return workerChecks; } @@ -45,10 +33,9 @@ namespace SYS.Application /// /// /// - public static object SelectWorkerCheckDaySumByWorkerNo(string wkn) + public object SelectWorkerCheckDaySumByWorkerNo(string wkn) { - string sql = "SELECT COUNT(*) FROM WORKERCHECK WHERE workerNo = '" + wkn + "'"; - return DBHelper.ExecuteScalar(sql); + return base.GetList(a => a.WorkerNo == wkn && a.delete_mk != 1).Count; } @@ -57,10 +44,10 @@ namespace SYS.Application /// /// /// - public static object SelectToDayCheckInfoByWorkerNo(string wkn) + public object SelectToDayCheckInfoByWorkerNo(string wkn) { - string sql = "select Count(*) from WORKERCHECK where WorkerNo = '"+wkn+"' and DATEDIFF(workercheck.CheckTime,CURRENT_DATE()) = 0"; - return DBHelper.ExecuteScalar(sql); + //string sql = "select Count(*) from WORKERCHECK where WorkerNo = '"+wkn+ "' and DATEDIFF(CURRENT_DATE(),workercheck.CheckTime)"; + return base.GetList(a => a.WorkerNo == wkn && a.delete_mk != 1 && a.CheckTime >= DateTime.Now).Count; } /// @@ -68,10 +55,9 @@ namespace SYS.Application /// /// /// - public static int AddCheckInfo(WorkerCheck workerCheck) + public bool AddCheckInfo(WorkerCheck workerCheck) { - string sql = "insert into WORKERCHECK values('" + workerCheck.WorkerNo + "','"+workerCheck.CheckTime+"','" + workerCheck.CheckWay + "','0')"; - return DBHelper.ExecuteNonQuery(sql); + return base.Insert(workerCheck); } } } diff --git a/SYS.Application/Worker/WorkerGoodBadService.cs b/SYS.Application/Worker/WorkerGoodBadService.cs index 9645af5c2ff530e291d4757a7ce7221beda2009b..375efcb2536d8772b0cd282f35e4abc57eefd4e7 100644 --- a/SYS.Application/Worker/WorkerGoodBadService.cs +++ b/SYS.Application/Worker/WorkerGoodBadService.cs @@ -5,37 +5,42 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using SYS.Core; +using SYS.Common; namespace SYS.Application { - public class WorkerGoodBadService + /// + /// 员工奖惩记录接口实现类 + /// + public class WorkerGoodBadService:Repository, IWorkerGoodBadService { - public static int AddGoodBad(WorkerGoodBad goodBad) + /// + /// 添加员工奖惩记录 + /// + /// + /// + public bool AddGoodBad(WorkerGoodBad goodBad) { - string sql = "insert into WorkerGoodBad values('" + goodBad.WorkNo + "','" + goodBad.GBInfo + "','" + goodBad.GBType + "','" + goodBad.GBOperation + "','" + goodBad.GBTime + "')"; - return DBHelper.ExecuteNonQuery(sql); + return base.Insert(goodBad); } - - public static List SelectAllGoodBadByWorkNo(string wn) + /// + /// 根据工号查找所有的奖惩记录信息 + /// + /// + /// + public List SelectAllGoodBadByWorkNo(string wn) { + List gBTypes = new List(); + gBTypes = base.Change().GetList(a => a.delete_mk != 1); List gb = new List(); string sql = "select * from WorkerGoodBad wgb,GBType gbt where wgb.GBType = gbt.GBType and wgb.WorkNo = '" + wn + "'"; - MySqlConnection conn = DBHelper.GetConnection(); - conn.Open(); - MySqlDataReader dr = DBHelper.ExecuteReader(sql); - while (dr.Read()) + gb = base.GetList(a => a.WorkNo == wn); + gb.ForEach(source => { - WorkerGoodBad goodBad = new WorkerGoodBad(); - goodBad.WorkNo = dr["WorkNo"].ToString(); - goodBad.GBInfo = dr["GBInfo"].ToString(); - goodBad.TypeName = dr["GBName"].ToString(); - goodBad.GBOperation = dr["GBOperation"].ToString(); - goodBad.GBTime = (DateTime)dr["GBTime"]; - gb.Add(goodBad); - } - dr.Close(); - DBHelper.Closecon(); + var gbType = gBTypes.FirstOrDefault(a => a.GBTypeId == source.GBType); + source.TypeName = string.IsNullOrEmpty(gbType.GBName) ? "" : gbType.GBName; + }); return gb; } } diff --git a/SYS.Application/Worker/WorkerHistoryService.cs b/SYS.Application/Worker/WorkerHistoryService.cs index ac71cea9a3b2323ff8e61e0d9f629eccfd43afaa..ef8f61584433813c8dd182848d174932e622ce62 100644 --- a/SYS.Application/Worker/WorkerHistoryService.cs +++ b/SYS.Application/Worker/WorkerHistoryService.cs @@ -1,36 +1,35 @@ using System; using System.Collections.Generic; using MySql.Data.MySqlClient; +using SYS.Common; using SYS.Core; namespace SYS.Application { - public class WorkerHistoryService + /// + /// 员工履历接口实现类 + /// + public class WorkerHistoryService:Repository, IWorkerHistoryService { - - public static int AddHistoryByWorkerId(WorkerHistory workerHistory, string wid) + /// + /// 根据工号添加员工履历 + /// + /// + /// + public bool AddHistoryByWorkerId(WorkerHistory workerHistory) { - string sql = "insert into WorkerHistory values('" + wid + "','" + workerHistory.StartDate + "','" + workerHistory.EndDate + "','" + workerHistory.Postion + "','" + workerHistory.Company + "')"; - return DBHelper.ExecuteNonQuery(sql); + return base.Insert(workerHistory); } - public static List SelectHistoryByWorkerId(string wid) + /// + /// 根据工号查询履历信息 + /// + /// + /// + public List SelectHistoryByWorkerId(string wid) { List why = new List(); - string sql = "SELECT * FROM WORKERINFO wi,WORKERHISTORY wh where wi.WorkerId = wh.WorkerId and wi.WorkerId = '" + wid + "'"; - MySqlDataReader dr = DBHelper.ExecuteReader(sql); - while (dr.Read()) - { - WorkerHistory workerHistory = new WorkerHistory(); - workerHistory.WorkerId = dr["WorkerId"].ToString(); - workerHistory.StartDate = DateTime.Parse(dr["StartDate"].ToString()); - workerHistory.EndDate = DateTime.Parse(dr["EndDate"].ToString()); - workerHistory.Postion = dr["Position"].ToString(); - workerHistory.Company = dr["Company"].ToString(); - why.Add(workerHistory); - } - dr.Close(); - DBHelper.Closecon(); + why = base.GetList(a => a.delete_mk != 1 && a.WorkerId == wid); return why; } } diff --git a/SYS.Application/Worker/WorkerService.cs b/SYS.Application/Worker/WorkerService.cs index 310ce81a2203c711969fff3bc026fda8e204f1e5..9669016b1708071d4e11cae8fccec4b0129b410d 100644 --- a/SYS.Application/Worker/WorkerService.cs +++ b/SYS.Application/Worker/WorkerService.cs @@ -1,23 +1,37 @@ using System; using System.Collections.Generic; +using System.Linq; using MySql.Data.MySqlClient; +using SYS.Common; using SYS.Core; namespace SYS.Application { - public class WorkerService + /// + /// 员工信息接口实现类 + /// + public class WorkerService:Repository,IWorkerService { - #region 修改员工信息 /// /// 修改员工信息 /// /// /// - public static int UpdateWorker(Worker worker) + public bool UpdateWorker(Worker worker) { - string sql = "update WORKERINFO set WorkerTel = '"+worker.WorkerTel+"',WorkerAddress = '"+worker.WorkerAddress+"',WorkerPwd = '"+worker.WorkerPwd+"',WorkerFace = '"+worker.WorkerFace+"',WorkerEducation = '"+worker.WorkerEduction+"',WorkerSex = '"+worker.WorkerSex+"' where WorkerId = '"+worker.WorkerId+"'"; - return DBHelper.ExecuteNonQuery(sql); + return base.Update(a => new Worker() + { + WorkerTel = worker.WorkerTel, + WorkerAddress = worker.WorkerAddress, + WorkerPwd = worker.WorkerPwd, + WorkerFace = worker.WorkerFace, + WorkerEducation = worker.WorkerEducation, + WorkerSex = worker.WorkerSex, + datachg_usr = AdminInfo.Account, + datachg_date = DateTime.Now + },a => a.WorkerId == worker.WorkerId); + } #endregion @@ -28,10 +42,9 @@ namespace SYS.Application /// /// /// - public static int AddWorker(Worker worker) + public bool AddWorker(Worker worker) { - string sql = "insert into WORKERINFO values('" + worker.WorkerId + "','" + worker.WorkerName + "','" + worker.WorkerBirth + "','" + worker.WorkerSex + "','" + worker.WorkerTel + "','" + worker.WorkerClub + "','" + worker.WorkerAddress + "','" + worker.WorkerPosition + "','" + worker.CardId + "','" + worker.WorkerPwd + "','" + worker.WorkerTime + "','" + worker.WorkerFace + "','" + worker.WorkerEduction + "')"; - return DBHelper.ExecuteNonQuery(sql); + return base.Insert(worker); } #endregion @@ -40,31 +53,45 @@ namespace SYS.Application /// 获取所有工作人员信息 /// /// - public static List SelectWorkerAll() + public List SelectWorkerAll() { + //查询所有教育程度信息 + List educations = new List(); + educations = base.Change().GetList(a => a.delete_mk != 1); + //查询所有性别类型信息 + List sexTypes = new List(); + sexTypes = base.Change().GetList(a => a.delete_mk != 1); + //查询所有民族类型信息 + List nations = new List(); + nations = base.Change().GetList(a => a.delete_mk != 1); + //查询所有部门信息 + List depts = new List(); + depts = base.Change().GetList(a => a.delete_mk != 1); + //查询所有职位信息 + List positions = new List(); + positions = base.Change().GetList(a => a.delete_mk != 1); + //查询所有员工信息 List workers = new List(); - string sql = "select * from WORKERINFO"; - MySqlDataReader dr = DBHelper.ExecuteReader(sql); - while (dr.Read()) + workers = base.Change().GetList(a => a.delete_mk != 1); + workers.ForEach(source => { - Worker worker = new Worker(); - worker.WorkerId = (string)dr["WorkerId"]; - worker.WorkerName = dr["WorkerName"].ToString(); - worker.WorkerBirth = DateTime.Parse(dr["WorkerBirthday"].ToString()); - worker.WorkerSex = Convert.ToString(dr["WorkerSex"]); - worker.WorkerTel = (string)dr["WorkerTel"]; - worker.WorkerClub = (string)dr["WorkerClub"]; - worker.WorkerAddress = (string)dr["WorkerAddress"]; - worker.WorkerPosition = (string)dr["WorkerPosition"]; - worker.CardId = (string)dr["CardId"]; - worker.WorkerPwd = (string)dr["WorkerPwd"]; - worker.WorkerTime = DateTime.Parse(dr["WorkerTime"].ToString()); - worker.WorkerFace = (string)dr["WorkerFace"]; - worker.WorkerEduction = (string)dr["WorkerEducation"]; - workers.Add(worker); - } - dr.Close(); - DBHelper.Closecon(); + //性别类型 + var sexType = sexTypes.FirstOrDefault(a => a.sexId == source.WorkerSex); + source.WorkerSexName = string.IsNullOrEmpty(sexType.sexName) ? "" : sexType.sexName; + //教育程度 + var eduction = educations.FirstOrDefault(a => a.education_no == source.WorkerEducation); + source.WorkerEducation = string.IsNullOrEmpty(eduction.education_name) ? "" : eduction.education_name; + //民族类型 + var nation = nations.FirstOrDefault(a => a.nation_no == source.WorkerNation); + source.NationName = string.IsNullOrEmpty(nation.nation_name) ? "" : nation.nation_name; + //部门 + var dept = depts.FirstOrDefault(a => a.dept_no == source.WorkerClub); + source.ClubName = string.IsNullOrEmpty(dept.dept_name) ? "" : dept.dept_name; + //职位 + var position = positions.FirstOrDefault(a => a.position_no == source.WorkerPosition); + source.PositionName = string.IsNullOrEmpty(position.position_name) ? "" : position.position_name; + }); + return workers; } #endregion @@ -75,29 +102,25 @@ namespace SYS.Application /// /// /// - public static Worker SelectWorkerInfoByWorkerId(string workerId) + public Worker SelectWorkerInfoByWorkerId(string workerId) { - Worker w = null; - string sql = "select * from WORKERINFO where WorkerId='" + workerId + "'"; - MySqlDataReader dr = DBHelper.ExecuteReader(sql); - if (dr.Read()) - { - w = new Worker(); - w.WorkerId = (string)dr["WorkerId"]; - w.WorkerName = dr["WorkerName"].ToString(); - w.WorkerBirth = DateTime.Parse(dr["WorkerBirthday"].ToString()); - w.WorkerSex = Convert.ToString(dr["WorkerSex"]); - w.WorkerTel = (string)dr["WorkerTel"]; - w.WorkerClub = (string)dr["WorkerClub"]; - w.WorkerAddress = (string)dr["WorkerAddress"]; - w.WorkerPosition = (string)dr["WorkerPosition"]; - w.CardId = (string)dr["CardId"]; - w.WorkerPwd = (string)dr["WorkerPwd"]; - w.WorkerTime = DateTime.Parse(dr["WorkerTime"].ToString()); - w.WorkerFace = (string)dr["WorkerFace"]; - } - dr.Close(); - DBHelper.Closecon(); + Worker w = new Worker(); + w = base.Change().GetSingle(a => a.WorkerId == workerId); + //性别类型 + var sexType = base.Change().GetSingle(a => a.sexId == w.WorkerSex); + w.WorkerSexName = string.IsNullOrEmpty(sexType.sexName) ? "" : sexType.sexName; + //教育程度 + var eduction = base.Change().GetSingle(a => a.education_no == w.WorkerEducation); + w.WorkerEducation = string.IsNullOrEmpty(eduction.education_name) ? "" : eduction.education_name; + //民族类型 + var nation = base.Change().GetSingle(a => a.nation_no == w.WorkerNation); + w.NationName = string.IsNullOrEmpty(nation.nation_name) ? "" : nation.nation_name; + //部门 + var dept = base.Change().GetSingle(a => a.dept_no == w.WorkerClub); + w.ClubName = string.IsNullOrEmpty(dept.dept_name) ? "" : dept.dept_name; + //职位 + var position = base.Change().GetSingle(a => a.position_no == w.WorkerPosition); + w.PositionName = string.IsNullOrEmpty(position.position_name) ? "" : position.position_name; return w; } #endregion @@ -111,30 +134,25 @@ namespace SYS.Application /// /// 登录密码 /// - public static Worker SelectWorkerInfoByWorkerIdAndWorkerPwd(string id, string pwd) + public Worker SelectWorkerInfoByWorkerIdAndWorkerPwd(string id, string pwd) { - Worker w = null; - string sql = "select * from WORKERINFO where WorkerId='{0}' and WorkerPwd='{1}'"; - sql = string.Format(sql, id, pwd); - MySqlDataReader dr = DBHelper.ExecuteReader(sql); - if (dr.Read()) - { - w = new Worker(); - w.WorkerId = (string)dr["WorkerId"]; - w.WorkerName = dr["WorkerName"].ToString(); - w.WorkerBirth = DateTime.Parse(dr["WorkerBirthday"].ToString()); - w.WorkerSex = Convert.ToString(dr["WorkerSex"]); - w.WorkerTel = (string)dr["WorkerTel"]; - w.WorkerClub = (string)dr["WorkerClub"]; - w.WorkerAddress = (string)dr["WorkerAddress"]; - w.WorkerPosition = (string)dr["WorkerPosition"]; - w.CardId = (string)dr["CardId"]; - w.WorkerPwd = (string)dr["WorkerPwd"]; - w.WorkerTime = DateTime.Parse(dr["WorkerTime"].ToString()); - w.WorkerFace = (string)dr["WorkerFace"]; - } - dr.Close(); - DBHelper.Closecon(); + Worker w = new Worker(); + w = base.GetSingle(a => a.WorkerId == id && a.WorkerPwd == pwd); + //性别类型 + var sexType = base.Change().GetSingle(a => a.sexId == w.WorkerSex); + w.WorkerSexName = string.IsNullOrEmpty(sexType.sexName) ? "" : sexType.sexName; + //教育程度 + var eduction = base.Change().GetSingle(a => a.education_no == w.WorkerEducation); + w.WorkerEducation = string.IsNullOrEmpty(eduction.education_name) ? "" : eduction.education_name; + //民族类型 + var nation = base.Change().GetSingle(a => a.nation_no == w.WorkerNation); + w.NationName = string.IsNullOrEmpty(nation.nation_name) ? "" : nation.nation_name; + //部门 + var dept = base.Change().GetSingle(a => a.dept_no == w.WorkerClub); + w.ClubName = string.IsNullOrEmpty(dept.dept_name) ? "" : dept.dept_name; + //职位 + var position = base.Change().GetSingle(a => a.position_no == w.WorkerPosition); + w.PositionName = string.IsNullOrEmpty(position.position_name) ? "" : position.position_name; return w; } #endregion diff --git a/SYS.Application/Zero/AdminService.cs b/SYS.Application/Zero/AdminService.cs index 3963e90d1700c76efced96badde30bf18f079c42..622a41bd86bc0faf3c65f5ebad8099604a8de031 100644 --- a/SYS.Application/Zero/AdminService.cs +++ b/SYS.Application/Zero/AdminService.cs @@ -1,56 +1,41 @@ using MySql.Data.MySqlClient; +using SYS.Common; using SYS.Core; namespace SYS.Application { - public class AdminService + /// + /// 管理员数据访问层 + /// + public class AdminService:Repository, IAdminService { + #region 根据超管密码查询员工类型和权限 /// /// 根据超管密码查询员工类型和权限 /// - /// + /// + /// /// - public static Admin SelectMangerByPass(string adminaccount,string adminpass) + public Admin SelectMangerByPass(string adminaccount,string adminpass) { - Admin a = null; - string sql = string.Format("select * from ADMININFO where AdminAccount = '{0}' and AdminPassword='{1}'", adminaccount, adminpass); - MySqlDataReader dr = DBHelper.ExecuteReader(sql); - if (dr.Read()) - { - a = new Admin(); - a.AdminType = dr["AdminType"].ToString(); - a.AdminName = dr["AdminName"].ToString(); - a.IsAdmin = (int)dr["IsAdmin"]; - } - dr.Close(); - DBHelper.Closecon(); - return a; + Admin admin = new Admin(); + admin = base.GetSingle(a => a.AdminAccount == adminaccount && a.AdminPassword == adminpass); + return admin; } #endregion - #region 根据超管密码查询超管信息 + #region 根据超管账号查询对应的密码 /// - /// 根据超管密码查询超管信息 + /// 根据超管账号查询对应的密码 /// - /// - /// 超管密码 + /// /// - public static Admin SelectAdminInfoByadminpwd(string pwd) + public Admin SelectAdminPwdByAccount(string account) { - Admin a = null; - string sql = "select * from ADMININFO where AdminPassword='{0}'"; - sql = string.Format(sql, pwd); - MySqlDataReader dr = DBHelper.ExecuteReader(sql); - if (dr.Read()) - { - a = new Admin(); - a.AdminPassword = (string)dr["WorkerId"]; - a.AdminType = dr["WorkerName"].ToString(); - } - dr.Close(); - DBHelper.Closecon(); - return a; + Admin admin = new Admin(); + admin = base.GetSingle(a => a.AdminAccount == account); + return admin; } #endregion } diff --git a/SYS.Application/Zero/BaseService.cs b/SYS.Application/Zero/BaseService.cs index 1ba1ec4d31b1acb20cb80990115990cd0b091be4..e5d88fac11270b134fd3530207d1dc92ecbad165 100644 --- a/SYS.Application/Zero/BaseService.cs +++ b/SYS.Application/Zero/BaseService.cs @@ -1,4 +1,5 @@ using MySql.Data.MySqlClient; +using SYS.Common; using SYS.Core; using System; using System.Collections.Generic; @@ -11,7 +12,7 @@ namespace SYS.Application /// /// 基础信息接口实现类 /// - public class BaseService: IBaseService + public class BaseService: Repository,IBaseService { #region 性别模块 @@ -22,18 +23,7 @@ namespace SYS.Application public List SelectSexTypeAll() { List sexTypes = new List(); - string sql = "select * from sextype"; - MySqlDataReader dr = DBHelper.ExecuteReader(sql); - while (dr.Read()) - { - SexType type = new SexType(); - type.sexId = (int)dr["sexId"]; - type.sexName = dr["sexName"].ToString(); - type.delete_mk = (int)dr["delete_mk"]; - sexTypes.Add(type); - } - dr.Close(); - DBHelper.Closecon(); + sexTypes = base.GetList(); return sexTypes; } @@ -43,18 +33,9 @@ namespace SYS.Application /// public SexType SelectSexType(SexType sexType) { - sexType = new SexType(); - string sql = string.Format("select * from sextype where sexId = {0}", sexType.sexId); - MySqlDataReader dr = DBHelper.ExecuteReader(sql); - while (dr.Read()) - { - sexType.sexId = (int)dr["sexId"]; - sexType.sexName = dr["sexName"].ToString(); - sexType.delete_mk = (int)dr["delete_mk"]; - } - dr.Close(); - DBHelper.Closecon(); - return sexType; + SexType sexTypes = new SexType(); + sexTypes = base.GetSingle(a => a.sexId == sexType.sexId); + return sexTypes; } /// @@ -62,10 +43,9 @@ namespace SYS.Application /// /// /// - public int AddSexType(SexType sexType) + public bool AddSexType(SexType sexType) { - string sql = string.Format("insert into sexType values('{0}','{1}')", sexType.sexId, sexType.sexName); - return DBHelper.ExecuteNonQuery(sql); + return base.Insert(sexType); } /// @@ -73,10 +53,14 @@ namespace SYS.Application /// /// /// - public int DelSexType(SexType sexType) + public bool DelSexType(SexType sexType) { - string sql = string.Format("update sexType set delete_mk = 1 where sexId = '[0]'", sexType.sexId); - return DBHelper.ExecuteNonQuery(sql); + return base.Update(a => new SexType() + { + delete_mk = sexType.delete_mk, + datachg_usr = LoginInfo.WorkerNo, + datachg_date = DateTime.Now + }, a => a.sexId == sexType.sexId); } /// @@ -84,10 +68,14 @@ namespace SYS.Application /// /// /// - public int UpdSexType(SexType sexType) + public bool UpdSexType(SexType sexType) { - string sql = string.Format("update sexType set sexName = '{1}' where sexId = '[0]'", sexType.sexId,sexType.sexName); - return DBHelper.ExecuteNonQuery(sql); + return base.Update(a => new SexType() + { + sexName = sexType.sexName, + datachg_usr = LoginInfo.WorkerNo, + datachg_date = DateTime.Now + }, a => a.sexId == sexType.sexId); } #endregion @@ -101,24 +89,7 @@ namespace SYS.Application public List SelectPositionAll() { List positions = new List(); - string sql = "select * from position"; - MySqlDataReader dr = DBHelper.ExecuteReader(sql); - while (dr.Read()) - { - Position position = new Position() - { - position_no = dr["position_no"].ToString(), - position_name = dr["position_name"].ToString(), - delete_mk = (int)dr["delete_mk"], - datains_usr = dr["datains_usr"].ToString(), - datains_date = Convert.ToDateTime(dr["datains_date"]), - datachg_usr = dr["datachg_usr"].ToString(), - datachg_date = Convert.ToDateTime(dr["datachg_date"]), - }; - positions.Add(position); - } - dr.Close(); - DBHelper.Closecon(); + positions = base.Change().GetList(); return positions; } @@ -129,23 +100,7 @@ namespace SYS.Application public Position SelectPosition(Position position) { Position position1 = new Position(); - string sql = string.Format("select * from position where position_no = '{0}'",position.position_no); - MySqlDataReader dr = DBHelper.ExecuteReader(sql); - while (dr.Read()) - { - position1 = new Position() - { - position_no = dr["position_no"].ToString(), - position_name = dr["position_name"].ToString(), - delete_mk = (int)dr["delete_mk"], - datains_usr = dr["datains_usr"].ToString(), - datains_date = Convert.ToDateTime(dr["datains_date"]), - datachg_usr = dr["datachg_usr"].ToString(), - datachg_date = Convert.ToDateTime(dr["datachg_date"]), - }; - } - dr.Close(); - DBHelper.Closecon(); + position1 = base.Change().GetSingle(a => a.position_no == position.position_no); return position1; } @@ -154,11 +109,9 @@ namespace SYS.Application /// /// /// - public int AddPosition(Position position) + public bool AddPosition(Position position) { - string sql = string.Format("insert into position(position_no,position_name,datains_usr,datains_date) values('{0}','{1}','{2}','{3}')" - , position.position_no,position.position_name,position.datains_usr,position.datains_date); - return DBHelper.ExecuteNonQuery(sql); + return base.Change().Insert(position); } /// @@ -166,11 +119,14 @@ namespace SYS.Application /// /// /// - public int DelPosition(Position position) + public bool DelPosition(Position position) { - string sql = string.Format("update position set delete_mk = 1,datachg_usr = '{1}',datachg_date = '{2}' where position_no = '{0}')" - , position.position_no, position.datachg_usr, position.datachg_date); - return DBHelper.ExecuteNonQuery(sql); + return base.Change().Update(a => new Position() + { + delete_mk = position.delete_mk, + datachg_usr = LoginInfo.WorkerNo, + datachg_date = DateTime.Now + },a => a.position_no == position.position_no); } /// @@ -178,11 +134,14 @@ namespace SYS.Application /// /// /// - public int UpdPosition(Position position) + public bool UpdPosition(Position position) { - string sql = string.Format("update position set position_name = '{1}',datachg_usr = '{2}',datachg_date = '{3}' where position_no = '{0}')" - , position.position_no, position.position_name,position.datachg_date,position.datachg_date); - return DBHelper.ExecuteNonQuery(sql); + return base.Change().Update(a => new Position() + { + position_name = position.position_name, + datachg_usr = LoginInfo.WorkerNo, + datachg_date = DateTime.Now + }, a => a.position_no == position.position_no); } #endregion @@ -196,24 +155,7 @@ namespace SYS.Application public List SelectNationAll() { List nations = new List(); - string sql = "select * from nation where delete_mk = 0"; - MySqlDataReader dr = DBHelper.ExecuteReader(sql); - while (dr.Read()) - { - Nation nation = new Nation() - { - nation_no = dr["nation_no"].ToString(), - nation_name = dr["nation_name"].ToString(), - delete_mk = (int)dr["delete_mk"], - datains_usr = dr["datains_usr"].ToString(), - datains_date = Convert.ToDateTime(dr["datains_date"]), - datachg_usr = dr["datachg_usr"].ToString(), - datachg_date = Convert.ToDateTime(dr["datachg_date"]), - }; - nations.Add(nation); - } - dr.Close(); - DBHelper.Closecon(); + nations = base.Change().GetList(); return nations; } @@ -224,23 +166,7 @@ namespace SYS.Application public Nation SelectNation(Nation nation) { Nation nation1 = new Nation(); - string sql = string.Format("select * from nation where nation_no = '{0}'", nation.nation_no); - MySqlDataReader dr = DBHelper.ExecuteReader(sql); - while (dr.Read()) - { - nation1 = new Nation() - { - nation_no = dr["nation_no"].ToString(), - nation_name = dr["nation_name"].ToString(), - delete_mk = (int)dr["delete_mk"], - datains_usr = dr["datains_usr"].ToString(), - datains_date = Convert.ToDateTime(dr["datains_date"]), - datachg_usr = dr["datachg_usr"].ToString(), - datachg_date = Convert.ToDateTime(dr["datachg_date"]), - }; - } - dr.Close(); - DBHelper.Closecon(); + nation1 = base.Change().GetSingle(a => a.nation_no.Equals(nation.nation_no)); return nation1; } @@ -249,11 +175,9 @@ namespace SYS.Application /// /// /// - public int AddNation(Nation nation) + public bool AddNation(Nation nation) { - string sql = string.Format("insert into nation(nation_no,nation_name,datains_usr,datains_date) values('{0}','{1}','{2}','{3}')" - , nation.nation_no, nation.nation_name, nation.datains_usr, nation.datains_date); - return DBHelper.ExecuteNonQuery(sql); + return base.Change().Insert(nation); } /// @@ -261,11 +185,15 @@ namespace SYS.Application /// /// /// - public int DelNation(Nation nation) + public bool DelNation(Nation nation) { - string sql = string.Format("update nation set delete_mk = 1,datachg_usr = '{1}',datachg_date = '{2}' where nation_no = '{0}'" - , nation.nation_no, nation.datachg_usr, nation.datachg_date); - return DBHelper.ExecuteNonQuery(sql); + return base.Change().Update(a => new Nation() + { + delete_mk = nation.delete_mk, + datachg_usr = LoginInfo.WorkerNo, + datachg_date = DateTime.Now + },a => a.nation_no.Equals(nation.nation_no)); + } /// @@ -273,11 +201,14 @@ namespace SYS.Application /// /// /// - public int UpdNation(Nation nation) + public bool UpdNation(Nation nation) { - string sql = string.Format("update nation set nation_name = '{1}',datachg_usr = '{2}',datachg_date = '{3}' where nation_no = '{0}')" - , nation.nation_no, nation.nation_name, nation.datachg_date, nation.datachg_date); - return DBHelper.ExecuteNonQuery(sql); + return base.Change().Update(a => new Nation() + { + nation_name = nation.nation_name, + datachg_usr = LoginInfo.WorkerNo, + datachg_date = DateTime.Now + }, a => a.nation_no.Equals(nation.nation_no)); } #endregion @@ -291,24 +222,7 @@ namespace SYS.Application public List SelectEducationAll() { List educations = new List(); - string sql = "select * from Education"; - MySqlDataReader dr = DBHelper.ExecuteReader(sql); - while (dr.Read()) - { - Education education = new Education() - { - education_no = dr["education_no"].ToString(), - education_name = dr["education_name"].ToString(), - delete_mk = (int)dr["delete_mk"], - datains_usr = dr["datains_usr"].ToString(), - datains_date = Convert.ToDateTime(dr["datains_date"]), - datachg_usr = dr["datachg_usr"].ToString(), - datachg_date = Convert.ToDateTime(dr["datachg_date"]), - }; - educations.Add(education); - } - dr.Close(); - DBHelper.Closecon(); + educations = base.Change().GetList(); return educations; } @@ -319,23 +233,7 @@ namespace SYS.Application public Education SelectEducation(Education education) { Education education1 = new Education(); - string sql = string.Format("select * from education where education_no = '{0}'", education.education_no); - MySqlDataReader dr = DBHelper.ExecuteReader(sql); - while (dr.Read()) - { - education1 = new Education() - { - education_no = dr["education_no"].ToString(), - education_name = dr["education_name"].ToString(), - delete_mk = (int)dr["delete_mk"], - datains_usr = dr["datains_usr"].ToString(), - datains_date = Convert.ToDateTime(dr["datains_date"]), - datachg_usr = dr["datachg_usr"].ToString(), - datachg_date = Convert.ToDateTime(dr["datachg_date"]), - }; - } - dr.Close(); - DBHelper.Closecon(); + education1 = base.Change().GetSingle(a => a.education_no == education.education_no); return education1; } @@ -344,11 +242,9 @@ namespace SYS.Application /// /// /// - public int AddEducation(Education education) + public bool AddEducation(Education education) { - string sql = string.Format("insert into education(education_no,education_name,datains_usr,datains_date) values('{0}','{1}','{2}','{3}')" - , education.education_no, education.education_name, education.datains_usr, education.datains_date); - return DBHelper.ExecuteNonQuery(sql); + return base.Change().Insert(education); } /// @@ -356,11 +252,14 @@ namespace SYS.Application /// /// /// - public int DelEducation(Education education) + public bool DelEducation(Education education) { - string sql = string.Format("update education set delete_mk = 1,datachg_usr = '{1}',datachg_date = '{2}' where education_no = '{0}')" - , education.education_no, education.datachg_usr, education.datachg_date); - return DBHelper.ExecuteNonQuery(sql); + return base.Change().Update(a => new Education() + { + delete_mk = education.delete_mk, + datachg_usr = LoginInfo.WorkerNo, + datachg_date = DateTime.Now + }, a => a.education_no == education.education_no); } /// @@ -368,11 +267,14 @@ namespace SYS.Application /// /// /// - public int UpdEducation(Education education) + public bool UpdEducation(Education education) { - string sql = string.Format("update education set education_name = '{1}',datachg_usr = '{2}',datachg_date = '{3}' where education_no = '{0}')" - , education.education_no, education.education_name, education.datachg_date, education.datachg_date); - return DBHelper.ExecuteNonQuery(sql); + return base.Change().Update(a => new Education() + { + education_name = education.education_name, + datachg_usr = LoginInfo.WorkerNo, + datachg_date = DateTime.Now + }, a => a.education_no == education.education_no); } #endregion @@ -386,28 +288,7 @@ namespace SYS.Application public List SelectDeptAll() { List depts = new List(); - string sql = "select * from Dept"; - MySqlDataReader dr = DBHelper.ExecuteReader(sql); - while (dr.Read()) - { - Dept dept = new Dept() - { - dept_no = dr["dept_no"].ToString(), - dept_name = dr["dept_name"].ToString(), - dept_desc = dr["dept_desc"].ToString(), - dept_leader = dr["dept_leader"].ToString(), - dept_date = Convert.ToDateTime(dr["dept_date"]), - dept_parent = dr["dept_parent"].ToString(), - delete_mk = (int)dr["delete_mk"], - datains_usr = dr["datains_usr"].ToString(), - datains_date = Convert.ToDateTime(dr["datains_date"]), - datachg_usr = dr["datachg_usr"].ToString(), - datachg_date = Convert.ToDateTime(dr["datachg_date"]), - }; - depts.Add(dept); - } - dr.Close(); - DBHelper.Closecon(); + depts = base.Change().GetList(); return depts; } @@ -418,27 +299,7 @@ namespace SYS.Application public Dept SelectDept(Dept dept) { Dept dept1 = new Dept(); - string sql = string.Format("select * from dept where dept_no = '{0}'", dept.dept_no); - MySqlDataReader dr = DBHelper.ExecuteReader(sql); - while (dr.Read()) - { - dept1 = new Dept() - { - dept_no = dr["dept_no"].ToString(), - dept_name = dr["dept_name"].ToString(), - dept_desc = dr["dept_desc"].ToString(), - dept_leader = dr["dept_leader"].ToString(), - dept_date = Convert.ToDateTime(dr["dept_date"]), - dept_parent = dr["dept_parent"].ToString(), - delete_mk = (int)dr["delete_mk"], - datains_usr = dr["datains_usr"].ToString(), - datains_date = Convert.ToDateTime(dr["datains_date"]), - datachg_usr = dr["datachg_usr"].ToString(), - datachg_date = Convert.ToDateTime(dr["datachg_date"]), - }; - } - dr.Close(); - DBHelper.Closecon(); + dept1 = base.Change().GetSingle(a => a.dept_no.Equals(dept.dept_no)); return dept1; } @@ -447,12 +308,9 @@ namespace SYS.Application /// /// /// - public int AddDept(Dept dept) + public bool AddDept(Dept dept) { - string sql = string.Format("insert into dept(dept_no,dept_name,dept_desc,dept_date,dept_leader,dept_parent,datains_usr,datains_date)" + - " values('{0}','{1}','{2}','{3}','{4}','{5}','{6}','{7}')" - , dept.dept_no, dept.dept_name, dept.dept_desc, dept.dept_date, dept.dept_leader, dept.dept_parent, dept.datains_usr, dept.datains_date); - return DBHelper.ExecuteNonQuery(sql); + return base.Change().Insert(dept); } /// @@ -460,11 +318,14 @@ namespace SYS.Application /// /// /// - public int DelDept(Dept dept) + public bool DelDept(Dept dept) { - string sql = string.Format("update dept set delete_mk = 1,datachg_usr = '{1}',datachg_date = '{2}' where dept_no = '{0}')" - , dept.dept_no, dept.datachg_usr, dept.datachg_date); - return DBHelper.ExecuteNonQuery(sql); + return base.Change().Update(a => new Dept() + { + delete_mk = dept.delete_mk, + datachg_usr = LoginInfo.WorkerNo, + datachg_date = DateTime.Now + },a => a.dept_no == dept.dept_no); } /// @@ -472,11 +333,18 @@ namespace SYS.Application /// /// /// - public int UpdDept(Dept dept) + public bool UpdDept(Dept dept) { - string sql = string.Format("update dept set dept_name = '{1}',dept_desc = '{2}',dept_date = '{3}',dept_leader = '{4}',dept_parent = '{5}',datachg_usr = {6},datachg_date = {7} where dept_no = '{0}')" - , dept.dept_no, dept.dept_name, dept.dept_desc, dept.dept_date, dept.dept_leader, dept.dept_parent, dept.datachg_usr, dept.datachg_date); - return DBHelper.ExecuteNonQuery(sql); + return base.Change().Update(a => new Dept() + { + dept_name = dept.dept_name, + dept_desc = dept.dept_desc, + dept_leader = dept.dept_leader, + dept_parent = dept.dept_parent, + dept_date = dept.dept_date, + datachg_usr = LoginInfo.WorkerNo, + datachg_date = DateTime.Now + },a => a.dept_no == dept.dept_no); } #endregion diff --git a/SYS.Application/Zero/IAdminService.cs b/SYS.Application/Zero/IAdminService.cs new file mode 100644 index 0000000000000000000000000000000000000000..a495e7c804160664e385352741c40e4d9bf60087 --- /dev/null +++ b/SYS.Application/Zero/IAdminService.cs @@ -0,0 +1,31 @@ +using SYS.Core; + +namespace SYS.Application +{ + /// + /// 管理员数据访问接口 + /// + public interface IAdminService + { + + #region 根据超管密码查询员工类型和权限 + /// + /// 根据超管密码查询员工类型和权限 + /// + /// + /// + /// + Admin SelectMangerByPass(string adminaccount, string adminpass); + #endregion + + + #region 根据超管账号查询对应的密码 + /// + /// 根据超管账号查询对应的密码 + /// + /// + /// + Admin SelectAdminPwdByAccount(string account); + #endregion + } +} \ No newline at end of file diff --git a/SYS.Application/Zero/IBaseService.cs b/SYS.Application/Zero/IBaseService.cs index 235a4e4304b3fc564d5d38f8d82577b5cf1d98e8..60df892485aba393994761e47804a9a4433c47a0 100644 --- a/SYS.Application/Zero/IBaseService.cs +++ b/SYS.Application/Zero/IBaseService.cs @@ -31,21 +31,21 @@ namespace SYS.Application /// /// /// - int AddSexType(SexType sexType); + bool AddSexType(SexType sexType); /// /// 删除性别类型 /// /// /// - int DelSexType(SexType sexType); + bool DelSexType(SexType sexType); /// /// 更新性别类型 /// /// /// - int UpdSexType(SexType sexType); + bool UpdSexType(SexType sexType); #endregion @@ -68,21 +68,21 @@ namespace SYS.Application /// /// /// - int AddPosition(Position position); + bool AddPosition(Position position); /// /// 删除职位类型 /// /// /// - int DelPosition(Position position); + bool DelPosition(Position position); /// /// 更新职位类型 /// /// /// - int UpdPosition(Position position); + bool UpdPosition(Position position); #endregion @@ -105,21 +105,21 @@ namespace SYS.Application /// /// /// - int AddNation(Nation nation); + bool AddNation(Nation nation); /// /// 删除民族类型 /// /// /// - int DelNation(Nation nation); + bool DelNation(Nation nation); /// /// 更新民族类型 /// /// /// - int UpdNation(Nation nation); + bool UpdNation(Nation nation); #endregion @@ -142,21 +142,21 @@ namespace SYS.Application /// /// /// - int AddEducation(Education education); + bool AddEducation(Education education); /// /// 删除学历类型 /// /// /// - int DelEducation(Education education); + bool DelEducation(Education education); /// /// 更新学历类型 /// /// /// - int UpdEducation(Education education); + bool UpdEducation(Education education); #endregion @@ -179,21 +179,21 @@ namespace SYS.Application /// /// /// - int AddDept(Dept dept); + bool AddDept(Dept dept); /// /// 删除部门类型 /// /// /// - int DelDept(Dept dept); + bool DelDept(Dept dept); /// /// 更新部门类型 /// /// /// - int UpdDept(Dept dept); + bool UpdDept(Dept dept); #endregion } diff --git a/SYS.Application/Zero/INoticeService.cs b/SYS.Application/Zero/INoticeService.cs new file mode 100644 index 0000000000000000000000000000000000000000..2c00171e7dd631fe2e373b09041e17a25ed56519 --- /dev/null +++ b/SYS.Application/Zero/INoticeService.cs @@ -0,0 +1,19 @@ +using SYS.Core; +using System.Collections.Generic; + +namespace SYS.Application +{ + /// + /// 公告接口 + /// + public interface INoticeService + { + #region 获取所有公告信息 + /// + /// 获取所有公告信息 + /// + /// + List SelectNoticeAll(); + #endregion + } +} \ No newline at end of file diff --git a/SYS.Application/Zero/IOperationlogService.cs b/SYS.Application/Zero/IOperationlogService.cs new file mode 100644 index 0000000000000000000000000000000000000000..0e4ead1518855f3eaa3c260d106bba78df631a11 --- /dev/null +++ b/SYS.Application/Zero/IOperationlogService.cs @@ -0,0 +1,6 @@ +namespace SYS.Application +{ + internal interface IOperationlogService + { + } +} \ No newline at end of file diff --git a/SYS.Application/Zero/NoticeService.cs b/SYS.Application/Zero/NoticeService.cs index 544ed08e4bc0f4951e712d01e065931845ad0b98..fd492f21ebf0e7994e4105e0ef9e6a9c6a4c5563 100644 --- a/SYS.Application/Zero/NoticeService.cs +++ b/SYS.Application/Zero/NoticeService.cs @@ -1,35 +1,25 @@ using System; using System.Collections.Generic; using MySql.Data.MySqlClient; +using SYS.Common; using SYS.Core; namespace SYS.Application { - public class NoticeService + /// + /// 公告信息接口实现类 + /// + public class NoticeService:Repository, INoticeService { #region 获取所有公告信息 /// /// 获取所有公告信息 /// /// - public static List SelectNoticeAll() + public List SelectNoticeAll() { List ntc = new List(); - string sql = "select * from UPLOADINFO"; - MySqlDataReader dr = DBHelper.ExecuteReader(sql); - while (dr.Read()) - { - Notice ntcs = new Notice(); - ntcs.NoticeNo = (string)dr["NoticeNo"]; - ntcs.Noticetheme = dr["Noticetheme"].ToString(); - ntcs.NoticeTime = DateTime.Parse(dr["NoticeTime"].ToString()); - ntcs.NoticeContent = Convert.ToString(dr["NoticeContent"]); - ntcs.NoticeClub = (string)dr["NoticeClub"]; - ntcs.NoticePerson = Convert.ToString(dr["NoticePerson"]); - ntc.Add(ntcs); - } - dr.Close(); - DBHelper.Closecon(); + ntc = base.GetList(a => a.delete_mk != 1); return ntc; } #endregion diff --git a/SYS.Application/Zero/OperationlogService.cs b/SYS.Application/Zero/OperationlogService.cs index a69067a754c8e66d8b1cbd5ac9b8459fb82a6771..3930091f2dc96847f9bc0716d028ab51848242c5 100644 --- a/SYS.Application/Zero/OperationlogService.cs +++ b/SYS.Application/Zero/OperationlogService.cs @@ -1,7 +1,9 @@ using System; using System.Collections.Generic; using System.Data; +using System.Linq; using MySql.Data.MySqlClient; +using SYS.Common; using SYS.Core; namespace SYS.Application @@ -9,47 +11,27 @@ namespace SYS.Application /// /// 操作日志数据访问层 /// - public class OperationlogService + public class OperationlogService:Repository, IOperationlogService { /// /// 添加操作日志 /// /// /// - public static int InsertOperationLog(Operation opr) + public bool InsertOperationLog(OperationLog opr) { - int n = 0; - string sql = "insert OPERATIONLOG(OperationTime,OperationLog,OperationAccount) values(@OperationTime," + - "@OperationLog,@OperationAccount)"; - n = DBHelper.ExecuteNonQuery(sql, CommandType.Text, - new MySqlParameter[] { - new MySqlParameter("@OperationTime",opr.OperationTime), - new MySqlParameter("@OperationLog",opr.Operationlog), - new MySqlParameter("@OperationAccount",opr.OperationAccount), - }); - return n; + return base.Insert(opr); } /// /// 查询所有操作日志 /// /// - public static List SelectOperationlogAll() + public List SelectOperationlogAll() { - List custos = new List(); - string sql = "select * from operationlog order by OperationTime desc"; - MySqlDataReader dr = DBHelper.ExecuteReader(sql); - while (dr.Read()) - { - OperationLog cso = new OperationLog(); - cso.OperationTime = DateTime.Parse(dr["OperationTime"].ToString()); - cso.Operationlog = dr["Operationlog"].ToString(); - cso.OperationAccount = (string)dr["OperationAccount"]; - custos.Add(cso); - } - dr.Close(); - DBHelper.Closecon(); - return custos; + List operationLogs = new List(); + operationLogs = base.GetList(a => a.delete_mk != 1).OrderBy(a => a.OperationTime).ToList(); + return operationLogs; } diff --git a/SYS.Application/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/SYS.Application/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index c79056d53a8a529363d143f959bb9868a32c9db0..06701643dec1ef19fbaa7e826579c3c4104081c5 100644 Binary files a/SYS.Application/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/SYS.Application/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/SYS.Application/obj/Debug/SYS.Application.csproj.FileListAbsolute.txt b/SYS.Application/obj/Debug/SYS.Application.csproj.FileListAbsolute.txt index f4f1a75580b0fccfed53c14c4d495ee4060e3723..d73c8cbea9560ab7947d826c50cc1a6ff810a0ce 100644 --- a/SYS.Application/obj/Debug/SYS.Application.csproj.FileListAbsolute.txt +++ b/SYS.Application/obj/Debug/SYS.Application.csproj.FileListAbsolute.txt @@ -65,3 +65,18 @@ D:\TopSkyHotelManagerSystem\TopskyHotelManagerSystem\SYS.Application\obj\Debug\S D:\TopSkyHotelManagerSystem\TopskyHotelManagerSystem\SYS.Application\obj\Debug\SYS.Application.dll D:\TopSkyHotelManagerSystem\TopskyHotelManagerSystem\SYS.Application\obj\Debug\SYS.Application.pdb D:\TopSkyHotelManagerSystem\TopskyHotelManagerSystem\SYS.Application\bin\Debug\SYS.Application.xml +D:\TopSkyHotelManagerSystem\TopskyHotelManagerSystem\SYS.Application\bin\Debug\Google.Protobuf.dll +D:\TopSkyHotelManagerSystem\TopskyHotelManagerSystem\SYS.Application\bin\Debug\Zstandard.Net.dll +D:\TopSkyHotelManagerSystem\TopskyHotelManagerSystem\SYS.Application\bin\Debug\K4os.Compression.LZ4.Streams.dll +D:\TopSkyHotelManagerSystem\TopskyHotelManagerSystem\SYS.Application\bin\Debug\Ubiety.Dns.Core.dll +D:\TopSkyHotelManagerSystem\TopskyHotelManagerSystem\SYS.Application\bin\Debug\System.Memory.dll +D:\TopSkyHotelManagerSystem\TopskyHotelManagerSystem\SYS.Application\bin\Debug\System.Buffers.dll +D:\TopSkyHotelManagerSystem\TopskyHotelManagerSystem\SYS.Application\bin\Debug\K4os.Compression.LZ4.dll +D:\TopSkyHotelManagerSystem\TopskyHotelManagerSystem\SYS.Application\bin\Debug\K4os.Hash.xxHash.dll +D:\TopSkyHotelManagerSystem\TopskyHotelManagerSystem\SYS.Application\bin\Debug\System.Numerics.Vectors.dll +D:\TopSkyHotelManagerSystem\TopskyHotelManagerSystem\SYS.Application\bin\Debug\System.Runtime.CompilerServices.Unsafe.dll +D:\TopSkyHotelManagerSystem\TopskyHotelManagerSystem\SYS.Application\bin\Debug\SqlSugar.dll +D:\TopSkyHotelManagerSystem\TopskyHotelManagerSystem\SYS.Application\bin\Debug\SYS.Common.dll +D:\TopSkyHotelManagerSystem\TopskyHotelManagerSystem\SYS.Application\bin\Debug\SYS.Common.pdb +D:\TopSkyHotelManagerSystem\TopskyHotelManagerSystem\SYS.Application\bin\Debug\SYS.Common.dll.config +D:\TopSkyHotelManagerSystem\TopskyHotelManagerSystem\SYS.Application\bin\Debug\SYS.Application.dll.config diff --git a/SYS.Browser.WebAPI/Controllers/Business/CashController.cs b/SYS.Browser.WebAPI/Controllers/Business/CashController.cs index e70856ccd0b5f8fec54dac61bc793d5385b17062..3922bf57782f2b638a1424c1003575f8465ca45f 100644 --- a/SYS.Browser.WebAPI/Controllers/Business/CashController.cs +++ b/SYS.Browser.WebAPI/Controllers/Business/CashController.cs @@ -21,7 +21,7 @@ namespace SYS.Browser.WebAPI.Controllers [HttpGet] public List SelectCashInfoAll() { - return CashService.SelectCashInfoAll(); + return new CashService().SelectCashInfoAll(); } /// @@ -32,7 +32,7 @@ namespace SYS.Browser.WebAPI.Controllers [HttpPost] public object AddCashInfo([FromBody]Cash cash) { - return CashService.AddCashInfo(cash); + return new CashService().AddCashInfo(cash); } } } diff --git a/SYS.Browser.WebAPI/Controllers/Zero/OperationlogController.cs b/SYS.Browser.WebAPI/Controllers/Zero/OperationlogController.cs index 7e3744a5b053484dfa5f05d4ce5cfae786f1aa1b..4cb270c18480bbe558c50aa6bd99611735f4dff6 100644 --- a/SYS.Browser.WebAPI/Controllers/Zero/OperationlogController.cs +++ b/SYS.Browser.WebAPI/Controllers/Zero/OperationlogController.cs @@ -16,7 +16,7 @@ namespace SYS.Browser.WebAPI.Controllers /// /// [HttpPost] - public int InsertOperationLog([FromBody]Operation opr) + public int InsertOperationLog([FromBody]OperationLog opr) { return OperationlogService.InsertOperationLog(opr); } diff --git a/SYS.Browser.WebAPI/Web.config b/SYS.Browser.WebAPI/Web.config index aad9d404d821796eee405729644a28ea5e551490..88c0305ae76a78b9c4421ad412141d88fd6317ec 100644 --- a/SYS.Browser.WebAPI/Web.config +++ b/SYS.Browser.WebAPI/Web.config @@ -47,6 +47,10 @@ + + + + diff --git a/SYS.Common/App.config b/SYS.Common/App.config index b6f86c51d85d52064f079bee5c8185e4b6095324..3b94bb59161c4f327b8f63ef96be9718b8a88343 100644 --- a/SYS.Common/App.config +++ b/SYS.Common/App.config @@ -1,16 +1,19 @@  -
+ +
- + - + diff --git a/SYS.Common/Base/BaseDto.cs b/SYS.Common/Base/BaseDto.cs index 781f0da860aab35da54a3e9787f00eabcf98bd1c..d384bd55c2dff3dabd004d6691293f61b3f5a212 100644 --- a/SYS.Common/Base/BaseDto.cs +++ b/SYS.Common/Base/BaseDto.cs @@ -8,17 +8,10 @@ namespace SYS.Common { public class BaseDto : IBaseDto { - public enum Code : int - { - SQLE_202_操作异常 = 202, - SQLE_200_操作成功 = 200, - SQLE_400_系统异常_请联系系统管理员 = 400 - - } /// /// 状态码 /// - public int StatusCode { get; set; } + public StatusCode StatusCode { get; set; } /// /// 状态信息 diff --git a/SYS.Common/Base/IBaseDto.cs b/SYS.Common/Base/IBaseDto.cs index 7b08cc79ec932ff7ebb02f2f31c1e6b793b3f901..363af977fee4a93a3c820b62cf98b36fd88892d8 100644 --- a/SYS.Common/Base/IBaseDto.cs +++ b/SYS.Common/Base/IBaseDto.cs @@ -14,11 +14,16 @@ namespace SYS.Common /// /// 状态码 /// - int StatusCode { get; set; } + StatusCode StatusCode { get; set; } /// /// 回传信息 /// string StatusMsg { get; set; } + + /// + /// 操作账户 + /// + string OperationAccount { get; set; } } } diff --git a/SYS.Common/Base/MsgDto.cs b/SYS.Common/Base/MsgDto.cs new file mode 100644 index 0000000000000000000000000000000000000000..2fbce5342c5f4e2fb25744e7d8d5211449d8ec4e --- /dev/null +++ b/SYS.Common/Base/MsgDto.cs @@ -0,0 +1,13 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace SYS.Common +{ + public class MsgDto:BaseDto + { + + } +} diff --git a/SYS.Common/Repository/Repository.cs b/SYS.Common/Repository/Repository.cs new file mode 100644 index 0000000000000000000000000000000000000000..85faecdf5248b10d351c59f3a5dd2b03e2bf40f6 --- /dev/null +++ b/SYS.Common/Repository/Repository.cs @@ -0,0 +1,32 @@ +using SqlSugar; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace SYS.Common +{ + public class Repository : SimpleClient where T : class, new() + { + public Repository(ISqlSugarClient context = null) : base(context)//注意这里要有默认值等于null + { + if (context == null) + { + base.Context = new SqlSugarClient(new ConnectionConfig() + { + DbType = SqlSugar.DbType.MySql, + InitKeyType = InitKeyType.Attribute, + IsAutoCloseConnection = true, + ConnectionString = "Server=134.175.239.108;Database=tshoteldb;Uid=root;Pwd=yjj0720.;" + }); + + base.Context.Aop.OnLogExecuting = (s, p) => + { + Console.WriteLine(s); + }; + } + } + + } +} diff --git a/SYS.Common/SYS.Common.csproj b/SYS.Common/SYS.Common.csproj index 6331d08f59634d814bd80670b96571f7aba47e01..b494b26e6dae3911be38a844d0f78c29e6695a89 100644 --- a/SYS.Common/SYS.Common.csproj +++ b/SYS.Common/SYS.Common.csproj @@ -1,5 +1,6 @@  + Debug @@ -34,6 +35,15 @@ 4 + + ..\packages\EntityFramework.6.3.0\lib\net45\EntityFramework.dll + + + ..\packages\EntityFramework.6.3.0\lib\net45\EntityFramework.SqlServer.dll + + + ..\packages\SqlSugar.5.0.2\lib\SqlSugar.dll + @@ -47,11 +57,23 @@ + + + + + + + 这台计算机上缺少此项目引用的 NuGet 程序包。使用“NuGet 程序包还原”可下载这些程序包。有关更多信息，请参见 http://go.microsoft.com/fwlink/?LinkID=322105。缺少的文件是 {0}。 + + + + + \ No newline at end of file diff --git a/SYS.Common/StatusCode/StatusCode.cs b/SYS.Common/StatusCode/StatusCode.cs new file mode 100644 index 0000000000000000000000000000000000000000..988de103ed712de26ab9d7e8c51d54d077bb9f21 --- /dev/null +++ b/SYS.Common/StatusCode/StatusCode.cs @@ -0,0 +1,15 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace SYS.Common +{ + public enum StatusCode + { + SQLE_202_操作异常 = 202, + SQLE_200_操作成功 = 200, + SQLE_400_系统异常_请联系系统管理员 = 400 + } +} diff --git a/SYS.Common/packages.config b/SYS.Common/packages.config index 5d3e70429cc5597b55fc3aa1463731c05a45bc57..5249f52fdd4c3d84ad5abfdf3f9aa7bc3fbe2d38 100644 --- a/SYS.Common/packages.config +++ b/SYS.Common/packages.config @@ -1,7 +1,7 @@  - - + + \ No newline at end of file diff --git a/SYS.ConsoleApp1/App.config b/SYS.ConsoleApp1/App.config new file mode 100644 index 0000000000000000000000000000000000000000..731f6de6c291e303814b02808f34140fe560e8e4 --- /dev/null +++ b/SYS.ConsoleApp1/App.config @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/SYS.ConsoleApp1/Program.cs b/SYS.ConsoleApp1/Program.cs new file mode 100644 index 0000000000000000000000000000000000000000..34eb5ea8131ab3c8f36819c8fe11ccac0a41b89c --- /dev/null +++ b/SYS.ConsoleApp1/Program.cs @@ -0,0 +1,15 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace SYS.ConsoleApp1 +{ + class Program + { + static void Main(string[] args) + { + } + } +} diff --git a/SYS.ConsoleApp1/Properties/AssemblyInfo.cs b/SYS.ConsoleApp1/Properties/AssemblyInfo.cs new file mode 100644 index 0000000000000000000000000000000000000000..7f60155c281be538bc47560a91417ad6368bc40a --- /dev/null +++ b/SYS.ConsoleApp1/Properties/AssemblyInfo.cs @@ -0,0 +1,36 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// 有关程序集的一般信息由以下 +// 控制。更改这些特性值可修改 +// 与程序集关联的信息。 +[assembly: AssemblyTitle("SYS.ConsoleApp1")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("SYS.ConsoleApp1")] +[assembly: AssemblyCopyright("Copyright © 2021")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// 将 ComVisible 设置为 false 会使此程序集中的类型 +//对 COM 组件不可见。如果需要从 COM 访问此程序集中的类型 +//请将此类型的 ComVisible 特性设置为 true。 +[assembly: ComVisible(false)] + +// 如果此项目向 COM 公开，则下列 GUID 用于类型库的 ID +[assembly: Guid("1ed51f09-8c1c-49f6-af3b-d06b8272036a")] + +// 程序集的版本信息由下列四个值组成: +// +// 主版本 +// 次版本 +// 生成号 +// 修订号 +// +//可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值 +//通过使用 "*"，如下所示: +// [assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/SYS.ConsoleApp1/SYS.ConsoleApp1.csproj b/SYS.ConsoleApp1/SYS.ConsoleApp1.csproj new file mode 100644 index 0000000000000000000000000000000000000000..5a635a8c802a7210dc0a0cc9cc28aa6a5da56f9d --- /dev/null +++ b/SYS.ConsoleApp1/SYS.ConsoleApp1.csproj @@ -0,0 +1,53 @@ + + + + + Debug + AnyCPU + {1ED51F09-8C1C-49F6-AF3B-D06B8272036A} + Exe + SYS.ConsoleApp1 + SYS.ConsoleApp1 + v4.6.1 + 512 + true + true + + + AnyCPU + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + AnyCPU + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/SYS.Core/Business/Cash.cs b/SYS.Core/Business/Cash.cs index 70664e5e0d491fbc0ae48d4efb6a0cc2b8cb9d07..ec4629c51a1ffa62e632b52756dd197c2a7507d9 100644 --- a/SYS.Core/Business/Cash.cs +++ b/SYS.Core/Business/Cash.cs @@ -1,14 +1,38 @@ using System; namespace SYS.Core { + /// + /// 资产管理 + /// public class Cash { + /// + /// 资产编号 + /// public string CashNo { get; set; } + /// + /// 资产名称 + /// public string CashName { get; set; } + /// + /// 资产总值 + /// public string CashPrice { get; set; } + /// + /// 所属部门 + /// public string CashClub { get; set; } + /// + /// 入库时间 + /// public DateTime CashTime { get; set; } + /// + /// 资产来源 + /// public string CashSource { get; set; } + /// + /// 资产经办人 + /// public string CashPerson { get; set; } } } diff --git a/SYS.Core/Util/Fonts.cs b/SYS.Core/Business/Fonts.cs similarity index 40% rename from SYS.Core/Util/Fonts.cs rename to SYS.Core/Business/Fonts.cs index 7bce39812aaa45d6cf2fca464947b94499d11d3e..97394884dd44d4acd47eed5f78e493b4329d699b 100644 --- a/SYS.Core/Util/Fonts.cs +++ b/SYS.Core/Business/Fonts.cs @@ -1,8 +1,18 @@ namespace SYS.Core { + /// + /// 酒店宣传联动内容 + /// public class Fonts { + /// + /// 宣传内容编号 + /// public int FontsId { get; set; } + + /// + /// 宣传内容 + /// public string FontsMess { get; set; } } } diff --git a/SYS.Core/Business/Reser.cs b/SYS.Core/Business/Reser.cs index 966eeb6fa0fdf16ca22394fb32dee9349bcccb4f..bee468a8c9bb97b3a6bbdac9abfd1b7c3bb42107 100644 --- a/SYS.Core/Business/Reser.cs +++ b/SYS.Core/Business/Reser.cs @@ -2,6 +2,9 @@ namespace SYS.Core { + /// + /// 预约列表 + /// public class Reser { /// @@ -32,6 +35,26 @@ namespace SYS.Core /// 预约止日 /// public DateTime ReserEndDay { get; set; } + /// + /// 删除标记 + /// + 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/SYS.Core/Business/SellThing.cs b/SYS.Core/Business/SellThing.cs index 5a4245262b7e374193f815162926661746609dad..324f057314fc3d9de4db6615470b8a6b3ba6c86c 100644 --- a/SYS.Core/Business/SellThing.cs +++ b/SYS.Core/Business/SellThing.cs @@ -1,11 +1,51 @@ -namespace SYS.Core +using System; + +namespace SYS.Core { + /// + /// 商品信息 + /// public class SellThing { + /// + /// 商品编号 + /// public string SellNo { get; set; } + /// + /// 商品名称 + /// public string SellName { get; set; } + /// + /// 商品价格 + /// public decimal SellPrice { get; set; } + /// + /// 规格型号 + /// public string format { get; set; } + /// + /// 库存 + /// public int Stock { get; set; } + /// + /// 删除标记 + /// + 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/SYS.Core/Business/Spend.cs b/SYS.Core/Business/Spend.cs index c0d0a4dd4e4a898c731ab524f7f2b0d851b591f9..1e1a804ad4812671c6c06a9bb719f0e45ba8ec42 100644 --- a/SYS.Core/Business/Spend.cs +++ b/SYS.Core/Business/Spend.cs @@ -2,15 +2,66 @@ namespace SYS.Core { + /// + /// 消费信息 + /// public class Spend { + + + + + /// + /// 房间编号 + /// public string RoomNo { get; set; } + /// + /// 客户编号 + /// public string CustoNo { get; set; } + /// + /// 商品名称 + /// public string SpendName { get; set; } + /// + /// 消费数量 + /// public int SpendAmount { get; set; } + /// + /// 商品单价 + /// public decimal SpendPrice { get; set; } + /// + /// 消费金额 + /// public decimal SpendMoney { get; set; } + /// + /// 消费时间 + /// public DateTime SpendTime { get; set; } + /// + /// 结算状态 + /// public string MoneyState { get; set; } + /// + /// 删除标记 + /// + 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/SYS.Core/Business/Wti.cs b/SYS.Core/Business/Wti.cs index aaad4a0b480bae492a2bad403a31152079506913..d5dfe374c5552952f470657c32aa47fe0a6191f0 100644 --- a/SYS.Core/Business/Wti.cs +++ b/SYS.Core/Business/Wti.cs @@ -2,8 +2,15 @@ namespace SYS.Core { + /// + /// 水电信息 + /// public class Wti { + /// + /// 信息编号 + /// + public string WtiNo { get; set; } /// /// 房间编号 /// @@ -32,6 +39,26 @@ namespace SYS.Core /// 客户编号 /// public string CustoNo { get; set; } + /// + /// 删除标记 + /// + 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/SYS.Core/Customer/Custo.cs b/SYS.Core/Customer/Custo.cs index 66cb785f4621908fbf195845f0110af77f4ba840..a83ca1fd07fe793c0d38357f85091ff615a41d79 100644 --- a/SYS.Core/Customer/Custo.cs +++ b/SYS.Core/Customer/Custo.cs @@ -2,20 +2,83 @@ namespace SYS.Core { + /// + /// 客户信息 + /// + [SqlSugar.SugarTable("userinfo")] public class Custo { + /// + /// 客户编号 + /// public string CustoNo { get; set; } + /// + /// 客户名称 + /// public string CustoName { get; set; } + /// + /// 客户性别 + /// public int CustoSex { get; set; } + /// + /// 客户电话 + /// public string CustoTel { get; set; } + /// + /// 证件类型 + /// public int PassportType { get; set; } + /// + /// 证件号码 + /// public string CustoID { get; set; } + /// + /// 居住地址 + /// public string CustoAdress { get; set; } + /// + /// 出生日期 + /// public DateTime CustoBirth { get; set; } + /// + /// 客户类型 + /// public int CustoType { get; set; } + /// + /// 客户类型 + /// + [SqlSugar.SugarColumn(IsIgnore = true)] public string typeName { get; set; } + /// + /// 证件类型 + /// + [SqlSugar.SugarColumn(IsIgnore = true)] public string PassportName { get; set; } + /// + /// 性别 + /// + [SqlSugar.SugarColumn(IsIgnore = true)] public string SexName { get; set; } + /// + /// 删除标记 + /// + 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/SYS.Core/Customer/CustoSpend.cs b/SYS.Core/Customer/CustoSpend.cs index 37a5e242308e01f5313f35e6c50e04727b045c6d..cf09ffd476223bff2c25fc5c12d422ba9fe029ec 100644 --- a/SYS.Core/Customer/CustoSpend.cs +++ b/SYS.Core/Customer/CustoSpend.cs @@ -1,8 +1,17 @@ namespace SYS.Core { + /// + /// 酒店盈利情况 + /// public class CustoSpend { + /// + /// 年 + /// public string Years { get; set; } + /// + /// 总金额 + /// public decimal Money { get; set; } } diff --git a/SYS.Core/Customer/CustoType.cs b/SYS.Core/Customer/CustoType.cs index d7882d1835763229d3f53c2c3140da9cd9d9f75c..9deac50fed2e61d2bd78ec4833f12e46f8bce138 100644 --- a/SYS.Core/Customer/CustoType.cs +++ b/SYS.Core/Customer/CustoType.cs @@ -1,8 +1,40 @@ -namespace SYS.Core +using System; + +namespace SYS.Core { + /// + /// 客户类型 + /// + [SqlSugar.SugarTable("usertype")] public class CustoType { + /// + /// 客户类型 + /// public int UserType { get; set; } + /// + /// 类型名字 + /// public string TypeName { get; set; } + /// + /// 删除标记 + /// + 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/SYS.Core/Customer/PassPortType.cs b/SYS.Core/Customer/PassPortType.cs index 17c5e7e7701cbeba8337bf3c63e34c1b71e9dd00..3a731af79990814e195fd42420a79ecfc9201867 100644 --- a/SYS.Core/Customer/PassPortType.cs +++ b/SYS.Core/Customer/PassPortType.cs @@ -6,6 +6,9 @@ using System.Threading.Tasks; namespace SYS.Core { + /// + /// 证件类型 + /// public class PassPortType { /// @@ -17,5 +20,25 @@ namespace SYS.Core /// 证件名称 /// public string PassportName { get; set; } + /// + /// 删除标记 + /// + 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/SYS.Core/Customer/SexType.cs b/SYS.Core/Customer/SexType.cs index de95cd51aa86bcd428979acfaad60957c9d2a65f..95572093cbe61a2b7befa1a537afe427ff27a53c 100644 --- a/SYS.Core/Customer/SexType.cs +++ b/SYS.Core/Customer/SexType.cs @@ -6,6 +6,9 @@ using System.Threading.Tasks; namespace SYS.Core { + /// + /// 性别 + /// public class SexType { /// @@ -22,5 +25,21 @@ namespace SYS.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/SYS.Core/Resources/Mono-l.ttf b/SYS.Core/Resources/Mono-l.ttf new file mode 100644 index 0000000000000000000000000000000000000000..e03ff7e6990da914a9e855906422f3d64f119dec Binary files /dev/null and b/SYS.Core/Resources/Mono-l.ttf differ diff --git a/SYS.Core/Resources/Mono.ttf b/SYS.Core/Resources/Mono.ttf new file mode 100644 index 0000000000000000000000000000000000000000..4781cc7f57b55e3e5defaeecafcd6bd7c096fa21 Binary files /dev/null and b/SYS.Core/Resources/Mono.ttf differ diff --git a/SYS.Core/Room/CheckInfo.cs b/SYS.Core/Room/CheckInfo.cs index 2a18af4d545f18fd68d47601f2726efd8c5c7794..5f41af041c9a26cd5c84fec0f2e9c71c79712607 100644 --- a/SYS.Core/Room/CheckInfo.cs +++ b/SYS.Core/Room/CheckInfo.cs @@ -1,13 +1,60 @@ -namespace SYS.Core +using System; + +namespace SYS.Core { + /// + /// 监管统计 + /// public class CheckInfo { + /// + /// 监管统计编号 + /// public string CheckNo { get; set; } + /// + /// 监管部门 + /// public string CheckClub { get; set; } + /// + /// 监管进度 + /// public string CheckProgres { get; set; } + /// + /// + /// public string CheckCash { get; set; } + /// + /// + /// public int CheckScore { get; set; } + /// + /// + /// public string CheckPerson { get; set; } + /// + /// + /// public string CheckAdvice { get; set; } + + /// + /// 删除标记 + /// + 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/SYS.Core/Room/Room.cs b/SYS.Core/Room/Room.cs index c5d8e58ba8a8375b5157fdfc7329c0debf3f74c9..45a5fee4f3cbf59c0954b5c95a18e8fbcd1ddaab 100644 --- a/SYS.Core/Room/Room.cs +++ b/SYS.Core/Room/Room.cs @@ -22,11 +22,11 @@ namespace SYS.Core /// /// 最后一次入住时间 /// - public DateTime CheckTime { get; set; } + public DateTime? CheckTime { get; set; } /// /// 最后一次退房时间 /// - public DateTime CheckOutTime { get; set; } + public DateTime? CheckOutTime { get; set; } /// /// 房间状态ID /// @@ -34,6 +34,7 @@ namespace SYS.Core /// /// 房间状态 /// + [SqlSugar.SugarColumn(IsIgnore = true)] public string RoomState { get; set; } /// /// 房间单价 @@ -46,7 +47,33 @@ namespace SYS.Core /// /// 客户类型名称 /// + [SqlSugar.SugarColumn(IsIgnore = true)] public string typeName { get; set; } + /// + /// 房间名称 + /// + [SqlSugar.SugarColumn(IsIgnore = true)] + public string RoomName { get; set; } + /// + /// 删除标记 + /// + 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/SYS.Core/Room/RoomState.cs b/SYS.Core/Room/RoomState.cs new file mode 100644 index 0000000000000000000000000000000000000000..f6db47461940f2527a5ba480ef19218b92c81550 --- /dev/null +++ b/SYS.Core/Room/RoomState.cs @@ -0,0 +1,40 @@ +using System; + +namespace SYS.Core +{ + /// + /// 房间状态 + /// + public class RoomState + { + /// + /// 房间状态编号 + /// + public int RoomStateId { get; set; } + /// + /// 房间状态 + /// + [SqlSugar.SugarColumn(ColumnName = "RoomState")] + public string RoomStateName { get; set; } + /// + /// 删除标记 + /// + 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/SYS.Core/Room/RoomStatic.cs b/SYS.Core/Room/RoomStatic.cs deleted file mode 100644 index b4e39be4a5420f72f07cbce33466ebe0c9119ad8..0000000000000000000000000000000000000000 --- a/SYS.Core/Room/RoomStatic.cs +++ /dev/null @@ -1,14 +0,0 @@ -namespace SYS.Core -{ - public static class RoomStatic - { - /// - /// 房间编号 - /// - public static string RoomNo { get; set; } - /// - /// 房间状态编号 - /// - public static int RoomStateId { get; set; } - } -} diff --git a/SYS.Core/Room/RoomType.cs b/SYS.Core/Room/RoomType.cs index c5743e39c46e299eadc41513daeb5594111a5497..fac494f936aa19c778acae8eb6fe0b006122f152 100644 --- a/SYS.Core/Room/RoomType.cs +++ b/SYS.Core/Room/RoomType.cs @@ -1,8 +1,40 @@ -namespace SYS.Core +using System; + +namespace SYS.Core { + /// + /// 房间类型 + /// public class RoomType { + /// + /// 类型编号 + /// public int Roomtype { get; set; } + /// + /// 房间类型 + /// public string RoomName { get; set; } + + /// + /// 删除标记 + /// + 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/SYS.Core/SYS.Core.csproj b/SYS.Core/SYS.Core.csproj index e6998b34ce0a59660859628e1d406c544f15dd5c..b3f02b6621228e1b6140acf4efdd6d6711590d72 100644 --- a/SYS.Core/SYS.Core.csproj +++ b/SYS.Core/SYS.Core.csproj @@ -40,6 +40,10 @@ + + False + ..\packages\SqlSugar.5.0.2\lib\SqlSugar.dll + @@ -60,12 +64,15 @@ Resource.resx Always + + Always + @@ -73,18 +80,17 @@ - + - - + @@ -121,5 +127,11 @@ Always + + + {65501af6-c629-448a-847e-1bcd60665865} + SYS.Common + + \ No newline at end of file diff --git a/SYS.Core/Util/CounterHelper.cs b/SYS.Core/Util/CounterHelper.cs new file mode 100644 index 0000000000000000000000000000000000000000..b39d24121a9f9713289df44ba6f89dc624d00942 --- /dev/null +++ b/SYS.Core/Util/CounterHelper.cs @@ -0,0 +1,39 @@ +using MySql.Data.MySqlClient; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace SYS.Core +{ + /// + /// 流水号规则 + /// + public class CounterHelper + { + /// + /// 获取生成编号 + /// + /// + /// + public string GetNewId(string str) + { + var count = 0; + var Str = string.Empty; + string sql = string.Format("select * from counterrule where rule_name = '{0}'",str); + MySqlDataReader dr = DBHelper.ExecuteReader(sql); + while (dr.Read()) + { + Str = dr["prefix_name"].ToString() + dr["separating_char"].ToString() + DateTime.Now.ToString(dr["custo_format"].ToString()) + + dr["number_format"].ToString() + dr["now_id"].ToString(); + count++; + } + dr.Close(); + DBHelper.Closecon(); + string sql1 = string.Format("update counterrule set now_id = now_id + {1} where rule_name = '{0}'", str,count); + DBHelper.ExecuteNonQuery(sql1); + return Str; + } + } +} diff --git a/SYS.Core/Util/DBHelper.cs b/SYS.Core/Util/DBHelper.cs index 2e4875ddd3fe20d088d3444f5a0699482d086830..e1696049d8ab2bbd3134713a6cf8cf7b86b3f939 100644 --- a/SYS.Core/Util/DBHelper.cs +++ b/SYS.Core/Util/DBHelper.cs @@ -11,7 +11,7 @@ namespace SYS.Core public class DBHelper { //private static string conStr = ConfigurationManager.AppSettings["MySqlStr"]; - private static string conStr = ""; + private static string conStr = "Server=134.175.239.108;Database=tshoteldb;Uid=root;Pwd=yjj0720.;"; private static MySqlConnection con = null; diff --git a/SYS.Core/Util/Md5LockedUtil.cs b/SYS.Core/Util/Md5LockedUtil.cs index b27f6f26f38546cc6e02b49b59e5cb5901036820..1d9e57e81fd716178716ef5463fcba6dc6fe8292 100644 --- a/SYS.Core/Util/Md5LockedUtil.cs +++ b/SYS.Core/Util/Md5LockedUtil.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.IO; using System.Linq; using System.Security.Cryptography; using System.Text; @@ -31,5 +32,24 @@ namespace SYS.Core return pwd; } + + /// + /// 对字符串进行32位MD5解密 + /// + /// + /// + public static string MD5DeEncrypt32(string str) + { + String encryptKey = "Oyea"; + DESCryptoServiceProvider descsp = new DESCryptoServiceProvider(); + byte[] key = Encoding.Unicode.GetBytes(encryptKey); + byte[] data = Convert.FromBase64String(str); + System.IO.MemoryStream MStream = new System.IO.MemoryStream(); + CryptoStream CStream = new CryptoStream(MStream, descsp.CreateDecryptor(key, key), CryptoStreamMode.Write); + CStream.Write(data, 0, data.Length); + CStream.FlushFinalBlock(); + return Encoding.Unicode.GetString(MStream.ToArray()); + + } } } diff --git a/SYS.Core/Worker/GBType.cs b/SYS.Core/Worker/GBType.cs new file mode 100644 index 0000000000000000000000000000000000000000..2a42b8947ab2c99cac29a899482fa6ea582a5da1 --- /dev/null +++ b/SYS.Core/Worker/GBType.cs @@ -0,0 +1,45 @@ +using System; + +namespace SYS.Application +{ + /// + /// 奖惩类型实体类 + /// + public class GBType + { + /// + /// 奖惩编号 + /// + public int GBTypeId { get; set; } + + /// + /// 奖惩名称 + /// + public string GBName { get; set; } + + /// + /// 删除标记 + /// + 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/SYS.Core/Worker/Worker.cs b/SYS.Core/Worker/Worker.cs index 57710fc6509ab22ec03f93c826cd5d6a570d55e1..d745ff4c99a5136e8ade781373b37964532a7327 100644 --- a/SYS.Core/Worker/Worker.cs +++ b/SYS.Core/Worker/Worker.cs @@ -2,20 +2,126 @@ namespace SYS.Core { + /// + /// 员工信息 + /// + [SqlSugar.SugarTable("worker")] public class Worker { + /// + /// 员工账号/工号 + /// + [SqlSugar.SugarColumn(ColumnName = "WorkerId")] public string WorkerId { get; set; } + /// + /// 员工姓名 + /// + [SqlSugar.SugarColumn(ColumnName = "WorkerName")] public string WorkerName { get; set; } - public DateTime WorkerBirth { get; set; } - public string WorkerSex { get; set; } + /// + /// 出生日期 + /// + [SqlSugar.SugarColumn(ColumnName = "WorkerBirthday")] + public DateTime WorkerBirthday { get; set; } + /// + /// 员工性别 + /// + [SqlSugar.SugarColumn(ColumnName = "WorkerSex")] + public int WorkerSex { get; set; } + /// + /// 员工性别(名称描述) + /// + [SqlSugar.SugarColumn(IsIgnore = true)] + public string WorkerSexName { get; set; } + /// + /// 民族类型 + /// + [SqlSugar.SugarColumn(ColumnName = "WorkerNation")] + public string WorkerNation { get; set; } + /// + /// 民族名称 + /// + [SqlSugar.SugarColumn(IsIgnore = true)] + public string NationName { get; set; } + /// + /// 员工电话 + /// + [SqlSugar.SugarColumn(ColumnName = "WorkerTel")] public string WorkerTel { get; set; } + /// + /// 所属部门 + /// + [SqlSugar.SugarColumn(ColumnName = "WorkerClub")] public string WorkerClub { get; set; } + /// + /// 部门名称 + /// + [SqlSugar.SugarColumn(IsIgnore = true)] + public string ClubName { get; set; } + /// + /// 居住地址 + /// + [SqlSugar.SugarColumn(ColumnName = "WorkerAddress")] public string WorkerAddress { get; set; } + /// + /// 员工职位 + /// + [SqlSugar.SugarColumn(ColumnName = "WorkerPosition")] public string WorkerPosition { get; set; } + /// + /// 职位名称 + /// + [SqlSugar.SugarColumn(IsIgnore = true)] + public string PositionName { get; set; } + /// + /// 证件号码 + /// public string CardId { get; set; } + /// + /// 员工密码 + /// public string WorkerPwd { get; set; } + /// + /// 员工入职时间 + /// public DateTime WorkerTime { get; set; } + /// + /// 员工面貌 + /// public string WorkerFace { get; set; } - public string WorkerEduction { get; set; } + /// + /// 群众面貌描述 + /// + [SqlSugar.SugarColumn(IsIgnore = true)] + public string FaceName { get; set; } + /// + /// 教育程度 + /// + public string WorkerEducation { get; set; } + /// + /// 教育程度名称 + /// + [SqlSugar.SugarColumn(IsIgnore = true)] + public string EducationName { get; set; } + /// + /// 删除标记 + /// + 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/SYS.Core/Worker/WorkerCheck.cs b/SYS.Core/Worker/WorkerCheck.cs index 75ca56117231b99276ece3e5b956ea419def3a9b..56728c5ac353daeda271a4600cca165ed24f65f4 100644 --- a/SYS.Core/Worker/WorkerCheck.cs +++ b/SYS.Core/Worker/WorkerCheck.cs @@ -2,12 +2,53 @@ namespace SYS.Core { + /// + /// 员工打卡考勤 + /// public class WorkerCheck { + /// + /// 工号 + /// public string WorkerNo { get; set; } + /// + /// 打卡时间 + /// public DateTime CheckTime { get; set; } + /// + /// 打卡方式 + /// public string CheckWay { get; set; } - public string CheckState { get; set; } + /// + /// 打卡状态 + /// + public int CheckState { get; set; } + + /// + /// 打卡状态 + /// + [SqlSugar.SugarColumn(IsIgnore = true)] + public string CheckStateNm { get; set; } + /// + /// 删除标记 + /// + 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/SYS.Core/Worker/WorkerGoodBad.cs b/SYS.Core/Worker/WorkerGoodBad.cs index e42ed56cf6227b2a604c2a510c59986c970b3389..8127828c08c44f5c29b88cc85d5a691e79785954 100644 --- a/SYS.Core/Worker/WorkerGoodBad.cs +++ b/SYS.Core/Worker/WorkerGoodBad.cs @@ -6,13 +6,54 @@ using System.Threading.Tasks; namespace SYS.Core { + /// + /// 员工奖罚 + /// public class WorkerGoodBad { + /// + /// 工号 + /// public string WorkNo { get; set; } + /// + /// 奖惩信息 + /// public string GBInfo { get; set; } + /// + /// 奖惩类型 + /// public int GBType { get; set; } + /// + /// 奖惩操作人 + /// public string GBOperation { get; set; } + /// + /// 奖惩时间 + /// public DateTime GBTime { get; set; } + /// + /// 类型名称 + /// public string TypeName { get; set; } + /// + /// 删除标记 + /// + 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/SYS.Core/Worker/WorkerHistory.cs b/SYS.Core/Worker/WorkerHistory.cs index 82d929606e7514cd35ddc05cd97fac7bf2cc5545..a296dda24a6182c7115dd32441bc0cfc0cfc2e51 100644 --- a/SYS.Core/Worker/WorkerHistory.cs +++ b/SYS.Core/Worker/WorkerHistory.cs @@ -2,12 +2,50 @@ namespace SYS.Core { + /// + /// 员工履历 + /// public class WorkerHistory { + /// + /// 工号 + /// public string WorkerId { get; set; } + /// + /// 开始时间 + /// public DateTime StartDate { get; set; } + /// + /// 结束时间 + /// public DateTime EndDate { get; set; } + /// + /// 职位 + /// public string Postion { get; set; } + /// + /// 公司 + /// public string Company { get; set; } + /// + /// 删除标记 + /// + 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/SYS.Core/Zero/Admin.cs b/SYS.Core/Zero/Admin.cs index 6431d4c713ff795c3d6c8910fa68b1e1f2e787c8..a0c906e629d61f1f40129d9e7099927eae780a67 100644 --- a/SYS.Core/Zero/Admin.cs +++ b/SYS.Core/Zero/Admin.cs @@ -1,27 +1,76 @@ -namespace SYS.Core + +namespace SYS.Core { + /// + /// 管理员实体类 + /// public class Admin { + /// + /// 构造函数 + /// + public Admin() + { + } + + private string _AdminAccount; /// /// 管理员账号 /// - public string AdminAccount { get; set; } + public string AdminAccount { get { return this._AdminAccount; } set { this._AdminAccount = value; } } + + private string _AdminPassword; /// /// 管理员密码 /// - public string AdminPassword { get; set; } + public string AdminPassword { get { return this._AdminPassword; } set { this._AdminPassword = value; } } + + private string _AdminType; /// /// 管理员类型 /// - public string AdminType { get; set; } + public string AdminType { get { return this._AdminType; } set { this._AdminType = value; } } + + private string _AdminName; /// /// 管理员名称 /// - public string AdminName { get; set; } + public string AdminName { get { return this._AdminName; } set { this._AdminName = value; } } + + private System.Int32 _IsAdmin; /// /// 是否为超级管理员 /// - public int IsAdmin { get; set; } + public System.Int32 IsAdmin { get { return this._IsAdmin; } set { this._IsAdmin = value; } } + private System.Int32 _DeleteMk; + /// + /// 删除标记 + /// + 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/SYS.Core/Zero/AdminInfo.cs b/SYS.Core/Zero/AdminInfo.cs index de5f128fb0be3f302fc13ea36de842c06b899bfd..1237e4c40050859b961090d3c8ef42498dccd1f6 100644 --- a/SYS.Core/Zero/AdminInfo.cs +++ b/SYS.Core/Zero/AdminInfo.cs @@ -3,24 +3,24 @@ public class AdminInfo { /// - /// 存储当前超管姓名 + /// 存储当前超管账号 /// - public static string Password = ""; + public static string Account = ""; /// /// 存储当前超管类型 /// - public static string adminType = ""; + public static string Type = ""; /// /// 存储当前超管用户组 /// - public static string admingroup = ""; + public static string Group = ""; /// /// 存储当前超管名称 /// - public static string adminName = ""; + public static string Name = ""; diff --git a/SYS.Core/Zero/Dept.cs b/SYS.Core/Zero/Dept.cs index 9c3b11fe7d4b222a1d68bdc8a6ccadf129b19738..38feb00e0e57818efa9360d3e4bc47a0b29bb5e6 100644 --- a/SYS.Core/Zero/Dept.cs +++ b/SYS.Core/Zero/Dept.cs @@ -13,7 +13,7 @@ namespace SYS.Core { /// /// 部门编号 - /// + /// public string dept_no { get; set; } /// /// 部门名称 diff --git a/SYS.Core/Zero/Nation.cs b/SYS.Core/Zero/Nation.cs index f134737d311aa72b4054a633caffeffb9afa113a..38a414fa7cfc085f8d5aeacb3a0f637bc62552d0 100644 --- a/SYS.Core/Zero/Nation.cs +++ b/SYS.Core/Zero/Nation.cs @@ -30,7 +30,7 @@ namespace SYS.Core /// /// 资料创建时间 /// - public DateTime datains_date { get; set; } + public DateTime? datains_date { get; set; } /// /// 资料更新人 /// @@ -38,7 +38,7 @@ namespace SYS.Core /// /// 资料更新时间 /// - public DateTime datachg_date { get; set; } + public DateTime? datachg_date { get; set; } } } diff --git a/SYS.Core/Zero/Notice.cs b/SYS.Core/Zero/Notice.cs index 51a34a8b594d490d46cf46e669c7f13c530228f4..03243a74a896f043e4ebcd40c512519030223325 100644 --- a/SYS.Core/Zero/Notice.cs +++ b/SYS.Core/Zero/Notice.cs @@ -2,14 +2,55 @@ namespace SYS.Core { + /// + /// 人名公告 + /// public class Notice { + /// + /// 公告编号 + /// public string NoticeNo { get; set; } + /// + /// 公告主题 + /// public string Noticetheme { get; set; } + /// + /// 公告时间 + /// public DateTime NoticeTime { get; set; } + /// + /// 公告正文 + /// public string NoticeContent { get; set; } + /// + /// 发文部门 + /// public string NoticeClub { get; set; } + /// + /// 公布人 + /// public string NoticePerson { get; set; } + /// + /// 删除标记 + /// + 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/SYS.Core/Zero/Operation.cs b/SYS.Core/Zero/Operation.cs deleted file mode 100644 index a7531de692ff7e44c43b14abd10e87a0df99b6f8..0000000000000000000000000000000000000000 --- a/SYS.Core/Zero/Operation.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System; - -namespace SYS.Core -{ - public class Operation - { - public DateTime OperationTime { get; set; } - public string Operationlog { get; set; } - public string OperationAccount { get; set; } - - } -} diff --git a/SYS.Core/Zero/OperationLog.cs b/SYS.Core/Zero/OperationLog.cs index a1a945c6f434a60ef4c0e932d76001b9632384bf..36032b1cd15e58add2989a4c6b2283d934d7594c 100644 --- a/SYS.Core/Zero/OperationLog.cs +++ b/SYS.Core/Zero/OperationLog.cs @@ -2,11 +2,43 @@ namespace SYS.Core { + /// + /// 操作日志 + /// public class OperationLog { + /// + /// 操作时间 + /// public DateTime OperationTime { get; set; } + /// + /// 操作信息 + /// public string Operationlog { get; set; } + /// + /// 操作账号 + /// public string OperationAccount { get; set; } + /// + /// 删除标记 + /// + 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/SYS.Core/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/SYS.Core/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index c05258582a1ed214ca026d40e46de25b35a65204..3b96830d621a0c24302289a6eed1c9062fa97cda 100644 Binary files a/SYS.Core/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/SYS.Core/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/SYS.Core/obj/Debug/SYS.Core.csproj.FileListAbsolute.txt b/SYS.Core/obj/Debug/SYS.Core.csproj.FileListAbsolute.txt index b85a69c99a61c77c070951f51dd42b326ecd94d7..3e9ec454ea544a4ffb3a985e20af936c3b6f731c 100644 --- a/SYS.Core/obj/Debug/SYS.Core.csproj.FileListAbsolute.txt +++ b/SYS.Core/obj/Debug/SYS.Core.csproj.FileListAbsolute.txt @@ -42,4 +42,18 @@ D:\TopSkyHotelManagerSystem\TopskyHotelManagerSystem\SYS.Core\obj\Debug\SYS.Core D:\TopSkyHotelManagerSystem\TopskyHotelManagerSystem\SYS.Core\obj\Debug\SYS.Core.csproj.CopyComplete D:\TopSkyHotelManagerSystem\TopskyHotelManagerSystem\SYS.Core\obj\Debug\SYS.Core.dll D:\TopSkyHotelManagerSystem\TopskyHotelManagerSystem\SYS.Core\obj\Debug\SYS.Core.pdb +D:\TopSkyHotelManagerSystem\TopskyHotelManagerSystem\SYS.Core\bin\Debug\Google.Protobuf.dll +D:\TopSkyHotelManagerSystem\TopskyHotelManagerSystem\SYS.Core\bin\Debug\Zstandard.Net.dll +D:\TopSkyHotelManagerSystem\TopskyHotelManagerSystem\SYS.Core\bin\Debug\K4os.Compression.LZ4.Streams.dll +D:\TopSkyHotelManagerSystem\TopskyHotelManagerSystem\SYS.Core\bin\Debug\Ubiety.Dns.Core.dll +D:\TopSkyHotelManagerSystem\TopskyHotelManagerSystem\SYS.Core\bin\Debug\System.Memory.dll +D:\TopSkyHotelManagerSystem\TopskyHotelManagerSystem\SYS.Core\bin\Debug\System.Buffers.dll +D:\TopSkyHotelManagerSystem\TopskyHotelManagerSystem\SYS.Core\bin\Debug\K4os.Compression.LZ4.dll +D:\TopSkyHotelManagerSystem\TopskyHotelManagerSystem\SYS.Core\bin\Debug\K4os.Hash.xxHash.dll +D:\TopSkyHotelManagerSystem\TopskyHotelManagerSystem\SYS.Core\bin\Debug\System.Numerics.Vectors.dll +D:\TopSkyHotelManagerSystem\TopskyHotelManagerSystem\SYS.Core\bin\Debug\System.Runtime.CompilerServices.Unsafe.dll D:\TopSkyHotelManagerSystem\TopskyHotelManagerSystem\SYS.Core\obj\Debug\SYS.Core.csprojAssemblyReference.cache +D:\TopSkyHotelManagerSystem\TopskyHotelManagerSystem\SYS.Core\bin\Debug\SqlSugar.dll +D:\TopSkyHotelManagerSystem\TopskyHotelManagerSystem\SYS.Core\bin\Debug\SYS.Common.dll +D:\TopSkyHotelManagerSystem\TopskyHotelManagerSystem\SYS.Core\bin\Debug\SYS.Common.pdb +D:\TopSkyHotelManagerSystem\TopskyHotelManagerSystem\SYS.Core\bin\Debug\SYS.Common.dll.config diff --git a/SYS.FormUI/App.config b/SYS.FormUI/App.config index 26408e77a5592a19859995b3d2263eaab2bb68ee..ab452ba8b84ea10223d622310d5aa6ba40d9e187 100644 --- a/SYS.FormUI/App.config +++ b/SYS.FormUI/App.config @@ -14,4 +14,12 @@ + + + + + + + + \ No newline at end of file diff --git a/SYS.FormUI/AppFunction/FrmAddRoom.cs b/SYS.FormUI/AppFunction/FrmAddRoom.cs index edf427a25af58e7ffc1091219aecd32e11b68cff..dac3791684f25b323b85e01c96b41ffe0ee13b54 100644 --- a/SYS.FormUI/AppFunction/FrmAddRoom.cs +++ b/SYS.FormUI/AppFunction/FrmAddRoom.cs @@ -58,10 +58,10 @@ namespace SYS.FormUI MessageBox.Show("添加房间成功！"); dgvRoomList.DataSource = RoomManager.SelectCanUseRoomAll(); #region 获取添加操作日志所需的信息 - Operation o = new Operation(); + OperationLog o = new OperationLog(); o.OperationTime = DateTime.Parse(DateTime.Now.ToString("yyyy-MM-dd,HH:mm:ss")); - o.Operationlog = AdminInfo.adminType + AdminInfo.admingroup + "于" + DateTime.Now + "新增了房间，房间号为：" + txtRoomNo.Text + "，房间类型为：" + cboRoomType.Text; - o.OperationAccount = AdminInfo.adminType + AdminInfo.admingroup; + o.Operationlog = AdminInfo.Account + AdminInfo.Name + "于" + DateTime.Now + "新增了房间，房间号为：" + txtRoomNo.Text + "，房间类型为：" + cboRoomType.Text; + o.OperationAccount = AdminInfo.Account + AdminInfo.Name; #endregion OperationlogManager.InsertOperationLog(o); } diff --git a/SYS.FormUI/AppFunction/FrmAddWorker.cs b/SYS.FormUI/AppFunction/FrmAddWorker.cs index 8b620ee7ff2c2b11d9fcedc75868a8173cec7fb8..4580bdbd2aa3d091522e08b4715d67459cc17dbb 100644 --- a/SYS.FormUI/AppFunction/FrmAddWorker.cs +++ b/SYS.FormUI/AppFunction/FrmAddWorker.cs @@ -130,12 +130,12 @@ namespace SYS.FormUI Worker worker = new Worker { WorkerId = WorkerNo.Text.Trim(), - WorkerSex = cboSex.Text, + WorkerSex = cboSex.Text == "女" ? 0 : 1, WorkerTel = WorkerTel.Text, WorkerAddress = txtAddress.Text, WorkerPwd = Pwd.Text, WorkerFace = cboWorkerFace.Text, - WorkerEduction = cboEducation.Text + WorkerEducation = cboEducation.Text }; int i = WorkerManager.UpdateWorker(worker); if (i > 0) @@ -168,8 +168,8 @@ namespace SYS.FormUI { WorkerId = WorkerNo.Text.Trim(), WorkerName = WorkerName.Text.Trim(), - WorkerBirth = dtpBirthday.Value, - WorkerSex = cboSex.Text, + WorkerBirthday = dtpBirthday.Value, + WorkerSex = cboSex.SelectedIndex, WorkerTel = NewTel, WorkerClub = cboClub.Text, WorkerAddress = txtAddress.Text, @@ -178,7 +178,7 @@ namespace SYS.FormUI WorkerPwd = Pwd.Text, WorkerTime = dtpTime.Value, WorkerFace = cboWorkerFace.Text, - WorkerEduction = cboEducation.Text + WorkerEducation = cboEducation.Text }; int n = WorkerManager.AddWorker(worker); #endregion @@ -199,12 +199,12 @@ namespace SYS.FormUI if (n > 0 && j > 0) { MessageBox.Show("员工信息/履历添加成功！该员工登录密码为：" + Pwd.Text + "，请提醒员工妥善保管！"); - FrmTopChange.Reload(); + FrmWorkerManager.Reload(); #region 获取添加操作日志所需的信息 - Operation o = new Operation(); + OperationLog o = new OperationLog(); o.OperationTime = DateTime.Parse(DateTime.Now.ToString("yyyy-MM-dd,HH:mm:ss")); - o.Operationlog = AdminInfo.admingroup + AdminInfo.adminType + "于" + DateTime.Now + "进行了添加员工操作，员工编号为：" + WorkerNo.Text + "！"; - o.OperationAccount = AdminInfo.admingroup + AdminInfo.adminType; + o.Operationlog = AdminInfo.Account + AdminInfo.Name + "于" + DateTime.Now + "进行了添加员工操作，员工编号为：" + WorkerNo.Text + "！"; + o.OperationAccount = AdminInfo.Account + AdminInfo.Name; OperationlogManager.InsertOperationLog(o); #endregion } diff --git a/SYS.FormUI/AppFunction/FrmAdminMain.resx b/SYS.FormUI/AppFunction/FrmAdminMain.resx deleted file mode 100644 index 2905aa69ba94518122d5acdb3415dece1c790849..0000000000000000000000000000000000000000 --- a/SYS.FormUI/AppFunction/FrmAdminMain.resx +++ /dev/null @@ -1,408 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - - - AAABAAEAQEAAAAEAIAAoQgAAFgAAACgAAABAAAAAgAAAAAEAIAAAAAAAAEAAACMuAAAjLgAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD4+u0A9/rrAPz8+QP9/f0E/Pz7CPz8+hv8/fom/P36J/39 - +if9/foh/f37DP79/QT+/PkD/Pv2Afv79gAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAPz8+AD8//0A/Pz5Dfz9+x/9/ftJ/f79Yv39/YD9/f2w/f79t/7+ - /b39/f3V/f794/3+/eX+/v3k/v793f7+/sL+/v63/v79sv3+/X39/f1d/f78Mf39+xD6+ukA/f35AAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD8/fsA/P36Bf39+xv9/fxI/f38g/39/b/9/f3h/f799f39 - /f/9/f7//v7+//7+/f/+/v7//v7+//7+/v/+/v7//v7+//7+/v/+/v7//v7+//7+/v/+/v7//v7+/v7+ - /uv+/v3G/v79gP3+/DX9/fsJ////APv99wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD5+vcA//79APz8+Qf9/fsq/f38X/39/aL9/v3Z/f79+P39 - /f/9/v3//f3+//7+/v/+/v7//f39//7+/v/+/v3//v7+//7+/v/+/v7//v7+//7+/v/+/v7//v7+//7+ - /v/+/v7//v7+//7+/v/+/v7//v7+//7+/v/+/v7s/v79sf7+/VT9/fsN/v7/APv79AAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMvYzwD///8A/fz7E/39/FP9/fyq/f396P39 - /fv9/f3//f79//3+/v/9/f7//f39//39/f/+/f7//v39//7+/f/9/v7//v3+//7+/v/+/v7//v7+//7+ - /v/+/v7//v7+//7+/v/+/v7//v7+//7+/v/+/v7//v7+//7+/v/+/v7//v7+//7+/v/+/v73/v79tP7+ - /Df8/PcC/f36AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA+/z5APr8+AL9/fsl/f38bP39 - /cj9/f33/f39//39/f/9/f3//f39//39/f/9/f7//f39//39/f/+/v7//v39//79/f/+/v3//f3+//7+ - /f/+/v7//v7+//7+/v/+/v7//v7+//7+/v/+/v7//v7+//7+/v/+/v7//v7+//7+/v/+/v7//v7+//7+ - /v/+/v7//v7+//7+/v/+/v7l/v79af7++wj+/v0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD8/PgA+/vvAf39 - +yT9/fyF/f393f39/f79/f3//f39//79/f/9/f3//f39//79/f/9/f3//f39//39/f/9/v3//f39//3+ - /f/+/v3//v39//79/f/+/v7//v7+//7+/v/+/f7//v7+//7+/v/+/v7//v7+//7+/v/+/v7//v7+//7+ - /v/+/v7//v7+//7+/v/+/v7//v7+//7+/v/+/v7//v7+//7+/vX+/v2Z/f37FP39/AAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPn5 - 8gD///8A/P38FP39/HD9/f3Z/f39/v39/f/9/f3//f39//39/f/9/f3//f39//39/fb9/f3b/f39y/39 - /Zz9/f2H/f38hP39+3z9/ft7/f38ev39/H79/f2H/v79iP79/a7+/v3U/v797P7+/v7+/f7//v7+//7+ - /v/+/v7//v7+//7+/v/+/v7//v7+//7+/v/+/v7//v7+//7+/v/+/v7//v7+//7+/v/+/v7//v7+/f7+ - /ZX9/fsM/f38AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAPz8+gD8/PoI/f38WP39/cj9/f36/f39//39/f/9/f3//f39//39/f39/f3n/f38u/39 - /Hz9/fxG/f38G/z9+w/7/PcE+/z3AAAAAAAAAAAAAAAAAAAAAAAAAAAA+/v2AP///wD9/foI/v78Ev39 - /DX9/fxu/f39s/7+/en+/v7//v7+//7+/v/+/v7//v7+//7+/v/+/v7//v7+//7+/v/+/v7//v7+//7+ - /v/+/v7//v7+//7+/v/+/v75/v7+dP7++gL+/vwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAA+Pn2AP7+/QD8/fwf/f38j/39/fX9/f3//f39//39/f/9/f3+/f396v39 - /bL9/f1o/fz7Kvz8+gz9/fsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAD7/fgA/fz6APz8+Qn9/fww/v79e/7+/dL+/v77/v7+//7+/v/+/v7//v7+//7+ - /v/+/v7//v7+//7+/v/+/v7//v7+//7+/v/+/v7//v7+//7+/vD+/v1R/v79AP7+/QAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/f37APz89wP9/fxS/f390P39/f/9/f3//f39//39 - /f/9/f3m/f38kP39/DT8/fsH9fHsAPn49AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA+vfeAOrq - egD9+fMC/vz6Bf38+wX9+fQD+O3cAPnv4AAAAAAAAAAAAAAAAAAAAAAA/v78AP38+AH9/fwZ/v79ef7+ - /ur+/v7//v7+//7+/v/+/v7//v7+//7+/v/+/v7//v7+//7+/v/+/v7//v7+//7+/v/+/v7//v7+wP7+ - /RP+/v0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/Pz6APz8+g79/fyC/f397/39 - /f/9/f3//f39//39/eL9/fyN/fz7Mfv79wT8/PkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAD8/PkA/P35A/39+yX9/fxk/f38nv39/bj+/f24/f38pf79/G/9/fws/f3+A/39/QAAAAAAAAAAAAAA - AAAAAAAA/fz7AP38+gP+/fxA/v7+vP7+/v7+/v7//v7+//7+/v/+/v7//v7+//7+/v/+/v7//v7+//7+ - /v/+/v7//v7+//7+/vr+/v1e////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADd3rsA/f39APz9 - /BH9/fyb/f39+/39/f/9/f3//f399P39/KD9/fsu+/v4Avz8+gAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAP39/AD7/PgB/f38Lv39/ZP9/v3g/v79/f7+/f/+/f7//v79//3+/f/+/v3+/v795f79 - /pP+/f0s/f7+AP79/QAAAAAAAAAAAAAAAAD6+vUA/v//AP7+/hb+/v2m/v7+/v7+/v/+/v7//v7+//7+ - /v/+/v7//v7+//7+/v/+/v7//v7+//7+/v/+/v7//v79uPz8+gwAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAA/fz8AP38/Bj9/fym/f39/f39/f/9/f3+/f39y/39+1T8/PkJ/Pz6AAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD+/PsA/vz7Kf39/df+/f3//v3+//79/f/9/v3//v79//7+ - /f/9/v3//f79//7+/v/+/v7//v7+1f7+/Tj+//4A/vz9AAAAAAAAAAAAAAAAAPv+9wD9/f0A/f38FP7+ - /qn+/v7//v7+//7+/v/+/v7//v7+//7+/v/+/v7//v7+//7+/v/+/v7//v7+//7+/vH9/fw9AAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAA/f39AP39/RH9/f2j/f39/v39/f/9/f3y/f38kv38/B3///8A+/v4AAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/fz6AP38+hP9/f2w/f39//3+ - /f/9/f37/f391f39/Zj+/v6O/f79l/3+/dX+/f39/v39//7+/v/9/v3R/v38Jv79/AAAAAAAAAAAAAAA - AAAAAAAAAAAAAP79/AD9/fwn/v7+1f7+/v/+/v7//v7+//7+/v/+/v7//v7+//7+/v/+/v7//v7+//7+ - /v/+/v7//v79fwAAAAAAAAAAAAAAAAAAAAAAAAAA/f38APz8+w/9/f2b/f39/f39/f/9/f3o/P37Z/z8 - +gT9/fsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAD9/fwA/f38KP39/dT9/f3U/f38aP38+xz9+/gC/fz4APz79QH9/fwf/v39p/79/f/9/v7//f7+//39 - /Yf9//8A+/n3AAAAAAAAAAAAAAAAAAAAAAD9/fwA/v7+AP79/Vn+/v70/v7+//7+/v/+/v7//v7+//7+ - /v/+/v7//v7+//7+/v/+/v7//v7+//7+/qkAAAAAAAAAAAAAAAAAAAAA/Pz6APv8+Qn8/PyT/f39/f39 - /f/9/f3R/f38Pvn79QL7/PkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAA/fz6AP379gH9/Ps2/f37JP39/ADZ2dkAAAAAAAAAAAAAAAAA/f39AP39 - /Sj+/v7n/v7+//3+/v/9/f3J/f37Ev39+wAAAAAAAAAAAAAAAAAAAAAAAAAAAP39/AD9/PwI/v7+rv7+ - /v/+/v7//v7+//7+/v/+/v7//v7+//7+/v/+/v7//v7+//7+///+/v7SAAAAAAAAAAAAAAAA/Pz6AP7/ - /wD9/fxe/fz99f39/f/9/fzR/f38M/3++wD9+/0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAA/fv5AP7//wD+/fxL/v7+8f3+/v/+/v7//v795v79/CL+/fwAAAAAAAAAAAAAAAAAAAAAAAAA - AAD9/fkA/v7+AP3+/WD+/v79/v7+//7+/v/+/v7//v7+//7+/v/+/v7//v7+//7+/v/+/v7//v7+4wAA - AAAAAAAAAAAAAPz8+wD8/Psx/f383v39/f/9/f3S/P38NPz8/QD9/fsAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAD7/PcA5e+3AP39/BP9/f1f/f393f39/v/9/v7//f7+//7+/cf+/PoR/v36AAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAP7+/QD+/v0o/v7+6P7+/v/+/v7//v7+//7+/v/+/v7//v7+//7+ - /v/+/v7//v7+//7+/uMAAAAAAAAAAPz8+gD8+/kL/Pz8qP39/f/8/P3a/f39N/38/QD8/fwAAAAAAAAA - AAAAAAAA/Pz6APz7+gX9/Ps8/f38Sf39/Ej9/fxI/f38Q/38+w/9/PsAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAP39/AD9/PkG/f38M/79/X/+/v3L/v7++f7+/v/+/v7//v7+//7+ - /fv+/f1t/v7+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD+/fsA/v37Hv7+/eD+/v7//v7+//7+ - /v/+/v7//v7+//7+/v/+/v7//v7+//7+/v/+/v7jAAAAAPv6+QD9/f0A/Pz7VPz9/ff9/fzy/Pz7XP7/ - /gD8/PoAAAAAAAAAAAAAAAAAAAAAAPz8/AD8/PwT/f390/39/f39/f36/f39+/39/ff9/Pxg/f39AAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP79/QD+/f0V/v38kv39/ev+/f3+/v79//3+ - /f/9/v7//v3+//7+/fH9/f2M/fz6D/39+wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/f36AP39 - +gv+/v27/v7+//7+/v/+/v7//v7+//7+/v/+/v7//v7+//7+/v/+/v7//v7+xgAAAAD7/PoA+/z6Dfz8 - /Lf9/P3//Pz8hPv9+QP8/PoAAAAAAAAAAAAAAAAAAAAAAAAAAAD8/PoA/Pz5B/39/K79/f3//f39//39 - /f/9/f3//f38lf3+/wD9+vgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP39/QD9/fwT/f79pf79 - /f7+/f7//f3+//39/v/9/f3//f398v79/bb+/f1G/fz7Bv39/gAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAPb07wD///8A/v7+o/7+/v/+/v7//v7+//7+/v/+/v7//v7+//7+/v/+/v7//v7+//7+ - /qL6/PYA/fz8APz8+079/fz4/P38wvz8+xj8/PwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP39 - /QD9/fyA/f39//39/f/9/f3//f39//39/cX9/PwP/fz8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP78 - +gD9//8A/f38eP39/f7+/v3//v79//39/f79/v3e/v39lv39/EL9/PsM//7/AP38+AAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD9/fsA/f37E/7+/cr+/v7//v7+//7+/v/+/v7//v7+//7+ - /v/+/v7//v7+//7+/v/+/v2B/Pz6APz7+Ab9/Pyp/f389/z8+1T9/f0A+/v4AAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAD9/fwA/f38RP39/ff9/f3//f39//39/f/9/f3j/f38Jf39/AAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAD+/fwA/vz5A/39/bL9/f3//f3+//39/f/9/f28/f38J//7+gH+/fwAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/v79AP7+/SD+/v7k/v7+//7+ - /v/+/v7//v7+//7+/v/+/v7//v7+//7+/v/+/v72/v79RPz8+wD8/Psr/fz86f39/Kb8+/oH/Pz7AAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/fz6AP38+iD9/fzb/f39//39/f/9/f3//f39/f39 - /Vf9/f0A/Pr4AAAAAAAAAAAAAAAAAAAAAAAAAAAA/fz7AP369gL9/fyr/f39//39/v/9/f3//f39Zf39 - /gAAAAAAAAAAAP38+gD9/fkE/f38P/79+y79/f0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP79 - /QD+/fw5/v7+7/7+/v/+/v7//v7+//7+/v/+/v7//v7+//7+/v/+/v7//v7+yv39+xX9/fwA/Pz8Y/39 - /PD9/PxF/fz8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP38+gD8+vcE/f38pv39 - /f/9/f3//f39//39/f/9/fyR/f//AP38+wAAAAAAAAAAAAAAAAAAAAAAAAAAAP38+QD+/v8A/f38a/39 - /f39/f3//v39//39/a79/fsd/fv4A/39+gz+/fwq/v39i/39/e7+/f3B/f38F/39/AAAAAAAAAAAAAAA - AAAAAAAAAAAAAP39+wD+/v4A/v79bP7+/v/+/v7//v7+//7+/v/+/v7//v7+//7+/v/+/v7//v7+/v7+ - /W7///8A/fz9APz8/I39/PzI/Pz7D/z8+wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAD7+vYA/f39AP38/G79/f3//f39//39/f/9/f3//f39xP38+hD9/PkAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAA/f38AP38+xv9/f3I/f39//79/f/+/f38/f392f39/aD9/f27/v395/7+/v79/v7//v7+/v79 - /Zj9/PkL/fz6AAAAAAAAAAAAAAAAAAAAAAD9/fsA/f37DP7+/bb+/v7//v7+//7+/v/+/v7//v7+//7+ - /v/+/v7//v7+//7+/tb+/v0f/v79AP7+/wD9/PyQ/Pz8fv39/QD8+/gAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAP39/AD9/Pw2/f398P39/f/9/f3//f39//39/e79/Ps3/f38AAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAP317AD9/v8A/f39PP39/dj9/f3//v39//3+/v/9/f7//f7+//3+ - /v/+/v7//v7+//7+/v/9/f3F/v37Gv79+wAAAAAAAAAAAAAAAAAAAAAA/v79AP79/Ev+/v70/v7+//7+ - /v/+/v7//v7+//7+/v/+/v7//v7+//7+/v7+/v50/v7/AP7+/AD8+/oO/Pz7rvz8+zj8/PsAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD9/PsA/fz7GP39/dL9/f3//f39//39 - /f/9/f3//f38aP39/AD7+e8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/f39AP3++wD9/fwx/f39qP39 - /e79/f7//f7+//79/f/+/v7//f79/f3+/eD+/f2L/f38If39/QD8/PoAAAAAAAAAAAAAAAAA/f37AP39 - +gj+/v2r/v7+//7+/v/+/v7//v7+//7+/v/+/v7//v7+//7+/v/+/v7P/v79HP7+/QAAAAAA+/v6DPz7 - +kr8+/kI+/v5AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/f38APz8 - +QH9/f2p/f39//39/f/9/f3//f39//39/KD9+vgD/fz7AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAA/vz7AP38+gn9/fw4/f39Yv39/JT9/fyu/v39ff79/Vn9/fwl/vv6BP38+gAAAAAAAAAAAAAA - AAAAAAAAAAAAAP7+/QD9/fxK/v7+8f7+/v/+/v7//v7+//7+/v/+/v7//v7+//7+/v/+/v7y/v79WP7+ - /wD+/fsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAPz8+gD9/f4A/f38a/39/f/9/f3//f39//39/f/9/f3J/fz7D/38+wAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPz69gD8+fQB/Pr2Avnz7AD69O8AAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAP39/AD9/fwW/v79vP7+/v/+/v7//v7+//7+/v/+/v7//v7+//7+ - /v/+/v7//v79jv39+wT9/fwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/fz8AP38/Eb9/f30/f39//39/f/9/f3//f397/39 - /DP9/fwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP79/AD+/fsE/v79iP7+/v7+/v7//v7+//7+ - /v/+/v7//v7+//7+/v/+/v7//v7+tv7+/Rf+/v4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP38+wD9/Psa/f382/39 - /f/9/f3//f39//39/fz9/fxh/f39AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPz9/AD//v4A/f39Xv7+ - /vP+/v7//v7+//7+/v/+/v7//v7+//7+/v/+/v7//v791P79/C3+/v0A/Pr1AAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAD9/PkA/fv3Bv39/Kv9/f3//f39//39/f/9/f3//f39lP7//wD9+/kAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP3+ - /QD+/f8A/v3+Of7+/tr+/f7//v7+//7+/v/+/v7//v7+//7+/v/+/v7//v7+3f79/UD//v8A/f37AAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/+vIA//ryAP39 - +gL8+/oC/vz5Avv9+QL9/fkC/f35Av3+/wD9/fxr/f39//39/f/9/f3//f39//39/cv9/fsR/f36Af39 - +wL+/fsC/fz4Avz9+gL9/fkC/vv5Avz59QD8+fUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAPr89wD+/f8A/f79N/7+/tX+/v7//v7+//7+/v/+/v7//v7+//7+/v/+/v7//v7+3/7+ - /UT+//8A/vz7AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAA/fz7AP38+xH9/fyY/f38sf39/K/9/fyv/f38sP39/LD9/fyu/f39xv39/f79/f3//f39//39 - /f/9/f3y/f39tf39/a/9/f2v/f39r/39/a/9/f2v/f39sf39/Z39/Psa/fz8AAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAP38+ADz7LUA/f39Of7+/tT+/v7//v7+//7+/v/+/v7//v7+//7+ - /v/+/v7//v791v79/UL8//wA/v39AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAPz8+wD8/PoV/fz80f39/f/9/f3//f39//39/f/9/f3//f39//39 - /f/9/f3//f39//39/f/9/f3//f39//39/f/9/f3//f39//39/f/9/f3//f39//39/f/9/f38/f39Vv39 - /QAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP38+wD9/PoE/f38XP3+/d/+/v7//v7+//7+ - /v/+/v7//v7+//7+/v/+/v7//v79vf39/DT///8A/fz6AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD8+/gA9/HhAP38/Jv9/f3//f39//39 - /f/9/f3//f39//39/f/9/f3//f39//39/f/9/f3//f39//39/f/9/f3//f39//39/f/9/f3//f39//39 - /f/9/f3//f39//39/Yb///8A/fz7AAAAAAAAAAAAAAAAAAAAAAAAAAAA/Pz6AP39/AD9/PsP/f39df39 - /e/9/f3//v7+//7+/v/+/v7//v7+//7+/v/+/v75/v39pf79/Rr+/f0A/v7+AAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP39 - /AD8/PtW/P383P39/N/9/f3f/f383/39/d/9/f3f/f393/39/d/9/f3f/f393/39/d/9/f3f/f393/39 - /d/9/f3f/f393/39/d/9/f3f/f393/39/eP9/f2c/fz6A/39/AAAAAAAAAAAAAAAAAAAAAAA/f38AP/5 - AAD9/f0p/f39q/3+/vr+/v7//f3+//7+/f/+/v7//v7+//7+/v/+/f7l/v39c/39+w79/vwAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAD9+/kA/fv5Bv38+xn9/Pwb/fz8G/38/Bv9/fwb/f38G/39/Bv9/fwb/f38G/38 - /Bv9/fwb/f38G/39/Bv9/fwb/f38G/79/Bv9/fwb/f38G/39/Bv9/fwb/f38Ev39+AD9/fsAAAAAAAAA - AAAAAAAA/vz9AP39+xH9/f1s/f392/79/v/9/v7//f3+//7+/v/+/v7//v7+//7+/v3+/f25/v39Of38 - 9gL9/PkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAPv79gD+/P4A/fz6Cv39/E39/f29/f39+v3+/f/+/v3//v7+//3+/f/+/v7//v7+//7+ - /t/9/v16/v38Ev3+/wD968gAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAA+v3zAP7//wD9/PsQ/f39UP39/a/9/f3z/v39//79/f/+/f7//v7+//7+ - /v/+/v7//f798v79/Z7+/f0s/f/6Af3++wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPz7+QD8+/kO/Pz6Nfz8 - +w38/f0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD8/PoA/Pz6Bf38+yr9/fx0/f39xv39/fb9/f3//f79//79 - /f/+/v7//v79//7+/v/+/v3x/v39sf39/Eb9/PoI/fz7AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAD8+/kA+/v5Gvz8/KT9/Py3/Pz8ePz8+zn8/PsQ/Pr2A/z7+QAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD8+vgA/Pr4A/38/Az9/Psv/f38Y/39/aT9/f3l/f39/v39 - /f/9/f3//f79//39/v/9/v3//f79//39/e79/f2l/v39Qf38+wv9/v4A6uHEAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAA+vr3AP/+/gD9/PsV/Pz7iPz9/O78/fzz/fz8zf38/JX9/Ptu/Pz7Pvz8 - +if8/Pkc/Pz5DP39+wL9/PgC/fz5Av38+gX8/PkV/Pz6If38+yn9/PxE/f38cf39/Y79/f3G/f396v39 - /fz9/f3//f39//39/f/9/f3//f79//7+/f/9/f77/f392f39/I79/fw6/fz6B/39/QAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/Pz6APz7+AT8/Pw5/P38mP38 - /Of9/f3+/f39//39/fP9/fzo/f381v39/cH9/f2y/f38sf39/LH9/f21/f38zP39/N79/f3q/f399P39 - /f/9/f3//f39//39/f/9/f3//f39//39/f/9/f3//f39+/39/eL9/f2o/f38XP38+x79+/cC/fv5AAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAA/Pr5APz6+QX8/Pwn/Pz8ef38/Mr9/P3y/f39//39/f/9/f3//f39//39/f/9/f3//f39//39 - /f/9/f3//f39//39/f/9/f3//f39//39/f/9/f3//f39/f39/fH9/f3W/f38nf39/Fv9/Pwj/Pz7Bfz8 - +gAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA+/j1APbw5wD8+/kT/Pz7Pf38/Hb9/fyj/f39y/39 - /dn9/fzy/f39+v39/fr9/f36/f39+v39/fr9/f30/f392/39/cz9/fzA/f39if39/G39/fw2/fz7G/z7 - +AL9/fsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPv5 - 8QD9//8A/Pv4Bf39/Az8/Psc/Pz7O/39/UT9/f1E/f39RP39/UT9/f1E/fz7Pfz8+x/9/v0N/f36C/v6 - 9gH7+vYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAA//////////////////////////////////////////////////////////////////////// - ///////////////////gAP///////gAAD//////gAAAD/////wAAAAD////8AAAAAD///+AAAAAAH/// - gAAAAAAP//8AAAAAAAf//AAD/AAAA//4AH//wAAD/+AB/wPwAAH/wA/8APwAAf+AP/AAfwAA/wD/8AA/ - gAD+A//wAB/AAPwH//gQH+AA+A//+PwP4AD4P////A/wAPB////gD/AA4PwH/4Af8ADh/Af/AB/wAMH8 - B/4AP/gAw/4D/gD/8ACH/gP8A//wAIf+A/wPH/AAj/4D/gAP8AGP/wH+AAfgAZ//Af8AB+ADH/8B/4AP - wAMf/wD/wB/AB///gP/4/4AH//+A////AA///4D///8AH///gP///gA//8BAAH/8AH//wAAAf/AA///A - AAB/4AH//8AAAH/AA///4AAAPwAH///gAAA+AA////////gAP///////4AB///4///8AAf///gP/8AAH - ////AAAAAB////+AAAAAf////+AAAAP/////+AAAH///////gAH///////////////////////////// - //////////////////////////////////////////////////8= - - - \ No newline at end of file diff --git a/SYS.FormUI/AppFunction/FrmBackAdmin.cs b/SYS.FormUI/AppFunction/FrmBackAdmin.cs index 7f71615b4b83db10eaeee5f96b075f2e64d8eadf..a790c7eb9d06555616814d95968294cd11b18de6 100644 --- a/SYS.FormUI/AppFunction/FrmBackAdmin.cs +++ b/SYS.FormUI/AppFunction/FrmBackAdmin.cs @@ -43,24 +43,13 @@ namespace SYS.FormUI private void llbUpLoadLog_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) { - pnlLook.Controls.Clear(); - FrmUpLoad frm1 = new FrmUpLoad(); - frm1.TopLevel = false; - pnlLook.Controls.Add(frm1); - frm1.Show(); - pnlWorkerPage.Visible = false; + } private void llbWorkerManager_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) { - pnlLook.Controls.Clear(); - FrmTopChange frm1 = new FrmTopChange(); - frm1.TopLevel = false; - pnlLook.Controls.Add(frm1); - frm1.Show(); - wk_AdminGroup = AdminInfo.admingroup; - pnlWorkerPage.Visible = false; + } private void llbAddRoom_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) @@ -102,10 +91,10 @@ namespace SYS.FormUI frm1.Show(); pnlCustoPage.Visible = false; - label5.Text = AdminInfo.admingroup + AdminInfo.adminType; + label5.Text = AdminInfo.Name; //label8.Text = "【"+AdminInfo.admingroup+"】"; - if (AdminInfo.adminType == "总经理") + if (AdminInfo.Type == "总经理") { btnCash.Enabled = true; btnWTI.Enabled = true; @@ -116,7 +105,7 @@ namespace SYS.FormUI btnWorker.Enabled = true; btnWorkerLog.Enabled = true; } - else if (AdminInfo.adminType == "财务经理") + else if (AdminInfo.Type == "财务经理") { btnCash.Enabled = true; btnWTI.Enabled = true; @@ -127,7 +116,7 @@ namespace SYS.FormUI btnWorker.Enabled = true; btnWorkerLog.Enabled = false; } - else if (AdminInfo.adminType == "酒店经理") + else if (AdminInfo.Type == "酒店经理") { btnCash.Enabled = true; btnWTI.Enabled = true; @@ -430,19 +419,19 @@ namespace SYS.FormUI private void cmsMain_Opening(object sender, CancelEventArgs e) { - if (AdminInfo.admingroup == "总经理") + if (AdminInfo.Type == "总经理") { tsmiBackUpDatabase.Enabled = true; tsmiRestoreDatabase.Enabled = true; tsmiWorkerManager.Enabled = true; } - else if (AdminInfo.admingroup == "经理") + else if (AdminInfo.Type == "经理") { tsmiBackUpDatabase.Enabled = false; tsmiRestoreDatabase.Enabled = false; tsmiWorkerManager.Enabled = true; } - if (AdminInfo.admingroup == "监管小组") + if (AdminInfo.Type == "监管小组") { tsmiBackUpDatabase.Enabled = false; tsmiRestoreDatabase.Enabled = false; diff --git a/SYS.FormUI/AppFunction/FrmBackUpDatabase.Designer.cs b/SYS.FormUI/AppFunction/FrmBackUpDatabase.Designer.cs deleted file mode 100644 index 59c135cca36f1650bf8815a96532f0e0a34d43ea..0000000000000000000000000000000000000000 --- a/SYS.FormUI/AppFunction/FrmBackUpDatabase.Designer.cs +++ /dev/null @@ -1,198 +0,0 @@ -namespace SYS.FormUI -{ - partial class FrmBackupDatabase - { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; - - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Windows Form Designer generated code - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmBackupDatabase)); - this.label1 = new System.Windows.Forms.Label(); - this.label2 = new System.Windows.Forms.Label(); - this.label3 = new System.Windows.Forms.Label(); - this.txtBackUpPath = new System.Windows.Forms.TextBox(); - this.txtBackUpName = new System.Windows.Forms.TextBox(); - this.btnLook = new System.Windows.Forms.Button(); - this.btnStart = new System.Windows.Forms.Button(); - this.btnCancel = new System.Windows.Forms.Button(); - this.pictureBox1 = new System.Windows.Forms.PictureBox(); - this.label4 = new System.Windows.Forms.Label(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); - this.SuspendLayout(); - // - // label1 - // - this.label1.AutoSize = true; - this.label1.BackColor = System.Drawing.Color.Transparent; - this.label1.Font = new System.Drawing.Font("苹方-简", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label1.Location = new System.Drawing.Point(7, 8); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(90, 22); - this.label1.TabIndex = 0; - this.label1.Text = "数据库备份"; - // - // label2 - // - this.label2.AutoSize = true; - this.label2.Font = new System.Drawing.Font("苹方-简", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label2.Location = new System.Drawing.Point(19, 69); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(93, 20); - this.label2.TabIndex = 2; - this.label2.Text = "备份数据库："; - // - // label3 - // - this.label3.AutoSize = true; - this.label3.Font = new System.Drawing.Font("苹方-简", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label3.Location = new System.Drawing.Point(19, 114); - this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(79, 20); - this.label3.TabIndex = 3; - this.label3.Text = "备份目录："; - // - // txtBackUpPath - // - this.txtBackUpPath.Font = new System.Drawing.Font("苹方-简", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.txtBackUpPath.Location = new System.Drawing.Point(117, 111); - this.txtBackUpPath.Name = "txtBackUpPath"; - this.txtBackUpPath.Size = new System.Drawing.Size(117, 27); - this.txtBackUpPath.TabIndex = 4; - // - // txtBackUpName - // - this.txtBackUpName.Font = new System.Drawing.Font("苹方-简", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.txtBackUpName.Location = new System.Drawing.Point(117, 66); - this.txtBackUpName.Name = "txtBackUpName"; - this.txtBackUpName.Size = new System.Drawing.Size(117, 27); - this.txtBackUpName.TabIndex = 5; - // - // btnLook - // - this.btnLook.BackColor = System.Drawing.Color.SkyBlue; - this.btnLook.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("btnLook.BackgroundImage"))); - this.btnLook.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; - this.btnLook.FlatStyle = System.Windows.Forms.FlatStyle.Popup; - this.btnLook.Font = new System.Drawing.Font("苹方-简", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnLook.Location = new System.Drawing.Point(247, 106); - this.btnLook.Name = "btnLook"; - this.btnLook.Size = new System.Drawing.Size(75, 34); - this.btnLook.TabIndex = 6; - this.btnLook.Text = "浏览..."; - this.btnLook.UseVisualStyleBackColor = false; - this.btnLook.Click += new System.EventHandler(this.btnLook_Click); - // - // btnStart - // - this.btnStart.BackColor = System.Drawing.Color.SkyBlue; - this.btnStart.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("btnStart.BackgroundImage"))); - this.btnStart.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; - this.btnStart.FlatStyle = System.Windows.Forms.FlatStyle.Popup; - this.btnStart.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnStart.Location = new System.Drawing.Point(112, 155); - this.btnStart.Name = "btnStart"; - this.btnStart.Size = new System.Drawing.Size(75, 34); - this.btnStart.TabIndex = 7; - this.btnStart.Text = "开始备份"; - this.btnStart.UseVisualStyleBackColor = false; - this.btnStart.Click += new System.EventHandler(this.btnStart_Click); - // - // btnCancel - // - this.btnCancel.BackColor = System.Drawing.Color.SkyBlue; - this.btnCancel.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("btnCancel.BackgroundImage"))); - this.btnCancel.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; - this.btnCancel.FlatStyle = System.Windows.Forms.FlatStyle.Popup; - this.btnCancel.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnCancel.Location = new System.Drawing.Point(208, 155); - this.btnCancel.Name = "btnCancel"; - this.btnCancel.Size = new System.Drawing.Size(75, 34); - this.btnCancel.TabIndex = 8; - this.btnCancel.Text = "关闭"; - this.btnCancel.UseVisualStyleBackColor = false; - this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click); - // - // pictureBox1 - // - this.pictureBox1.BackColor = System.Drawing.Color.Transparent; - this.pictureBox1.Location = new System.Drawing.Point(1, 0); - this.pictureBox1.Name = "pictureBox1"; - this.pictureBox1.Size = new System.Drawing.Size(100, 36); - this.pictureBox1.TabIndex = 1; - this.pictureBox1.TabStop = false; - // - // label4 - // - this.label4.AutoSize = true; - this.label4.Font = new System.Drawing.Font("苹方-简", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label4.ForeColor = System.Drawing.Color.Red; - this.label4.Location = new System.Drawing.Point(240, 69); - this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(135, 20); - this.label4.TabIndex = 9; - this.label4.Text = "请勿保存于桌面！！"; - // - // FrmBackupDatabase - // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.BackColor = System.Drawing.Color.SkyBlue; - this.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; - this.ClientSize = new System.Drawing.Size(394, 222); - this.Controls.Add(this.label4); - this.Controls.Add(this.btnCancel); - this.Controls.Add(this.btnStart); - this.Controls.Add(this.btnLook); - this.Controls.Add(this.txtBackUpName); - this.Controls.Add(this.txtBackUpPath); - this.Controls.Add(this.label3); - this.Controls.Add(this.label2); - this.Controls.Add(this.label1); - this.Controls.Add(this.pictureBox1); - this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None; - this.Name = "FrmBackupDatabase"; - this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; - this.Text = "FrmBackupDatabase"; - this.Load += new System.EventHandler(this.FrmBackupDatabase_Load); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); - this.ResumeLayout(false); - this.PerformLayout(); - - } - - #endregion - - private System.Windows.Forms.Label label1; - private System.Windows.Forms.PictureBox pictureBox1; - private System.Windows.Forms.Label label2; - private System.Windows.Forms.Label label3; - private System.Windows.Forms.TextBox txtBackUpPath; - private System.Windows.Forms.TextBox txtBackUpName; - private System.Windows.Forms.Button btnLook; - private System.Windows.Forms.Button btnStart; - private System.Windows.Forms.Button btnCancel; - private System.Windows.Forms.Label label4; - } -} \ No newline at end of file diff --git a/SYS.FormUI/AppFunction/FrmBackUpDatabase.cs b/SYS.FormUI/AppFunction/FrmBackUpDatabase.cs deleted file mode 100644 index 059770241dce74ed94da55718ee4f4d6f20efbd5..0000000000000000000000000000000000000000 --- a/SYS.FormUI/AppFunction/FrmBackUpDatabase.cs +++ /dev/null @@ -1,66 +0,0 @@ -using SYS.Core; -using System; -using System.Data; -using MySql.Data.MySqlClient; -using System.Windows.Forms; - -namespace SYS.FormUI -{ - public partial class FrmBackupDatabase : Form - { - public FrmBackupDatabase() - { - InitializeComponent(); - } - - private void btnLook_Click(object sender, EventArgs e) - { - FolderBrowserDialog fbd = new FolderBrowserDialog(); - fbd.RootFolder = System.Environment.SpecialFolder.Desktop; - fbd.SelectedPath = "C:"; - fbd.ShowNewFolderButton = true; - fbd.Description = "请选择备份目录:"; - if (fbd.ShowDialog() == DialogResult.OK) - { - string Path = fbd.SelectedPath; - txtBackUpPath.Text = Path; - } - } - - private void btnStart_Click(object sender, EventArgs e) - { - string strDB = txtBackUpName.Text.ToString().Trim(); - MySqlConnection con = DBHelper.GetConnection(); - MySqlCommand cmdBK = new MySqlCommand(); - cmdBK.CommandType = CommandType.Text; - cmdBK.Connection = con; - string Date = DateTime.Now.Year.ToString() + DateTime.Now.Month.ToString() + DateTime.Now.Day.ToString(); - cmdBK.CommandText = "backup database TSHotelDB to disk='" + txtBackUpPath.Text + '\\' + txtBackUpName.Text + "_" + Date + ".bak'"; - try - { - con.Open(); - cmdBK.ExecuteNonQuery(); - MessageBox.Show("备份成功，请前往所选择保存的目录下查看！"); - System.Diagnostics.Process.Start("Explorer.exe", txtBackUpPath.Text); - } - catch (Exception) - { - MessageBox.Show("备份失败，遇到未知错误！"); - } - finally - { - con.Close(); - } - } - - private void btnCancel_Click(object sender, EventArgs e) - { - this.Close(); - } - - private void FrmBackupDatabase_Load(object sender, EventArgs e) - { - - } - } -} diff --git a/SYS.FormUI/AppFunction/FrmBackgroundSystem.Designer.cs b/SYS.FormUI/AppFunction/FrmBackgroundSystem.Designer.cs index 418909ce6ac038cef7b24b43b372e90ab23fdaf0..6a2b3920c3a00b1c04f9dc2bd69737be5ab476db 100644 --- a/SYS.FormUI/AppFunction/FrmBackgroundSystem.Designer.cs +++ b/SYS.FormUI/AppFunction/FrmBackgroundSystem.Designer.cs @@ -30,57 +30,59 @@ namespace SYS.FormUI private void InitializeComponent() { this.components = new System.ComponentModel.Container(); - System.Windows.Forms.TreeNode treeNode85 = new System.Windows.Forms.TreeNode("职位类型维护"); - System.Windows.Forms.TreeNode treeNode86 = new System.Windows.Forms.TreeNode("民族类型维护"); - System.Windows.Forms.TreeNode treeNode87 = new System.Windows.Forms.TreeNode("性别类型维护"); - System.Windows.Forms.TreeNode treeNode88 = new System.Windows.Forms.TreeNode("学历类型维护"); - System.Windows.Forms.TreeNode treeNode89 = new System.Windows.Forms.TreeNode("部门信息维护"); - System.Windows.Forms.TreeNode treeNode90 = new System.Windows.Forms.TreeNode("基础信息", new System.Windows.Forms.TreeNode[] { - treeNode85, - treeNode86, - treeNode87, - treeNode88, - treeNode89}); - System.Windows.Forms.TreeNode treeNode91 = new System.Windows.Forms.TreeNode("员工工资账单"); - System.Windows.Forms.TreeNode treeNode92 = new System.Windows.Forms.TreeNode("内部财务账单"); - System.Windows.Forms.TreeNode treeNode93 = new System.Windows.Forms.TreeNode("酒店盈利情况"); - System.Windows.Forms.TreeNode treeNode94 = new System.Windows.Forms.TreeNode("财务信息", new System.Windows.Forms.TreeNode[] { - treeNode91, - treeNode92, - treeNode93}); - System.Windows.Forms.TreeNode treeNode95 = new System.Windows.Forms.TreeNode("水电信息"); - System.Windows.Forms.TreeNode treeNode96 = new System.Windows.Forms.TreeNode("水电管理", new System.Windows.Forms.TreeNode[] { - treeNode95}); - System.Windows.Forms.TreeNode treeNode97 = new System.Windows.Forms.TreeNode("监管部门情况"); - System.Windows.Forms.TreeNode treeNode98 = new System.Windows.Forms.TreeNode("监管统计", new System.Windows.Forms.TreeNode[] { - treeNode97}); - System.Windows.Forms.TreeNode treeNode99 = new System.Windows.Forms.TreeNode("房态图一览"); - System.Windows.Forms.TreeNode treeNode100 = new System.Windows.Forms.TreeNode("新增客房"); - System.Windows.Forms.TreeNode treeNode101 = new System.Windows.Forms.TreeNode("客房管理", new System.Windows.Forms.TreeNode[] { - treeNode99, - treeNode100}); - System.Windows.Forms.TreeNode treeNode102 = new System.Windows.Forms.TreeNode("客户信息管理"); - System.Windows.Forms.TreeNode treeNode103 = new System.Windows.Forms.TreeNode("顾客消费账单"); - System.Windows.Forms.TreeNode treeNode104 = new System.Windows.Forms.TreeNode("客户管理", new System.Windows.Forms.TreeNode[] { - treeNode102, - treeNode103}); - System.Windows.Forms.TreeNode treeNode105 = new System.Windows.Forms.TreeNode("员工管理"); - System.Windows.Forms.TreeNode treeNode106 = new System.Windows.Forms.TreeNode("任命日志"); - System.Windows.Forms.TreeNode treeNode107 = new System.Windows.Forms.TreeNode("上传任命日志"); - System.Windows.Forms.TreeNode treeNode108 = new System.Windows.Forms.TreeNode("人事管理", new System.Windows.Forms.TreeNode[] { - treeNode105, - treeNode106, - treeNode107}); - System.Windows.Forms.TreeNode treeNode109 = new System.Windows.Forms.TreeNode("商品管理"); - System.Windows.Forms.TreeNode treeNode110 = new System.Windows.Forms.TreeNode("仓库物资"); - System.Windows.Forms.TreeNode treeNode111 = new System.Windows.Forms.TreeNode("物资管理", new System.Windows.Forms.TreeNode[] { - treeNode109, - treeNode110}); - System.Windows.Forms.TreeNode treeNode112 = new System.Windows.Forms.TreeNode("员工操作日志"); + System.Windows.Forms.TreeNode treeNode113 = new System.Windows.Forms.TreeNode("职位类型维护"); + System.Windows.Forms.TreeNode treeNode114 = new System.Windows.Forms.TreeNode("民族类型维护"); + System.Windows.Forms.TreeNode treeNode115 = new System.Windows.Forms.TreeNode("性别类型维护"); + System.Windows.Forms.TreeNode treeNode116 = new System.Windows.Forms.TreeNode("学历类型维护"); + System.Windows.Forms.TreeNode treeNode117 = new System.Windows.Forms.TreeNode("部门信息维护"); + System.Windows.Forms.TreeNode treeNode118 = new System.Windows.Forms.TreeNode("基础信息", new System.Windows.Forms.TreeNode[] { + treeNode113, + treeNode114, + treeNode115, + treeNode116, + treeNode117}); + System.Windows.Forms.TreeNode treeNode119 = new System.Windows.Forms.TreeNode("员工工资账单"); + System.Windows.Forms.TreeNode treeNode120 = new System.Windows.Forms.TreeNode("内部财务账单"); + System.Windows.Forms.TreeNode treeNode121 = new System.Windows.Forms.TreeNode("酒店盈利情况"); + System.Windows.Forms.TreeNode treeNode122 = new System.Windows.Forms.TreeNode("财务信息", new System.Windows.Forms.TreeNode[] { + treeNode119, + treeNode120, + treeNode121}); + System.Windows.Forms.TreeNode treeNode123 = new System.Windows.Forms.TreeNode("水电信息"); + System.Windows.Forms.TreeNode treeNode124 = new System.Windows.Forms.TreeNode("水电管理", new System.Windows.Forms.TreeNode[] { + treeNode123}); + System.Windows.Forms.TreeNode treeNode125 = new System.Windows.Forms.TreeNode("监管部门情况"); + System.Windows.Forms.TreeNode treeNode126 = new System.Windows.Forms.TreeNode("监管统计", new System.Windows.Forms.TreeNode[] { + treeNode125}); + System.Windows.Forms.TreeNode treeNode127 = new System.Windows.Forms.TreeNode("房态图一览"); + System.Windows.Forms.TreeNode treeNode128 = new System.Windows.Forms.TreeNode("新增客房"); + System.Windows.Forms.TreeNode treeNode129 = new System.Windows.Forms.TreeNode("客房管理", new System.Windows.Forms.TreeNode[] { + treeNode127, + treeNode128}); + System.Windows.Forms.TreeNode treeNode130 = new System.Windows.Forms.TreeNode("客户信息管理"); + System.Windows.Forms.TreeNode treeNode131 = new System.Windows.Forms.TreeNode("顾客消费账单"); + System.Windows.Forms.TreeNode treeNode132 = new System.Windows.Forms.TreeNode("客户管理", new System.Windows.Forms.TreeNode[] { + treeNode130, + treeNode131}); + System.Windows.Forms.TreeNode treeNode133 = new System.Windows.Forms.TreeNode("员工管理"); + System.Windows.Forms.TreeNode treeNode134 = new System.Windows.Forms.TreeNode("任命日志"); + System.Windows.Forms.TreeNode treeNode135 = new System.Windows.Forms.TreeNode("上传任命日志"); + System.Windows.Forms.TreeNode treeNode136 = new System.Windows.Forms.TreeNode("人事管理", new System.Windows.Forms.TreeNode[] { + treeNode133, + treeNode134, + treeNode135}); + System.Windows.Forms.TreeNode treeNode137 = new System.Windows.Forms.TreeNode("商品管理"); + System.Windows.Forms.TreeNode treeNode138 = new System.Windows.Forms.TreeNode("仓库物资"); + System.Windows.Forms.TreeNode treeNode139 = new System.Windows.Forms.TreeNode("物资管理", new System.Windows.Forms.TreeNode[] { + treeNode137, + treeNode138}); + System.Windows.Forms.TreeNode treeNode140 = new System.Windows.Forms.TreeNode("员工操作日志"); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmBackgroundSystem)); this.Aside = new Sunny.UI.UINavMenu(); this.imageList1 = new System.Windows.Forms.ImageList(this.components); this.pnlForm = new Sunny.UI.UIPanel(); + this.btnSetting = new Sunny.UI.UIButton(); + this.btnLocked = new Sunny.UI.UIButton(); this.SuspendLayout(); // // Aside @@ -90,77 +92,77 @@ namespace SYS.FormUI this.Aside.Font = new System.Drawing.Font("微软雅黑", 12F); this.Aside.FullRowSelect = true; this.Aside.ItemHeight = 50; - this.Aside.Location = new System.Drawing.Point(3, 38); + this.Aside.Location = new System.Drawing.Point(6, 87); this.Aside.MenuStyle = Sunny.UI.UIMenuStyle.Custom; this.Aside.Name = "Aside"; - treeNode85.Name = "节点1"; - treeNode85.Text = "职位类型维护"; - treeNode86.Name = "节点2"; - treeNode86.Text = "民族类型维护"; - treeNode87.Name = "节点3"; - treeNode87.Text = "性别类型维护"; - treeNode88.Name = "节点4"; - treeNode88.Text = "学历类型维护"; - treeNode89.Name = "节点5"; - treeNode89.Text = "部门信息维护"; - treeNode90.Name = "节点0"; - treeNode90.Text = "基础信息"; - treeNode91.Name = "节点0"; - treeNode91.Text = "员工工资账单"; - treeNode92.Name = "节点1"; - treeNode92.Text = "内部财务账单"; - treeNode93.Name = "节点2"; - treeNode93.Text = "酒店盈利情况"; - treeNode94.Name = "btnCash"; - treeNode94.Text = "财务信息"; - treeNode95.Name = "节点0"; - treeNode95.Text = "水电信息"; - treeNode96.Name = "节点1"; - treeNode96.Text = "水电管理"; - treeNode97.Name = "节点3"; - treeNode97.Text = "监管部门情况"; - treeNode98.Name = "节点2"; - treeNode98.Text = "监管统计"; - treeNode99.Name = "节点6"; - treeNode99.Text = "房态图一览"; - treeNode100.Name = "节点7"; - treeNode100.Text = "新增客房"; - treeNode101.Name = "节点3"; - treeNode101.Text = "客房管理"; - treeNode102.Name = "节点8"; - treeNode102.Text = "客户信息管理"; - treeNode103.Name = "节点9"; - treeNode103.Text = "顾客消费账单"; - treeNode104.Name = "节点4"; - treeNode104.Text = "客户管理"; - treeNode105.Name = "节点6"; - treeNode105.Text = "员工管理"; - treeNode106.Name = "节点15"; - treeNode106.Text = "任命日志"; - treeNode107.Name = "节点16"; - treeNode107.Text = "上传任命日志"; - treeNode108.Name = "节点5"; - treeNode108.Text = "人事管理"; - treeNode109.Name = "节点11"; - treeNode109.Text = "商品管理"; - treeNode110.Name = "节点12"; - treeNode110.Text = "仓库物资"; - treeNode111.Name = "节点10"; - treeNode111.Text = "物资管理"; - treeNode112.Name = "节点13"; - treeNode112.Text = "员工操作日志"; + treeNode113.Name = "节点1"; + treeNode113.Text = "职位类型维护"; + treeNode114.Name = "节点2"; + treeNode114.Text = "民族类型维护"; + treeNode115.Name = "节点3"; + treeNode115.Text = "性别类型维护"; + treeNode116.Name = "节点4"; + treeNode116.Text = "学历类型维护"; + treeNode117.Name = "节点5"; + treeNode117.Text = "部门信息维护"; + treeNode118.Name = "节点0"; + treeNode118.Text = "基础信息"; + treeNode119.Name = "节点0"; + treeNode119.Text = "员工工资账单"; + treeNode120.Name = "节点1"; + treeNode120.Text = "内部财务账单"; + treeNode121.Name = "节点2"; + treeNode121.Text = "酒店盈利情况"; + treeNode122.Name = "btnCash"; + treeNode122.Text = "财务信息"; + treeNode123.Name = "节点0"; + treeNode123.Text = "水电信息"; + treeNode124.Name = "节点1"; + treeNode124.Text = "水电管理"; + treeNode125.Name = "节点3"; + treeNode125.Text = "监管部门情况"; + treeNode126.Name = "节点2"; + treeNode126.Text = "监管统计"; + treeNode127.Name = "节点6"; + treeNode127.Text = "房态图一览"; + treeNode128.Name = "节点7"; + treeNode128.Text = "新增客房"; + treeNode129.Name = "节点3"; + treeNode129.Text = "客房管理"; + treeNode130.Name = "节点8"; + treeNode130.Text = "客户信息管理"; + treeNode131.Name = "节点9"; + treeNode131.Text = "顾客消费账单"; + treeNode132.Name = "节点4"; + treeNode132.Text = "客户管理"; + treeNode133.Name = "节点6"; + treeNode133.Text = "员工管理"; + treeNode134.Name = "节点15"; + treeNode134.Text = "任命日志"; + treeNode135.Name = "节点16"; + treeNode135.Text = "上传任命日志"; + treeNode136.Name = "节点5"; + treeNode136.Text = "人事管理"; + treeNode137.Name = "节点11"; + treeNode137.Text = "商品管理"; + treeNode138.Name = "节点12"; + treeNode138.Text = "仓库物资"; + treeNode139.Name = "节点10"; + treeNode139.Text = "物资管理"; + treeNode140.Name = "节点13"; + treeNode140.Text = "员工操作日志"; this.Aside.Nodes.AddRange(new System.Windows.Forms.TreeNode[] { - treeNode90, - treeNode94, - treeNode96, - treeNode98, - treeNode101, - treeNode104, - treeNode108, - treeNode111, - treeNode112}); + treeNode118, + treeNode122, + treeNode124, + treeNode126, + treeNode129, + treeNode132, + treeNode136, + treeNode139, + treeNode140}); this.Aside.ShowLines = false; - this.Aside.Size = new System.Drawing.Size(234, 625); + this.Aside.Size = new System.Drawing.Size(234, 624); this.Aside.Style = Sunny.UI.UIStyle.Custom; this.Aside.TabIndex = 0; this.Aside.MenuItemClick += new Sunny.UI.UINavMenu.OnMenuItemClick(this.Aside_MenuItemClick); @@ -174,7 +176,7 @@ namespace SYS.FormUI // pnlForm // this.pnlForm.Font = new System.Drawing.Font("微软雅黑", 12F); - this.pnlForm.Location = new System.Drawing.Point(244, 40); + this.pnlForm.Location = new System.Drawing.Point(247, 88); this.pnlForm.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.pnlForm.MinimumSize = new System.Drawing.Size(1, 1); this.pnlForm.Name = "pnlForm"; @@ -183,15 +185,65 @@ namespace SYS.FormUI this.pnlForm.TabIndex = 1; this.pnlForm.Text = "点击左侧导航栏"; // + // btnSetting + // + this.btnSetting.BackColor = System.Drawing.Color.Transparent; + this.btnSetting.BackgroundImage = global::SYS.FormUI.Properties.Resources.settings2; + this.btnSetting.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.btnSetting.Cursor = System.Windows.Forms.Cursors.Arrow; + this.btnSetting.FillColor = System.Drawing.Color.Transparent; + this.btnSetting.Font = new System.Drawing.Font("微软雅黑", 12F); + this.btnSetting.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(111)))), ((int)(((byte)(168)))), ((int)(((byte)(255))))); + this.btnSetting.ForeHoverColor = System.Drawing.Color.FromArgb(((int)(((byte)(111)))), ((int)(((byte)(168)))), ((int)(((byte)(255))))); + this.btnSetting.ForePressColor = System.Drawing.Color.FromArgb(((int)(((byte)(111)))), ((int)(((byte)(168)))), ((int)(((byte)(255))))); + this.btnSetting.ForeSelectedColor = System.Drawing.Color.FromArgb(((int)(((byte)(111)))), ((int)(((byte)(168)))), ((int)(((byte)(255))))); + this.btnSetting.Location = new System.Drawing.Point(1172, 45); + this.btnSetting.MinimumSize = new System.Drawing.Size(1, 1); + this.btnSetting.Name = "btnSetting"; + this.btnSetting.Radius = 20; + this.btnSetting.Size = new System.Drawing.Size(35, 35); + this.btnSetting.Style = Sunny.UI.UIStyle.Custom; + this.btnSetting.StyleCustomMode = true; + this.btnSetting.TabIndex = 31; + this.btnSetting.MouseLeave += new System.EventHandler(this.btnSetting_MouseLeave); + this.btnSetting.MouseHover += new System.EventHandler(this.btnSetting_MouseHover); + // + // btnLocked + // + this.btnLocked.BackColor = System.Drawing.Color.Transparent; + this.btnLocked.BackgroundImage = global::SYS.FormUI.Properties.Resources._lock; + this.btnLocked.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; + this.btnLocked.Cursor = System.Windows.Forms.Cursors.Arrow; + this.btnLocked.FillColor = System.Drawing.Color.Transparent; + this.btnLocked.Font = new System.Drawing.Font("微软雅黑", 12F); + this.btnLocked.ForeHoverColor = System.Drawing.Color.FromArgb(((int)(((byte)(111)))), ((int)(((byte)(168)))), ((int)(((byte)(255))))); + this.btnLocked.ForePressColor = System.Drawing.Color.FromArgb(((int)(((byte)(111)))), ((int)(((byte)(168)))), ((int)(((byte)(255))))); + this.btnLocked.ForeSelectedColor = System.Drawing.Color.FromArgb(((int)(((byte)(111)))), ((int)(((byte)(168)))), ((int)(((byte)(255))))); + this.btnLocked.Location = new System.Drawing.Point(1213, 45); + this.btnLocked.MinimumSize = new System.Drawing.Size(1, 1); + this.btnLocked.Name = "btnLocked"; + this.btnLocked.Radius = 20; + this.btnLocked.Size = new System.Drawing.Size(35, 35); + this.btnLocked.Style = Sunny.UI.UIStyle.Custom; + this.btnLocked.StyleCustomMode = true; + this.btnLocked.TabIndex = 30; + this.btnLocked.Click += new System.EventHandler(this.btnLocked_Click); + this.btnLocked.MouseLeave += new System.EventHandler(this.btnLocked_MouseLeave); + this.btnLocked.MouseHover += new System.EventHandler(this.btnLocked_MouseHover); + // // FrmBackgroundSystem // this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 21F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1253, 666); + this.ClientSize = new System.Drawing.Size(1255, 718); + this.Controls.Add(this.btnSetting); + this.Controls.Add(this.btnLocked); this.Controls.Add(this.pnlForm); this.Controls.Add(this.Aside); this.EscClose = false; this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); + this.IsForbidAltF4 = true; + this.MaximizeBox = false; this.Name = "FrmBackgroundSystem"; this.ShowIcon = true; this.ShowRadius = false; @@ -209,5 +261,7 @@ namespace SYS.FormUI private Sunny.UI.UINavMenu Aside; private System.Windows.Forms.ImageList imageList1; private Sunny.UI.UIPanel pnlForm; + private Sunny.UI.UIButton btnLocked; + private Sunny.UI.UIButton btnSetting; } } \ No newline at end of file diff --git a/SYS.FormUI/AppFunction/FrmBackgroundSystem.cs b/SYS.FormUI/AppFunction/FrmBackgroundSystem.cs index 643ab9f76540b09137554c4f32013108fb2a5cff..030f2698b664f8c16bb29d0c4773e079feee71d0 100644 --- a/SYS.FormUI/AppFunction/FrmBackgroundSystem.cs +++ b/SYS.FormUI/AppFunction/FrmBackgroundSystem.cs @@ -81,20 +81,37 @@ namespace SYS.FormUI //frm1.Show(); break; case "内部财务账单": - MessageBox.Show("2"); + pnlForm.Controls.Clear(); + FrmCash frmCash = new FrmCash(); + frmCash.TopLevel = false; + pnlForm.Controls.Add(frmCash); + frmCash.Show(); break; case "酒店盈利情况": - MessageBox.Show("3"); + pnlForm.Controls.Clear(); + FrmChart frmChart = new FrmChart(); + frmChart.TopLevel = false; + pnlForm.Controls.Add(frmChart); + frmChart.Show(); break; case "水电管理": + break; case "水电信息": - MessageBox.Show("4"); + pnlForm.Controls.Clear(); + WtiInfo wtiInfo = new WtiInfo(); + wtiInfo.TopLevel = false; + pnlForm.Controls.Add(wtiInfo); + wtiInfo.Show(); break; case "监管统计": break; case "监管部门情况": - MessageBox.Show("5"); + pnlForm.Controls.Clear(); + FrmCheckList frmCheckList = new FrmCheckList(); + frmCheckList.TopLevel = false; + pnlForm.Controls.Add(frmCheckList); + frmCheckList.Show(); break; case "客房管理": break; @@ -102,40 +119,106 @@ namespace SYS.FormUI MessageBox.Show("6"); break; case "新增客房": - MessageBox.Show("7"); + pnlForm.Controls.Clear(); + FrmAddRoom frmAddRoom = new FrmAddRoom(); + frmAddRoom.TopLevel = false; + pnlForm.Controls.Add(frmAddRoom); + frmAddRoom.Show(); break; case "客户管理": break; case "客户信息管理": - MessageBox.Show("8"); + pnlForm.Controls.Clear(); + FrmCustoManager frmCustoManager = new FrmCustoManager(); + frmCustoManager.TopLevel = false; + pnlForm.Controls.Add(frmCustoManager); + frmCustoManager.Show(); break; case "顾客消费账单": - MessageBox.Show("9"); + pnlForm.Controls.Clear(); + FrmCustoSpend frmCustoSpend = new FrmCustoSpend(); + frmCustoSpend.TopLevel = false; + pnlForm.Controls.Add(frmCustoSpend); + frmCustoSpend.Show(); break; case "人事管理": break; case "员工管理": - MessageBox.Show("10"); + pnlForm.Controls.Clear(); + FrmWorkerManager frmWorkerManager = new FrmWorkerManager(); + frmWorkerManager.TopLevel = false; + pnlForm.Controls.Add(frmWorkerManager); + frmWorkerManager.Show(); break; case "任命日志": - MessageBox.Show("11"); + pnlForm.Controls.Clear(); + FrmNotice frmNotice = new FrmNotice(); + frmNotice.TopLevel = false; + pnlForm.Controls.Add(frmNotice); + frmNotice.Show(); break; case "上传任命日志": - MessageBox.Show("12"); + pnlForm.Controls.Clear(); + FrmUpLoadNotice frmUpLoadNotice = new FrmUpLoadNotice(); + frmUpLoadNotice.TopLevel = false; + pnlForm.Controls.Add(frmUpLoadNotice); + frmUpLoadNotice.Show(); break; case "物资管理": break; case "商品管理": - MessageBox.Show("13"); + pnlForm.Controls.Clear(); + FrmSellThingManager frmSellThingManager = new FrmSellThingManager(); + frmSellThingManager.TopLevel = false; + pnlForm.Controls.Add(frmSellThingManager); + frmSellThingManager.Show(); break; case "仓库物资": - MessageBox.Show("14"); break; case "员工操作日志": - MessageBox.Show("15"); + pnlForm.Controls.Clear(); + FrmOperation frmOperation = new FrmOperation(); + frmOperation.TopLevel = false; + pnlForm.Controls.Add(frmOperation); + frmOperation.Show(); break; } } } + + private void btnSetting_MouseHover(object sender, EventArgs e) + { + this.btnSetting.RectHoverColor = Color.Black; + this.btnSetting.Radius = 20; + this.btnSetting.RadiusSides = UICornerRadiusSides.All; + + } + + private void btnLocked_MouseHover(object sender, EventArgs e) + { + this.btnLocked.RectHoverColor = Color.Black; + this.btnLocked.Radius = 20; + this.btnLocked.RadiusSides = UICornerRadiusSides.All; + } + + private void btnSetting_MouseLeave(object sender, EventArgs e) + { + this.btnSetting.RectColor = System.Drawing.Color.FromArgb(111, 168, 255); + this.btnLocked.Radius = 20; + } + + private void btnLocked_MouseLeave(object sender, EventArgs e) + { + this.btnLocked.RectColor = System.Drawing.Color.FromArgb(111, 168, 255); + this.btnLocked.Radius = 20; + } + + private void btnLocked_Click(object sender, EventArgs e) + { + if (MessageBox.Show("确定要锁定屏幕吗？锁定后不能做任何操作!", "锁屏", MessageBoxButtons.OKCancel, MessageBoxIcon.Question) == DialogResult.OK) + { + new FrmUnLockSystem().ShowDialog(); + } + } } } diff --git a/SYS.FormUI/AppFunction/FrmBackgroundSystem.resx b/SYS.FormUI/AppFunction/FrmBackgroundSystem.resx index 52ce699aa56ec4cead9f489c25027ee2abf56af3..de6812b39556d5e6e9741bb070200fab85fd35e5 100644 --- a/SYS.FormUI/AppFunction/FrmBackgroundSystem.resx +++ b/SYS.FormUI/AppFunction/FrmBackgroundSystem.resx @@ -125,7 +125,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAC6 - BwAAAk1TRnQBSQFMAwEBAAEgAQABIAEAARABAAEQAQAE/wEJAQAI/wFCAU0BNgEEBgABNgEEAgABKAMA + BwAAAk1TRnQBSQFMAwEBAAFIAQABSAEAARABAAEQAQAE/wEJAQAI/wFCAU0BNgEEBgABNgEEAgABKAMA AUADAAEQAwABAQEAAQgGAAEEGAABgAIAAYADAAKAAQABgAMAAYABAAGAAQACgAIAA8ABAAHAAdwBwAEA AfABygGmAQABMwUAATMBAAEzAQABMwEAAjMCAAMWAQADHAEAAyIBAAMpAQADVQEAA00BAANCAQADOQEA AYABfAH/AQACUAH/AQABkwEAAdYBAAH/AewBzAEAAcYB1gHvAQAB1gLnAQABkAGpAa0CAAH/ATMDAAFm @@ -161,9 +161,6 @@ BgAL - - True - diff --git a/SYS.FormUI/AppFunction/FrmCash.cs b/SYS.FormUI/AppFunction/FrmCash.cs index 0c62e467fec472f724a58ae9976b0b617a3444c7..6776eb38d4167835b4d2429bebc0877b220cef36 100644 --- a/SYS.FormUI/AppFunction/FrmCash.cs +++ b/SYS.FormUI/AppFunction/FrmCash.cs @@ -42,10 +42,10 @@ namespace SYS.FormUI private void FrmCash_Load(object sender, EventArgs e) { dgvCashList.AutoGenerateColumns = false; - dgvCashList.DataSource = CashManager.SelectCashInfoAll(); + dgvCashList.DataSource = new CashManager().SelectCashInfoAll(); Random random = new Random(); txtCashNo.Text = "CN" + random.Next(0, 9).ToString() + random.Next(0, 9).ToString() + random.Next(0, 9).ToString() + random.Next(0, 9).ToString(); - if (AdminInfo.adminType != "财务经理" && AdminInfo.adminType != "总经理") + if (AdminInfo.Type != "财务经理" || AdminInfo.Type != "总经理") { btnOK.Enabled = false; btnOK.Text = "权限不足"; @@ -73,12 +73,12 @@ namespace SYS.FormUI { MessageBox.Show("录入成功！"); dgvCashList.AutoGenerateColumns = false; - dgvCashList.DataSource = CashManager.SelectCashInfoAll(); + dgvCashList.DataSource = new CashManager().SelectCashInfoAll(); #region 获取添加操作日志所需的信息 - Operation o = new Operation(); + OperationLog o = new OperationLog(); o.OperationTime = DateTime.Parse(DateTime.Now.ToString("yyyy-MM-dd,HH:mm:ss")); - o.Operationlog = AdminInfo.adminType + AdminInfo.admingroup + "于" + DateTime.Now + "进行资产录入，资产编号为：" + txtCashNo.Text.Trim(); - o.OperationAccount = AdminInfo.adminType + AdminInfo.admingroup; + o.Operationlog = AdminInfo.Account + AdminInfo.Name + "于" + DateTime.Now + "进行资产录入，资产编号为：" + txtCashNo.Text.Trim(); + o.OperationAccount = AdminInfo.Account + AdminInfo.Name; #endregion OperationlogManager.InsertOperationLog(o); foreach (Control Ctrol in uiGroupBox1.Controls) diff --git a/SYS.FormUI/AppFunction/FrmChangePosition.Designer.cs b/SYS.FormUI/AppFunction/FrmChangePosition.Designer.cs index fe4fb2ccb3f228a74d4344ee7246f11649a3530b..a52ecf863c91f7316a94a8cb577bb7572825c61a 100644 --- a/SYS.FormUI/AppFunction/FrmChangePosition.Designer.cs +++ b/SYS.FormUI/AppFunction/FrmChangePosition.Designer.cs @@ -46,66 +46,66 @@ // label1 // this.label1.AutoSize = true; - this.label1.Font = new System.Drawing.Font("苹方-简", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label1.Location = new System.Drawing.Point(15, 17); + this.label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label1.Location = new System.Drawing.Point(15, 51); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(56, 17); + this.label1.Size = new System.Drawing.Size(55, 15); this.label1.TabIndex = 0; this.label1.Text = "员工编号"; // // label2 // this.label2.AutoSize = true; - this.label2.Font = new System.Drawing.Font("苹方-简", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label2.Location = new System.Drawing.Point(15, 54); + this.label2.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label2.Location = new System.Drawing.Point(15, 95); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(56, 17); + this.label2.Size = new System.Drawing.Size(55, 15); this.label2.TabIndex = 1; this.label2.Text = "员工姓名"; // // label3 // this.label3.AutoSize = true; - this.label3.Font = new System.Drawing.Font("苹方-简", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label3.Location = new System.Drawing.Point(15, 91); + this.label3.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label3.Location = new System.Drawing.Point(15, 132); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(56, 17); + this.label3.Size = new System.Drawing.Size(55, 15); this.label3.TabIndex = 2; this.label3.Text = "原属部门"; // // label4 // this.label4.AutoSize = true; - this.label4.Font = new System.Drawing.Font("苹方-简", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label4.Location = new System.Drawing.Point(15, 128); + this.label4.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label4.Location = new System.Drawing.Point(15, 169); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(56, 17); + this.label4.Size = new System.Drawing.Size(55, 15); this.label4.TabIndex = 3; this.label4.Text = "员工职位"; // // txtworkerId // - this.txtworkerId.Font = new System.Drawing.Font("苹方-简", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.txtworkerId.Location = new System.Drawing.Point(84, 12); + this.txtworkerId.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.txtworkerId.Location = new System.Drawing.Point(84, 51); this.txtworkerId.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.txtworkerId.Name = "txtworkerId"; this.txtworkerId.ReadOnly = true; - this.txtworkerId.Size = new System.Drawing.Size(116, 24); + this.txtworkerId.Size = new System.Drawing.Size(116, 21); this.txtworkerId.TabIndex = 4; // // txtworkerName // - this.txtworkerName.Font = new System.Drawing.Font("苹方-简", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.txtworkerName.Location = new System.Drawing.Point(84, 47); + this.txtworkerName.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.txtworkerName.Location = new System.Drawing.Point(84, 88); this.txtworkerName.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.txtworkerName.Name = "txtworkerName"; - this.txtworkerName.Size = new System.Drawing.Size(116, 24); + this.txtworkerName.Size = new System.Drawing.Size(116, 21); this.txtworkerName.TabIndex = 5; // // cboClub // this.cboClub.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.cboClub.Font = new System.Drawing.Font("苹方-简", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.cboClub.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.cboClub.FormattingEnabled = true; this.cboClub.Items.AddRange(new object[] { "人事部", @@ -114,57 +114,57 @@ "商品部", "后勤部", "经理部"}); - this.cboClub.Location = new System.Drawing.Point(84, 83); + this.cboClub.Location = new System.Drawing.Point(84, 124); this.cboClub.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.cboClub.Name = "cboClub"; - this.cboClub.Size = new System.Drawing.Size(116, 25); + this.cboClub.Size = new System.Drawing.Size(116, 23); this.cboClub.TabIndex = 6; // // cboPosition // this.cboPosition.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.cboPosition.Font = new System.Drawing.Font("苹方-简", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.cboPosition.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.cboPosition.FormattingEnabled = true; this.cboPosition.Items.AddRange(new object[] { "职员", "经理", "总经理"}); - this.cboPosition.Location = new System.Drawing.Point(84, 121); + this.cboPosition.Location = new System.Drawing.Point(84, 162); this.cboPosition.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.cboPosition.Name = "cboPosition"; - this.cboPosition.Size = new System.Drawing.Size(116, 25); + this.cboPosition.Size = new System.Drawing.Size(116, 23); this.cboPosition.TabIndex = 7; // // cboNewPosition // this.cboNewPosition.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.cboNewPosition.Font = new System.Drawing.Font("苹方-简", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.cboNewPosition.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.cboNewPosition.FormattingEnabled = true; this.cboNewPosition.Items.AddRange(new object[] { "职员", "经理", "总经理"}); - this.cboNewPosition.Location = new System.Drawing.Point(279, 122); + this.cboNewPosition.Location = new System.Drawing.Point(279, 163); this.cboNewPosition.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.cboNewPosition.Name = "cboNewPosition"; - this.cboNewPosition.Size = new System.Drawing.Size(116, 25); + this.cboNewPosition.Size = new System.Drawing.Size(116, 23); this.cboNewPosition.TabIndex = 9; this.cboNewPosition.TextChanged += new System.EventHandler(this.cboNewPosition_TextChanged); // // label5 // this.label5.AutoSize = true; - this.label5.Font = new System.Drawing.Font("苹方-简", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label5.Location = new System.Drawing.Point(210, 129); + this.label5.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label5.Location = new System.Drawing.Point(210, 170); this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(56, 17); + this.label5.Size = new System.Drawing.Size(55, 15); this.label5.TabIndex = 8; this.label5.Text = "调任职位"; // // cboNewClub // this.cboNewClub.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.cboNewClub.Font = new System.Drawing.Font("苹方-简", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.cboNewClub.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.cboNewClub.FormattingEnabled = true; this.cboNewClub.Items.AddRange(new object[] { "人事部", @@ -173,27 +173,27 @@ "商品部", "后勤部", "经理部"}); - this.cboNewClub.Location = new System.Drawing.Point(279, 85); + this.cboNewClub.Location = new System.Drawing.Point(279, 126); this.cboNewClub.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.cboNewClub.Name = "cboNewClub"; - this.cboNewClub.Size = new System.Drawing.Size(116, 25); + this.cboNewClub.Size = new System.Drawing.Size(116, 23); this.cboNewClub.TabIndex = 11; this.cboNewClub.TextChanged += new System.EventHandler(this.cboNewClub_TextChanged); // // label6 // this.label6.AutoSize = true; - this.label6.Font = new System.Drawing.Font("苹方-简", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label6.Location = new System.Drawing.Point(210, 92); + this.label6.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label6.Location = new System.Drawing.Point(210, 133); this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(56, 17); + this.label6.Size = new System.Drawing.Size(55, 15); this.label6.TabIndex = 10; this.label6.Text = "调任部门"; // // btnOK // - this.btnOK.Font = new System.Drawing.Font("苹方-简", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnOK.Location = new System.Drawing.Point(419, 107); + this.btnOK.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnOK.Location = new System.Drawing.Point(419, 148); this.btnOK.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.btnOK.Name = "btnOK"; this.btnOK.Size = new System.Drawing.Size(78, 40); @@ -204,9 +204,9 @@ // // FrmChangePosition // - this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F); + this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(513, 159); + this.ClientSize = new System.Drawing.Size(554, 231); this.Controls.Add(this.btnOK); this.Controls.Add(this.cboNewClub); this.Controls.Add(this.label6); @@ -220,13 +220,12 @@ this.Controls.Add(this.label3); this.Controls.Add(this.label2); this.Controls.Add(this.label1); - this.Font = new System.Drawing.Font("苹方-简", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; + this.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.MaximizeBox = false; this.MinimizeBox = false; this.Name = "FrmChangePosition"; - this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; + this.ShowIcon = true; this.Text = "将XXX任命为XXX"; this.Load += new System.EventHandler(this.FrmChangePosition_Load); this.ResumeLayout(false); diff --git a/SYS.FormUI/AppFunction/FrmChangePosition.cs b/SYS.FormUI/AppFunction/FrmChangePosition.cs index ec1011dc29540b87cb85df445454b8cabd2462a6..2a318d1a6535a58ada21d380f4d86fd27f09fbb4 100644 --- a/SYS.FormUI/AppFunction/FrmChangePosition.cs +++ b/SYS.FormUI/AppFunction/FrmChangePosition.cs @@ -3,10 +3,11 @@ using MySql.Data.MySqlClient; using System.Windows.Forms; using SYS.Manager; using SYS.Core; +using Sunny.UI; namespace SYS.FormUI { - public partial class FrmChangePosition : Form + public partial class FrmChangePosition : UIForm { public static string wk_WorkerNo; public static string wk_WorkerPosition; @@ -45,10 +46,10 @@ namespace SYS.FormUI { MessageBox.Show("任命已生效!"); #region 获取添加操作日志所需的信息 - Operation o = new Operation(); + OperationLog o = new OperationLog(); o.OperationTime = DateTime.Parse(DateTime.Now.ToString("yyyy-MM-dd,HH:mm:ss")); - o.Operationlog = AdminInfo.admingroup + AdminInfo.adminType + "于" + DateTime.Now + "将员工：" + txtworkerName.Text + "晋升为" + cboNewClub.Text + cboNewPosition.Text; - o.OperationAccount = AdminInfo.admingroup + AdminInfo.adminType; + o.Operationlog = AdminInfo.Account + AdminInfo.Name + "于" + DateTime.Now + "将员工：" + txtworkerName.Text + "晋升为" + cboNewClub.Text + cboNewPosition.Text; + o.OperationAccount = AdminInfo.Account + AdminInfo.Name; #endregion OperationlogManager.InsertOperationLog(o); } diff --git a/SYS.FormUI/AppFunction/FrmChangeRoom.cs b/SYS.FormUI/AppFunction/FrmChangeRoom.cs index 74fe127a79685112d69e20515bfe3a36d678a0b6..300b59b9bc2add04f5ef57d1bb31c80539f8a3fc 100644 --- a/SYS.FormUI/AppFunction/FrmChangeRoom.cs +++ b/SYS.FormUI/AppFunction/FrmChangeRoom.cs @@ -19,8 +19,8 @@ namespace SYS.FormUI { string rno = cboRoomList.Text; cboRoomList.DataSource = RoomManager.SelectCanUseRoomAll(); - cboRoomList.ValueMember = "RoomNo"; - cboRoomList.DisplayMember = "RoomName"; + cboRoomList.ValueMember = "typeName"; + cboRoomList.DisplayMember = "RoomNo"; } @@ -41,10 +41,6 @@ namespace SYS.FormUI CheckTime = DateTime.Now }; - int result1 = RoomManager.UpdateRoomInfo(checkInRoom); - int result2 = RoomManager.UpdateRoomByRoomNo(rno); - - if (rno.Contains("BD")) { sum = Convert.ToDouble(Convert.ToInt32(RoomManager.DayByRoomNo(rno).ToString()) * 300); @@ -73,7 +69,7 @@ namespace SYS.FormUI Spend s = new Spend() { RoomNo = cboRoomList.Text, - SpendName = "居住" + rno + Convert.ToInt32(RoomManager.DayByRoomNo(rno).ToString()) + "天", + SpendName = "居住" + rno + "共" + Convert.ToInt32(RoomManager.DayByRoomNo(rno).ToString()) + "天", SpendAmount = Convert.ToInt32(RoomManager.DayByRoomNo(rno).ToString()), CustoNo = ucRoomList.CustoNo, SpendPrice = Convert.ToDecimal(sum), @@ -81,18 +77,24 @@ namespace SYS.FormUI SpendTime = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")), MoneyState = "未结算", }; + + int result1 = RoomManager.UpdateRoomInfo(checkInRoom); + int result2 = RoomManager.UpdateRoomByRoomNo(rno); + int result3 = SpendManager.UpdateSpendInfoByRoomNo(rno, nrno, ucRoomList.CustoNo); + if (result1 > 0 && result2 > 0) { MessageBox.Show("转房成功"); int m = SpendManager.InsertSpendInfo(s); FrmRoomManager.Reload(); #region 获取添加操作日志所需的信息 - Operation o = new Operation(); + OperationLog o = new OperationLog(); o.OperationTime = DateTime.Parse(DateTime.Now.ToString("yyyy-MM-dd,HH:mm:ss")); o.Operationlog = ucRoomList.CustoNo + "于" + DateTime.Now + "进行了换房，请记得到后台修改消费价格！"; o.OperationAccount = lbu; #endregion OperationlogManager.InsertOperationLog(o); + scope.Complete(); this.Close(); } else diff --git a/SYS.FormUI/AppFunction/FrmChangeWorker.cs b/SYS.FormUI/AppFunction/FrmChangeWorker.cs index f2cea6f69ac9812e3a363054ee8b4d7a80da2ce8..f5482c03ddee20f526ffabd2ee85768b6f24194b 100644 --- a/SYS.FormUI/AppFunction/FrmChangeWorker.cs +++ b/SYS.FormUI/AppFunction/FrmChangeWorker.cs @@ -28,7 +28,7 @@ namespace SYS.FormUI private void FrmChangeWorker_Load(object sender, EventArgs e) { - if(AdminInfo.adminType != "总经理") + if(AdminInfo.Type != "总经理") { btnUpWorker.Enabled = false; btnUpWorker.Text = "权限不足"; @@ -38,20 +38,20 @@ namespace SYS.FormUI btnGoodBad.Text = "权限不足"; } - wk_WorkerNo = FrmTopChange.wk_WorkerNo; - wk_WorkerName = FrmTopChange.wk_WorkerName; - wk_WorkerBirthday = FrmTopChange.wk_WorkerBirthday; - wk_WorkerSex = FrmTopChange.wk_WorkerSex; - wk_WorkerTel = FrmTopChange.wk_WorkerTel; - wk_WorkerClub = FrmTopChange.wk_WorkerClub; - wk_WorkerAddress = FrmTopChange.wk_WorkerAddress; - wk_WorkerPosition = FrmTopChange.wk_WorkerPosition; - wk_WorkerID = FrmTopChange.wk_WorkerID; - wk_WorkerPwd = FrmTopChange.wk_WorkerPwd; - wk_WorkerTime = FrmTopChange.wk_WorkerTime; - wk_WorkerFace = FrmTopChange.wk_WorkerFace; - wk_WorkerEducation = FrmTopChange.wk_WorkerEducation; - lblWorker.Text = FrmTopChange.wk_WorkerClub + FrmTopChange.wk_WorkerPosition + "：" + FrmTopChange.wk_WorkerName + "的操作界面"; + wk_WorkerNo = FrmWorkerManager.wk_WorkerNo; + wk_WorkerName = FrmWorkerManager.wk_WorkerName; + wk_WorkerBirthday = FrmWorkerManager.wk_WorkerBirthday; + wk_WorkerSex = FrmWorkerManager.wk_WorkerSex; + wk_WorkerTel = FrmWorkerManager.wk_WorkerTel; + wk_WorkerClub = FrmWorkerManager.wk_WorkerClub; + wk_WorkerAddress = FrmWorkerManager.wk_WorkerAddress; + wk_WorkerPosition = FrmWorkerManager.wk_WorkerPosition; + wk_WorkerID = FrmWorkerManager.wk_WorkerID; + wk_WorkerPwd = FrmWorkerManager.wk_WorkerPwd; + wk_WorkerTime = FrmWorkerManager.wk_WorkerTime; + wk_WorkerFace = FrmWorkerManager.wk_WorkerFace; + wk_WorkerEducation = FrmWorkerManager.wk_WorkerEducation; + lblWorker.Text = FrmWorkerManager.wk_WorkerClub + FrmWorkerManager.wk_WorkerPosition + "：" + FrmWorkerManager.wk_WorkerName + "的操作界面"; if (wk_WorkerClub == "餐饮部") { this.BackgroundImage = Resources.餐饮部界面; diff --git a/SYS.FormUI/AppFunction/FrmCheckIn.cs b/SYS.FormUI/AppFunction/FrmCheckIn.cs index 56c5230e7bec4b502826cf9f97ef50cb2c5ab455..a14d4971fc574ec061e34675ed889ff9e65244f6 100644 --- a/SYS.FormUI/AppFunction/FrmCheckIn.cs +++ b/SYS.FormUI/AppFunction/FrmCheckIn.cs @@ -4,6 +4,8 @@ using System.Windows.Forms; using SYS.Manager; using SYS.Core; using Sunny.UI; +using SYS.Application; +using System.Transactions; namespace SYS.FormUI { @@ -19,15 +21,14 @@ namespace SYS.FormUI { txtRoomNo.Text = ucRoomList.rm_RoomNo; - Room r = RoomManager.SelectRoomByRoomNo(txtRoomNo.Text); - RoomType t = RoomTypeManager.SelectRoomTypeByRoomNo(txtRoomNo.Text); + Room r = new RoomService().SelectRoomByRoomNo(txtRoomNo.Text); + RoomType t = new RoomTypeService().SelectRoomTypeByRoomNo(txtRoomNo.Text); txtType.Text = t.RoomName; txtMoney.Text = r.RoomMoney.ToString(); txtRoomPosition.Text = r.RoomPosition; txtState.Text = r.RoomState; - txtState.Text = RoomManager.SelectRoomStateNameByRoomNo(txtRoomNo.Text).ToString(); - List ctos = CustoManager.SelectCanUseCustoAll(); - List roms = RoomManager.SelectCanUseRoomAll(); + List ctos = new CustoService().SelectCustoAll(); + List roms = new RoomService().SelectCanUseRoomAll(); for (int i = 0; i < roms.Count; i++) { txtRoomNo.AutoCompleteCustomSource.Add(roms[i].RoomNo); @@ -48,29 +49,7 @@ namespace SYS.FormUI } #endregion - #region 房间编号输入框的值发生改变时的事件方法 - private void txtRoomNo_TextChanged(object sender, EventArgs e) - { - try - { - Room r = RoomManager.SelectRoomByRoomNo(txtRoomNo.Text); - RoomType t = RoomTypeManager.SelectRoomTypeByRoomNo(txtRoomNo.Text); - txtType.Text = t.RoomName; - txtMoney.Text = r.RoomMoney.ToString(); - txtRoomPosition.Text = r.RoomPosition; - txtState.Text = r.RoomState; - txtState.Text = RoomManager.SelectRoomStateNameByRoomNo(txtRoomNo.Text).ToString(); - } - catch - { - txtType.Text = ""; - txtMoney.Text = ""; - txtRoomPosition.Text = ""; - txtState.Text = ""; - txtState.Text = ""; - } - } - #endregion + #region 关闭窗口 private void btnClose_Click(object sender, EventArgs e) @@ -101,32 +80,42 @@ namespace SYS.FormUI { if (CheckInupt()) { - if (CustoManager.SelectCustoByCustoNo(txtCustoNo.Text) != null) + if (new CustoService().SelectCardInfoByCustoNo(txtCustoNo.Text) != null) { - Room r = new Room(); - r.CheckTime = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")); - r.CustoNo = txtCustoNo.Text; - r.RoomStateId = 1; - r.RoomNo = txtRoomNo.Text; - - int n = RoomManager.UpdateRoomInfo(r); - if (n > 0) - { - MessageBox.Show("登记入住成功！", "登记提示"); - txtCustoNo.Text = ""; - FrmRoomManager.Reload(); - this.Close(); - #region 获取添加操作日志所需的信息 - Operation o = new Operation(); - o.OperationTime = DateTime.Parse(DateTime.Now.ToString("yyyy-MM-dd,HH:mm:ss")); - o.Operationlog = LoginInfo.WorkerClub + LoginInfo.WorkerPosition + LoginInfo.WorkerName + "于" + DateTime.Now + "帮助" + r.CustoNo + "进行了入住操作！"; - o.OperationAccount = LoginInfo.WorkerClub + LoginInfo.WorkerPosition + LoginInfo.WorkerName; - #endregion - OperationlogManager.InsertOperationLog(o); - } - else + using (TransactionScope scope = new TransactionScope()) { - MessageBox.Show("登记入住失败！", "登记提示"); + Room r = new Room() + { + CheckTime = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")), + CustoNo = txtCustoNo.Text, + RoomStateId = 1, + RoomNo = txtRoomNo.Text, + datachg_usr = LoginInfo.WorkerNo, + datachg_date = DateTime.Now, + }; + + bool n = new RoomService().UpdateRoomInfo(r); + if (n == true) + { + MessageBox.Show("登记入住成功！", "登记提示"); + txtCustoNo.Text = ""; + FrmRoomManager.Reload(); + #region 获取添加操作日志所需的信息 + OperationLog o = new OperationLog(); + o.OperationTime = DateTime.Parse(DateTime.Now.ToString("yyyy-MM-dd,HH:mm:ss")); + o.Operationlog = LoginInfo.WorkerClub + LoginInfo.WorkerPosition + LoginInfo.WorkerName + "于" + DateTime.Now + "帮助" + r.CustoNo + "进行了入住操作！"; + o.OperationAccount = LoginInfo.WorkerClub + LoginInfo.WorkerPosition + LoginInfo.WorkerName; + o.datains_usr = LoginInfo.WorkerNo; + o.datains_date = DateTime.Now; + #endregion + new OperationlogService().InsertOperationLog(o); + scope.Complete(); + this.Close(); + } + else + { + MessageBox.Show("登记入住失败！", "登记提示"); + } } } else @@ -148,10 +137,10 @@ namespace SYS.FormUI { try { - Custo c = CustoManager.SelectCustoByCustoNo(txtCustoNo.Text); + Custo c = new CustoService().SelectCardInfoByCustoNo(txtCustoNo.Text); txtCustoName.Text = c.CustoName; txtCustoTel.Text = c.CustoTel; - txtCustoType.Text = CustoTypeManager.SelectTypeNameByCustoTypeId(c.CustoType); + txtCustoType.Text = c.typeName; } catch { diff --git a/SYS.FormUI/AppFunction/FrmCashList.Designer.cs b/SYS.FormUI/AppFunction/FrmCheckList.Designer.cs similarity index 99% rename from SYS.FormUI/AppFunction/FrmCashList.Designer.cs rename to SYS.FormUI/AppFunction/FrmCheckList.Designer.cs index 1b9a3f8b9bb790514fb8e625011ce8eadda4ea7d..b9c0baae6f10330a9d5b15aa766be26fbfa99142 100644 --- a/SYS.FormUI/AppFunction/FrmCashList.Designer.cs +++ b/SYS.FormUI/AppFunction/FrmCheckList.Designer.cs @@ -1,6 +1,6 @@ namespace SYS.FormUI { - partial class FrmCashList + partial class FrmCheckList { /// /// Required designer variable. diff --git a/SYS.FormUI/AppFunction/FrmCashList.cs b/SYS.FormUI/AppFunction/FrmCheckList.cs similarity index 97% rename from SYS.FormUI/AppFunction/FrmCashList.cs rename to SYS.FormUI/AppFunction/FrmCheckList.cs index e530b630d4c4daf190d53875a25cfaed43515ab5..565f6ef3c1d04957f24e7080ecded0f6402c9852 100644 --- a/SYS.FormUI/AppFunction/FrmCashList.cs +++ b/SYS.FormUI/AppFunction/FrmCheckList.cs @@ -4,9 +4,9 @@ using SYS.Manager; namespace SYS.FormUI { - public partial class FrmCashList : Form + public partial class FrmCheckList : Form { - public FrmCashList() + public FrmCheckList() { InitializeComponent(); } diff --git a/SYS.FormUI/AppFunction/FrmCashList.resx b/SYS.FormUI/AppFunction/FrmCheckList.resx similarity index 100% rename from SYS.FormUI/AppFunction/FrmCashList.resx rename to SYS.FormUI/AppFunction/FrmCheckList.resx diff --git a/SYS.FormUI/AppFunction/FrmCheckOutForm.cs b/SYS.FormUI/AppFunction/FrmCheckOutForm.cs index d80e0171eb903afcfd9c1498b07e7d85fbbf428c..0ebe5f62dac93893f6bbcd66a3671ac664c5d255 100644 --- a/SYS.FormUI/AppFunction/FrmCheckOutForm.cs +++ b/SYS.FormUI/AppFunction/FrmCheckOutForm.cs @@ -6,6 +6,7 @@ using SYS.Core; using SYS.FormUI.Properties; using System.Collections.Generic; using Sunny.UI; +using SYS.Application; namespace SYS.FormUI { @@ -84,7 +85,7 @@ namespace SYS.FormUI #endregion #region 加载性别信息 - List listSexType = new BaseManager().SelectSexTypeAll(); + List listSexType = new BaseService().SelectSexTypeAll(); this.cboCustoSex.DataSource = listSexType; this.cboCustoSex.DisplayMember = "sexName"; this.cboCustoSex.ValueMember = "sexId"; @@ -108,27 +109,27 @@ namespace SYS.FormUI } if (rs == "BD") { - sum = Convert.ToDouble(Convert.ToString(Convert.ToInt32(RoomManager.DayByRoomNo(txtRoomNo.Text).ToString()) * 300)); + sum = Convert.ToDouble(Convert.ToString(Convert.ToInt32(new RoomService().DayByRoomNo(txtRoomNo.Text).ToString()) * 300)); } if (rs == "BS") { - sum = Convert.ToDouble(Convert.ToString(Convert.ToInt32(RoomManager.DayByRoomNo(txtRoomNo.Text).ToString()) * 425)); + sum = Convert.ToDouble(Convert.ToString(Convert.ToInt32(new RoomService().DayByRoomNo(txtRoomNo.Text).ToString()) * 425)); } if (rs == "HD") { - sum = Convert.ToDouble(Convert.ToString(Convert.ToInt32(RoomManager.DayByRoomNo(txtRoomNo.Text).ToString()) * 625)); + sum = Convert.ToDouble(Convert.ToString(Convert.ToInt32(new RoomService().DayByRoomNo(txtRoomNo.Text).ToString()) * 625)); } if (rs == "HS") { - sum = Convert.ToDouble(Convert.ToString(Convert.ToInt32(RoomManager.DayByRoomNo(txtRoomNo.Text).ToString()) * 660)); + sum = Convert.ToDouble(Convert.ToString(Convert.ToInt32(new RoomService().DayByRoomNo(txtRoomNo.Text).ToString()) * 660)); } if (rs == "QL") { - sum = Convert.ToDouble(Convert.ToString(Convert.ToInt32(RoomManager.DayByRoomNo(txtRoomNo.Text).ToString()) * 845)); + sum = Convert.ToDouble(Convert.ToString(Convert.ToInt32(new RoomService().DayByRoomNo(txtRoomNo.Text).ToString()) * 845)); } if (rs == "ZT") { - sum = Convert.ToDouble(Convert.ToString(Convert.ToInt32(RoomManager.DayByRoomNo(txtRoomNo.Text).ToString()) * 1080)); + sum = Convert.ToDouble(Convert.ToString(Convert.ToInt32(new RoomService().DayByRoomNo(txtRoomNo.Text).ToString()) * 1080)); } lblDay.Text = Convert.ToString(Convert.ToInt32(RoomManager.DayByRoomNo(txtRoomNo.Text).ToString())); w = new Wti() @@ -288,9 +289,9 @@ namespace SYS.FormUI } MessageBox.Show("结算成功！", "系统提示"); FrmRoomManager.Reload(); - + #region 获取添加操作日志所需的信息 - Operation o = new Operation(); + OperationLog o = new OperationLog(); o.OperationTime = DateTime.Parse(DateTime.Now.ToString("yyyy-MM-dd,HH:mm:ss")); o.Operationlog = LoginInfo.WorkerClub + LoginInfo.WorkerPosition + LoginInfo.WorkerName + "于" + DateTime.Now + "帮助" + txtCustoNo.Text + "进行了退房结算操作！"; o.OperationAccount = LoginInfo.WorkerClub + LoginInfo.WorkerPosition + LoginInfo.WorkerName; @@ -314,7 +315,7 @@ namespace SYS.FormUI MessageBox.Show("结算成功！", "系统提示"); FrmRoomManager.Reload(); #region 获取添加操作日志所需的信息 - Operation o = new Operation(); + OperationLog o = new OperationLog(); o.OperationTime = DateTime.Parse(DateTime.Now.ToString("yyyy-MM-dd,HH:mm:ss")); o.Operationlog = LoginInfo.WorkerClub + LoginInfo.WorkerPosition + LoginInfo.WorkerName + "于" + DateTime.Now + "帮助" + txtCustoNo.Text + "进行了退房结算操作！"; o.OperationAccount = LoginInfo.WorkerClub + LoginInfo.WorkerPosition + LoginInfo.WorkerName; diff --git a/SYS.FormUI/AppFunction/FrmCustoManager.cs b/SYS.FormUI/AppFunction/FrmCustoManager.cs index 5b97c7f9c3cab5989cf8f50e97b13b8508047c01..1389bb9f0daae95620060789a14d96d5662c419d 100644 --- a/SYS.FormUI/AppFunction/FrmCustoManager.cs +++ b/SYS.FormUI/AppFunction/FrmCustoManager.cs @@ -114,7 +114,7 @@ namespace SYS.FormUI worksheet.Columns.EntireColumn.AutoFit();//列宽自适应 MessageBox.Show(fileName + "信息导出成功", "来自T仔提示", MessageBoxButtons.OK); #region 获取添加操作日志所需的信息 - Operation o = new Operation(); + OperationLog o = new OperationLog(); o.OperationTime = DateTime.Parse(DateTime.Now.ToString("yyyy-MM-dd,HH:mm:ss")); o.Operationlog = LoginInfo.WorkerClub + LoginInfo.WorkerName + LoginInfo.WorkerPosition + LoginInfo.WorkerName + "于" + DateTime.Now + "导出了" + "后台用户信息!"; o.OperationAccount = LoginInfo.WorkerClub + LoginInfo.WorkerName + LoginInfo.WorkerPosition; diff --git a/SYS.FormUI/AppFunction/FrmCustomerManager.Designer.cs b/SYS.FormUI/AppFunction/FrmCustomerManager.Designer.cs index 9bb99f561d53806a8365a6b9ee6e04828d06c902..ad435ba52079b576c1cbefed5973e1e6877bd78b 100644 --- a/SYS.FormUI/AppFunction/FrmCustomerManager.Designer.cs +++ b/SYS.FormUI/AppFunction/FrmCustomerManager.Designer.cs @@ -33,10 +33,12 @@ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); this.gbCustoInfo = new System.Windows.Forms.GroupBox(); - this.txtCardID = new Sunny.UI.UITextBox(); + this.txtCustoNo = new Sunny.UI.UITextBox(); this.label2 = new System.Windows.Forms.Label(); this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); this.dgvCustomerList = new Sunny.UI.UIDataGridView(); + this.btnSerach = new Sunny.UI.UIButton(); + this.btnAddCusto = new Sunny.UI.UIButton(); this.CustoNo = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.CustoName = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.CustoSex = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -49,15 +51,18 @@ this.Column2 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column3 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column4 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.btnSerach = new Sunny.UI.UIButton(); - this.btnAddCusto = new Sunny.UI.UIButton(); + this.Column5 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column6 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column7 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column8 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column9 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.gbCustoInfo.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dgvCustomerList)).BeginInit(); this.SuspendLayout(); // // gbCustoInfo // - this.gbCustoInfo.Controls.Add(this.txtCardID); + this.gbCustoInfo.Controls.Add(this.txtCustoNo); this.gbCustoInfo.Controls.Add(this.label2); this.gbCustoInfo.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.gbCustoInfo.Location = new System.Drawing.Point(46, 420); @@ -67,21 +72,21 @@ this.gbCustoInfo.TabStop = false; this.gbCustoInfo.Text = "条件搜索栏"; // - // txtCardID - // - this.txtCardID.Cursor = System.Windows.Forms.Cursors.IBeam; - this.txtCardID.FillColor = System.Drawing.Color.White; - this.txtCardID.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.txtCardID.Location = new System.Drawing.Point(327, 16); - this.txtCardID.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.txtCardID.Maximum = 2147483647D; - this.txtCardID.Minimum = -2147483648D; - this.txtCardID.MinimumSize = new System.Drawing.Size(1, 1); - this.txtCardID.Name = "txtCardID"; - this.txtCardID.Padding = new System.Windows.Forms.Padding(5); - this.txtCardID.Radius = 20; - this.txtCardID.Size = new System.Drawing.Size(204, 33); - this.txtCardID.TabIndex = 88; + // txtCustoNo + // + this.txtCustoNo.Cursor = System.Windows.Forms.Cursors.IBeam; + this.txtCustoNo.FillColor = System.Drawing.Color.White; + this.txtCustoNo.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.txtCustoNo.Location = new System.Drawing.Point(327, 16); + this.txtCustoNo.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.txtCustoNo.Maximum = 2147483647D; + this.txtCustoNo.Minimum = -2147483648D; + this.txtCustoNo.MinimumSize = new System.Drawing.Size(1, 1); + this.txtCustoNo.Name = "txtCustoNo"; + this.txtCustoNo.Padding = new System.Windows.Forms.Padding(5); + this.txtCustoNo.Radius = 20; + this.txtCustoNo.Size = new System.Drawing.Size(204, 33); + this.txtCustoNo.TabIndex = 88; // // label2 // @@ -91,7 +96,7 @@ this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(88, 25); this.label2.TabIndex = 87; - this.label2.Text = "证件号码"; + this.label2.Text = "客户编号"; // // toolTip1 // @@ -133,7 +138,12 @@ this.Column1, this.Column2, this.Column3, - this.Column4}); + this.Column4, + this.Column5, + this.Column6, + this.Column7, + this.Column8, + this.Column9}); this.dgvCustomerList.EnableHeadersVisualStyles = false; this.dgvCustomerList.Font = new System.Drawing.Font("微软雅黑", 12F); this.dgvCustomerList.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255))))); @@ -151,6 +161,32 @@ this.dgvCustomerList.Style = Sunny.UI.UIStyle.Custom; this.dgvCustomerList.TabIndex = 83; // + // btnSerach + // + this.btnSerach.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnSerach.Font = new System.Drawing.Font("微软雅黑", 12F); + this.btnSerach.Location = new System.Drawing.Point(815, 426); + this.btnSerach.MinimumSize = new System.Drawing.Size(1, 1); + this.btnSerach.Name = "btnSerach"; + this.btnSerach.Radius = 30; + this.btnSerach.Size = new System.Drawing.Size(103, 49); + this.btnSerach.TabIndex = 84; + this.btnSerach.Text = "搜 索"; + this.btnSerach.Click += new System.EventHandler(this.btnSerach_BtnClick); + // + // btnAddCusto + // + this.btnAddCusto.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnAddCusto.Font = new System.Drawing.Font("微软雅黑", 12F); + this.btnAddCusto.Location = new System.Drawing.Point(924, 426); + this.btnAddCusto.MinimumSize = new System.Drawing.Size(1, 1); + this.btnAddCusto.Name = "btnAddCusto"; + this.btnAddCusto.Radius = 30; + this.btnAddCusto.Size = new System.Drawing.Size(103, 49); + this.btnAddCusto.TabIndex = 85; + this.btnAddCusto.Text = "添加客户"; + this.btnAddCusto.Click += new System.EventHandler(this.btnAddCusto_BtnClick); + // // CustoNo // this.CustoNo.DataPropertyName = "CustoNo"; @@ -239,31 +275,45 @@ this.Column4.ReadOnly = true; this.Column4.Visible = false; // - // btnSerach + // Column5 // - this.btnSerach.Cursor = System.Windows.Forms.Cursors.Hand; - this.btnSerach.Font = new System.Drawing.Font("微软雅黑", 12F); - this.btnSerach.Location = new System.Drawing.Point(815, 426); - this.btnSerach.MinimumSize = new System.Drawing.Size(1, 1); - this.btnSerach.Name = "btnSerach"; - this.btnSerach.Radius = 30; - this.btnSerach.Size = new System.Drawing.Size(103, 49); - this.btnSerach.TabIndex = 84; - this.btnSerach.Text = "搜 索"; - this.btnSerach.Click += new System.EventHandler(this.btnSerach_BtnClick); + this.Column5.DataPropertyName = "delete_mk"; + this.Column5.HeaderText = "Column5"; + this.Column5.Name = "Column5"; + this.Column5.ReadOnly = true; + this.Column5.Visible = false; // - // btnAddCusto + // Column6 // - this.btnAddCusto.Cursor = System.Windows.Forms.Cursors.Hand; - this.btnAddCusto.Font = new System.Drawing.Font("微软雅黑", 12F); - this.btnAddCusto.Location = new System.Drawing.Point(924, 426); - this.btnAddCusto.MinimumSize = new System.Drawing.Size(1, 1); - this.btnAddCusto.Name = "btnAddCusto"; - this.btnAddCusto.Radius = 30; - this.btnAddCusto.Size = new System.Drawing.Size(103, 49); - this.btnAddCusto.TabIndex = 85; - this.btnAddCusto.Text = "添加客户"; - this.btnAddCusto.Click += new System.EventHandler(this.btnAddCusto_BtnClick); + this.Column6.DataPropertyName = "datains_usr"; + this.Column6.HeaderText = "Column6"; + this.Column6.Name = "Column6"; + this.Column6.ReadOnly = true; + this.Column6.Visible = false; + // + // Column7 + // + this.Column7.DataPropertyName = "datains_date"; + this.Column7.HeaderText = "Column7"; + this.Column7.Name = "Column7"; + this.Column7.ReadOnly = true; + this.Column7.Visible = false; + // + // Column8 + // + this.Column8.DataPropertyName = "datachg_usr"; + this.Column8.HeaderText = "Column8"; + this.Column8.Name = "Column8"; + this.Column8.ReadOnly = true; + this.Column8.Visible = false; + // + // Column9 + // + this.Column9.DataPropertyName = "datachg_date"; + this.Column9.HeaderText = "Column9"; + this.Column9.Name = "Column9"; + this.Column9.ReadOnly = true; + this.Column9.Visible = false; // // FrmCustomerManager // @@ -292,6 +342,9 @@ private System.Windows.Forms.ToolTip toolTip1; private System.Windows.Forms.Label label2; private Sunny.UI.UIDataGridView dgvCustomerList; + private Sunny.UI.UIButton btnSerach; + private Sunny.UI.UITextBox txtCustoNo; + private Sunny.UI.UIButton btnAddCusto; private System.Windows.Forms.DataGridViewTextBoxColumn CustoNo; private System.Windows.Forms.DataGridViewTextBoxColumn CustoName; private System.Windows.Forms.DataGridViewTextBoxColumn CustoSex; @@ -304,8 +357,10 @@ private System.Windows.Forms.DataGridViewTextBoxColumn Column2; private System.Windows.Forms.DataGridViewTextBoxColumn Column3; private System.Windows.Forms.DataGridViewTextBoxColumn Column4; - private Sunny.UI.UIButton btnSerach; - private Sunny.UI.UITextBox txtCardID; - private Sunny.UI.UIButton btnAddCusto; + private System.Windows.Forms.DataGridViewTextBoxColumn Column5; + private System.Windows.Forms.DataGridViewTextBoxColumn Column6; + private System.Windows.Forms.DataGridViewTextBoxColumn Column7; + private System.Windows.Forms.DataGridViewTextBoxColumn Column8; + private System.Windows.Forms.DataGridViewTextBoxColumn Column9; } } \ No newline at end of file diff --git a/SYS.FormUI/AppFunction/FrmCustomerManager.cs b/SYS.FormUI/AppFunction/FrmCustomerManager.cs index d26205a2e3841e19be2adcb1a204d56a69dcb172..db602ee478b1ddc6e5d1fea5782d39747f3c5de5 100644 --- a/SYS.FormUI/AppFunction/FrmCustomerManager.cs +++ b/SYS.FormUI/AppFunction/FrmCustomerManager.cs @@ -213,7 +213,7 @@ namespace SYS.FormUI worksheet.Columns.EntireColumn.AutoFit();//列宽自适应 MessageBox.Show(fileName + "信息导出成功", "来自T仔提示", MessageBoxButtons.OK); #region 获取添加操作日志所需的信息 - Operation o = new Operation(); + OperationLog o = new OperationLog(); o.OperationTime = DateTime.Parse(DateTime.Now.ToString("yyyy-MM-dd,HH:mm:ss")); o.Operationlog = LoginInfo.WorkerClub + LoginInfo.WorkerName + LoginInfo.WorkerPosition + LoginInfo.WorkerName + "于" + DateTime.Now + "导出了" + "用户信息!"; o.OperationAccount = LoginInfo.WorkerClub + LoginInfo.WorkerName + LoginInfo.WorkerPosition; @@ -360,13 +360,13 @@ namespace SYS.FormUI private void btnSerach_BtnClick(object sender, EventArgs e) { - if (txtCardID.Text != "") + if (txtCustoNo.Text != "") { - dgvCustomerList.DataSource = CustoManager.SelectCustoInfoByCardId(txtCardID.Text); + dgvCustomerList.DataSource = CustoManager.SelectCustoInfoByCardId(txtCustoNo.Text); } else { - MessageBox.Show("请输入证件号码！"); + MessageBox.Show("请输入客户编号！"); } } diff --git a/SYS.FormUI/AppFunction/FrmCustomerManager.resx b/SYS.FormUI/AppFunction/FrmCustomerManager.resx index 237dea14e4bba2caffe90ead7c684fa467a2fa38..03dcc7e485272e2b4af240d004364ea2f0ac9183 100644 --- a/SYS.FormUI/AppFunction/FrmCustomerManager.resx +++ b/SYS.FormUI/AppFunction/FrmCustomerManager.resx @@ -156,4 +156,19 @@ True + + True + + + True + + + True + + + True + + + True + \ No newline at end of file diff --git a/SYS.FormUI/AppFunction/FrmDepartment.Designer.cs b/SYS.FormUI/AppFunction/FrmDepartment.Designer.cs index a5268b4cc87f8fdea646932690825fa08f3e749c..0aa6eef8e8fdbfd3be02eed97d5ff28086cb3413 100644 --- a/SYS.FormUI/AppFunction/FrmDepartment.Designer.cs +++ b/SYS.FormUI/AppFunction/FrmDepartment.Designer.cs @@ -30,13 +30,25 @@ namespace SYS.FormUI private void InitializeComponent() { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmDepartment)); + this.flpInformation = new System.Windows.Forms.FlowLayoutPanel(); this.SuspendLayout(); // + // flpInformation + // + this.flpInformation.AutoScroll = true; + this.flpInformation.BackColor = System.Drawing.Color.Transparent; + this.flpInformation.Location = new System.Drawing.Point(441, 37); + this.flpInformation.Margin = new System.Windows.Forms.Padding(2); + this.flpInformation.Name = "flpInformation"; + this.flpInformation.Size = new System.Drawing.Size(562, 582); + this.flpInformation.TabIndex = 73; + // // FrmDepartment // this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 21F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(1005, 623); + this.Controls.Add(this.flpInformation); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.MaximizeBox = false; this.MinimizeBox = false; @@ -49,5 +61,7 @@ namespace SYS.FormUI } #endregion + + private System.Windows.Forms.FlowLayoutPanel flpInformation; } } \ No newline at end of file diff --git a/SYS.FormUI/AppFunction/FrmDepartment.cs b/SYS.FormUI/AppFunction/FrmDepartment.cs index 7e0c78ec81cc628f6fb38b717d8d19e3d0aadb45..ad21a11a491a53166e3b5f6b98518eaa0b739c63 100644 --- a/SYS.FormUI/AppFunction/FrmDepartment.cs +++ b/SYS.FormUI/AppFunction/FrmDepartment.cs @@ -1,4 +1,5 @@ using Sunny.UI; +using SYS.Manager; using System; using System.Collections.Generic; using System.ComponentModel; @@ -20,7 +21,16 @@ namespace SYS.FormUI private void FrmDepartment_Load(object sender, EventArgs e) { + //var list = new BaseManager().SelectDeptAll(); + + } + + + } + + + } diff --git a/SYS.FormUI/AppFunction/FrmGoodOrBad.cs b/SYS.FormUI/AppFunction/FrmGoodOrBad.cs index 832b4a065c640da2cc586a4f7584cc8eb720158f..e561ab967a22eb7ed3a1a5e8dee98b73093d1263 100644 --- a/SYS.FormUI/AppFunction/FrmGoodOrBad.cs +++ b/SYS.FormUI/AppFunction/FrmGoodOrBad.cs @@ -51,9 +51,9 @@ namespace SYS.FormUI private void FrmGoodOrBad_Load(object sender, EventArgs e) { CmpSetDgv(); - lblWorkerNo.Text = FrmTopChange.wk_WorkerNo; - lblName.Text = FrmTopChange.wk_WorkerName; - lblDate.Text = FrmTopChange.wk_WorkerTime.Substring(0,9); + lblWorkerNo.Text = FrmWorkerManager.wk_WorkerNo; + lblName.Text = FrmWorkerManager.wk_WorkerName; + lblDate.Text = FrmWorkerManager.wk_WorkerTime.Substring(0,9); DgvGoodBadList.AutoGenerateColumns = false; DgvGoodBadList.DataSource = WorkerGoodBadManager.SelectAllGoodBadByWorkNo(lblWorkerNo.Text); CboType.SelectedIndex = 0; @@ -70,17 +70,17 @@ namespace SYS.FormUI goodBad.WorkNo = lblWorkerNo.Text; goodBad.GBType = CboType.SelectedIndex; goodBad.GBInfo = RtbGBInfo.Text; - goodBad.GBOperation = AdminInfo.admingroup; + goodBad.GBOperation = AdminInfo.Account; goodBad.GBTime = DtpDate.Value; int n = WorkerGoodBadManager.AddGoodBad(goodBad); if (n > 0) { MessageBox.Show("新增成功！"); #region 获取添加操作日志所需的信息 - Operation o = new Operation(); + OperationLog o = new OperationLog(); o.OperationTime = DateTime.Parse(DateTime.Now.ToString("yyyy-MM-dd,HH:mm:ss")); - o.Operationlog = AdminInfo.admingroup + AdminInfo.adminType + "于" + DateTime.Now + "对员工：" + lblName.Text + "进行了奖罚情况录入！"; - o.OperationAccount = AdminInfo.admingroup + AdminInfo.adminType; + o.Operationlog = AdminInfo.Account + AdminInfo.Name + "于" + DateTime.Now + "对员工：" + lblName.Text + "进行了奖罚情况录入！"; + o.OperationAccount = AdminInfo.Account + AdminInfo.Name; #endregion OperationlogManager.InsertOperationLog(o); DgvGoodBadList.DataSource = WorkerGoodBadManager.SelectAllGoodBadByWorkNo(lblWorkerNo.Text); diff --git a/SYS.FormUI/AppFunction/FrmInputs.cs b/SYS.FormUI/AppFunction/FrmInputs.cs index 0af668fde97d1ea7439605ede487937c72b91b39..611199af5b30dd3d887f25ecb02d1908d267ae2a 100644 --- a/SYS.FormUI/AppFunction/FrmInputs.cs +++ b/SYS.FormUI/AppFunction/FrmInputs.cs @@ -1,4 +1,5 @@ using MySql.Data.MySqlClient; +using SYS.Application; using SYS.Core; using SYS.Manager; using System; @@ -52,7 +53,7 @@ namespace SYS.FormUI #endregion #region 加载性别信息 - List listSexType = new BaseManager().SelectSexTypeAll(); + List listSexType = new BaseService().SelectSexTypeAll(); this.cbSex.DataSource = listSexType; this.cbSex.DisplayMember = "sexName"; this.cbSex.ValueMember = "sexId"; @@ -95,7 +96,7 @@ namespace SYS.FormUI MessageBox.Show("添加成功"); #region 获取添加操作日志所需的信息 - Operation o = new Operation(); + OperationLog o = new OperationLog(); o.OperationTime = DateTime.Parse(DateTime.Now.ToString("yyyy-MM-dd,HH:mm:ss")); o.Operationlog = "编号："+ LoginInfo.WorkerNo + "【"+FrmMain.wk_WorkerName + "】" + "于" + DateTime.Now + "插入了一条数据！"; o.OperationAccount = LoginInfo.WorkerNo; diff --git a/SYS.FormUI/AppFunction/FrmNation.cs b/SYS.FormUI/AppFunction/FrmNation.cs index 4ef03fd80dcd6ebee5630b7fbf1a07b16c5a5a32..9cc306a160143a53973d47f9a7399d3e1b30360a 100644 --- a/SYS.FormUI/AppFunction/FrmNation.cs +++ b/SYS.FormUI/AppFunction/FrmNation.cs @@ -1,5 +1,7 @@ using Sunny.UI; +using SYS.Application; using SYS.Core; +using SYS.FormUI.Properties; using SYS.Manager; using System; using System.Collections.Generic; @@ -24,11 +26,17 @@ namespace SYS.FormUI public static OperationInfo reload; + public static OperationInfo Accessed; + + public static OperationInfo insert; + public FrmNation() { InitializeComponent(); operation = Visited; reload = ReloadNationList; + Accessed = Access; + insert = Insert; } ucBaseInformation baseInfo = null; @@ -37,17 +45,32 @@ namespace SYS.FormUI private void FrmNation_Load(object sender, EventArgs e) { ReloadNationList(); - + new SYS.Core.CounterHelper().GetNewId("WorkerId"); + } public void ReloadNationList() { flpInformation.Controls.Clear(); - nations = new BaseManager().SelectNationAll(); + baseInfo = new ucBaseInformation(); + baseInfo.BackgroundImage = Resources.添加__增加___加; + baseInfo.lbName.Text = "新增民族类型"; + baseInfo.btnOperation.Text = "新增"; + baseInfo.btnOperation.FillColor = Color.FromArgb(80, 160, 255); + baseInfo.btnOperation.FillHoverColor = Color.FromArgb(80, 180, 255); + flpInformation.Controls.Add(baseInfo); + nations = new BaseService().SelectNationAll(); for (int i = 0; i < nations.Count; i++) { baseInfo = new ucBaseInformation(); baseInfo.lbName.Text = "名称:" + nations[i].nation_name; + if (nations[i].delete_mk == 1) + { + baseInfo.btnOperation.Text = "恢复"; + baseInfo.btnOperation.FillColor = Color.FromArgb(33, 179, 81); + baseInfo.lbName.BackColor = Color.Red; + baseInfo.btnOperation.FillHoverColor = Color.FromArgb(128, 255, 128); + } flpInformation.Controls.Add(baseInfo); } } @@ -58,10 +81,10 @@ namespace SYS.FormUI flpInformation.Height = 582; } - public void Visited() + public void Visited() { //筛选出只与当前民族对应的数据 - Nation nation = nations.FirstOrDefault(a => !a.nation_name.Equals(info)); + Nation nation = nations.FirstOrDefault(a => a.nation_name.Equals(info)); if (nation.nation_name.Equals(info)) { var _nation = new Nation() @@ -73,17 +96,60 @@ namespace SYS.FormUI }; if (_nation != null) { - int n = new BaseManager().DelNation(_nation); - if (n > 0) + bool n = new BaseService().DelNation(_nation); + if (n == true) { UIMessageBox.ShowSuccess("删除成功！"); ReloadNationList(); } } } + } + public void Access() + { + //筛选出只与当前民族对应的数据 + Nation nation = nations.FirstOrDefault(a => a.nation_name.Equals(info)); + if (nation.nation_name.Equals(info)) + { + var _nation = new Nation() + { + nation_no = nation.nation_no, + delete_mk = 0, + datachg_usr = LoginInfo.WorkerNo, + datachg_date = DateTime.Now + }; + if (_nation != null) + { + bool n = new BaseService().DelNation(_nation); + if (n == true) + { + UIMessageBox.ShowSuccess("恢复成功！"); + ReloadNationList(); + } + } + } - + } + public void Insert() + { + var _nation = new Nation() + { + nation_no = new SYS.Core.CounterHelper().GetNewId("NationId").ToString(), + nation_name = info, + delete_mk = 0, + datains_usr = LoginInfo.WorkerNo, + datains_date = DateTime.Now + }; + if (_nation != null) + { + bool n = new BaseService().AddNation(_nation); + if (n == true) + { + UIMessageBox.ShowSuccess("新增成功！"); + ReloadNationList(); + } + } } } diff --git a/SYS.FormUI/AppFunction/FrmNotice.Designer.cs b/SYS.FormUI/AppFunction/FrmNotice.Designer.cs new file mode 100644 index 0000000000000000000000000000000000000000..73dfb2901f799c4d377ade20f5d09b8feeaef8f0 --- /dev/null +++ b/SYS.FormUI/AppFunction/FrmNotice.Designer.cs @@ -0,0 +1,117 @@ + +namespace SYS.FormUI +{ + partial class FrmNotice + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); + this.dgvNoticeList = new System.Windows.Forms.DataGridView(); + this.clNoticeNo = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.clNoticetheme = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.clNoticeContent = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.label5 = new System.Windows.Forms.Label(); + ((System.ComponentModel.ISupportInitialize)(this.dgvNoticeList)).BeginInit(); + this.SuspendLayout(); + // + // dgvNoticeList + // + this.dgvNoticeList.AllowUserToAddRows = false; + this.dgvNoticeList.AllowUserToDeleteRows = false; + this.dgvNoticeList.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; + this.dgvNoticeList.BackgroundColor = System.Drawing.Color.SkyBlue; + this.dgvNoticeList.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dgvNoticeList.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.clNoticeNo, + this.clNoticetheme, + this.clNoticeContent}); + this.dgvNoticeList.Location = new System.Drawing.Point(216, 54); + this.dgvNoticeList.Name = "dgvNoticeList"; + this.dgvNoticeList.ReadOnly = true; + dataGridViewCellStyle2.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.dgvNoticeList.RowsDefaultCellStyle = dataGridViewCellStyle2; + this.dgvNoticeList.RowTemplate.Height = 23; + this.dgvNoticeList.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; + this.dgvNoticeList.Size = new System.Drawing.Size(368, 456); + this.dgvNoticeList.TabIndex = 111; + // + // clNoticeNo + // + this.clNoticeNo.DataPropertyName = "NoticeNo"; + this.clNoticeNo.HeaderText = "公告编号"; + this.clNoticeNo.Name = "clNoticeNo"; + this.clNoticeNo.ReadOnly = true; + // + // clNoticetheme + // + this.clNoticetheme.DataPropertyName = "Noticetheme"; + this.clNoticetheme.HeaderText = "公告主题"; + this.clNoticetheme.Name = "clNoticetheme"; + this.clNoticetheme.ReadOnly = true; + // + // clNoticeContent + // + this.clNoticeContent.DataPropertyName = "NoticeContent"; + this.clNoticeContent.HeaderText = "公告正文"; + this.clNoticeContent.Name = "clNoticeContent"; + this.clNoticeContent.ReadOnly = true; + // + // label5 + // + this.label5.AutoSize = true; + this.label5.Font = new System.Drawing.Font("Microsoft Sans Serif", 21.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label5.Location = new System.Drawing.Point(353, 14); + this.label5.Name = "label5"; + this.label5.Size = new System.Drawing.Size(131, 33); + this.label5.TabIndex = 110; + this.label5.Text = "历史公告"; + // + // FrmNotice + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(816, 553); + this.Controls.Add(this.dgvNoticeList); + this.Controls.Add(this.label5); + this.Name = "FrmNotice"; + this.Text = "FrmNotice"; + this.Load += new System.EventHandler(this.FrmNotice_Load); + ((System.ComponentModel.ISupportInitialize)(this.dgvNoticeList)).EndInit(); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private System.Windows.Forms.DataGridView dgvNoticeList; + private System.Windows.Forms.DataGridViewTextBoxColumn clNoticeNo; + private System.Windows.Forms.DataGridViewTextBoxColumn clNoticetheme; + private System.Windows.Forms.DataGridViewTextBoxColumn clNoticeContent; + private System.Windows.Forms.Label label5; + } +} \ No newline at end of file diff --git a/SYS.FormUI/AppFunction/FrmAdminMain.cs b/SYS.FormUI/AppFunction/FrmNotice.cs similarity index 53% rename from SYS.FormUI/AppFunction/FrmAdminMain.cs rename to SYS.FormUI/AppFunction/FrmNotice.cs index 840c5df401a9ce0761844936a14a4ed8122a677a..66d35af1de494417edbc9a42b35ee74c09c3bcfc 100644 --- a/SYS.FormUI/AppFunction/FrmAdminMain.cs +++ b/SYS.FormUI/AppFunction/FrmNotice.cs @@ -1,4 +1,4 @@ -using Sunny.UI; +using SYS.Manager; using System; using System.Collections.Generic; using System.ComponentModel; @@ -11,16 +11,17 @@ using System.Windows.Forms; namespace SYS.FormUI { - public partial class FrmAdminMain : UIForm + public partial class FrmNotice : Form { - public FrmAdminMain() + public FrmNotice() { InitializeComponent(); } - private void FrmAdminMain_Load(object sender, EventArgs e) + private void FrmNotice_Load(object sender, EventArgs e) { - + dgvNoticeList.AutoGenerateColumns = false; + dgvNoticeList.DataSource = NoticeManager.SelectNoticeAll(); } } } diff --git a/SYS.FormUI/AppFunction/FrmBackUpDatabase.resx b/SYS.FormUI/AppFunction/FrmNotice.resx similarity index 37% rename from SYS.FormUI/AppFunction/FrmBackUpDatabase.resx rename to SYS.FormUI/AppFunction/FrmNotice.resx index 224d37342e3f6480c12e4fe58137074a36e0747e..4f6453c9e546206190bfa345cc6d6928127c7255 100644 --- a/SYS.FormUI/AppFunction/FrmBackUpDatabase.resx +++ b/SYS.FormUI/AppFunction/FrmNotice.resx @@ -117,119 +117,13 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - - Qk3OBwAAAAAAAJ4BAAAoAAAARwAAABYAAAABAAgAAAAAAAAAAAASCwAAEgsAAFoAAABaAAAAAAAA//// - ////+O7///bq///w3f//6s///+jL///mx///5MP//+K////gu///3bb//9uy///Zrv//1aX//9Kh/5V6 - WP///Pn//9Cc/7STa///05///9Sf///Vo///16n//92z///Xov//2ab//9in/5yGaP//2qv/nYdq///c - r///37f//+K7/7Ccgv//+fH/m4Vm/56Kbf//5L///+bD///oxv//6cr//+vO///58P+wnHz///Hb///2 - 5//w7OX/s551///46v//+Ov///rw//Ds5P//+u////vy//Xiq///7LP/9OKr///66v//++z/trOk/7e0 - pv//9Lr///W6///0u///9bz/8+zD///2vP/07LT///a9///3vf//9r7///e////3wP+3taf/9e61///4 - vv/z7LX///jA///4wf//+ML///nE///6xv//+8f///vI///95/+5uKv///vE///7xv/W6u7/WTwkEBAQ - EBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQ - EBAkPFkAPRM3Pj4+Pj4+Pj4+Pj4+Pj4+Pj4+Pj4+Pj4+Pj4+Pj4+Pj4+Pj4+Pj4+Pj4+Pj4+Pj4+Pj4+ - Pj4+Pj4+Pj4+Pj4+P0ZLMD0AHDkSFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQU - FBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFRk4RBwAEEAWDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8P - Dw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8aTBAAEEEbDg4ODg4ODg4ODg4ODg4O - Dg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4bQxAAEEUdFxcX - FxcXFxcXFxcXFxcXFxcXFxcXFxcXFxcXFxcXFxcXFxcXFxcXFxcXFxcXFxcXFxcXFxcXFxcXFxcXFxcX - FxcdRRAAEEUfDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0N - DQ0NDQ0NDQ0NDQ0NDQ0fRRAAEEcYDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwM - DAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwYRxAAEEggCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsL - CwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsgSBAAEEghCgoKCgoKCgoKCgoKCgoK - CgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgohSBAAEEkmCQkJ - CQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJ - CQkmSRAAEE4nCAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgI - CAgICAgICAgICAgICAgnThAAEE8oBwcHBwcHBwcHBwcHBwcHBwcHBwcHBwcHBwcHBwcHBwcHBwcHBwcH - BwcHBwcHBwcHBwcHBwcHBwcHBwcHBwcHBwcoTxAAEFApBgYGBgYGBgYGBgYGBgYGBgYGBgYGBgYGBgYG - BgYGBgYGBgYGBgYGBgYGBgYGBgYGBgYGBgYGBgYGBgYGBgYGBgYpUBAAEFAqBQUFBQUFBQUFBQUFBQUF - BQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUqUBAAEFEtBAQE - BAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQE - BAQtURAAEFIuAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMD - AwMDAwMDAwMDAwMDAwMuUhAAEFgxAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIC - AgICAgICAgICAgICAgICAgICAgICAgICAgIyUxAAEFc6KyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMj - IyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyM1VBAAHk1VOzMzMzMzMzMzMzMzMzMz - MzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzYRQh4ASiw0AQEB - AQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEB - AQEvIkoAWVYlEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQ - EBAQEBAQEBAQEBAQEBAlVlkA - - - - - Qk3OBwAAAAAAAJ4BAAAoAAAARwAAABYAAAABAAgAAAAAAAAAAAASCwAAEgsAAFoAAABaAAAAAAAA//// - ////+O7///bq///w3f//6s///+jL///mx///5MP//+K////gu///3bb//9uy///Zrv//1aX//9Kh/5V6 - WP///Pn//9Cc/7STa///05///9Sf///Vo///16n//92z///Xov//2ab//9in/5yGaP//2qv/nYdq///c - r///37f//+K7/7Ccgv//+fH/m4Vm/56Kbf//5L///+bD///oxv//6cr//+vO///58P+wnHz///Hb///2 - 5//w7OX/s551///46v//+Ov///rw//Ds5P//+u////vy//Xiq///7LP/9OKr///66v//++z/trOk/7e0 - pv//9Lr///W6///0u///9bz/8+zD///2vP/07LT///a9///3vf//9r7///e////3wP+3taf/9e61///4 - vv/z7LX///jA///4wf//+ML///nE///6xv//+8f///vI///95/+5uKv///vE///7xv/W6u7/WTwkEBAQ - EBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQ - EBAkPFkAPRM3Pj4+Pj4+Pj4+Pj4+Pj4+Pj4+Pj4+Pj4+Pj4+Pj4+Pj4+Pj4+Pj4+Pj4+Pj4+Pj4+Pj4+ - Pj4+Pj4+Pj4+Pj4+P0ZLMD0AHDkSFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQU - FBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFRk4RBwAEEAWDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8P - Dw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8aTBAAEEEbDg4ODg4ODg4ODg4ODg4O - Dg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4bQxAAEEUdFxcX - FxcXFxcXFxcXFxcXFxcXFxcXFxcXFxcXFxcXFxcXFxcXFxcXFxcXFxcXFxcXFxcXFxcXFxcXFxcXFxcX - FxcdRRAAEEUfDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0N - DQ0NDQ0NDQ0NDQ0NDQ0fRRAAEEcYDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwM - DAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwYRxAAEEggCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsL - CwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsgSBAAEEghCgoKCgoKCgoKCgoKCgoK - CgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgohSBAAEEkmCQkJ - CQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJ - CQkmSRAAEE4nCAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgI - CAgICAgICAgICAgICAgnThAAEE8oBwcHBwcHBwcHBwcHBwcHBwcHBwcHBwcHBwcHBwcHBwcHBwcHBwcH - BwcHBwcHBwcHBwcHBwcHBwcHBwcHBwcHBwcoTxAAEFApBgYGBgYGBgYGBgYGBgYGBgYGBgYGBgYGBgYG - BgYGBgYGBgYGBgYGBgYGBgYGBgYGBgYGBgYGBgYGBgYGBgYGBgYpUBAAEFAqBQUFBQUFBQUFBQUFBQUF - BQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUqUBAAEFEtBAQE - BAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQE - BAQtURAAEFIuAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMD - AwMDAwMDAwMDAwMDAwMuUhAAEFgxAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIC - AgICAgICAgICAgICAgICAgICAgICAgICAgIyUxAAEFc6KyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMj - IyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyM1VBAAHk1VOzMzMzMzMzMzMzMzMzMz - MzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzYRQh4ASiw0AQEB - AQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEB - AQEvIkoAWVYlEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQ - EBAQEBAQEBAQEBAQEBAlVlkA - - - - - Qk3OBwAAAAAAAJ4BAAAoAAAARwAAABYAAAABAAgAAAAAAAAAAAASCwAAEgsAAFoAAABaAAAAAAAA//// - ////+O7///bq///w3f//6s///+jL///mx///5MP//+K////gu///3bb//9uy///Zrv//1aX//9Kh/5V6 - WP///Pn//9Cc/7STa///05///9Sf///Vo///16n//92z///Xov//2ab//9in/5yGaP//2qv/nYdq///c - r///37f//+K7/7Ccgv//+fH/m4Vm/56Kbf//5L///+bD///oxv//6cr//+vO///58P+wnHz///Hb///2 - 5//w7OX/s551///46v//+Ov///rw//Ds5P//+u////vy//Xiq///7LP/9OKr///66v//++z/trOk/7e0 - pv//9Lr///W6///0u///9bz/8+zD///2vP/07LT///a9///3vf//9r7///e////3wP+3taf/9e61///4 - vv/z7LX///jA///4wf//+ML///nE///6xv//+8f///vI///95/+5uKv///vE///7xv/W6u7/WTwkEBAQ - EBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQ - EBAkPFkAPRM3Pj4+Pj4+Pj4+Pj4+Pj4+Pj4+Pj4+Pj4+Pj4+Pj4+Pj4+Pj4+Pj4+Pj4+Pj4+Pj4+Pj4+ - Pj4+Pj4+Pj4+Pj4+P0ZLMD0AHDkSFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQU - FBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFRk4RBwAEEAWDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8P - Dw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8aTBAAEEEbDg4ODg4ODg4ODg4ODg4O - Dg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4bQxAAEEUdFxcX - FxcXFxcXFxcXFxcXFxcXFxcXFxcXFxcXFxcXFxcXFxcXFxcXFxcXFxcXFxcXFxcXFxcXFxcXFxcXFxcX - FxcdRRAAEEUfDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0N - DQ0NDQ0NDQ0NDQ0NDQ0fRRAAEEcYDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwM - DAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwYRxAAEEggCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsL - CwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsgSBAAEEghCgoKCgoKCgoKCgoKCgoK - CgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgohSBAAEEkmCQkJ - CQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJ - CQkmSRAAEE4nCAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgI - CAgICAgICAgICAgICAgnThAAEE8oBwcHBwcHBwcHBwcHBwcHBwcHBwcHBwcHBwcHBwcHBwcHBwcHBwcH - BwcHBwcHBwcHBwcHBwcHBwcHBwcHBwcHBwcoTxAAEFApBgYGBgYGBgYGBgYGBgYGBgYGBgYGBgYGBgYG - BgYGBgYGBgYGBgYGBgYGBgYGBgYGBgYGBgYGBgYGBgYGBgYGBgYpUBAAEFAqBQUFBQUFBQUFBQUFBQUF - BQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUqUBAAEFEtBAQE - BAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQE - BAQtURAAEFIuAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMD - AwMDAwMDAwMDAwMDAwMuUhAAEFgxAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIC - AgICAgICAgICAgICAgICAgICAgICAgICAgIyUxAAEFc6KyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMj - IyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyM1VBAAHk1VOzMzMzMzMzMzMzMzMzMz - MzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzYRQh4ASiw0AQEB - AQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEB - AQEvIkoAWVYlEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQ - EBAQEBAQEBAQEBAQEBAlVlkA - - + + True + + + True + + + True + \ No newline at end of file diff --git a/SYS.FormUI/AppFunction/FrmReserList.cs b/SYS.FormUI/AppFunction/FrmReserList.cs index 9ae0f6d4220c81503f7630a3f0f016ba5d40a175..0e1214f53d3f852f554ccf7c2e3b34178c14a758 100644 --- a/SYS.FormUI/AppFunction/FrmReserList.cs +++ b/SYS.FormUI/AppFunction/FrmReserList.cs @@ -7,6 +7,7 @@ using Sunny.UI; using System.Transactions; using SYS.Core.Util; using System.Collections.Generic; +using SYS.Application; namespace SYS.FormUI { @@ -43,7 +44,7 @@ namespace SYS.FormUI #endregion #region 加载性别信息 - List listSexType = new BaseManager().SelectSexTypeAll(); + List listSexType = new BaseService().SelectSexTypeAll(); this.cbSex.DataSource = listSexType; this.cbSex.DisplayMember = "sexName"; this.cbSex.ValueMember = "sexId"; diff --git a/SYS.FormUI/AppFunction/FrmReserManager.cs b/SYS.FormUI/AppFunction/FrmReserManager.cs index e380401a8b6e9d224e8532aebb7049e39a787b44..49565b17f00daa278fcee7685994629a8c802754 100644 --- a/SYS.FormUI/AppFunction/FrmReserManager.cs +++ b/SYS.FormUI/AppFunction/FrmReserManager.cs @@ -46,7 +46,7 @@ namespace SYS.FormUI { MessageBox.Show("预约成功！请在指定时间内进行登记入住"); #region 获取添加操作日志所需的信息 - Operation o = new Operation(); + OperationLog o = new OperationLog(); o.OperationTime = DateTime.Parse(DateTime.Now.ToString("yyyy-MM-dd,HH:mm:ss")); o.Operationlog = LoginInfo.WorkerClub + LoginInfo.WorkerPosition + LoginInfo.WorkerName + "于" + DateTime.Now + "帮助" + txtCustoTel.Text + "进行了预订房间操作！"; o.OperationAccount = LoginInfo.WorkerClub + LoginInfo.WorkerPosition + LoginInfo.WorkerName; diff --git a/SYS.FormUI/AppFunction/FrmRoomManager.cs b/SYS.FormUI/AppFunction/FrmRoomManager.cs index 366756e32ca3f7e6e09e936bfa8d18149fc26d93..b12845b62cd434e33528fc4b571ed138ea66fc59 100644 --- a/SYS.FormUI/AppFunction/FrmRoomManager.cs +++ b/SYS.FormUI/AppFunction/FrmRoomManager.cs @@ -4,6 +4,7 @@ using System.Windows.Forms; using SYS.Manager; using SYS.Core; using SYS.FormUI.Properties; +using SYS.Application; namespace SYS.FormUI { @@ -38,49 +39,39 @@ namespace SYS.FormUI private void FrmRoomManager_Load(object sender, EventArgs e) { - foreach (Control item in this.pnlRoomInfo.Controls) - { - if (item.GetType().ToString() == "System.Windows.Forms.Label") - { - item.Font = UI_FontUtil.SetChildControlsFont(); - } - } + //foreach (Control item in this.pnlRoomInfo.Controls) + //{ + // if (item.GetType().ToString() == "System.Windows.Forms.Label") + // { + // item.Font = UI_FontUtil.SetChildControlsFont(); + // } + //} - romsty = RoomManager.SelectRoomAll(); + romsty = new RoomService().SelectRoomAll(); for (int i = 0; i < romsty.Count; i++) { - romt = new ucRoomList(this); - romt.Tag = romsty[i].RoomNo; + romt = new ucRoomList(); + romt.lblRoomNo.Text = romsty[i].RoomNo; + romt.lblCustoNo.Text = romsty[i].CustoNo; + romt.lblRoomType.Text = romsty[i].RoomName; romt.romCustoInfo = romsty[i]; flpRoom.Controls.Add(romt); } - } - #endregion - #region 神秘的遍历方法 - public void CmpInfo(Room rom, Custo user) - { - foreach (Control rmb in flpRoom.Controls) + if (lblCheckTime.Text == "0001/1/1") { - if (rmb.Tag.ToString() != rom.RoomNo) - { - - } - + lblCheckTime.Text = ""; } } #endregion - - - private void tmrGetData_Tick(object sender, EventArgs e) { - lblCanUse.Text = RoomManager.SelectCanUseRoomAllByRoomState().ToString(); - lblCheck.Text = RoomManager.SelectNotUseRoomAllByRoomState().ToString(); - lblNotClear.Text = RoomManager.SelectNotClearRoomAllByRoomState().ToString(); - lblFix.Text = RoomManager.SelectFixingRoomAllByRoomState().ToString(); - lblReser.Text = RoomManager.SelectReseredRoomAllByRoomState().ToString(); + lblCanUse.Text = new RoomService().SelectCanUseRoomAllByRoomState().ToString(); + lblCheck.Text = new RoomService().SelectNotUseRoomAllByRoomState().ToString(); + lblNotClear.Text = new RoomService().SelectNotClearRoomAllByRoomState().ToString(); + lblFix.Text = new RoomService().SelectFixingRoomAllByRoomState().ToString(); + lblReser.Text = new RoomService().SelectReseredRoomAllByRoomState().ToString(); lblRoomNo.Text = ucRoomList.co_RoomNo; lblCustoNo.Text = ucRoomList.co_CustoNo; lblRoomPosition.Text = ucRoomList.co_RoomPosition; @@ -99,13 +90,16 @@ namespace SYS.FormUI private void btnAll_Click(object sender, EventArgs e) { flpRoom.Controls.Clear(); - romsty = RoomManager.SelectRoomAll(); + romsty = new RoomService().SelectRoomAll(); for (int i = 0; i < romsty.Count; i++) { - romt = new ucRoomList(this); - romt.Tag = romsty[i].RoomNo; + romt = new ucRoomList(); + romt.lblRoomNo.Text = romsty[i].RoomNo; + romt.lblCustoNo.Text = romsty[i].CustoNo; + romt.lblRoomType.Text = romsty[i].RoomName; romt.romCustoInfo = romsty[i]; flpRoom.Controls.Add(romt); + } } @@ -117,19 +111,22 @@ namespace SYS.FormUI private void LoadData(string typeName) { flpRoom.Controls.Clear(); - romsty = RoomManager.SelectRoomByTypeName(typeName); + romsty = new RoomService().SelectRoomByTypeName(typeName); for (int i = 0; i < romsty.Count; i++) { - romt = new ucRoomList(this); - romt.Tag = romsty[i].RoomNo; + romt = new ucRoomList(); + romt.lblRoomNo.Text = romsty[i].RoomNo; + romt.lblCustoNo.Text = romsty[i].CustoNo; + romt.lblRoomType.Text = romsty[i].RoomName; romt.romCustoInfo = romsty[i]; flpRoom.Controls.Add(romt); + } - lblCanUse.Text = RoomManager.SelectCanUseRoomAllByRoomState().ToString(); - lblCheck.Text = RoomManager.SelectNotUseRoomAllByRoomState().ToString(); - lblNotClear.Text = RoomManager.SelectNotClearRoomAllByRoomState().ToString(); - lblFix.Text = RoomManager.SelectFixingRoomAllByRoomState().ToString(); - lblReser.Text = RoomManager.SelectReseredRoomAllByRoomState().ToString(); + lblCanUse.Text = new RoomService().SelectCanUseRoomAllByRoomState().ToString(); + lblCheck.Text = new RoomService().SelectNotUseRoomAllByRoomState().ToString(); + lblNotClear.Text = new RoomService().SelectNotClearRoomAllByRoomState().ToString(); + lblFix.Text = new RoomService().SelectFixingRoomAllByRoomState().ToString(); + lblReser.Text = new RoomService().SelectReseredRoomAllByRoomState().ToString(); } private void btnBS_Click(object sender, EventArgs e) @@ -167,13 +164,16 @@ namespace SYS.FormUI private void LoadRoomByState(int stateid) { flpRoom.Controls.Clear(); - romsty = RoomManager.SelectRoomByRoomState(stateid); + romsty = new RoomService().SelectRoomByRoomState(stateid); for (int i = 0; i < romsty.Count; i++) { - romt = new ucRoomList(this); - romt.Tag = romsty[i].RoomNo; + romt = new ucRoomList(); + romt.lblRoomNo.Text = romsty[i].RoomNo; + romt.lblCustoNo.Text = romsty[i].CustoNo; + romt.lblRoomType.Text = romsty[i].RoomName; romt.romCustoInfo = romsty[i]; flpRoom.Controls.Add(romt); + } lblRoomNo.Text = ""; lblRoomPosition.Text = ""; @@ -185,13 +185,16 @@ namespace SYS.FormUI private void LoadRoom() { flpRoom.Controls.Clear(); - romsty = RoomManager.SelectRoomAll(); + romsty = new RoomService().SelectRoomAll(); for (int i = 0; i < romsty.Count; i++) { - romt = new ucRoomList(this); - romt.Tag = romsty[i].RoomNo; + romt = new ucRoomList(); + romt.lblRoomNo.Text = romsty[i].RoomNo; + romt.lblCustoNo.Text = romsty[i].CustoNo; + romt.lblRoomType.Text = romsty[i].RoomName; romt.romCustoInfo = romsty[i]; flpRoom.Controls.Add(romt); + } lblRoomNo.Text = ""; lblRoomPosition.Text = ""; diff --git a/SYS.FormUI/AppFunction/FrmRoomStateManager.cs b/SYS.FormUI/AppFunction/FrmRoomStateManager.cs index 9d448580ed869fe417476501022ac3f0292935a2..9b092efc82684e2717fb85de9bdbeffa4aceef88 100644 --- a/SYS.FormUI/AppFunction/FrmRoomStateManager.cs +++ b/SYS.FormUI/AppFunction/FrmRoomStateManager.cs @@ -3,6 +3,7 @@ using System.Windows.Forms; using SYS.Manager; using SYS.Core; using Sunny.UI; +using SYS.Application; namespace SYS.FormUI { @@ -16,11 +17,10 @@ namespace SYS.FormUI #region 窗体加载事件 private void FrmRoomStateManager_Load(object sender, EventArgs e) { - txtRoomNo.Text = RoomStatic.RoomNo; - cboState.DataSource = RoomManager.SelectRoomStateAll(); + txtRoomNo.Text = ucRoomList.rm_RoomNo; + cboState.DataSource = new RoomService().SelectRoomStateAll(); cboState.DisplayMember = "RoomState"; cboState.ValueMember = "RoomStateId"; - cboState.SelectedIndex = RoomStatic.RoomStateId; } #endregion diff --git a/SYS.FormUI/AppFunction/FrmSelectCustoInfo.cs b/SYS.FormUI/AppFunction/FrmSelectCustoInfo.cs index f668c6c8a1d23259dab34afc0c7b4862719dc2de..7be265e5ce08b8dbf4d8ace52ce03f2bd29e06b2 100644 --- a/SYS.FormUI/AppFunction/FrmSelectCustoInfo.cs +++ b/SYS.FormUI/AppFunction/FrmSelectCustoInfo.cs @@ -4,6 +4,7 @@ using SYS.Manager; using SYS.Core; using Sunny.UI; using System.Collections.Generic; +using SYS.Application; namespace SYS.FormUI { @@ -53,7 +54,7 @@ namespace SYS.FormUI #endregion #region 加载性别信息 - List listSexType = new BaseManager().SelectSexTypeAll(); + List listSexType = new BaseService().SelectSexTypeAll(); this.cbSex.DataSource = listSexType; this.cbSex.DisplayMember = "sexName"; this.cbSex.ValueMember = "sexId"; diff --git a/SYS.FormUI/AppFunction/FrmSellThing.cs b/SYS.FormUI/AppFunction/FrmSellThing.cs index 4520dd01bc3d1be15b6be41e25b66e1e330d30a8..aa3a0dbd08d4824047a3d3e782908d13ad0be9fe 100644 --- a/SYS.FormUI/AppFunction/FrmSellThing.cs +++ b/SYS.FormUI/AppFunction/FrmSellThing.cs @@ -216,7 +216,7 @@ namespace SYS.FormUI LoadSpendInfo(r.RoomNo); LoadSellThingInfo(); #region 获取添加操作日志所需的信息 - Operation o = new Operation(); + OperationLog o = new OperationLog(); o.OperationTime = DateTime.Parse(DateTime.Now.ToString("yyyy-MM-dd,HH:mm:ss")); o.Operationlog = LoginInfo.WorkerClub + LoginInfo.WorkerPosition + LoginInfo.WorkerName + "于" + DateTime.Now + "帮助" + s.CustoNo + "进行了消费商品:" + txtSellName.Text + "操作！"; o.OperationAccount = LoginInfo.WorkerClub + LoginInfo.WorkerPosition + LoginInfo.WorkerName; diff --git a/SYS.FormUI/AppFunction/FrmUnLockSystem.Designer.cs b/SYS.FormUI/AppFunction/FrmUnLockSystem.Designer.cs index ef1ca27ed1de29d3d376a7fcd4162d2c4710bff8..94c0c3fd06bfaa1810566364467d3e337e8d3262 100644 --- a/SYS.FormUI/AppFunction/FrmUnLockSystem.Designer.cs +++ b/SYS.FormUI/AppFunction/FrmUnLockSystem.Designer.cs @@ -41,7 +41,7 @@ this.label1.BackColor = System.Drawing.Color.Transparent; this.label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label1.ForeColor = System.Drawing.Color.Red; - this.label1.Location = new System.Drawing.Point(54, 52); + this.label1.Location = new System.Drawing.Point(54, 37); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(410, 24); this.label1.TabIndex = 0; @@ -82,7 +82,7 @@ this.btnUnLock.Style = Sunny.UI.UIStyle.Red; this.btnUnLock.TabIndex = 113; this.btnUnLock.Text = "解 锁"; - this.btnUnLock.Click += new System.EventHandler(this.btnUnLock_Click_1); + this.btnUnLock.Click += new System.EventHandler(this.btnUnLock_Click); // // FrmUnLockSystem // @@ -98,8 +98,11 @@ this.MaximizeBox = false; this.MinimizeBox = false; this.Name = "FrmUnLockSystem"; + this.Padding = new System.Windows.Forms.Padding(0); this.RectColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(80)))), ((int)(((byte)(80))))); - this.Style = Sunny.UI.UIStyle.Red; + this.ShowInTaskbar = false; + this.ShowTitle = false; + this.Style = Sunny.UI.UIStyle.Custom; this.Text = "系统已锁定！"; this.TitleColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(80)))), ((int)(((byte)(80))))); this.Deactivate += new System.EventHandler(this.FrmUnLockSystem_Deactivate); diff --git a/SYS.FormUI/AppFunction/FrmUnLockSystem.cs b/SYS.FormUI/AppFunction/FrmUnLockSystem.cs index 614335504fbabea8aa11fabf43f4d099335e0d3c..45cb5c5547dd15ac284653b6f25f3ebd6a66f3f1 100644 --- a/SYS.FormUI/AppFunction/FrmUnLockSystem.cs +++ b/SYS.FormUI/AppFunction/FrmUnLockSystem.cs @@ -6,6 +6,7 @@ using System.Runtime.InteropServices; using System.Windows.Forms; using Sunny.UI; using SYS.Core; +using SYS.Manager; namespace SYS.FormUI { @@ -47,19 +48,22 @@ namespace SYS.FormUI private void btnUnLock_Click(object sender, EventArgs e) { - //if (txtUnLockPwd.Text != AdminInfo.ad) - //{ - // MessageBox.Show("密码错误! 请输入当前超管密码解锁!"); - // txtUnLockPwd.Text = ""; - // txtUnLockPwd.Focus(); - //} - //else - //{ - // this.Close(); - // string regPath = System.Windows.Forms.Application.StartupPath + @"\启用任务管理器.reg"; - // ExecuteReg(regPath); - // FrmMain.Start(); - //} + var account = AdminManager.SelectAdminPwdByAccount(AdminInfo.Account); + if (account != null) + { + if (account.AdminPassword != txtUnLockPwd.Text.Trim()) + { + MessageBox.Show("密码错误! 请输入当前超管密码解锁!"); + txtUnLockPwd.Text = ""; + txtUnLockPwd.Focus(); + return; + } + this.Close(); + string regPath = System.Windows.Forms.Application.StartupPath + @"\启用任务管理器.reg"; + ExecuteReg(regPath); + FrmMain.Start(); + + } } @@ -78,7 +82,7 @@ namespace SYS.FormUI { string regPath = System.Windows.Forms.Application.StartupPath + @"\禁用任务管理器.reg"; ExecuteReg(regPath); - FrmMain.Stop(); + //FrmMain.Stop(); //HookStart(); Process[] ps = Process.GetProcessesByName("TS酒店管理系统"); if (ps.Length < 0) diff --git a/SYS.FormUI/AppFunction/FrmUpLoad.Designer.cs b/SYS.FormUI/AppFunction/FrmUpLoadNotice.Designer.cs similarity index 64% rename from SYS.FormUI/AppFunction/FrmUpLoad.Designer.cs rename to SYS.FormUI/AppFunction/FrmUpLoadNotice.Designer.cs index 1961665a953e99a68703a74c6361c27fe1ebcb34..de5e1499a7c3ab1a11765413bfa0e70e596ef991 100644 --- a/SYS.FormUI/AppFunction/FrmUpLoad.Designer.cs +++ b/SYS.FormUI/AppFunction/FrmUpLoadNotice.Designer.cs @@ -1,6 +1,6 @@ namespace SYS.FormUI { - partial class FrmUpLoad + partial class FrmUpLoadNotice { /// /// Required designer variable. @@ -28,15 +28,13 @@ /// private void InitializeComponent() { - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmUpLoad)); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmUpLoadNotice)); this.UpLoadNotice = new System.Windows.Forms.Button(); this.pnlUpLoad = new System.Windows.Forms.Panel(); this.txtNoticePerson = new System.Windows.Forms.TextBox(); this.label6 = new System.Windows.Forms.Label(); this.cboSelectClub = new System.Windows.Forms.ComboBox(); this.label4 = new System.Windows.Forms.Label(); - this.btnUpLoad = new System.Windows.Forms.Button(); this.rtbNoticeContent = new System.Windows.Forms.RichTextBox(); this.dtpUpLoadDate = new System.Windows.Forms.DateTimePicker(); this.label3 = new System.Windows.Forms.Label(); @@ -44,13 +42,8 @@ this.label2 = new System.Windows.Forms.Label(); this.txtUpLoadNo = new System.Windows.Forms.TextBox(); this.label1 = new System.Windows.Forms.Label(); - this.label5 = new System.Windows.Forms.Label(); - this.dgvNoticeList = new System.Windows.Forms.DataGridView(); - this.clNoticeNo = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.clNoticetheme = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.clNoticeContent = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.btnUpLoad = new System.Windows.Forms.Button(); this.pnlUpLoad.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.dgvNoticeList)).BeginInit(); this.SuspendLayout(); // // UpLoadNotice @@ -58,7 +51,7 @@ this.UpLoadNotice.BackColor = System.Drawing.Color.DeepSkyBlue; this.UpLoadNotice.FlatAppearance.BorderSize = 0; this.UpLoadNotice.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.UpLoadNotice.Font = new System.Drawing.Font("苹方-简", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.UpLoadNotice.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.UpLoadNotice.Location = new System.Drawing.Point(12, 8); this.UpLoadNotice.Name = "UpLoadNotice"; this.UpLoadNotice.Size = new System.Drawing.Size(103, 23); @@ -81,70 +74,55 @@ this.pnlUpLoad.Controls.Add(this.label2); this.pnlUpLoad.Controls.Add(this.txtUpLoadNo); this.pnlUpLoad.Controls.Add(this.label1); - this.pnlUpLoad.Font = new System.Drawing.Font("苹方-简", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.pnlUpLoad.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.pnlUpLoad.Location = new System.Drawing.Point(3, 37); this.pnlUpLoad.Name = "pnlUpLoad"; - this.pnlUpLoad.Size = new System.Drawing.Size(614, 456); + this.pnlUpLoad.Size = new System.Drawing.Size(974, 456); this.pnlUpLoad.TabIndex = 1; this.pnlUpLoad.Visible = false; // // txtNoticePerson // - this.txtNoticePerson.Font = new System.Drawing.Font("苹方-简", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.txtNoticePerson.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtNoticePerson.Location = new System.Drawing.Point(403, 423); this.txtNoticePerson.Name = "txtNoticePerson"; - this.txtNoticePerson.Size = new System.Drawing.Size(88, 24); + this.txtNoticePerson.Size = new System.Drawing.Size(88, 21); this.txtNoticePerson.TabIndex = 11; // // label6 // this.label6.AutoSize = true; - this.label6.Font = new System.Drawing.Font("苹方-简", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label6.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label6.Location = new System.Drawing.Point(357, 427); this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(56, 17); + this.label6.Size = new System.Drawing.Size(55, 15); this.label6.TabIndex = 10; this.label6.Text = "发布人："; // // cboSelectClub // - this.cboSelectClub.Font = new System.Drawing.Font("苹方-简", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.cboSelectClub.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.cboSelectClub.FormattingEnabled = true; this.cboSelectClub.Items.AddRange(new object[] { "人力资源管理部"}); this.cboSelectClub.Location = new System.Drawing.Point(229, 424); this.cboSelectClub.Name = "cboSelectClub"; - this.cboSelectClub.Size = new System.Drawing.Size(114, 25); + this.cboSelectClub.Size = new System.Drawing.Size(114, 23); this.cboSelectClub.TabIndex = 9; // // label4 // this.label4.AutoSize = true; - this.label4.Font = new System.Drawing.Font("苹方-简", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label4.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label4.Location = new System.Drawing.Point(158, 427); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(68, 17); + this.label4.Size = new System.Drawing.Size(67, 15); this.label4.TabIndex = 8; this.label4.Text = "发布部门："; // - // btnUpLoad - // - this.btnUpLoad.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("btnUpLoad.BackgroundImage"))); - this.btnUpLoad.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; - this.btnUpLoad.FlatAppearance.BorderSize = 0; - this.btnUpLoad.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.btnUpLoad.Font = new System.Drawing.Font("苹方-简", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnUpLoad.Location = new System.Drawing.Point(497, 422); - this.btnUpLoad.Name = "btnUpLoad"; - this.btnUpLoad.Size = new System.Drawing.Size(75, 23); - this.btnUpLoad.TabIndex = 7; - this.btnUpLoad.Text = "发布"; - this.btnUpLoad.UseVisualStyleBackColor = true; - this.btnUpLoad.Click += new System.EventHandler(this.btnUpLoad_Click); - // // rtbNoticeContent // - this.rtbNoticeContent.Font = new System.Drawing.Font("苹方-简", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.rtbNoticeContent.Font = new System.Drawing.Font("Microsoft Sans Serif", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.rtbNoticeContent.Location = new System.Drawing.Point(0, 47); this.rtbNoticeContent.Name = "rtbNoticeContent"; this.rtbNoticeContent.Size = new System.Drawing.Size(611, 365); @@ -155,7 +133,7 @@ // this.dtpUpLoadDate.Location = new System.Drawing.Point(505, 14); this.dtpUpLoadDate.Name = "dtpUpLoadDate"; - this.dtpUpLoadDate.Size = new System.Drawing.Size(106, 24); + this.dtpUpLoadDate.Size = new System.Drawing.Size(106, 21); this.dtpUpLoadDate.TabIndex = 5; // // label3 @@ -172,7 +150,7 @@ // this.txtNoticeTheme.Location = new System.Drawing.Point(273, 14); this.txtNoticeTheme.Name = "txtNoticeTheme"; - this.txtNoticeTheme.Size = new System.Drawing.Size(145, 24); + this.txtNoticeTheme.Size = new System.Drawing.Size(145, 21); this.txtNoticeTheme.TabIndex = 3; // // label2 @@ -189,7 +167,7 @@ // this.txtUpLoadNo.Location = new System.Drawing.Point(84, 14); this.txtUpLoadNo.Name = "txtUpLoadNo"; - this.txtUpLoadNo.Size = new System.Drawing.Size(100, 24); + this.txtUpLoadNo.Size = new System.Drawing.Size(100, 21); this.txtUpLoadNo.TabIndex = 1; // // label1 @@ -202,78 +180,36 @@ this.label1.TabIndex = 0; this.label1.Text = "公告编号："; // - // label5 - // - this.label5.AutoSize = true; - this.label5.Font = new System.Drawing.Font("苹方-简", 21.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label5.Location = new System.Drawing.Point(756, -3); - this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(134, 41); - this.label5.TabIndex = 108; - this.label5.Text = "历史公告"; - // - // dgvNoticeList - // - this.dgvNoticeList.AllowUserToAddRows = false; - this.dgvNoticeList.AllowUserToDeleteRows = false; - this.dgvNoticeList.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; - this.dgvNoticeList.BackgroundColor = System.Drawing.Color.SkyBlue; - this.dgvNoticeList.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - this.dgvNoticeList.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { - this.clNoticeNo, - this.clNoticetheme, - this.clNoticeContent}); - this.dgvNoticeList.Location = new System.Drawing.Point(619, 37); - this.dgvNoticeList.Name = "dgvNoticeList"; - this.dgvNoticeList.ReadOnly = true; - dataGridViewCellStyle1.Font = new System.Drawing.Font("苹方-简", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.dgvNoticeList.RowsDefaultCellStyle = dataGridViewCellStyle1; - this.dgvNoticeList.RowTemplate.Height = 23; - this.dgvNoticeList.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; - this.dgvNoticeList.Size = new System.Drawing.Size(368, 456); - this.dgvNoticeList.TabIndex = 109; - this.dgvNoticeList.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvNoticeList_CellClick); - // - // clNoticeNo - // - this.clNoticeNo.DataPropertyName = "NoticeNo"; - this.clNoticeNo.HeaderText = "公告编号"; - this.clNoticeNo.Name = "clNoticeNo"; - this.clNoticeNo.ReadOnly = true; - // - // clNoticetheme - // - this.clNoticetheme.DataPropertyName = "Noticetheme"; - this.clNoticetheme.HeaderText = "公告主题"; - this.clNoticetheme.Name = "clNoticetheme"; - this.clNoticetheme.ReadOnly = true; - // - // clNoticeContent + // btnUpLoad // - this.clNoticeContent.DataPropertyName = "NoticeContent"; - this.clNoticeContent.HeaderText = "公告正文"; - this.clNoticeContent.Name = "clNoticeContent"; - this.clNoticeContent.ReadOnly = true; + this.btnUpLoad.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("btnUpLoad.BackgroundImage"))); + this.btnUpLoad.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.btnUpLoad.FlatAppearance.BorderSize = 0; + this.btnUpLoad.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.btnUpLoad.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnUpLoad.Location = new System.Drawing.Point(497, 422); + this.btnUpLoad.Name = "btnUpLoad"; + this.btnUpLoad.Size = new System.Drawing.Size(75, 23); + this.btnUpLoad.TabIndex = 7; + this.btnUpLoad.Text = "发布"; + this.btnUpLoad.UseVisualStyleBackColor = true; + this.btnUpLoad.Click += new System.EventHandler(this.btnUpLoad_Click); // - // FrmUpLoad + // FrmUpLoadNotice // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackColor = System.Drawing.Color.SkyBlue; this.ClientSize = new System.Drawing.Size(989, 497); - this.Controls.Add(this.dgvNoticeList); - this.Controls.Add(this.label5); this.Controls.Add(this.pnlUpLoad); this.Controls.Add(this.UpLoadNotice); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None; - this.Name = "FrmUpLoad"; + this.Name = "FrmUpLoadNotice"; this.Text = "FrmCashList"; this.Load += new System.EventHandler(this.FrmUpLoad_Load); this.pnlUpLoad.ResumeLayout(false); this.pnlUpLoad.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.dgvNoticeList)).EndInit(); this.ResumeLayout(false); - this.PerformLayout(); } @@ -291,12 +227,7 @@ private System.Windows.Forms.Label label1; private System.Windows.Forms.ComboBox cboSelectClub; private System.Windows.Forms.Label label4; - private System.Windows.Forms.Label label5; - private System.Windows.Forms.DataGridView dgvNoticeList; private System.Windows.Forms.TextBox txtNoticePerson; private System.Windows.Forms.Label label6; - private System.Windows.Forms.DataGridViewTextBoxColumn clNoticeNo; - private System.Windows.Forms.DataGridViewTextBoxColumn clNoticetheme; - private System.Windows.Forms.DataGridViewTextBoxColumn clNoticeContent; } } \ No newline at end of file diff --git a/SYS.FormUI/AppFunction/FrmUpLoad.cs b/SYS.FormUI/AppFunction/FrmUpLoadNotice.cs similarity index 40% rename from SYS.FormUI/AppFunction/FrmUpLoad.cs rename to SYS.FormUI/AppFunction/FrmUpLoadNotice.cs index a0957fb6e778f15b54e572565cbb24def2025ba7..ab893896befd90a5325007c303ed3b329d33becd 100644 --- a/SYS.FormUI/AppFunction/FrmUpLoad.cs +++ b/SYS.FormUI/AppFunction/FrmUpLoadNotice.cs @@ -6,9 +6,9 @@ using SYS.Core; namespace SYS.FormUI { - public partial class FrmUpLoad : Form + public partial class FrmUpLoadNotice : Form { - public FrmUpLoad() + public FrmUpLoadNotice() { InitializeComponent(); } @@ -27,10 +27,10 @@ namespace SYS.FormUI int n = DBHelper.ExecuteNonQuery(sql); MessageBox.Show("上传成功，上传日期为：" + DateTime.Now.ToShortDateString() + ""); #region 获取添加操作日志所需的信息 - Operation o = new Operation(); + OperationLog o = new OperationLog(); o.OperationTime = DateTime.Parse(DateTime.Now.ToString("yyyy-MM-dd,HH:mm:ss")); - o.Operationlog = AdminInfo.admingroup + AdminInfo.adminType + "于" + DateTime.Now + "进行了上传公告操作！"; - o.OperationAccount = AdminInfo.admingroup + AdminInfo.adminType; + o.Operationlog = AdminInfo.Account + AdminInfo.Name + "于" + DateTime.Now + "进行了上传公告操作！"; + o.OperationAccount = AdminInfo.Account + AdminInfo.Name; #endregion OperationlogManager.InsertOperationLog(o); foreach (Control Ctrol in pnlUpLoad.Controls) @@ -46,47 +46,21 @@ namespace SYS.FormUI } } - public void CmpSetDgv() - { - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); - this.dgvNoticeList.AllowUserToAddRows = false; - this.dgvNoticeList.AllowUserToDeleteRows = false; - dataGridViewCellStyle1.BackColor = System.Drawing.Color.LightCyan; - this.dgvNoticeList.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1; - this.dgvNoticeList.BackgroundColor = System.Drawing.Color.White; - this.dgvNoticeList.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; - this.dgvNoticeList.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single; - dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;//211, 223, 240 - dataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(211)))), ((int)(((byte)(223)))), ((int)(((byte)(240))))); - dataGridViewCellStyle2.Font = new System.Drawing.Font("苹方-简", 12, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle2.ForeColor = System.Drawing.Color.Blue; - dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - this.dgvNoticeList.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2; - this.dgvNoticeList.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - this.dgvNoticeList.EnableHeadersVisualStyles = false; - this.dgvNoticeList.GridColor = System.Drawing.SystemColors.GradientInactiveCaption; - this.dgvNoticeList.ReadOnly = true; - this.dgvNoticeList.RowHeadersVisible = false; - this.dgvNoticeList.RowTemplate.Height = 23; - this.dgvNoticeList.RowTemplate.ReadOnly = true; - } + private void FrmUpLoad_Load(object sender, EventArgs e) { - CmpSetDgv(); + cboSelectClub.SelectedIndex = 0; - dgvNoticeList.AutoGenerateColumns = false; - dgvNoticeList.DataSource = NoticeManager.SelectNoticeAll(); + } private void dgvNoticeList_CellClick(object sender, DataGridViewCellEventArgs e) { pnlUpLoad.Visible = true; - txtUpLoadNo.Text = dgvNoticeList.SelectedRows[0].Cells["clNoticeNo"].Value.ToString(); - txtNoticeTheme.Text = dgvNoticeList.SelectedRows[0].Cells["clNoticetheme"].Value.ToString(); - rtbNoticeContent.Text = dgvNoticeList.SelectedRows[0].Cells["clNoticeContent"].Value.ToString(); + //txtUpLoadNo.Text = dgvNoticeList.SelectedRows[0].Cells["clNoticeNo"].Value.ToString(); + //txtNoticeTheme.Text = dgvNoticeList.SelectedRows[0].Cells["clNoticetheme"].Value.ToString(); + //rtbNoticeContent.Text = dgvNoticeList.SelectedRows[0].Cells["clNoticeContent"].Value.ToString(); //cboSelectClub.Text= dgvNoticeList.SelectedRows[0].Cells["clNoticeClub"].ToString(); //txtNoticePerson.Text= dgvNoticeList.SelectedRows[0].Cells["clNoticePerson"].ToString(); } diff --git a/SYS.FormUI/AppFunction/FrmUpLoad.resx b/SYS.FormUI/AppFunction/FrmUpLoadNotice.resx similarity index 94% rename from SYS.FormUI/AppFunction/FrmUpLoad.resx rename to SYS.FormUI/AppFunction/FrmUpLoadNotice.resx index 6fdf3e74fef275997982b4614ab69b31c5cc8bac..bf371a084fe6ddd10a6229233fb6e255f3ad55ba 100644 --- a/SYS.FormUI/AppFunction/FrmUpLoad.resx +++ b/SYS.FormUI/AppFunction/FrmUpLoadNotice.resx @@ -156,13 +156,4 @@ EBAQEBAQEBAQEBAQEBAlVlkA - - True - - - True - - - True - \ No newline at end of file diff --git a/SYS.FormUI/AppFunction/FrmTopChange.Designer.cs b/SYS.FormUI/AppFunction/FrmWorkerManager.Designer.cs similarity index 99% rename from SYS.FormUI/AppFunction/FrmTopChange.Designer.cs rename to SYS.FormUI/AppFunction/FrmWorkerManager.Designer.cs index e34a291e9bb33e504da98006ee1cdac4901539c5..f54fb28dbd4f4d6d7d30aacd5ae45b8c805aeb53 100644 --- a/SYS.FormUI/AppFunction/FrmTopChange.Designer.cs +++ b/SYS.FormUI/AppFunction/FrmWorkerManager.Designer.cs @@ -1,6 +1,6 @@ namespace SYS.FormUI { - partial class FrmTopChange + partial class FrmWorkerManager { /// /// Required designer variable. diff --git a/SYS.FormUI/AppFunction/FrmTopChange.cs b/SYS.FormUI/AppFunction/FrmWorkerManager.cs similarity index 97% rename from SYS.FormUI/AppFunction/FrmTopChange.cs rename to SYS.FormUI/AppFunction/FrmWorkerManager.cs index 579e3c96ba9dc873d9ba1e87b1c41b04523e7e6a..25b763bcf1c49f8f7ecc1b9a266102b2e71c504b 100644 --- a/SYS.FormUI/AppFunction/FrmTopChange.cs +++ b/SYS.FormUI/AppFunction/FrmWorkerManager.cs @@ -6,7 +6,7 @@ using SYS.Manager; namespace SYS.FormUI { - public partial class FrmTopChange : Form + public partial class FrmWorkerManager : Form { public static string wk_WorkerNo; public static string wk_WorkerName; @@ -28,7 +28,7 @@ namespace SYS.FormUI //定义委托类型的变量 public static ReLoadWorkerList Reload; - public FrmTopChange() + public FrmWorkerManager() { InitializeComponent(); Reload = LoadWorker; @@ -71,7 +71,7 @@ namespace SYS.FormUI CmpSetDgv(); dgvWorkerList.AutoGenerateColumns = false; dgvWorkerList.DataSource = WorkerManager.SelectWorkerAll(); - if (AdminInfo.adminType != "总经理") + if (AdminInfo.Type != "总经理") { btnAddWorker.Enabled = false; btnAddWorker.Text = "权限不足"; diff --git a/SYS.FormUI/AppFunction/FrmTopChange.resx b/SYS.FormUI/AppFunction/FrmWorkerManager.resx similarity index 100% rename from SYS.FormUI/AppFunction/FrmTopChange.resx rename to SYS.FormUI/AppFunction/FrmWorkerManager.resx diff --git a/SYS.FormUI/AppInterface/FrmAdminEnter.cs b/SYS.FormUI/AppInterface/FrmAdminEnter.cs index 96ef806abc5d676170063a80dfdbe73b44855585..c212f00c79cfdc45d69e189ce0910b643af7fcc1 100644 --- a/SYS.FormUI/AppInterface/FrmAdminEnter.cs +++ b/SYS.FormUI/AppInterface/FrmAdminEnter.cs @@ -26,9 +26,10 @@ namespace SYS.FormUI Admin a = AdminManager.SelectMangerByPass(account,pass); if (a != null)//判断超管是否存在 { - AdminInfo.adminType = a.AdminType; - AdminInfo.adminName = txtPassword.Text; - FrmBackAdmin fm = new FrmBackAdmin(); + AdminInfo.Type = a.AdminType; + AdminInfo.Name = a.AdminName; + AdminInfo.Account = a.AdminAccount; + FrmBackgroundSystem fm = new FrmBackgroundSystem(); fm.Show();//打开主窗体 this.Hide();//隐藏登录窗体 } diff --git a/SYS.FormUI/AppInterface/FrmLogin.cs b/SYS.FormUI/AppInterface/FrmLogin.cs index 831b1fa51104d5b6626d0c96faee8013ab7dc0ab..73c67f8d0d4c1d692de4b50a2a47761ed531641a 100644 --- a/SYS.FormUI/AppInterface/FrmLogin.cs +++ b/SYS.FormUI/AppInterface/FrmLogin.cs @@ -7,6 +7,7 @@ using SYS.Core; using SYS.FormUI.Properties; using System.Collections.Generic; using Sunny.UI; +using SYS.Application; namespace SYS.FormUI { @@ -109,10 +110,10 @@ namespace SYS.FormUI #region 判断版本号 private void CheckUpdate() { - string newversion = CheckInfoManager.CheckBaseVersion(); + var newversion = new ApplicationVersionUtil().CheckBaseVersion(); string version = System.Windows.Forms.Application.ProductVersion.ToString(); - if (version != newversion) + if (newversion.base_version != version) { UIMessageDialog.ShowErrorDialog(this, "系统提醒", "旧版已停止使用，请到github或gitee仓库更新最新发行版！"); System.Windows.Forms.Application.Exit(); @@ -169,10 +170,10 @@ namespace SYS.FormUI { string id = txtWorkerId.Text;//获取员工编号 string pwd = txtWorkerPwd.Text;//获取员工密码 - Worker w = WorkerManager.SelectWorkerInfoByWorkerId(id); + Worker w = new WorkerService().SelectWorkerInfoByWorkerId(id); if (w != null)//判断员工编号是否存在 { - w = WorkerManager.SelectWorkerInfoByWorkerIdAndWorkerPwd(id, pwd); + w = new WorkerService().SelectWorkerInfoByWorkerIdAndWorkerPwd(id, pwd); if (w != null) //判断员工密码是否正确 { LoginInfo.WorkerNo = w.WorkerId; @@ -184,12 +185,14 @@ namespace SYS.FormUI this.Hide();//隐藏登录窗体 frm.Show();//打开主窗体 #region 获取添加操作日志所需的信息 - Operation o = new Operation(); + OperationLog o = new OperationLog(); o.OperationTime = DateTime.Parse(DateTime.Now.ToString("yyyy-MM-dd,HH:mm:ss")); o.Operationlog = txtWorkerId.Text + "于" + DateTime.Now + "登入了系统！"; o.OperationAccount = txtWorkerId.Text; + o.datains_usr = LoginInfo.WorkerNo; + o.datains_date = DateTime.Now; #endregion - OperationlogManager.InsertOperationLog(o); + new OperationlogService().InsertOperationLog(o); } else { @@ -204,8 +207,9 @@ namespace SYS.FormUI } } } - catch + catch(Exception ex) { + Console.WriteLine(ex); MessageBox.Show("请连接好数据库！", "温馨提示"); } } diff --git a/SYS.FormUI/AppMain/FrmMain.Designer.cs b/SYS.FormUI/AppMain/FrmMain.Designer.cs index d5b28113e286c3b55455ccfae2f998bbe3c6b5aa..6d65f46c3b8fb873ad50ff7e99cec9d33bd051b4 100644 --- a/SYS.FormUI/AppMain/FrmMain.Designer.cs +++ b/SYS.FormUI/AppMain/FrmMain.Designer.cs @@ -345,7 +345,7 @@ this.pnlCheckInfo.Controls.Add(this.label2); this.pnlCheckInfo.Location = new System.Drawing.Point(173, 53); this.pnlCheckInfo.Name = "pnlCheckInfo"; - this.pnlCheckInfo.Size = new System.Drawing.Size(92, 73); + this.pnlCheckInfo.Size = new System.Drawing.Size(88, 73); this.pnlCheckInfo.TabIndex = 27; this.pnlCheckInfo.Visible = false; // @@ -353,7 +353,7 @@ // this.lblClose.AutoSize = true; this.lblClose.Font = new System.Drawing.Font("Microsoft Sans Serif", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.lblClose.Location = new System.Drawing.Point(73, 6); + this.lblClose.Location = new System.Drawing.Point(66, 5); this.lblClose.Name = "lblClose"; this.lblClose.Size = new System.Drawing.Size(16, 17); this.lblClose.TabIndex = 3; diff --git a/SYS.FormUI/AppMain/FrmMain.cs b/SYS.FormUI/AppMain/FrmMain.cs index 945fc0d218b4c3ad3e505e5a716d1e83b8a87134..d604b0ce4aba204386992fb0e3254205219c1226 100644 --- a/SYS.FormUI/AppMain/FrmMain.cs +++ b/SYS.FormUI/AppMain/FrmMain.cs @@ -10,6 +10,7 @@ using SYS.Core; using SYS.FormUI.Properties; using Sunny.UI; using System.Management; +using SYS.Application; namespace SYS.FormUI { @@ -233,19 +234,18 @@ namespace SYS.FormUI #region 窗体加载事件方法 private void FrmMain_Load(object sender, EventArgs e) { - foreach (Control item in this.Controls) - { - if (item.GetType().ToString() == "System.Windows.Forms.Label") - { - item.Font = UI_FontUtil.SetMainFont(); - } - } + //foreach (Control item in this.Controls) + //{ + // if (item.GetType().ToString() == "System.Windows.Forms.Label") + // { + // item.Font = UI_FontUtil.SetMainFont(); + // } + //} var type = GetCurrentChassisType(); if (type == ChassisTypes.Laptop || type == ChassisTypes.Notebook) { iBattery.Visible = true; - iBattery.FillColor = Color.Lavender; } SetClassLong(this.Handle, GCL_STYLE, GetClassLong(this.Handle, GCL_STYLE) | CS_DropSHADOW); //API函数加载，实现窗体边框阴影效果 @@ -267,7 +267,7 @@ namespace SYS.FormUI label3.Text = "下午好," + LoginInfo.WorkerName; btnHello.BackgroundImage = Resources.咖啡; } - int n = Convert.ToInt32(WorkerCheckManager.SelectToDayCheckInfoByWorkerNo(LoginInfo.WorkerNo)); + int n = Convert.ToInt32(new WorkerCheckService().SelectToDayCheckInfoByWorkerNo(LoginInfo.WorkerNo)); if (n > 0) { linkLabel1.Text = "已打卡"; @@ -377,7 +377,7 @@ namespace SYS.FormUI FrmAdminEnter frm = new FrmAdminEnter(); frm.Show(); #region 获取添加操作日志所需的信息 - Operation o = new Operation(); + OperationLog o = new OperationLog(); o.OperationTime = DateTime.Parse(DateTime.Now.ToString("yyyy-MM-dd,HH:mm:ss")); o.Operationlog = LoginInfo.WorkerNo + LoginInfo.WorkerName + "于" + DateTime.Now + "尝试或成功登入了后台系统！"; o.OperationAccount = LoginInfo.WorkerNo; @@ -479,14 +479,14 @@ namespace SYS.FormUI private void linkLabel1_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) { - int n = Convert.ToInt32(WorkerCheckManager.SelectToDayCheckInfoByWorkerNo(LoginInfo.WorkerNo)); + int n = Convert.ToInt32(new WorkerCheckService().SelectToDayCheckInfoByWorkerNo(LoginInfo.WorkerNo)); if (n > 0) { linkLabel1.Text = "已打卡"; linkLabel1.ForeColor = Color.Green; linkLabel1.LinkColor = Color.Green; pnlCheckInfo.Visible = true; - lblCheckDay.Text = Convert.ToString(WorkerCheckManager.SelectWorkerCheckDaySumByWorkerNo(LoginInfo.WorkerNo)); + lblCheckDay.Text = Convert.ToString(new WorkerCheckService().SelectWorkerCheckDaySumByWorkerNo(LoginInfo.WorkerNo)); } else { @@ -503,10 +503,10 @@ namespace SYS.FormUI CheckTime = DateTime.Parse(GetNetDateTime()) }; - int j = WorkerCheckManager.AddCheckInfo(workerCheck); - if (j > 0) + bool j = new WorkerCheckService().AddCheckInfo(workerCheck); + if (j == true) { - lblCheckDay.Text = Convert.ToString(WorkerCheckManager.SelectWorkerCheckDaySumByWorkerNo(LoginInfo.WorkerNo)); + lblCheckDay.Text = Convert.ToString(new WorkerCheckService().SelectWorkerCheckDaySumByWorkerNo(LoginInfo.WorkerNo)); MessageBox.Show("打卡成功！你已累计打卡" + lblCheckDay.Text + "天，再接再厉吧！", "打卡提醒", MessageBoxButtons.OK, MessageBoxIcon.Information); linkLabel1.Text = "已打卡"; linkLabel1.ForeColor = Color.Green; diff --git a/SYS.FormUI/AppFunction/FrmAdminMain.Designer.cs b/SYS.FormUI/AppUserControls/CtrlOrgChar.Designer.cs similarity index 37% rename from SYS.FormUI/AppFunction/FrmAdminMain.Designer.cs rename to SYS.FormUI/AppUserControls/CtrlOrgChar.Designer.cs index fd10ca648fb4832590a7ad25595ceecc535112a0..0fbd6d374e4d67b0b0b84b13fb46c78a8a7d9f3a 100644 --- a/SYS.FormUI/AppFunction/FrmAdminMain.Designer.cs +++ b/SYS.FormUI/AppUserControls/CtrlOrgChar.Designer.cs @@ -1,17 +1,16 @@ - -namespace SYS.FormUI +namespace SYS.FormUI { - partial class FrmAdminMain + partial class CtrlOrgChar { - /// - /// Required designer variable. + /// + /// 設計工具所需的變數。 /// private System.ComponentModel.IContainer components = null; - /// - /// Clean up any resources being used. + /// + /// 清除任何使用中的資源。 /// - /// true if managed resources should be disposed; otherwise, false. + /// 如果應該處置 Managed 資源則為 true，否則為 false。 protected override void Dispose(bool disposing) { if (disposing && (components != null)) @@ -21,33 +20,41 @@ namespace SYS.FormUI base.Dispose(disposing); } - #region Windows Form Designer generated code + #region 元件設計工具產生的程式碼 - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. + /// + /// 此為設計工具支援所需的方法 - 請勿使用程式碼編輯器修改這個方法的內容。 + /// /// private void InitializeComponent() { - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmAdminMain)); + this.panel1 = new System.Windows.Forms.Panel(); this.SuspendLayout(); // - // FrmAdminMain + // panel1 // - this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 21F); + this.panel1.Location = new System.Drawing.Point(12, 17); + this.panel1.Name = "panel1"; + this.panel1.Size = new System.Drawing.Size(50, 44); + this.panel1.TabIndex = 7; + // + // CtrlOrgChar + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1080, 720); - this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); - this.IsForbidAltF4 = true; - this.Name = "FrmAdminMain"; - this.ShowIcon = true; - this.Text = "TS酒店管理后台安全系统V1.2 稳定版"; - this.TextAlignment = System.Drawing.StringAlignment.Center; - this.Load += new System.EventHandler(this.FrmAdminMain_Load); + this.BackColor = System.Drawing.SystemColors.Info; + this.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.Controls.Add(this.panel1); + this.Name = "CtrlOrgChar"; + this.Size = new System.Drawing.Size(764, 490); this.ResumeLayout(false); } #endregion + + private System.Windows.Forms.Panel panel1; + + } -} \ No newline at end of file +} diff --git a/SYS.FormUI/AppUserControls/CtrlOrgChar.cs b/SYS.FormUI/AppUserControls/CtrlOrgChar.cs new file mode 100644 index 0000000000000000000000000000000000000000..657f33fbdaa62924db74297ff04273bda3cfcac8 --- /dev/null +++ b/SYS.FormUI/AppUserControls/CtrlOrgChar.cs @@ -0,0 +1,102 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Drawing; +using System.Data; +using System.Linq; +using System.Text; +using System.Windows.Forms; + +namespace SYS.FormUI +{ + public partial class CtrlOrgChar : UserControl + { + public CtrlOrgChar() + { + InitializeComponent(); + } + OrgCharGenerator _CharGen = new OrgCharGenerator(); + + private object _RootParentKeyValue; + public object RootParentKeyValue + { + get + { + return _RootParentKeyValue; + } + set + { + if (_RootParentKeyValue != value) + { + _RootParentKeyValue = value; + } + } + } + private string _KeyFileName; + public string KeyFileName + { + get + { + return _KeyFileName; + } + set + { + if (_KeyFileName != value) + { + _KeyFileName = value; + } + } + } + private string _ParentKeyFileName; + public string ParentKeyFileName + { + get + { + return _ParentKeyFileName; + } + set + { + if (_ParentKeyFileName != value) + { + _ParentKeyFileName = value; + } + } + } + private DataTable _DataSource; + public DataTable DataSource + { + get + { + return _DataSource; + } + set + { + if (_DataSource != value) + { + _DataSource = value; + } + } + } + + + public void ShowChar() + { + try + { + this.panel1.SuspendLayout(); + OrgCharDataSource ds = new OrgCharDataSource(this.KeyFileName, + ParentKeyFileName, + _RootParentKeyValue, + DataSource, + typeof(SH_OrgCharControlBuilder), + this.panel1); + _CharGen.GeneratorControlChar(ds); + this.panel1.Invalidate(); + } + finally + { + this.panel1.ResumeLayout(false); + } + } + } +} diff --git a/SYS.FormUI/AppUserControls/CtrlOrgChar.resx b/SYS.FormUI/AppUserControls/CtrlOrgChar.resx new file mode 100644 index 0000000000000000000000000000000000000000..19dc0dd8b3964e653690c64d095c5d28283828b7 --- /dev/null +++ b/SYS.FormUI/AppUserControls/CtrlOrgChar.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/SYS.FormUI/AppUserControls/CtrlOrgPanel.Designer.cs b/SYS.FormUI/AppUserControls/CtrlOrgPanel.Designer.cs new file mode 100644 index 0000000000000000000000000000000000000000..2c2fb173865d72586650b0e86aa3a19b91b9cf26 --- /dev/null +++ b/SYS.FormUI/AppUserControls/CtrlOrgPanel.Designer.cs @@ -0,0 +1,130 @@ +namespace SYS.FormUI +{ + partial class CtrlOrgPanel + { + /// + /// 設計工具所需的變數。 + /// + private System.ComponentModel.IContainer components = null; + + /// + /// 清除任何使用中的資源。 + /// + /// 如果應該處置 Managed 資源則為 true，否則為 false。 + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region 元件設計工具產生的程式碼 + + /// + /// 此為設計工具支援所需的方法 - 請勿使用程式碼編輯器修改這個方法的內容。 + /// + /// + private void InitializeComponent() + { + this.labName = new System.Windows.Forms.LinkLabel(); + this.label1 = new System.Windows.Forms.Label(); + this.label2 = new System.Windows.Forms.Label(); + this.label3 = new System.Windows.Forms.Label(); + this.labDecision = new System.Windows.Forms.Label(); + this.labJobs = new System.Windows.Forms.Label(); + this.SuspendLayout(); + // + // labName + // + this.labName.AutoSize = true; + this.labName.BackColor = System.Drawing.Color.Transparent; + this.labName.Location = new System.Drawing.Point(44, 8); + this.labName.Name = "labName"; + this.labName.Size = new System.Drawing.Size(0, 13); + this.labName.TabIndex = 0; + // + // label1 + // + this.label1.AutoSize = true; + this.label1.BackColor = System.Drawing.Color.Transparent; + this.label1.Location = new System.Drawing.Point(10, 8); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(34, 13); + this.label1.TabIndex = 1; + this.label1.Text = "姓名:"; + // + // label2 + // + this.label2.AutoSize = true; + this.label2.BackColor = System.Drawing.Color.Transparent; + this.label2.Location = new System.Drawing.Point(10, 24); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(34, 13); + this.label2.TabIndex = 2; + this.label2.Text = "職位:"; + // + // label3 + // + this.label3.AutoSize = true; + this.label3.BackColor = System.Drawing.Color.Transparent; + this.label3.Location = new System.Drawing.Point(9, 40); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(34, 13); + this.label3.TabIndex = 4; + this.label3.Text = "決策:"; + // + // labDecision + // + this.labDecision.AutoSize = true; + this.labDecision.BackColor = System.Drawing.Color.Transparent; + this.labDecision.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(136))); + this.labDecision.ForeColor = System.Drawing.Color.Blue; + this.labDecision.Location = new System.Drawing.Point(44, 39); + this.labDecision.Name = "labDecision"; + this.labDecision.Size = new System.Drawing.Size(0, 13); + this.labDecision.TabIndex = 5; + // + // labJobs + // + this.labJobs.AutoSize = true; + this.labJobs.BackColor = System.Drawing.Color.Transparent; + this.labJobs.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(136))); + this.labJobs.ForeColor = System.Drawing.Color.Blue; + this.labJobs.Location = new System.Drawing.Point(44, 24); + this.labJobs.Name = "labJobs"; + this.labJobs.Size = new System.Drawing.Size(0, 15); + this.labJobs.TabIndex = 6; + // + // CtrlOrgPanel + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(247)))), ((int)(((byte)(245)))), ((int)(((byte)(241))))); + this.BackgroundImage = global::SYS.FormUI.Properties.Resources.組織圖塊; + this.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.Controls.Add(this.label3); + this.Controls.Add(this.label2); + this.Controls.Add(this.label1); + this.Controls.Add(this.labName); + this.Controls.Add(this.labDecision); + this.Controls.Add(this.labJobs); + this.DoubleBuffered = true; + this.Name = "CtrlOrgPanel"; + this.Size = new System.Drawing.Size(135, 62); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private System.Windows.Forms.LinkLabel labName; + private System.Windows.Forms.Label label1; + private System.Windows.Forms.Label label2; + private System.Windows.Forms.Label label3; + private System.Windows.Forms.Label labDecision; + private System.Windows.Forms.Label labJobs; + } +} diff --git a/SYS.FormUI/AppUserControls/CtrlOrgPanel.cs b/SYS.FormUI/AppUserControls/CtrlOrgPanel.cs new file mode 100644 index 0000000000000000000000000000000000000000..21ce191dcda9dd02d8354139cccc8e2da37f5963 --- /dev/null +++ b/SYS.FormUI/AppUserControls/CtrlOrgPanel.cs @@ -0,0 +1,123 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Drawing; +using System.Data; +using System.Linq; +using System.Text; +using System.Windows.Forms; + +namespace SYS.FormUI +{ + public partial class CtrlOrgPanel : UserControl, IOrgCharNodeControl + { + public CtrlOrgPanel() + { + InitializeComponent(); + this.Click += new EventHandler(NodeButton_Click); + } + public CtrlOrgPanel(DataRow dr, string name, string descision, string jobs) + { + InitializeComponent(); + + this.Click += new EventHandler(NodeButton_Click); + SourceRow = dr; + this.labDecision.Text = descision; + this.labJobs.Text = jobs; + this.labName.Text = name; + } + + private DataRow _SourceRow; + private DataRow SourceRow + { + set + { + if (_SourceRow != value) + { + _SourceRow = value; + } + } + } + + void NodeButton_Click(object sender, EventArgs e) + { + if (this.ClickCallBack != null) + { + this.ClickCallBack.Invoke(this.Node); + } + } + public OrgCharNode _Node; + #region INodeControl 成員 + private dlgNodeClick _ClickCallBack; + public dlgNodeClick ClickCallBack + { + get + { + return _ClickCallBack; + } + set + { + _ClickCallBack = value; + } + } + public OrgCharNode Node + { + get { return _Node; } + set + { + this._Node = value; + + } + } + public int NodeWidth + { + get { return this.Width; } + set { this.Width = value; } + } + public int NodeHeight + { + get { return this.Height; } + set { this.Height = value; } + } + public int Node_X + { + get { return this.Left; } + set { this.Left = value; } + } + public int Node_Y + { + get { return this.Top; } + set { this.Top = value; } + } + + #endregion + + + + + } + + public class SH_OrgCharControlBuilder : IOrgCharControlBuilder + { + + + #region IOrgCharControlBuilder 成員 + + IOrgCharNodeControl IOrgCharControlBuilder.Build(DataRow dr) + { + //CtrlOrgPanel pel = new CtrlOrgPanel(dr, + // dr["CD_MEMBER"] == DBNull.Value ? "" : dr["CD_MEMBER"].ToString(), + // dr["CD_ROLE"] == DBNull.Value ? "" : dr["CD_ROLE"].ToString(), + // dr["CD_JOB"] == DBNull.Value ? "" : dr["CD_JOB"].ToString() + // ); + CtrlOrgPanel pel = new CtrlOrgPanel(dr, + dr["id"] == DBNull.Value ? "" : dr["id"].ToString(), + dr["id"] == DBNull.Value ? "" : dr["id"].ToString(), + dr["id"] == DBNull.Value ? "" : dr["id"].ToString() + ); + return pel; + } + + #endregion + } +} diff --git a/SYS.FormUI/AppUserControls/CtrlOrgPanel.resx b/SYS.FormUI/AppUserControls/CtrlOrgPanel.resx new file mode 100644 index 0000000000000000000000000000000000000000..19dc0dd8b3964e653690c64d095c5d28283828b7 --- /dev/null +++ b/SYS.FormUI/AppUserControls/CtrlOrgPanel.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/SYS.FormUI/AppUserControls/ExtensionMethods.cs b/SYS.FormUI/AppUserControls/ExtensionMethods.cs new file mode 100644 index 0000000000000000000000000000000000000000..01054b4a3922098ccf6495de89cd495362de1421 --- /dev/null +++ b/SYS.FormUI/AppUserControls/ExtensionMethods.cs @@ -0,0 +1,35 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace SYS.FormUI +{ + public static class ExtensionMethods + { + public static DataTable ToDataTable(this IList data) + { + PropertyDescriptorCollection properties = TypeDescriptor.GetProperties(typeof(T)); + DataTable dt = new DataTable(); + for (int i = 0; i < properties.Count; i++) + { + PropertyDescriptor property = properties[i]; + dt.Columns.Add(property.Name, property.PropertyType); + } + object[] values = new object[properties.Count]; + foreach (T item in data) + { + for (int i = 0; i < values.Length; i++) + { + values[i] = properties[i].GetValue(item); + } + dt.Rows.Add(values); + } + return dt; + } + + } +} diff --git a/SYS.FormUI/AppUserControls/OrgCharGenerator.cs b/SYS.FormUI/AppUserControls/OrgCharGenerator.cs new file mode 100644 index 0000000000000000000000000000000000000000..7a6315cfc020832dced24ae0b77c760fb1c64661 --- /dev/null +++ b/SYS.FormUI/AppUserControls/OrgCharGenerator.cs @@ -0,0 +1,681 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Drawing; +using System.Data; +using System.Windows.Forms; + +namespace SYS.FormUI +{ + public delegate void dlgNodeClick(OrgCharNode node); + public class OrgCharGenerator + { + public const int ROOTMAIGINS_TOP = 30; + public const int NODEMAIGINS_RIGHT = 20; + public const int NODEMAIGINS_LEFT = 20; + /// + /// 節點的垂直間距 + /// + public const int NODE_V_DIS = 50; + /// + /// 節點的水平間距 + /// + public const int NODE_H_DIS = 10; + /// + /// 節點寬 + /// + public const int NODE_WIDTH = 129; + /// + /// 節點高度 + /// + public const int NODE_HEIGHT = 61; + /// + /// 跟節點 + /// + public OrgCharNode _RootNode; + /// + /// 層次集合 + /// + public List Levels = new List(); + /// + /// 數據源 + /// + public OrgCharDataSource DataSource; + /// + /// 容器的控件 + /// + public CtrlOrgChar _OrgCtrl; + public int Max_X; + public int Max_Y; + /// + /// 給定某個範圍，計算出每個node的位置Rectangle + /// + /// + /// 最左邊的節點x座標 + /// 最左邊的節點y座標 + public void GeneratorControlChar(OrgCharNode RootNode) + { + this.Max_X = 0; + this.Max_Y = 0; + _RootNode = RootNode; + this.Levels.Clear(); + AddNodeToLevels(RootNode); + CalNodeRec(RootNode); + if (this.DataSource != null && this.DataSource.Container != null) + { + this.DataSource.Container.Width = this.Max_X + NODE_WIDTH + NODEMAIGINS_RIGHT; + this.DataSource.Container.Height = this.Max_Y + NODE_HEIGHT; + } + } + public void GeneratorControlChar(OrgCharDataSource datasource) + { + DataSource = datasource; + DataSource.Container.Paint += new PaintEventHandler(Container_Paint); + this._RootNode=DataSource.BuildNodeTree(); + GeneratorControlChar(this._RootNode); + } + void Container_Paint(object sender, PaintEventArgs e) + { + this.DrawParenChildLine(e.Graphics); + } + /// + /// 把各個leve層次的節點加入到對應的level中 + /// + /// + private void AddNodeToLevels(OrgCharNode n) + { + if (n.Level > Levels.Count - 1) + { + Level l = new Level(n.Level); + l.Items.Add(n); + Levels.Add(l); + } + else + { + Levels[n.Level].Items.Add(n); + } + Levels.Sort(CompareSortLevel); //重新排序列表 + } + private int CompareSortLevel(Level x, Level y) + { + return x.level.CompareTo(y.level); + } + /// + /// 通過childs來獲取node X座標 + /// + /// + /// + public int GetXByChilds(OrgCharNode node) + { + if (node.Childs.Count > 0) + { + int tmp = 0; + tmp = node.FirstChildNode.X + ((node.LastChildNode.Right - node.FirstChildNode.X) / 2) - NODE_WIDTH / 2; + return tmp; + } + return -1; + } + /// + /// 通過父親的前一個節點的子節點來獲取X座標 + /// + /// + /// + public int GetXByParentPreviousNode(OrgCharNode node) + { + if (node.ParentNode == null) { return -1; } + OrgCharNode pprvnode = node.ParentNode.PreviousNode; + if (pprvnode != null) + { + if (pprvnode.Childs.Count > 0) + { + return pprvnode.LastChildNode.Right + NODE_H_DIS; + } + else + { + return pprvnode.X ; + } + } + else + { + if (node.ParentNode != null) + { + return GetXByParentPreviousNode(node.ParentNode); + } + } + return -1; + } + /// + /// 通過同level的前一個子節點的Right來獲取X座標 + /// + /// + /// + public int GetXByLevel(OrgCharNode node) + { + OrgCharNode prvnode = this.Levels[node.Level].GetPrviousNode(node); + if (prvnode != null) + { + return prvnode.Right + NODE_H_DIS; + } + return -1; + } + + public void CalNodeRec(OrgCharNode node) + { + AddNodeToLevels(node); + foreach (OrgCharNode n in node.Childs) + { + CalNodeRec(n); + } + //System.Diagnostics.Debug.WriteLine((node.Tag); + + node.Width = NODE_WIDTH; + node.Heigth = NODE_HEIGHT; + int[] sortArr = new int[] { + GetXByParentPreviousNode(node), + GetXByChilds(node), + GetXByLevel(node), + NODEMAIGINS_RIGHT }; + Array.Sort(sortArr); + int N_X = sortArr[sortArr.Length - 1]; //取出最大X座標 就是node 的座標 + node.X = N_X; + node.Y = (NODE_V_DIS + NODE_HEIGHT) * node.Level + ROOTMAIGINS_TOP; + if (Max_X < node.X) + { + Max_X = node.X; + } + if (Max_Y< node.Y) + { + Max_Y = node.Y; + } + } + private Pen uPen = new Pen(SystemColors.ControlText, 2); + private Graphics g; + /// + /// 畫父子之間的線條 + /// + public void DrawParenChildLine(Graphics g) + { + this.g = g; + if (this._RootNode != null) + { + DrawParenChildLine(this._RootNode); + } + } + private void DrawParenChildLine(OrgCharNode node) + { + if (node.Childs.Count > 0) + { + foreach (OrgCharNode n in node.Childs) + { + + Draw3Dline( + node.X + node.Width / 2, + node.Botton, + node.X + node.Width / 2, + node.Botton + NODE_V_DIS / 2); + Draw3DEndPoint(node.X + node.Width / 2 , node.Botton,0); + Draw3Dline( + node.X + node.Width / 2, + node.Botton + NODE_V_DIS / 2, + n.X + n.Width / 2, + n.Y - NODE_V_DIS / 2); + Draw3Dline( + n.X + n.Width / 2, + n.Y - NODE_V_DIS / 2, + n.X + n.Width / 2, + n.Y); + Draw3DEndPoint(n.X + n.Width / 2 , n.Y,1); + DrawParenChildLine(n); + + } + } + } + SolidBrush EnpointBrush = new SolidBrush(SystemColors.ControlLightLight); + private void Draw3DEndPoint(int x, int y ,int upanddown) + { + //this.g.FillEllipse(new SolidBrush(SystemColors.ControlDark), new Rectangle(x , y , 8, 8)); + + int h = 5; + Point p1 = new Point(x, y); + + + if (upanddown == 0) + { + + Point p2 = new Point(x , y - h); + Point p3 = new Point(x - h, y - h); + Point p4 = new Point(x + h, y - h); + p1.Offset(-1, 4); + p2.Offset(-1, 4); + p3.Offset(-1, 4); + p4.Offset(-1, 4); + EnpointBrush.Color = ControlPaint.Light(SystemColors.ControlLight, 0.4f); + this.g.FillPolygon(EnpointBrush, new Point[] { p1, p2, p3 }); + EnpointBrush.Color = ControlPaint.Dark(SystemColors.ControlDark, 0.2f); ; + this.g.FillPolygon(EnpointBrush, new Point[] { p1, p2, p4 }); + } + else + { + Point p2 = new Point(x , y+h); + Point p5 = new Point(x - h, y+h); + Point p6 = new Point(x + h, y+h); + p1.Offset(-1, -5); + p2.Offset(-1, -5); + p5.Offset(-1, -5); + p6.Offset(-1, -5); + EnpointBrush.Color = ControlPaint.Light(SystemColors.ControlLight, 0.4f); + + this.g.FillPolygon(EnpointBrush, new Point[] { p1, p2, p5}); + EnpointBrush.Color = ControlPaint.Dark(SystemColors.ControlDark, 0.2f); ; + this.g.FillPolygon(EnpointBrush, new Point[] { p1, p2, p6 }); + } + } + + private void Draw3Dline(int x, int y, int x1, int y1) + { + if (g != null) + { + g.DrawLine(uPen, x, y, x1, y1); + Draw3DLine(g, new Point(x, y), new Point(x1, y1), BorderStyle3D.RaisedFrame, SystemColors.ControlLight, SystemColors.ControlDark); + } + } + private enum BorderStyle3D + { + Default, + None, + Flat, + Raised, + RaisedInner, + RaisedOuter, + Sunken, + SunkenInner, + SunkenOuter, + Etched, + Bump, + RaisedFrame + } + private void Draw3DLine(Graphics g, Point x, Point y, BorderStyle3D style, Color baseColor, Color border) + { + Color color = ControlPaint.Light(baseColor, 0.4f); + Color color2 = ControlPaint.LightLight(baseColor); + Color color3 = ControlPaint.Dark(baseColor, 0.2f); + Color color4 = ControlPaint.Dark(baseColor, 0.6f); + Pen pen = new Pen(color); + switch (style) + { + case BorderStyle3D.Default: + case BorderStyle3D.Flat: + pen.Color = (border == Color.Empty) ? baseColor : border; + g.DrawLine(pen, x, y); + break; + case BorderStyle3D.Raised: + Draw3DLine(g, x, y, BorderStyle3D.RaisedOuter, baseColor, border); + x.Offset(-1, -1); + y.Offset(-1, -1); + Draw3DLine(g, x, y, BorderStyle3D.RaisedInner, baseColor, border); + break; + case BorderStyle3D.RaisedInner: + if (x.X == y.Y) + { + g.DrawLine(pen, x, y); + } + else + { + pen.Color = color3; + g.DrawLine(pen, x, y); + } + break; + case BorderStyle3D.RaisedOuter: + if (x.X == y.Y) + { + pen.Color = color2; + g.DrawLine(pen, x, y); + } + else + { + pen.Color = color4; + g.DrawLine(pen, x, y); + } + break; + + case BorderStyle3D.Sunken: + Draw3DLine(g, x, y, BorderStyle3D.SunkenOuter, baseColor, border); + x.Offset(-1, -1); + y.Offset(-1, -1); + Draw3DLine(g, x, y, BorderStyle3D.SunkenInner, baseColor, border); + break; + + case BorderStyle3D.SunkenInner: + + if (x.X == y.Y) + { + pen.Color = color4; + g.DrawLine(pen, x, y); + } + else + { + pen.Color = color; + g.DrawLine(pen, x, y); + } + break; + case BorderStyle3D.SunkenOuter: + if (x.X == y.Y) + { + pen.Color = color3; + g.DrawLine(pen, x, y); + } + else + { + pen.Color = color2; + g.DrawLine(pen, x, y); + } + break; + + case BorderStyle3D.Etched: + Draw3DLine(g, x, y, BorderStyle3D.SunkenOuter, baseColor, border); + x.Offset(-1, -1); + y.Offset(-1, -1); + + Draw3DLine(g, x, y, BorderStyle3D.RaisedInner, baseColor, border); + break; + + case BorderStyle3D.Bump: + Draw3DLine(g, x, y, BorderStyle3D.RaisedOuter, baseColor, border); + x.Offset(-1, -1); + y.Offset(-1, -1); + + Draw3DLine(g, x, y, BorderStyle3D.SunkenInner, baseColor, border); + break; + case BorderStyle3D.RaisedFrame: + Draw3DLine(g, x, y, BorderStyle3D.Raised, baseColor, border); + x.Offset(-2, -2); + y.Offset(-2, -2); + Draw3DLine(g, x, y, BorderStyle3D.Sunken, baseColor, border); + break; + } + pen.Dispose(); + } + public class Level + { + public Level(int l) + { + level = l; + } + private int GetNodeIndex(OrgCharNode node) + { + for (int i = 0; i < this.Items.Count; i++) + { + if (node.Equals(this.Items[i])) + { + return i; + } + } + return -1; + } + public int level; + + public List Items = new List(); + /// + /// 獲取Level某個節點的前一個節點 + /// + /// + /// + public OrgCharNode GetPrviousNode(OrgCharNode node) + { + int index = this.GetNodeIndex(node); + if (index == -1 || index == 0) + { + return null; + } + else + { + return this.Items[index - 1]; + } + + } + } + } + public class OrgCharNode + { + public OrgCharNode(IOrgCharNodeControl c) + { + this.ctrl = c; + } + private Rectangle PosRec; + public int Level = 0; + public OrgCharNode ParentNode; + public IOrgCharNodeControl ctrl; + public List Childs = new List(); + public event dlgNodeClick OnNodeClick; + public void ControlCallBack(OrgCharNode node) + { + if (this.OnNodeClick != null) + { + this.OnNodeClick(this); + } + } + public void AddChild(OrgCharNode node) + { + node.ParentNode = this; + node.Level = this.Level + 1; + this.Childs.Add(node); + + } + public int Index + { + get + { + if (this.ParentNode != null) + { + return this.ParentNode.Childs.IndexOf(this); + } + return -1; + } + } + public OrgCharNode PreviousNode + { + get + { + if (this.ParentNode != null) + { + if (this.Index == -1 || this.Index == 0) + { + return null; + } + else + { + return this.ParentNode.Childs[this.Index - 1]; + } + } + + return null; + } + } + public OrgCharNode FirstChildNode + { + get + { + if (Childs.Count > 0) + { + return this.Childs[0]; + } + return null; + } + } + public OrgCharNode LastChildNode + { + get + { + if (Childs.Count ==0) + { + return null; + } + else + { + return this.Childs[this.Childs.Count -1]; + } + + } + } + public int X + { + get + { + return PosRec.X; + } + set + { + PosRec.X = value; + if (this.ctrl != null) + { + this.ctrl.Node_X = value; + } + } + } + public int Y + { + get + { + return PosRec.Y; + } + set + { + PosRec.Y = value; + if (this.ctrl != null) + { + this.ctrl.Node_Y = value; + } + } + } + public int Width + { + get + { + return PosRec.Width; + } + set + { + PosRec.Width = value; + if (this.ctrl != null) + { + this.ctrl.NodeWidth = value; + } + } + } + public int Heigth + { + get + { + return PosRec.Height; + } + set + { + PosRec.Height = value; + if (this.ctrl != null) + { + this.ctrl.NodeHeight = value; + } + } + } + public int Right + { + get + { + return X + Width; + } + } + public int Botton + { + get + { + return Y + Heigth; + } + } + public object Tag; + } + + public interface IOrgCharNodeControl + { + dlgNodeClick ClickCallBack { get; set; } + OrgCharNode Node { get; set; } + int Node_X { get; set; } + int Node_Y { get; set; } + int NodeWidth { get; set; } + int NodeHeight { get; set; } + } + public interface IOrgCharControlBuilder + { + IOrgCharNodeControl Build(DataRow dr); + } + + public class OrgCharDataSource + { + /// + /// 數據源構造函數 + /// + /// dt表的主鍵名稱 + /// dt表的父親鍵名稱 + /// 根節點的父節點值 + /// 要顯示的節點控件類型 給控件必須 繼承Control 實現IOrgCharNodeControl 接口 必須有無參數的構造函數 + /// 來源數據表 + public OrgCharDataSource(string k, string pk,object rootparentvalue, DataTable dt,Type Buildertype,Control c) + { + this.KeyFileName = k; + this.ParentKeyFileName = pk; + this.Table = dt; + this.RootParentvalue = rootparentvalue; + this.BuilderType = Buildertype; + this.Container = c; + } + public string KeyFileName; + public string ParentKeyFileName; + public object RootParentvalue; + public DataTable Table; + public Type BuilderType; + public Control Container; + public IOrgCharControlBuilder ControlBuilder; + public OrgCharNode BuildNodeTree() + { + DataRow[] drs = Table.Select(string.Format("{0}='{1}'", ParentKeyFileName, 0)); + if (ControlBuilder == null) + { + ControlBuilder = (IOrgCharControlBuilder)Activator.CreateInstance(this.BuilderType); + } + + IOrgCharNodeControl obj = ControlBuilder.Build(drs[0]); + this.Container.Controls.Add((Control)obj); + obj.Node_X = -100; + obj.NodeHeight = OrgCharGenerator.NODE_HEIGHT; + obj.NodeWidth = OrgCharGenerator.NODE_WIDTH; + OrgCharNode rootn = new OrgCharNode(obj); + obj.Node = rootn; + BuildNodeTree(drs[0], rootn); + return rootn; + } + private void BuildNodeTree(DataRow r, OrgCharNode pn) + { + DataRow[] drs = Table.Select(string.Format("{0}='{1}'", ParentKeyFileName, r[KeyFileName])); + foreach (DataRow d in drs) + { + if (ControlBuilder == null) + { + ControlBuilder = (IOrgCharControlBuilder)Activator.CreateInstance(this.BuilderType); + } + IOrgCharNodeControl obj = ControlBuilder.Build(d); + this.Container.Controls.Add((Control)obj); + + obj.Node_X = -100; + obj.NodeHeight = OrgCharGenerator.NODE_HEIGHT; + obj.NodeWidth = OrgCharGenerator.NODE_WIDTH; + OrgCharNode n = new OrgCharNode(obj); + obj.Node = n; + pn.AddChild(n); + BuildNodeTree(d, n); + } + } + + } + + +} diff --git a/SYS.FormUI/AppUserControls/ucBaseInformation.Designer.cs b/SYS.FormUI/AppUserControls/ucBaseInformation.Designer.cs index 62d014425695579055a3d4673504c52a796249ac..3fd9b26971a3b4a09a15f6edfc9510bbdced2192 100644 --- a/SYS.FormUI/AppUserControls/ucBaseInformation.Designer.cs +++ b/SYS.FormUI/AppUserControls/ucBaseInformation.Designer.cs @@ -38,13 +38,19 @@ namespace SYS.FormUI // this.btnOperation.Anchor = System.Windows.Forms.AnchorStyles.None; this.btnOperation.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnOperation.FillColor = System.Drawing.Color.FromArgb(((int)(((byte)(199)))), ((int)(((byte)(29)))), ((int)(((byte)(35))))); + this.btnOperation.FillHoverColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(128))))); + this.btnOperation.FillSelectedColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(128))))); this.btnOperation.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnOperation.Location = new System.Drawing.Point(34, 4); this.btnOperation.Margin = new System.Windows.Forms.Padding(0); this.btnOperation.MinimumSize = new System.Drawing.Size(1, 1); this.btnOperation.Name = "btnOperation"; this.btnOperation.Radius = 20; + this.btnOperation.RectSelectedColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(128))))); + this.btnOperation.RectSides = System.Windows.Forms.ToolStripStatusLabelBorderSides.None; this.btnOperation.Size = new System.Drawing.Size(44, 26); + this.btnOperation.Style = Sunny.UI.UIStyle.Custom; this.btnOperation.StyleCustomMode = true; this.btnOperation.TabIndex = 15; this.btnOperation.Text = "删除"; @@ -69,10 +75,12 @@ namespace SYS.FormUI this.lbName.Padding = new System.Windows.Forms.Padding(5); this.lbName.Radius = 20; this.lbName.ReadOnly = true; + this.lbName.RectDisableColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255))))); this.lbName.RectSides = System.Windows.Forms.ToolStripStatusLabelBorderSides.None; this.lbName.Size = new System.Drawing.Size(74, 29); this.lbName.Style = Sunny.UI.UIStyle.Custom; this.lbName.TabIndex = 17; + this.lbName.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; this.lbName.MouseLeave += new System.EventHandler(this.lbName_MouseLeave); this.lbName.MouseHover += new System.EventHandler(this.lbName_MouseHover); this.lbName.Validated += new System.EventHandler(this.lbName_Validated); diff --git a/SYS.FormUI/AppUserControls/ucBaseInformation.cs b/SYS.FormUI/AppUserControls/ucBaseInformation.cs index 8dc990ede54c80a032d22553e94e288330866e87..b5da4f38c0637f1854e56a93de7a6770d3eb2d5f 100644 --- a/SYS.FormUI/AppUserControls/ucBaseInformation.cs +++ b/SYS.FormUI/AppUserControls/ucBaseInformation.cs @@ -66,6 +66,19 @@ namespace SYS.FormUI { //lbName.Enabled = true; //lbName.ReadOnly = false; + if (btnOperation.Text == "恢复") + { + FrmNation.info = lbName.Text.Replace("名称:", string.Empty).ToString(); + FrmNation.Accessed(); + return; + } + if (btnOperation.Text == "新增") + { + lbName.Enabled = true; + lbName.ReadOnly = false; + return; + } + FrmNation.info = lbName.Text.Replace("名称:", string.Empty).ToString(); FrmNation.operation(); //MessageBox.Show(lbName.Text.Replace("名称:", string.Empty).ToString()); @@ -73,8 +86,8 @@ namespace SYS.FormUI private void lbName_MouseLeave(object sender, EventArgs e) { - lbName.Enabled = false; - lbName.ReadOnly = true; + //lbName.Enabled = false; + //lbName.ReadOnly = true; lbName.FillColor = Color.FromArgb(235, 243, 255); lbName.FillDisableColor = Color.FromArgb(235, 243, 255); lbName.RectColor = Color.FromArgb(235, 243, 255); @@ -82,13 +95,14 @@ namespace SYS.FormUI private void lbName_MouseHover(object sender, EventArgs e) { - lbName.Enabled = true; - lbName.ReadOnly = false; + //lbName.Enabled = true; + //lbName.ReadOnly = false; } private void lbName_Validated(object sender, EventArgs e) { - + FrmNation.info = lbName.Text.ToString(); + FrmNation.insert(); } } } diff --git a/SYS.FormUI/AppUserControls/ucBaseInformation.resx b/SYS.FormUI/AppUserControls/ucBaseInformation.resx index 90ec49eb51ed03991e305a8398c7817c18fc3e06..4b6d373804dd2ef49fc2fa35e581344d9c8cb369 100644 --- a/SYS.FormUI/AppUserControls/ucBaseInformation.resx +++ b/SYS.FormUI/AppUserControls/ucBaseInformation.resx @@ -129,13 +129,13 @@ - iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAS5JREFUWEft - lr+uAUEYxfcN9k994xG4NY1WIoJEf2udiFJotEqtXryD5/A0nDOOtWSyO0IuxXeSXybzzXdmjzW7RF+h - JEnaYAFOgSxkdUrTtBbH8cbT54W99MjuAmxRXGFkkBD24E92+hn+oLUQ2LuU3W3AZG1NK0UzN9GUc3dx - TSvF3qLfAlgAC2AB3hIAb9KRppXitYr+fEMtlIJ3eBfjEWNddvobgB9iwJ4AGHgm+0Uo9rkQQpZlTdly - oc4Q3n4PQ9lMN+G2BH8F4Fe2XKgNH3rK6Ml2EQqvHsIpOKHWufaVwIPKAzuV3W3wr48he4v+twR40s87 - YQEsgAWwAHcB1mCuhRD2D6/iHnAhQoB3d/d/AL/vP1iYAG5SCTZoyZoLtbGv1wcuvpLt04qiM/cKDdw4 - ayEsAAAAAElFTkSuQmCC + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAEuSURBVFhH7Za/rgFBGMX3DfZPfeMRuDWNViKCRH9rnYhSaLRKrV68g+fwNJwzjrVksjtCLsV3 + kl8m8813Zo81u0RfoSRJ2mABToEsZHVK07QWx/HG0+eFvfTI7gJsUVxhZJAQ9uBPdvoZ/qC1ENi7lN1t + wGRtTStFMzfRlHN3cU0rxd6i3wJYAAtgAd4SAG/SkaaV4rWK/nxDLZSCd3gX4xFjXXb6G4AfYsCeABh4 + JvtFKPa5EEKWZU3ZcqHOEN5+D0PZTDfhtgR/BeBXtlyoDR96yujJdhEKrx7CKTih1rn2lcCDygM7ld1t + 8K+PIXuL/rcEeNLPO2EBLIAFsAB3AdZgroUQ9g+v4h5wIUKAd3f3fwC/7z9YmABuUgk2aMmaC7Wxr9cH + Lr6S7dOKojP3Cg3cOGshLAAAAABJRU5ErkJggg== \ No newline at end of file diff --git a/SYS.FormUI/AppUserControls/ucRoomList.Designer.cs b/SYS.FormUI/AppUserControls/ucRoomList.Designer.cs index c74f4f539c9d7e2cb6ad9cd2be59979e3e1bfd7d..611f409129bc8783474360ef5d728d5cfb856473 100644 --- a/SYS.FormUI/AppUserControls/ucRoomList.Designer.cs +++ b/SYS.FormUI/AppUserControls/ucRoomList.Designer.cs @@ -167,8 +167,8 @@ private System.Windows.Forms.ToolStripMenuItem tsmiChangeState; private System.Windows.Forms.ToolStripMenuItem tsmiChangeRoom; private System.Windows.Forms.ToolStripMenuItem tsmiReserRoom; - private System.Windows.Forms.Label lblCustoNo; - private System.Windows.Forms.Label lblRoomType; - private System.Windows.Forms.Label lblRoomNo; + public System.Windows.Forms.Label lblCustoNo; + public System.Windows.Forms.Label lblRoomType; + public System.Windows.Forms.Label lblRoomNo; } } diff --git a/SYS.FormUI/AppUserControls/ucRoomList.cs b/SYS.FormUI/AppUserControls/ucRoomList.cs index ca0d276c0a466b2bc81ec7eecbed8b6a1bb7a926..a58f092be45c69a7241b4c4790523d49a2748894 100644 --- a/SYS.FormUI/AppUserControls/ucRoomList.cs +++ b/SYS.FormUI/AppUserControls/ucRoomList.cs @@ -7,6 +7,7 @@ using System.Windows.Forms; using SYS.Manager; using SYS.Core; using SYS.FormUI.Properties; +using SYS.Application; namespace SYS.FormUI { @@ -23,12 +24,7 @@ namespace SYS.FormUI //traninfo = LoadRoomInfo(co_RoomNo, co_CustoNo, co_RoomPosition, co_CheckTime, co_RoomState); //string Roomno, string Custono, string Roompo, string Checktime, string Roomstate } - public ucRoomList(FrmRoomManager frm) - { - InitializeComponent(); - this.frm = frm; - - } + #region 房态图圆角代码 public GraphicsPath GetRoundRectPath(RectangleF rect, float radius) { @@ -158,7 +154,7 @@ namespace SYS.FormUI #region 鼠标点击房态图传值到类 private void ucRoomList_Click(object sender, EventArgs e) { - frm.CmpInfo(romCustoInfo, romRoomInfo); + //frm.CmpInfo(romCustoInfo, romRoomInfo); co_RoomNo = romCustoInfo.RoomNo; co_CustoNo = romCustoInfo.CustoNo; co_CheckTime = Convert.ToDateTime(romCustoInfo.CheckTime).ToString(); @@ -170,19 +166,19 @@ namespace SYS.FormUI #region 房态图加载事件方法 private void ucRoomList_Load(object sender, EventArgs e) { - foreach (Control label in this.Controls) - { - if (label.GetType().ToString() == "System.Windows.Forms.Label") - { - label.Font = UI_FontUtil.SetRoomControlsFont(); - } - } + //foreach (Control label in this.Controls) + //{ + // if (label.GetType().ToString() == "System.Windows.Forms.Label") + // { + // label.Font = UI_FontUtil.SetRoomControlsFont(); + // } + //} this.CanPenetrate(); this.Region = new Region(GetRoundRectPath(new RectangleF(0, 0, this.Width, this.Height), 8f)); - lblCustoNo.Text = romCustoInfo.CustoNo; - lblRoomNo.Text = romCustoInfo.RoomNo; - lblRoomType.Text = romCustoInfo.typeName; - co_CheckTime = romCustoInfo.CheckTime.ToString(); + //lblCustoNo.Text = romCustoInfo.CustoNo; + //lblRoomNo.Text = romCustoInfo.RoomNo; + //lblRoomType.Text = romCustoInfo.typeName; + //co_CheckTime = romCustoInfo.CheckTime.ToString(); us_CustoNo = romRoomInfo.CustoNo; us_CustoName = romRoomInfo.CustoName; @@ -224,7 +220,7 @@ namespace SYS.FormUI #region 当右键菜单打开时事件方法 private void cmsMain_Opening(object sender, CancelEventArgs e) { - r = RoomManager.SelectRoomByRoomNo(lblRoomNo.Text); + r = new RoomService().SelectRoomByRoomNo(lblRoomNo.Text); if (lblCustoNo.Text != "") { tsmiCheckIn.Enabled = false; @@ -356,9 +352,8 @@ namespace SYS.FormUI #region 修改房间状态 private void tsmiChangeState_Click(object sender, EventArgs e) { - //RoomManager.UpdateRoomStateByRoomNo(lblRoomNo.Text); - RoomStatic.RoomStateId = Convert.ToInt32(RoomManager.SelectRoomStateIdByRoomNo(lblRoomNo.Text)); - RoomStatic.RoomNo = lblRoomNo.Text; + rm_RoomStateId = Convert.ToInt32(RoomManager.SelectRoomStateIdByRoomNo(lblRoomNo.Text)); + rm_RoomNo = lblRoomNo.Text; FrmRoomStateManager frsm = new FrmRoomStateManager(); frsm.ShowDialog(); } @@ -390,30 +385,30 @@ namespace SYS.FormUI private void lblRoomType_Click(object sender, EventArgs e) { - frm.CmpInfo(romCustoInfo, romRoomInfo); + //frm.CmpInfo(romCustoInfo, romRoomInfo); co_RoomNo = romCustoInfo.RoomNo; co_CustoNo = romCustoInfo.CustoNo; - co_CheckTime = Convert.ToDateTime(romCustoInfo.CheckTime).ToString(); + co_CheckTime = Convert.ToDateTime(romCustoInfo.CheckTime).ToString("yyyy年MM月dd日"); co_RoomPosition = romCustoInfo.RoomPosition; co_RoomState = romCustoInfo.RoomState; } private void lblRoomNo_Click(object sender, EventArgs e) { - frm.CmpInfo(romCustoInfo, romRoomInfo); + //frm.CmpInfo(romCustoInfo, romRoomInfo); co_RoomNo = romCustoInfo.RoomNo; co_CustoNo = romCustoInfo.CustoNo; - co_CheckTime = Convert.ToDateTime(romCustoInfo.CheckTime).ToString(); + co_CheckTime = Convert.ToDateTime(romCustoInfo.CheckTime).ToString("yyyy年MM月dd日"); co_RoomPosition = romCustoInfo.RoomPosition; co_RoomState = romCustoInfo.RoomState; } private void lblCustoNo_Click(object sender, EventArgs e) { - frm.CmpInfo(romCustoInfo, romRoomInfo); + //frm.CmpInfo(romCustoInfo, romRoomInfo); co_RoomNo = romCustoInfo.RoomNo; co_CustoNo = romCustoInfo.CustoNo; - co_CheckTime = Convert.ToDateTime(romCustoInfo.CheckTime).ToString(); + co_CheckTime = Convert.ToDateTime(romCustoInfo.CheckTime).ToString("yyyy年MM月dd日"); co_RoomPosition = romCustoInfo.RoomPosition; co_RoomState = romCustoInfo.RoomState; } diff --git a/SYS.FormUI/Program.cs b/SYS.FormUI/Program.cs index 079a7b20979dd212cdb564df645b69578b6a29a2..8cbda971e1584b15f7ad755c774776cb2aedf414 100644 --- a/SYS.FormUI/Program.cs +++ b/SYS.FormUI/Program.cs @@ -14,7 +14,7 @@ namespace SYS.FormUI { System.Windows.Forms.Application.EnableVisualStyles(); System.Windows.Forms.Application.SetCompatibleTextRenderingDefault(false); - System.Windows.Forms.Application.Run(new FrmNation()); + System.Windows.Forms.Application.Run(new FrmLogin()); } } } diff --git a/SYS.FormUI/Properties/Resources.Designer.cs b/SYS.FormUI/Properties/Resources.Designer.cs index ec817514822ea5b025495a58f91463477c27ce5b..b6b1725fbf2e77a08e6b9b12472fed61fd8619e0 100644 --- a/SYS.FormUI/Properties/Resources.Designer.cs +++ b/SYS.FormUI/Properties/Resources.Designer.cs @@ -80,6 +80,16 @@ namespace SYS.FormUI.Properties { } } + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// + internal static System.Drawing.Bitmap _lock { + get { + object obj = ResourceManager.GetObject("lock", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// @@ -280,6 +290,16 @@ namespace SYS.FormUI.Properties { } } + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// + internal static System.Drawing.Bitmap settings2 { + get { + object obj = ResourceManager.GetObject("settings2", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// @@ -340,6 +360,16 @@ namespace SYS.FormUI.Properties { } } + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// + internal static System.Drawing.Bitmap 增加_添加_加减__1_ { + get { + object obj = ResourceManager.GetObject("增加 添加 加减 (1)", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// @@ -490,6 +520,26 @@ namespace SYS.FormUI.Properties { } } + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// + internal static System.Drawing.Bitmap 添加__增加___加 { + get { + object obj = ResourceManager.GetObject("添加 增加 加", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// + internal static System.Drawing.Bitmap 組織圖塊 { + get { + object obj = ResourceManager.GetObject("組織圖塊", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// diff --git a/SYS.FormUI/Properties/Resources.resx b/SYS.FormUI/Properties/Resources.resx index 19c62f2c60f7a3b1f003476ad0177e7b5e624734..0b468f57ce441353da54de91da7cf067433b4d81 100644 --- a/SYS.FormUI/Properties/Resources.resx +++ b/SYS.FormUI/Properties/Resources.resx @@ -118,163 +118,178 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - ..\Resources\经理部界面.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\button.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\arrow-down-b.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\更多扩展-ib.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\酒店部界面.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\bin\Debug\已住icon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\修改.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\后勤部界面.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\月亮.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\添 加-a.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\搜索--1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\获取用户编号.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\添 加a.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\获取用户编号-ia.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\main_bg.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\bin\Debug\RoomState2-h.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\delete2a.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\bin\Debug\RoomState3.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\bin\Debug\RoomState1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\bin\Debug\RoomState4.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\bin\Debug\RoomState2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\导出 (4)1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\已预约.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\修改a.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\bin\Debug\RoomState3_fixed-h.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\已入住.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\bin\Debug\可住icon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\添加 增加 加.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\Background.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\后勤部界面.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\更多扩展-ib.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\人事部界面.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\bin\Debug\RoomState4.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\bin\Debug\打卡.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\早上.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\bin\Debug\RoomState1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\bin\Debug\RoomState5-h.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\bin\Debug\脏房icon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\bin\Debug\RoomState3_fixed.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\minus.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\添 加a.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\bin\Debug\打卡.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\lock.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\隐藏.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\财务部界面.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\修改a.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\早上.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\餐饮部界面.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\bin\Debug\RoomState4-h.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\button.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\delete2-a.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\获取用户编号.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\搜索--1a.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\更多扩展-ia.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\显示.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\修改.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\770e7b52ecafc807247aad51bb6c6b43.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\minus (1).png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\餐饮部界面.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\delete2-a.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\咖啡.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\close.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\bin\Debug\RoomState5-h.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\bin\Debug\RoomState4-h.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\酒店部界面.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\已入住.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\搜索--1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\bin\Debug\RoomState2-h.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\bin\Debug\客房icon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\bin\Debug\RoomState3.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\bin\Debug\预约房icon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\月亮.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\delete2a.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\770e7b52ecafc807247aad51bb6c6b43.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\close.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\bin\Debug\RoomState1-h.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\经理部界面.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\显示.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\增加 添加 加减 (1).png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\搜索--1a.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\bin\Debug\RoomState3_fixed-h.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\咖啡.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\已预约.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\bin\Debug\RoomState5.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\77377282_p0_master1200.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\settings2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\bin\Debug\客房icon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\arrow-down-b.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\财务部界面.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\minus (1).png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\人事部界面.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\bin\Debug\RoomState2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\导出 (4)1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\77377282_p0_master1200.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\获取用户编号-ia.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\更多扩展-ia.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\bin\Debug\可住icon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\minus.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\bin\Debug\维修房icon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\bin\Debug\已住icon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\main_bg.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\bin\Debug\预约房icon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\bin\Debug\RoomState1-h.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\bin\Debug\脏房icon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\隐藏.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\組織圖塊.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a \ No newline at end of file diff --git a/SYS.FormUI/Resources/lock.png b/SYS.FormUI/Resources/lock.png new file mode 100644 index 0000000000000000000000000000000000000000..7dca57cb7ab090a7371a3ad3c60647c263eabb81 Binary files /dev/null and b/SYS.FormUI/Resources/lock.png differ diff --git a/SYS.FormUI/Resources/settings2.png b/SYS.FormUI/Resources/settings2.png new file mode 100644 index 0000000000000000000000000000000000000000..e56e54cdba703b849954937aa21e8692b75786ac Binary files /dev/null and b/SYS.FormUI/Resources/settings2.png differ diff --git "a/SYS.FormUI/Resources/\345\242\236\345\212\240 \346\267\273\345\212\240 \345\212\240\345\207\217 (1).png" "b/SYS.FormUI/Resources/\345\242\236\345\212\240 \346\267\273\345\212\240 \345\212\240\345\207\217 (1).png" new file mode 100644 index 0000000000000000000000000000000000000000..8b1d03ac8f361a787ee47f995aeb66735f955c40 Binary files /dev/null and "b/SYS.FormUI/Resources/\345\242\236\345\212\240 \346\267\273\345\212\240 \345\212\240\345\207\217 (1).png" differ diff --git "a/SYS.FormUI/Resources/\346\267\273\345\212\240 \345\242\236\345\212\240 \345\212\240.png" "b/SYS.FormUI/Resources/\346\267\273\345\212\240 \345\242\236\345\212\240 \345\212\240.png" new file mode 100644 index 0000000000000000000000000000000000000000..1a0809a4478ec9fae2534cf3fdc8400617b860a8 Binary files /dev/null and "b/SYS.FormUI/Resources/\346\267\273\345\212\240 \345\242\236\345\212\240 \345\212\240.png" differ diff --git "a/SYS.FormUI/Resources/\347\265\204\347\271\224\345\234\226\345\241\212.bmp" "b/SYS.FormUI/Resources/\347\265\204\347\271\224\345\234\226\345\241\212.bmp" new file mode 100644 index 0000000000000000000000000000000000000000..32e99a63b70d33b580a52440a17f5b471add23f0 Binary files /dev/null and "b/SYS.FormUI/Resources/\347\265\204\347\271\224\345\234\226\345\241\212.bmp" differ diff --git a/SYS.FormUI/SYS.FormUI.csproj b/SYS.FormUI/SYS.FormUI.csproj index 90920439cec87376d66ee39334b9de8384bd8dab..23784bbe90417d696265019e4f32dd5064591ee0 100644 --- a/SYS.FormUI/SYS.FormUI.csproj +++ b/SYS.FormUI/SYS.FormUI.csproj @@ -90,6 +90,9 @@ False ..\SYS.Library\MySql.Data.EntityFramework.dll + + ..\packages\SqlSugar.5.0.2\lib\SqlSugar.dll + ..\packages\SunnyUI.2.2.9\lib\net40\SunnyUI.dll @@ -109,6 +112,9 @@ + + C:\Users\Administrator\Downloads\Compressed\WindowsFormsApplication2\WindowsFormsApplication2\Until\bin\Debug\Until.dll + @@ -129,6 +135,12 @@ FrmNation.cs + + Form + + + FrmNotice.cs + Form @@ -141,21 +153,31 @@ FrmSexType.cs - + UserControl + Always - - ucBaseInformation.cs + + CtrlOrgChar.cs + Always - - Component + + UserControl Always - - Form + + CtrlOrgPanel.cs + Always + + + + Always - - FrmAdminMain.cs + + UserControl + + + ucBaseInformation.cs Form @@ -193,29 +215,17 @@ FrmAdminEnter.cs - - Form - - - FrmBackAdmin.cs - - - Form - - - FrmBackUpDatabase.cs - Form FrmCash.cs - + Form - - FrmCashList.cs + + FrmCheckList.cs Form @@ -319,23 +329,17 @@ FrmSellThingManager.cs - + Form - - FrmStart.cs + + FrmWorkerManager.cs - + Form - - FrmTopChange.cs - - - Form - - - FrmUpLoad.cs + + FrmUpLoadNotice.cs Form @@ -399,9 +403,6 @@ WtiInfo.cs - - FrmAdminMain.cs - FrmBackgroundSystem.cs @@ -427,6 +428,9 @@ FrmNation.cs + + FrmNotice.cs + FrmPosition.cs @@ -436,17 +440,11 @@ FrmAdminEnter.cs - - FrmBackAdmin.cs - - - FrmBackUpDatabase.cs - FrmCash.cs - - FrmCashList.cs + + FrmCheckList.cs FrmChangePosition.cs @@ -499,14 +497,11 @@ FrmSellThingManager.cs - - FrmStart.cs + + FrmWorkerManager.cs - - FrmTopChange.cs - - - FrmUpLoad.cs + + FrmUpLoadNotice.cs FrmCustomerManager.cs @@ -530,6 +525,14 @@ FrmWorkerCheckInfo.cs + + CtrlOrgChar.cs + Always + + + CtrlOrgPanel.cs + Always + ucBaseInformation.cs @@ -727,6 +730,11 @@ + + + + + @@ -779,6 +787,14 @@ + + {600f4cc8-4323-4237-a55c-bfef4b67d57c} + SYS.Application + + + {65501AF6-C629-448A-847E-1BCD60665865} + SYS.Common + {cd039d0f-bd50-4fbf-b9cd-cdfab25c7dfa} SYS.Core diff --git a/SYS.FormUI/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/SYS.FormUI/obj/Debug/DesignTimeResolveAssemblyReferences.cache index 876b09b538f5d540194795b435767e8c5c1066d4..cde02edca52aa3dcef09298c338444aa136cdc2f 100644 Binary files a/SYS.FormUI/obj/Debug/DesignTimeResolveAssemblyReferences.cache and b/SYS.FormUI/obj/Debug/DesignTimeResolveAssemblyReferences.cache differ diff --git a/SYS.FormUI/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/SYS.FormUI/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 3d1c241aac2ef2cb974bdc7b58f13fe312a08be0..71f387485ace3100312568bcf3f131fffb7b828d 100644 Binary files a/SYS.FormUI/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/SYS.FormUI/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/SYS.FormUI/obj/Debug/SYS.FormUI.csproj.FileListAbsolute.txt b/SYS.FormUI/obj/Debug/SYS.FormUI.csproj.FileListAbsolute.txt index ecd5725ef96ca57197a54457f97b52953be3ba2c..79a584923e8bc57953378f6c230c5ada8eeceed6 100644 --- a/SYS.FormUI/obj/Debug/SYS.FormUI.csproj.FileListAbsolute.txt +++ b/SYS.FormUI/obj/Debug/SYS.FormUI.csproj.FileListAbsolute.txt @@ -206,7 +206,6 @@ D:\TopSkyHotelManagerSystem\TopskyHotelManagerSystem\SYS.FormUI\bin\Debug\Resour D:\TopSkyHotelManagerSystem\TopskyHotelManagerSystem\SYS.FormUI\bin\Debug\Resource.resx D:\TopSkyHotelManagerSystem\TopskyHotelManagerSystem\SYS.FormUI\bin\Debug\Resource.Designer.cs D:\TopSkyHotelManagerSystem\TopskyHotelManagerSystem\SYS.FormUI\bin\Debug\Util\IDCardUtil.cs -D:\TopSkyHotelManagerSystem\TopskyHotelManagerSystem\SYS.FormUI\bin\Debug\CircleProgramBar.cs D:\TopSkyHotelManagerSystem\TopskyHotelManagerSystem\SYS.FormUI\bin\Debug\TS酒店管理系统.exe.config D:\TopSkyHotelManagerSystem\TopskyHotelManagerSystem\SYS.FormUI\bin\Debug\TS酒店管理系统.exe.manifest D:\TopSkyHotelManagerSystem\TopskyHotelManagerSystem\SYS.FormUI\bin\Debug\TS酒店管理系统.application @@ -218,17 +217,13 @@ D:\TopSkyHotelManagerSystem\TopskyHotelManagerSystem\SYS.FormUI\bin\Debug\SYS.Co D:\TopSkyHotelManagerSystem\TopskyHotelManagerSystem\SYS.FormUI\bin\Debug\EntityFramework.xml D:\TopSkyHotelManagerSystem\TopskyHotelManagerSystem\SYS.FormUI\obj\Debug\SYS.FormUI.csprojAssemblyReference.cache D:\TopSkyHotelManagerSystem\TopskyHotelManagerSystem\SYS.FormUI\obj\Debug\SYS.FormUI.csproj.ResolveComReference.cache -D:\TopSkyHotelManagerSystem\TopskyHotelManagerSystem\SYS.FormUI\obj\Debug\SYS.FormUI.FrmAdminMain.resources D:\TopSkyHotelManagerSystem\TopskyHotelManagerSystem\SYS.FormUI\obj\Debug\SYS.FormUI.FrmBackgroundSystem.resources D:\TopSkyHotelManagerSystem\TopskyHotelManagerSystem\SYS.FormUI\obj\Debug\SYS.FormUI.FrmChart.resources D:\TopSkyHotelManagerSystem\TopskyHotelManagerSystem\SYS.FormUI\obj\Debug\SYS.FormUI.FrmAboutUs.resources D:\TopSkyHotelManagerSystem\TopskyHotelManagerSystem\SYS.FormUI\obj\Debug\SYS.FormUI.FrmAddRoom.resources D:\TopSkyHotelManagerSystem\TopskyHotelManagerSystem\SYS.FormUI\obj\Debug\SYS.FormUI.FrmAddWorker.resources D:\TopSkyHotelManagerSystem\TopskyHotelManagerSystem\SYS.FormUI\obj\Debug\SYS.FormUI.FrmAdminEnter.resources -D:\TopSkyHotelManagerSystem\TopskyHotelManagerSystem\SYS.FormUI\obj\Debug\SYS.FormUI.FrmBackAdmin.resources -D:\TopSkyHotelManagerSystem\TopskyHotelManagerSystem\SYS.FormUI\obj\Debug\SYS.FormUI.FrmBackupDatabase.resources D:\TopSkyHotelManagerSystem\TopskyHotelManagerSystem\SYS.FormUI\obj\Debug\SYS.FormUI.FrmCash.resources -D:\TopSkyHotelManagerSystem\TopskyHotelManagerSystem\SYS.FormUI\obj\Debug\SYS.FormUI.FrmCashList.resources D:\TopSkyHotelManagerSystem\TopskyHotelManagerSystem\SYS.FormUI\obj\Debug\SYS.FormUI.FrmChangePosition.resources D:\TopSkyHotelManagerSystem\TopskyHotelManagerSystem\SYS.FormUI\obj\Debug\SYS.FormUI.FrmChangeRoom.resources D:\TopSkyHotelManagerSystem\TopskyHotelManagerSystem\SYS.FormUI\obj\Debug\SYS.FormUI.FrmChangeWorker.resources @@ -246,9 +241,6 @@ D:\TopSkyHotelManagerSystem\TopskyHotelManagerSystem\SYS.FormUI\obj\Debug\SYS.Fo D:\TopSkyHotelManagerSystem\TopskyHotelManagerSystem\SYS.FormUI\obj\Debug\SYS.FormUI.FrmSelectCustoInfo.resources D:\TopSkyHotelManagerSystem\TopskyHotelManagerSystem\SYS.FormUI\obj\Debug\SYS.FormUI.FrmSellThing.resources D:\TopSkyHotelManagerSystem\TopskyHotelManagerSystem\SYS.FormUI\obj\Debug\SYS.FormUI.FrmSellThingManager.resources -D:\TopSkyHotelManagerSystem\TopskyHotelManagerSystem\SYS.FormUI\obj\Debug\SYS.FormUI.FrmStart.resources -D:\TopSkyHotelManagerSystem\TopskyHotelManagerSystem\SYS.FormUI\obj\Debug\SYS.FormUI.FrmTopChange.resources -D:\TopSkyHotelManagerSystem\TopskyHotelManagerSystem\SYS.FormUI\obj\Debug\SYS.FormUI.FrmUpLoad.resources D:\TopSkyHotelManagerSystem\TopskyHotelManagerSystem\SYS.FormUI\obj\Debug\SYS.FormUI.FrmCustomerManager.resources D:\TopSkyHotelManagerSystem\TopskyHotelManagerSystem\SYS.FormUI\obj\Debug\SYS.FormUI.FrmLogin.resources D:\TopSkyHotelManagerSystem\TopskyHotelManagerSystem\SYS.FormUI\obj\Debug\SYS.FormUI.FrmMain.resources @@ -275,3 +267,19 @@ D:\TopSkyHotelManagerSystem\TopskyHotelManagerSystem\SYS.FormUI\obj\Debug\SYS.Fo D:\TopSkyHotelManagerSystem\TopskyHotelManagerSystem\SYS.FormUI\obj\Debug\SYS.FormUI.FrmNation.resources D:\TopSkyHotelManagerSystem\TopskyHotelManagerSystem\SYS.FormUI\obj\Debug\SYS.FormUI.ucBaseInformation.resources D:\TopSkyHotelManagerSystem\TopskyHotelManagerSystem\SYS.FormUI\bin\Debug\SYS.Application.xml +D:\TopSkyHotelManagerSystem\TopskyHotelManagerSystem\SYS.FormUI\obj\Debug\TS酒店管理系统.exe.config +D:\TopSkyHotelManagerSystem\TopskyHotelManagerSystem\SYS.FormUI\obj\Debug\SYS.FormUI.FrmNotice.resources +D:\TopSkyHotelManagerSystem\TopskyHotelManagerSystem\SYS.FormUI\obj\Debug\SYS.FormUI.FrmCheckList.resources +D:\TopSkyHotelManagerSystem\TopskyHotelManagerSystem\SYS.FormUI\obj\Debug\SYS.FormUI.FrmWorkerManager.resources +D:\TopSkyHotelManagerSystem\TopskyHotelManagerSystem\SYS.FormUI\obj\Debug\SYS.FormUI.FrmUpLoadNotice.resources +D:\TopSkyHotelManagerSystem\TopskyHotelManagerSystem\SYS.FormUI\obj\Debug\SYS.FormUI.CtrlOrgChar.resources +D:\TopSkyHotelManagerSystem\TopskyHotelManagerSystem\SYS.FormUI\obj\Debug\SYS.FormUI.CtrlOrgPanel.resources +D:\TopSkyHotelManagerSystem\TopskyHotelManagerSystem\SYS.FormUI\bin\Debug\AppUserControls\CtrlOrgChar.resx +D:\TopSkyHotelManagerSystem\TopskyHotelManagerSystem\SYS.FormUI\bin\Debug\AppUserControls\CtrlOrgPanel.resx +D:\TopSkyHotelManagerSystem\TopskyHotelManagerSystem\SYS.FormUI\bin\Debug\AppUserControls\CtrlOrgChar.cs +D:\TopSkyHotelManagerSystem\TopskyHotelManagerSystem\SYS.FormUI\bin\Debug\AppUserControls\CtrlOrgChar.Designer.cs +D:\TopSkyHotelManagerSystem\TopskyHotelManagerSystem\SYS.FormUI\bin\Debug\AppUserControls\CtrlOrgPanel.cs +D:\TopSkyHotelManagerSystem\TopskyHotelManagerSystem\SYS.FormUI\bin\Debug\AppUserControls\CtrlOrgPanel.Designer.cs +D:\TopSkyHotelManagerSystem\TopskyHotelManagerSystem\SYS.FormUI\bin\Debug\AppUserControls\OrgCharGenerator.cs +D:\TopSkyHotelManagerSystem\TopskyHotelManagerSystem\SYS.FormUI\bin\Debug\SYS.Common.dll.config +D:\TopSkyHotelManagerSystem\TopskyHotelManagerSystem\SYS.FormUI\bin\Debug\SYS.Application.dll.config diff --git "a/SYS.FormUI/obj/Debug/TS\351\205\222\345\272\227\347\256\241\347\220\206\347\263\273\347\273\237.exe.config" "b/SYS.FormUI/obj/Debug/TS\351\205\222\345\272\227\347\256\241\347\220\206\347\263\273\347\273\237.exe.config" index 8d029b4f8199f6e6d981186a47b11a343961c2f1..b7801fa6f7ae40e8a3e488286add7fdf8aec3103 100644 --- "a/SYS.FormUI/obj/Debug/TS\351\205\222\345\272\227\347\256\241\347\220\206\347\263\273\347\273\237.exe.config" +++ "b/SYS.FormUI/obj/Debug/TS\351\205\222\345\272\227\347\256\241\347\220\206\347\263\273\347\273\237.exe.config" @@ -1,12 +1,24 @@ - - - + +
+ + + + + + + + + + + + + diff --git a/SYS.FormUI/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll b/SYS.FormUI/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll index b63bca387d23ddd4d499e45a19472093de16100b..c985a161fd21f0513357430c0588a16315828c12 100644 Binary files a/SYS.FormUI/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll and b/SYS.FormUI/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll differ diff --git a/SYS.Library/SYS.Library.csproj b/SYS.Library/SYS.Library.csproj index a65ff114ce1a2e8bc8c5ad59e162dfd161a8f2e5..ad44bf6163455b9d1df4ac4de032d2a22375cd3b 100644 --- a/SYS.Library/SYS.Library.csproj +++ b/SYS.Library/SYS.Library.csproj @@ -67,5 +67,8 @@ SYS.Core + + + \ No newline at end of file diff --git a/SYS.Library/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/SYS.Library/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 322e9a9d08ff124b2e55a573f1c4fea33f4e892e..ec5b7e3a65124cfa716797fdd3da477cb8788850 100644 Binary files a/SYS.Library/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/SYS.Library/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/SYS.Library/obj/Debug/SYS.Library.csproj.FileListAbsolute.txt b/SYS.Library/obj/Debug/SYS.Library.csproj.FileListAbsolute.txt index c21758af81026d28f03a396ad996d518f8e58a34..af08e473fb35ea7248ae5d7c83ca16b549392e9b 100644 --- a/SYS.Library/obj/Debug/SYS.Library.csproj.FileListAbsolute.txt +++ b/SYS.Library/obj/Debug/SYS.Library.csproj.FileListAbsolute.txt @@ -52,3 +52,19 @@ D:\TopSkyHotelManagerSystem\TopskyHotelManagerSystem\SYS.Library\obj\Debug\SYS.L D:\TopSkyHotelManagerSystem\TopskyHotelManagerSystem\SYS.Library\obj\Debug\SYS.Library.dll D:\TopSkyHotelManagerSystem\TopskyHotelManagerSystem\SYS.Library\obj\Debug\SYS.Library.pdb D:\TopSkyHotelManagerSystem\TopskyHotelManagerSystem\SYS.Library\bin\Debug\SYS.Application.xml +D:\TopSkyHotelManagerSystem\TopskyHotelManagerSystem\SYS.Library\bin\Debug\Google.Protobuf.dll +D:\TopSkyHotelManagerSystem\TopskyHotelManagerSystem\SYS.Library\bin\Debug\Zstandard.Net.dll +D:\TopSkyHotelManagerSystem\TopskyHotelManagerSystem\SYS.Library\bin\Debug\K4os.Compression.LZ4.Streams.dll +D:\TopSkyHotelManagerSystem\TopskyHotelManagerSystem\SYS.Library\bin\Debug\Ubiety.Dns.Core.dll +D:\TopSkyHotelManagerSystem\TopskyHotelManagerSystem\SYS.Library\bin\Debug\System.Memory.dll +D:\TopSkyHotelManagerSystem\TopskyHotelManagerSystem\SYS.Library\bin\Debug\System.Buffers.dll +D:\TopSkyHotelManagerSystem\TopskyHotelManagerSystem\SYS.Library\bin\Debug\K4os.Compression.LZ4.dll +D:\TopSkyHotelManagerSystem\TopskyHotelManagerSystem\SYS.Library\bin\Debug\K4os.Hash.xxHash.dll +D:\TopSkyHotelManagerSystem\TopskyHotelManagerSystem\SYS.Library\bin\Debug\System.Numerics.Vectors.dll +D:\TopSkyHotelManagerSystem\TopskyHotelManagerSystem\SYS.Library\bin\Debug\System.Runtime.CompilerServices.Unsafe.dll +D:\TopSkyHotelManagerSystem\TopskyHotelManagerSystem\SYS.Library\bin\Debug\SYS.Library.dll.config +D:\TopSkyHotelManagerSystem\TopskyHotelManagerSystem\SYS.Library\bin\Debug\SYS.Common.dll +D:\TopSkyHotelManagerSystem\TopskyHotelManagerSystem\SYS.Library\bin\Debug\SqlSugar.dll +D:\TopSkyHotelManagerSystem\TopskyHotelManagerSystem\SYS.Library\bin\Debug\SYS.Application.dll.config +D:\TopSkyHotelManagerSystem\TopskyHotelManagerSystem\SYS.Library\bin\Debug\SYS.Common.pdb +D:\TopSkyHotelManagerSystem\TopskyHotelManagerSystem\SYS.Library\bin\Debug\SYS.Common.dll.config diff --git a/SYS.Manager/Business/CashManager.cs b/SYS.Manager/Business/CashManager.cs index 9ce4a7a2853ecc8e2e567ba2badff5f2bcb56555..cfd810b10b50022cf735e8097521fb7f08437674 100644 --- a/SYS.Manager/Business/CashManager.cs +++ b/SYS.Manager/Business/CashManager.cs @@ -6,15 +6,15 @@ namespace SYS.Manager { public class CashManager { - public static List SelectCashInfoAll() + public List SelectCashInfoAll() { - return CashService.SelectCashInfoAll(); + return new CashService().SelectCashInfoAll(); } public static object AddCashInfo(Cash cash) { - return CashService.AddCashInfo(cash); + return new CashService().AddCashInfo(cash); } } } diff --git a/SYS.Manager/Business/SpendManager.cs b/SYS.Manager/Business/SpendManager.cs index 11d2e34ff3aa4926b4ce35d97cd416f15a5fb0ea..c1c53aa567ae2adbcca048f46ea980ced3a87f26 100644 --- a/SYS.Manager/Business/SpendManager.cs +++ b/SYS.Manager/Business/SpendManager.cs @@ -56,5 +56,19 @@ namespace SYS.Manager } #endregion + #region 将转房前的未结算记录一同转移到新房间 + /// + /// 将转房前的未结算记录一同转移到新房间 + /// + /// + /// + /// + /// + public static int UpdateSpendInfoByRoomNo(string oldRoon, string newRoom, string custoNo) + { + return SpendService.UpdateSpendInfoByRoomNo(oldRoon,newRoom,custoNo); + } + #endregion + } } diff --git a/SYS.Manager/Room/RoomManager.cs b/SYS.Manager/Room/RoomManager.cs index 9d58fa4b1b80b1de3990ceb7552805c5c59e113c..f90ee2c3ce0d6e6551e36a21e501d85b8972de64 100644 --- a/SYS.Manager/Room/RoomManager.cs +++ b/SYS.Manager/Room/RoomManager.cs @@ -238,5 +238,6 @@ namespace SYS.Manager #endregion + } } diff --git a/SYS.Manager/SYS.Manager.csproj b/SYS.Manager/SYS.Manager.csproj index 28793d9bbc1cf6adb348893261f5f6e77bbd2d0f..23ca74f47e3984803c7cb08b4ac26ab043f3147e 100644 --- a/SYS.Manager/SYS.Manager.csproj +++ b/SYS.Manager/SYS.Manager.csproj @@ -74,5 +74,8 @@ SYS.Core + + + \ No newline at end of file diff --git a/SYS.Manager/Zero/AdminManager.cs b/SYS.Manager/Zero/AdminManager.cs index 93606cb3d6dc1e3144748ec07f6b2a2b5f639d24..8a54b67ae7e5b65319930b9c19468a8a3c188743 100644 --- a/SYS.Manager/Zero/AdminManager.cs +++ b/SYS.Manager/Zero/AdminManager.cs @@ -29,5 +29,17 @@ namespace SYS.Manager return AdminService.SelectAdminInfoByadminpwd(pwd); } #endregion + + #region 根据超管账号查询对应的密码 + /// + /// 根据超管账号查询对应的密码 + /// + /// + /// + public static Admin SelectAdminPwdByAccount(string account) + { + return AdminService.SelectAdminPwdByAccount(account); + } + #endregion } } diff --git a/SYS.Manager/Zero/BaseManager.cs b/SYS.Manager/Zero/BaseManager.cs index a9afdfa44f075517f73276c90dc9e0b0c0b901a1..99a287df42ca1621ead2d9d03a5680796ea673de 100644 --- a/SYS.Manager/Zero/BaseManager.cs +++ b/SYS.Manager/Zero/BaseManager.cs @@ -14,264 +14,264 @@ namespace SYS.Manager public class BaseManager { - #region 性别模块 - - /// - /// 查询所有性别类型 - /// - /// - public List SelectSexTypeAll() - { - return new BaseService().SelectSexTypeAll(); - } - - /// - /// 查询性别类型 - /// - /// - public SexType SelectSexType(SexType sexType) - { - return new BaseService().SelectSexType(sexType); - } - - /// - /// 添加性别类型 - /// - /// - /// - public int AddSexType(SexType sexType) - { - return new BaseService().AddSexType(sexType); - } - - /// - /// 删除性别类型 - /// - /// - /// - public int DelSexType(SexType sexType) - { - return new BaseService().DelSexType(sexType); - } - - /// - /// 更新性别类型 - /// - /// - /// - public int UpdSexType(SexType sexType) - { - return new BaseService().UpdSexType(sexType); - } - - #endregion - - #region 职位模块 - - /// - /// 查询所有职位类型 - /// - /// - public List SelectPositionAll() - { - return new BaseService().SelectPositionAll(); - } - - /// - /// 查询职位类型 - /// - /// - public Position SelectPosition(Position position) - { - return new BaseService().SelectPosition(position); - } - - /// - /// 添加职位类型 - /// - /// - /// - public int AddPosition(Position position) - { - return new BaseService().AddPosition(position); - } - - /// - /// 删除职位类型 - /// - /// - /// - public int DelPosition(Position position) - { - return new BaseService().DelPosition(position); - } - - /// - /// 更新职位类型 - /// - /// - /// - public int UpdPosition(Position position) - { - return new BaseService().UpdPosition(position); - } - - #endregion - - #region 民族模块 - - /// - /// 查询所有民族类型 - /// - /// - public List SelectNationAll() - { - return new BaseService().SelectNationAll(); - } - - /// - /// 查询民族类型 - /// - /// - public Nation SelectNation(Nation nation) - { - return new BaseService().SelectNation(nation); - } - - /// - /// 添加民族类型 - /// - /// - /// - public int AddNation(Nation nation) - { - return new BaseService().AddNation(nation); - } - - /// - /// 删除民族类型 - /// - /// - /// - public int DelNation(Nation nation) - { - return new BaseService().DelNation(nation); - } - - /// - /// 更新民族类型 - /// - /// - /// - public int UpdNation(Nation nation) - { - return new BaseService().UpdNation(nation); - } - - #endregion - - #region 学历模块 - - /// - /// 查询所有学历类型 - /// - /// - public List SelectEducationAll() - { - return new BaseService().SelectEducationAll(); - } - - /// - /// 查询学历类型 - /// - /// - public Education SelectEducation(Education education) - { - return new BaseService().SelectEducation(education); - } - - /// - /// 添加学历类型 - /// - /// - /// - public int AddEducation(Education education) - { - return new BaseService().AddEducation(education); - } - - /// - /// 删除学历类型 - /// - /// - /// - public int DelEducation(Education education) - { - return new BaseService().DelEducation(education); - } - - /// - /// 更新学历类型 - /// - /// - /// - public int UpdEducation(Education education) - { - return new BaseService().UpdEducation(education); - } - - #endregion - - #region 部门模块 - - /// - /// 查询所有部门类型 - /// - /// - public List SelectDeptAll() - { - return new BaseService().SelectDeptAll(); - } - - /// - /// 查询部门类型 - /// - /// - public Dept SelectDept(Dept dept) - { - return new BaseService().SelectDept(dept); - } - - /// - /// 添加部门类型 - /// - /// - /// - public int AddDept(Dept dept) - { - return new BaseService().AddDept(dept); - } - - /// - /// 删除部门类型 - /// - /// - /// - public int DelDept(Dept dept) - { - return new BaseService().DelDept(dept); - } - - /// - /// 更新部门类型 - /// - /// - /// - public int UpdDept(Dept dept) - { - return new BaseService().UpdDept(dept); - } - - #endregion + //#region 性别模块 + + ///// + ///// 查询所有性别类型 + ///// + ///// + //public List SelectSexTypeAll() + //{ + // return new BaseService().SelectSexTypeAll(); + //} + + ///// + ///// 查询性别类型 + ///// + ///// + //public SexType SelectSexType(SexType sexType) + //{ + // return new BaseService().SelectSexType(sexType); + //} + + ///// + ///// 添加性别类型 + ///// + ///// + ///// + //public int AddSexType(SexType sexType) + //{ + // return new BaseService().AddSexType(sexType); + //} + + ///// + ///// 删除性别类型 + ///// + ///// + ///// + //public int DelSexType(SexType sexType) + //{ + // return new BaseService().DelSexType(sexType); + //} + + ///// + ///// 更新性别类型 + ///// + ///// + ///// + //public int UpdSexType(SexType sexType) + //{ + // return new BaseService().UpdSexType(sexType); + //} + + //#endregion + + //#region 职位模块 + + ///// + ///// 查询所有职位类型 + ///// + ///// + //public List SelectPositionAll() + //{ + // return new BaseService().SelectPositionAll(); + //} + + ///// + ///// 查询职位类型 + ///// + ///// + //public Position SelectPosition(Position position) + //{ + // return new BaseService().SelectPosition(position); + //} + + ///// + ///// 添加职位类型 + ///// + ///// + ///// + //public int AddPosition(Position position) + //{ + // return new BaseService().AddPosition(position); + //} + + ///// + ///// 删除职位类型 + ///// + ///// + ///// + //public int DelPosition(Position position) + //{ + // return new BaseService().DelPosition(position); + //} + + ///// + ///// 更新职位类型 + ///// + ///// + ///// + //public int UpdPosition(Position position) + //{ + // return new BaseService().UpdPosition(position); + //} + + //#endregion + + //#region 民族模块 + + ///// + ///// 查询所有民族类型 + ///// + ///// + //public List SelectNationAll() + //{ + // //return new BaseService().SelectDeptAll(); + //} + + ///// + ///// 查询民族类型 + ///// + ///// + //public Nation SelectNation(Nation nation) + //{ + // //return new BaseService().SelectNation(nation); + //} + + ///// + ///// 添加民族类型 + ///// + ///// + ///// + //public int AddNation(Nation nation) + //{ + // //return new BaseService().AddNation(nation); + //} + + ///// + ///// 删除民族类型 + ///// + ///// + ///// + //public int DelNation(Nation nation) + //{ + // //return new BaseService().DelNation(nation); + //} + + ///// + ///// 更新民族类型 + ///// + ///// + ///// + //public int UpdNation(Nation nation) + //{ + // //return new BaseService().UpdNation(nation); + //} + + //#endregion + + //#region 学历模块 + + ///// + ///// 查询所有学历类型 + ///// + ///// + //public List SelectEducationAll() + //{ + // return new BaseService().SelectEducationAll(); + //} + + ///// + ///// 查询学历类型 + ///// + ///// + //public Education SelectEducation(Education education) + //{ + // return new BaseService().SelectEducation(education); + //} + + ///// + ///// 添加学历类型 + ///// + ///// + ///// + //public int AddEducation(Education education) + //{ + // return new BaseService().AddEducation(education); + //} + + ///// + ///// 删除学历类型 + ///// + ///// + ///// + //public int DelEducation(Education education) + //{ + // return new BaseService().DelEducation(education); + //} + + ///// + ///// 更新学历类型 + ///// + ///// + ///// + //public int UpdEducation(Education education) + //{ + // return new BaseService().UpdEducation(education); + //} + + //#endregion + + //#region 部门模块 + + ///// + ///// 查询所有部门类型 + ///// + ///// + //public List SelectDeptAll() + //{ + // return new BaseService().SelectDeptAll(); + //} + + ///// + ///// 查询部门类型 + ///// + ///// + //public Dept SelectDept(Dept dept) + //{ + // return new BaseService().SelectDept(dept); + //} + + ///// + ///// 添加部门类型 + ///// + ///// + ///// + //public int AddDept(Dept dept) + //{ + // return new BaseService().AddDept(dept); + //} + + ///// + ///// 删除部门类型 + ///// + ///// + ///// + //public int DelDept(Dept dept) + //{ + // return new BaseService().DelDept(dept); + //} + + ///// + ///// 更新部门类型 + ///// + ///// + ///// + //public int UpdDept(Dept dept) + //{ + // return new BaseService().UpdDept(dept); + //} + + //#endregion } } diff --git a/SYS.Manager/Zero/OperationlogManager.cs b/SYS.Manager/Zero/OperationlogManager.cs index 429fb1614fac1e0f286c5525affc42a658011b0f..d587cbd1919a5f8661848f61bd12f985192b2a6f 100644 --- a/SYS.Manager/Zero/OperationlogManager.cs +++ b/SYS.Manager/Zero/OperationlogManager.cs @@ -6,7 +6,7 @@ namespace SYS.Manager { public class OperationlogManager { - public static int InsertOperationLog(Operation opr) + public static int InsertOperationLog(OperationLog opr) { return OperationlogService.InsertOperationLog(opr); } diff --git a/SYS.Manager/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/SYS.Manager/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 619616813e986a86c8682cff644a91c9458a7d99..75b7e9c9246bdafa5ef73a0ab77547f54163947e 100644 Binary files a/SYS.Manager/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/SYS.Manager/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/SYS.Manager/obj/Debug/SYS.Manager.csproj.FileListAbsolute.txt b/SYS.Manager/obj/Debug/SYS.Manager.csproj.FileListAbsolute.txt index b1556c240e10d09548e36fe9b445b37eac9a9f06..0cd5e48cd1ff52e0f31e1adc399880d7381a2904 100644 --- a/SYS.Manager/obj/Debug/SYS.Manager.csproj.FileListAbsolute.txt +++ b/SYS.Manager/obj/Debug/SYS.Manager.csproj.FileListAbsolute.txt @@ -51,3 +51,17 @@ D:\TopSkyHotelManagerSystem\TopskyHotelManagerSystem\SYS.Manager\obj\Debug\SYS.M D:\TopSkyHotelManagerSystem\TopskyHotelManagerSystem\SYS.Manager\obj\Debug\SYS.Manager.dll D:\TopSkyHotelManagerSystem\TopskyHotelManagerSystem\SYS.Manager\obj\Debug\SYS.Manager.pdb D:\TopSkyHotelManagerSystem\TopskyHotelManagerSystem\SYS.Manager\bin\Debug\SYS.Application.xml +D:\TopSkyHotelManagerSystem\TopskyHotelManagerSystem\SYS.Manager\bin\Debug\Google.Protobuf.dll +D:\TopSkyHotelManagerSystem\TopskyHotelManagerSystem\SYS.Manager\bin\Debug\Zstandard.Net.dll +D:\TopSkyHotelManagerSystem\TopskyHotelManagerSystem\SYS.Manager\bin\Debug\K4os.Compression.LZ4.Streams.dll +D:\TopSkyHotelManagerSystem\TopskyHotelManagerSystem\SYS.Manager\bin\Debug\Ubiety.Dns.Core.dll +D:\TopSkyHotelManagerSystem\TopskyHotelManagerSystem\SYS.Manager\bin\Debug\System.Memory.dll +D:\TopSkyHotelManagerSystem\TopskyHotelManagerSystem\SYS.Manager\bin\Debug\System.Buffers.dll +D:\TopSkyHotelManagerSystem\TopskyHotelManagerSystem\SYS.Manager\bin\Debug\K4os.Compression.LZ4.dll +D:\TopSkyHotelManagerSystem\TopskyHotelManagerSystem\SYS.Manager\bin\Debug\K4os.Hash.xxHash.dll +D:\TopSkyHotelManagerSystem\TopskyHotelManagerSystem\SYS.Manager\bin\Debug\System.Numerics.Vectors.dll +D:\TopSkyHotelManagerSystem\TopskyHotelManagerSystem\SYS.Manager\bin\Debug\System.Runtime.CompilerServices.Unsafe.dll +D:\TopSkyHotelManagerSystem\TopskyHotelManagerSystem\SYS.Manager\bin\Debug\SYS.Common.dll +D:\TopSkyHotelManagerSystem\TopskyHotelManagerSystem\SYS.Manager\bin\Debug\SqlSugar.dll +D:\TopSkyHotelManagerSystem\TopskyHotelManagerSystem\SYS.Manager\bin\Debug\SYS.Common.pdb +D:\TopSkyHotelManagerSystem\TopskyHotelManagerSystem\SYS.Manager\bin\Debug\SYS.Common.dll.config