diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/LeaveStatistics.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/LeaveStatistics.cshtml index be9e462ef..5c3b6b152 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/LeaveStatistics.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/LeaveStatistics.cshtml @@ -20,15 +20,15 @@
-
+
姓名
-
+
联系电话
-
+
请假种类
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/LeaveStatistics.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/LeaveStatistics.js index 79965dda0..998484ed5 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/LeaveStatistics.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/LeaveStatistics.js @@ -124,8 +124,10 @@ var bootstrap = function ($, learun) { return "运行中"; } else if (cellvalue == 2) { return "草稿"; - } else { + } else if (cellvalue == 3) { return "作废"; + } else { + return "终止"; } } else { @@ -135,7 +137,7 @@ var bootstrap = function ($, learun) { } }, ], - mainId: 'F_Id', + mainId: 'LC_ID', isPage: true, sidx: 'qj_txsj DESC', dblclick: function () { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/Transceiver.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/Transceiver.js index 39d203c1d..2c03dad15 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/Transceiver.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/Transceiver.js @@ -91,8 +91,10 @@ var bootstrap = function ($, learun) { return "运行中"; } else if (cellvalue == 2) { return "草稿"; - } else { + } else if (cellvalue == 3) { return "作废"; + } else { + return "终止"; } } else { @@ -102,7 +104,7 @@ var bootstrap = function ($, learun) { } }, ], - mainId: 'F_Id', + mainId: 'LC_ID', isPage: true, sidx: 'F_CreateDate DESC', dblclick: function () { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/UseCar.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/UseCar.js index 11e6245c1..2ba4355af 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/UseCar.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/UseCar.js @@ -65,8 +65,10 @@ var bootstrap = function ($, learun) { return "运行中"; } else if (cellvalue == 2) { return "草稿"; - } else { + } else if (cellvalue == 3) { return "作废"; + } else { + return "终止"; } } else { @@ -76,9 +78,9 @@ var bootstrap = function ($, learun) { } }, ], - mainId: 'F_Id', + mainId: 'LC_ID', isPage: true, - sidx: 'F_CreateDate DESC', + sidx: 'LC_ycsj DESC', dblclick: function () { page.eye(); } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/LR_LGManager/LC_docx2.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/LR_LGManager/LC_docx2.cs new file mode 100644 index 000000000..3fe6ba262 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/LR_LGManager/LC_docx2.cs @@ -0,0 +1,29 @@ +using Learun.Application.TwoDevelopment.LR_LGManager; +using System.Data.Entity.ModelConfiguration; + +namespace Learun.Application.Mapping +{ + /// + /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 + /// Copyright (c) 2013-2018 北京泉江科技有限公司 + /// 创 建：超级管理员 + /// 日 期：2020-05-07 14:26 + /// 描 述：流程用印申请 + /// + public class LC_docx2Map : EntityTypeConfiguration + { + public LC_docx2Map() + { + #region 表、主键 + //表 + this.ToTable("LC_DOCX2"); + //主键 + this.HasKey(t => t.LC_ID); + #endregion + + #region 配置关系 + #endregion + } + } +} + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/LR_LGManager/LC_gcsqMap.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/LR_LGManager/LC_gcsqMap.cs new file mode 100644 index 000000000..c45ab1d45 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/LR_LGManager/LC_gcsqMap.cs @@ -0,0 +1,29 @@ +using Learun.Application.TwoDevelopment.LR_LGManager; +using System.Data.Entity.ModelConfiguration; + +namespace Learun.Application.Mapping +{ + /// + /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 + /// Copyright (c) 2013-2018 北京泉江科技有限公司 + /// 创 建：超级管理员 + /// 日 期：2020-05-07 14:26 + /// 描 述：流程用印申请 + /// + public class LC_gcsqMap : EntityTypeConfiguration + { + public LC_gcsqMap() + { + #region 表、主键 + //表 + this.ToTable("LC_GCSQ"); + //主键 + this.HasKey(t => t.LC_ID); + #endregion + + #region 配置关系 + #endregion + } + } +} + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/LR_LGManager/cs_qjMap.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/LR_LGManager/cs_qjMap.cs new file mode 100644 index 000000000..c4487e410 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/LR_LGManager/cs_qjMap.cs @@ -0,0 +1,29 @@ +using Learun.Application.TwoDevelopment.LR_LGManager; +using System.Data.Entity.ModelConfiguration; + +namespace Learun.Application.Mapping +{ + /// + /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 + /// Copyright (c) 2013-2018 北京泉江科技有限公司 + /// 创 建：超级管理员 + /// 日 期：2020-05-07 14:26 + /// 描 述：流程用印申请 + /// + public class cs_qjMap : EntityTypeConfiguration + { + public cs_qjMap() + { + #region 表、主键 + //表 + this.ToTable("CS_QJ"); + //主键 + this.HasKey(t => t.LC_ID); + #endregion + + #region 配置关系 + #endregion + } + } +} + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/Learun.Application.Mapping.csproj b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/Learun.Application.Mapping.csproj index 9d2d9c36f..01d48536a 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/Learun.Application.Mapping.csproj +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/Learun.Application.Mapping.csproj @@ -149,6 +149,9 @@ + + + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_LGManager/LC_docx2/LC_docx2Entity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_LGManager/LC_docx2/LC_docx2Entity.cs new file mode 100644 index 000000000..f22d1656c --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_LGManager/LC_docx2/LC_docx2Entity.cs @@ -0,0 +1,147 @@ +using Learun.Util; +using System; +using System.ComponentModel.DataAnnotations.Schema; +namespace Learun.Application.TwoDevelopment.LR_LGManager + +{ + /// + /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 + /// Copyright (c) 2013-2018 北京泉江科技有限公司 + /// 创 建：超级管理员 + /// 日 期：2020-05-07 14:26 + /// 描 述：流程用印申请 + /// + public class LC_docx2Entity + { + #region 实体成员 + + [Column("LC_ID")] + public string LC_ID { get; set; } + [Column("F_CreateUserName")] + public string F_CreateUserName { get; set; } + [Column("LC_party")] + public string LC_party { get; set; } + [Column("LC_accept")] + public string LC_accept { get; set; } + [Column("LC_amount")] + public string LC_amount { get; set; } + [Column("LC_num")] + public string LC_num { get; set; } + [Column("LC_numdoc")] + public string LC_numdoc { get; set; } + [Column("LC_name")] + public string LC_name { get; set; } + [Column("LC_important")] + public string LC_important { get; set; } + [Column("LC_secret")] + public string LC_secret { get; set; } + [Column("LC_docx")] + public string LC_docx { get; set; } + [Column("LC_other")] + public string LC_other { get; set; } + [Column("LC_docx2")] + public string LC_docx2 { get; set; } + [Column("LC_docx3")] + public string LC_docx3 { get; set; } + [Column("LC_docx4")] + public string LC_docx4 { get; set; } + [Column("LC_docx5")] + public string LC_docx5 { get; set; } + #endregion + + #region 扩展操作 + /// + /// 新增调用 + /// + public void Create() + { + this.LC_ID = Guid.NewGuid().ToString(); + } + /// + /// 编辑调用 + /// + /// + public void Modify(string keyValue) + { + this.LC_ID = keyValue; + UserInfo userInfo = LoginUserInfo.Get(); + } + #endregion + #region 扩展数据 + /// + /// 主键 + /// + /// + [NotMapped] + public string F_Id { get; set; } + /// + /// 流程模板主键 + /// + /// + [NotMapped] + public string F_SchemeId { get; set; } + /// + /// 流程模板编码 + /// + /// + [NotMapped] + public string F_SchemeCode { get; set; } + /// + /// 流程模板名称 + /// + /// + [NotMapped] + public string F_SchemeName { get; set; } + /// + /// 流程进程自定义标题 + /// + /// + [NotMapped] + public string F_Title { get; set; } + /// + /// 流程进程等级 + /// + /// + [NotMapped] + public int? F_Level { get; set; } + /// + /// 流程进程有效标志 1正常2草稿3作废4终止 + /// + /// + [NotMapped] + public int? F_EnabledMark { get; set; } + /// + /// 流程进程是否结束1是0不是 + /// + /// + [NotMapped] + public int? F_IsFinished { get; set; } + /// + /// 是否被催办 1 被催办了 + /// + /// + [NotMapped] + public int? F_IsUrge { get; set; } + /// + /// 创建时间 + /// + /// + [NotMapped] + public DateTime? F_CreateDate { get; set; } + /// + /// 创建人主键 + /// + /// + [NotMapped] + public string F_CreateUserId { get; set; } + /// + /// 创建人名称 + /// + /// + [NotMapped] + public string F_CreateUserNameInProcess { get; set; } + + #endregion + } +} + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_LGManager/LC_gcsq/LC_gcsqEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_LGManager/LC_gcsq/LC_gcsqEntity.cs new file mode 100644 index 000000000..062dbdc23 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_LGManager/LC_gcsq/LC_gcsqEntity.cs @@ -0,0 +1,142 @@ +using Learun.Util; +using System; +using System.ComponentModel.DataAnnotations.Schema; +namespace Learun.Application.TwoDevelopment.LR_LGManager + +{ + /// + /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 + /// Copyright (c) 2013-2018 北京泉江科技有限公司 + /// 创 建：超级管理员 + /// 日 期：2020-05-07 14:26 + /// 描 述：流程用印申请 + /// + public class LC_gcsqEntity + { + #region 实体成员 + [Column("LC_ID")] + public string LC_ID { get; set; } + [Column("F_CREATEUSERNAME")] + public string F_CreateUserName { get; set; } + [Column("LC_YCBM")] + public string LC_ycbm { get; set; } + [Column("LC_YCR")] + public string LC_ycr { get; set; } + [Column("LC_CPH")] + public string LC_cph { get; set; } + [Column("LC_SY")] + public string LC_sy { get; set; } + [Column("LC_LX")] + public string LC_lx { get; set; } + [Column("LC_YCSJ")] + public string LC_ycsj { get; set; } + [Column("LC_XSLC")] + public string LC_xslc { get; set; } + [Column("LC_SJXM")] + public string LC_sjxm { get; set; } + [Column("LC_PJ")] + public string LC_pj { get; set; } + [Column("LC_FJ")] + public string LC_fj { get; set; } + [Column("LC_BY1")] + public string LC_by1 { get; set; } + [Column("LC_BY2")] + public string LC_by2 { get; set; } + #endregion + + #region 扩展操作 + /// + /// 新增调用 + /// + public void Create() + { + this.LC_ID = Guid.NewGuid().ToString(); + } + /// + /// 编辑调用 + /// + /// + public void Modify(string keyValue) + { + this.LC_ID = keyValue; + UserInfo userInfo = LoginUserInfo.Get(); + } + #endregion + #region 扩展数据 + /// + /// 主键 + /// + /// + [NotMapped] + public string F_Id { get; set; } + /// + /// 流程模板主键 + /// + /// + [NotMapped] + public string F_SchemeId { get; set; } + /// + /// 流程模板编码 + /// + /// + [NotMapped] + public string F_SchemeCode { get; set; } + /// + /// 流程模板名称 + /// + /// + [NotMapped] + public string F_SchemeName { get; set; } + /// + /// 流程进程自定义标题 + /// + /// + [NotMapped] + public string F_Title { get; set; } + /// + /// 流程进程等级 + /// + /// + [NotMapped] + public int? F_Level { get; set; } + /// + /// 流程进程有效标志 1正常2草稿3作废4终止 + /// + /// + [NotMapped] + public int? F_EnabledMark { get; set; } + /// + /// 流程进程是否结束1是0不是 + /// + /// + [NotMapped] + public int? F_IsFinished { get; set; } + /// + /// 是否被催办 1 被催办了 + /// + /// + [NotMapped] + public int? F_IsUrge { get; set; } + /// + /// 创建时间 + /// + /// + [NotMapped] + public DateTime? F_CreateDate { get; set; } + /// + /// 创建人主键 + /// + /// + [NotMapped] + public string F_CreateUserId { get; set; } + /// + /// 创建人名称 + /// + /// + [NotMapped] + public string F_CreateUserNameInProcess { get; set; } + + #endregion + } +} + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_LGManager/cs_qj/cs_qjEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_LGManager/cs_qj/cs_qjEntity.cs new file mode 100644 index 000000000..6e3f3980f --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_LGManager/cs_qj/cs_qjEntity.cs @@ -0,0 +1,141 @@ +using Learun.Util; +using System; +using System.ComponentModel.DataAnnotations.Schema; +namespace Learun.Application.TwoDevelopment.LR_LGManager + +{ + /// + /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 + /// Copyright (c) 2013-2018 北京泉江科技有限公司 + /// 创 建：超级管理员 + /// 日 期：2020-05-07 14:26 + /// 描 述：流程用印申请 + /// + public class cs_qjEntity + { + #region 实体成员 + /// + /// ID + /// + /// + [Column("LC_ID")] + public string LC_ID { get; set; } + [Column("QJ_NAME")] + public string qj_name { get; set; } + [Column("QJ_TXSJ")] + public DateTime? qj_txsj { get; set; } + [Column("QJ_BM")] + public string qj_bm { get; set; } + [Column("QJ_LX")] + public string qj_lx { get; set; } + [Column("QJ_ZW")] + public string qj_zw { get; set; } + [Column("QJ_SJKS")] + public DateTime? qj_sjks { get; set; } + [Column("QJ_SJJS")] + public DateTime? qj_sjjs { get; set; } + [Column("QJ_DH")] + public string qj_dh { get; set; } + [Column("QJ_LY")] + public string qj_ly { get; set; } + [Column("QJ_SJ")] + public int? qj_sj { get; set; } + + #endregion + + #region 扩展操作 + /// + /// 新增调用 + /// + public void Create() + { + this.LC_ID = Guid.NewGuid().ToString(); + } + /// + /// 编辑调用 + /// + /// + public void Modify(string keyValue) + { + this.LC_ID = keyValue; + UserInfo userInfo = LoginUserInfo.Get(); + } + #endregion + #region 扩展数据 + /// + /// 主键 + /// + /// + [NotMapped] + public string F_Id { get; set; } + /// + /// 流程模板主键 + /// + /// + [NotMapped] + public string F_SchemeId { get; set; } + /// + /// 流程模板编码 + /// + /// + [NotMapped] + public string F_SchemeCode { get; set; } + /// + /// 流程模板名称 + /// + /// + [NotMapped] + public string F_SchemeName { get; set; } + /// + /// 流程进程自定义标题 + /// + /// + [NotMapped] + public string F_Title { get; set; } + /// + /// 流程进程等级 + /// + /// + [NotMapped] + public int? F_Level { get; set; } + /// + /// 流程进程有效标志 1正常2草稿3作废4终止 + /// + /// + [NotMapped] + public int? F_EnabledMark { get; set; } + /// + /// 流程进程是否结束1是0不是 + /// + /// + [NotMapped] + public int? F_IsFinished { get; set; } + /// + /// 是否被催办 1 被催办了 + /// + /// + [NotMapped] + public int? F_IsUrge { get; set; } + /// + /// 创建时间 + /// + /// + [NotMapped] + public DateTime? F_CreateDate { get; set; } + /// + /// 创建人主键 + /// + /// + [NotMapped] + public string F_CreateUserId { get; set; } + /// + /// 创建人名称 + /// + /// + [NotMapped] + public string F_CreateUserNameInProcess { get; set; } + + #endregion + } +} + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Learun.Application.TwoDevelopment.csproj b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Learun.Application.TwoDevelopment.csproj index b5650c17e..0fa6018b9 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Learun.Application.TwoDevelopment.csproj +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Learun.Application.TwoDevelopment.csproj @@ -363,6 +363,9 @@ + + + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/Process/NWFProcessBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/Process/NWFProcessBLL.cs index 110d3a63f..261a7c571 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/Process/NWFProcessBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/Process/NWFProcessBLL.cs @@ -67,15 +67,15 @@ namespace Learun.Application.WorkFlow return nWFProcessSerive.GetPageList(pagination, queryJson); } - public IEnumerable GetUseCar(Pagination pagination, string queryJson) + public IEnumerable GetUseCar(Pagination pagination, string queryJson) { return nWFProcessSerive.GetUseCar(pagination, queryJson); } - public IEnumerable GetLeaveStatistics(Pagination pagination, string queryJson) + public IEnumerable GetLeaveStatistics(Pagination pagination, string queryJson) { return nWFProcessSerive.GetLeaveStatistics(pagination, queryJson); } - public IEnumerable GetTransceiver(Pagination pagination, string queryJson) + public IEnumerable GetTransceiver(Pagination pagination, string queryJson) { return nWFProcessSerive.GetTransceiver(pagination, queryJson); } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/Process/NWFProcessEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/Process/NWFProcessEntity.cs index e12c903a7..995f4cb34 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/Process/NWFProcessEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/Process/NWFProcessEntity.cs @@ -181,63 +181,6 @@ namespace Learun.Application.WorkFlow [NotMapped] public bool? LeaderIsAgree { get; set; } - [NotMapped] - public string LC_ID { get; set; } - [NotMapped] - public string LC_ycbm { get; set; } - [NotMapped] - public string LC_ycr { get; set; } - [NotMapped] - public string LC_cph { get; set; } - [NotMapped] - public string LC_sy { get; set; } - [NotMapped] - public string LC_lx { get; set; } - [NotMapped] - public string LC_ycsj { get; set; } - [NotMapped] - public string LC_xslc { get; set; } - [NotMapped] - public string LC_sjxm { get; set; } - [NotMapped] - public string LC_pj { get; set; } - //---------------------------- - - [NotMapped] - public string qj_name { get; set; } - [NotMapped] - public string qj_txsj { get; set; } - [NotMapped] - public string qj_bm { get; set; } - [NotMapped] - public string qj_lx { get; set; } - [NotMapped] - public string qj_sjks { get; set; } - [NotMapped] - public string qj_sjjs { get; set; } - [NotMapped] - public string qj_dh { get; set; } - [NotMapped] - public string qj_ly { get; set; } - //--------------------------------- - [NotMapped] - public string LC_party { get; set; } - [NotMapped] - public string LC_accept { get; set; } - [NotMapped] - public string LC_amount { get; set; } - [NotMapped] - public string LC_num { get; set; } - [NotMapped] - public string LC_numdoc { get; set; } - [NotMapped] - public string LC_name { get; set; } - [NotMapped] - public string LC_important { get; set; } - [NotMapped] - public string LC_secret { get; set; } - [NotMapped] - public string LC_other { get; set; } #endregion } } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/Process/NWFProcessIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/Process/NWFProcessIBLL.cs index 550b03b3d..f11446cd6 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/Process/NWFProcessIBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/Process/NWFProcessIBLL.cs @@ -28,9 +28,9 @@ namespace Learun.Application.WorkFlow /// 查询条件 /// IEnumerable GetPageList(Pagination pagination, string queryJson); - IEnumerable GetUseCar(Pagination pagination, string queryJson); - IEnumerable GetLeaveStatistics(Pagination pagination, string queryJson); - IEnumerable GetTransceiver(Pagination pagination, string queryJson); + IEnumerable GetUseCar(Pagination pagination, string queryJson); + IEnumerable GetLeaveStatistics(Pagination pagination, string queryJson); + IEnumerable GetTransceiver(Pagination pagination, string queryJson); string GetFirstTaskByProcessId(string processId); IEnumerable GetAllList(); diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/Process/NWFProcessSerivce.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/Process/NWFProcessSerivce.cs index 462d94aab..4636d75da 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/Process/NWFProcessSerivce.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/Process/NWFProcessSerivce.cs @@ -166,7 +166,7 @@ namespace Learun.Application.WorkFlow /// 分页参数 /// 查询条件 /// - public IEnumerable GetUseCar(Pagination pagination, string queryJson) + public IEnumerable GetUseCar(Pagination pagination, string queryJson) { try { @@ -175,46 +175,39 @@ namespace Learun.Application.WorkFlow var dbMISName = this.BaseRepository("CollegeMIS").getDbConnection().Database; var dp = new DynamicParameters(new { }); var strSql = new StringBuilder(); - strSql.Append(" select zb.*,cl.* from " + dbName + ".[dbo].LR_NWF_PROCESS zb "); - strSql.Append(" left join " + dbMISName + ".[dbo].LC_gcsq cl on cl.LC_ID=zb.F_id "); - strSql.Append(" where 1=1 "); + strSql.Append(" select zb.*,lnp.* from " + dbMISName + ".[dbo].LC_gcsq zb "); + strSql.Append(" left join " + dbName + ".[dbo].LR_NWF_PROCESS lnp on lnp.F_id=zb.LC_ID "); + strSql.Append(" where 1=1 and lnp.F_SchemeCode = 'LC_gcsq' "); + strSql.Append(" and lnp.F_EnabledMark != '3' and lnp.F_EnabledMark != '2' and lnp.F_IsChild='0' "); if (queryParam["categoryId"].ToString() == "1") { - strSql.Append(" and zb.F_IsFinished= '0' "); + strSql.Append(" and lnp.F_IsFinished= '0' "); } else { - strSql.Append(" and zb.F_IsFinished= '1' "); + strSql.Append(" and lnp.F_IsFinished= '1' "); } - strSql.Append(" and zb.F_SchemeCode = 'LC_gcsq' "); - strSql.Append(" and zb.F_EnabledMark != '3' and F_EnabledMark != '4' and F_IsChild='0' "); - //if (!queryParam["StartTime"].IsEmpty() && !queryParam["EndTime"].IsEmpty()) - //{ - // DateTime startTime = queryParam["StartTime"].ToDate(); - // DateTime endTime = queryParam["EndTime"].ToDate(); - // strSql.Append(" and ( zb.F_CreateDate>= " + startTime + " && F_CreateDate <= " + endTime + " )"); - //} if (!queryParam["LC_ycbm"].IsEmpty()) { - strSql.Append(" and cl.LC_ycbm like '%" + queryParam["LC_ycbm"].ToString() + "%' "); + strSql.Append(" and zb.LC_ycbm like '%" + queryParam["LC_ycbm"].ToString() + "%' "); } if (!queryParam["LC_ycr"].IsEmpty()) { - strSql.Append(" and cl.LC_ycr like '%" + queryParam["LC_ycr"].ToString() + "%' "); + strSql.Append(" and zb.LC_ycr like '%" + queryParam["LC_ycr"].ToString() + "%' "); } if (!queryParam["LC_ycsj"].IsEmpty()) { - strSql.Append(" and cl.LC_ycsj like '%" + queryParam["LC_ycsj"].ToString() + "%' "); + strSql.Append(" and zb.LC_ycsj like '%" + queryParam["LC_ycsj"].ToString() + "%' "); } if (!queryParam["LC_sjxm"].IsEmpty()) { - strSql.Append(" and cl.LC_sjxm like '%" + queryParam["LC_sjxm"].ToString() + "%' "); + strSql.Append(" and zb.LC_sjxm like '%" + queryParam["LC_sjxm"].ToString() + "%' "); } if (!queryParam["LC_cph"].IsEmpty()) { - strSql.Append(" and cl.LC_cph like '%" + queryParam["LC_cph"].ToString() + "%' "); + strSql.Append(" and zb.LC_cph like '%" + queryParam["LC_cph"].ToString() + "%' "); } - return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(), dp); + return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(), dp); } catch (Exception ex) @@ -236,7 +229,7 @@ namespace Learun.Application.WorkFlow /// 分页参数 /// 查询条件 /// - public IEnumerable GetLeaveStatistics(Pagination pagination, string queryJson) + public IEnumerable GetLeaveStatistics(Pagination pagination, string queryJson) { try { @@ -247,7 +240,8 @@ namespace Learun.Application.WorkFlow var strSql = new StringBuilder(); strSql.Append(" select zb.*,lnp.* from " + dbMISName + ".[dbo].cs_qj zb "); strSql.Append(" left join " + dbName + ".[dbo].LR_NWF_PROCESS lnp on zb.LC_ID =lnp.F_id "); - strSql.Append(" where 1=1 "); + strSql.Append(" where 1=1 and lnp.F_SchemeCode = 'LC_leave'"); + strSql.Append(" and lnp.F_EnabledMark != '3' and lnp.F_EnabledMark != '2' and lnp.F_IsChild='0' "); if (queryParam["categoryId"].ToString() == "1") { strSql.Append(" and lnp.F_IsFinished= '0' "); @@ -256,8 +250,7 @@ namespace Learun.Application.WorkFlow { strSql.Append(" and lnp.F_IsFinished= '1' "); } - strSql.Append(" and lnp.F_SchemeCode = 'LC_leave' "); - strSql.Append(" and lnp.F_EnabledMark != '3' and lnp.F_EnabledMark != '4' and lnp.F_IsChild='0' "); + if (!queryParam["qj_name"].IsEmpty()) { strSql.Append(" and zb.qj_name = '" + queryParam["qj_name"].ToString() + "' "); @@ -276,7 +269,7 @@ namespace Learun.Application.WorkFlow DateTime endTime = queryParam["EndTime"].ToDate(); strSql.Append(" and ( zb.qj_txsj>= '" + startTime + "' and zb.qj_txsj <= '" + endTime + "' )"); } - return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(), dp); + return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(), dp, pagination); } catch (Exception ex) @@ -297,7 +290,7 @@ namespace Learun.Application.WorkFlow /// 分页参数 /// 查询条件 /// - public IEnumerable GetTransceiver(Pagination pagination, string queryJson) + public IEnumerable GetTransceiver(Pagination pagination, string queryJson) { try { @@ -308,7 +301,8 @@ namespace Learun.Application.WorkFlow var strSql = new StringBuilder(); strSql.Append(" select zb.*,lnp.* from " + dbMISName + ".[dbo].LC_docx2 zb "); strSql.Append(" left join " + dbName + ".[dbo].LR_NWF_PROCESS lnp on zb.LC_ID =lnp.F_id "); - strSql.Append(" where 1=1 "); + strSql.Append(" where 1=1 and lnp.F_SchemeCode = 'LC_docx' "); + strSql.Append(" and lnp.F_EnabledMark != '3' and lnp.F_EnabledMark != '2' and lnp.F_IsChild='0' "); if (queryParam["categoryId"].ToString() == "1") { strSql.Append(" and lnp.F_IsFinished= '0' "); @@ -317,8 +311,6 @@ namespace Learun.Application.WorkFlow { strSql.Append(" and lnp.F_IsFinished= '1' "); } - strSql.Append(" and lnp.F_SchemeCode = 'LC_docx' "); - strSql.Append(" and lnp.F_EnabledMark != '3' and lnp.F_EnabledMark != '4' and lnp.F_IsChild='0' "); if (!queryParam["LC_party"].IsEmpty()) { strSql.Append(" and zb.LC_party like '%" + queryParam["LC_party"].ToString() + "%' "); @@ -331,9 +323,9 @@ namespace Learun.Application.WorkFlow { DateTime startTime = queryParam["StartTime"].ToDate(); DateTime endTime = queryParam["EndTime"].ToDate(); - strSql.Append(" and ( zb.LC_accept>= '" + startTime + "' and zb.LC_accept <= '" + endTime + "' )"); + strSql.Append(" and CONVERT(varchar, zb.lc_accept) >= CONVERT(varchar, '" + startTime + "') and CONVERT(varchar, zb.LC_accept) <= CONVERT(varchar, '" + endTime + "')"); } - return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(), dp); + return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(), dp); } catch (Exception ex)