diff --git a/README.md b/README.md
index fa891121cc51c7dc084f93f117e1cea094656e33..6239637296a0699f4dfff7cba9293063b83b4f1b 100644
--- a/README.md
+++ b/README.md
@@ -1,30 +1,27 @@
TopskyHotelManagerSystem
-
+
-
-# 特别鸣谢:
-
-### [遗失情缘](https://blog.lost520.cn/)提供的圆形进度条加载效果!
-
# 引用的开源项目:
1. ##### Fody——将所有dll打包成exe应用程序。[Fody,MIT开源协议](https://github.com/Fody/Fody)
-2. ##### SunnyUI——SunnyUI.Net, 基于 C# .Net WinForm 开源控件库、工具类库、扩展类库、多页面开发框架。
+2. ##### SQLSugar,国内最受欢迎ORM框架[SQLSugar。 [Apache-2.0开源协议](https://gitee.com/sunkaixuan/SqlSugar)
+
+3. ##### SunnyUI——SunnyUI.Net, 基于 C# .Net WinForm 开源控件库、工具类库、扩展类库、多页面开发框架。
[SunnyUI.Net,GPL3.0开源协议](https://gitee.com/yhuse/SunnyUI)
# 本项目说明:
-##### 1、一切开发请遵照MIT开源协议进行,SunnyUI.Net框架采用的是GPL3.0开源协议,需要用到时请务必在项目介绍加上对应描述。
+##### 1、一切开发请遵照MIT开源协议进行,SunnyUI.Net框架采用的是GPL3.0开源协议、SQLSugarORM框架采用的是Apache2.0,需要用到时请务必在项目介绍加上对应描述。
##### 2、有bug欢迎提出issue!或进行评论
-##### 3、本系统部分页面基于SunnyUI.Net控件库进行创建,在此特别声明!
+##### 3、本系统90%页面基于SunnyUI.Net控件库进行创建,在此特别声明!
##### 4、**关于数据库脚本问题,请先移步至Scripts文件下,下载Data和Table两个文件,再数据库中先执行Table.sql,再执行Data.sql!**
@@ -50,6 +47,28 @@
**开发技术:.NET WinForm**
+# 系统结构:
+
+
+# 系统功能模块汇总:
+
+| 功能汇总 | | | | | | | |
+|----------|--------|--------|--------|------|--------|--------|---|
+| (前台)客房管理 | 预约房间 | 入住房间 | 结算退房 | 转换房间 | 查看用户信息 | 修改房间状态 | |
+| (前台)用户管理 | 用户信息展示 | 搜索用户信息 | 添加客户 | | | | |
+| (前台)商品消费 | 商品列表 | 搜索商品信息 | 商品消费 | 消费信息 | | | |
+| (前台)扩展功能 | 无 | | | | | | |
+| (后台)基础信息 | 职位类型维护 | 民族类型维护 | 学历类型维护 | 部门信息维护 | | | |
+| (后台)财务信息 | 员工工资账单 | 内部财务账单 | 酒店盈利情况 | | | | |
+| (后台)水电管理 | 水电信息 | | | | | | |
+| (后台)监管统计 | 监管部门情况 | | | | | | |
+| (后台)客房管理 | 房态图一览 | 新增客房 | | | | | |
+| (后台)客户管理 | 客户信息管理 | 顾客消费账单 | | | | | |
+| 功能汇总(续) | | | | | | | |
+| (后台)人事管理 | 员工管理 | 公告日志 | 上传公告日志 | | | | |
+| (后台)物资管理 | 商品管理 | 仓库物资 | | | | | |
+| 员工操作日志 | | | | | | | |
+
# 项目作者:
**杨俊杰(即本账号,项目组长,核心代码编写和后期项目整合)**
@@ -58,6 +77,8 @@
**宾华安(数据库,提供数据库管理支持)**
+**张黔广(开发,APP前后端开发)**
+
# 项目运行部署:
**下载并安装Microsoft Visual Studio Professional 2017及以上版本,并通过下载Zip包解压,打开.sln后缀格式文件运行。**
@@ -70,4 +91,5 @@
**2、随后打开Data.sql文件进行数据导入。**
-[](https://gitee.com/yjj0720/TopskyHotelManagerSystem)
\ No newline at end of file
+
+[](https://gitee.com/java-and-net/TopskyHotelManagerSystem)
\ No newline at end of file
diff --git a/SYS.Application/Business/CashService.cs b/SYS.Application/Business/CashService.cs
index 04dc244f993bd96cfac613d6acc81832de7fd4b8..b25cc2c51b65212b08bff71efdf7588d84fd1993 100644
--- a/SYS.Application/Business/CashService.cs
+++ b/SYS.Application/Business/CashService.cs
@@ -1,40 +1,48 @@
using System;
using System.Collections.Generic;
+using System.Linq;
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 depts = new List();
+ depts = base.Change().GetList(a => a.delete_mk != 1);
+ //查询所有员工信息
+ List workers = new List();
+ workers = base.Change().GetList(a => a.delete_mk != 1);
List cs = new List();
- string sql = "select * from CASHINFO";
- MySqlDataReader dr = DBHelper.ExecuteReader(sql);
- while (dr.Read())
+ cs = base.GetList(a => a.delete_mk != 1);
+ cs.ForEach(source =>
{
-
- 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();
+ var dept = depts.FirstOrDefault(a => a.dept_no.Equals(source.CashClub));
+ source.DeptName = dept == null ? "" : dept.dept_name;
+ var worker = workers.FirstOrDefault(a => a.WorkerId.Equals(source.CashPerson));
+ source.PersonName = worker == null ? "" : worker.WorkerName;
+ });
return cs;
}
}
diff --git a/SYS.Application/Business/FontsService.cs b/SYS.Application/Business/FontsService.cs
new file mode 100644
index 0000000000000000000000000000000000000000..10897c111ccc4b1b9e3d26a6a58f95a04a1e0a64
--- /dev/null
+++ b/SYS.Application/Business/FontsService.cs
@@ -0,0 +1,28 @@
+using MySql.Data.MySqlClient;
+using SYS.Common;
+using SYS.Core;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace SYS.Application
+{
+ ///
+ /// 酒店宣传联动内容接口实现类
+ ///
+ public class FontsService:Repository,IFontsService
+ {
+ ///
+ /// 查询所有宣传联动内容(跑马灯)
+ ///
+ ///
+ public List SelectFontAll()
+ {
+ List fonts = new List();
+ 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..b7c8f8142ba3002bf5cfdb2aacd927d9d0a3542a
--- /dev/null
+++ b/SYS.Application/Business/ISellService.cs
@@ -0,0 +1,86 @@
+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 UpdateSellthingInfo(SellThing sellThing);
+
+ ///
+ /// 撤回客户消费信息
+ ///
+ ///
+ ///
+ ///
+ bool DeleteSellThing(string roomNo, string time);
+
+ ///
+ /// 根据商品编号删除商品信息
+ ///
+ ///
+ ///
+ bool DeleteSellThingBySellNo(string sellNo);
+
+ ///
+ /// 根据商品名称和价格查询商品编号
+ ///
+ ///
+ ///
+ ///
+ 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..c7d280d73776281de3ce826b022592a5f462f61e
--- /dev/null
+++ b/SYS.Application/Business/ISpendService.cs
@@ -0,0 +1,85 @@
+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 SelectSpendByRoomNo(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(List spends, 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
new file mode 100644
index 0000000000000000000000000000000000000000..3ca24686d8dcde2a79a92e257f439c91d9b28ce5
--- /dev/null
+++ b/SYS.Application/Business/ReserService.cs
@@ -0,0 +1,65 @@
+using System;
+using System.Collections.Generic;
+using MySql.Data.MySqlClient;
+using SYS.Common;
+using SYS.Core;
+
+namespace SYS.Application
+{
+ ///
+ /// 预约信息接口实现类
+ ///
+ public class ReserService:Repository,IReserService
+ {
+ ///
+ /// 获取所有预约信息
+ ///
+ ///
+ public List SelectReserAll()
+ {
+ List rss = new List();
+ rss = base.GetList(a => a.delete_mk == 0);
+ return rss;
+ }
+
+ ///
+ /// 根据房间编号获取预约信息
+ ///
+ ///
+ ///
+ public Reser SelectReserInfoByRoomNo(string no)
+ {
+ Reser res = null;
+ res = base.GetSingle(a => a.ReserRoom == no && a.delete_mk != 1);
+ return res;
+ }
+
+ ///
+ /// 删除预约信息
+ ///
+ ///
+ ///
+ public bool DeleteReserInfo(string rid)
+ {
+ return base.Update(a => new Reser()
+ {
+ delete_mk = 1,
+ datachg_usr = LoginInfo.WorkerNo,
+ datachg_date = DateTime.Now
+ },a => a.ReserId == rid);
+
+ }
+
+ ///
+ /// 添加预约信息
+ ///
+ ///
+ ///
+ public bool InserReserInfo(Reser r)
+ {
+ return base.Insert(r);
+ }
+
+
+ }
+}
diff --git a/SYS.Application/Business/SellService.cs b/SYS.Application/Business/SellService.cs
index a85d31341f01ef2c7396f06fba7bd544cd5aecd6..352ee78e48a2244039cab4bf03c91f8e4e3bb3cb 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 != 1);
return s;
}
@@ -60,50 +39,75 @@ 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 bool UpdateSellthingInfo(SellThing sellThing)
+ {
+ return base.Update(a => new SellThing()
+ {
+ SellName = sellThing.SellName,
+ SellPrice = sellThing.SellPrice,
+ Stock = sellThing.Stock,
+ format = sellThing.format,
+ },a => a.SellNo == sellThing.SellNo);
}
///
/// 撤回客户消费信息
///
- ///
+ ///
+ ///
+ ///
+ public bool DeleteSellThing(string roomNo, string time)
+ {
+ 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));
+
+ }
+
+ ///
+ /// 根据商品编号删除商品信息
+ ///
+ ///
///
- public static int DeleteSellThing(string roomNo, string time)
+ public bool DeleteSellThingBySellNo(string sellNo)
{
- string sql = "delete from CUSTOSPEND where RoomNo='{0}' and SpendTime='{1}'";
- sql = string.Format(sql, roomNo, time);
- return DBHelper.ExecuteNonQuery(sql);
+ return base.Update(a => new SellThing()
+ {
+ delete_mk = 1,
+ datachg_usr = AdminInfo.Account,
+ datachg_date = DateTime.Now
+ }, a => a.SellNo == sellNo);
}
///
@@ -112,56 +116,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..3a30991c6772944c29c8facd8961f07397f7e1d1 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,73 +18,36 @@ 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;
+ return base.Insert(s);
}
#endregion
- #region 根据客户编号查询信息
+ #region 根据客户编号查询消费信息
///
- /// 根据客户编号查询信息
+ /// 根据客户编号查询消费信息
///
- ///
- ///
+ ///
///
- public static List SelectSpendByRoomNo(string RoomNo)
+ public List SelectSpendByCustoNo(string No)
{
- 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;
+ List ls = new List();
+ ls = base.GetList(a => a.CustoNo == No && a.MoneyState == "未结算" && a.delete_mk != 1);
+ return ls;
}
#endregion
- #region 根据客户编号查询消费信息
+ #region 根据房间编号查询消费信息
///
- /// 根据客户编号查询消费信息
+ /// 根据房间编号查询消费信息
///
///
///
- public static List SelectSpendByCustoNo(string No)
+ public List SelectSpendByRoomNo(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.RoomNo == No && a.MoneyState == "未结算" && a.delete_mk != 1);
return ls;
}
#endregion
@@ -89,26 +57,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 +70,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 +83,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,12 +98,40 @@ 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(List spends, string newRoom, string custoNo)
+ {
+ var listSpendId = spends.Select(a => a.SpendName).Distinct().ToList();
+
+ return base.Update(a => new Spend()
+ {
+ RoomNo = newRoom,
+ datachg_usr = LoginInfo.WorkerNo,
+ datachg_date = DateTime.Now
+ }, a => listSpendId.Contains(a.RoomNo) && 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 edfeb940ee35ebdb5398d1e3e42a52a22e8b93b6..82a3e2616a93cd1f05087cc6d2b32f8c55279659 100644
--- a/SYS.Application/Business/WtiService.cs
+++ b/SYS.Application/Business/WtiService.cs
@@ -1,11 +1,15 @@
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 根据房间编号查询水电费信息
///
@@ -13,24 +17,10 @@ namespace SYS.Application
///
///
///
- 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
@@ -43,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
@@ -71,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
@@ -100,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
@@ -117,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
@@ -133,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
@@ -148,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
@@ -163,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 6c5835077a90af546ca049b8946bd250a49585e0..8816d4e86a31c97d029520c56a7fa77d6f1adcf2 100644
--- a/SYS.Application/Customer/CustoService.cs
+++ b/SYS.Application/Customer/CustoService.cs
@@ -1,28 +1,62 @@
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 bool UpdCustomerInfoByCustoNo(Custo custo)
{
- List custos = new List();
+ return base.Update(a => new Custo()
+ {
+ CustoName = custo.CustoName,
+ CustoSex = custo.CustoSex,
+ CustoType = custo.CustoType,
+ CustoBirth = custo.CustoBirth,
+ CustoAdress = custo.CustoAdress,
+ CustoID = custo.CustoID,
+ CustoTel = custo.CustoTel,
+ PassportType = custo.PassportType,
+ datachg_usr = custo.datachg_usr,
+ datachg_date = DateTime.Now
+ },a => a.CustoNo == custo.CustoNo);
+ }
+
+ ///
+ /// 查询酒店盈利情况
+ ///
+ ///
+ public List SelectAllMoney()
+ {
+ List custoSpends = new List();
string sql = "select year(spendtime) as 年份,sum(spendmoney) as 总额 from CustoSpend group by year(spendtime)";
MySqlDataReader dr = DBHelper.ExecuteReader(sql);
while (dr.Read())
@@ -30,116 +64,66 @@ namespace SYS.Application
CustoSpend cso = new CustoSpend();
cso.Years = dr["年份"].ToString();
cso.Money = (decimal)dr["总额"];
- custos.Add(cso);
+ custoSpends.Add(cso);
}
dr.Close();
DBHelper.Closecon();
- return custos;
+ return custoSpends;
}
- 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";
- 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;
}
- #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 == 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 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/CustoTypeService.cs b/SYS.Application/Customer/CustoTypeService.cs
deleted file mode 100644
index 7fed1ca799b8277693bef8174e1c2d17608715fc..0000000000000000000000000000000000000000
--- a/SYS.Application/Customer/CustoTypeService.cs
+++ /dev/null
@@ -1,102 +0,0 @@
-using SYS.Core;
-using MySql.Data.MySqlClient;
-using System.Collections.Generic;
-
-namespace SYS.Application
-{
- public class CustoTypeService
- {
- #region 根据会员等级编号查询会员等级名称
- ///
- /// 根据会员等级编号查询会员等级名称
- ///
- ///
- ///
- public static string SelectTypeNameByCustoTypeId(int CustoTypeId)
- {
- string name = "";
- string sql = "select * from USERTYPE where UserType=" + CustoTypeId;
- MySqlDataReader dr = DBHelper.ExecuteReader(sql);
- if (dr.Read())
- {
- name = dr["TypeName"].ToString();
- }
- dr.Close();
- DBHelper.Closecon();
- return name;
- }
- #endregion
-
- #region 查询所有会员等级名称
- ///
- /// 查询所有会员等级名称
- ///
- ///
- public static List SelectCustoTypesAll()
- {
- List types = new List();
- string sql = "select * from USERTYPE";
- MySqlDataReader dr = DBHelper.ExecuteReader(sql);
- while (dr.Read())
- {
- CustoType type = new CustoType();
- type.UserType = (int)dr["UserType"];
- type.TypeName = dr["TypeName"].ToString();
- types.Add(type);
- }
- dr.Close();
- DBHelper.Closecon();
-
- return types;
- }
- #endregion
-
- #region 查询所有证件类型
- ///
- /// 查询所有证件类型
- ///
- ///
- public static List SelectPassPortTypeAll()
- {
- List passTypes = new List();
- string sql = "select * from Passporttype";
- MySqlDataReader dr = DBHelper.ExecuteReader(sql);
- while (dr.Read())
- {
- PassPortType type = new PassPortType();
- type.PassportId = (int)dr["PassportId"];
- type.PassportName = dr["PassportName"].ToString();
- passTypes.Add(type);
- }
- dr.Close();
- DBHelper.Closecon();
-
- return passTypes;
- }
- #endregion
-
- #region 查询所有性别类型
- ///
- /// 查询所有性别类型
- ///
- ///
- public static 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();
- sexTypes.Add(type);
- }
- dr.Close();
- DBHelper.Closecon();
-
- return sexTypes;
- }
- #endregion
- }
-}
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..c2ddb9c33d1d5c86bd06c3939ad3e8ba9d637fd7
--- /dev/null
+++ b/SYS.Application/Customer/ICustoService.cs
@@ -0,0 +1,48 @@
+using SYS.Core;
+using System.Collections.Generic;
+
+namespace SYS.Application
+{
+ ///
+ /// 客户信息接口
+ ///
+ public interface ICustoService
+ {
+ #region 添加客户信息
+ ///
+ /// 添加客户信息
+ ///
+ ///
+ ///
+ bool InsertCustomerInfo(Custo custo);
+ #endregion
+
+ ///
+ /// 更新客户信息
+ ///
+ ///
+ ///
+ bool UpdCustomerInfoByCustoNo(Custo custo);
+
+ ///
+ /// 查询酒店盈利情况
+ ///
+ ///
+ List SelectAllMoney();
+
+ ///
+ /// 查询所有客户信息
+ ///
+ ///
+ List SelectCustoAll();
+
+ ///
+ /// 根据客户编号查询客户信息
+ ///
+ ///
+ ///
+ Custo SelectCardInfoByCustoNo(string CustoNo);
+
+
+ }
+}
\ No newline at end of file
diff --git a/SYS.Application/Properties/AssemblyInfo.cs b/SYS.Application/Properties/AssemblyInfo.cs
index 754a29de6846b3475de5122a35c35163782c2e5f..b8374f0c03528f8822b360befa79537efb3e959e 100644
--- a/SYS.Application/Properties/AssemblyInfo.cs
+++ b/SYS.Application/Properties/AssemblyInfo.cs
@@ -5,12 +5,12 @@ using System.Runtime.InteropServices;
// 有关程序集的一般信息由以下
// 控制。更改这些特性值可修改
// 与程序集关联的信息。
-[assembly: AssemblyTitle("Application")]
+[assembly: AssemblyTitle("SYS.Application")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Application")]
-[assembly: AssemblyCopyright("Copyright © 2020")]
+[assembly: AssemblyCompany("java-and-net")]
+[assembly: AssemblyProduct("SYS.Application")]
+[assembly: AssemblyCopyright("Copyright © 2020 java-and-net")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// 可以指定所有值,也可以使用以下所示的 "*" 预置版本号和修订号
//通过使用 "*",如下所示:
// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("1.4.0.0")]
+[assembly: AssemblyFileVersion("1.4.0.0")]
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/ReserService.cs b/SYS.Application/Room/ReserService.cs
index cecf1376aa56af2057d1c3d15ebee499ac7ace75..e64d84d47315f4c5ee2b19d75b10d0941b43db5f 100644
--- a/SYS.Application/Room/ReserService.cs
+++ b/SYS.Application/Room/ReserService.cs
@@ -1,16 +1,25 @@
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();
+<<<<<<< HEAD:SYS.Application/Room/ReserService.cs
+<<<<<<< HEAD:SYS.Application/Room/ReserService.cs
string sql = "select * from RESER";
MySqlDataReader dr = DBHelper.ExecuteReader(sql);
while (dr.Read())
@@ -37,12 +46,25 @@ namespace SYS.Application
}
dr.Close();
DBHelper.Closecon();
+=======
+ rss = base.GetList(a => a.delete_mk == 0);
+>>>>>>> InitProject_v1.4.8_happy_new_year:SYS.Application/Business/ReserService.cs
+=======
+ rss = base.GetList(a => a.delete_mk == 0);
+>>>>>>> master:SYS.Application/Business/ReserService.cs
return rss;
}
- public static Reser SelectReserInfoByRoomNo(string no)
+ ///
+ /// 根据房间编号获取预约信息
+ ///
+ ///
+ ///
+ public Reser SelectReserInfoByRoomNo(string no)
{
Reser res = null;
+<<<<<<< HEAD:SYS.Application/Room/ReserService.cs
+<<<<<<< HEAD:SYS.Application/Room/ReserService.cs
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())
@@ -64,25 +86,52 @@ namespace SYS.Application
}
dr.Close();
DBHelper.Closecon();
+=======
+ res = base.GetSingle(a => a.ReserRoom == no && a.delete_mk != 1);
+>>>>>>> InitProject_v1.4.8_happy_new_year:SYS.Application/Business/ReserService.cs
+=======
+ res = base.GetSingle(a => a.ReserRoom == no && a.delete_mk != 1);
+>>>>>>> master:SYS.Application/Business/ReserService.cs
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)
{
+<<<<<<< HEAD:SYS.Application/Room/ReserService.cs
+<<<<<<< HEAD:SYS.Application/Room/ReserService.cs
string sql = "insert WTINFO (CustoName,CustoTel,ReserWay,";
sql += "ReserRoomNo,ReserDate,ReserEndDay,Remark) values ";
sql += "('{0}','{1}','{2}','{3}','{4}','{5}','{6}')";
sql = string.Format(sql, r.CustoName, r.CustoTel, r.ReserWay,
r.ReserRoom, r.ReserDate, r.ReserEndDay, r.ReserRemark);
return DBHelper.ExecuteNonQuery(sql);
+=======
+ return base.Insert(r);
+>>>>>>> InitProject_v1.4.8_happy_new_year:SYS.Application/Business/ReserService.cs
+=======
+ return base.Insert(r);
+>>>>>>> master:SYS.Application/Business/ReserService.cs
}
diff --git a/SYS.Application/Room/RoomService.cs b/SYS.Application/Room/RoomService.cs
index 37f304cdede4bfd7b42e3f7e6aeaccbf0742c3c9..365daf561a3dcdcfd794d51d3bc3e6b9325b1025 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,150 +18,96 @@ 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;
- 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"];
- room.PersonNum = Convert.ToString(dr["PersonNum"]);
- 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
- #region 获取所有房间信息
+
+ #region 根据房间状态来查询可使用的房间
///
- /// 获取所有房间信息
+ /// 根据房间状态来查询可使用的房间
///
///
- public static List SelectRoomAll()
+ 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";
- 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"];
- room.PersonNum = Convert.ToString(dr["PersonNum"]);
- 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
- #region 获取房间分区的信息
+
+ #region 获取所有房间信息
///
- /// 获取房间分区的信息
+ /// 获取所有房间信息
///
///
- public static List SelectRoomByTypeName(string TypeName)
+ public List SelectRoomAll()
{
- 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 + "'";
- 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);
+ List rooms = new List();
+ rooms = base.GetList(a => a.delete_mk != 1).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"];
- r.PersonNum = Convert.ToString(dr["PersonNum"]);
- 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
- #region 根据房间状态来查询可使用的房间
+ #region 获取房间分区的信息
///
- /// 根据房间状态来查询可使用的房间
+ /// 获取房间分区的信息
///
///
- public static List SelectCanUseRoomAll()
+ public List SelectRoomByTypeName(string TypeName)
{
+ 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();
- 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 && listTypes.Contains(a.RoomType)).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"];
- room.PersonNum = Convert.ToString(dr["PersonNum"]);
- 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
@@ -167,32 +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"];
- room.PersonNum = Convert.ToString(dr["PersonNum"]);
- 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
@@ -203,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(),PersonNum=Null,";
- 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
@@ -218,11 +154,9 @@ namespace SYS.Application
///
///
///
- public static object DayByRoomNo(string roomno)
+ public object DayByRoomNo(string roomno)
{
- string sql = "select DATEDIFF(CURRENT_DATE(),CheckTime) from ROOM where RoomNo='" + roomno + "'";
- //DATEDIFF(workercheck.CheckTime,CURRENT_DATE()) = 0
- return DBHelper.ExecuteScalar(sql);
+ return Math.Abs(((TimeSpan)(base.GetSingle(a => a.RoomNo == roomno).CheckTime - DateTime.Now)).Days);
}
#endregion
@@ -232,13 +166,31 @@ 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}',PersonNum='{4}' where RoomNo='{0}'";
- sql = string.Format(sql, r.RoomNo, r.CustoNo, r.CheckTime, r.RoomStateId, r.PersonNum);
- 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
+
+ #region 根据房间编号修改房间信息(预约)
+ ///
+ /// 根据房间编号修改房间信息(预约)
+ ///
+ ///
+ ///
+ public bool UpdateRoomInfoWithReser(Room r)
+ {
+ return base.Update(a => new Room()
+ {
+ RoomStateId = r.RoomStateId,
+ datachg_usr = LoginInfo.WorkerNo,
+ datachg_date = DateTime.Now
+ }, a => a.RoomNo == r.RoomNo);
}
#endregion
@@ -247,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'";
- return DBHelper.ExecuteScalar(sql);
+ return base.GetList(a => a.RoomStateId == 0 && a.delete_mk != 1).OrderBy(a => a.RoomNo).Count();
}
#endregion
@@ -260,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'";
- return DBHelper.ExecuteScalar(sql);
+ return base.GetList(a => a.RoomStateId == 1 && a.delete_mk != 1).OrderBy(a => a.RoomNo).Count();
}
#endregion
@@ -273,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
@@ -287,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'";
- return DBHelper.ExecuteScalar(sql);
+ return base.GetList(a => a.RoomStateId == 3 && a.delete_mk != 1).OrderBy(a => a.RoomNo).Count();
}
#endregion
@@ -300,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'";
- return DBHelper.ExecuteScalar(sql);
+ return base.GetList(a => a.RoomStateId == 2 && a.delete_mk != 1).OrderBy(a => a.RoomNo).Count();
}
#endregion
@@ -313,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'";
- 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
@@ -341,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
@@ -352,13 +282,18 @@ 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);
+ try
+ {
+ return base.Insert(rn);
+ }
+ catch (Exception)
+ {
+ return false;
+ }
}
#endregion
@@ -367,35 +302,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"];
- room.PersonNum = Convert.ToString(dr["PersonNum"]);
- 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
@@ -405,20 +326,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
@@ -429,10 +340,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 f01b71f96160c40255397475fe6e2845458f7462..c9af2ff67c942a950fb793a807982eeb70f3d0ba 100644
--- a/SYS.Application/SYS.Application.csproj
+++ b/SYS.Application/SYS.Application.csproj
@@ -22,6 +22,7 @@
prompt
4
x64
+ bin\Debug\SYS.Application.xml
pdbonly
@@ -31,6 +32,9 @@
prompt
4
+
+ bitbug_favicon %281%29.ico
+
False
@@ -44,6 +48,9 @@
False
..\SYS.Library\MySql.Web.dll
+
+ ..\packages\SqlSugar.5.0.2\lib\SqlSugar.dll
+
@@ -54,16 +61,34 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
-
-
+
-
+
@@ -75,12 +100,21 @@
+
+ {65501af6-c629-448a-847e-1bcd60665865}
+ SYS.Common
+
{cd039d0f-bd50-4fbf-b9cd-cdfab25c7dfa}
SYS.Core
False
-
+
+
+
+
+
+
\ 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..c8d6f66ab506dfd2bd38bff3a9f0538fab406867
--- /dev/null
+++ b/SYS.Application/Worker/IWorkerService.cs
@@ -0,0 +1,75 @@
+using SYS.Core;
+using System.Collections.Generic;
+
+namespace SYS.Application
+{
+ ///
+ /// 员工信息接口
+ ///
+ public interface IWorkerService
+ {
+ #region 修改员工信息
+ ///
+ /// 修改员工信息
+ ///
+ ///
+ ///
+ bool UpdateWorker(Worker worker);
+ #endregion
+
+ ///
+ /// 更新员工职位和部门
+ ///
+ ///
+ ///
+
+ bool UpdateWorkerPositionAndClub(Worker worker);
+
+ #region 添加员工信息
+ ///
+ /// 添加员工信息
+ ///
+ ///
+ ///
+ bool AddWorker(Worker worker);
+ #endregion
+
+ #region 获取所有工作人员信息
+ ///
+ /// 获取所有工作人员信息
+ ///
+ ///
+ List SelectWorkerAll();
+ #endregion
+
+ #region 根据登录名称查询员工信息
+ ///
+ /// 根据登录名称查询员工信息
+ ///
+ ///
+ ///
+ Worker SelectWorkerInfoByWorkerId(string workerId);
+ #endregion
+
+ #region 根据登录名称、密码查询员工信息
+ ///
+ /// 根据登录名称、密码查询员工信息
+ ///
+ ///
+ /// 登录名称
+ ///
+ /// 登录密码
+ ///
+ Worker SelectWorkerInfoByWorkerIdAndWorkerPwd(string id, string pwd);
+ #endregion
+
+
+ ///
+ /// 根据员工编号和密码修改密码
+ ///
+ ///
+ ///
+ ///
+ bool UpdWorkerPwdByWorkNo(string workId, string workPwd);
+ }
+}
\ No newline at end of file
diff --git a/SYS.Application/Worker/WorkerCheckService.cs b/SYS.Application/Worker/WorkerCheckService.cs
index 0b83fadc8c4612065feaa4df278c9d43a15c0752..ae1f6930a2e92aa9ee0a827fee18ae1da3837cfb 100644
--- a/SYS.Application/Worker/WorkerCheckService.cs
+++ b/SYS.Application/Worker/WorkerCheckService.cs
@@ -1,41 +1,30 @@
using System;
using System.Collections.Generic;
+using System.Linq;
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 +34,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 +45,12 @@ 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)";
+ var listCheckInfo = base.GetList(a => a.WorkerNo == wkn && a.delete_mk != 1);
+ var count = listCheckInfo.Where(a => a.CheckTime.ToShortDateString() == DateTime.Now.ToShortDateString()).Count() > 0 ? 1:0;
+ return count;
}
///
@@ -68,10 +58,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..f3fb3686f44f4f202457bedd4ca90c3d7520dff8 100644
--- a/SYS.Application/Worker/WorkerGoodBadService.cs
+++ b/SYS.Application/Worker/WorkerGoodBadService.cs
@@ -5,37 +5,49 @@ 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 admins = new List();
+ admins = base.Change().GetList(a => a.DeleteMk != 1);
+ 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;
+
+ //操作人
+ var admin = admins.FirstOrDefault(a => a.AdminAccount == source.GBOperation);
+ source.OperationName = string.IsNullOrEmpty(admin.AdminName) ? "" : admin.AdminName;
+ });
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..795ed8c4dbd41063615554e6c8ecab608a86553c 100644
--- a/SYS.Application/Worker/WorkerService.cs
+++ b/SYS.Application/Worker/WorkerService.cs
@@ -1,26 +1,56 @@
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()
+ {
+ WorkerName = worker.WorkerName,
+ WorkerTel = worker.WorkerTel,
+ WorkerAddress = worker.WorkerAddress,
+ WorkerFace = string.IsNullOrEmpty(worker.WorkerFace) ? "" : worker.WorkerFace,
+ WorkerEducation = string.IsNullOrEmpty(worker.WorkerEducation) ? "" : worker.WorkerEducation,
+ WorkerNation = string.IsNullOrEmpty(worker.WorkerNation) ? "" : worker.WorkerNation,
+ datachg_usr = AdminInfo.Account,
+ datachg_date = DateTime.Now
+ },a => a.WorkerId == worker.WorkerId);
+
}
#endregion
+ ///
+ /// 更新员工职位和部门
+ ///
+ ///
+ ///
+
+ public bool UpdateWorkerPositionAndClub(Worker worker)
+ {
+ return base.Update(a => new Worker()
+ {
+ WorkerClub = worker.WorkerClub,
+ WorkerPosition = worker.WorkerPosition,
+ datachg_usr = AdminInfo.Account,
+ datachg_date = DateTime.Now
+ }, a => a.WorkerId == worker.WorkerId);
+ }
#region 添加员工信息
///
@@ -28,10 +58,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 +69,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.EducationName = 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 +118,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.EducationName = 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,32 +150,49 @@ 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())
+ Worker w = new Worker();
+ w = base.GetSingle(a => a.WorkerId == id && a.WorkerPwd == pwd);
+ if (w == null)
{
- 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"];
+ w = null;
+ return w;
}
- dr.Close();
- DBHelper.Closecon();
+ //性别类型
+ 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.EducationName = 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
+
+ ///
+ /// 根据员工编号和密码修改密码
+ ///
+ ///
+ ///
+ ///
+ public bool UpdWorkerPwdByWorkNo(string workId,string workPwd)
+ {
+ return base.Update(a => new Worker()
+ {
+ WorkerPwd = workPwd,
+ datachg_usr = LoginInfo.WorkerNo,
+ datachg_date = DateTime.Now
+ },a => a.WorkerId == workId);
+ }
+
}
}
diff --git a/SYS.Application/Zero/AdminService.cs b/SYS.Application/Zero/AdminService.cs
index 98bf57166f2998d2237371b57939771055211232..f8c5bcb4c249b5ec39693e9448949f22d3714817 100644
--- a/SYS.Application/Zero/AdminService.cs
+++ b/SYS.Application/Zero/AdminService.cs
@@ -1,57 +1,60 @@
using MySql.Data.MySqlClient;
+using SYS.Common;
using SYS.Core;
+using System;
namespace SYS.Application
{
- public class AdminService
+ ///
+ /// 管理员数据访问层
+ ///
+ public class AdminService:Repository, IAdminService
{
+
#region 根据超管密码查询员工类型和权限
///
/// 根据超管密码查询员工类型和权限
///
- ///
+ ///
+ ///
///
- public static Admin SelectMangerByPass(string adminpass)
+ public Admin SelectMangerByPass(string adminaccount,string adminpass)
{
- Admin a = null;
- string sql = "select * from ADMININFO where AdminPassword='" + adminpass + "'";
- MySqlDataReader dr = DBHelper.ExecuteReader(sql);
- if (dr.Read())
- {
- a = new Admin();
- a.AdminPassword = (string)dr["AdminPassword"];
- a.AdminType = dr["AdminType"].ToString();
- a.AdminGroup = dr["AdminName"].ToString();
- }
- 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
+
+ ///
+ /// 修改密码
+ ///
+ ///
+ ///
+ ///
+ public bool UpdateNewPwdByOldPwd(string Account, string NewPwd)
+ {
+ return base.Update(a => new Admin()
+ {
+ AdminPassword = NewPwd,
+ datachg_usr = AdminInfo.Account,
+ datachg_time = DateTime.Now
+ },a => a.AdminAccount == Account);
+ }
+
}
}
diff --git a/SYS.Application/Zero/BaseService.cs b/SYS.Application/Zero/BaseService.cs
new file mode 100644
index 0000000000000000000000000000000000000000..ab82a79e75db28a18b3a7545b3860fed25fac0db
--- /dev/null
+++ b/SYS.Application/Zero/BaseService.cs
@@ -0,0 +1,659 @@
+using MySql.Data.MySqlClient;
+using SYS.Common;
+using SYS.Core;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace SYS.Application
+{
+ ///
+ /// 基础信息接口实现类
+ ///
+ public class BaseService: Repository,IBaseService
+ {
+
+ #region 性别模块
+
+ ///
+ /// 查询所有性别类型(可用)
+ ///
+ ///
+ public List SelectSexTypeAllCanUse()
+ {
+ List sexTypes = new List