From 233d10ede2eaa18f0a658bd675d28529e9259eca Mon Sep 17 00:00:00 2001 From: Chunkit Yeung Date: Sat, 26 Feb 2022 19:49:41 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SYS.Application/Business/ISellService.cs | 20 +- SYS.Application/Business/ISpendService.cs | 6 + SYS.Application/Business/IWtiService.cs | 2 +- SYS.Application/Business/SellService.cs | 68 +-- SYS.Application/Business/SpendService.cs | 38 ++ SYS.Application/Business/WtiService.cs | 18 +- SYS.Application/Customer/CustoService.cs | 47 +- SYS.Application/Customer/ICustoService.cs | 6 + SYS.Application/Zero/BaseService.cs | 107 ++--- SYS.Application/Zero/IBaseService.cs | 32 +- SYS.Core/Business/SellThing.cs | 2 +- SYS.Core/Business/Wti.cs | 11 +- ...gnTimeResolveAssemblyReferencesInput.cache | Bin 22502 -> 22364 bytes SYS.FormUI/AppFunction/FrmAddRoom.cs | 1 + SYS.FormUI/AppFunction/FrmAddWorker.cs | 8 +- SYS.FormUI/AppFunction/FrmChangePosition.cs | 2 +- SYS.FormUI/AppFunction/FrmCheckOutForm.cs | 2 +- .../AppFunction/FrmCustoManager.Designer.cs | 232 ++++----- SYS.FormUI/AppFunction/FrmCustoManager.cs | 16 +- .../FrmCustomerManager.Designer.cs | 154 +++--- SYS.FormUI/AppFunction/FrmCustomerManager.cs | 13 +- SYS.FormUI/AppFunction/FrmEditInputs.cs | 2 +- .../AppFunction/FrmEducation.Designer.cs | 73 ++- SYS.FormUI/AppFunction/FrmEducation.cs | 43 +- SYS.FormUI/AppFunction/FrmMySpace.cs | 6 +- SYS.FormUI/AppFunction/FrmNation.Designer.cs | 73 ++- SYS.FormUI/AppFunction/FrmNation.cs | 46 +- SYS.FormUI/AppFunction/FrmNation.resx | 21 +- .../AppFunction/FrmPosition.Designer.cs | 73 ++- SYS.FormUI/AppFunction/FrmPosition.cs | 43 +- SYS.FormUI/AppFunction/FrmReserList.cs | 2 +- .../AppFunction/FrmReserManager.Designer.cs | 25 +- SYS.FormUI/AppFunction/FrmReserManager.cs | 19 +- SYS.FormUI/AppFunction/FrmRoomMap.Designer.cs | 1 + SYS.FormUI/AppFunction/FrmRoomMap.cs | 6 +- SYS.FormUI/AppFunction/FrmSelectCustoInfo.cs | 2 +- SYS.FormUI/AppFunction/FrmSellThing.cs | 140 ++++-- SYS.FormUI/AppFunction/FrmSellThingManager.cs | 2 +- SYS.FormUI/AppFunction/FrmWtiInfo.cs | 2 +- .../AppUserControls/ucBaseInformation.cs | 49 +- .../AppUserControls/ucEducationInformation.cs | 13 +- .../AppUserControls/ucPositionInformation.cs | 5 +- .../AppUserControls/ucRoomList.Designer.cs | 29 +- SYS.FormUI/AppUserControls/ucRoomList.cs | 179 +++++-- SYS.FormUI/SYS.FormUI.csproj | 18 +- .../icon/\346\260\221\346\227\217.ico" | Bin 744 -> 445 bytes .../DesignTimeResolveAssemblyReferences.cache | Bin 3275 -> 4328 bytes .../data.sql" | 443 ++++++++---------- 48 files changed, 1286 insertions(+), 814 deletions(-) diff --git a/SYS.Application/Business/ISellService.cs b/SYS.Application/Business/ISellService.cs index 5f9c3c4..ee032dd 100644 --- a/SYS.Application/Business/ISellService.cs +++ b/SYS.Application/Business/ISellService.cs @@ -36,21 +36,7 @@ namespace SYS.Application /// 查询所有商品 /// /// - List SelectSellThingAll(); - - /// - /// 根据商品ID查询 - /// - /// - /// - SellThing SelectSellThingByNo(string No); - - /// - /// 根据商品名称查询 - /// - /// - /// - List SelectSellThingByName(string Name); + List SelectSellThingAll(SellThing sellThing = null); /// /// 修改商品 @@ -72,9 +58,9 @@ namespace SYS.Application /// /// /// - /// + /// /// - bool DeleteSellThing(string roomNo, string custoNo, DateTime spendTime); + bool DeleteSellThing(string roomNo, string custoNo, string sellName); /// /// 根据商品编号删除商品信息 diff --git a/SYS.Application/Business/ISpendService.cs b/SYS.Application/Business/ISpendService.cs index 65e011d..9368d7d 100644 --- a/SYS.Application/Business/ISpendService.cs +++ b/SYS.Application/Business/ISpendService.cs @@ -114,5 +114,11 @@ namespace SYS.Application bool UpdateSpendInfoByRoomNo(List spends, string newRoom, string custoNo); #endregion + /// + /// 更新消费信息 + /// + /// + /// + bool UpdSpenInfo(Spend spend); } } \ No newline at end of file diff --git a/SYS.Application/Business/IWtiService.cs b/SYS.Application/Business/IWtiService.cs index 8127b50..83b2729 100644 --- a/SYS.Application/Business/IWtiService.cs +++ b/SYS.Application/Business/IWtiService.cs @@ -92,7 +92,7 @@ namespace SYS.Application /// /// /// - bool DeleteWtiInfo(string roomno); + //bool DeleteWtiInfo(string roomno); #endregion #region 根据房间编号、使用时间删除水电费信息 diff --git a/SYS.Application/Business/SellService.cs b/SYS.Application/Business/SellService.cs index 837ff6f..9c4b46e 100644 --- a/SYS.Application/Business/SellService.cs +++ b/SYS.Application/Business/SellService.cs @@ -23,7 +23,9 @@ */ using System; using System.Collections.Generic; +using jvncorelib_fr.Entitylib; using MySql.Data.MySqlClient; +using SqlSugar; using SYS.Common; using SYS.Core; @@ -38,43 +40,41 @@ namespace SYS.Application /// 查询所有商品 /// /// - public List SelectSellThingAll() + public List SelectSellThingAll(SellThing sellThing = null) { List sellThings = new List(); - sellThings = base.GetList(a => a.delete_mk == 0); - sellThings.ForEach(sellThing => + var exp = Expressionable.Create().And(a => a.delete_mk == 0); + if (sellThing.IsNullOrEmpty()) { - sellThing.SellPriceStr = Decimal.Parse(sellThing.SellPrice.ToString()).ToString("#,##0.00").ToString(); - }); - return sellThings; - } - - /// - /// 根据商品ID查询 - /// - /// - /// - public SellThing SelectSellThingByNo(string No) - { - SellThing s = new SellThing(); - s = base.GetSingle(a => a.SellNo == No && a.delete_mk != 1); - return s; - } - - /// - /// 根据商品名称查询 - /// - /// - /// - public List SelectSellThingByName(string Name) - { - 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)); + sellThings = base.GetList(exp.ToExpression()); + sellThings.ForEach(_sellThing => + { + _sellThing.SellPriceStr = Decimal.Parse(_sellThing.SellPrice.ToString()).ToString("#,##0.00").ToString(); + }); + } + else + { + //商品编号 + if (!sellThing.SellNo.IsNullOrEmpty()) + { + exp = exp.And(a => a.SellNo.Contains(sellThing.SellNo)); + } + //商品名称 + if (!sellThing.SellName.IsNullOrEmpty()) + { + exp = exp.Or(a => a.SellName.Contains(sellThing.SellName)); + } + sellThings = base.GetList(exp.ToExpression()); + sellThings.ForEach(_sellThing => + { + _sellThing.SellPriceStr = Decimal.Parse(_sellThing.SellPrice.ToString()).ToString("#,##0.00").ToString(); + }); + } return sellThings; } /// - /// 修改商品 + /// 更新商品数量 /// /// /// @@ -110,17 +110,17 @@ namespace SYS.Application /// /// /// - /// + /// /// - public bool DeleteSellThing(string roomNo, string custoNo, DateTime spendTime) + public bool DeleteSellThing(string roomNo, string custoNo, string sellName) { return base.Change().Update(a => new Spend() { delete_mk = 1, datachg_usr = LoginInfo.WorkerNo, datachg_date = DateTime.Now - },a => a.MoneyState == "未结算" && a.RoomNo == roomNo && a.CustoNo == custoNo - && a.SpendTime == spendTime); + },a => a.MoneyState.Equals(SpendConsts.UnSettle) && a.RoomNo == roomNo && a.CustoNo == custoNo + && a.SpendName == sellName); } diff --git a/SYS.Application/Business/SpendService.cs b/SYS.Application/Business/SpendService.cs index 2a21352..5996ec0 100644 --- a/SYS.Application/Business/SpendService.cs +++ b/SYS.Application/Business/SpendService.cs @@ -61,6 +61,12 @@ namespace SYS.Application { source.SpendStateNm = string.IsNullOrEmpty(source.MoneyState) ? "" : source.MoneyState.Equals(SpendConsts.Settled) ? "已结算" : "未结算"; + + source.SpendPriceStr = string.IsNullOrEmpty(source.SpendPrice + "") ? "" + : Decimal.Parse(source.SpendPrice.ToString()).ToString("#,##0.00").ToString(); + + source.SpendMoneyStr = string.IsNullOrEmpty(source.SpendMoney + "") ? "" + : Decimal.Parse(source.SpendMoney.ToString()).ToString("#,##0.00").ToString(); }); return ls; } @@ -80,6 +86,12 @@ namespace SYS.Application { source.SpendStateNm = string.IsNullOrEmpty(source.MoneyState) ? "" : source.MoneyState.Equals(SpendConsts.Settled) ? "已结算" : "未结算"; + + source.SpendPriceStr = string.IsNullOrEmpty(source.SpendPrice + "") ? "" + : Decimal.Parse(source.SpendPrice.ToString()).ToString("#,##0.00").ToString(); + + source.SpendMoneyStr = string.IsNullOrEmpty(source.SpendMoney + "") ? "" + : Decimal.Parse(source.SpendMoney.ToString()).ToString("#,##0.00").ToString(); }); return ls; } @@ -99,6 +111,12 @@ namespace SYS.Application { source.SpendStateNm = string.IsNullOrEmpty(source.MoneyState) ? "" : source.MoneyState.Equals(SpendConsts.Settled) ? "已结算" : "未结算"; + + source.SpendPriceStr = string.IsNullOrEmpty(source.SpendPrice + "") ? "" + : Decimal.Parse(source.SpendPrice.ToString()).ToString("#,##0.00").ToString(); + + source.SpendMoneyStr = string.IsNullOrEmpty(source.SpendMoney + "") ? "" + : Decimal.Parse(source.SpendMoney.ToString()).ToString("#,##0.00").ToString(); }); return ls; } @@ -128,6 +146,8 @@ namespace SYS.Application } #endregion + + #region 根据房间号查询消费的所有信息 /// /// 根据房间号查询消费的所有信息 @@ -207,5 +227,23 @@ namespace SYS.Application } #endregion + /// + /// 更新消费信息 + /// + /// + /// + public bool UpdSpenInfo(Spend spend) + { + return base.Update(a => new Spend() + { + SpendAmount = spend.SpendAmount, + SpendMoney = spend.SpendMoney, + + }, a => a.MoneyState.Equals(SpendConsts.UnSettle) + && a.RoomNo.Equals(spend.RoomNo) + && a.CustoNo.Equals(spend.CustoNo) + && a.SpendName.Equals(spend.SpendName)); + } + } } diff --git a/SYS.Application/Business/WtiService.cs b/SYS.Application/Business/WtiService.cs index b7ee9d1..eec4cdf 100644 --- a/SYS.Application/Business/WtiService.cs +++ b/SYS.Application/Business/WtiService.cs @@ -153,15 +153,15 @@ namespace SYS.Application /// /// /// - public bool DeleteWtiInfo(string roomno) - { - return base.Update(a => new Wti() - { - delete_mk = 1, - datachg_usr = LoginInfo.WorkerNo, - datachg_date = DateTime.Now - }, a => a.WtiNo == roomno); - } + //public bool DeleteWtiInfo(string roomno) + //{ + // return base.Update(a => new Wti() + // { + // delete_mk = 1, + // datachg_usr = LoginInfo.WorkerNo, + // datachg_date = DateTime.Now + // }, a => a.WtiNo == roomno); + //} #endregion #region 根据房间编号、使用时间删除水电费信息 diff --git a/SYS.Application/Customer/CustoService.cs b/SYS.Application/Customer/CustoService.cs index a5110c0..e2820cf 100644 --- a/SYS.Application/Customer/CustoService.cs +++ b/SYS.Application/Customer/CustoService.cs @@ -25,6 +25,7 @@ using System; using System.Collections.Generic; using System.Linq; using EncryptTools; +using jvncorelib_fr.Entitylib; using MySql.Data.MySqlClient; using Npgsql; using SYS.Common; @@ -164,6 +165,45 @@ namespace SYS.Application return custos; } + /// + /// 查询指定客户信息 + /// + /// + public List SelectCustoByInfo(Custo custo) + { + //查询出所有性别类型 + 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(); + custos = base.GetList(a => a.CustoNo.Contains(custo.CustoNo)).OrderBy(a => a.CustoNo).ToList(); + custos.ForEach(source => + { + //解密身份证号码 + var sourceStr = source.CustoID.Contains("·") ? encrypt.Decryption(source.CustoID) : source.CustoID; + source.CustoID = sourceStr; + //解密联系方式 + var sourceTelStr = source.CustoTel.Contains("·") ? encrypt.Decryption(source.CustoTel) : source.CustoTel; + source.CustoTel = sourceTelStr; + //性别类型 + 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; + } + /// /// 根据客户编号查询客户信息 /// @@ -171,11 +211,10 @@ namespace SYS.Application /// public Custo SelectCardInfoByCustoNo(string CustoNo) { - Custo c = new Custo(); - c = base.GetSingle(a => a.CustoNo.Equals(CustoNo)); - if (c == null) + Custo c = base.GetSingle(a => a.CustoNo.Contains(CustoNo)); + if (c.IsNullOrEmpty()) { - return c; + return null; } //性别类型 var sexType = base.Change().GetSingle(a => a.sexId == c.CustoSex); diff --git a/SYS.Application/Customer/ICustoService.cs b/SYS.Application/Customer/ICustoService.cs index a277aa7..dc37aa2 100644 --- a/SYS.Application/Customer/ICustoService.cs +++ b/SYS.Application/Customer/ICustoService.cs @@ -67,6 +67,12 @@ namespace SYS.Application /// List SelectCustoAll(); + /// + /// 查询指定客户信息 + /// + /// + List SelectCustoByInfo(Custo custo); + /// /// 根据客户编号查询客户信息 /// diff --git a/SYS.Application/Zero/BaseService.cs b/SYS.Application/Zero/BaseService.cs index 04770a7..172d542 100644 --- a/SYS.Application/Zero/BaseService.cs +++ b/SYS.Application/Zero/BaseService.cs @@ -21,12 +21,15 @@ *SOFTWARE. * */ +using jvncorelib_fr.Entitylib; using MySql.Data.MySqlClient; +using SqlSugar; using SYS.Common; using SYS.Core; using System; using System.Collections.Generic; using System.Linq; +using System.Linq.Expressions; using System.Text; using System.Threading.Tasks; @@ -40,26 +43,22 @@ namespace SYS.Application #region 性别模块 - /// - /// 查询所有性别类型(可用) - /// - /// - public List SelectSexTypeAllCanUse() - { - List sexTypes = new List(); - sexTypes = base.GetList(a => a.delete_mk != 1); - return sexTypes; - } - /// /// 查询所有性别类型 /// /// - public List SelectSexTypeAll() + public List SelectSexTypeAll(SexType sexType = null) { - List sexTypes = new List(); - sexTypes = base.GetList(); - return sexTypes; + var where = Expressionable.Create(); + if (sexType != null && sexType.sexName.IsNullOrEmpty()) + { + where = where.And(a => a.delete_mk == sexType.delete_mk); + } + if (sexType != null && !sexType.sexName.IsNullOrEmpty()) + { + where = where.And(a => a.sexName.Contains(sexType.sexName)); + } + return base.Change().GetList(where.ToExpression()); } /// @@ -117,26 +116,22 @@ namespace SYS.Application #region 职位模块 - /// - /// 查询所有职位类型(可用) - /// - /// - public List SelectPositionAllCanUse() - { - List positions = new List(); - positions = base.Change().GetList(a => a.delete_mk != 1); - return positions; - } - /// /// 查询所有职位类型 /// /// - public List SelectPositionAll() + public List SelectPositionAll(Position position = null) { - List positions = new List(); - positions = base.Change().GetList(); - return positions; + var where = Expressionable.Create(); + if (position != null && position.position_name.IsNullOrEmpty()) + { + where = where.And(a => a.delete_mk == position.delete_mk); + } + if (position != null && !position.position_name.IsNullOrEmpty()) + { + where = where.And(a => a.position_name.Contains(position.position_name)); + } + return base.Change().GetList(where.ToExpression()); } /// @@ -194,26 +189,22 @@ namespace SYS.Application #region 民族模块 - /// - /// 查询所有民族类型(可用) - /// - /// - public List SelectNationAllCanUse() - { - List nations = new List(); - nations = base.Change().GetList(a => a.delete_mk != 1); - return nations; - } - /// /// 查询所有民族类型 /// /// - public List SelectNationAll() + public List SelectNationAll(Nation nation = null) { - List nations = new List(); - nations = base.Change().GetList(); - return nations; + var where = Expressionable.Create(); + if (nation != null && nation.nation_name.IsNullOrEmpty()) + { + where = where.And(a => a.delete_mk == nation.delete_mk); + } + if (nation != null && !nation.nation_name.IsNullOrEmpty()) + { + where = where.And(a => a.nation_name.Contains(nation.nation_name)); + } + return base.Change().GetList(where.ToExpression()); } /// @@ -272,26 +263,22 @@ namespace SYS.Application #region 学历模块 - /// - /// 查询所有学历类型(可用) - /// - /// - public List SelectEducationAllCanUse() - { - List educations = new List(); - educations = base.Change().GetList(a => a.delete_mk != 1); - return educations; - } - /// /// 查询所有学历类型 /// /// - public List SelectEducationAll() + public List SelectEducationAll(Education education = null) { - List educations = new List(); - educations = base.Change().GetList(); - return educations; + var where = Expressionable.Create(); + if (education != null && education.education_name.IsNullOrEmpty()) + { + where = where.And(a => a.delete_mk == education.delete_mk); + } + if (education != null && !education.education_name.IsNullOrEmpty()) + { + where = where.And(a => a.education_name.Contains(education.education_name)); + } + return base.Change().GetList(where.ToExpression()); } /// diff --git a/SYS.Application/Zero/IBaseService.cs b/SYS.Application/Zero/IBaseService.cs index b8bbf24..02bb56a 100644 --- a/SYS.Application/Zero/IBaseService.cs +++ b/SYS.Application/Zero/IBaseService.cs @@ -37,17 +37,11 @@ namespace SYS.Application { #region 性别模块 - /// - /// 查询所有性别类型(可用) - /// - /// - List SelectSexTypeAllCanUse(); - /// /// 查询所有性别类型 /// /// - List SelectSexTypeAll(); + List SelectSexTypeAll(SexType sexType = null); /// /// 查询性别类型 @@ -80,17 +74,11 @@ namespace SYS.Application #region 职位模块 - /// - /// 查询所有职位类型(可用) - /// - /// - List SelectPositionAllCanUse(); - /// /// 查询所有职位类型 /// /// - List SelectPositionAll(); + List SelectPositionAll(Position position = null); /// /// 查询职位类型 @@ -123,17 +111,11 @@ namespace SYS.Application #region 民族模块 - /// - /// 查询所有民族类型(可用) - /// - /// - List SelectNationAllCanUse(); - /// /// 查询所有民族类型 /// /// - List SelectNationAll(); + List SelectNationAll(Nation nation = null); /// /// 查询民族类型 @@ -166,17 +148,11 @@ namespace SYS.Application #region 学历模块 - /// - /// 查询所有学历类型(可用) - /// - /// - List SelectEducationAllCanUse(); - /// /// 查询所有学历类型 /// /// - List SelectEducationAll(); + List SelectEducationAll(Education education = null); /// /// 查询学历类型 diff --git a/SYS.Core/Business/SellThing.cs b/SYS.Core/Business/SellThing.cs index 2fdefe3..be11449 100644 --- a/SYS.Core/Business/SellThing.cs +++ b/SYS.Core/Business/SellThing.cs @@ -57,7 +57,7 @@ namespace SYS.Core /// /// 库存 /// - public int Stock { get; set; } + public decimal Stock { get; set; } /// /// 删除标记 /// diff --git a/SYS.Core/Business/Wti.cs b/SYS.Core/Business/Wti.cs index bd5c2fc..20de558 100644 --- a/SYS.Core/Business/Wti.cs +++ b/SYS.Core/Business/Wti.cs @@ -35,38 +35,47 @@ namespace SYS.Core /// /// 信息编号 /// - public string WtiNo { get; set; } + [SqlSugar.SugarColumn(ColumnName = "WtiNo")] + public int WtiNo { get; set; } /// /// 房间编号 /// + [SqlSugar.SugarColumn(ColumnName = "RoomNo")] public string RoomNo { get; set; } /// /// 开始使用时间 /// + [SqlSugar.SugarColumn(ColumnName = "UseDate")] public DateTime UseDate { get; set; } /// /// 结束使用时间 /// + [SqlSugar.SugarColumn(ColumnName = "EndDate")] public DateTime EndDate { get; set; } /// /// 水费 /// + [SqlSugar.SugarColumn(ColumnName = "WaterUse")] public decimal WaterUse { get; set; } /// /// 电费 /// + [SqlSugar.SugarColumn(ColumnName = "PowerUse")] public decimal PowerUse { get; set; } /// /// 记录员 /// + [SqlSugar.SugarColumn(ColumnName = "Record")] public string Record { get; set; } /// /// 客户编号 /// + [SqlSugar.SugarColumn(ColumnName = "CustoNo")] public string CustoNo { get; set; } /// /// 删除标记 /// + [SqlSugar.SugarColumn(ColumnName = "delete_mk")] public int delete_mk { get; set; } /// /// 资料创建人 diff --git a/SYS.Core/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/SYS.Core/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index b79551bbdfa00e4badcf94f5748d336580ddad80..26a74213b02a8fe82dfda21ffebc80e84f147d40 100644 GIT binary patch delta 219 zcmaF1p7G8)#tkcZ+;p6+V!}QBT>Qg>V~Q(_OHy-%@nki%j_jAKE8 YUUGh3T4p+%98j||7B!o7`F45&07;rg@c;k- delta 97 zcmcb!j`7)g#tkcZ7@a34@+(c26JVR{5W+k81ds6KE&S$_fAa`{X>DE*tv5M{SCY{b krc$^lHO8@^KrcBzFD)~jO^$(q!3rkFRFt}TG4D=K055(XNB{r; diff --git a/SYS.FormUI/AppFunction/FrmAddRoom.cs b/SYS.FormUI/AppFunction/FrmAddRoom.cs index c8bfa72..252556b 100644 --- a/SYS.FormUI/AppFunction/FrmAddRoom.cs +++ b/SYS.FormUI/AppFunction/FrmAddRoom.cs @@ -89,6 +89,7 @@ namespace SYS.FormUI for (int i = 0; i < rooms.Count; i++) { romt = new ucRoomList(); + romt.lblMark.Text = "Mark"; romt.lblRoomNo.Text = rooms[i].RoomNo; romt.lblCustoNo.Text = rooms[i].CustoNo; romt.lblRoomType.Text = rooms[i].RoomName; diff --git a/SYS.FormUI/AppFunction/FrmAddWorker.cs b/SYS.FormUI/AppFunction/FrmAddWorker.cs index 23a084e..44d2071 100644 --- a/SYS.FormUI/AppFunction/FrmAddWorker.cs +++ b/SYS.FormUI/AppFunction/FrmAddWorker.cs @@ -62,19 +62,19 @@ namespace SYS.FormUI cboClub.DisplayMember = "dept_name"; cboClub.ValueMember = "dept_no"; //加载民族信息 - cbWorkerNation.DataSource = new BaseService().SelectNationAllCanUse(); + cbWorkerNation.DataSource = new BaseService().SelectNationAll(new Nation { delete_mk = 0 }); cbWorkerNation.DisplayMember = "nation_name"; cbWorkerNation.ValueMember = "nation_no"; //加载职位信息 - cboWorkerPosition.DataSource = new BaseService().SelectPositionAllCanUse(); + cboWorkerPosition.DataSource = new BaseService().SelectPositionAll(new Position { delete_mk = 0 }); cboWorkerPosition.DisplayMember = "position_name"; cboWorkerPosition.ValueMember = "position_no"; //加载性别信息 - cboSex.DataSource = new BaseService().SelectSexTypeAllCanUse(); + cboSex.DataSource = new BaseService().SelectSexTypeAll(new SexType {delete_mk = 0 }); cboSex.DisplayMember = "sexName"; cboSex.ValueMember = "sexId"; //加载学历信息 - cboEducation.DataSource = new BaseService().SelectEducationAllCanUse(); + cboEducation.DataSource = new BaseService().SelectEducationAll(new Education { delete_mk = 0 }); cboEducation.DisplayMember = "education_name"; cboEducation.ValueMember = "education_no"; diff --git a/SYS.FormUI/AppFunction/FrmChangePosition.cs b/SYS.FormUI/AppFunction/FrmChangePosition.cs index 601655a..a2ae0f2 100644 --- a/SYS.FormUI/AppFunction/FrmChangePosition.cs +++ b/SYS.FormUI/AppFunction/FrmChangePosition.cs @@ -53,7 +53,7 @@ namespace SYS.FormUI txtClub.Text = FrmChangeWorker.wk_WorkerClub; txtPosition.Text = FrmChangeWorker.wk_WorkerPosition; //获取所有职位信息 - cboNewPosition.DataSource = new BaseService().SelectPositionAllCanUse(); + cboNewPosition.DataSource = new BaseService().SelectPositionAll(new Position { delete_mk = 0 }); cboNewPosition.DisplayMember = "position_name"; cboNewPosition.ValueMember = "position_no"; //获取所有部门信息 diff --git a/SYS.FormUI/AppFunction/FrmCheckOutForm.cs b/SYS.FormUI/AppFunction/FrmCheckOutForm.cs index 5f10ee6..ac4a6e8 100644 --- a/SYS.FormUI/AppFunction/FrmCheckOutForm.cs +++ b/SYS.FormUI/AppFunction/FrmCheckOutForm.cs @@ -105,7 +105,7 @@ namespace SYS.FormUI #endregion #region 加载性别信息 - List listSexType = new BaseService().SelectSexTypeAllCanUse(); + List listSexType = new BaseService().SelectSexTypeAll(new SexType { delete_mk = 0 }); this.cboCustoSex.DataSource = listSexType; this.cboCustoSex.DisplayMember = "sexName"; this.cboCustoSex.ValueMember = "sexId"; diff --git a/SYS.FormUI/AppFunction/FrmCustoManager.Designer.cs b/SYS.FormUI/AppFunction/FrmCustoManager.Designer.cs index b324387..156820a 100644 --- a/SYS.FormUI/AppFunction/FrmCustoManager.Designer.cs +++ b/SYS.FormUI/AppFunction/FrmCustoManager.Designer.cs @@ -32,15 +32,9 @@ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmCustoManager)); this.dgvCustomerList = new Sunny.UI.UIDataGridView(); - this.gbCustoInfo = new System.Windows.Forms.GroupBox(); - this.txtCardID = new Sunny.UI.UITextBox(); - this.label3 = new System.Windows.Forms.Label(); - this.btnSerach = new Sunny.UI.UIButton(); - this.btnAddCusto = new Sunny.UI.UIButton(); - this.btnExport = new Sunny.UI.UIButton(); - this.btnUpdate = new Sunny.UI.UIButton(); this.CustoNo = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.CustoName = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.CustoSex = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -53,8 +47,15 @@ this.Column2 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column3 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column4 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.btnSerach = new Sunny.UI.UIButton(); + this.btnAddCusto = new Sunny.UI.UIButton(); + this.btnExport = new Sunny.UI.UIButton(); + this.btnUpdate = new Sunny.UI.UIButton(); + this.uiGroupBox1 = new Sunny.UI.UIGroupBox(); + this.txtCustoNo = new Sunny.UI.UITextBox(); + this.label3 = new System.Windows.Forms.Label(); ((System.ComponentModel.ISupportInitialize)(this.dgvCustomerList)).BeginInit(); - this.gbCustoInfo.SuspendLayout(); + this.uiGroupBox1.SuspendLayout(); this.SuspendLayout(); // // dgvCustomerList @@ -74,11 +75,11 @@ dataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255))))); dataGridViewCellStyle2.Font = new System.Drawing.Font("微软雅黑", 12F); dataGridViewCellStyle2.ForeColor = System.Drawing.Color.White; - dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle2.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255))))); dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText; dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True; this.dgvCustomerList.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2; - this.dgvCustomerList.ColumnHeadersHeight = 32; + this.dgvCustomerList.ColumnHeadersHeight = 25; this.dgvCustomerList.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing; this.dgvCustomerList.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.CustoNo, @@ -107,106 +108,25 @@ this.dgvCustomerList.Location = new System.Drawing.Point(3, 38); this.dgvCustomerList.Name = "dgvCustomerList"; this.dgvCustomerList.ReadOnly = true; + dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255))))); + dataGridViewCellStyle4.Font = new System.Drawing.Font("微软雅黑", 12F); + dataGridViewCellStyle4.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48))))); + dataGridViewCellStyle4.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255))))); + dataGridViewCellStyle4.SelectionForeColor = System.Drawing.Color.White; + dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dgvCustomerList.RowHeadersDefaultCellStyle = dataGridViewCellStyle4; this.dgvCustomerList.RowHeadersVisible = false; - dataGridViewCellStyle4.BackColor = System.Drawing.Color.White; - this.dgvCustomerList.RowsDefaultCellStyle = dataGridViewCellStyle4; + this.dgvCustomerList.RowHeight = 29; + dataGridViewCellStyle5.BackColor = System.Drawing.Color.White; + this.dgvCustomerList.RowsDefaultCellStyle = dataGridViewCellStyle5; this.dgvCustomerList.RowTemplate.Height = 29; this.dgvCustomerList.SelectedIndex = -1; this.dgvCustomerList.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; this.dgvCustomerList.ShowRect = false; - this.dgvCustomerList.Size = new System.Drawing.Size(999, 506); + this.dgvCustomerList.Size = new System.Drawing.Size(999, 517); this.dgvCustomerList.TabIndex = 111; // - // gbCustoInfo - // - this.gbCustoInfo.Controls.Add(this.txtCardID); - this.gbCustoInfo.Controls.Add(this.label3); - this.gbCustoInfo.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.gbCustoInfo.Location = new System.Drawing.Point(10, 550); - this.gbCustoInfo.Name = "gbCustoInfo"; - this.gbCustoInfo.Size = new System.Drawing.Size(538, 57); - this.gbCustoInfo.TabIndex = 112; - this.gbCustoInfo.TabStop = false; - this.gbCustoInfo.Text = "条件搜索栏"; - // - // txtCardID - // - this.txtCardID.Cursor = System.Windows.Forms.Cursors.IBeam; - this.txtCardID.FillColor = System.Drawing.Color.White; - this.txtCardID.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.txtCardID.Location = new System.Drawing.Point(227, 16); - this.txtCardID.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.txtCardID.Maximum = 2147483647D; - this.txtCardID.Minimum = -2147483648D; - this.txtCardID.MinimumSize = new System.Drawing.Size(1, 1); - this.txtCardID.Name = "txtCardID"; - this.txtCardID.Padding = new System.Windows.Forms.Padding(5); - this.txtCardID.Radius = 20; - this.txtCardID.Size = new System.Drawing.Size(204, 33); - this.txtCardID.TabIndex = 88; - // - // label3 - // - this.label3.AutoSize = true; - this.label3.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label3.Location = new System.Drawing.Point(132, 19); - this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(88, 25); - this.label3.TabIndex = 87; - this.label3.Text = "客户编号"; - // - // btnSerach - // - this.btnSerach.Cursor = System.Windows.Forms.Cursors.Hand; - this.btnSerach.Font = new System.Drawing.Font("微软雅黑", 12F); - this.btnSerach.Location = new System.Drawing.Point(559, 558); - this.btnSerach.MinimumSize = new System.Drawing.Size(1, 1); - this.btnSerach.Name = "btnSerach"; - this.btnSerach.Radius = 30; - this.btnSerach.Size = new System.Drawing.Size(103, 49); - this.btnSerach.TabIndex = 113; - this.btnSerach.Text = "搜 索"; - this.btnSerach.Click += new System.EventHandler(this.picSearch_Click_1); - // - // btnAddCusto - // - this.btnAddCusto.Cursor = System.Windows.Forms.Cursors.Hand; - this.btnAddCusto.Font = new System.Drawing.Font("微软雅黑", 12F); - this.btnAddCusto.Location = new System.Drawing.Point(668, 558); - this.btnAddCusto.MinimumSize = new System.Drawing.Size(1, 1); - this.btnAddCusto.Name = "btnAddCusto"; - this.btnAddCusto.Radius = 30; - this.btnAddCusto.Size = new System.Drawing.Size(103, 49); - this.btnAddCusto.TabIndex = 114; - this.btnAddCusto.Text = "添加客户"; - this.btnAddCusto.Click += new System.EventHandler(this.picAddCusto_Click_1); - // - // btnExport - // - this.btnExport.Cursor = System.Windows.Forms.Cursors.Hand; - this.btnExport.Font = new System.Drawing.Font("微软雅黑", 12F); - this.btnExport.Location = new System.Drawing.Point(780, 558); - this.btnExport.MinimumSize = new System.Drawing.Size(1, 1); - this.btnExport.Name = "btnExport"; - this.btnExport.Radius = 30; - this.btnExport.Size = new System.Drawing.Size(103, 49); - this.btnExport.TabIndex = 115; - this.btnExport.Text = "导出列表"; - this.btnExport.Click += new System.EventHandler(this.picLoadOut_Click_1); - // - // btnUpdate - // - this.btnUpdate.Cursor = System.Windows.Forms.Cursors.Hand; - this.btnUpdate.Font = new System.Drawing.Font("微软雅黑", 12F); - this.btnUpdate.Location = new System.Drawing.Point(889, 558); - this.btnUpdate.MinimumSize = new System.Drawing.Size(1, 1); - this.btnUpdate.Name = "btnUpdate"; - this.btnUpdate.Radius = 30; - this.btnUpdate.Size = new System.Drawing.Size(103, 49); - this.btnUpdate.TabIndex = 116; - this.btnUpdate.Text = "修改客户"; - this.btnUpdate.Click += new System.EventHandler(this.picUpdateCusto_Click_1); - // // CustoNo // this.CustoNo.DataPropertyName = "CustoNo"; @@ -295,6 +215,100 @@ this.Column4.ReadOnly = true; this.Column4.Visible = false; // + // btnSerach + // + this.btnSerach.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnSerach.Font = new System.Drawing.Font("微软雅黑", 12F); + this.btnSerach.Location = new System.Drawing.Point(583, 570); + this.btnSerach.MinimumSize = new System.Drawing.Size(1, 1); + this.btnSerach.Name = "btnSerach"; + this.btnSerach.Radius = 30; + this.btnSerach.Size = new System.Drawing.Size(97, 41); + this.btnSerach.TabIndex = 113; + this.btnSerach.Text = "搜 索"; + this.btnSerach.Click += new System.EventHandler(this.picSearch_Click_1); + // + // btnAddCusto + // + this.btnAddCusto.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnAddCusto.Font = new System.Drawing.Font("微软雅黑", 12F); + this.btnAddCusto.Location = new System.Drawing.Point(688, 570); + this.btnAddCusto.MinimumSize = new System.Drawing.Size(1, 1); + this.btnAddCusto.Name = "btnAddCusto"; + this.btnAddCusto.Radius = 30; + this.btnAddCusto.Size = new System.Drawing.Size(97, 41); + this.btnAddCusto.TabIndex = 114; + this.btnAddCusto.Text = "添加客户"; + this.btnAddCusto.Click += new System.EventHandler(this.picAddCusto_Click_1); + // + // btnExport + // + this.btnExport.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnExport.Font = new System.Drawing.Font("微软雅黑", 12F); + this.btnExport.Location = new System.Drawing.Point(793, 570); + this.btnExport.MinimumSize = new System.Drawing.Size(1, 1); + this.btnExport.Name = "btnExport"; + this.btnExport.Radius = 30; + this.btnExport.Size = new System.Drawing.Size(97, 41); + this.btnExport.TabIndex = 115; + this.btnExport.Text = "导出列表"; + this.btnExport.Click += new System.EventHandler(this.picLoadOut_Click_1); + // + // btnUpdate + // + this.btnUpdate.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnUpdate.Font = new System.Drawing.Font("微软雅黑", 12F); + this.btnUpdate.Location = new System.Drawing.Point(898, 570); + this.btnUpdate.MinimumSize = new System.Drawing.Size(1, 1); + this.btnUpdate.Name = "btnUpdate"; + this.btnUpdate.Radius = 30; + this.btnUpdate.Size = new System.Drawing.Size(97, 41); + this.btnUpdate.TabIndex = 116; + this.btnUpdate.Text = "修改客户"; + this.btnUpdate.Click += new System.EventHandler(this.picUpdateCusto_Click_1); + // + // uiGroupBox1 + // + this.uiGroupBox1.Controls.Add(this.txtCustoNo); + this.uiGroupBox1.Controls.Add(this.label3); + this.uiGroupBox1.Font = new System.Drawing.Font("微软雅黑", 12F); + this.uiGroupBox1.Location = new System.Drawing.Point(4, 552); + this.uiGroupBox1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.uiGroupBox1.MinimumSize = new System.Drawing.Size(1, 1); + this.uiGroupBox1.Name = "uiGroupBox1"; + this.uiGroupBox1.Padding = new System.Windows.Forms.Padding(0, 32, 0, 0); + this.uiGroupBox1.Size = new System.Drawing.Size(572, 62); + this.uiGroupBox1.TabIndex = 117; + this.uiGroupBox1.Text = "条件搜索"; + this.uiGroupBox1.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter; + // + // txtCustoNo + // + this.txtCustoNo.Cursor = System.Windows.Forms.Cursors.IBeam; + this.txtCustoNo.FillColor = System.Drawing.Color.White; + this.txtCustoNo.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.txtCustoNo.Location = new System.Drawing.Point(112, 23); + this.txtCustoNo.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.txtCustoNo.Maximum = 2147483647D; + this.txtCustoNo.Minimum = -2147483648D; + this.txtCustoNo.MinimumSize = new System.Drawing.Size(1, 1); + this.txtCustoNo.Name = "txtCustoNo"; + this.txtCustoNo.Padding = new System.Windows.Forms.Padding(5); + this.txtCustoNo.Radius = 20; + this.txtCustoNo.Size = new System.Drawing.Size(443, 33); + this.txtCustoNo.TabIndex = 92; + this.txtCustoNo.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; + // + // label3 + // + this.label3.AutoSize = true; + this.label3.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label3.Location = new System.Drawing.Point(17, 26); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(88, 25); + this.label3.TabIndex = 91; + this.label3.Text = "客户编号"; + // // FrmCustoManager // this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 21F); @@ -302,11 +316,11 @@ this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255))))); this.ClientSize = new System.Drawing.Size(1005, 623); this.ControlBox = false; + this.Controls.Add(this.uiGroupBox1); this.Controls.Add(this.btnUpdate); this.Controls.Add(this.btnExport); this.Controls.Add(this.btnAddCusto); this.Controls.Add(this.btnSerach); - this.Controls.Add(this.gbCustoInfo); this.Controls.Add(this.dgvCustomerList); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.MaximizeBox = false; @@ -316,17 +330,14 @@ this.Text = "客户信息管理"; this.Load += new System.EventHandler(this.FrmCustoManager_Load); ((System.ComponentModel.ISupportInitialize)(this.dgvCustomerList)).EndInit(); - this.gbCustoInfo.ResumeLayout(false); - this.gbCustoInfo.PerformLayout(); + this.uiGroupBox1.ResumeLayout(false); + this.uiGroupBox1.PerformLayout(); this.ResumeLayout(false); } #endregion private Sunny.UI.UIDataGridView dgvCustomerList; - private System.Windows.Forms.GroupBox gbCustoInfo; - private Sunny.UI.UITextBox txtCardID; - private System.Windows.Forms.Label label3; private Sunny.UI.UIButton btnSerach; private Sunny.UI.UIButton btnAddCusto; private Sunny.UI.UIButton btnExport; @@ -343,5 +354,8 @@ private System.Windows.Forms.DataGridViewTextBoxColumn Column2; private System.Windows.Forms.DataGridViewTextBoxColumn Column3; private System.Windows.Forms.DataGridViewTextBoxColumn Column4; + private Sunny.UI.UIGroupBox uiGroupBox1; + private Sunny.UI.UITextBox txtCustoNo; + private System.Windows.Forms.Label label3; } } \ No newline at end of file diff --git a/SYS.FormUI/AppFunction/FrmCustoManager.cs b/SYS.FormUI/AppFunction/FrmCustoManager.cs index bd55502..0535cc5 100644 --- a/SYS.FormUI/AppFunction/FrmCustoManager.cs +++ b/SYS.FormUI/AppFunction/FrmCustoManager.cs @@ -123,8 +123,20 @@ namespace SYS.FormUI #region 搜索会员信息事件方法 private void picSearch_Click_1(object sender, EventArgs e) { - dgvCustomerList.AutoGenerateColumns = false; - dgvCustomerList.DataSource = new CustoService().SelectCardInfoByCustoNo(txtCardID.Text); + if (txtCustoNo.Text != "") + { + dgvCustomerList.ClearRows(); + dgvCustomerList.AutoGenerateColumns = false; + List custos = new CustoService().SelectCustoByInfo(new Custo { CustoNo = txtCustoNo.Text.Trim() }); + dgvCustomerList.DataSource = custos; + } + else + { + dgvCustomerList.ClearRows(); + dgvCustomerList.AutoGenerateColumns = false; + List custos = new CustoService().SelectCustoAll(); + dgvCustomerList.DataSource = custos; + } } #endregion diff --git a/SYS.FormUI/AppFunction/FrmCustomerManager.Designer.cs b/SYS.FormUI/AppFunction/FrmCustomerManager.Designer.cs index 08f4ae3..ad3e1db 100644 --- a/SYS.FormUI/AppFunction/FrmCustomerManager.Designer.cs +++ b/SYS.FormUI/AppFunction/FrmCustomerManager.Designer.cs @@ -29,12 +29,10 @@ private void InitializeComponent() { this.components = new System.ComponentModel.Container(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle(); - this.gbCustoInfo = new System.Windows.Forms.GroupBox(); - this.txtCustoNo = new Sunny.UI.UITextBox(); - this.label2 = new System.Windows.Forms.Label(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle(); this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); this.dgvCustomerList = new Sunny.UI.UIDataGridView(); this.CustoNo = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -57,48 +55,13 @@ this.btnSerach = new Sunny.UI.UIButton(); this.btnAddCusto = new Sunny.UI.UIButton(); this.btnUpdCustomer = new Sunny.UI.UIButton(); - this.gbCustoInfo.SuspendLayout(); + this.uiGroupBox1 = new Sunny.UI.UIGroupBox(); + this.txtCustoNo = new Sunny.UI.UITextBox(); + this.label3 = new System.Windows.Forms.Label(); ((System.ComponentModel.ISupportInitialize)(this.dgvCustomerList)).BeginInit(); + this.uiGroupBox1.SuspendLayout(); this.SuspendLayout(); // - // gbCustoInfo - // - this.gbCustoInfo.Controls.Add(this.txtCustoNo); - this.gbCustoInfo.Controls.Add(this.label2); - this.gbCustoInfo.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.gbCustoInfo.Location = new System.Drawing.Point(46, 420); - this.gbCustoInfo.Name = "gbCustoInfo"; - this.gbCustoInfo.Size = new System.Drawing.Size(687, 57); - this.gbCustoInfo.TabIndex = 73; - this.gbCustoInfo.TabStop = false; - this.gbCustoInfo.Text = "条件搜索栏"; - // - // txtCustoNo - // - this.txtCustoNo.Cursor = System.Windows.Forms.Cursors.IBeam; - this.txtCustoNo.FillColor = System.Drawing.Color.White; - this.txtCustoNo.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.txtCustoNo.Location = new System.Drawing.Point(289, 16); - this.txtCustoNo.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.txtCustoNo.Maximum = 2147483647D; - this.txtCustoNo.Minimum = -2147483648D; - this.txtCustoNo.MinimumSize = new System.Drawing.Size(1, 1); - this.txtCustoNo.Name = "txtCustoNo"; - this.txtCustoNo.Padding = new System.Windows.Forms.Padding(5); - this.txtCustoNo.Radius = 20; - this.txtCustoNo.Size = new System.Drawing.Size(204, 33); - this.txtCustoNo.TabIndex = 88; - // - // label2 - // - this.label2.AutoSize = true; - this.label2.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label2.Location = new System.Drawing.Point(194, 19); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(88, 25); - this.label2.TabIndex = 87; - this.label2.Text = "客户编号"; - // // toolTip1 // this.toolTip1.ToolTipIcon = System.Windows.Forms.ToolTipIcon.Info; @@ -110,22 +73,22 @@ this.dgvCustomerList.AllowUserToDeleteRows = false; this.dgvCustomerList.AllowUserToResizeColumns = false; this.dgvCustomerList.AllowUserToResizeRows = false; - dataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255))))); - this.dgvCustomerList.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle4; + dataGridViewCellStyle9.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255))))); + this.dgvCustomerList.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle9; this.dgvCustomerList.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; this.dgvCustomerList.BackgroundColor = System.Drawing.Color.White; this.dgvCustomerList.BorderStyle = System.Windows.Forms.BorderStyle.None; this.dgvCustomerList.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.Raised; this.dgvCustomerList.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single; - dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255))))); - dataGridViewCellStyle5.Font = new System.Drawing.Font("微软雅黑", 12F); - dataGridViewCellStyle5.ForeColor = System.Drawing.Color.White; - dataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dgvCustomerList.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle5; - this.dgvCustomerList.ColumnHeadersHeight = 32; + dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle10.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255))))); + dataGridViewCellStyle10.Font = new System.Drawing.Font("微软雅黑", 12F); + dataGridViewCellStyle10.ForeColor = System.Drawing.Color.White; + dataGridViewCellStyle10.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle10.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dgvCustomerList.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle10; + this.dgvCustomerList.ColumnHeadersHeight = 25; this.dgvCustomerList.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing; this.dgvCustomerList.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.CustoNo, @@ -151,9 +114,18 @@ this.dgvCustomerList.Location = new System.Drawing.Point(12, 12); this.dgvCustomerList.Name = "dgvCustomerList"; this.dgvCustomerList.ReadOnly = true; + dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle11.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255))))); + dataGridViewCellStyle11.Font = new System.Drawing.Font("微软雅黑", 12F); + dataGridViewCellStyle11.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48))))); + dataGridViewCellStyle11.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255))))); + dataGridViewCellStyle11.SelectionForeColor = System.Drawing.Color.White; + dataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dgvCustomerList.RowHeadersDefaultCellStyle = dataGridViewCellStyle11; this.dgvCustomerList.RowHeadersVisible = false; - dataGridViewCellStyle6.BackColor = System.Drawing.Color.White; - this.dgvCustomerList.RowsDefaultCellStyle = dataGridViewCellStyle6; + this.dgvCustomerList.RowHeight = 29; + dataGridViewCellStyle12.BackColor = System.Drawing.Color.White; + this.dgvCustomerList.RowsDefaultCellStyle = dataGridViewCellStyle12; this.dgvCustomerList.RowTemplate.Height = 29; this.dgvCustomerList.SelectedIndex = -1; this.dgvCustomerList.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; @@ -296,11 +268,11 @@ // this.btnSerach.Cursor = System.Windows.Forms.Cursors.Hand; this.btnSerach.Font = new System.Drawing.Font("微软雅黑", 12F); - this.btnSerach.Location = new System.Drawing.Point(739, 426); + this.btnSerach.Location = new System.Drawing.Point(591, 443); this.btnSerach.MinimumSize = new System.Drawing.Size(1, 1); this.btnSerach.Name = "btnSerach"; this.btnSerach.Radius = 30; - this.btnSerach.Size = new System.Drawing.Size(103, 49); + this.btnSerach.Size = new System.Drawing.Size(97, 41); this.btnSerach.TabIndex = 84; this.btnSerach.Text = "搜 索"; this.btnSerach.Click += new System.EventHandler(this.btnSerach_BtnClick); @@ -309,11 +281,11 @@ // this.btnAddCusto.Cursor = System.Windows.Forms.Cursors.Hand; this.btnAddCusto.Font = new System.Drawing.Font("微软雅黑", 12F); - this.btnAddCusto.Location = new System.Drawing.Point(848, 426); + this.btnAddCusto.Location = new System.Drawing.Point(774, 443); this.btnAddCusto.MinimumSize = new System.Drawing.Size(1, 1); this.btnAddCusto.Name = "btnAddCusto"; this.btnAddCusto.Radius = 30; - this.btnAddCusto.Size = new System.Drawing.Size(103, 49); + this.btnAddCusto.Size = new System.Drawing.Size(97, 41); this.btnAddCusto.TabIndex = 85; this.btnAddCusto.Text = "添加客户"; this.btnAddCusto.Click += new System.EventHandler(this.btnAddCusto_BtnClick); @@ -324,46 +296,85 @@ this.btnUpdCustomer.Enabled = false; this.btnUpdCustomer.FillDisableColor = System.Drawing.Color.Silver; this.btnUpdCustomer.Font = new System.Drawing.Font("微软雅黑", 12F); - this.btnUpdCustomer.Location = new System.Drawing.Point(957, 426); + this.btnUpdCustomer.Location = new System.Drawing.Point(957, 443); this.btnUpdCustomer.MinimumSize = new System.Drawing.Size(1, 1); this.btnUpdCustomer.Name = "btnUpdCustomer"; this.btnUpdCustomer.Radius = 30; - this.btnUpdCustomer.Size = new System.Drawing.Size(103, 49); + this.btnUpdCustomer.Size = new System.Drawing.Size(97, 41); this.btnUpdCustomer.Style = Sunny.UI.UIStyle.Custom; this.btnUpdCustomer.TabIndex = 87; this.btnUpdCustomer.Text = "修改客户"; this.btnUpdCustomer.Click += new System.EventHandler(this.btnUpdCustomer_Click); // + // uiGroupBox1 + // + this.uiGroupBox1.Controls.Add(this.txtCustoNo); + this.uiGroupBox1.Controls.Add(this.label3); + this.uiGroupBox1.Font = new System.Drawing.Font("微软雅黑", 12F); + this.uiGroupBox1.Location = new System.Drawing.Point(12, 426); + this.uiGroupBox1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.uiGroupBox1.MinimumSize = new System.Drawing.Size(1, 1); + this.uiGroupBox1.Name = "uiGroupBox1"; + this.uiGroupBox1.Padding = new System.Windows.Forms.Padding(0, 32, 0, 0); + this.uiGroupBox1.Size = new System.Drawing.Size(572, 62); + this.uiGroupBox1.TabIndex = 119; + this.uiGroupBox1.Text = "条件搜索"; + this.uiGroupBox1.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter; + // + // txtCustoNo + // + this.txtCustoNo.Cursor = System.Windows.Forms.Cursors.IBeam; + this.txtCustoNo.FillColor = System.Drawing.Color.White; + this.txtCustoNo.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.txtCustoNo.Location = new System.Drawing.Point(112, 23); + this.txtCustoNo.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.txtCustoNo.Maximum = 2147483647D; + this.txtCustoNo.Minimum = -2147483648D; + this.txtCustoNo.MinimumSize = new System.Drawing.Size(1, 1); + this.txtCustoNo.Name = "txtCustoNo"; + this.txtCustoNo.Padding = new System.Windows.Forms.Padding(5); + this.txtCustoNo.Radius = 20; + this.txtCustoNo.Size = new System.Drawing.Size(443, 33); + this.txtCustoNo.TabIndex = 92; + this.txtCustoNo.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; + // + // label3 + // + this.label3.AutoSize = true; + this.label3.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label3.Location = new System.Drawing.Point(17, 26); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(88, 25); + this.label3.TabIndex = 91; + this.label3.Text = "客户编号"; + // // FrmCustomerManager // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255))))); this.ClientSize = new System.Drawing.Size(1072, 490); + this.Controls.Add(this.uiGroupBox1); this.Controls.Add(this.btnUpdCustomer); this.Controls.Add(this.btnAddCusto); this.Controls.Add(this.btnSerach); this.Controls.Add(this.dgvCustomerList); - this.Controls.Add(this.gbCustoInfo); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None; this.Name = "FrmCustomerManager"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "TS酒店管理系统"; this.Load += new System.EventHandler(this.FrmCustomerManager_Load); - this.gbCustoInfo.ResumeLayout(false); - this.gbCustoInfo.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.dgvCustomerList)).EndInit(); + this.uiGroupBox1.ResumeLayout(false); + this.uiGroupBox1.PerformLayout(); this.ResumeLayout(false); } #endregion - private System.Windows.Forms.GroupBox gbCustoInfo; private System.Windows.Forms.ToolTip toolTip1; - private System.Windows.Forms.Label label2; private Sunny.UI.UIDataGridView dgvCustomerList; private Sunny.UI.UIButton btnSerach; - private Sunny.UI.UITextBox txtCustoNo; private Sunny.UI.UIButton btnAddCusto; private System.Windows.Forms.DataGridViewTextBoxColumn CustoNo; private System.Windows.Forms.DataGridViewTextBoxColumn CustoName; @@ -383,5 +394,8 @@ private System.Windows.Forms.DataGridViewTextBoxColumn Column8; private System.Windows.Forms.DataGridViewTextBoxColumn Column9; private Sunny.UI.UIButton btnUpdCustomer; + private Sunny.UI.UIGroupBox uiGroupBox1; + private Sunny.UI.UITextBox txtCustoNo; + private System.Windows.Forms.Label label3; } } \ No newline at end of file diff --git a/SYS.FormUI/AppFunction/FrmCustomerManager.cs b/SYS.FormUI/AppFunction/FrmCustomerManager.cs index 88283d1..b38ac83 100644 --- a/SYS.FormUI/AppFunction/FrmCustomerManager.cs +++ b/SYS.FormUI/AppFunction/FrmCustomerManager.cs @@ -151,14 +151,17 @@ namespace SYS.FormUI { if (txtCustoNo.Text != "") { - //dgvCustomerList.ClearRows(); - Custo source = new CustoService().SelectCardInfoByCustoNo(txtCustoNo.Text.Trim()); - dgvCustomerList.DataSource = source; - //dgvCustomerList.AutoGenerateColumns = false; + dgvCustomerList.ClearRows(); + dgvCustomerList.AutoGenerateColumns = false; + List custos = new CustoService().SelectCustoByInfo(new Custo { CustoNo = txtCustoNo.Text.Trim() }); + dgvCustomerList.DataSource = custos; } else { - UIMessageBox.ShowWarning("请输入客户编号！"); + dgvCustomerList.ClearRows(); + dgvCustomerList.AutoGenerateColumns = false; + List custos = new CustoService().SelectCustoAll(); + dgvCustomerList.DataSource = custos; } } diff --git a/SYS.FormUI/AppFunction/FrmEditInputs.cs b/SYS.FormUI/AppFunction/FrmEditInputs.cs index 3e9b16b..282f2fb 100644 --- a/SYS.FormUI/AppFunction/FrmEditInputs.cs +++ b/SYS.FormUI/AppFunction/FrmEditInputs.cs @@ -59,7 +59,7 @@ namespace SYS.FormUI #endregion #region 加载性别信息 - List listSexType = new BaseService().SelectSexTypeAllCanUse(); + List listSexType = new BaseService().SelectSexTypeAll(new SexType { delete_mk = 0 }); this.cbSex.DataSource = listSexType; this.cbSex.DisplayMember = "sexName"; this.cbSex.ValueMember = "sexId"; diff --git a/SYS.FormUI/AppFunction/FrmEducation.Designer.cs b/SYS.FormUI/AppFunction/FrmEducation.Designer.cs index 7f97e8d..099afd3 100644 --- a/SYS.FormUI/AppFunction/FrmEducation.Designer.cs +++ b/SYS.FormUI/AppFunction/FrmEducation.Designer.cs @@ -31,39 +31,108 @@ namespace SYS.FormUI { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmEducation)); this.flpInformation = new System.Windows.Forms.FlowLayoutPanel(); + this.txtEducationNm = new Sunny.UI.UITextBox(); + this.label2 = new System.Windows.Forms.Label(); + this.btnAdd = new Sunny.UI.UIButton(); + this.btnSearch = new Sunny.UI.UIButton(); this.SuspendLayout(); // // flpInformation // this.flpInformation.AutoScroll = true; this.flpInformation.BackColor = System.Drawing.Color.Transparent; - this.flpInformation.Location = new System.Drawing.Point(441, 39); + this.flpInformation.Location = new System.Drawing.Point(2, 117); this.flpInformation.Margin = new System.Windows.Forms.Padding(2); this.flpInformation.Name = "flpInformation"; - this.flpInformation.Size = new System.Drawing.Size(562, 582); + this.flpInformation.Size = new System.Drawing.Size(1001, 504); this.flpInformation.TabIndex = 73; this.flpInformation.SizeChanged += new System.EventHandler(this.flpInformation_SizeChanged); // + // txtEducationNm + // + this.txtEducationNm.Cursor = System.Windows.Forms.Cursors.IBeam; + this.txtEducationNm.FillColor = System.Drawing.Color.White; + this.txtEducationNm.Font = new System.Drawing.Font("微软雅黑", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.txtEducationNm.Location = new System.Drawing.Point(280, 56); + this.txtEducationNm.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.txtEducationNm.Maximum = 2147483647D; + this.txtEducationNm.Minimum = -2147483648D; + this.txtEducationNm.MinimumSize = new System.Drawing.Size(1, 1); + this.txtEducationNm.Name = "txtEducationNm"; + this.txtEducationNm.Padding = new System.Windows.Forms.Padding(5); + this.txtEducationNm.Radius = 20; + this.txtEducationNm.Size = new System.Drawing.Size(250, 35); + this.txtEducationNm.Style = Sunny.UI.UIStyle.Custom; + this.txtEducationNm.StyleCustomMode = true; + this.txtEducationNm.TabIndex = 127; + this.txtEducationNm.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; + // + // label2 + // + this.label2.AutoSize = true; + this.label2.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label2.Location = new System.Drawing.Point(173, 62); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(88, 25); + this.label2.TabIndex = 123; + this.label2.Text = "学历名称"; + // + // btnAdd + // + this.btnAdd.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnAdd.Font = new System.Drawing.Font("微软雅黑", 12F); + this.btnAdd.Location = new System.Drawing.Point(582, 56); + this.btnAdd.MinimumSize = new System.Drawing.Size(1, 1); + this.btnAdd.Name = "btnAdd"; + this.btnAdd.Radius = 20; + this.btnAdd.Size = new System.Drawing.Size(100, 35); + this.btnAdd.TabIndex = 128; + this.btnAdd.Text = "添 加"; + this.btnAdd.Click += new System.EventHandler(this.btnAdd_Click); + // + // btnSearch + // + this.btnSearch.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnSearch.Font = new System.Drawing.Font("微软雅黑", 12F); + this.btnSearch.Location = new System.Drawing.Point(732, 56); + this.btnSearch.MinimumSize = new System.Drawing.Size(1, 1); + this.btnSearch.Name = "btnSearch"; + this.btnSearch.Radius = 20; + this.btnSearch.Size = new System.Drawing.Size(100, 35); + this.btnSearch.TabIndex = 129; + this.btnSearch.Text = "搜 索"; + this.btnSearch.Click += new System.EventHandler(this.btnSearch_Click); + // // FrmEducation // this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 21F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(1005, 623); this.ControlBox = false; + this.Controls.Add(this.btnSearch); + this.Controls.Add(this.btnAdd); + this.Controls.Add(this.txtEducationNm); + this.Controls.Add(this.label2); this.Controls.Add(this.flpInformation); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.MaximizeBox = false; this.MinimizeBox = false; this.Name = "FrmEducation"; this.ShowIcon = true; + this.ShowTitleIcon = true; this.Text = "学历类型维护"; this.Load += new System.EventHandler(this.FrmEducation_Load); this.ResumeLayout(false); + this.PerformLayout(); } #endregion private System.Windows.Forms.FlowLayoutPanel flpInformation; + private Sunny.UI.UITextBox txtEducationNm; + private System.Windows.Forms.Label label2; + private Sunny.UI.UIButton btnAdd; + private Sunny.UI.UIButton btnSearch; } } \ No newline at end of file diff --git a/SYS.FormUI/AppFunction/FrmEducation.cs b/SYS.FormUI/AppFunction/FrmEducation.cs index 9e05519..cc424f0 100644 --- a/SYS.FormUI/AppFunction/FrmEducation.cs +++ b/SYS.FormUI/AppFunction/FrmEducation.cs @@ -58,7 +58,6 @@ namespace SYS.FormUI operation = Visited; reload = ReloadEducationList; Accessed = Access; - insert = Insert; } ucEducationInformation baseInfo = null; List educations = null; @@ -72,14 +71,6 @@ namespace SYS.FormUI public void ReloadEducationList() { flpInformation.Controls.Clear(); - baseInfo = new ucEducationInformation(); - baseInfo.Tag = "学历"; - baseInfo.BackgroundImage = Resources.添加__增加___加; - baseInfo.lbName.Text = "新增学历类型"; - baseInfo.btnOperation.Text = "新增"; - baseInfo.btnOperation.FillColor = Color.FromArgb(80, 160, 255); - baseInfo.btnOperation.FillHoverColor = Color.FromArgb(80, 180, 255); - flpInformation.Controls.Add(baseInfo); educations = new BaseService().SelectEducationAll(); for (int i = 0; i < educations.Count; i++) { @@ -159,17 +150,17 @@ namespace SYS.FormUI } - public void Insert() + private void btnAdd_Click(object sender, EventArgs e) { - if (string.IsNullOrWhiteSpace(info)) + if (txtEducationNm.Text.Trim().IsNullOrEmpty()) { - UIMessageBox.Show("学历名称不能为空，请检查！", "系统提示", UIStyle.Red, UIMessageBoxButtons.OK); + UIMessageTip.ShowError("学历名称为空，请检查", 3000); return; } var _education = new Education() { education_no = new SYS.Core.CounterHelper().GetNewId(CounterRuleConsts.EducationId).ToString(), - education_name = info, + education_name = txtEducationNm.Text.Trim(), delete_mk = 0, datains_usr = AdminInfo.Account, datains_date = DateTime.Now @@ -184,8 +175,34 @@ namespace SYS.FormUI RecordHelper.Record(AdminInfo.Account + "-" + AdminInfo.Name + "在" + DateTime.Now + "位于" + AdminInfo.SoftwareVersion + "执行：" + "新增学历类型操作！新增值为：" + _education.education_no, 2); #endregion ReloadEducationList(); + txtEducationNm.Text = ""; } } } + + private void btnSearch_Click(object sender, EventArgs e) + { + if (txtEducationNm.Text.Trim().IsNullOrEmpty()) + { + UIMessageTip.ShowError("学历名称为空，请检查", 3000); + return; + } + var listSource = new BaseService().SelectEducationAll(new Education { education_name = txtEducationNm.Text.Trim() }); + flpInformation.Controls.Clear(); + for (int i = 0; i < listSource.Count; i++) + { + baseInfo = new ucEducationInformation(); + baseInfo.Tag = "学历"; + baseInfo.lbName.Text = "名称:" + listSource[i].education_name; + if (listSource[i].delete_mk == 1) + { + baseInfo.btnOperation.Text = "恢复"; + baseInfo.btnOperation.FillColor = Color.FromArgb(33, 179, 81); + baseInfo.lbName.BackColor = Color.Red; + baseInfo.btnOperation.FillHoverColor = Color.FromArgb(128, 255, 128); + } + flpInformation.Controls.Add(baseInfo); + } + } } } diff --git a/SYS.FormUI/AppFunction/FrmMySpace.cs b/SYS.FormUI/AppFunction/FrmMySpace.cs index f3114cc..b8e9a20 100644 --- a/SYS.FormUI/AppFunction/FrmMySpace.cs +++ b/SYS.FormUI/AppFunction/FrmMySpace.cs @@ -51,11 +51,11 @@ namespace SYS.FormUI private void FrmMySpace_Load(object sender, EventArgs e) { //加载民族信息 - cbWorkerNation.DataSource = new BaseService().SelectNationAllCanUse(); + cbWorkerNation.DataSource = new BaseService().SelectNationAll(new Nation { delete_mk = 0 }); cbWorkerNation.DisplayMember = "nation_name"; cbWorkerNation.ValueMember = "nation_no"; //加载性别信息 - cboSex.DataSource = new BaseService().SelectSexTypeAllCanUse(); + cboSex.DataSource = new BaseService().SelectSexTypeAll(new SexType { delete_mk = 0 }); cboSex.DisplayMember = "sexName"; cboSex.ValueMember = "sexId"; //加载部门信息 @@ -63,7 +63,7 @@ namespace SYS.FormUI cboWorkerClub.DisplayMember = "dept_name"; cboWorkerClub.ValueMember = "dept_no"; //加载职位信息 - cboWorkerPosition.DataSource = new BaseService().SelectPositionAllCanUse(); + cboWorkerPosition.DataSource = new BaseService().SelectPositionAll(new Position { delete_mk = 0 }); cboWorkerPosition.DisplayMember = "position_name"; cboWorkerPosition.ValueMember = "position_no"; LoadData(); diff --git a/SYS.FormUI/AppFunction/FrmNation.Designer.cs b/SYS.FormUI/AppFunction/FrmNation.Designer.cs index 10c6c61..dd00870 100644 --- a/SYS.FormUI/AppFunction/FrmNation.Designer.cs +++ b/SYS.FormUI/AppFunction/FrmNation.Designer.cs @@ -31,39 +31,108 @@ namespace SYS.FormUI { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmNation)); this.flpInformation = new System.Windows.Forms.FlowLayoutPanel(); + this.btnAdd = new Sunny.UI.UIButton(); + this.txtNationNm = new Sunny.UI.UITextBox(); + this.label2 = new System.Windows.Forms.Label(); + this.btnSearch = new Sunny.UI.UIButton(); this.SuspendLayout(); // // flpInformation // this.flpInformation.AutoScroll = true; this.flpInformation.BackColor = System.Drawing.Color.Transparent; - this.flpInformation.Location = new System.Drawing.Point(440, 38); + this.flpInformation.Location = new System.Drawing.Point(2, 117); this.flpInformation.Margin = new System.Windows.Forms.Padding(2); this.flpInformation.Name = "flpInformation"; - this.flpInformation.Size = new System.Drawing.Size(562, 582); + this.flpInformation.Size = new System.Drawing.Size(1001, 504); this.flpInformation.TabIndex = 72; this.flpInformation.SizeChanged += new System.EventHandler(this.flpInformation_SizeChanged); // + // btnAdd + // + this.btnAdd.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnAdd.Font = new System.Drawing.Font("微软雅黑", 12F); + this.btnAdd.Location = new System.Drawing.Point(582, 56); + this.btnAdd.MinimumSize = new System.Drawing.Size(1, 1); + this.btnAdd.Name = "btnAdd"; + this.btnAdd.Radius = 20; + this.btnAdd.Size = new System.Drawing.Size(100, 35); + this.btnAdd.TabIndex = 131; + this.btnAdd.Text = "添 加"; + this.btnAdd.Click += new System.EventHandler(this.btnAdd_Click); + // + // txtNationNm + // + this.txtNationNm.Cursor = System.Windows.Forms.Cursors.IBeam; + this.txtNationNm.FillColor = System.Drawing.Color.White; + this.txtNationNm.Font = new System.Drawing.Font("微软雅黑", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.txtNationNm.Location = new System.Drawing.Point(280, 56); + this.txtNationNm.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.txtNationNm.Maximum = 2147483647D; + this.txtNationNm.Minimum = -2147483648D; + this.txtNationNm.MinimumSize = new System.Drawing.Size(1, 1); + this.txtNationNm.Name = "txtNationNm"; + this.txtNationNm.Padding = new System.Windows.Forms.Padding(5); + this.txtNationNm.Radius = 20; + this.txtNationNm.Size = new System.Drawing.Size(250, 35); + this.txtNationNm.Style = Sunny.UI.UIStyle.Custom; + this.txtNationNm.StyleCustomMode = true; + this.txtNationNm.TabIndex = 130; + this.txtNationNm.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; + // + // label2 + // + this.label2.AutoSize = true; + this.label2.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label2.Location = new System.Drawing.Point(173, 62); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(88, 25); + this.label2.TabIndex = 129; + this.label2.Text = "民族名称"; + // + // btnSearch + // + this.btnSearch.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnSearch.Font = new System.Drawing.Font("微软雅黑", 12F); + this.btnSearch.Location = new System.Drawing.Point(732, 56); + this.btnSearch.MinimumSize = new System.Drawing.Size(1, 1); + this.btnSearch.Name = "btnSearch"; + this.btnSearch.Radius = 20; + this.btnSearch.Size = new System.Drawing.Size(100, 35); + this.btnSearch.TabIndex = 132; + this.btnSearch.Text = "搜 索"; + this.btnSearch.Click += new System.EventHandler(this.btnSearch_Click); + // // FrmNation // this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 21F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(1005, 623); this.ControlBox = false; + this.Controls.Add(this.btnSearch); + this.Controls.Add(this.btnAdd); + this.Controls.Add(this.txtNationNm); + this.Controls.Add(this.label2); this.Controls.Add(this.flpInformation); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.MaximizeBox = false; this.MinimizeBox = false; this.Name = "FrmNation"; this.ShowIcon = true; + this.ShowTitleIcon = true; this.Text = "民族类型维护"; this.Load += new System.EventHandler(this.FrmNation_Load); this.ResumeLayout(false); + this.PerformLayout(); } #endregion private System.Windows.Forms.FlowLayoutPanel flpInformation; + private Sunny.UI.UIButton btnAdd; + private Sunny.UI.UITextBox txtNationNm; + private System.Windows.Forms.Label label2; + private Sunny.UI.UIButton btnSearch; } } \ No newline at end of file diff --git a/SYS.FormUI/AppFunction/FrmNation.cs b/SYS.FormUI/AppFunction/FrmNation.cs index a3f85a0..582ba28 100644 --- a/SYS.FormUI/AppFunction/FrmNation.cs +++ b/SYS.FormUI/AppFunction/FrmNation.cs @@ -59,7 +59,6 @@ namespace SYS.FormUI operation = Visited; reload = ReloadNationList; Accessed = Access; - insert = Insert; } ucBaseInformation baseInfo = null; @@ -74,13 +73,6 @@ namespace SYS.FormUI public void ReloadNationList() { flpInformation.Controls.Clear(); - baseInfo = new ucBaseInformation(); - baseInfo.BackgroundImage = Resources.添加__增加___加; - baseInfo.lbName.Text = "新增民族类型"; - baseInfo.btnOperation.Text = "新增"; - baseInfo.btnOperation.FillColor = Color.FromArgb(80, 160, 255); - baseInfo.btnOperation.FillHoverColor = Color.FromArgb(80, 180, 255); - flpInformation.Controls.Add(baseInfo); nations = new BaseService().SelectNationAll(); for (int i = 0; i < nations.Count; i++) { @@ -99,8 +91,8 @@ namespace SYS.FormUI private void flpInformation_SizeChanged(object sender, EventArgs e) { - flpInformation.Width = 660; - flpInformation.Height = 582; + //flpInformation.Width = 660; + //flpInformation.Height = 582; } public void Visited() @@ -159,12 +151,17 @@ namespace SYS.FormUI } - public void Insert() + private void btnAdd_Click(object sender, EventArgs e) { + if (txtNationNm.Text.Trim().IsNullOrEmpty()) + { + UIMessageTip.ShowError("民族名称为空，请检查", 3000); + return; + } var _nation = new Nation() { nation_no = new SYS.Core.CounterHelper().GetNewId(CounterRuleConsts.NationId).ToString(), - nation_name = info, + nation_name = txtNationNm.Text.Trim(), delete_mk = 0, datains_usr = AdminInfo.Account, datains_date = DateTime.Now @@ -179,9 +176,34 @@ namespace SYS.FormUI RecordHelper.Record(AdminInfo.Account + "-" + AdminInfo.Name + "在" + DateTime.Now + "位于" + AdminInfo.SoftwareVersion + "执行：" + "新增民族类型操作！新增值为：" + _nation.nation_no, 2); #endregion ReloadNationList(); + txtNationNm.Text = ""; } } } + private void btnSearch_Click(object sender, EventArgs e) + { + if (txtNationNm.Text.Trim().IsNullOrEmpty()) + { + UIMessageTip.ShowError("民族名称为空，请检查", 3000); + return; + } + var listSource = new BaseService().SelectNationAll(new Nation { nation_name = txtNationNm.Text.Trim() }); + flpInformation.Controls.Clear(); + for (int i = 0; i < listSource.Count; i++) + { + baseInfo = new ucBaseInformation(); + baseInfo.Tag = "民族"; + baseInfo.lbName.Text = "名称:" + listSource[i].nation_name; + if (listSource[i].delete_mk == 1) + { + baseInfo.btnOperation.Text = "恢复"; + baseInfo.btnOperation.FillColor = Color.FromArgb(33, 179, 81); + baseInfo.lbName.BackColor = Color.Red; + baseInfo.btnOperation.FillHoverColor = Color.FromArgb(128, 255, 128); + } + flpInformation.Controls.Add(baseInfo); + } + } } } diff --git a/SYS.FormUI/AppFunction/FrmNation.resx b/SYS.FormUI/AppFunction/FrmNation.resx index 0bc7da8..b0a0545 100644 --- a/SYS.FormUI/AppFunction/FrmNation.resx +++ b/SYS.FormUI/AppFunction/FrmNation.resx @@ -120,19 +120,14 @@ - AAABAAEAICAAAAEAGADSAgAAFgAAAIlQTkcNChoKAAAADUlIRFIAAAAgAAAAIAgGAAAAc3p69AAAAAFz - UkdCAK7OHOkAAAAEZ0FNQQAAsY8L/GEFAAAACXBIWXMAAA7DAAAOwwHHb6hkAAACZ0lEQVRYR7VWTShE - URSeshBZTHYWakpZaFJKSLOYbJQsRFOWkiQphSyUzEYpCysL8lOalYVQFlY2fsqCzcRGWWiQDUmN1Yzv - jPtm7jz3d+5z6/Tmvfvd73z33HPOnVDIYeTz+Vgul9uCpWHfsAfYGb4nYXEHav1SOFqCE+UA5gW2BlBY - z2iBAGk17FMnwJsH9hbWYuFCDQXZmKlzTgQdU4qOCDav9EDhZef6ztRv4NnvLcLvO1sBfjw4toUiZMQk - iBZgfsDVOReVzjIRLHtl/EkCQ8hCUALIX1EAXiIgfxSR43uGC//RvwiAk2UVMeYbWASozgMZ4CwdAV52 - JbunzC2UEJ7tNuWnyKevsvDLdkYlwxIvjt8XQWwbPJN03H8qgLXQMh+0W1gTPtYFIYByDFbvz/wEPl4q - wlWIAjATrhGgRiTauZIYi9aDSj6+mRWFUIJpdubV/5xLBODnWNp+NeXnJWLCUUCxlftzIKIj9ipBh1PM - lzqeKAx04WjIw5iPVyhgXH23/mY4XZFv7CnqdCMsCtSuW2E17J3++QgHMPewDq1zP4DqFPbsZ8W3K0n0 - NiUdNGvtnLtwhiWkUYHgLsXRxFxE7AiiMC2JQkoieNZFQLdAwBOOolkQhahEwCvljIuIAwHxvmUUTl0E - zEh2NuUnVZUporBakQgs7JUk2AfmGnlSXZ8Avs9KBN0RsLSizvcsBZyDq8pIhM65Jwq4Ia50T3SdEvhF - UwHXBmQ3wNQSIYgzOjzNA5fVdkcAegzJBplzCq3xAP+hMgosmejiURpzPmrsmQNCRJvRUehAILLaPadh - xeP+AcFMJca2dDvBAAAAAElFTkSuQmCC + AAABAAEAICAAAAEAGACnAQAAFgAAAIlQTkcNChoKAAAADUlIRFIAAAAgAAAAIAgGAAAAc3p69AAAAAFz + UkdCAK7OHOkAAAAEZ0FNQQAAsY8L/GEFAAAACXBIWXMAAA7DAAAOwwHHb6hkAAABPElEQVRYR2NgGAWj + IUBkCPz//18AiBWA2ACIHYCYhUitlCsDWoYB/v379xOItwAlGoC0OeW24DEBajvI13AMtNQHiOuBeAdI + HkhPopkjYA7AZQHQ8nQgfggNETmqO4SQA0AWAi1XBeLdQHwJqN6Gqo4gxgFQR7ADHTAXqP4DkK4C4mQg + dgdFHUUOItYBMEugCfMpUsqlrwOQfUuq47GGFCWGUKIX7hhKDKFE7+BzADBFTwTi/UA8H4hbiclu1AwB + kFlngBZ3A/FOIH4BLQG3ANnhuLIZNR2AkZWAFgcB8RIg/g7Ep4HYEt0hNHUAzDKgxYpAPBuI3wBx8IBl + Q6DlZdBo2QRklwDZAXQJAWQfAy32BuKlUIeASsMzdC+KKSr3sWmmSjBS4qpRBwyGEGigOCVTkgZG9Y6G + AC1DAACmE9+CTlteYQAAAABJRU5ErkJggg== \ No newline at end of file diff --git a/SYS.FormUI/AppFunction/FrmPosition.Designer.cs b/SYS.FormUI/AppFunction/FrmPosition.Designer.cs index bddd12b..cf86075 100644 --- a/SYS.FormUI/AppFunction/FrmPosition.Designer.cs +++ b/SYS.FormUI/AppFunction/FrmPosition.Designer.cs @@ -31,38 +31,107 @@ namespace SYS.FormUI { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmPosition)); this.flpInformation = new System.Windows.Forms.FlowLayoutPanel(); + this.btnAdd = new Sunny.UI.UIButton(); + this.txtJobNm = new Sunny.UI.UITextBox(); + this.label2 = new System.Windows.Forms.Label(); + this.btnSearch = new Sunny.UI.UIButton(); this.SuspendLayout(); // // flpInformation // this.flpInformation.AutoScroll = true; this.flpInformation.BackColor = System.Drawing.Color.Transparent; - this.flpInformation.Location = new System.Drawing.Point(441, 37); + this.flpInformation.Location = new System.Drawing.Point(2, 117); this.flpInformation.Margin = new System.Windows.Forms.Padding(2); this.flpInformation.Name = "flpInformation"; - this.flpInformation.Size = new System.Drawing.Size(562, 582); + this.flpInformation.Size = new System.Drawing.Size(1001, 504); this.flpInformation.TabIndex = 73; // + // btnAdd + // + this.btnAdd.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnAdd.Font = new System.Drawing.Font("微软雅黑", 12F); + this.btnAdd.Location = new System.Drawing.Point(582, 56); + this.btnAdd.MinimumSize = new System.Drawing.Size(1, 1); + this.btnAdd.Name = "btnAdd"; + this.btnAdd.Radius = 20; + this.btnAdd.Size = new System.Drawing.Size(100, 35); + this.btnAdd.TabIndex = 134; + this.btnAdd.Text = "添 加"; + this.btnAdd.Click += new System.EventHandler(this.btnAdd_Click); + // + // txtJobNm + // + this.txtJobNm.Cursor = System.Windows.Forms.Cursors.IBeam; + this.txtJobNm.FillColor = System.Drawing.Color.White; + this.txtJobNm.Font = new System.Drawing.Font("微软雅黑", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.txtJobNm.Location = new System.Drawing.Point(280, 56); + this.txtJobNm.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.txtJobNm.Maximum = 2147483647D; + this.txtJobNm.Minimum = -2147483648D; + this.txtJobNm.MinimumSize = new System.Drawing.Size(1, 1); + this.txtJobNm.Name = "txtJobNm"; + this.txtJobNm.Padding = new System.Windows.Forms.Padding(5); + this.txtJobNm.Radius = 20; + this.txtJobNm.Size = new System.Drawing.Size(250, 35); + this.txtJobNm.Style = Sunny.UI.UIStyle.Custom; + this.txtJobNm.StyleCustomMode = true; + this.txtJobNm.TabIndex = 133; + this.txtJobNm.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; + // + // label2 + // + this.label2.AutoSize = true; + this.label2.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label2.Location = new System.Drawing.Point(173, 62); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(88, 25); + this.label2.TabIndex = 132; + this.label2.Text = "职位名称"; + // + // btnSearch + // + this.btnSearch.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnSearch.Font = new System.Drawing.Font("微软雅黑", 12F); + this.btnSearch.Location = new System.Drawing.Point(732, 56); + this.btnSearch.MinimumSize = new System.Drawing.Size(1, 1); + this.btnSearch.Name = "btnSearch"; + this.btnSearch.Radius = 20; + this.btnSearch.Size = new System.Drawing.Size(100, 35); + this.btnSearch.TabIndex = 135; + this.btnSearch.Text = "搜 索"; + this.btnSearch.Click += new System.EventHandler(this.btnSearch_Click); + // // FrmPosition // this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 21F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(1005, 623); this.ControlBox = false; + this.Controls.Add(this.btnSearch); + this.Controls.Add(this.btnAdd); + this.Controls.Add(this.txtJobNm); + this.Controls.Add(this.label2); this.Controls.Add(this.flpInformation); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.MaximizeBox = false; this.MinimizeBox = false; this.Name = "FrmPosition"; this.ShowIcon = true; + this.ShowTitleIcon = true; this.Text = "职位类型维护"; this.Load += new System.EventHandler(this.FrmPosition_Load); this.ResumeLayout(false); + this.PerformLayout(); } #endregion private System.Windows.Forms.FlowLayoutPanel flpInformation; + private Sunny.UI.UIButton btnAdd; + private Sunny.UI.UITextBox txtJobNm; + private System.Windows.Forms.Label label2; + private Sunny.UI.UIButton btnSearch; } } \ No newline at end of file diff --git a/SYS.FormUI/AppFunction/FrmPosition.cs b/SYS.FormUI/AppFunction/FrmPosition.cs index 2a94b64..22a527f 100644 --- a/SYS.FormUI/AppFunction/FrmPosition.cs +++ b/SYS.FormUI/AppFunction/FrmPosition.cs @@ -58,7 +58,6 @@ namespace SYS.FormUI operation = Visited; reload = ReloadPositionList; Accessed = Access; - insert = Insert; } ucPositionInformation baseInfo = null; @@ -72,13 +71,6 @@ namespace SYS.FormUI public void ReloadPositionList() { flpInformation.Controls.Clear(); - baseInfo = new ucPositionInformation(); - baseInfo.BackgroundImage = Resources.添加__增加___加; - baseInfo.lbName.Text = "新增职位类型"; - baseInfo.btnOperation.Text = "新增"; - baseInfo.btnOperation.FillColor = Color.FromArgb(80, 160, 255); - baseInfo.btnOperation.FillHoverColor = Color.FromArgb(80, 180, 255); - flpInformation.Controls.Add(baseInfo); positions = new BaseService().SelectPositionAll(); for (int i = 0; i < positions.Count; i++) { @@ -157,12 +149,17 @@ namespace SYS.FormUI } - public void Insert() + private void btnAdd_Click(object sender, EventArgs e) { + if (txtJobNm.Text.Trim().IsNullOrEmpty()) + { + UIMessageTip.ShowError("职位名称为空，请检查", 3000); + return; + } var _position = new Position() { position_no = new SYS.Core.CounterHelper().GetNewId(CounterRuleConsts.PositionId).ToString(), - position_name = info, + position_name = txtJobNm.Text.Trim(), delete_mk = 0, datains_usr = AdminInfo.Account, datains_date = DateTime.Now @@ -177,7 +174,33 @@ namespace SYS.FormUI RecordHelper.Record(AdminInfo.Account + "-" + AdminInfo.Name + "在" + DateTime.Now + "位于" + AdminInfo.SoftwareVersion + "执行：" + "新增职位类型操作！新增值为：" + _position.position_no, 2); #endregion ReloadPositionList(); + txtJobNm.Text = ""; + } + } + } + + private void btnSearch_Click(object sender, EventArgs e) + { + if (txtJobNm.Text.Trim().IsNullOrEmpty()) + { + UIMessageTip.ShowError("职位名称为空，请检查", 3000); + return; + } + var listSource = new BaseService().SelectPositionAll(new Position { position_name = txtJobNm.Text.Trim() }); + flpInformation.Controls.Clear(); + for (int i = 0; i < listSource.Count; i++) + { + baseInfo = new ucPositionInformation(); + baseInfo.Tag = "职位"; + baseInfo.lbName.Text = "名称:" + listSource[i].position_name; + if (listSource[i].delete_mk == 1) + { + baseInfo.btnOperation.Text = "恢复"; + baseInfo.btnOperation.FillColor = Color.FromArgb(33, 179, 81); + baseInfo.lbName.BackColor = Color.Red; + baseInfo.btnOperation.FillHoverColor = Color.FromArgb(128, 255, 128); } + flpInformation.Controls.Add(baseInfo); } } } diff --git a/SYS.FormUI/AppFunction/FrmReserList.cs b/SYS.FormUI/AppFunction/FrmReserList.cs index 134283e..ad66193 100644 --- a/SYS.FormUI/AppFunction/FrmReserList.cs +++ b/SYS.FormUI/AppFunction/FrmReserList.cs @@ -47,7 +47,7 @@ namespace SYS.FormUI #endregion #region 加载性别信息 - List listSexType = new BaseService().SelectSexTypeAllCanUse(); + List listSexType = new BaseService().SelectSexTypeAll(new SexType { delete_mk = 0 }); this.cbSex.DataSource = listSexType; this.cbSex.DisplayMember = "sexName"; this.cbSex.ValueMember = "sexId"; diff --git a/SYS.FormUI/AppFunction/FrmReserManager.Designer.cs b/SYS.FormUI/AppFunction/FrmReserManager.Designer.cs index d2c138a..f8d902d 100644 --- a/SYS.FormUI/AppFunction/FrmReserManager.Designer.cs +++ b/SYS.FormUI/AppFunction/FrmReserManager.Designer.cs @@ -76,6 +76,7 @@ this.txtCustoName.Style = Sunny.UI.UIStyle.Custom; this.txtCustoName.StyleCustomMode = true; this.txtCustoName.TabIndex = 107; + this.txtCustoName.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; // // txtCustoTel // @@ -85,6 +86,7 @@ this.txtCustoTel.Location = new System.Drawing.Point(122, 147); this.txtCustoTel.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.txtCustoTel.Maximum = 2147483647D; + this.txtCustoTel.MaxLength = 11; this.txtCustoTel.Minimum = -2147483648D; this.txtCustoTel.MinimumSize = new System.Drawing.Size(1, 1); this.txtCustoTel.Name = "txtCustoTel"; @@ -94,6 +96,7 @@ this.txtCustoTel.Style = Sunny.UI.UIStyle.Custom; this.txtCustoTel.StyleCustomMode = true; this.txtCustoTel.TabIndex = 108; + this.txtCustoTel.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; // // label1 // @@ -117,6 +120,7 @@ // // cboReserWay // + this.cboReserWay.DataSource = null; this.cboReserWay.DropDownStyle = Sunny.UI.UIDropDownStyle.DropDownList; this.cboReserWay.FillColor = System.Drawing.Color.White; this.cboReserWay.Font = new System.Drawing.Font("微软雅黑", 15.75F); @@ -128,7 +132,7 @@ this.cboReserWay.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.cboReserWay.MinimumSize = new System.Drawing.Size(63, 0); this.cboReserWay.Name = "cboReserWay"; - this.cboReserWay.Padding = new System.Windows.Forms.Padding(0, 0, 30, 0); + this.cboReserWay.Padding = new System.Windows.Forms.Padding(0, 0, 30, 2); this.cboReserWay.Radius = 20; this.cboReserWay.ReadOnly = true; this.cboReserWay.Size = new System.Drawing.Size(159, 35); @@ -149,6 +153,7 @@ // // cboReserRoomNo // + this.cboReserRoomNo.DataSource = null; this.cboReserRoomNo.DropDownStyle = Sunny.UI.UIDropDownStyle.DropDownList; this.cboReserRoomNo.FillColor = System.Drawing.Color.White; this.cboReserRoomNo.Font = new System.Drawing.Font("微软雅黑", 15.75F); @@ -156,7 +161,7 @@ this.cboReserRoomNo.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.cboReserRoomNo.MinimumSize = new System.Drawing.Size(63, 0); this.cboReserRoomNo.Name = "cboReserRoomNo"; - this.cboReserRoomNo.Padding = new System.Windows.Forms.Padding(0, 0, 30, 0); + this.cboReserRoomNo.Padding = new System.Windows.Forms.Padding(0, 0, 30, 2); this.cboReserRoomNo.Radius = 20; this.cboReserRoomNo.Size = new System.Drawing.Size(159, 35); this.cboReserRoomNo.Style = Sunny.UI.UIStyle.Custom; @@ -179,14 +184,14 @@ this.dtpBouDate.DropDownStyle = Sunny.UI.UIDropDownStyle.DropDownList; this.dtpBouDate.FillColor = System.Drawing.Color.White; this.dtpBouDate.Font = new System.Drawing.Font("Microsoft Sans Serif", 15.75F); - this.dtpBouDate.Location = new System.Drawing.Point(119, 306); + this.dtpBouDate.Location = new System.Drawing.Point(122, 307); this.dtpBouDate.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.dtpBouDate.MaxLength = 10; this.dtpBouDate.MinimumSize = new System.Drawing.Size(63, 0); this.dtpBouDate.Name = "dtpBouDate"; - this.dtpBouDate.Padding = new System.Windows.Forms.Padding(0, 0, 30, 0); + this.dtpBouDate.Padding = new System.Windows.Forms.Padding(0, 0, 30, 2); this.dtpBouDate.Radius = 20; - this.dtpBouDate.Size = new System.Drawing.Size(162, 31); + this.dtpBouDate.Size = new System.Drawing.Size(159, 31); this.dtpBouDate.Style = Sunny.UI.UIStyle.Custom; this.dtpBouDate.SymbolDropDown = 61555; this.dtpBouDate.SymbolNormal = 61555; @@ -195,6 +200,8 @@ this.dtpBouDate.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; this.dtpBouDate.Value = new System.DateTime(2021, 5, 13, 0, 0, 0, 0); this.dtpBouDate.ValueChanged += new Sunny.UI.UIDatePicker.OnDateTimeChanged(this.dtpBouDate_ValueChanged); + this.dtpBouDate.TextChanged += new System.EventHandler(this.dtpBouDate_TextChanged); + this.dtpBouDate.Validated += new System.EventHandler(this.dtpBouDate_Validated); // // label12 // @@ -211,15 +218,15 @@ this.dtpEndDate.DropDownStyle = Sunny.UI.UIDropDownStyle.DropDownList; this.dtpEndDate.FillColor = System.Drawing.Color.White; this.dtpEndDate.Font = new System.Drawing.Font("Microsoft Sans Serif", 15.75F); - this.dtpEndDate.Location = new System.Drawing.Point(122, 355); + this.dtpEndDate.Location = new System.Drawing.Point(125, 356); this.dtpEndDate.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.dtpEndDate.MaxLength = 10; this.dtpEndDate.MinimumSize = new System.Drawing.Size(63, 0); this.dtpEndDate.Name = "dtpEndDate"; - this.dtpEndDate.Padding = new System.Windows.Forms.Padding(0, 0, 30, 0); + this.dtpEndDate.Padding = new System.Windows.Forms.Padding(0, 0, 30, 2); this.dtpEndDate.Radius = 20; this.dtpEndDate.ReadOnly = true; - this.dtpEndDate.Size = new System.Drawing.Size(162, 31); + this.dtpEndDate.Size = new System.Drawing.Size(156, 31); this.dtpEndDate.Style = Sunny.UI.UIStyle.Custom; this.dtpEndDate.SymbolDropDown = 61555; this.dtpEndDate.SymbolNormal = 61555; @@ -258,7 +265,7 @@ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255))))); this.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; - this.ClientSize = new System.Drawing.Size(315, 476); + this.ClientSize = new System.Drawing.Size(315, 461); this.Controls.Add(this.btnReser); this.Controls.Add(this.dtpEndDate); this.Controls.Add(this.label13); diff --git a/SYS.FormUI/AppFunction/FrmReserManager.cs b/SYS.FormUI/AppFunction/FrmReserManager.cs index e34af2b..cb68742 100644 --- a/SYS.FormUI/AppFunction/FrmReserManager.cs +++ b/SYS.FormUI/AppFunction/FrmReserManager.cs @@ -23,8 +23,7 @@ namespace SYS.FormUI private void btnReser_Click(object sender, EventArgs e) { Random random = new Random(); - string reserid = ""; - reserid = new CounterHelper().GetNewId(CounterRuleConsts.ReserId); + string reserid = new CounterHelper().GetNewId(CounterRuleConsts.ReserId); Reser reser = new Reser() { ReserId = reserid, @@ -33,7 +32,9 @@ namespace SYS.FormUI ReserWay = cboReserWay.Text, ReserRoom = cboReserRoomNo.Text, ReserDate = dtpBouDate.Value, - ReserEndDay = dtpEndDate.Value + ReserEndDay = dtpEndDate.Value, + datains_usr = LoginInfo.WorkerNo, + datains_date = DateTime.Now }; Room room = new Room() { @@ -79,7 +80,17 @@ namespace SYS.FormUI private void dtpBouDate_ValueChanged(object sender, DateTime value) { - dtpEndDate.Value = DateTime.Now.AddDays(3); + dtpEndDate.Value = dtpBouDate.Value.AddDays(3); + } + + private void dtpBouDate_TextChanged(object sender, EventArgs e) + { + dtpEndDate.Value = dtpBouDate.Value.AddDays(3); + } + + private void dtpBouDate_Validated(object sender, EventArgs e) + { + dtpEndDate.Value = dtpBouDate.Value.AddDays(3); } } } \ No newline at end of file diff --git a/SYS.FormUI/AppFunction/FrmRoomMap.Designer.cs b/SYS.FormUI/AppFunction/FrmRoomMap.Designer.cs index a14c6a9..633f4e9 100644 --- a/SYS.FormUI/AppFunction/FrmRoomMap.Designer.cs +++ b/SYS.FormUI/AppFunction/FrmRoomMap.Designer.cs @@ -41,6 +41,7 @@ namespace SYS.FormUI.AppFunction this.flpRoom.Name = "flpRoom"; this.flpRoom.Size = new System.Drawing.Size(838, 424); this.flpRoom.TabIndex = 72; + this.flpRoom.MouseEnter += new System.EventHandler(this.flpRoom_MouseEnter); // // FrmRoomMap // diff --git a/SYS.FormUI/AppFunction/FrmRoomMap.cs b/SYS.FormUI/AppFunction/FrmRoomMap.cs index 5c47e26..1347de1 100644 --- a/SYS.FormUI/AppFunction/FrmRoomMap.cs +++ b/SYS.FormUI/AppFunction/FrmRoomMap.cs @@ -55,6 +55,7 @@ namespace SYS.FormUI.AppFunction for (int i = 0; i < rooms.Count; i++) { romt = new ucRoomList(); + romt.lblMark.Text = "Mark"; romt.lblRoomNo.Text = rooms[i].RoomNo; romt.lblCustoNo.Text = rooms[i].CustoNo; romt.lblRoomType.Text = rooms[i].RoomName; @@ -63,6 +64,9 @@ namespace SYS.FormUI.AppFunction } } - + private void flpRoom_MouseEnter(object sender, EventArgs e) + { + return; + } } } diff --git a/SYS.FormUI/AppFunction/FrmSelectCustoInfo.cs b/SYS.FormUI/AppFunction/FrmSelectCustoInfo.cs index 3771a0b..3227d61 100644 --- a/SYS.FormUI/AppFunction/FrmSelectCustoInfo.cs +++ b/SYS.FormUI/AppFunction/FrmSelectCustoInfo.cs @@ -75,7 +75,7 @@ namespace SYS.FormUI #endregion #region 加载性别信息 - List listSexType = new BaseService().SelectSexTypeAllCanUse(); + List listSexType = new BaseService().SelectSexTypeAll(new SexType { delete_mk = 0 }); this.cbSex.DataSource = listSexType; this.cbSex.DisplayMember = "sexName"; this.cbSex.ValueMember = "sexId"; diff --git a/SYS.FormUI/AppFunction/FrmSellThing.cs b/SYS.FormUI/AppFunction/FrmSellThing.cs index 2d9989e..1e4c3da 100644 --- a/SYS.FormUI/AppFunction/FrmSellThing.cs +++ b/SYS.FormUI/AppFunction/FrmSellThing.cs @@ -29,6 +29,8 @@ using SYS.Core; using Sunny.UI; using SYS.Application; using SYS.Common; +using jvncorelib_fr.Entitylib; +using System.Linq; namespace SYS.FormUI { @@ -74,7 +76,7 @@ namespace SYS.FormUI private void LoadThingByName() { - List lstSource = new SellService().SelectSellThingByName(txtFind.Text); + List lstSource = new SellService().SelectSellThingAll(new SellThing { SellNo = txtFind.Text.Trim(), SellName = txtFind.Text.Trim() }); this.dgvSellthing.DataSource = lstSource; this.dgvSellthing.AutoGenerateColumns = false; } @@ -84,15 +86,8 @@ namespace SYS.FormUI #region 根据客户编号加载消费信息的方法 private void LoadSpendInfoByRoomNo(string room) { - List lstSource = new SpendService().SelectSpendByRoomNo(room); - this.dgvRoomSell.AutoGenerateColumns = false; - this.dgvRoomSell.DataSource = lstSource; - } - - private void LoadSpendInfoByCustoNo(string custoNo) - { - List lstSource = new SpendService().SelectSpendByCustoNo(custoNo); this.dgvRoomSell.AutoGenerateColumns = false; + List lstSource = new SpendService().SelectSpendByRoomNo(room); this.dgvRoomSell.DataSource = lstSource; } #endregion @@ -164,38 +159,105 @@ namespace SYS.FormUI { if (CheckInput()) { - SellThing st = new SellService().SelectSellThingByNo(txtSellNo.Text); + List st = new SellService().SelectSellThingAll(new SellThing { SellNo = txtSellNo.Text.Trim() }) ; r = new RoomService().SelectRoomByRoomNo(txtRoomNo.Text); - - Spend s = new Spend() - { - RoomNo = txtRoomNo.Text, - SpendName = txtSellName.Text, - SpendAmount = (int)nudNum.Value, - CustoNo = r.CustoNo, - SpendPrice = Convert.ToDecimal(txtPrice.Text), - SpendMoney = Convert.ToDecimal(Convert.ToDouble(txtPrice.Text) * nudNum.Value), - SpendTime = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")), - MoneyState = SpendConsts.UnSettle, - }; - bool m = new SpendService().InsertSpendInfo(s); - if (m == true) + var listSource = new SpendService().SelectSpendInfoRoomNo(txtRoomNo.Text.Trim()); + Spend s = null; + listSource = new SpendService().SelectSpendInfoRoomNo(txtRoomNo.Text.Trim()); + if (!listSource.IsNullOrEmpty()) { - string Stock = (st.Stock - nudNum.Value).ToString(); - bool n = new SellService().UpdateSellThing(Stock, st.SellNo); - UIMessageBox.Show("添加成功","系统提示",UIStyle.Green,UIMessageBoxButtons.OK,true); - LoadSpendInfoByCustoNo(r.CustoNo); - LoadSellThingInfo(); - #region 获取添加操作日志所需的信息 - RecordHelper.Record(LoginInfo.WorkerNo + "-" + LoginInfo.WorkerName + "在" + DateTime.Now + "位于" + LoginInfo.SoftwareVersion + "执行：" + "帮助" + s.CustoNo + "进行了消费商品:" + txtSellName.Text + "操作！", 2); - #endregion - nudNum.Value = 0; - return; + var sellthing = listSource.FirstOrDefault(a => a.SpendName.Equals(txtSellName.Text)); + if (!sellthing.IsNullOrEmpty()) + { + s = new Spend() + { + RoomNo = txtRoomNo.Text, + SpendName = txtSellName.Text, + SpendAmount = (int)nudNum.Value + listSource.FirstOrDefault(a => a.SpendName.Equals(txtSellName.Text.Trim())).SpendAmount, + CustoNo = r.CustoNo, + SpendPrice = Convert.ToDecimal(txtPrice.Text), + SpendMoney = Convert.ToDecimal(Convert.ToDouble(txtPrice.Text) * nudNum.Value) + listSource.FirstOrDefault(a => a.SpendName.Equals(txtSellName.Text.Trim())).SpendMoney, + SpendTime = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")), + MoneyState = SpendConsts.UnSettle, + }; + if (new SpendService().UpdSpenInfo(s)) + { + var stock = ((decimal)st.First().Stock - (decimal)nudNum.Value); + bool n = new SellService().UpdateSellthingInfo(new SellThing { SellName = st.First().SellName, SellPrice = st.First().SellPrice, Stock = stock, SellNo = st.First().SellNo, format = st.First().format }); + UIMessageBox.Show("添加成功", "系统提示", UIStyle.Green, UIMessageBoxButtons.OK, true); + LoadSpendInfoByRoomNo(r.RoomNo); + LoadSellThingInfo(); + #region 获取添加操作日志所需的信息 + RecordHelper.Record(LoginInfo.WorkerNo + "-" + LoginInfo.WorkerName + "在" + DateTime.Now + "位于" + LoginInfo.SoftwareVersion + "执行：" + "帮助" + s.CustoNo + "进行了消费商品:" + txtSellName.Text + "操作！", 2); + #endregion + } + } + else + { + s = new Spend() + { + RoomNo = txtRoomNo.Text, + SpendName = txtSellName.Text, + SpendAmount = (int)nudNum.Value, + CustoNo = r.CustoNo, + SpendPrice = Convert.ToDecimal(txtPrice.Text), + SpendMoney = Convert.ToDecimal(Convert.ToDouble(txtPrice.Text) * nudNum.Value), + SpendTime = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")), + MoneyState = SpendConsts.UnSettle, + }; + bool m = new SpendService().InsertSpendInfo(s); + if (m == true) + { + var stock = ((decimal)st.First().Stock - (decimal)nudNum.Value); + bool n = new SellService().UpdateSellthingInfo(new SellThing { SellName = st.First().SellName, SellPrice = st.First().SellPrice, Stock = stock, SellNo = st.First().SellNo, format = st.First().format }); + UIMessageBox.Show("添加成功", "系统提示", UIStyle.Green, UIMessageBoxButtons.OK, true); + LoadSpendInfoByRoomNo(r.RoomNo); + LoadSellThingInfo(); + #region 获取添加操作日志所需的信息 + RecordHelper.Record(LoginInfo.WorkerNo + "-" + LoginInfo.WorkerName + "在" + DateTime.Now + "位于" + LoginInfo.SoftwareVersion + "执行：" + "帮助" + s.CustoNo + "进行了消费商品:" + txtSellName.Text + "操作！", 2); + #endregion + nudNum.Value = 0; + return; + } + else + { + UIMessageBox.ShowError("添加失败"); + return; + } + } } else { - UIMessageBox.ShowError("添加失败"); - return; + s = new Spend() + { + RoomNo = txtRoomNo.Text, + SpendName = txtSellName.Text, + SpendAmount = (int)nudNum.Value, + CustoNo = r.CustoNo, + SpendPrice = Convert.ToDecimal(txtPrice.Text), + SpendMoney = Convert.ToDecimal(Convert.ToDouble(txtPrice.Text) * nudNum.Value), + SpendTime = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")), + MoneyState = SpendConsts.UnSettle, + }; + bool m = new SpendService().InsertSpendInfo(s); + if (m == true) + { + var stock = ((decimal)st.First().Stock - (decimal)nudNum.Value); + bool n = new SellService().UpdateSellthingInfo(new SellThing { SellName = st.First().SellName, SellPrice = st.First().SellPrice, Stock = stock, SellNo = st.First().SellNo, format = st.First().format }); + UIMessageBox.Show("添加成功", "系统提示", UIStyle.Green, UIMessageBoxButtons.OK, true); + LoadSpendInfoByRoomNo(r.RoomNo); + LoadSellThingInfo(); + #region 获取添加操作日志所需的信息 + RecordHelper.Record(LoginInfo.WorkerNo + "-" + LoginInfo.WorkerName + "在" + DateTime.Now + "位于" + LoginInfo.SoftwareVersion + "执行：" + "帮助" + s.CustoNo + "进行了消费商品:" + txtSellName.Text + "操作！", 2); + #endregion + nudNum.Value = 0; + return; + } + else + { + UIMessageBox.ShowError("添加失败"); + return; + } } } } @@ -226,9 +288,9 @@ namespace SYS.FormUI SellThing s = new SellService().SelectSellThingByNameAndPrice(name, price); decimal num = Convert.ToDecimal(dgvRoomSell.SelectedRows[0].Cells["clSpendAmount"].Value.ToString()); string Stock = (s.Stock + num).ToString(); - if (new SellService().DeleteSellThing(txtRoomNo.Text, custoNo, spendTime) == true) + if (new SellService().DeleteSellThing(txtRoomNo.Text, custoNo, name) == true) { - bool n = new SellService().UpdateSellThing(Stock, s.SellNo); + bool n = new SellService().UpdateSellthingInfo(new SellThing { SellName = s.SellName, SellPrice = s.SellPrice, Stock = s.Stock, SellNo = s.SellNo, format = s.format }); UIMessageTip.ShowOk("撤销成功！", 1000); #region 获取添加操作日志所需的信息 RecordHelper.Record(LoginInfo.WorkerNo + "-" + LoginInfo.WorkerName + "在" + DateTime.Now + "位于" + LoginInfo.SoftwareVersion + "执行：" + "帮助" + custoNo + "撤销了消费商品:" + txtSellName.Text + "操作！", 2); @@ -308,7 +370,7 @@ namespace SYS.FormUI //LoadSpendInfo(); //清空 } - else if (r != null) + else if (!r.IsNullOrEmpty()) { if (r.RoomStateId == 1) { diff --git a/SYS.FormUI/AppFunction/FrmSellThingManager.cs b/SYS.FormUI/AppFunction/FrmSellThingManager.cs index 6ad42b0..154bc79 100644 --- a/SYS.FormUI/AppFunction/FrmSellThingManager.cs +++ b/SYS.FormUI/AppFunction/FrmSellThingManager.cs @@ -61,7 +61,7 @@ namespace SYS.FormUI private void btnFind_Click(object sender, EventArgs e) { - dgvSellthing.DataSource = new SellService().SelectSellThingByName(txtFind.Text); + dgvSellthing.DataSource = new SellService().SelectSellThingAll(new SellThing { SellNo = txtFind.Text.Trim(), SellName = txtFind.Text.Trim() }); } private void btnDeleteSellThing_Click(object sender, EventArgs e) diff --git a/SYS.FormUI/AppFunction/FrmWtiInfo.cs b/SYS.FormUI/AppFunction/FrmWtiInfo.cs index aba854a..ff00a31 100644 --- a/SYS.FormUI/AppFunction/FrmWtiInfo.cs +++ b/SYS.FormUI/AppFunction/FrmWtiInfo.cs @@ -71,7 +71,7 @@ namespace SYS.FormUI { Wti wti = new Wti { - WtiNo = txtRecordNo.Text.Trim(), + WtiNo = Convert.ToInt16(txtRecordNo.Text.Trim()), RoomNo = txtRoomNo.Text.Trim(), CustoNo = txtCustoNo.Text.Trim(), UseDate = dtpStartDate.Value, diff --git a/SYS.FormUI/AppUserControls/ucBaseInformation.cs b/SYS.FormUI/AppUserControls/ucBaseInformation.cs index fba6c29..8c9528e 100644 --- a/SYS.FormUI/AppUserControls/ucBaseInformation.cs +++ b/SYS.FormUI/AppUserControls/ucBaseInformation.cs @@ -83,53 +83,19 @@ namespace SYS.FormUI private void btnOperation_Click(object sender, EventArgs e) { - //lbName.Enabled = true; - //lbName.ReadOnly = false; if (btnOperation.Text == "恢复") { FrmNation.info = lbName.Text.Replace("名称:", string.Empty).ToString(); FrmNation.Accessed(); return; } - if (btnOperation.Text == "恢复" && this.Tag.ToString() == "学历") - { - FrmEducation.info = lbName.Text.Replace("名称:", string.Empty).ToString(); - FrmEducation.Accessed(); - return; - } - if (btnOperation.Text == "新增") - { - lbName.Enabled = true; - lbName.ReadOnly = false; - return; - } - if (btnOperation.Text == "新增" && this.Tag.ToString() == "学历") - { - lbName.Enabled = true; - lbName.ReadOnly = false; - return; - } - if (this.Tag.ToString() == " 学历") - { - FrmEducation.info = lbName.Text.Replace("名称:", string.Empty).ToString(); - FrmEducation.operation(); - return; - } - - if (this.Tag.ToString() != " 学历") - { - - FrmNation.info = lbName.Text.Replace("名称:", string.Empty).ToString(); - FrmNation.operation(); - return; - } - //MessageBox.Show(lbName.Text.Replace("名称:", string.Empty).ToString()); + FrmNation.info = lbName.Text.Replace("名称:", string.Empty).ToString(); + FrmNation.operation(); + return; } private void lbName_MouseLeave(object sender, EventArgs e) { - //lbName.Enabled = false; - //lbName.ReadOnly = true; lbName.FillColor = Color.FromArgb(235, 243, 255); lbName.FillDisableColor = Color.FromArgb(235, 243, 255); lbName.RectColor = Color.FromArgb(235, 243, 255); @@ -143,14 +109,7 @@ namespace SYS.FormUI private void lbName_Validated(object sender, EventArgs e) { - if (this.Tag.ToString() == "学历") - { - FrmEducation.info = lbName.Text.ToString(); - FrmEducation.insert(); - return; - } - FrmNation.info = lbName.Text.ToString(); - FrmNation.insert(); + } } } diff --git a/SYS.FormUI/AppUserControls/ucEducationInformation.cs b/SYS.FormUI/AppUserControls/ucEducationInformation.cs index 4d8c201..2fe7a33 100644 --- a/SYS.FormUI/AppUserControls/ucEducationInformation.cs +++ b/SYS.FormUI/AppUserControls/ucEducationInformation.cs @@ -89,22 +89,13 @@ namespace SYS.FormUI FrmEducation.Accessed(); return; } - if (btnOperation.Text == "新增") - { - lbName.Enabled = true; - lbName.ReadOnly = false; - return; - } FrmEducation.info = lbName.Text.Replace("名称:", string.Empty).ToString(); FrmEducation.operation(); return; - //MessageBox.Show(lbName.Text.Replace("名称:", string.Empty).ToString()); } private void lbName_MouseLeave(object sender, EventArgs e) { - //lbName.Enabled = false; - //lbName.ReadOnly = true; lbName.FillColor = Color.FromArgb(235, 243, 255); lbName.FillDisableColor = Color.FromArgb(235, 243, 255); lbName.RectColor = Color.FromArgb(235, 243, 255); @@ -118,8 +109,8 @@ namespace SYS.FormUI private void lbName_Validated(object sender, EventArgs e) { - FrmEducation.info = lbName.Text.ToString(); - FrmEducation.insert(); + //FrmEducation.info = lbName.Text.ToString(); + //FrmEducation.insert(); } } } diff --git a/SYS.FormUI/AppUserControls/ucPositionInformation.cs b/SYS.FormUI/AppUserControls/ucPositionInformation.cs index 9fc77f2..8dd1108 100644 --- a/SYS.FormUI/AppUserControls/ucPositionInformation.cs +++ b/SYS.FormUI/AppUserControls/ucPositionInformation.cs @@ -98,7 +98,6 @@ namespace SYS.FormUI FrmPosition.info = lbName.Text.Replace("名称:", string.Empty).ToString(); FrmPosition.operation(); return; - //MessageBox.Show(lbName.Text.Replace("名称:", string.Empty).ToString()); } private void lbName_MouseLeave(object sender, EventArgs e) @@ -118,8 +117,8 @@ namespace SYS.FormUI private void lbName_Validated(object sender, EventArgs e) { - FrmPosition.info = lbName.Text.ToString(); - FrmPosition.insert(); + //FrmPosition.info = lbName.Text.ToString(); + //FrmPosition.insert(); } } } diff --git a/SYS.FormUI/AppUserControls/ucRoomList.Designer.cs b/SYS.FormUI/AppUserControls/ucRoomList.Designer.cs index c2381a3..d3d65dd 100644 --- a/SYS.FormUI/AppUserControls/ucRoomList.Designer.cs +++ b/SYS.FormUI/AppUserControls/ucRoomList.Designer.cs @@ -40,6 +40,7 @@ this.lblRoomType = new System.Windows.Forms.Label(); this.lblRoomNo = new System.Windows.Forms.Label(); this.uttTips = new Sunny.UI.UIToolTip(this.components); + this.lblMark = new Sunny.UI.UILabel(); this.cmsMain.SuspendLayout(); this.SuspendLayout(); // @@ -108,8 +109,8 @@ this.lblCustoNo.Size = new System.Drawing.Size(62, 17); this.lblCustoNo.TabIndex = 10; this.lblCustoNo.Text = "CustoNo"; - this.lblCustoNo.Click += new System.EventHandler(this.lblCustoNo_Click); - this.lblCustoNo.MouseHover += new System.EventHandler(this.lblCustoNo_MouseHover); + this.lblCustoNo.MouseClick += new System.Windows.Forms.MouseEventHandler(this.lblCustoNo_MouseClick); + this.lblCustoNo.MouseEnter += new System.EventHandler(this.lblCustoNo_MouseEnter); // // lblRoomType // @@ -121,8 +122,8 @@ this.lblRoomType.Size = new System.Drawing.Size(61, 17); this.lblRoomType.TabIndex = 9; this.lblRoomType.Text = "RoomTy"; - this.lblRoomType.Click += new System.EventHandler(this.lblRoomType_Click); - this.lblRoomType.MouseHover += new System.EventHandler(this.lblRoomType_MouseHover); + this.lblRoomType.MouseClick += new System.Windows.Forms.MouseEventHandler(this.lblRoomType_MouseClick); + this.lblRoomType.MouseEnter += new System.EventHandler(this.lblRoomType_MouseEnter); // // lblRoomNo // @@ -135,8 +136,8 @@ this.lblRoomNo.Size = new System.Drawing.Size(63, 17); this.lblRoomNo.TabIndex = 8; this.lblRoomNo.Text = "RoomNo"; - this.lblRoomNo.Click += new System.EventHandler(this.lblRoomNo_Click); - this.lblRoomNo.MouseHover += new System.EventHandler(this.lblRoomNo_MouseHover); + this.lblRoomNo.MouseClick += new System.Windows.Forms.MouseEventHandler(this.lblRoomNo_MouseClick); + this.lblRoomNo.MouseEnter += new System.EventHandler(this.lblRoomNo_MouseEnter); // // uttTips // @@ -146,6 +147,17 @@ this.uttTips.ToolTipIcon = System.Windows.Forms.ToolTipIcon.Info; this.uttTips.ToolTipTitle = "点击提示"; // + // lblMark + // + this.lblMark.Font = new System.Drawing.Font("微软雅黑", 12F); + this.lblMark.Location = new System.Drawing.Point(37, 48); + this.lblMark.Name = "lblMark"; + this.lblMark.Size = new System.Drawing.Size(15, 23); + this.lblMark.TabIndex = 11; + this.lblMark.Text = "uiLabel1"; + this.lblMark.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + this.lblMark.Visible = false; + // // ucRoomList // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); @@ -154,18 +166,20 @@ this.BackgroundImage = global::SYS.FormUI.Properties.Resources.可住状态; this.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; this.ContextMenuStrip = this.cmsMain; + this.Controls.Add(this.lblMark); this.Controls.Add(this.lblCustoNo); this.Controls.Add(this.lblRoomType); this.Controls.Add(this.lblRoomNo); this.DoubleBuffered = true; this.Name = "ucRoomList"; this.Size = new System.Drawing.Size(95, 79); - this.uttTips.SetToolTip(this, "点击查看房间信息"); + this.uttTips.SetToolTip(this, "鼠标悬停可显示房间信息\r\n点击鼠标左键查看房间信息\r\n快速双击鼠标左键可快速入住"); this.Load += new System.EventHandler(this.ucRoomList_Load); this.SizeChanged += new System.EventHandler(this.ucRoomList_SizeChanged); this.Click += new System.EventHandler(this.ucRoomList_Click); this.DoubleClick += new System.EventHandler(this.ucRoomList_DoubleClick); this.MouseClick += new System.Windows.Forms.MouseEventHandler(this.ucRoomList_MouseClick); + this.MouseEnter += new System.EventHandler(this.ucRoomList_MouseEnter); this.MouseLeave += new System.EventHandler(this.ucRoomList_MouseLeave); this.MouseHover += new System.EventHandler(this.ucRoomList_MouseHover); this.cmsMain.ResumeLayout(false); @@ -186,5 +200,6 @@ public System.Windows.Forms.Label lblRoomType; public System.Windows.Forms.Label lblRoomNo; private Sunny.UI.UIToolTip uttTips; + public Sunny.UI.UILabel lblMark; } } diff --git a/SYS.FormUI/AppUserControls/ucRoomList.cs b/SYS.FormUI/AppUserControls/ucRoomList.cs index 2ba0be9..3989b12 100644 --- a/SYS.FormUI/AppUserControls/ucRoomList.cs +++ b/SYS.FormUI/AppUserControls/ucRoomList.cs @@ -157,9 +157,9 @@ namespace SYS.FormUI label.Font = UI_FontUtil.roomControlFont; } } + this.CanPenetrate(); this.Region = new Region(GetRoundRectPath(new RectangleF(0, 0, this.Width, this.Height), 6f)); - us_CustoNo = romRoomInfo.CustoNo; us_CustoName = romRoomInfo.CustoName; us_CustoSex = romRoomInfo.CustoSex == 1 ? "男" : "女"; @@ -361,13 +361,25 @@ namespace SYS.FormUI } - private void lblRoomType_Click(object sender, EventArgs e) + private void ucRoomList_SizeChanged(object sender, EventArgs e) { - LoadRoomInfo(); + this.Width = 125; + this.Height = 85; + } + private void ucRoomList_MouseHover(object sender, EventArgs e) + { try { - FrmRoomManager.ReadInfo(); + if (lblMark.Text.Trim().IsNullOrEmpty()) + { + FrmRoomManager.ReadInfo(); + } + else + { + cmsMain.Enabled = false; + return; + } } catch (Exception) { @@ -375,13 +387,30 @@ namespace SYS.FormUI } } - private void lblRoomNo_Click(object sender, EventArgs e) + public void LoadRoomInfo() { - LoadRoomInfo(); + co_RoomNo = romCustoInfo.RoomNo; + co_CustoNo = romCustoInfo.CustoNo; + romTypeName = romCustoInfo.RoomName; + co_CheckTime = romCustoInfo.CheckTimeFormat; + co_RoomPosition = romCustoInfo.RoomPosition; + co_RoomState = romCustoInfo.RoomState; + + } + private void ucRoomList_MouseClick(object sender, MouseEventArgs e) + { try { - FrmRoomManager.ReadInfo(); + if (lblMark.Text.Trim().IsNullOrEmpty()) + { + FrmRoomManager.ReadInfo(); + } + else + { + cmsMain.Enabled = false; + return; + } } catch (Exception) { @@ -389,13 +418,19 @@ namespace SYS.FormUI } } - private void lblCustoNo_Click(object sender, EventArgs e) + private void ucRoomList_MouseEnter(object sender, EventArgs e) { - LoadRoomInfo(); - try { - FrmRoomManager.ReadInfo(); + if (lblMark.Text.Trim().IsNullOrEmpty()) + { + FrmRoomManager.ReadInfo(); + } + else + { + cmsMain.Enabled = false; + return; + } } catch (Exception) { @@ -403,55 +438,119 @@ namespace SYS.FormUI } } - private void ucRoomList_SizeChanged(object sender, EventArgs e) + private void lblRoomType_MouseClick(object sender, MouseEventArgs e) { - //lblRoomType.Width = 61; - //lblRoomType.Height = 17; - //lblCustoNo.Width = 61; - //lblCustoNo.Height = 17; - //lblRoomNo.Width = 61; - //lblRoomNo.Height = 17; - this.Width = 125; - this.Height = 85; - } + try + { + if (lblMark.Text.Trim().IsNullOrEmpty()) + { + FrmRoomManager.ReadInfo(); + } + else + { + cmsMain.Enabled = false; + return; + } + } + catch (Exception) + { - private void ucRoomList_MouseHover(object sender, EventArgs e) - { - LoadRoomInfo(); - //FrmRoomManager.ReadInfo(); + } } - public void LoadRoomInfo() + private void lblRoomNo_MouseClick(object sender, MouseEventArgs e) { - co_RoomNo = romCustoInfo.RoomNo; - co_CustoNo = romCustoInfo.CustoNo; - romTypeName = romCustoInfo.RoomName; - co_CheckTime = romCustoInfo.CheckTimeFormat; - co_RoomPosition = romCustoInfo.RoomPosition; - co_RoomState = romCustoInfo.RoomState; + try + { + if (lblMark.Text.Trim().IsNullOrEmpty()) + { + FrmRoomManager.ReadInfo(); + } + else + { + cmsMain.Enabled = false; + return; + } + } + catch (Exception) + { + } } - private void lblRoomType_MouseHover(object sender, EventArgs e) + private void lblCustoNo_MouseClick(object sender, MouseEventArgs e) { - LoadRoomInfo(); + try + { + if (lblMark.Text.Trim().IsNullOrEmpty()) + { + FrmRoomManager.ReadInfo(); + } + else + { + cmsMain.Enabled = false; + return; + } + } + catch (Exception) + { + + } } - private void lblRoomNo_MouseHover(object sender, EventArgs e) + private void lblRoomType_MouseEnter(object sender, EventArgs e) { - LoadRoomInfo(); + try + { + if (lblMark.Text.Trim().IsNullOrEmpty()) + { + FrmRoomManager.ReadInfo(); + } + else + { + cmsMain.Enabled = false; + return; + } + } + catch (Exception) + { + + } } - private void lblCustoNo_MouseHover(object sender, EventArgs e) + private void lblRoomNo_MouseEnter(object sender, EventArgs e) { - LoadRoomInfo(); + try + { + if (lblMark.Text.Trim().IsNullOrEmpty()) + { + FrmRoomManager.ReadInfo(); + } + else + { + cmsMain.Enabled = false; + return; + } + } + catch (Exception) + { + + } } - private void ucRoomList_MouseClick(object sender, MouseEventArgs e) + private void lblCustoNo_MouseEnter(object sender, EventArgs e) { try { - FrmRoomManager.ReadInfo(); + if (lblMark.Text.Trim().IsNullOrEmpty()) + { + FrmRoomManager.ReadInfo(); + } + else + { + cmsMain.Enabled = false; + return; + } } catch (Exception) { diff --git a/SYS.FormUI/SYS.FormUI.csproj b/SYS.FormUI/SYS.FormUI.csproj index d4bfc8f..ca73992 100644 --- a/SYS.FormUI/SYS.FormUI.csproj +++ b/SYS.FormUI/SYS.FormUI.csproj @@ -252,6 +252,12 @@ FrmLoading.cs + + UserControl + + + ucBaseInformation.cs + UserControl @@ -264,12 +270,6 @@ ucEducationInformation.cs - - UserControl - - - ucBaseInformation.cs - Form @@ -631,15 +631,15 @@ FrmWorkerCheckInfo.cs + + ucBaseInformation.cs + ucPositionInformation.cs ucEducationInformation.cs - - ucBaseInformation.cs - ucVipType.cs diff --git "a/SYS.FormUI/icon/\346\260\221\346\227\217.ico" "b/SYS.FormUI/icon/\346\260\221\346\227\217.ico" index 2601046aa992236e039581b5711b6c827d8ba89d..d3fa8a5a1a5186cec868ca33ee872631fce69705 100644 GIT binary patch delta 365 zcmV-z0h0dc1-%0h000310RSK%000317yzdMkq}#d0X#`WK~z{rV_+Bsqai?K2>k#5 zUjT>|fY<w$O& zNFGQ}qM0LL4!~sr(DHO3eh3W_IjTE^kOM##0xees;@v=e38>zNs*WJW0Z>P<1066I zsQv?gkgfvaWFU42MIA*BBGv&gOP~q!DN@R%uLF>MORD3sh7=`+P@)&^7)lJGMDO5p z05C;Q1mgWbJRgW#iOFu%3;~c?XMh%W1MyBEegQ23w*cAUxUv~F9e|OQfEEV<@e&~Z z4#cN{*b?0#G<5*XGN8qZKs+0W-vDv&fMr8epyg%IXxRj0mjKxTbO`}u9|JA+2I8eq zhk#1MGjuPCDJu7|X{JgrQsSyn2MmS~XrMSHQ<4To^^S%BEkghRrW4%bIzSm$YJF3`B*NO+k&NG->?VR8NMfBaR+MsQaD{BPen+Nt5)?(p84F%blsdG*Q9aD;q2sW?uK;dQQ`p(pE z;Mwmj!tXm<0e(Ce-x49 zdxi`D(Z2|QlVue#<{MZ9sLlf!;4B>hUUnsayQj=8ln|cnHszxfN~60@6Y@MK3*!qRfqyG6Rr`UMkLy~k{FBD zgGxTWnH7alf@yZ<)&HDJ1mNdb+I}_V=OtpoQ9!Yk`*R?oBlapmhf~a#I-V#Dbm3@! z$itYAS14dyeYgH*I9-u%>?!JWBP?4ADk2nR6tunw(rKY;2K_UvcHw<}5X zHYFW2Yweu7aE2wMQGwtt#nHrEMC=HnFfEBfN+NjHML@Sez!Q$5SrCP&M8GTMjEjf^ z0r9?N6i!_P%t&@N~qR#g$1)PJc z%1DIHxhD#^A+B^!be$6TMNt`9hJIjgfC7^9dd%#>B}dI72ydi<9$@G!# z<(YZuV7XkNNETQw1tiDfoL`g*mVj_w5=#<++=|JvT 关于谭国平同志的职位任命通知

经高层商讨，决定即日起任命谭国平同志为人力资源部经理，免去其原人力资源部职员一职！ 

', 'D-004', 0, 'admin', '2021-02-16', NULL, '0001-01-01'); INSERT INTO "uploadinfo" ("NoticeNo", "Noticetheme", "NoticeType", "NoticeTime", "NoticeContent", "NoticeClub", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES ('UP001', '人员调动', 'PersonnelChanges', '2018-12-03 15:48:58', '现将临时工李顺调为正式工，并担任经理部秘书！即日起生效', '人事部', 0, NULL, NULL, NULL, NULL); -INSERT INTO "userinfo" ("CustoNo", "CustoName", "CustoSex", "CustoTel", "PassportType", "CustoID", "CustoAdress", "CustoBirth", "CustoType", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES ('TS-20210078', '阿洛', 1, 'ciJGvV9GPK9NLT5h6MF3TXH7uIGZMdaEU9OonULCndSiqvG0TdI5WYmyPGJJaQdOMhu8lle6F/RLmQUCbqOoQZFS2C6Eqi/4REJ/6RqYwUh3sfSN0iqa8XwD3kM0Sbs0oN3mhbXaS6GiWdf8gDFWlvoLpReJwyEdyD5CZsTcl9I=·FHHFFiDBB0FaH0DcciB(f058b29692ad55ff)', 0, 'A0hBGBWBhLggHZ1oAf+Ta9UBfKV1404IJF33vp4w95xKFmg7YMY/NRPQwCceV1QlsqkO9kOTGHWgY9Gjdx9Wut6n0VTb3v78AKYa1TxV3M6Zy4e2kelSP2I983S8Pm0E6rWM5CN5R68qh0BUCcKV3TDxxlLysZIkcs8B9N20Uqg=·FHHFFiDBB0☆gai0ai☆B(fd4bc7ae1cf03f0)', '广东省茂名市信宜县', '1988-07-20', 0, 0, '', '2021-10-20', 'WK010', '2022-01-31'); INSERT INTO "userinfo" ("CustoNo", "CustoName", "CustoSex", "CustoTel", "PassportType", "CustoID", "CustoAdress", "CustoBirth", "CustoType", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES ('TS-20220089', '古河早苗', 0, 'voRtCiTyE6F+mg0n5gpN2VRub/EaMXAMAZJx/5ZKO+OHMSJKEaffnL66+Kg9lS9zXOY/MNOB3FuLeelDe5sk+ylLvVNwEK7gvBlmK+6cX2lmmZw454iVZhQJQYuJ7ocRWRpKWYGRVykuBX/FXsdIf/VtbB9hLbC/PYWVTDTZChU=·FHHgc☆gcFFHDcDgH0aF(822878d662b80ce1)', 4, 'TZpIO1nle+bZ9325uMcs5u/SDVCik1EO0vyK7OXKl0siGPkY0kyIham4WUkd2Na74hqjweD2JAewZ8aTwe0pjgijc0qbGBZ6gygsIdXhJUYQiPxMKZszIZvAfm2syz2a3oFAOknE7UkfO1eCj8efCfuQdCEkTWXzZOiy6nS6k6Q=·FHHgc☆gcFFgHDg☆cFFD(3b6742000c11b508)', '团子商店街', '1980-07-08', 0, 0, 'WK010', '2022-02-01', NULL, '0001-01-01'); INSERT INTO "userinfo" ("CustoNo", "CustoName", "CustoSex", "CustoTel", "PassportType", "CustoID", "CustoAdress", "CustoBirth", "CustoType", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES ('TS-20220090', '古河秋生', 1, 'ossNxyLtRvvGc8+tKD/OtTZk5Cd3EkPe2vd6oIoVdTTpjEQkSlh0XIF88Rg2iWnhGh3jEfnzr22l6TY+1B+LzHgzGVv5fV2kSvjGsFw6V/Ad2zuDHiyV8CDz2AMMhJH+wfA87cJzGnsFM1t2sS7o4982hlzxY02LTzPF+PzqdVI=·FHHgc☆ggagiHHF0☆i☆B(41a2107858c2662e)', 4, 'B8EWKh4XeWLDlRoqd1rm3FNkk4h00NgsZKNOVGZQpZwa4d/JL4WZ0N3QltCBPKkJ0i31chzTDWwO9ugQA5zrwPMNuZjnmU2YSuCe2Dlv2IUlxr2/x5Ao4i4udSZzcIigIPzDLLVQzvWBiL7gvzVs2xay+DH0HJ61tObjWhpkUs0=·FHHgc☆ggagiDBDFD☆aB(31552737d8c6feb2)', '团子商店街', '1980-02-05', 0, 0, 'WK010', '2022-02-01', NULL, '0001-01-01'); -INSERT INTO "userinfo" ("CustoNo", "CustoName", "CustoSex", "CustoTel", "PassportType", "CustoID", "CustoAdress", "CustoBirth", "CustoType", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES ('TS-20220099', '茅野芽衣', 0, 'vSlJaIgmLIzxj0xaZBVEHqkZwrshJtTD0EgQU53P7Y5QLqeiGHgSg4GPzLZCohN8F68708pt7SaWTwCD+XhPmEYwrneXQBGI7X8C6OU6RVY4R+fQUXHOP6IsQNac/gVSPuRpxDFjuxQhq1PQ+h4Ytxaoq5NeEwnq9BDnbAK0oGY=·FHHggF0Hic☆☆0HiiB00(3dbe3ec34c68e35d)', 4, 'mDcX6KjNq1wT9rkuKJxyxgXgFcersrlntOKhFgdR7l9x4qQjIXraWyUpA3Oed9VXs+nC6H37jtsmpTNdoaGF01OGFcsd3ELEoSY9A2MlpIDMZxrBltFFrNLsziLHvpEXu3OJGX0GpX5EC1zqMJt50qbuuVaItzGw+tjW/N2bLLA=·FHHggF0HicDiBagDHDH(c6d8320393bb7cb9)', '东京', '1995-07-06', 0, 0, 'WK010', '2022-02-02', 'WK010', '2022-02-02'); +INSERT INTO "userinfo" ("CustoNo", "CustoName", "CustoSex", "CustoTel", "PassportType", "CustoID", "CustoAdress", "CustoBirth", "CustoType", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES ('TS-20210078', '阿洛', 1, 'ciJGvV9GPK9NLT5h6MF3TXH7uIGZMdaEU9OonULCndSiqvG0TdI5WYmyPGJJaQdOMhu8lle6F/RLmQUCbqOoQZFS2C6Eqi/4REJ/6RqYwUh3sfSN0iqa8XwD3kM0Sbs0oN3mhbXaS6GiWdf8gDFWlvoLpReJwyEdyD5CZsTcl9I=·FHHFFiDBB0FaH0DcciB(f058b29692ad55ff)', 0, 'A0hBGBWBhLggHZ1oAf+Ta9UBfKV1404IJF33vp4w95xKFmg7YMY/NRPQwCceV1QlsqkO9kOTGHWgY9Gjdx9Wut6n0VTb3v78AKYa1TxV3M6Zy4e2kelSP2I983S8Pm0E6rWM5CN5R68qh0BUCcKV3TDxxlLysZIkcs8B9N20Uqg=·FHHFFiDBB0☆gai0ai☆B(fd4bc7ae1cf03f0)', '广东省茂名市信宜县', '1988-07-20', 3, 0, '', '2021-10-20', 'WK010', '2022-01-31'); +INSERT INTO "userinfo" ("CustoNo", "CustoName", "CustoSex", "CustoTel", "PassportType", "CustoID", "CustoAdress", "CustoBirth", "CustoType", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES ('TS-202200136', '路三强', 0, 'I0AJ+awpCsNygsp7VfCRQbcwWivwB+UBSBoz4TwBoX9cRRjRKJdPODwqdtK20TfeZ8wwp9iXIO4oBN4d+bGUZQpODZZ9z5oJj3BJx5FRLciS3HXu7oKeqSOKVIE6rSaiPD+6IGhpc4rIzXDwHdfYNb2gGsM26AEYUxQhK01MfY0=·FHiFBiaFFH0a0iacgiB(c98e6301e5628f55)', 0, 'ryljB7aFD5UWfYBK+8lGSo+qiEpA6rNmQf8hvp86hxBh81umKV77ylFtYToOIBjBpPJQklSviPdNE7lqHASsUl/JfwwBuTRlCPeZNx4h0WwbeiH5tVC2AFxBGkxzaWQha1sUXjVvXfYlsnmR0ohdfev17BVCkrUwSy/Cgh+4oNY=·FHiFBiaFFgi☆FcHcgDD(694c3f1ff51f967)', '广东省茂名市信宜县', '1988-12-14', 0, 0, 'WK010', '2022-02-26', NULL, '0001-01-01'); +INSERT INTO "userinfo" ("CustoNo", "CustoName", "CustoSex", "CustoTel", "PassportType", "CustoID", "CustoAdress", "CustoBirth", "CustoType", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES ('TS-20220099', '茅野芽衣', 0, 'Qfh+KpEDwBoqkRsB/gtfSBHeaAKbzZZLzEdKGYdpNiR2CHS7/4j4Pie+BlqB04UG+dCbFtgXSdfs0QisEUCR2iNyfbtbFIcXN6tWYWtxxyLkWwQpBKjtZo6uUYvbfZZ7qiFLdI+cqdZJEjChoNvkD1K6nESWlNlIZaxa6bRArD8=·FHiFcDD0g00iH☆DFFHH(1775707505e62eae)', 4, 'qEPEOVA7IvVd3ufQ2FcFj0+is6Vh0lsYPMQ5p+q36jjhrdAJo6sPxttsoW8vzoCWhiKYcN6Xa0tqRPim7/PBysnl1lr03cNulqUHXk4Vb3hx6GhL0hSuKxDJSazkNzN4PIFK75IRancHe/Tk5VoMLssb9o/wRWfA8/OL4wncvdA=·FHiFcDD0g00c☆FBH0cB(9d926a241e44edf7)', '大阪', '1995-07-06', 0, 0, 'WK010', '2022-02-02', 'WK010', '2022-02-26'); INSERT INTO "usertype" ("UserType", "TypeName", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (0, '普通用户', 0, NULL, NULL, NULL, NULL); INSERT INTO "usertype" ("UserType", "TypeName", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (1, '钻石会员', 0, NULL, NULL, NULL, NULL); INSERT INTO "usertype" ("UserType", "TypeName", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (2, '白金会员', 0, NULL, NULL, NULL, NULL); @@ -4872,6 +5013,8 @@ INSERT INTO "usertype" ("UserType", "TypeName", "delete_mk", "datains_usr", "dat INSERT INTO "vip_rule" ("id", "rule_id", "rule_name", "rule_value", "type_id", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (1, 'VR-202107170003', '升级到钻石会员的规则', '70000.00', 1, 0, 'admin', '2021-07-17', NULL, '0001-01-01'); INSERT INTO "vip_rule" ("id", "rule_id", "rule_name", "rule_value", "type_id", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (2, 'VR-202107170007', '升级到黄金会员的规则', '50000.00', 3, 0, 'admin', '2021-07-17', NULL, '0001-01-01'); INSERT INTO "vip_rule" ("id", "rule_id", "rule_name", "rule_value", "type_id", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (3, 'VR-2021071700010', '升级到白金会员的规则', '30000.00', 2, 0, 'admin', '2021-07-17', NULL, '0001-01-01'); +INSERT INTO "vip_rule" ("id", "rule_id", "rule_name", "rule_value", "type_id", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (0, 'VR-2022022600052', '尊贵会员', '150000.00', 1, 0, 'admin', '2022-02-26', NULL, '0001-01-01'); +INSERT INTO "worker" ("WorkerId", "WorkerName", "WorkerBirthday", "WorkerSex", "WorkerTel", "WorkerClub", "WorkerNation", "WorkerAddress", "WorkerPosition", "CardID", "WorkerPwd", "WorkerTime", "WorkerFace", "WorkerEducation", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES ('WK010', '杨俊杰', '1999-07-20 00:00:00', 1, 'B6CCShOF+ezaHM3LdXEDWPmWHBRpYmEl0DVl/p/Ate8D/LT88ksL9wa35D6vkQqzvnAtzUXkDT5Rpavw8LWgceXalSgDTcEPsopL+KbiHw/1NlTxCeRB4ldpj5Djwi57oRBgzqH7h053DYNmtgLPuGV3DcsDgSawRXY1y1ziYrk=·FHHiDagiBgg0Bg0DaBH(a1226e938724d985)', 'D-001', 'N-00001', '广东珠海', 'P-0001', '123121313132X3', 'admin', '2011-04-20 00:00:00', '团员', 'E-00006', 0, NULL, NULL, 'admin', '2022-02-07'); INSERT INTO "worker" ("WorkerId", "WorkerName", "WorkerBirthday", "WorkerSex", "WorkerTel", "WorkerClub", "WorkerNation", "WorkerAddress", "WorkerPosition", "CardID", "WorkerPwd", "WorkerTime", "WorkerFace", "WorkerEducation", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES ('Duyen', '阿娟', '1969-10-11 00:00:00', 0, '13433221223', 'D-011', 'N-00001', '市区', 'P-0003', '440921189910119090', '123456', '2020-07-05 02:20:31', '党员', 'E-00003', 0, NULL, NULL, NULL, NULL); INSERT INTO "worker" ("WorkerId", "WorkerName", "WorkerBirthday", "WorkerSex", "WorkerTel", "WorkerClub", "WorkerNation", "WorkerAddress", "WorkerPosition", "CardID", "WorkerPwd", "WorkerTime", "WorkerFace", "WorkerEducation", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES ('Hien', '阿賢', '1969-10-11 00:00:00', 0, '13433221223', 'D-005', 'N-00001', '市区', 'P-0003', '440921189910119090', '123456', '2020-07-05 02:19:53', '党员', 'E-00006', 0, NULL, NULL, NULL, NULL); INSERT INTO "worker" ("WorkerId", "WorkerName", "WorkerBirthday", "WorkerSex", "WorkerTel", "WorkerClub", "WorkerNation", "WorkerAddress", "WorkerPosition", "CardID", "WorkerPwd", "WorkerTime", "WorkerFace", "WorkerEducation", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES ('Huong', '阿香', '1969-10-11 00:00:00', 0, '13433221223', 'D-011', 'N-00001', '市区', 'P-0003', '440921189910119090', '123456', '2020-07-05 02:17:25', '党员', 'E-00003', 0, NULL, NULL, NULL, NULL); @@ -4887,7 +5030,6 @@ INSERT INTO "worker" ("WorkerId", "WorkerName", "WorkerBirthday", "WorkerSex", " INSERT INTO "worker" ("WorkerId", "WorkerName", "WorkerBirthday", "WorkerSex", "WorkerTel", "WorkerClub", "WorkerNation", "WorkerAddress", "WorkerPosition", "CardID", "WorkerPwd", "WorkerTime", "WorkerFace", "WorkerEducation", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES ('WK007', '罗良建', '2000-12-05 00:00:00', 1, '15693857612', 'D-003', 'N-00001', '市区', 'P-0002', '12343564758586', '123456', '2018-12-03 15:48:37', '团员', 'E-00006', 0, NULL, NULL, 'admin', '2021-02-17'); INSERT INTO "worker" ("WorkerId", "WorkerName", "WorkerBirthday", "WorkerSex", "WorkerTel", "WorkerClub", "WorkerNation", "WorkerAddress", "WorkerPosition", "CardID", "WorkerPwd", "WorkerTime", "WorkerFace", "WorkerEducation", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES ('WK008', '林淑仪', '1999-12-05 00:00:00', 0, '15693857612', 'D-008', 'N-00001', '市区', 'P-2021001', '12343564758586', '123456', '2018-12-03 15:48:37', '团员', 'E-00006', 0, NULL, NULL, 'admin', '2021-04-10'); INSERT INTO "worker" ("WorkerId", "WorkerName", "WorkerBirthday", "WorkerSex", "WorkerTel", "WorkerClub", "WorkerNation", "WorkerAddress", "WorkerPosition", "CardID", "WorkerPwd", "WorkerTime", "WorkerFace", "WorkerEducation", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES ('WK009', '老铁', '1989-12-05 00:00:00', 1, '15693857612', 'D-004', 'N-00001', '市区', 'P-0003', '12343564758586', '123456', '2018-12-03 15:48:37', '团员', 'E-00006', 0, NULL, NULL, NULL, NULL); -INSERT INTO "worker" ("WorkerId", "WorkerName", "WorkerBirthday", "WorkerSex", "WorkerTel", "WorkerClub", "WorkerNation", "WorkerAddress", "WorkerPosition", "CardID", "WorkerPwd", "WorkerTime", "WorkerFace", "WorkerEducation", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES ('WK010', '杨俊杰', '1999-07-20 00:00:00', 1, 'B6CCShOF+ezaHM3LdXEDWPmWHBRpYmEl0DVl/p/Ate8D/LT88ksL9wa35D6vkQqzvnAtzUXkDT5Rpavw8LWgceXalSgDTcEPsopL+KbiHw/1NlTxCeRB4ldpj5Djwi57oRBgzqH7h053DYNmtgLPuGV3DcsDgSawRXY1y1ziYrk=·FHHiDagiBgg0Bg0DaBH(a1226e938724d985)', 'D-001', 'N-00001', '广东珠海', 'P-0001', '123121313132X3', 'admin', '2011-04-20 00:00:00', '团员', 'E-00006', 0, NULL, NULL, 'admin', '2022-02-07'); INSERT INTO "worker" ("WorkerId", "WorkerName", "WorkerBirthday", "WorkerSex", "WorkerTel", "WorkerClub", "WorkerNation", "WorkerAddress", "WorkerPosition", "CardID", "WorkerPwd", "WorkerTime", "WorkerFace", "WorkerEducation", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES ('WK011', '六月', '1900-01-18 00:00:00', 1, '13433221223', 'D-002', 'N-00001', '市区', 'P-0003', '440921189910119090', '123456', '2011-12-05 00:00:00', '群众', 'E-00006', 0, NULL, NULL, NULL, NULL); INSERT INTO "worker" ("WorkerId", "WorkerName", "WorkerBirthday", "WorkerSex", "WorkerTel", "WorkerClub", "WorkerNation", "WorkerAddress", "WorkerPosition", "CardID", "WorkerPwd", "WorkerTime", "WorkerFace", "WorkerEducation", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES ('WK012', '七月', '1989-10-11 00:00:00', 1, '13433221223', 'D-002', 'N-00001', '市区', 'P-0003', '440921189910119090', '123456', '2011-12-05 00:00:00', '群众', 'E-00006', 0, NULL, NULL, NULL, NULL); INSERT INTO "worker" ("WorkerId", "WorkerName", "WorkerBirthday", "WorkerSex", "WorkerTel", "WorkerClub", "WorkerNation", "WorkerAddress", "WorkerPosition", "CardID", "WorkerPwd", "WorkerTime", "WorkerFace", "WorkerEducation", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES ('WK013', '八月', '1979-10-11 00:00:00', 1, '13433221223', 'D-004', 'N-00001', '市区', 'P-0003', '440921189910119090', '123456', '2011-12-05 00:00:00', '群众', 'E-00006', 0, NULL, NULL, NULL, NULL); @@ -4915,138 +5057,16 @@ INSERT INTO "worker" ("WorkerId", "WorkerName", "WorkerBirthday", "WorkerSex", " INSERT INTO "worker" ("WorkerId", "WorkerName", "WorkerBirthday", "WorkerSex", "WorkerTel", "WorkerClub", "WorkerNation", "WorkerAddress", "WorkerPosition", "CardID", "WorkerPwd", "WorkerTime", "WorkerFace", "WorkerEducation", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES ('WK202102004', '潞州', '2020-11-24 22:50:37', 1, '4AEE3E28DF37EA1AF64BD636ECA59DCB', 'D-008', 'N-00007', '广东珠海', 'P-0003', '79D8861186EB60E3611CD4A5D0BCAE', '123456', '2020-11-24 22:50:37', '群众', 'E-00006', 0, NULL, NULL, NULL, NULL); INSERT INTO "worker" ("WorkerId", "WorkerName", "WorkerBirthday", "WorkerSex", "WorkerTel", "WorkerClub", "WorkerNation", "WorkerAddress", "WorkerPosition", "CardID", "WorkerPwd", "WorkerTime", "WorkerFace", "WorkerEducation", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES ('WK202102007', '江小白', '1993-07-20 00:00:00', 1, 'A89CDE93F692F546F0BEC375DC9E60FB', 'D-010', 'N-00001', '广东省茂名市信宜县', 'P-0003', '3D7640EF7C9B756E75C276FF9C8D233', '123456', '2020-11-24 22:50:37', '群众', 'E-00006', 0, 'admin', '2021-02-14', 'admin', '2021-02-14'); INSERT INTO "worker" ("WorkerId", "WorkerName", "WorkerBirthday", "WorkerSex", "WorkerTel", "WorkerClub", "WorkerNation", "WorkerAddress", "WorkerPosition", "CardID", "WorkerPwd", "WorkerTime", "WorkerFace", "WorkerEducation", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES ('WK2021040024', '赤羽业', '1999-07-20 00:00:00', 1, '15161656165', 'D-011', 'N-00001', '广东省茂名市信宜县', 'P-0003', '440921189910119090', '123456', '2020-11-24 22:50:37', '群众', 'E-00007', 0, 'admin', '2021-04-18', NULL, NULL); +INSERT INTO "worker" ("WorkerId", "WorkerName", "WorkerBirthday", "WorkerSex", "WorkerTel", "WorkerClub", "WorkerNation", "WorkerAddress", "WorkerPosition", "CardID", "WorkerPwd", "WorkerTime", "WorkerFace", "WorkerEducation", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES ('WK775', '凌峰', '1995-07-14 00:00:00', 1, '13328993360', 'D-003', 'N-00001', '广东省茂名市信宜县', 'P-0003', '440921199507149395', '123456', '2020-05-04 12:57:15', '党员', 'E-00006', 0, NULL, NULL, NULL, NULL); INSERT INTO "worker" ("WorkerId", "WorkerName", "WorkerBirthday", "WorkerSex", "WorkerTel", "WorkerClub", "WorkerNation", "WorkerAddress", "WorkerPosition", "CardID", "WorkerPwd", "WorkerTime", "WorkerFace", "WorkerEducation", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES ('WK2021040025', '冈崎朋也', '1999-07-20 00:00:00', 1, 'bEJDqDv3W/o1p69Y2JXPj5H4kCninKF0LrnVJH9plJyOZAXEOaWTolwnnM99GQSEorYGVfZNYtBqt2ohO4vKO6OrgWtBTg4Kh1KjKL6wrBEK42mghcursCod6G73fdbQITFRHMSJmhK68PQNbi/tVw0EUn4aGsxsy6THx2KsK6A=·FHHgciDFiHcHcgDiaB0(2dfb79318b734469)', 'D-010', 'N-00001', '广东省茂名市信宜县', 'P-0003', '440921189910119090', '123456', '2020-11-24 22:50:37', '群众', 'E-00003', 0, 'admin', '2021-04-18', 'admin', '2022-02-01'); INSERT INTO "worker" ("WorkerId", "WorkerName", "WorkerBirthday", "WorkerSex", "WorkerTel", "WorkerClub", "WorkerNation", "WorkerAddress", "WorkerPosition", "CardID", "WorkerPwd", "WorkerTime", "WorkerFace", "WorkerEducation", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES ('WK2021040026', '古河渚', '1996-12-15 00:00:00', 0, 'TqXplZEAJiCJ34jERPTDwnH4vcojLfOX6isZGyHe1M7ThNEiTAa7ZtHrmstzF25S5YjQR4eCbr3Gy+V8qdpQJqn7jh4Rn9vXnzneCBCP5WsvFC+wpoaILCCOpeOrgkZfBt36itg2rhV6h/FT4yrX7wAHly1WFxW1WVGawfAQEZY=·FHHgciDaFB0DgH0cciB(c2ae638db2d0dd83)', 'D-010', 'N-00001', '大阪', 'P-0003', '440921189910119090', '123456', '2020-11-24 22:50:37', '群众', 'E-00003', 0, 'admin', '2021-04-18', 'admin', '2022-02-01'); INSERT INTO "worker" ("WorkerId", "WorkerName", "WorkerBirthday", "WorkerSex", "WorkerTel", "WorkerClub", "WorkerNation", "WorkerAddress", "WorkerPosition", "CardID", "WorkerPwd", "WorkerTime", "WorkerFace", "WorkerEducation", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES ('WK2022020042', '夜莺', '1988-12-13 00:00:00', 0, 'YJmmD35b13Ojc2UJPXXntwk+xpnKSTsCqzkzJBkbsadc3skEyGqlVIJUFU4Em0tjbv0IsTJnLskVB8VjZ95YyhKRJcksmdNXHyR1PF6dvaJ8nv9FHQ93V66I06ObgVXB+/ysSOAuL7DM3Ndj5UxgiAlK2DDE1eKjNttliIq6zvg=·FHHgcaFc☆F☆a☆iga0gB(376e5910042923d5)', 'D-202200114', 'N-00009', '广东省茂名市信宜县', 'P-2021001', 'DjM0t5DO0oIckI4JlN+z9Bkosi/SV0mQllIT6U3515hzns4FSRExxunfW9BEbQoldRlKoifXFXnKz6sulj5rf0yi1lPl+plA+NQ0LA8goCiQAyfEUEBwbCOgvhPjKbptdS3R3y46v4AEy6gcaYS3A4Zrc3m/ipqD2xXchsKuBrM=·FHHgcaFc☆FDa☆c0cFH0(ee00c65e12fee5a2)', '123456', '2020-11-24 22:50:37', '群众', 'E-00005', 0, 'admin', '2022-02-01', NULL, NULL); -INSERT INTO "worker" ("WorkerId", "WorkerName", "WorkerBirthday", "WorkerSex", "WorkerTel", "WorkerClub", "WorkerNation", "WorkerAddress", "WorkerPosition", "CardID", "WorkerPwd", "WorkerTime", "WorkerFace", "WorkerEducation", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES ('WK388', '张三', '1998-06-27 00:00:00', 1, 'A+XROKGquR9JRSlRmWEIzmz/yA5BvTK8jbGUg3bAT7S3Qc3oxcsJlftz4r45JKDOoP45Ip+Mh7C0DhRLsr8z0GJ/NAdneBkOtKZk1j686EeIMueXRphpU0/hRC4m0aISGSNdn8wr5KFp7U8k/uLdJgfBAgVloy3rAPSiICK66sE=·FHHgci☆BciiHiccHaaB(fc82c054c807242a)', 'D-002', 'N-00001', '广西壮族自治区防城港市上思县', 'P-0003', '450621199806271679', '585402554', '2020-08-20 09:33:45', '群众', 'E-00005', 0, NULL, NULL, 'admin', '2022-02-01'); -INSERT INTO "worker" ("WorkerId", "WorkerName", "WorkerBirthday", "WorkerSex", "WorkerTel", "WorkerClub", "WorkerNation", "WorkerAddress", "WorkerPosition", "CardID", "WorkerPwd", "WorkerTime", "WorkerFace", "WorkerEducation", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES ('WK775', '凌峰', '1995-07-14 00:00:00', 1, '13328993360', 'D-003', 'N-00001', '广东省茂名市信宜县', 'P-0003', '440921199507149395', '123456', '2020-05-04 12:57:15', '党员', 'E-00006', 0, NULL, NULL, NULL, NULL); +INSERT INTO "worker" ("WorkerId", "WorkerName", "WorkerBirthday", "WorkerSex", "WorkerTel", "WorkerClub", "WorkerNation", "WorkerAddress", "WorkerPosition", "CardID", "WorkerPwd", "WorkerTime", "WorkerFace", "WorkerEducation", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES ('WK388', '张三', '1998-06-27 00:00:00', 1, 'A+XROKGquR9JRSlRmWEIzmz/yA5BvTK8jbGUg3bAT7S3Qc3oxcsJlftz4r45JKDOoP45Ip+Mh7C0DhRLsr8z0GJ/NAdneBkOtKZk1j686EeIMueXRphpU0/hRC4m0aISGSNdn8wr5KFp7U8k/uLdJgfBAgVloy3rAPSiICK66sE=·FHHgci☆BciiHiccHaaB(fc82c054c807242a)', 'D-002', 'N-00001', '广西壮族自治区防城港市上思县', 'P-0003', '450621199806271679', '123456', '2020-08-20 09:33:45', '群众', 'E-00005', 0, NULL, NULL, 'admin', '2022-02-01'); INSERT INTO "worker" ("WorkerId", "WorkerName", "WorkerBirthday", "WorkerSex", "WorkerTel", "WorkerClub", "WorkerNation", "WorkerAddress", "WorkerPosition", "CardID", "WorkerPwd", "WorkerTime", "WorkerFace", "WorkerEducation", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES ('Xingxue', '興學', '1999-07-20 00:00:00', 1, '15019927415', 'D-001', 'N-00001', '金湾', 'P-0003', '123121313132X3', '123456', '2020-07-05 02:18:53', '团员', 'E-00005', 0, NULL, NULL, NULL, NULL); -INSERT INTO "workercheck" ("Id", "WorkerNo", "CheckTime", "CheckWay", "CheckState", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (1, 'WK010', '2020-04-19 19:23:13', '系统界面', 0, 0, NULL, NULL, NULL, NULL); -INSERT INTO "workercheck" ("Id", "WorkerNo", "CheckTime", "CheckWay", "CheckState", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (2, 'WK010', '2020-04-21 19:25:55', '系统界面', 0, 0, NULL, NULL, NULL, NULL); -INSERT INTO "workercheck" ("Id", "WorkerNo", "CheckTime", "CheckWay", "CheckState", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (3, 'WK010', '2020-04-22 13:01:26', '系统界面', 0, 0, NULL, NULL, NULL, NULL); -INSERT INTO "workercheck" ("Id", "WorkerNo", "CheckTime", "CheckWay", "CheckState", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (4, 'WK010', '2020-04-23 15:46:18', '系统界面', 0, 0, NULL, NULL, NULL, NULL); -INSERT INTO "workercheck" ("Id", "WorkerNo", "CheckTime", "CheckWay", "CheckState", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (5, 'WK010', '2020-04-25 18:44:03', '系统界面', 0, 0, NULL, NULL, NULL, NULL); -INSERT INTO "workercheck" ("Id", "WorkerNo", "CheckTime", "CheckWay", "CheckState", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (6, 'WK010', '2020-04-26 10:33:41', '系统界面', 0, 0, NULL, NULL, NULL, NULL); -INSERT INTO "workercheck" ("Id", "WorkerNo", "CheckTime", "CheckWay", "CheckState", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (7, 'WK010', '2020-04-29 00:12:50', '系统界面', 0, 0, NULL, NULL, NULL, NULL); -INSERT INTO "workercheck" ("Id", "WorkerNo", "CheckTime", "CheckWay", "CheckState", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (8, 'WK001', '2020-04-29 12:38:12', '系统界面', 0, 0, NULL, NULL, NULL, NULL); -INSERT INTO "workercheck" ("Id", "WorkerNo", "CheckTime", "CheckWay", "CheckState", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (9, 'WK010', '2020-05-01 00:24:14', '系统界面', 0, 0, NULL, NULL, NULL, NULL); -INSERT INTO "workercheck" ("Id", "WorkerNo", "CheckTime", "CheckWay", "CheckState", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (10, 'WK010', '2020-05-02 10:54:07', '系统界面', 0, 0, NULL, NULL, NULL, NULL); -INSERT INTO "workercheck" ("Id", "WorkerNo", "CheckTime", "CheckWay", "CheckState", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (11, 'WK010', '2020-05-03 19:55:47', '系统界面', 0, 0, NULL, NULL, NULL, NULL); -INSERT INTO "workercheck" ("Id", "WorkerNo", "CheckTime", "CheckWay", "CheckState", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (12, 'WK010', '2020-05-04 12:51:47', '系统界面', 0, 0, NULL, NULL, NULL, NULL); -INSERT INTO "workercheck" ("Id", "WorkerNo", "CheckTime", "CheckWay", "CheckState", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (13, 'WK010', '2020-05-07 15:20:18', '系统界面', 0, 0, NULL, NULL, NULL, NULL); -INSERT INTO "workercheck" ("Id", "WorkerNo", "CheckTime", "CheckWay", "CheckState", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (14, 'WK010', '2020-05-08 22:06:14', '系统界面', 0, 0, NULL, NULL, NULL, NULL); -INSERT INTO "workercheck" ("Id", "WorkerNo", "CheckTime", "CheckWay", "CheckState", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (15, 'WK010', '2020-05-09 10:46:01', '系统界面', 0, 0, NULL, NULL, NULL, NULL); -INSERT INTO "workercheck" ("Id", "WorkerNo", "CheckTime", "CheckWay", "CheckState", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (16, 'WK010', '2020-05-10 21:30:52', '系统界面', 0, 0, NULL, NULL, NULL, NULL); -INSERT INTO "workercheck" ("Id", "WorkerNo", "CheckTime", "CheckWay", "CheckState", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (17, 'WK010', '2020-05-11 20:16:32', '系统界面', 0, 0, NULL, NULL, NULL, NULL); -INSERT INTO "workercheck" ("Id", "WorkerNo", "CheckTime", "CheckWay", "CheckState", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (18, 'WK010', '2020-05-12 20:58:07', '系统界面', 0, 0, NULL, NULL, NULL, NULL); -INSERT INTO "workercheck" ("Id", "WorkerNo", "CheckTime", "CheckWay", "CheckState", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (19, 'WK010', '2020-05-14 22:14:03', '系统界面', 0, 0, NULL, NULL, NULL, NULL); -INSERT INTO "workercheck" ("Id", "WorkerNo", "CheckTime", "CheckWay", "CheckState", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (20, 'WK010', '2020-05-15 17:07:43', '系统界面', 0, 0, NULL, NULL, NULL, NULL); -INSERT INTO "workercheck" ("Id", "WorkerNo", "CheckTime", "CheckWay", "CheckState", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (21, 'WK010', '2020-05-18 22:26:40', '系统界面', 0, 0, NULL, NULL, NULL, NULL); -INSERT INTO "workercheck" ("Id", "WorkerNo", "CheckTime", "CheckWay", "CheckState", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (22, 'WK010', '2020-05-19 10:49:38', '系统界面', 0, 0, NULL, NULL, NULL, NULL); -INSERT INTO "workercheck" ("Id", "WorkerNo", "CheckTime", "CheckWay", "CheckState", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (23, 'WK010', '2020-05-20 08:40:40', '系统界面', 0, 0, NULL, NULL, NULL, NULL); -INSERT INTO "workercheck" ("Id", "WorkerNo", "CheckTime", "CheckWay", "CheckState", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (24, 'WK010', '2020-05-21 14:38:13', '系统界面', 0, 0, NULL, NULL, NULL, NULL); -INSERT INTO "workercheck" ("Id", "WorkerNo", "CheckTime", "CheckWay", "CheckState", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (25, 'WK010', '2020-05-22 19:48:30', '系统界面', 0, 0, NULL, NULL, NULL, NULL); -INSERT INTO "workercheck" ("Id", "WorkerNo", "CheckTime", "CheckWay", "CheckState", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (26, 'WK010', '2020-05-24 18:35:58', '系统界面', 0, 0, NULL, NULL, NULL, NULL); -INSERT INTO "workercheck" ("Id", "WorkerNo", "CheckTime", "CheckWay", "CheckState", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (27, 'WK010', '2020-05-25 14:28:22', '系统界面', 0, 0, NULL, NULL, NULL, NULL); -INSERT INTO "workercheck" ("Id", "WorkerNo", "CheckTime", "CheckWay", "CheckState", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (28, 'WK010', '2020-05-27 23:50:39', '系统界面', 0, 0, NULL, NULL, NULL, NULL); -INSERT INTO "workercheck" ("Id", "WorkerNo", "CheckTime", "CheckWay", "CheckState", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (29, 'WK010', '2020-05-28 17:23:55', '系统界面', 0, 0, NULL, NULL, NULL, NULL); -INSERT INTO "workercheck" ("Id", "WorkerNo", "CheckTime", "CheckWay", "CheckState", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (30, 'WK010', '2020-06-02 21:20:57', '系统界面', 0, 0, NULL, NULL, NULL, NULL); -INSERT INTO "workercheck" ("Id", "WorkerNo", "CheckTime", "CheckWay", "CheckState", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (31, 'WK010', '2020-06-04 15:53:00', '系统界面', 0, 0, NULL, NULL, NULL, NULL); -INSERT INTO "workercheck" ("Id", "WorkerNo", "CheckTime", "CheckWay", "CheckState", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (32, 'WK010', '2020-06-07 22:36:06', '系统界面', 0, 0, NULL, NULL, NULL, NULL); -INSERT INTO "workercheck" ("Id", "WorkerNo", "CheckTime", "CheckWay", "CheckState", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (33, 'WK010', '2020-06-08 22:31:55', '系统界面', 0, 0, NULL, NULL, NULL, NULL); -INSERT INTO "workercheck" ("Id", "WorkerNo", "CheckTime", "CheckWay", "CheckState", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (34, 'WK010', '2020-06-12 14:41:33', '系统界面', 0, 0, NULL, NULL, NULL, NULL); -INSERT INTO "workercheck" ("Id", "WorkerNo", "CheckTime", "CheckWay", "CheckState", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (35, 'WK010', '2020-06-19 12:42:27', '系统界面', 0, 0, NULL, NULL, NULL, NULL); -INSERT INTO "workercheck" ("Id", "WorkerNo", "CheckTime", "CheckWay", "CheckState", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (36, 'WK010', '2020-06-24 17:37:10', '系统界面', 0, 0, NULL, NULL, NULL, NULL); -INSERT INTO "workercheck" ("Id", "WorkerNo", "CheckTime", "CheckWay", "CheckState", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (37, 'WK010', '2020-06-28 09:31:41', '系统界面', 0, 0, NULL, NULL, NULL, NULL); -INSERT INTO "workercheck" ("Id", "WorkerNo", "CheckTime", "CheckWay", "CheckState", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (38, 'WK010', '2020-07-01 16:31:36', '系统界面', 0, 0, NULL, NULL, NULL, NULL); -INSERT INTO "workercheck" ("Id", "WorkerNo", "CheckTime", "CheckWay", "CheckState", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (39, 'WK010', '2020-07-02 22:25:34', '系统界面', 0, 0, NULL, NULL, NULL, NULL); -INSERT INTO "workercheck" ("Id", "WorkerNo", "CheckTime", "CheckWay", "CheckState", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (40, 'WK010', '2020-07-13 14:16:26', '系统界面', 0, 0, NULL, NULL, NULL, NULL); -INSERT INTO "workercheck" ("Id", "WorkerNo", "CheckTime", "CheckWay", "CheckState", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (41, 'WK010', '2020-07-16 15:02:03', '系统界面', 0, 0, NULL, NULL, NULL, NULL); -INSERT INTO "workercheck" ("Id", "WorkerNo", "CheckTime", "CheckWay", "CheckState", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (42, 'WK010', '2020-07-24 11:29:44', '系统界面', 0, 0, NULL, NULL, NULL, NULL); -INSERT INTO "workercheck" ("Id", "WorkerNo", "CheckTime", "CheckWay", "CheckState", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (43, 'WK010', '2020-08-04 11:39:43', '系统界面', 0, 0, NULL, NULL, NULL, NULL); -INSERT INTO "workercheck" ("Id", "WorkerNo", "CheckTime", "CheckWay", "CheckState", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (44, 'WK010', '2020-08-05 16:49:44', '系统界面', 0, 0, NULL, NULL, NULL, NULL); -INSERT INTO "workercheck" ("Id", "WorkerNo", "CheckTime", "CheckWay", "CheckState", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (45, 'WK010', '2020-08-06 16:52:38', '系统界面', 0, 0, NULL, NULL, NULL, NULL); -INSERT INTO "workercheck" ("Id", "WorkerNo", "CheckTime", "CheckWay", "CheckState", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (46, 'WK010', '2020-08-07 15:35:51', '系统界面', 0, 0, NULL, NULL, NULL, NULL); -INSERT INTO "workercheck" ("Id", "WorkerNo", "CheckTime", "CheckWay", "CheckState", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (47, 'WK010', '2020-08-19 15:56:18', '系统界面', 0, 0, NULL, NULL, NULL, NULL); -INSERT INTO "workercheck" ("Id", "WorkerNo", "CheckTime", "CheckWay", "CheckState", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (48, 'WK010', '2020-08-23 17:06:06', '系统界面', 0, 0, NULL, NULL, NULL, NULL); -INSERT INTO "workercheck" ("Id", "WorkerNo", "CheckTime", "CheckWay", "CheckState", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (49, 'WK010', '2020-09-14 14:09:25', '系统界面', 0, 0, NULL, NULL, NULL, NULL); -INSERT INTO "workercheck" ("Id", "WorkerNo", "CheckTime", "CheckWay", "CheckState", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (50, 'WK010', '2020-09-16 13:02:07', '系统界面', 0, 0, NULL, NULL, NULL, NULL); -INSERT INTO "workercheck" ("Id", "WorkerNo", "CheckTime", "CheckWay", "CheckState", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (51, 'WK010', '2020-09-17 09:44:26', '系统界面', 0, 0, NULL, NULL, NULL, NULL); -INSERT INTO "workercheck" ("Id", "WorkerNo", "CheckTime", "CheckWay", "CheckState", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (52, 'WK010', '2020-11-11 14:54:59', '系统界面', 0, 0, NULL, NULL, NULL, NULL); -INSERT INTO "workercheck" ("Id", "WorkerNo", "CheckTime", "CheckWay", "CheckState", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (53, 'WK010', '2020-11-12 21:33:40', '系统界面', 0, 0, NULL, NULL, NULL, NULL); -INSERT INTO "workercheck" ("Id", "WorkerNo", "CheckTime", "CheckWay", "CheckState", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (54, 'WK010', '2020-11-13 21:00:32', '系统界面', 0, 0, NULL, NULL, NULL, NULL); -INSERT INTO "workercheck" ("Id", "WorkerNo", "CheckTime", "CheckWay", "CheckState", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (55, 'WK010', '2020-11-15 01:57:48', '系统界面', 0, 0, NULL, NULL, NULL, NULL); -INSERT INTO "workercheck" ("Id", "WorkerNo", "CheckTime", "CheckWay", "CheckState", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (56, 'WK010', '2020-11-16 18:23:56', '系统界面', 0, 0, NULL, NULL, NULL, NULL); -INSERT INTO "workercheck" ("Id", "WorkerNo", "CheckTime", "CheckWay", "CheckState", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (57, 'WK010', '2020-11-17 17:49:24', '系统界面', 0, 0, NULL, NULL, NULL, NULL); -INSERT INTO "workercheck" ("Id", "WorkerNo", "CheckTime", "CheckWay", "CheckState", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (58, 'WK010', '2020-11-30 18:25:03', '系统界面', 0, 0, NULL, NULL, NULL, NULL); -INSERT INTO "workercheck" ("Id", "WorkerNo", "CheckTime", "CheckWay", "CheckState", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (59, 'WK010', '2020-12-03 13:42:16', '系统界面', 0, 0, NULL, NULL, NULL, NULL); -INSERT INTO "workercheck" ("Id", "WorkerNo", "CheckTime", "CheckWay", "CheckState", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (60, 'WK010', '2020-12-08 21:04:52', '系统界面', 0, 0, NULL, NULL, NULL, NULL); -INSERT INTO "workercheck" ("Id", "WorkerNo", "CheckTime", "CheckWay", "CheckState", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (61, 'WK010', '2020-12-09 23:21:38', '系统界面', 0, 0, NULL, NULL, NULL, NULL); -INSERT INTO "workercheck" ("Id", "WorkerNo", "CheckTime", "CheckWay", "CheckState", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (62, 'WK010', '2020-12-10 02:46:46', '系统界面', 0, 0, NULL, NULL, NULL, NULL); -INSERT INTO "workercheck" ("Id", "WorkerNo", "CheckTime", "CheckWay", "CheckState", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (63, 'WK010', '2020-12-13 18:18:29', '系统界面', 0, 0, NULL, NULL, NULL, NULL); -INSERT INTO "workercheck" ("Id", "WorkerNo", "CheckTime", "CheckWay", "CheckState", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (64, 'WK010', '2020-12-23 23:01:06', '系统界面', 0, 0, NULL, NULL, NULL, NULL); -INSERT INTO "workercheck" ("Id", "WorkerNo", "CheckTime", "CheckWay", "CheckState", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (65, 'WK010', '2020-12-25 21:05:35', '系统界面', 0, 0, NULL, NULL, NULL, NULL); -INSERT INTO "workercheck" ("Id", "WorkerNo", "CheckTime", "CheckWay", "CheckState", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (66, 'WK010', '2021-01-17 22:35:44', '系统界面', 0, 0, NULL, NULL, NULL, NULL); -INSERT INTO "workercheck" ("Id", "WorkerNo", "CheckTime", "CheckWay", "CheckState", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (67, 'WK010', '2021-01-24 17:29:39', '系统界面', 0, 0, NULL, NULL, NULL, NULL); -INSERT INTO "workercheck" ("Id", "WorkerNo", "CheckTime", "CheckWay", "CheckState", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (68, 'WK010', '2021-01-30 14:44:52', '系统界面', 0, 0, NULL, NULL, NULL, NULL); -INSERT INTO "workercheck" ("Id", "WorkerNo", "CheckTime", "CheckWay", "CheckState", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (69, 'WK002', '2021-02-10 14:00:55', '系统界面', 0, 0, 'WK002', '2021-02-10', NULL, NULL); -INSERT INTO "workercheck" ("Id", "WorkerNo", "CheckTime", "CheckWay", "CheckState", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (70, 'WK010', '2021-02-11 21:56:49', '系统界面', 0, 0, NULL, '0001-01-01', NULL, '0001-01-01'); -INSERT INTO "workercheck" ("Id", "WorkerNo", "CheckTime", "CheckWay", "CheckState", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (71, 'WK010', '2021-02-15 20:48:43', '系统界面', 0, 0, 'WK010', '2021-02-15', NULL, '0001-01-01'); -INSERT INTO "workercheck" ("Id", "WorkerNo", "CheckTime", "CheckWay", "CheckState", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (72, 'WK010', '2021-02-16 13:05:50', '系统界面', 0, 0, 'WK010', '2021-02-16', NULL, '0001-01-01'); -INSERT INTO "workercheck" ("Id", "WorkerNo", "CheckTime", "CheckWay", "CheckState", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (73, 'WK010', '2021-02-17 20:22:18', '系统界面', 0, 0, 'WK010', '2021-02-17', NULL, '0001-01-01'); -INSERT INTO "workercheck" ("Id", "WorkerNo", "CheckTime", "CheckWay", "CheckState", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (74, 'WK010', '2021-02-18 09:55:49', '系统界面', 0, 0, 'WK010', '2021-02-18', NULL, '0001-01-01'); -INSERT INTO "workercheck" ("Id", "WorkerNo", "CheckTime", "CheckWay", "CheckState", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (75, 'WK010', '2021-02-19 09:11:43', '系统界面', 0, 0, 'WK010', '2021-02-19', NULL, '0001-01-01'); -INSERT INTO "workercheck" ("Id", "WorkerNo", "CheckTime", "CheckWay", "CheckState", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (76, 'WK010', '2021-02-20 20:25:39', '系统界面', 0, 0, 'WK010', '2021-02-20', NULL, '0001-01-01'); -INSERT INTO "workercheck" ("Id", "WorkerNo", "CheckTime", "CheckWay", "CheckState", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (77, 'WK010', '2021-02-28 13:21:46', '系统界面', 0, 0, 'WK010', '2021-02-28', NULL, '0001-01-01'); -INSERT INTO "workercheck" ("Id", "WorkerNo", "CheckTime", "CheckWay", "CheckState", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (78, 'WK010', '2021-03-01 23:06:40', '系统界面', 0, 0, 'WK010', '2021-03-01', NULL, '0001-01-01'); -INSERT INTO "workercheck" ("Id", "WorkerNo", "CheckTime", "CheckWay", "CheckState", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (79, 'WK010', '2021-03-08 20:09:02', '系统界面', 0, 0, 'WK010', '2021-03-08', NULL, '0001-01-01'); -INSERT INTO "workercheck" ("Id", "WorkerNo", "CheckTime", "CheckWay", "CheckState", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (80, 'WK010', '2021-03-20 18:57:04', '系统界面', 0, 0, 'WK010', '2021-03-20', NULL, '0001-01-01'); -INSERT INTO "workercheck" ("Id", "WorkerNo", "CheckTime", "CheckWay", "CheckState", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (81, 'WK010', '2021-03-21 20:27:37', '系统界面', 0, 0, 'WK010', '2021-03-21', NULL, '0001-01-01'); -INSERT INTO "workercheck" ("Id", "WorkerNo", "CheckTime", "CheckWay", "CheckState", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (82, 'WK010', '2021-03-24 22:54:52', '系统界面', 0, 0, 'WK010', '2021-03-24', NULL, '0001-01-01'); -INSERT INTO "workercheck" ("Id", "WorkerNo", "CheckTime", "CheckWay", "CheckState", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (83, 'WK010', '2021-04-06 14:12:15', '系统界面', 0, 0, 'WK010', '2021-04-06', NULL, '0001-01-01'); -INSERT INTO "workercheck" ("Id", "WorkerNo", "CheckTime", "CheckWay", "CheckState", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (84, 'WK010', '2021-04-10 14:53:33', '系统界面', 0, 0, 'WK010', '2021-04-10', NULL, '0001-01-01'); -INSERT INTO "workercheck" ("Id", "WorkerNo", "CheckTime", "CheckWay", "CheckState", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (85, 'WK010', '2021-04-13 17:28:48', '系统界面', 0, 0, 'WK010', '2021-04-13', NULL, '0001-01-01'); -INSERT INTO "workercheck" ("Id", "WorkerNo", "CheckTime", "CheckWay", "CheckState", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (86, 'WK010', '2021-04-14 21:45:47', '系统界面', 0, 0, 'WK010', '2021-04-14', NULL, '0001-01-01'); -INSERT INTO "workercheck" ("Id", "WorkerNo", "CheckTime", "CheckWay", "CheckState", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (87, 'WK010', '2021-04-15 17:18:15', '系统界面', 0, 0, 'WK010', '2021-04-15', NULL, '0001-01-01'); -INSERT INTO "workercheck" ("Id", "WorkerNo", "CheckTime", "CheckWay", "CheckState", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (88, 'WK010', '2021-04-17 16:22:00', '系统界面', 0, 0, 'WK010', '2021-04-17', NULL, '0001-01-01'); -INSERT INTO "workercheck" ("Id", "WorkerNo", "CheckTime", "CheckWay", "CheckState", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (89, 'WK010', '2021-04-18 12:54:10', '系统界面', 0, 0, 'WK010', '2021-04-18', NULL, '0001-01-01'); -INSERT INTO "workercheck" ("Id", "WorkerNo", "CheckTime", "CheckWay", "CheckState", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (90, 'WK2021040026', '2021-04-18 14:16:09', '系统界面', 0, 0, 'WK2021040026', '2021-04-18', NULL, '0001-01-01'); -INSERT INTO "workercheck" ("Id", "WorkerNo", "CheckTime", "CheckWay", "CheckState", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (91, 'WK2021040024', '2021-04-18 15:09:45', '系统界面', 0, 0, 'WK2021040024', '2021-04-18', NULL, '0001-01-01'); -INSERT INTO "workercheck" ("Id", "WorkerNo", "CheckTime", "CheckWay", "CheckState", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (92, 'WK010', '2021-04-22 21:59:01', '系统界面', 0, 0, 'WK010', '2021-04-22', NULL, '0001-01-01'); -INSERT INTO "workercheck" ("Id", "WorkerNo", "CheckTime", "CheckWay", "CheckState", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (93, 'WK010', '2021-04-29 21:13:05', '系统界面', 0, 0, 'WK010', '2021-04-29', NULL, '0001-01-01'); -INSERT INTO "workercheck" ("Id", "WorkerNo", "CheckTime", "CheckWay", "CheckState", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (94, 'WK010', '2021-05-05 13:28:55', '系统界面', 0, 0, 'WK010', '2021-05-05', NULL, '0001-01-01'); -INSERT INTO "workercheck" ("Id", "WorkerNo", "CheckTime", "CheckWay", "CheckState", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (95, 'WK009', '2021-05-05 13:45:18', '系统界面', 0, 0, 'WK009', '2021-05-05', NULL, '0001-01-01'); -INSERT INTO "workercheck" ("Id", "WorkerNo", "CheckTime", "CheckWay", "CheckState", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (96, 'WK010', '2021-05-10 21:06:13', '系统界面', 0, 0, 'WK010', '2021-05-10', NULL, '0001-01-01'); -INSERT INTO "workercheck" ("Id", "WorkerNo", "CheckTime", "CheckWay", "CheckState", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (97, 'WK010', '2021-05-13 21:21:03', '系统界面', 0, 0, 'WK010', '2021-05-13', NULL, '0001-01-01'); -INSERT INTO "workercheck" ("Id", "WorkerNo", "CheckTime", "CheckWay", "CheckState", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (98, 'WK010', '2021-05-21 23:43:11', '系统界面', 0, 0, 'WK010', '2021-05-21', NULL, '0001-01-01'); -INSERT INTO "workercheck" ("Id", "WorkerNo", "CheckTime", "CheckWay", "CheckState", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (99, 'WK010', '2021-05-22 14:57:01', '系统界面', 0, 0, 'WK010', '2021-05-22', NULL, '0001-01-01'); -INSERT INTO "workercheck" ("Id", "WorkerNo", "CheckTime", "CheckWay", "CheckState", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (100, 'WK010', '2021-05-23 11:02:24', '系统界面', 0, 0, 'WK010', '2021-05-23', NULL, '0001-01-01'); -INSERT INTO "workercheck" ("Id", "WorkerNo", "CheckTime", "CheckWay", "CheckState", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (101, 'WK010', '2021-05-29 23:17:34', '系统界面', 0, 0, 'WK010', '2021-05-29', NULL, '0001-01-01'); -INSERT INTO "workercheck" ("Id", "WorkerNo", "CheckTime", "CheckWay", "CheckState", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (102, 'WK009', '2021-05-29 23:25:16', '系统界面', 0, 0, 'WK009', '2021-05-29', NULL, '0001-01-01'); -INSERT INTO "workercheck" ("Id", "WorkerNo", "CheckTime", "CheckWay", "CheckState", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (103, 'WK010', '2021-06-04 19:37:48', '系统界面', 0, 0, 'WK010', '2021-06-04', NULL, '0001-01-01'); -INSERT INTO "workercheck" ("Id", "WorkerNo", "CheckTime", "CheckWay", "CheckState", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (104, 'WK010', '2021-06-13 16:10:15', '系统界面', 0, 0, 'WK010', '2021-06-13', NULL, '0001-01-01'); -INSERT INTO "workercheck" ("Id", "WorkerNo", "CheckTime", "CheckWay", "CheckState", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (105, 'WK010', '2021-06-23 12:13:51', '系统界面', 0, 0, 'WK010', '2021-06-23', NULL, '0001-01-01'); -INSERT INTO "workercheck" ("Id", "WorkerNo", "CheckTime", "CheckWay", "CheckState", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (106, 'WK010', '2021-07-16 22:01:51', '系统界面', 0, 0, 'WK010', '2021-07-16', NULL, '0001-01-01'); -INSERT INTO "workercheck" ("Id", "WorkerNo", "CheckTime", "CheckWay", "CheckState", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (107, 'WK010', '2021-07-19 19:39:30', '系统界面', 0, 0, 'WK010', '2021-07-19', NULL, '0001-01-01'); -INSERT INTO "workercheck" ("Id", "WorkerNo", "CheckTime", "CheckWay", "CheckState", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (113, 'WK010', '2021-07-26 11:19:25', '系统界面', 0, 0, NULL, '0001-01-01', NULL, '0001-01-01'); -INSERT INTO "workercheck" ("Id", "WorkerNo", "CheckTime", "CheckWay", "CheckState", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (114, 'WK010', '2021-07-26 11:21:26', '系统界面2333333333333333', 0, 0, NULL, '0001-01-01', NULL, '0001-01-01'); -INSERT INTO "workercheck" ("Id", "WorkerNo", "CheckTime", "CheckWay", "CheckState", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (115, 'WK010', '2021-07-26 11:22:01', '系统界面2333333333333333', 0, 0, NULL, '0001-01-01', NULL, '0001-01-01'); -INSERT INTO "workercheck" ("Id", "WorkerNo", "CheckTime", "CheckWay", "CheckState", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (116, 'WK010', '0001-01-01 00:00:00', '系统界面2333333333333333', 0, 0, NULL, '0001-01-01', NULL, '0001-01-01'); -INSERT INTO "workercheck" ("Id", "WorkerNo", "CheckTime", "CheckWay", "CheckState", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (117, 'WK010', '2021-07-26 11:47:18', '系统界面2333333333333333', 0, 0, NULL, '0001-01-01', NULL, '0001-01-01'); -INSERT INTO "workercheck" ("Id", "WorkerNo", "CheckTime", "CheckWay", "CheckState", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (118, 'WK010', '2021-07-26 19:52:25', '系统界面2333333333333333', 0, 0, NULL, '0001-01-01', NULL, '0001-01-01'); -INSERT INTO "workercheck" ("Id", "WorkerNo", "CheckTime", "CheckWay", "CheckState", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (119, 'WK010', '2021-07-27 20:32:46', '系统界面', 0, 0, 'WK010', '2021-07-27', NULL, '0001-01-01'); -INSERT INTO "workercheck" ("Id", "WorkerNo", "CheckTime", "CheckWay", "CheckState", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (120, 'WK010', '2021-08-01 15:53:21', '系统界面', 0, 0, 'WK010', '2021-08-01', NULL, '0001-01-01'); -INSERT INTO "workercheck" ("Id", "WorkerNo", "CheckTime", "CheckWay", "CheckState", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (121, 'WK010', '2021-10-07 14:55:58', '系统界面', 0, 0, 'WK010', '2021-10-07', NULL, '0001-01-01'); -INSERT INTO "workercheck" ("Id", "WorkerNo", "CheckTime", "CheckWay", "CheckState", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (122, 'WK010', '2021-10-20 22:47:32', '系统界面', 0, 0, 'WK010', '2021-10-20', NULL, '0001-01-01'); -INSERT INTO "workercheck" ("Id", "WorkerNo", "CheckTime", "CheckWay", "CheckState", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (123, 'WK010', '2021-11-12 17:24:22', '系统界面', 0, 0, 'WK010', '2021-11-12', NULL, '0001-01-01'); -INSERT INTO "workercheck" ("Id", "WorkerNo", "CheckTime", "CheckWay", "CheckState", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (124, 'WK010', '2021-12-15 10:13:09', '系统界面', 0, 0, 'WK010', '2021-12-15', NULL, '0001-01-01'); -INSERT INTO "workercheck" ("Id", "WorkerNo", "CheckTime", "CheckWay", "CheckState", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (125, 'WK010', '2021-12-28 22:07:05', '系统界面', 0, 0, 'WK010', '2021-12-28', NULL, '0001-01-01'); -INSERT INTO "workercheck" ("Id", "WorkerNo", "CheckTime", "CheckWay", "CheckState", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (126, 'WK010', '2022-01-30 23:29:39', '系统界面', 0, 0, 'WK010', '2022-01-30', NULL, '0001-01-01'); -INSERT INTO "workercheck" ("Id", "WorkerNo", "CheckTime", "CheckWay", "CheckState", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (127, 'WK010', '2022-01-31 00:11:38', '系统界面', 0, 0, 'WK010', '2022-01-31', NULL, '0001-01-01'); -INSERT INTO "workercheck" ("Id", "WorkerNo", "CheckTime", "CheckWay", "CheckState", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (128, 'WK010', '2022-02-01 20:15:31', '系统界面', 0, 0, 'WK010', '2022-02-01', NULL, '0001-01-01'); -INSERT INTO "workercheck" ("Id", "WorkerNo", "CheckTime", "CheckWay", "CheckState", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (129, 'WK010', '2022-02-02 12:06:12', '系统界面', 0, 0, 'WK010', '2022-02-02', NULL, '0001-01-01'); -INSERT INTO "workercheck" ("Id", "WorkerNo", "CheckTime", "CheckWay", "CheckState", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (130, 'WK001', '2022-02-06 00:33:58', '系统界面', 0, 0, 'WK001', '2022-02-06', NULL, '0001-01-01'); -INSERT INTO "workercheck" ("Id", "WorkerNo", "CheckTime", "CheckWay", "CheckState", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (131, 'WK010', '2022-02-07 12:46:35', '系统界面', 0, 0, 'WK010', '2022-02-07', NULL, '0001-01-01'); +INSERT INTO "workercheck" ("Id", "WorkerNo", "CheckTime", "CheckWay", "CheckState", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (66, 'WK010', '2022-02-21 20:31:19', '系统界面', 0, 0, 'WK010', '2022-02-21', NULL, '0001-01-01'); +INSERT INTO "workercheck" ("Id", "WorkerNo", "CheckTime", "CheckWay", "CheckState", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (72, 'WK010', '2022-02-22 23:16:46', '系统界面', 0, 0, 'WK010', '2022-02-22', NULL, '0001-01-01'); +INSERT INTO "workercheck" ("Id", "WorkerNo", "CheckTime", "CheckWay", "CheckState", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (75, 'WK010', '2022-02-25 22:13:30', '系统界面', 0, 0, 'WK010', '2022-02-25', NULL, '0001-01-01'); +INSERT INTO "workercheck" ("Id", "WorkerNo", "CheckTime", "CheckWay", "CheckState", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (86, 'WK010', '2022-02-26 12:28:59', '系统界面', 0, 0, 'WK010', '2022-02-26', NULL, '0001-01-01'); INSERT INTO "workergoodbad" ("Id", "WorkNo", "GBInfo", "GBType", "GBOperation", "GBTime", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (1, 'WK008', '牛逼就完事了！', 0, '杨俊杰', '2020-04-21 21:02:30', 0, NULL, NULL, NULL, NULL); INSERT INTO "workergoodbad" ("Id", "WorkNo", "GBInfo", "GBType", "GBOperation", "GBTime", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (2, 'WK775', '被评为优秀的“五四”行业青年', 0, '杨俊杰', '2020-05-04 13:01:17', 0, NULL, NULL, NULL, NULL); INSERT INTO "workergoodbad" ("Id", "WorkNo", "GBInfo", "GBType", "GBOperation", "GBTime", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (3, 'WK010', '测试', 1, 'admin', '2020-11-24 22:50:37', 0, 'admin', '2021-02-15', NULL, '0001-01-01'); @@ -5072,56 +5092,5 @@ INSERT INTO "workerpic" ("Id", "WorkerId", "Pic") VALUES (4, 'WK2021040024', 'ca INSERT INTO "workerpic" ("Id", "WorkerId", "Pic") VALUES (8, 'WK010', 'c5691e6c-ef99-486a-b127-4340cb7d3e7f.jpg'); INSERT INTO "workerpic" ("Id", "WorkerId", "Pic") VALUES (9, 'WK001', 'fb4bc453-29b8-495f-82d1-36e02f10e3d0.png'); INSERT INTO "workerpic" ("Id", "WorkerId", "Pic") VALUES (10, 'WK002', '36caf9bd-f3db-4d8b-834d-cf6c39581de3.png'); -INSERT INTO "wtinfo" ("WtiNo", "RoomNo", "UseDate", "EndDate", "WaterUse", "PowerUse", "Record", "CustoNo", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (1, 'BD001', '2018-12-11 09:48:00', '2018-12-11 10:08:29', '3.00', '3.00', 'admin', 'TS8888', 0, NULL, NULL, NULL, NULL); -INSERT INTO "wtinfo" ("WtiNo", "RoomNo", "UseDate", "EndDate", "WaterUse", "PowerUse", "Record", "CustoNo", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (2, 'ZT006', '2018-12-27 11:44:01', '2018-12-27 11:44:01', '0.16', '3.00', 'admin', 'TS8888', 0, NULL, NULL, NULL, NULL); -INSERT INTO "wtinfo" ("WtiNo", "RoomNo", "UseDate", "EndDate", "WaterUse", "PowerUse", "Record", "CustoNo", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (3, 'BD003', '2018-12-06 00:00:00', '2018-12-11 07:27:57', '0.80', '15.00', 'admin', 'TS6666', 0, NULL, NULL, NULL, NULL); -INSERT INTO "wtinfo" ("WtiNo", "RoomNo", "UseDate", "EndDate", "WaterUse", "PowerUse", "Record", "CustoNo", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (4, 'HD002', '2018-11-29 00:00:00', '2018-12-11 07:40:07', '1.92', '36.00', 'admin', 'TS1003', 0, NULL, NULL, NULL, NULL); -INSERT INTO "wtinfo" ("WtiNo", "RoomNo", "UseDate", "EndDate", "WaterUse", "PowerUse", "Record", "CustoNo", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (5, 'BD005', '2018-12-06 00:00:00', '2018-12-11 07:43:28', '0.80', '15.00', 'admin', 'TS1002', 0, NULL, NULL, 'admin', '2022-01-31'); -INSERT INTO "wtinfo" ("WtiNo", "RoomNo", "UseDate", "EndDate", "WaterUse", "PowerUse", "Record", "CustoNo", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (6, 'HS005', '2018-11-29 00:00:00', '2018-12-11 07:45:00', '1.92', '36.00', 'admin', 'TS1032', 0, NULL, NULL, NULL, NULL); -INSERT INTO "wtinfo" ("WtiNo", "RoomNo", "UseDate", "EndDate", "WaterUse", "PowerUse", "Record", "CustoNo", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (7, 'BD001', '2018-12-20 19:59:10', '2018-12-21 00:31:00', '0.16', '3.00', 'admin', 'TS1862', 0, NULL, NULL, NULL, NULL); -INSERT INTO "wtinfo" ("WtiNo", "RoomNo", "UseDate", "EndDate", "WaterUse", "PowerUse", "Record", "CustoNo", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (8, 'BS001', '2018-12-27 20:46:42', '2018-12-27 20:46:42', '0.00', '0.00', 'admin', 'TS1003', 0, NULL, NULL, NULL, NULL); -INSERT INTO "wtinfo" ("WtiNo", "RoomNo", "UseDate", "EndDate", "WaterUse", "PowerUse", "Record", "CustoNo", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (9, 'HD001', '2018-12-26 09:55:37', '2020-02-28 17:08:35', '68.64', '1287.00', 'admin', 'TS1862', 0, NULL, NULL, NULL, NULL); -INSERT INTO "wtinfo" ("WtiNo", "RoomNo", "UseDate", "EndDate", "WaterUse", "PowerUse", "Record", "CustoNo", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (10, 'ZT001', '2019-10-28 21:13:40', '2020-03-14 23:20:57', '22.08', '414.00', 'admin', 'TS1457', 0, NULL, NULL, NULL, NULL); -INSERT INTO "wtinfo" ("WtiNo", "RoomNo", "UseDate", "EndDate", "WaterUse", "PowerUse", "Record", "CustoNo", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (11, 'QL001', '2018-12-26 09:51:10', '2018-12-26 09:51:10', '0.16', '3.00', 'admin', 'TS1395', 0, NULL, NULL, NULL, NULL); -INSERT INTO "wtinfo" ("WtiNo", "RoomNo", "UseDate", "EndDate", "WaterUse", "PowerUse", "Record", "CustoNo", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (12, 'BS004', '2018-12-26 20:11:18', '2018-12-26 20:11:18', '12.00', '25.00', 'admin', 'TS1251', 0, NULL, NULL, 'admin', '2022-01-31'); -INSERT INTO "wtinfo" ("WtiNo", "RoomNo", "UseDate", "EndDate", "WaterUse", "PowerUse", "Record", "CustoNo", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (13, 'BS003', '2018-12-26 18:52:53', '2020-04-06 19:58:52', '74.72', '1401.00', 'admin', 'TS1084', 0, NULL, NULL, NULL, NULL); -INSERT INTO "wtinfo" ("WtiNo", "RoomNo", "UseDate", "EndDate", "WaterUse", "PowerUse", "Record", "CustoNo", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (14, 'BS002', '2018-12-26 18:52:37', '2020-04-06 20:24:26', '74.70', '1401.00', 'admin', 'TS1074', 0, NULL, NULL, NULL, NULL); -INSERT INTO "wtinfo" ("WtiNo", "RoomNo", "UseDate", "EndDate", "WaterUse", "PowerUse", "Record", "CustoNo", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (15, 'HD002', '2018-12-27 17:32:26', '2020-04-06 20:25:04', '74.56', '1398.00', 'admin', 'TS1634', 0, NULL, NULL, NULL, NULL); -INSERT INTO "wtinfo" ("WtiNo", "RoomNo", "UseDate", "EndDate", "WaterUse", "PowerUse", "Record", "CustoNo", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (16, 'HD003', '2018-12-26 20:06:12', '2020-04-06 20:25:22', '74.72', '1401.00', 'admin', 'TS1765', 0, NULL, NULL, NULL, NULL); -INSERT INTO "wtinfo" ("WtiNo", "RoomNo", "UseDate", "EndDate", "WaterUse", "PowerUse", "Record", "CustoNo", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (17, 'BD002', '2018-12-27 20:26:49', '2020-04-07 00:23:43', '74.72', '1401.00', 'admin', 'TS1001', 0, NULL, NULL, NULL, NULL); -INSERT INTO "wtinfo" ("WtiNo", "RoomNo", "UseDate", "EndDate", "WaterUse", "PowerUse", "Record", "CustoNo", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (18, 'BS005', '2020-04-07 14:34:21', '2020-04-07 14:37:17', '0.00', '0.00', 'admin', 'TS1081', 0, NULL, NULL, NULL, NULL); -INSERT INTO "wtinfo" ("WtiNo", "RoomNo", "UseDate", "EndDate", "WaterUse", "PowerUse", "Record", "CustoNo", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (19, 'BS009', '2020-04-08 12:49:19', '2020-04-09 14:39:53', '0.16', '3.00', 'admin', 'TS6666', 0, NULL, NULL, NULL, NULL); -INSERT INTO "wtinfo" ("WtiNo", "RoomNo", "UseDate", "EndDate", "WaterUse", "PowerUse", "Record", "CustoNo", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (20, 'BD003', '2020-04-06 18:14:17', '2020-04-14 16:46:08', '1.28', '24.00', 'admin', 'TS1779', 0, NULL, NULL, NULL, NULL); -INSERT INTO "wtinfo" ("WtiNo", "RoomNo", "UseDate", "EndDate", "WaterUse", "PowerUse", "Record", "CustoNo", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (21, 'BD001', '2020-04-23 16:35:48', '2020-04-23 16:35:48', '0.48', '9.00', 'admin', 'TS1032', 0, NULL, NULL, NULL, NULL); -INSERT INTO "wtinfo" ("WtiNo", "RoomNo", "UseDate", "EndDate", "WaterUse", "PowerUse", "Record", "CustoNo", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (22, 'ZT002', '2020-04-23 20:53:29', '2020-04-23 20:53:29', '2.56', '48.00', 'admin', 'TS1364', 0, NULL, NULL, NULL, NULL); -INSERT INTO "wtinfo" ("WtiNo", "RoomNo", "UseDate", "EndDate", "WaterUse", "PowerUse", "Record", "CustoNo", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (23, 'BD001', '2020-04-25 20:19:57', '2020-04-26 19:06:06', '0.16', '3.00', 'admin', 'TS1336', 0, NULL, NULL, NULL, NULL); -INSERT INTO "wtinfo" ("WtiNo", "RoomNo", "UseDate", "EndDate", "WaterUse", "PowerUse", "Record", "CustoNo", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (24, 'BD004', '2020-04-29 12:39:21', '2020-05-04 13:04:09', '0.80', '15.00', 'admin', 'TS1480', 0, NULL, NULL, NULL, NULL); -INSERT INTO "wtinfo" ("WtiNo", "RoomNo", "UseDate", "EndDate", "WaterUse", "PowerUse", "Record", "CustoNo", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (25, 'BD006', '2020-04-26 10:36:51', '2020-05-04 13:07:25', '1.28', '24.00', 'admin', 'TS1032', 0, NULL, NULL, NULL, NULL); -INSERT INTO "wtinfo" ("WtiNo", "RoomNo", "UseDate", "EndDate", "WaterUse", "PowerUse", "Record", "CustoNo", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (26, 'BD001', '2020-05-07 15:16:55', '2020-05-25 15:29:10', '2.88', '54.00', 'admin', 'TS1239', 0, NULL, NULL, NULL, NULL); -INSERT INTO "wtinfo" ("WtiNo", "RoomNo", "UseDate", "EndDate", "WaterUse", "PowerUse", "Record", "CustoNo", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (27, 'BD010', '2020-05-04 13:12:36', '2020-05-26 15:24:43', '6.40', '120.00', 'admin', 'TS1043', 0, NULL, NULL, NULL, NULL); -INSERT INTO "wtinfo" ("WtiNo", "RoomNo", "UseDate", "EndDate", "WaterUse", "PowerUse", "Record", "CustoNo", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (28, 'HD003', '2020-04-26 10:36:24', '2020-05-27 08:31:14', '4.96', '93.00', 'admin', 'TS1001', 0, NULL, NULL, NULL, NULL); -INSERT INTO "wtinfo" ("WtiNo", "RoomNo", "UseDate", "EndDate", "WaterUse", "PowerUse", "Record", "CustoNo", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (29, 'ZT006', '2020-05-04 13:12:36', '2020-05-27 08:31:36', '3.68', '69.00', 'admin', 'TS1074', 0, NULL, NULL, NULL, NULL); -INSERT INTO "wtinfo" ("WtiNo", "RoomNo", "UseDate", "EndDate", "WaterUse", "PowerUse", "Record", "CustoNo", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (30, 'ZT005', '2020-03-03 19:59:44', '2020-05-27 08:31:56', '13.60', '255.00', 'admin', 'TS1005', 0, NULL, NULL, NULL, NULL); -INSERT INTO "wtinfo" ("WtiNo", "RoomNo", "UseDate", "EndDate", "WaterUse", "PowerUse", "Record", "CustoNo", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (31, 'BS007', '2020-04-05 13:12:36', '2020-05-27 08:32:04', '8.32', '156.00', 'admin', 'TS1003', 0, NULL, NULL, NULL, NULL); -INSERT INTO "wtinfo" ("WtiNo", "RoomNo", "UseDate", "EndDate", "WaterUse", "PowerUse", "Record", "CustoNo", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (32, 'BD007', '2020-04-05 13:12:36', '2020-05-27 08:32:13', '8.32', '156.00', 'admin', 'TS1002', 0, NULL, NULL, NULL, NULL); -INSERT INTO "wtinfo" ("WtiNo", "RoomNo", "UseDate", "EndDate", "WaterUse", "PowerUse", "Record", "CustoNo", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (33, 'BD003', '2020-05-27 11:19:21', '2020-05-27 11:20:00', '0.00', '0.00', 'admin', 'TS1310', 0, NULL, NULL, NULL, NULL); -INSERT INTO "wtinfo" ("WtiNo", "RoomNo", "UseDate", "EndDate", "WaterUse", "PowerUse", "Record", "CustoNo", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (34, 'BD001', '2020-08-04 11:45:36', '2020-08-18 17:31:12', '12.32', '231.00', 'admin', 'TS1365', 0, NULL, NULL, NULL, NULL); -INSERT INTO "wtinfo" ("WtiNo", "RoomNo", "UseDate", "EndDate", "WaterUse", "PowerUse", "Record", "CustoNo", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (35, 'QL003', '2021-01-30 00:00:00', '2021-02-12 15:13:23', '1.92', '36.00', 'admin', 'TS1290', 0, NULL, '0001-01-01', NULL, '0001-01-01'); -INSERT INTO "wtinfo" ("WtiNo", "RoomNo", "UseDate", "EndDate", "WaterUse", "PowerUse", "Record", "CustoNo", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (36, 'BD004', '2021-01-17 00:00:00', '2021-04-13 22:23:36', '13.60', '255.00', 'admin', 'TS1816', 0, NULL, '0001-01-01', NULL, '0001-01-01'); -INSERT INTO "wtinfo" ("WtiNo", "RoomNo", "UseDate", "EndDate", "WaterUse", "PowerUse", "Record", "CustoNo", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (37, 'BD001', '2021-02-11 00:00:00', '2021-04-17 16:11:00', '10.24', '192.00', 'admin', 'TS1074', 0, NULL, '0001-01-01', NULL, '0001-01-01'); -INSERT INTO "wtinfo" ("WtiNo", "RoomNo", "UseDate", "EndDate", "WaterUse", "PowerUse", "Record", "CustoNo", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (39, 'BD006', '2021-02-09 00:00:00', '2021-05-14 22:50:53', '15.04', '282.00', 'admin', 'TS1347', 0, NULL, '0001-01-01', NULL, '0001-01-01'); -INSERT INTO "wtinfo" ("WtiNo", "RoomNo", "UseDate", "EndDate", "WaterUse", "PowerUse", "Record", "CustoNo", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (40, 'BD002', '2021-04-17 00:00:00', '2021-05-28 08:52:18', '7.40', '120.00', 'admin', 'TS-20210035', 0, NULL, '0001-01-01', NULL, '0001-01-01'); -INSERT INTO "wtinfo" ("WtiNo", "RoomNo", "UseDate", "EndDate", "WaterUse", "PowerUse", "Record", "CustoNo", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (41, 'BS004', '2021-05-29 00:00:00', '2021-07-17 17:46:28', '7.68', '144.00', 'admin', 'TS1364', 0, NULL, '0001-01-01', NULL, '0001-01-01'); -INSERT INTO "wtinfo" ("WtiNo", "RoomNo", "UseDate", "EndDate", "WaterUse", "PowerUse", "Record", "CustoNo", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (42, 'BD003', '2021-05-13 00:00:00', '2021-10-20 22:47:43', '25.60', '480.00', 'admin', 'TS-20210067', 0, NULL, '0001-01-01', NULL, '0001-01-01'); -INSERT INTO "wtinfo" ("WtiNo", "RoomNo", "UseDate", "EndDate", "WaterUse", "PowerUse", "Record", "CustoNo", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (43, 'BD005', '2021-05-14 00:00:00', '2022-01-30 23:25:47', '41.76', '783.00', 'admin', 'TS-20210068', 0, NULL, '0001-01-01', NULL, '0001-01-01'); -INSERT INTO "wtinfo" ("WtiNo", "RoomNo", "UseDate", "EndDate", "WaterUse", "PowerUse", "Record", "CustoNo", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (44, 'BD008', '2021-02-12 00:00:00', '2022-01-30 23:26:06', '56.32', '1056.00', 'admin', 'TS1812', 0, NULL, '0001-01-01', NULL, '0001-01-01'); -INSERT INTO "wtinfo" ("WtiNo", "RoomNo", "UseDate", "EndDate", "WaterUse", "PowerUse", "Record", "CustoNo", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (45, 'BD010', '2020-12-01 00:00:00', '2022-01-30 23:26:27', '68.00', '1275.00', 'admin', 'TS1143', 0, NULL, '0001-01-01', NULL, '0001-01-01'); -INSERT INTO "wtinfo" ("WtiNo", "RoomNo", "UseDate", "EndDate", "WaterUse", "PowerUse", "Record", "CustoNo", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (46, 'BD011', '2021-07-17 00:00:00', '2022-01-30 23:26:49', '31.52', '591.00', 'admin', 'TS1634', 0, NULL, '0001-01-01', NULL, '0001-01-01'); -INSERT INTO "wtinfo" ("WtiNo", "RoomNo", "UseDate", "EndDate", "WaterUse", "PowerUse", "Record", "CustoNo", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (47, 'HD002', '2021-01-30 00:00:00', '2022-01-30 23:27:06', '58.40', '1095.00', 'admin', 'TS1140', 0, NULL, '0001-01-01', NULL, '0001-01-01'); -INSERT INTO "wtinfo" ("WtiNo", "RoomNo", "UseDate", "EndDate", "WaterUse", "PowerUse", "Record", "CustoNo", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (48, 'HD008', '2020-12-08 00:00:00', '2022-01-30 23:27:28', '66.88', '1254.00', 'admin', 'TS1492', 0, NULL, '0001-01-01', NULL, '0001-01-01'); -INSERT INTO "wtinfo" ("WtiNo", "RoomNo", "UseDate", "EndDate", "WaterUse", "PowerUse", "Record", "CustoNo", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (49, 'HD009', '2021-04-14 00:00:00', '2022-01-30 23:27:52', '46.56', '873.00', 'admin', 'TS-20210024', 0, NULL, '0001-01-01', NULL, '0001-01-01'); -INSERT INTO "wtinfo" ("WtiNo", "RoomNo", "UseDate", "EndDate", "WaterUse", "PowerUse", "Record", "CustoNo", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (50, 'HD014', '2021-05-10 00:00:00', '2022-01-30 23:28:08', '42.40', '795.00', 'admin', 'TS-20210039', 0, NULL, '0001-01-01', NULL, '0001-01-01'); -INSERT INTO "wtinfo" ("WtiNo", "RoomNo", "UseDate", "EndDate", "WaterUse", "PowerUse", "Record", "CustoNo", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (51, 'QL006', '2021-05-10 00:00:00', '2022-01-30 23:28:25', '42.40', '795.00', 'admin', 'TS-20210035', 0, NULL, '0001-01-01', NULL, '0001-01-01'); -INSERT INTO "wtinfo" ("WtiNo", "RoomNo", "UseDate", "EndDate", "WaterUse", "PowerUse", "Record", "CustoNo", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (52, 'ZT001', '2021-07-17 00:00:00', '2022-01-30 23:28:43', '31.52', '591.00', 'admin', 'TS1364', 0, NULL, '0001-01-01', NULL, '0001-01-01'); -INSERT INTO "wtinfo" ("WtiNo", "RoomNo", "UseDate", "EndDate", "WaterUse", "PowerUse", "Record", "CustoNo", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (53, 'ZT006', '2021-01-30 00:00:00', '2022-01-30 23:29:02', '58.40', '1095.00', 'admin', 'TS1266', 0, NULL, '0001-01-01', NULL, '0001-01-01'); -INSERT INTO "wtinfo" ("WtiNo", "RoomNo", "UseDate", "EndDate", "WaterUse", "PowerUse", "Record", "CustoNo", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date") VALUES (54, 'ZT012', '2021-05-10 00:00:00', '2022-01-30 23:29:20', '42.40', '795.00', 'admin', 'TS-20210039', 0, NULL, '0001-01-01', NULL, '0001-01-01'); +INSERT INTO "workerpic" ("Id", "WorkerId", "Pic") VALUES (206, 'Shenyou', 'cea9d22e-cd3e-4ea8-adfd-6d43e9e80698.png'); +INSERT INTO "workerpic" ("Id", "WorkerId", "Pic") VALUES (207, 'WK775', '68137280-5cec-473a-a0d8-6a8538a6daf3.png'); -- Gitee