From 599c41c1367017234123485198c82198e83e2f51 Mon Sep 17 00:00:00 2001 From: dyy <18335927079@163.com> Date: Tue, 19 Apr 2022 11:16:15 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E3=80=90=E5=A2=9E=E5=8A=A0=E3=80=91?= =?UTF-8?q?=E5=8A=9E=E4=BA=8B=E5=A4=A7=E5=8E=85=E5=A2=9E=E5=8A=A0=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E8=A1=A8=E5=8D=95=E6=95=B0=E6=8D=AE=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?-=E7=94=A8=E5=8D=B0=E7=94=B3=E8=AF=B7=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/NWFProcessController.cs | 34 ++++ .../NWFProcess/MonitorIndexOfyyspd.cshtml | 50 ++++++ .../Views/NWFProcess/MonitorIndexOfyyspd.js | 141 +++++++++++++++ .../Learun.Application.Web.csproj | 2 + .../LR_LGManager/LC_yyspdMap.cs | 29 +++ .../Learun.Application.Mapping.csproj | 1 + .../LR_LGManager/LC_yyspd/LC_yyspdEntity.cs | 165 ++++++++++++++++++ .../Learun.Application.TwoDevelopment.csproj | 1 + .../Process/NWFProcessBLL.cs | 32 ++++ .../Process/NWFProcessIBLL.cs | 15 ++ .../Process/NWFProcessSerivce.cs | 71 ++++++++ 11 files changed, 541 insertions(+) create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/MonitorIndexOfyyspd.cshtml create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/MonitorIndexOfyyspd.js create mode 100644 Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/LR_LGManager/LC_yyspdMap.cs create mode 100644 Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_LGManager/LC_yyspd/LC_yyspdEntity.cs diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Controllers/NWFProcessController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Controllers/NWFProcessController.cs index 8cdb35b3a..9becdb2ed 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Controllers/NWFProcessController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Controllers/NWFProcessController.cs @@ -267,6 +267,15 @@ namespace Learun.Application.Web.Areas.LR_NewWorkFlow.Controllers { return View(); } + /// + /// 用印申请统计 + /// + /// + [HttpGet] + public ActionResult MonitorIndexOfyyspd() + { + return View(); + } #endregion #region 获取数据 @@ -387,6 +396,31 @@ namespace Learun.Application.Web.Areas.LR_NewWorkFlow.Controllers } #endregion + #region 流程表单数据统计 + /// + /// 用印申请流程表单统计 + /// + /// 分页参数 + /// 查询条件 + /// + [HttpGet] + [AjaxOnly] + public ActionResult GetPageListOfyyspd(string pagination, string queryJson) + { + Pagination paginationobj = pagination.ToObject(); + var list = nWFProcessIBLL.GetPageListOfyyspd(paginationobj, queryJson); + var jsonData = new + { + rows = list, + total = paginationobj.total, + page = paginationobj.page, + records = paginationobj.records, + }; + return Success(jsonData); + } + + #endregion + #region 流程API /// /// 获取流程模板 diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/MonitorIndexOfyyspd.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/MonitorIndexOfyyspd.cshtml new file mode 100644 index 000000000..4f4bb8414 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/MonitorIndexOfyyspd.cshtml @@ -0,0 +1,50 @@ +@{ + ViewBag.Title = "流程监控"; + Layout = "~/Views/Shared/_Index.cshtml"; +} +
+
+
+
+
    +
  • 未完成
    • +
  • 已完成
    • +
+
+
+
+
+
+
+
+ @*
+
+
*@ +
+ +
+
+  查询 +
+
+
+
+ +
+
+  查看 +
+
+
+ +
+
+
+
+
+@Html.AppendJsFile("/Areas/LR_NewWorkFlow/Views/NWFProcess/MonitorIndexOfyyspd.js") + + + + + diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/MonitorIndexOfyyspd.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/MonitorIndexOfyyspd.js new file mode 100644 index 000000000..6e082bee0 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/MonitorIndexOfyyspd.js @@ -0,0 +1,141 @@ +/* + * 版 本 Learun-ADMS V7.0.3 力软敏捷开发框架(http://www.learun.cn) + * Copyright (c) 2013-2018 上海力软信息技术有限公司 + * 创建人：力软-前端开发组 + * 日 期：2018.12.19 + * 描 述：流程监控 + */ +var bootstrap = function ($, learun) { + "use strict"; + var categoryId = '1'; + var logbegin = ''; + var logend = ''; + + var page = { + init: function () { + $('#lr_verify').hide(); + page.initleft(); + page.initGrid(); + page.bind(); + }, + bind: function () { + $('#datesearch').lrdate({ + dfdata: [ + { name: '今天', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00') }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } }, + { name: '近7天', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'd', -6) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } }, + { name: '近1个月', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'm', -1) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } }, + { name: '近3个月', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'm', -3) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } }, + ], + // 月 + mShow: false, + premShow: false, + // 季度 + jShow: false, + prejShow: false, + // 年 + ysShow: false, + yxShow: false, + preyShow: false, + yShow: false, + selectfn: function (begin, end) { + logbegin = begin; + logend = end; + page.search(); + } + }); + // 查询 + $('#btn_Search').on('click', function () { + var keyword = $('#txt_Keyword').val(); + page.search({ keyword: keyword }); + }); + // 刷新 + $('#lr_refresh').on('click', function () { + location.reload(); + }); + // 查看 + $('#lr_eye').on('click', function () { + page.eye(); + }); + }, + initleft: function () { + $('#lr_left_list li').on('click', function () { + var $this = $(this); + var $parent = $this.parent(); + $parent.find('.active').removeClass('active'); + $this.addClass('active'); + categoryId = $this.attr('data-value'); + page.search(); + }); + }, + initGrid: function () { + $('#gridtable').lrAuthorizeJfGridLei({ + url: top.$.rootUrl + '/LR_NewWorkFlow/NWFProcess/GetPageListOfyyspd', + headData: [ + { label: "用印部门", name: "LC_yybm", width: 100, align: "center" }, + { label: "用印名称", name: "LC_yzmc", width: 150, align: "center" }, + { label: "用印份数", name: "LC_yyfs", width: 100, align: "center" }, + { label: "用印时间", name: "LC_yysj", width: 120, align: "center" }, + { label: "用印事项", name: "LC_yysx", width: 250, align: "center" }, + { label: "经办人", name: "F_CreateUserName", width: 100, align: "center" }, + { + label: "流程审批状态", name: "F_EnabledMark", width: 70, align: "center", + formatter: function (cellvalue, row) { + if (row.F_IsFinished == 0) { + if (cellvalue == 1) { + if (row.F_IsUrge == "1" && categoryId == '2') { + return "催办加急"; + } + return "运行中"; + } else if (cellvalue == 2) { + return "草稿"; + } else if (cellvalue == 3) { + return "作废"; + } else { + return "终止"; + } + } + else { + return "结束"; + } + + } + }, + ], + mainId: 'F_Id', + isPage: true, + sidx: 'F_CreateDate DESC', + dblclick: function () { + page.eye(); + } + }); + page.search(); + }, + search: function (param) { + param = param || {}; + param.StartTime = logbegin; + param.EndTime = logend; + param.categoryId = categoryId; + $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); + }, + eye: function () { + var processId = $('#gridtable').jfGridValue('F_Id') || ''; + var title = $('#gridtable').jfGridValue('F_Title'); + var schemeName = $('#gridtable').jfGridValue('F_SchemeName'); + + if (schemeName != title && title) { + title = schemeName + "(" + title + ")"; + } + else { + title = schemeName; + } + + if (learun.checkrow(processId)) { + learun.frameTab.open({ F_ModuleId: 'monitor' + processId, F_FullName: '查看-' + title, F_UrlAddress: '/LR_NewWorkFlow/NWFProcess/MonitorDetailsIndex?processId=' + processId }); + } + } + }; + + page.init(); +} + + diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj b/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj index f3c9f7bbd..d0890b265 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj @@ -1375,6 +1375,7 @@ + @@ -7719,6 +7720,7 @@ + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/LR_LGManager/LC_yyspdMap.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/LR_LGManager/LC_yyspdMap.cs new file mode 100644 index 000000000..1f9a75e92 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/LR_LGManager/LC_yyspdMap.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_yyspdMap : EntityTypeConfiguration + { + public LC_yyspdMap() + { + #region 表、主键 + //表 + this.ToTable("LC_YYSPD"); + //主键 + 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 f84dc15fa..b94b32bbd 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 @@ -148,6 +148,7 @@ + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_LGManager/LC_yyspd/LC_yyspdEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_LGManager/LC_yyspd/LC_yyspdEntity.cs new file mode 100644 index 000000000..e6b0a6449 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_LGManager/LC_yyspd/LC_yyspdEntity.cs @@ -0,0 +1,165 @@ +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_yyspdEntity + { + #region 实体成员 + /// + /// ID + /// + /// + [Column("LC_ID")] + public string LC_ID { get; set; } + /// + /// 经办人 + /// + /// + [Column("F_CREATEUSERNAME")] + public string F_CreateUserName { get; set; } + /// + /// 用印部门 + /// + /// + [Column("LC_YYBM")] + public string LC_yybm { get; set; } + /// + /// 印章名称 + /// + /// + [Column("LC_YZMC")] + public string LC_yzmc { get; set; } + /// + /// 用印时间 + /// + /// + [Column("LC_YYSJ")] + public string LC_yysj { get; set; } + /// + /// 用印份数 + /// + /// + [Column("LC_YYFS")] + public string LC_yyfs { get; set; } + /// + /// 用印事项 + /// + /// + [Column("LC_YYSX")] + public string LC_yysx { get; set; } + /// + /// LC_fj + /// + /// + [Column("LC_FJ")] + public string LC_fj { get; set; } + + #endregion + + #region 扩展操作 + /// + /// 新增调用 + /// + public void Create() + { + this.LC_ID = Guid.NewGuid().ToString(); + UserInfo userInfo = LoginUserInfo.Get(); + this.F_CreateUserName = userInfo.realName; + } + /// + /// 编辑调用 + /// + /// + 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 2695e667b..458d768f7 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 @@ -362,6 +362,7 @@ + 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 a10328c61..070ac41b9 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 @@ -199,6 +199,38 @@ namespace Learun.Application.WorkFlow #endregion + + #region 流程表单数据统计 + + /// + /// 用印申请流程表单统计 + /// + /// 分页参数 + /// 查询条件 + /// + public IEnumerable GetPageListOfyyspd(Pagination pagination, string queryJson) + { + try + { + return nWFProcessSerive.GetPageListOfyyspd(pagination,queryJson); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + + #endregion + + #region 流程API #region 委托方法 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 c9126951c..6685aa55b 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 @@ -115,6 +115,21 @@ namespace Learun.Application.WorkFlow void DeleteEntity(string processId); #endregion + + #region 流程表单数据统计 + + /// + /// 用印申请流程表单统计 + /// + /// 分页参数 + /// 查询条件 + /// + IEnumerable GetPageListOfyyspd(Pagination pagination, string queryJson); + + + #endregion + + #region 流程API /// 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 665e2dcf1..f2896c352 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 @@ -6,6 +6,7 @@ using System.Data; using System.Linq; using System.Text; using Learun.Application.TwoDevelopment.LR_LGManager; +using Dapper; namespace Learun.Application.WorkFlow { @@ -767,6 +768,76 @@ namespace Learun.Application.WorkFlow } } + #region 流程表单数据统计 + + /// + /// 用印申请流程表单统计 + /// + /// 分页参数 + /// 查询条件 + /// + public IEnumerable GetPageListOfyyspd(Pagination pagination, string queryJson) + { + try + { + var misdbname = BaseRepository("CollegeMIS").getDbConnection().Database; + var basedbname = BaseRepository().getDbConnection().Database; + + var strSql = new StringBuilder(); + strSql.Append("select y.*,t.F_Id,t.F_SchemeId,t.F_SchemeCode,t.F_SchemeName,t.F_Title,t.F_Level,t.F_EnabledMark,t.F_IsFinished,t.F_CreateDate,t.F_CreateUserId,t.F_CreateUserName as F_CreateUserNameInProcess from LR_NWF_Process t left join LR_NWF_SchemeInfo s on t.F_SchemeCode=s.F_Code "); + strSql.Append($" left join {misdbname}.dbo.LC_yyspd y on y.LC_ID=t.F_Id "); + strSql.Append(" where 1=1 and t.F_EnabledMark !=2 and t.F_EnabledMark != 3 and t.F_IsChild = 0 "); + strSql.Append(" and s.F_Code='LC_yyspd' "); + + var queryParam = queryJson.ToJObject(); + // 虚拟参数 + var dp = new DynamicParameters(new { }); + + // 分类 + if (!queryParam["categoryId"].IsEmpty()) // 1:未完成 2:已完成 + { + if (queryParam["categoryId"].ToString() == "1") + { + strSql.Append(" and t.F_IsFinished = 0 "); + } + else + { + strSql.Append(" and t.F_IsFinished = 1 "); + } + } + //用印名称、用印事项、用印时间 + if (!queryParam["keyword"].IsEmpty()) + { + dp.Add("keyword", "%" + queryParam["keyword"].ToString() + "%", DbType.String); + strSql.Append(" AND (y.LC_yzmc like @keyword or y.LC_yysx like @keyword or y.LC_yysj like @keyword) "); + } + // 用印时间 + if (!queryParam["StartTime"].IsEmpty() && !queryParam["EndTime"].IsEmpty()) + { + dp.Add("StartTime", queryParam["StartTime"].ToString(), DbType.Date); + dp.Add("EndTime", queryParam["EndTime"].ToString(), DbType.Date); + strSql.Append(" and (y.LC_yysj >= @StartTime and y.LC_yysj <= @EndTime)"); + } + + var result = this.BaseRepository().FindList(strSql.ToString(),dp); + + return result; + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + + + #endregion #region 获取sql语句 /// From a1c94b6ba317f8c319bdd5f315889dbb339eb562 Mon Sep 17 00:00:00 2001 From: dyy <18335927079@163.com> Date: Tue, 19 Apr 2022 15:02:16 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91?= =?UTF-8?q?=E7=94=A8=E5=8D=B0=E7=94=B3=E8=AF=B7=E7=BB=9F=E8=AE=A1=EF=BC=9A?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=A4=9A=E6=9D=A1=E4=BB=B6=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../NWFProcess/MonitorIndexOfyyspd.cshtml | 18 +++++++++++++++++ .../Views/NWFProcess/MonitorIndexOfyyspd.js | 3 +++ .../Process/NWFProcessSerivce.cs | 20 ++++++++++++++++++- 3 files changed, 40 insertions(+), 1 deletion(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/MonitorIndexOfyyspd.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/MonitorIndexOfyyspd.cshtml index 4f4bb8414..874255043 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/MonitorIndexOfyyspd.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/MonitorIndexOfyyspd.cshtml @@ -20,6 +20,24 @@ @*
*@ +
+
+
+
+
用印名称
+ +
+
+
用印事项
+ +
+
+
用印时间
+ +
+
+
+
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/MonitorIndexOfyyspd.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/MonitorIndexOfyyspd.js index 6e082bee0..0fc92a8fa 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/MonitorIndexOfyyspd.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/MonitorIndexOfyyspd.js @@ -43,6 +43,9 @@ var bootstrap = function ($, learun) { page.search(); } }); + $('#multiple_condition_query').lrMultipleQuery(function (queryJson) { + page.search(queryJson); + }, 220, 400); // 查询 $('#btn_Search').on('click', function () { var keyword = $('#txt_Keyword').val(); 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 f2896c352..7a3d5be18 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 @@ -805,7 +805,25 @@ namespace Learun.Application.WorkFlow strSql.Append(" and t.F_IsFinished = 1 "); } } - //用印名称、用印事项、用印时间 + //用印名称 + if (!queryParam["LC_yzmc"].IsEmpty()) + { + dp.Add("LC_yzmc", "%" + queryParam["LC_yzmc"].ToString() + "%", DbType.String); + strSql.Append(" AND y.LC_yzmc like @LC_yzmc "); + } + //用印事项 + if (!queryParam["LC_yysx"].IsEmpty()) + { + dp.Add("LC_yysx", "%" + queryParam["LC_yysx"].ToString() + "%", DbType.String); + strSql.Append(" AND y.LC_yysx like @LC_yysx "); + } + //用印时间 + if (!queryParam["LC_yysj"].IsEmpty()) + { + dp.Add("LC_yysj", "%" + queryParam["LC_yysj"].ToString() + "%", DbType.String); + strSql.Append(" AND y.LC_yysj like @LC_yysj "); + } + //关键字：用印名称、用印事项、用印时间 if (!queryParam["keyword"].IsEmpty()) { dp.Add("keyword", "%" + queryParam["keyword"].ToString() + "%", DbType.String); From 88e03f6038c55396de32de5e5fa45ed12e69442e Mon Sep 17 00:00:00 2001 From: ndbs Date: Tue, 19 Apr 2022 18:35:03 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E5=85=AC=E8=BD=A6=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/NWFProcessController.cs | 21 +++- .../Views/NWFProcess/UseCar.cshtml | 69 ++++++++++ .../LR_NewWorkFlow/Views/NWFProcess/UseCar.js | 118 ++++++++++++++++++ .../Learun.Application.Web.csproj | 2 + .../Process/NWFProcessBLL.cs | 5 + .../Process/NWFProcessEntity.cs | 21 ++++ .../Process/NWFProcessIBLL.cs | 1 + .../Process/NWFProcessSerivce.cs | 76 ++++++++++- 8 files changed, 310 insertions(+), 3 deletions(-) create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/UseCar.cshtml create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/UseCar.js diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Controllers/NWFProcessController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Controllers/NWFProcessController.cs index 9becdb2ed..9359d9ae4 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Controllers/NWFProcessController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Controllers/NWFProcessController.cs @@ -248,6 +248,11 @@ namespace Learun.Application.Web.Areas.LR_NewWorkFlow.Controllers #region 统计页面 [HttpGet] + public ActionResult UseCar() + { + return View(); + } + [HttpGet] public ActionResult MonitorIndexRenShi() { return View(); @@ -300,7 +305,21 @@ namespace Learun.Application.Web.Areas.LR_NewWorkFlow.Controllers }; return Success(jsonData); } - + [HttpGet] + [AjaxOnly] + public ActionResult GetUseCar(string pagination, string queryJson) + { + Pagination paginationobj = pagination.ToObject(); + var list = nWFProcessIBLL.GetUseCar(paginationobj, queryJson); + var jsonData = new + { + rows = list, + total = paginationobj.total, + page = paginationobj.page, + records = paginationobj.records, + }; + return Success(jsonData); + } public ActionResult GetFirstTaskByProcessId(string processId) { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/UseCar.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/UseCar.cshtml new file mode 100644 index 000000000..0b4c39a7b --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/UseCar.cshtml @@ -0,0 +1,69 @@ +@{ + ViewBag.Title = "用车申请统计"; + Layout = "~/Views/Shared/_Index.cshtml"; +} +
+
+
+
+
    +
  • 未完成
    • +
  • 已完成
    • +
+
+
+
+
+
+
+
+
+
+
+
+
用车部门
+ +
+
+
用车人
+ +
+
+
车牌号
+ +
+
+
用车时间
+ +
+
+
司机姓名
+ +
+
+
+
+
+
+
+ +
+
+  查看 + @* 指派审核人 +  作废*@ +
+
+
+ +
+
+
+
+
+@Html.AppendJsFile("/Areas/LR_NewWorkFlow/Views/NWFProcess/UseCar.js") + + + + + 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 new file mode 100644 index 000000000..11e6245c1 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/UseCar.js @@ -0,0 +1,118 @@ +/* + * 版 本 Learun-ADMS V7.0.3 力软敏捷开发框架(http://www.learun.cn) + * Copyright (c) 2013-2018 上海力软信息技术有限公司 + * 创建人：力软-前端开发组 + * 日 期：2018.12.19 + * 描 述：流程监控 + */ +var bootstrap = function ($, learun) { + "use strict"; + var categoryId = '1'; + var logbegin = ''; + var logend = ''; + + var page = { + init: function () { + $('#lr_verify').hide(); + page.initleft(); + page.initGrid(); + page.bind(); + }, + bind: function () { + $('#multiple_condition_query').lrMultipleQuery(function (queryJson) { + page.search(queryJson); + }, 200, 400); + // 刷新 + $('#lr_refresh').on('click', function () { + location.reload(); + }); + // 查看 + $('#lr_eye').on('click', function () { + page.eye(); + }); + }, + initleft: function () { + $('#lr_left_list li').on('click', function () { + var $this = $(this); + var $parent = $this.parent(); + $parent.find('.active').removeClass('active'); + $this.addClass('active'); + categoryId = $this.attr('data-value'); + page.search(); + }); + }, + initGrid: function () { + $('#gridtable').lrAuthorizeJfGridLei({ + url: top.$.rootUrl + '/LR_NewWorkFlow/NWFProcess/GetUseCar', + headData: [ + { label: "用车部门", name: "LC_ycbm", width: 100, align: "center" }, + { label: "用车人", name: "LC_ycr", width: 100, align: "center" }, + { label: "车牌号", name: "LC_cph", width: 100, align: "center" }, + { label: "用车事由", name: "LC_sy", width: 100, align: "center" }, + { label: "用车路线", name: "LC_lx", width: 100, align: "center" }, + { label: "用车时间", name: "LC_ycsj", width: 100, align: "center" }, + { label: "行驶里程", name: "LC_xslc", width: 100, align: "center" }, + { label: "司机姓名", name: "LC_sjxm", width: 100, align: "center" }, + { label: "用车评价", name: "LC_pj", width: 100, align: "center" }, + { + label: "状态", name: "F_EnabledMark", width: 100, align: "center", + formatter: function (cellvalue, row) { + if (row.F_IsFinished == 0) { + if (cellvalue == 1) { + if (row.F_IsUrge == "1" && categoryId == '2') { + return "催办加急"; + } + return "运行中"; + } else if (cellvalue == 2) { + return "草稿"; + } else { + return "作废"; + } + } + else { + return "结束"; + } + + } + }, + ], + mainId: 'F_Id', + isPage: true, + sidx: 'F_CreateDate DESC', + dblclick: function () { + page.eye(); + } + }); + page.search(); + }, + search: function (param) { + param = param || {}; + param.StartTime = logbegin; + param.EndTime = logend; + param.categoryId = categoryId; + param.F_Category = 'LC_gcsq'; + param.F_SchemeCode = 'LC_gcsq'; + $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); + }, + eye: function () { + var processId = $('#gridtable').jfGridValue('LC_ID') || ''; + var title = $('#gridtable').jfGridValue('F_Title'); + var schemeName = $('#gridtable').jfGridValue('F_SchemeName'); + + if (schemeName != title && title) { + title = schemeName + "(" + title + ")"; + } + else { + title = schemeName; + } + + if (learun.checkrow(processId)) { + learun.frameTab.open({ F_ModuleId: 'monitor' + processId, F_FullName: '查看-' + title, F_UrlAddress: '/LR_NewWorkFlow/NWFProcess/MonitorDetailsIndex?processId=' + processId }); + } + } + }; + + page.init(); +} + + diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj b/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj index d0890b265..106e7c3c3 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj @@ -1383,6 +1383,7 @@ + @@ -7721,6 +7722,7 @@ + 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 070ac41b9..e5fcde25f 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 @@ -66,6 +66,11 @@ namespace Learun.Application.WorkFlow { return nWFProcessSerive.GetPageList(pagination, queryJson); } + + public IEnumerable GetUseCar(Pagination pagination, string queryJson) + { + return nWFProcessSerive.GetUseCar(pagination, queryJson); + } public string GetFirstTaskByProcessId(string processId) { return nWFProcessSerive.GetFirstTaskByProcessId(processId); 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 7074c7918..79bde2637 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 @@ -180,6 +180,27 @@ 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; } #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 6685aa55b..5ed83eeba 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,6 +28,7 @@ namespace Learun.Application.WorkFlow /// 查询条件 /// IEnumerable GetPageList(Pagination pagination, string queryJson); + IEnumerable GetUseCar(Pagination pagination, string queryJson); string GetFirstTaskByProcessId(string processId); IEnumerable GetAllList(); LC_hetongEntity GetHTInfo(string keyValue); 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 7a3d5be18..eab4358f9 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 @@ -159,6 +159,78 @@ namespace Learun.Application.WorkFlow } } } + + /// + /// 获取流程信息列表 + /// + /// 分页参数 + /// 查询条件 + /// + public IEnumerable GetUseCar(Pagination pagination, string queryJson) + { + try + { + var queryParam = queryJson.ToJObject(); + var dbName = this.BaseRepository().getDbConnection().Database; + 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 "); + if (queryParam["categoryId"].ToString() == "1") + { + strSql.Append(" and zb.F_IsFinished= '0' "); + } + else + { + strSql.Append(" and zb.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 + " )"); + //} + strSql.Append(" and F_IsStart=1 "); + if (!queryParam["LC_ycbm"].IsEmpty()) + { + strSql.Append(" and cl.LC_ycbm like '%" + queryParam["LC_ycbm"].ToString() + "%' "); + } + if (!queryParam["LC_ycr"].IsEmpty()) + { + strSql.Append(" and cl.LC_ycr like '%" + queryParam["LC_ycr"].ToString() + "%' "); + } + if (!queryParam["LC_ycsj"].IsEmpty()) + { + strSql.Append(" and cl.LC_ycsj like '%" + queryParam["LC_ycsj"].ToString() + "%' "); + } + if (!queryParam["LC_sjxm"].IsEmpty()) + { + strSql.Append(" and cl.LC_sjxm like '%" + queryParam["LC_sjxm"].ToString() + "%' "); + } + if (!queryParam["LC_cph"].IsEmpty()) + { + strSql.Append(" and cl.LC_cph like '%" + queryParam["LC_cph"].ToString() + "%' "); + } + return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(), dp); + + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + /// /// 根据processid 获取taskid /// @@ -792,7 +864,7 @@ namespace Learun.Application.WorkFlow var queryParam = queryJson.ToJObject(); // 虚拟参数 var dp = new DynamicParameters(new { }); - + // 分类 if (!queryParam["categoryId"].IsEmpty()) // 1:未完成 2:已完成 { @@ -837,7 +909,7 @@ namespace Learun.Application.WorkFlow strSql.Append(" and (y.LC_yysj >= @StartTime and y.LC_yysj <= @EndTime)"); } - var result = this.BaseRepository().FindList(strSql.ToString(),dp); + var result = this.BaseRepository().FindList(strSql.ToString(), dp); return result; } From 6227a5cec024502d8e564c924985bbbe2dbe4039 Mon Sep 17 00:00:00 2001 From: dyy <18335927079@163.com> Date: Wed, 20 Apr 2022 10:25:59 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E3=80=90=E5=A2=9E=E5=8A=A0=E3=80=91?= =?UTF-8?q?=E4=BC=9A=E8=AE=AE=E5=AE=A4=E7=94=B3=E8=AF=B7=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/NWFProcessController.cs | 30 ++++ .../NWFProcess/MonitorIndexOfmeeting.cshtml | 76 +++++++++ .../Views/NWFProcess/MonitorIndexOfmeeting.js | 143 ++++++++++++++++ .../Learun.Application.Web.csproj | 2 + .../LR_LGManager/LC_meetingMap.cs | 29 ++++ .../Learun.Application.Mapping.csproj | 1 + .../LC_meeting/LC_meetingEntity.cs | 153 ++++++++++++++++++ .../Learun.Application.TwoDevelopment.csproj | 1 + .../Process/NWFProcessBLL.cs | 25 +++ .../Process/NWFProcessIBLL.cs | 8 + .../Process/NWFProcessSerivce.cs | 96 +++++++++++ 11 files changed, 564 insertions(+) create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/MonitorIndexOfmeeting.cshtml create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/MonitorIndexOfmeeting.js create mode 100644 Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/LR_LGManager/LC_meetingMap.cs create mode 100644 Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_LGManager/LC_meeting/LC_meetingEntity.cs diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Controllers/NWFProcessController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Controllers/NWFProcessController.cs index 9becdb2ed..dd2ee0489 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Controllers/NWFProcessController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Controllers/NWFProcessController.cs @@ -276,6 +276,15 @@ namespace Learun.Application.Web.Areas.LR_NewWorkFlow.Controllers { return View(); } + /// + /// 会议室申请统计 + /// + /// + [HttpGet] + public ActionResult MonitorIndexOfmeeting() + { + return View(); + } #endregion #region 获取数据 @@ -418,6 +427,27 @@ namespace Learun.Application.Web.Areas.LR_NewWorkFlow.Controllers }; return Success(jsonData); } + /// + /// 会议室申请流程表单统计 + /// + /// 分页参数 + /// 查询条件 + /// + [HttpGet] + [AjaxOnly] + public ActionResult GetPageListOfmeeting(string pagination, string queryJson) + { + Pagination paginationobj = pagination.ToObject(); + var list = nWFProcessIBLL.GetPageListOfmeeting(paginationobj, queryJson); + var jsonData = new + { + rows = list, + total = paginationobj.total, + page = paginationobj.page, + records = paginationobj.records, + }; + return Success(jsonData); + } #endregion diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/MonitorIndexOfmeeting.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/MonitorIndexOfmeeting.cshtml new file mode 100644 index 000000000..d7b66ecb7 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/MonitorIndexOfmeeting.cshtml @@ -0,0 +1,76 @@ +@{ + ViewBag.Title = "流程监控"; + Layout = "~/Views/Shared/_Index.cshtml"; +} +
+
+
+
+
    +
  • 未完成
    • +
  • 已完成
    • +
+
+
+
+
+
+
+
+ @*
+
+
*@ +
+
+
+
+
申请人
+ +
+
+
会议主题
+ +
+
+
会议内容
+ +
+
+
会议室
+ +
+
+
会议时间
+ +
+
+
+
+
+ +
+
+  查询 +
+
+
+
+ +
+
+  查看 +
+
+
+ +
+
+
+
+
+@Html.AppendJsFile("/Areas/LR_NewWorkFlow/Views/NWFProcess/MonitorIndexOfmeeting.js") + + + + + diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/MonitorIndexOfmeeting.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/MonitorIndexOfmeeting.js new file mode 100644 index 000000000..154da69dd --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/MonitorIndexOfmeeting.js @@ -0,0 +1,143 @@ +/* + * 版 本 Learun-ADMS V7.0.3 力软敏捷开发框架(http://www.learun.cn) + * Copyright (c) 2013-2018 上海力软信息技术有限公司 + * 创建人：力软-前端开发组 + * 日 期：2018.12.19 + * 描 述：流程监控 + */ +var bootstrap = function ($, learun) { + "use strict"; + var categoryId = '1'; + var logbegin = ''; + var logend = ''; + + var page = { + init: function () { + $('#lr_verify').hide(); + page.initleft(); + page.initGrid(); + page.bind(); + }, + bind: function () { + $('#datesearch').lrdate({ + dfdata: [ + { name: '今天', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00') }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } }, + { name: '近7天', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'd', -6) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } }, + { name: '近1个月', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'm', -1) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } }, + { name: '近3个月', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'm', -3) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } }, + ], + // 月 + mShow: false, + premShow: false, + // 季度 + jShow: false, + prejShow: false, + // 年 + ysShow: false, + yxShow: false, + preyShow: false, + yShow: false, + selectfn: function (begin, end) { + logbegin = begin; + logend = end; + page.search(); + } + }); + $('#multiple_condition_query').lrMultipleQuery(function (queryJson) { + page.search(queryJson); + }, 280, 400); + // 查询 + $('#btn_Search').on('click', function () { + var keyword = $('#txt_Keyword').val(); + page.search({ keyword: keyword }); + }); + // 刷新 + $('#lr_refresh').on('click', function () { + location.reload(); + }); + // 查看 + $('#lr_eye').on('click', function () { + page.eye(); + }); + }, + initleft: function () { + $('#lr_left_list li').on('click', function () { + var $this = $(this); + var $parent = $this.parent(); + $parent.find('.active').removeClass('active'); + $this.addClass('active'); + categoryId = $this.attr('data-value'); + page.search(); + }); + }, + initGrid: function () { + $('#gridtable').lrAuthorizeJfGridLei({ + url: top.$.rootUrl + '/LR_NewWorkFlow/NWFProcess/GetPageListOfmeeting', + headData: [ + { label: "申请人", name: "F_CreateUserName", width: 100, align: "center" }, + { label: "会议主题", name: "LC_Title", width: 150, align: "center" }, + { label: "会议内容", name: "LC_Content", width: 200, align: "center" }, + { label: "会议室", name: "LC_Meetroom", width: 100, align: "center" }, + { label: "会议时间", name: "LC_MeetTime", width: 100, align: "center" }, + { + label: "流程审批状态", name: "F_EnabledMark", width: 70, align: "center", + formatter: function (cellvalue, row) { + if (row.F_IsFinished == 0) { + if (cellvalue == 1) { + if (row.F_IsUrge == "1" && categoryId == '2') { + return "催办加急"; + } + return "运行中"; + } else if (cellvalue == 2) { + return "草稿"; + } else if (cellvalue == 3) { + return "作废"; + } else { + return "终止"; + } + } + else { + return "结束"; + } + + } + }, + ], + mainId: 'F_Id', + isPage: true, + sidx: 'F_CreateDate DESC', + dblclick: function () { + page.eye(); + } + }); + page.search(); + }, + search: function (param) { + param = param || {}; + param.StartTime = logbegin; + param.EndTime = logend; + param.categoryId = categoryId; + $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); + }, + eye: function () { + var processId = $('#gridtable').jfGridValue('F_Id') || ''; + var title = $('#gridtable').jfGridValue('F_Title'); + var schemeName = $('#gridtable').jfGridValue('F_SchemeName'); + + if (schemeName != title && title) { + title = schemeName + "(" + title + ")"; + } + else { + title = schemeName; + } + + if (learun.checkrow(processId)) { + learun.frameTab.open({ F_ModuleId: 'monitor' + processId, F_FullName: '查看-' + title, F_UrlAddress: '/LR_NewWorkFlow/NWFProcess/MonitorDetailsIndex?processId=' + processId }); + } + } + }; + + page.init(); +} + + diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj b/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj index d0890b265..19e28fb20 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj @@ -1375,6 +1375,7 @@ + @@ -7721,6 +7722,7 @@ + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/LR_LGManager/LC_meetingMap.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/LR_LGManager/LC_meetingMap.cs new file mode 100644 index 000000000..e87fff2b4 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/LR_LGManager/LC_meetingMap.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_meetingMap : EntityTypeConfiguration + { + public LC_meetingMap() + { + #region 表、主键 + //表 + this.ToTable("LC_MEETING"); + //主键 + 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 b94b32bbd..9d2d9c36f 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 @@ -148,6 +148,7 @@ + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_LGManager/LC_meeting/LC_meetingEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_LGManager/LC_meeting/LC_meetingEntity.cs new file mode 100644 index 000000000..7a8689959 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_LGManager/LC_meeting/LC_meetingEntity.cs @@ -0,0 +1,153 @@ +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_meetingEntity + { + #region 实体成员 + /// + /// ID + /// + /// + [Column("LC_ID")] + public string LC_ID { get; set; } + /// + /// 申请人 + /// + /// + [Column("F_CREATEUSERNAME")] + public string F_CreateUserName { get; set; } + /// + /// 会议时间 + /// + /// + [Column("LC_MEETTIME")] + public string LC_MeetTime { get; set; } + /// + /// 会议室 + /// + /// + [Column("LC_MEETROOM")] + public string LC_MeetRoom { get; set; } + /// + /// 会议主题 + /// + /// + [Column("LC_TITLE")] + public string LC_Title { get; set; } + /// + /// 会议内容 + /// + /// + [Column("LC_CONTENT")] + public string LC_Content { get; set; } + + #endregion + + #region 扩展操作 + /// + /// 新增调用 + /// + public void Create() + { + this.LC_ID = Guid.NewGuid().ToString(); + UserInfo userInfo = LoginUserInfo.Get(); + this.F_CreateUserName = userInfo.realName; + } + /// + /// 编辑调用 + /// + /// + 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 458d768f7..b5650c17e 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 @@ -362,6 +362,7 @@ + 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 070ac41b9..ea84908b2 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 @@ -227,6 +227,31 @@ namespace Learun.Application.WorkFlow } } + /// + /// 会议室申请流程表单统计 + /// + /// 分页参数 + /// 查询条件 + /// + public IEnumerable GetPageListOfmeeting(Pagination pagination, string queryJson) + { + try + { + return nWFProcessSerive.GetPageListOfmeeting(pagination, queryJson); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + #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 6685aa55b..5197fb910 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 @@ -126,6 +126,14 @@ namespace Learun.Application.WorkFlow /// IEnumerable GetPageListOfyyspd(Pagination pagination, string queryJson); + /// + /// 会议室申请流程表单统计 + /// + /// 分页参数 + /// 查询条件 + /// + IEnumerable GetPageListOfmeeting(Pagination pagination, string queryJson); + #endregion 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 7a3d5be18..867d77f03 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 @@ -854,6 +854,102 @@ namespace Learun.Application.WorkFlow } } + /// + /// 会议室申请流程表单统计 + /// + /// 分页参数 + /// 查询条件 + /// + public IEnumerable GetPageListOfmeeting(Pagination pagination, string queryJson) + { + try + { + var misdbname = BaseRepository("CollegeMIS").getDbConnection().Database; + var basedbname = BaseRepository().getDbConnection().Database; + + var strSql = new StringBuilder(); + strSql.Append("select y.*,t.F_Id,t.F_SchemeId,t.F_SchemeCode,t.F_SchemeName,t.F_Title,t.F_Level,t.F_EnabledMark,t.F_IsFinished,t.F_CreateDate,t.F_CreateUserId,t.F_CreateUserName as F_CreateUserNameInProcess from LR_NWF_Process t left join LR_NWF_SchemeInfo s on t.F_SchemeCode=s.F_Code "); + strSql.Append($" left join {misdbname}.dbo.LC_meeting y on y.LC_ID=t.F_Id "); + strSql.Append(" where 1=1 and t.F_EnabledMark !=2 and t.F_EnabledMark != 3 and t.F_IsChild = 0 "); + strSql.Append(" and s.F_Code='LC_meeting' "); + + var queryParam = queryJson.ToJObject(); + // 虚拟参数 + var dp = new DynamicParameters(new { }); + + // 分类 + if (!queryParam["categoryId"].IsEmpty()) // 1:未完成 2:已完成 + { + if (queryParam["categoryId"].ToString() == "1") + { + strSql.Append(" and t.F_IsFinished = 0 "); + } + else + { + strSql.Append(" and t.F_IsFinished = 1 "); + } + } + //申请人 + if (!queryParam["F_CreateUserName"].IsEmpty()) + { + dp.Add("F_CreateUserName", "%" + queryParam["F_CreateUserName"].ToString() + "%", DbType.String); + strSql.Append(" AND y.F_CreateUserName like @F_CreateUserName "); + } + //会议主题 + if (!queryParam["LC_Title"].IsEmpty()) + { + dp.Add("LC_Title", "%" + queryParam["LC_Title"].ToString() + "%", DbType.String); + strSql.Append(" AND y.LC_Title like @LC_Title "); + } + //会议内容 + if (!queryParam["LC_Content"].IsEmpty()) + { + dp.Add("LC_Content", "%" + queryParam["LC_Content"].ToString() + "%", DbType.String); + strSql.Append(" AND y.LC_Content like @LC_Content "); + } + //会议室 + if (!queryParam["LC_Meetroom"].IsEmpty()) + { + dp.Add("LC_Meetroom", "%" + queryParam["LC_Meetroom"].ToString() + "%", DbType.String); + strSql.Append(" AND y.LC_Meetroom like @LC_Meetroom "); + } + //会议时间 + if (!queryParam["LC_MeetTime"].IsEmpty()) + { + dp.Add("LC_MeetTime", "%" + queryParam["LC_MeetTime"].ToString() + "%", DbType.String); + strSql.Append(" AND y.LC_MeetTime like @LC_MeetTime "); + } + //关键字：申请人、会议主题、会议内容、会议室、会议时间 + if (!queryParam["keyword"].IsEmpty()) + { + dp.Add("keyword", "%" + queryParam["keyword"].ToString() + "%", DbType.String); + strSql.Append(" AND (y.F_CreateUserName like @keyword or y.LC_Title like @keyword or y.LC_Content like @keyword or y.LC_Meetroom like @keyword or y.LC_MeetTime like @keyword) "); + } + // 会议时间 + if (!queryParam["StartTime"].IsEmpty() && !queryParam["EndTime"].IsEmpty()) + { + dp.Add("StartTime", queryParam["StartTime"].ToString(), DbType.Date); + dp.Add("EndTime", queryParam["EndTime"].ToString(), DbType.Date); + strSql.Append(" and (y.LC_MeetTime >= @StartTime and y.LC_MeetTime <= @EndTime)"); + } + + var result = this.BaseRepository().FindList(strSql.ToString(), dp); + + return result; + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + #endregion From a4246a504ce6b467471c7883c634163bf5995205 Mon Sep 17 00:00:00 2001 From: dyy <18335927079@163.com> Date: Wed, 20 Apr 2022 10:29:21 +0800 Subject: [PATCH 5/9] =?UTF-8?q?=E5=90=88=E5=B9=B6=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Learun.Application.Web/Learun.Application.Web.csproj | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj b/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj index 106e7c3c3..b427ac022 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj @@ -1375,6 +1375,7 @@ + @@ -7723,6 +7724,7 @@ + From f50bdf1595f58bd667d680c69a5c06d00e1afb18 Mon Sep 17 00:00:00 2001 From: ndbs Date: Wed, 20 Apr 2022 14:54:14 +0800 Subject: [PATCH 6/9] =?UTF-8?q?=E8=AF=B7=E5=81=87=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/NWFProcessController.cs | 46 ++++- .../Views/NWFProcess/LeaveStatistics.cshtml | 64 +++++++ .../Views/NWFProcess/LeaveStatistics.js | 177 ++++++++++++++++++ .../Learun.Application.Web.csproj | 4 + .../Process/NWFProcessBLL.cs | 4 + .../Process/NWFProcessEntity.cs | 37 ++++ .../Process/NWFProcessIBLL.cs | 2 + .../Process/NWFProcessSerivce.cs | 64 ++++++- 8 files changed, 394 insertions(+), 4 deletions(-) create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/LeaveStatistics.cshtml create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/LeaveStatistics.js diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Controllers/NWFProcessController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Controllers/NWFProcessController.cs index 9359d9ae4..c1b5d64bc 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Controllers/NWFProcessController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Controllers/NWFProcessController.cs @@ -253,6 +253,16 @@ namespace Learun.Application.Web.Areas.LR_NewWorkFlow.Controllers return View(); } [HttpGet] + public ActionResult LeaveStatistics() + { + return View(); + } + [HttpGet] + public ActionResult Transceiver() + { + return View(); + } + [HttpGet] public ActionResult MonitorIndexRenShi() { return View(); @@ -320,6 +330,36 @@ namespace Learun.Application.Web.Areas.LR_NewWorkFlow.Controllers }; return Success(jsonData); } + [HttpGet] + [AjaxOnly] + public ActionResult GetLeaveStatistics(string pagination, string queryJson) + { + Pagination paginationobj = pagination.ToObject(); + var list = nWFProcessIBLL.GetLeaveStatistics(paginationobj, queryJson); + var jsonData = new + { + rows = list, + total = paginationobj.total, + page = paginationobj.page, + records = paginationobj.records, + }; + return Success(jsonData); + } + //[HttpGet] + //[AjaxOnly] + //public ActionResult GetUseCar(string pagination, string queryJson) + //{ + // Pagination paginationobj = pagination.ToObject(); + // var list = nWFProcessIBLL.GetUseCar(paginationobj, queryJson); + // var jsonData = new + // { + // rows = list, + // total = paginationobj.total, + // page = paginationobj.page, + // records = paginationobj.records, + // }; + // return Success(jsonData); + //} public ActionResult GetFirstTaskByProcessId(string processId) { @@ -924,7 +964,7 @@ namespace Learun.Application.Web.Areas.LR_NewWorkFlow.Controllers { var userentity = userIbll.GetEntityByUserId(uid); string deptname = departmentIbll.GetEntity(userentity?.F_DepartmentId)?.F_FullName; - usernamelist.Add("["+ deptname + "]"+userentity?.F_RealName); + usernamelist.Add("[" + deptname + "]" + userentity?.F_RealName); } return SuccessString(string.Join(",", usernamelist)); } @@ -932,8 +972,8 @@ namespace Learun.Application.Web.Areas.LR_NewWorkFlow.Controllers [HttpGet] public ActionResult GetNextUserMonitor(string F_ProcessId) { - var tasklist=nWFTaskIBLL.GetUnFinishTaskList(F_ProcessId).FirstOrDefault(); - if (tasklist!=null&&!string.IsNullOrEmpty(tasklist.F_Id)) + var tasklist = nWFTaskIBLL.GetUnFinishTaskList(F_ProcessId).FirstOrDefault(); + if (tasklist != null && !string.IsNullOrEmpty(tasklist.F_Id)) { List usernamelist = new List(); List nextlist = nWFTaskIBLL.GetTaskUserList(tasklist.F_Id).Select(m => m.F_UserId).ToList(); 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 new file mode 100644 index 000000000..be9e462ef --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/LeaveStatistics.cshtml @@ -0,0 +1,64 @@ +@{ + ViewBag.Title = "用车申请统计"; + Layout = "~/Views/Shared/_Index.cshtml"; +} +
+
+
+
+
    +
  • 未完成
    • +
  • 已完成
    • +
+
+
+
+
+
+
+
+
+
+
+
+
姓名
+
+
+
+
联系电话
+ +
+
+
请假种类
+
+
+
+
+
+
+
用车部门
+
+
+
+
+ +
+
+  查看 + @* 指派审核人 +  作废*@ +
+
+
+ +
+
+
+
+
+@Html.AppendJsFile("/Areas/LR_NewWorkFlow/Views/NWFProcess/LeaveStatistics.js") + + + + + 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 new file mode 100644 index 000000000..79965dda0 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/LeaveStatistics.js @@ -0,0 +1,177 @@ +/* + * 版 本 Learun-ADMS V7.0.3 力软敏捷开发框架(http://www.learun.cn) + * Copyright (c) 2013-2018 上海力软信息技术有限公司 + * 创建人：力软-前端开发组 + * 日 期：2018.12.19 + * 描 述：流程监控 + */ +var bootstrap = function ($, learun) { + "use strict"; + var categoryId = '1'; + var logbegin = ''; + var logend = ''; + + var page = { + init: function () { + $('#lr_verify').hide(); + page.initleft(); + page.initGrid(); + page.bind(); + }, + bind: function () { + $('#datesearch').lrdate({ + dfdata: [ + { name: '今天', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00') }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } }, + { name: '近7天', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'd', -6) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } }, + { name: '近1个月', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'm', -1) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } }, + { name: '近3个月', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'm', -3) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } }, + ], + // 月 + mShow: false, + premShow: false, + // 季度 + jShow: false, + prejShow: false, + // 年 + ysShow: false, + yxShow: false, + preyShow: false, + yShow: false, + selectfn: function (begin, end) { + logbegin = begin; + logend = end; + page.search(); + } + }); + $('#multiple_condition_query').lrMultipleQuery(function (queryJson) { + page.search(queryJson); + }, 200, 400); + $('#qj_lx').lrDataItemSelect({ code: 'LeaveType' }); + $('#qj_name').lrDataSourceSelect({ code: 'teacheruserdata', value: 'f_userid', text: 'f_realname' }); + // 刷新 + $('#lr_refresh').on('click', function () { + location.reload(); + }); + // 查看 + $('#lr_eye').on('click', function () { + page.eye(); + }); + }, + initleft: function () { + $('#lr_left_list li').on('click', function () { + var $this = $(this); + var $parent = $this.parent(); + $parent.find('.active').removeClass('active'); + $this.addClass('active'); + categoryId = $this.attr('data-value'); + page.search(); + }); + }, + initGrid: function () { + $('#gridtable').lrAuthorizeJfGridLei({ + url: top.$.rootUrl + '/LR_NewWorkFlow/NWFProcess/GetLeaveStatistics', + headData: [ + { + label: "姓名", name: "qj_name", width: 100, align: "center", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'teacheruserdata', + key: value, + keyId: 'f_userid', + callback: function (_data) { + callback(_data["f_realname"]); + } + }); + } + }, + { label: "填表时间", name: "qj_txsj", width: 150, align: "center" }, + { label: "联系电话", name: "qj_bm", width: 100, align: "center" }, + { + label: "请假种类", name: "qj_lx", width: 100, align: "center" , + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'LeaveType', + callback: function (_data) { + callback(_data.text); + } + }); + } + }, + { label: "开始时间", name: "qj_sjks", width: 150, align: "center" }, + { label: "结束时间", name: "qj_sjjs", width: 150, align: "center" }, + { + label: "请假天数", name: "qj_dh", width: 100, align: "center" , + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'LeaveDay', + callback: function (_data) { + callback(_data.text); + } + }); + } + }, + { label: "请假事由", name: "qj_ly", width: 100, align: "center" }, + { + label: "状态", name: "F_EnabledMark", width: 100, align: "center", + formatter: function (cellvalue, row) { + if (row.F_IsFinished == 0) { + if (cellvalue == 1) { + if (row.F_IsUrge == "1" && categoryId == '2') { + return "催办加急"; + } + return "运行中"; + } else if (cellvalue == 2) { + return "草稿"; + } else { + return "作废"; + } + } + else { + return "结束"; + } + + } + }, + ], + mainId: 'F_Id', + isPage: true, + sidx: 'qj_txsj DESC', + dblclick: function () { + page.eye(); + } + }); + page.search(); + }, + search: function (param) { + param = param || {}; + param.StartTime = logbegin; + param.EndTime = logend; + param.categoryId = categoryId; + param.F_Category = 'LC_leave'; + param.F_SchemeCode = 'LC_leave'; + $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); + }, + eye: function () { + var processId = $('#gridtable').jfGridValue('LC_ID') || ''; + var title = $('#gridtable').jfGridValue('F_Title'); + var schemeName = $('#gridtable').jfGridValue('F_SchemeName'); + + if (schemeName != title && title) { + title = schemeName + "(" + title + ")"; + } + else { + title = schemeName; + } + + if (learun.checkrow(processId)) { + learun.frameTab.open({ F_ModuleId: 'monitor' + processId, F_FullName: '查看-' + title, F_UrlAddress: '/LR_NewWorkFlow/NWFProcess/MonitorDetailsIndex?processId=' + processId }); + } + } + }; + + page.init(); +} + + diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj b/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj index 106e7c3c3..9ffeaa58d 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj @@ -1375,6 +1375,7 @@ + @@ -1383,6 +1384,7 @@ + @@ -7723,6 +7725,8 @@ + + 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 e5fcde25f..b95a96612 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 @@ -71,6 +71,10 @@ namespace Learun.Application.WorkFlow { return nWFProcessSerive.GetUseCar(pagination, queryJson); } + public IEnumerable GetLeaveStatistics(Pagination pagination, string queryJson) + { + return nWFProcessSerive.GetLeaveStatistics(pagination, queryJson); + } public string GetFirstTaskByProcessId(string processId) { return nWFProcessSerive.GetFirstTaskByProcessId(processId); 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 79bde2637..e12c903a7 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 @@ -201,6 +201,43 @@ namespace Learun.Application.WorkFlow 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 5ed83eeba..017835a8d 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 @@ -29,6 +29,8 @@ namespace Learun.Application.WorkFlow /// IEnumerable GetPageList(Pagination pagination, string queryJson); IEnumerable GetUseCar(Pagination pagination, string queryJson); + IEnumerable GetLeaveStatistics(Pagination pagination, string queryJson); + string GetFirstTaskByProcessId(string processId); IEnumerable GetAllList(); LC_hetongEntity GetHTInfo(string keyValue); 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 eab4358f9..481b4095a 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 @@ -187,7 +187,7 @@ namespace Learun.Application.WorkFlow strSql.Append(" and zb.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' "); + strSql.Append(" and zb.F_EnabledMark != '3' and F_EnabledMark != '2' and F_IsChild='0' "); //if (!queryParam["StartTime"].IsEmpty() && !queryParam["EndTime"].IsEmpty()) //{ // DateTime startTime = queryParam["StartTime"].ToDate(); @@ -231,6 +231,68 @@ namespace Learun.Application.WorkFlow } } + /// + /// 获取流程信息列表 + /// + /// 分页参数 + /// 查询条件 + /// + public IEnumerable GetLeaveStatistics(Pagination pagination, string queryJson) + { + try + { + var queryParam = queryJson.ToJObject(); + var dbName = this.BaseRepository().getDbConnection().Database; + var dbMISName = this.BaseRepository("CollegeMIS").getDbConnection().Database; + var dp = new DynamicParameters(new { }); + 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 "); + if (queryParam["categoryId"].ToString() == "1") + { + strSql.Append(" and lnp.F_IsFinished= '0' "); + } + else + { + 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 != '2' and lnp.F_IsChild='0' "); + strSql.Append(" and lnp.F_IsStart=1 "); + if (!queryParam["qj_name"].IsEmpty()) + { + strSql.Append(" and zb.qj_name = '" + queryParam["qj_name"].ToString() + "' "); + } + if (!queryParam["qj_bm"].IsEmpty()) + { + strSql.Append(" and zb.qj_bm like '%" + queryParam["qj_bm"].ToString() + "%' "); + } + if (!queryParam["qj_lx"].IsEmpty()) + { + strSql.Append(" and zb.qj_lx = '" + queryParam["qj_lx"].ToString() + "' "); + } + if (!queryParam["StartTime"].IsEmpty() && !queryParam["EndTime"].IsEmpty()) + { + DateTime startTime = queryParam["StartTime"].ToDate(); + 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); + + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } /// /// 根据processid 获取taskid /// From 57fb6d8474e8143c8e5e2a99ec6509437a62937e Mon Sep 17 00:00:00 2001 From: ndbs Date: Wed, 20 Apr 2022 15:39:23 +0800 Subject: [PATCH 7/9] =?UTF-8?q?=E6=94=B6=E5=8F=91=E6=96=87=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/NWFProcessController.cs | 30 ++-- .../Views/NWFProcess/Transceiver.cshtml | 60 ++++++++ .../Views/NWFProcess/Transceiver.js | 144 ++++++++++++++++++ .../Learun.Application.Web.csproj | 4 +- .../Process/NWFProcessBLL.cs | 4 + .../Process/NWFProcessIBLL.cs | 1 + .../Process/NWFProcessSerivce.cs | 65 +++++++- 7 files changed, 286 insertions(+), 22 deletions(-) create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/Transceiver.cshtml create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/Transceiver.js diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Controllers/NWFProcessController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Controllers/NWFProcessController.cs index 317bb331d..78927c642 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Controllers/NWFProcessController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Controllers/NWFProcessController.cs @@ -354,21 +354,21 @@ namespace Learun.Application.Web.Areas.LR_NewWorkFlow.Controllers }; return Success(jsonData); } - //[HttpGet] - //[AjaxOnly] - //public ActionResult GetUseCar(string pagination, string queryJson) - //{ - // Pagination paginationobj = pagination.ToObject(); - // var list = nWFProcessIBLL.GetUseCar(paginationobj, queryJson); - // var jsonData = new - // { - // rows = list, - // total = paginationobj.total, - // page = paginationobj.page, - // records = paginationobj.records, - // }; - // return Success(jsonData); - //} + [HttpGet] + [AjaxOnly] + public ActionResult GetTransceiver(string pagination, string queryJson) + { + Pagination paginationobj = pagination.ToObject(); + var list = nWFProcessIBLL.GetTransceiver(paginationobj, queryJson); + var jsonData = new + { + rows = list, + total = paginationobj.total, + page = paginationobj.page, + records = paginationobj.records, + }; + return Success(jsonData); + } public ActionResult GetFirstTaskByProcessId(string processId) { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/Transceiver.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/Transceiver.cshtml new file mode 100644 index 000000000..b4a251d6f --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/Transceiver.cshtml @@ -0,0 +1,60 @@ +@{ + ViewBag.Title = "用车申请统计"; + Layout = "~/Views/Shared/_Index.cshtml"; +} +
+
+
+
+
    +
  • 未完成
    • +
  • 已完成
    • +
+
+
+
+
+
+
+
+
+
+
+
+
来文单位
+ +
+
+
文件名称
+ +
+
+
+
+
+
+
+
+
+
+ +
+
+  查看 + @* 指派审核人 +  作废*@ +
+
+
+ +
+
+
+
+
+@Html.AppendJsFile("/Areas/LR_NewWorkFlow/Views/NWFProcess/Transceiver.js") + + + + + 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 new file mode 100644 index 000000000..39d203c1d --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/Transceiver.js @@ -0,0 +1,144 @@ +/* + * 版 本 Learun-ADMS V7.0.3 力软敏捷开发框架(http://www.learun.cn) + * Copyright (c) 2013-2018 上海力软信息技术有限公司 + * 创建人：力软-前端开发组 + * 日 期：2018.12.19 + * 描 述：流程监控 + */ +var bootstrap = function ($, learun) { + "use strict"; + var categoryId = '1'; + var logbegin = ''; + var logend = ''; + + var page = { + init: function () { + $('#lr_verify').hide(); + page.initleft(); + page.initGrid(); + page.bind(); + }, + bind: function () { + $('#datesearch').lrdate({ + dfdata: [ + { name: '今天', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00') }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } }, + { name: '近7天', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'd', -6) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } }, + { name: '近1个月', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'm', -1) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } }, + { name: '近3个月', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'm', -3) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } }, + ], + // 月 + mShow: false, + premShow: false, + // 季度 + jShow: false, + prejShow: false, + // 年 + ysShow: false, + yxShow: false, + preyShow: false, + yShow: false, + selectfn: function (begin, end) { + logbegin = begin; + logend = end; + page.search(); + } + }); + $('#multiple_condition_query').lrMultipleQuery(function (queryJson) { + page.search(queryJson); + }, 200, 400); + $('#qj_lx').lrDataItemSelect({ code: 'LeaveType' }); + $('#qj_name').lrDataSourceSelect({ code: 'teacheruserdata', value: 'f_userid', text: 'f_realname' }); + // 刷新 + $('#lr_refresh').on('click', function () { + location.reload(); + }); + // 查看 + $('#lr_eye').on('click', function () { + page.eye(); + }); + }, + initleft: function () { + $('#lr_left_list li').on('click', function () { + var $this = $(this); + var $parent = $this.parent(); + $parent.find('.active').removeClass('active'); + $this.addClass('active'); + categoryId = $this.attr('data-value'); + page.search(); + }); + }, + initGrid: function () { + $('#gridtable').lrAuthorizeJfGridLei({ + url: top.$.rootUrl + '/LR_NewWorkFlow/NWFProcess/GetTransceiver', + headData: [ + { label: "来文单位", name: "LC_party", width: 100, align: "center" }, + { label: "日期", name: "LC_accept", width: 150, align: "center" }, + { label: "页数", name: "LC_amount", width: 100, align: "center" }, + { label: "收文编号", name: "LC_num", width: 100, align: "center" }, + { label: "文号", name: "LC_numdoc", width: 100, align: "center" }, + { label: "文件名称", name: "LC_name", width: 100, align: "center" }, + { label: "急缓程度", name: "LC_important", width: 100, align: "center" }, + { label: "秘密级别", name: "LC_secret", width: 150, align: "center" }, + { label: "备注", name: "LC_other", width: 150, align: "center" }, + { + label: "状态", name: "F_EnabledMark", width: 100, align: "center", + formatter: function (cellvalue, row) { + if (row.F_IsFinished == 0) { + if (cellvalue == 1) { + if (row.F_IsUrge == "1" && categoryId == '2') { + return "催办加急"; + } + return "运行中"; + } else if (cellvalue == 2) { + return "草稿"; + } else { + return "作废"; + } + } + else { + return "结束"; + } + + } + }, + ], + mainId: 'F_Id', + isPage: true, + sidx: 'F_CreateDate DESC', + dblclick: function () { + page.eye(); + } + }); + page.search(); + }, + search: function (param) { + param = param || {}; + param.StartTime = logbegin; + param.EndTime = logend; + param.categoryId = categoryId; + param.F_Category = 'LC_leave'; + param.F_SchemeCode = 'LC_leave'; + $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); + }, + eye: function () { + var processId = $('#gridtable').jfGridValue('LC_ID') || ''; + var title = $('#gridtable').jfGridValue('F_Title'); + var schemeName = $('#gridtable').jfGridValue('F_SchemeName'); + + if (schemeName != title && title) { + title = schemeName + "(" + title + ")"; + } + else { + title = schemeName; + } + + if (learun.checkrow(processId)) { + learun.frameTab.open({ F_ModuleId: 'monitor' + processId, F_FullName: '查看-' + title, F_UrlAddress: '/LR_NewWorkFlow/NWFProcess/MonitorDetailsIndex?processId=' + processId }); + } + } + }; + + page.init(); +} + + diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj b/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj index dbda368dd..b73496469 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj @@ -1376,7 +1376,6 @@ - @@ -1386,6 +1385,7 @@ + @@ -7727,8 +7727,8 @@ - + 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 0e1cee292..110d3a63f 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 @@ -75,6 +75,10 @@ namespace Learun.Application.WorkFlow { return nWFProcessSerive.GetLeaveStatistics(pagination, queryJson); } + public IEnumerable GetTransceiver(Pagination pagination, string queryJson) + { + return nWFProcessSerive.GetTransceiver(pagination, queryJson); + } public string GetFirstTaskByProcessId(string processId) { return nWFProcessSerive.GetFirstTaskByProcessId(processId); 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 d8ddb973f..550b03b3d 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 @@ -30,6 +30,7 @@ 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); 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 eee235ca6..462d94aab 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 @@ -187,14 +187,13 @@ namespace Learun.Application.WorkFlow strSql.Append(" and zb.F_IsFinished= '1' "); } strSql.Append(" and zb.F_SchemeCode = 'LC_gcsq' "); - strSql.Append(" and zb.F_EnabledMark != '3' and F_EnabledMark != '2' and F_IsChild='0' "); + 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 + " )"); //} - strSql.Append(" and F_IsStart=1 "); if (!queryParam["LC_ycbm"].IsEmpty()) { strSql.Append(" and cl.LC_ycbm like '%" + queryParam["LC_ycbm"].ToString() + "%' "); @@ -246,7 +245,7 @@ namespace Learun.Application.WorkFlow var dbMISName = this.BaseRepository("CollegeMIS").getDbConnection().Database; var dp = new DynamicParameters(new { }); var strSql = new StringBuilder(); - strSql.Append(" select zb.*,lnp.* from "+ dbMISName + ".[dbo].cs_qj zb "); + 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 "); if (queryParam["categoryId"].ToString() == "1") @@ -258,8 +257,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 != '2' and lnp.F_IsChild='0' "); - strSql.Append(" and lnp.F_IsStart=1 "); + 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() + "' "); @@ -294,6 +292,63 @@ namespace Learun.Application.WorkFlow } } /// + /// 获取流程信息列表 + /// + /// 分页参数 + /// 查询条件 + /// + public IEnumerable GetTransceiver(Pagination pagination, string queryJson) + { + try + { + var queryParam = queryJson.ToJObject(); + var dbName = this.BaseRepository().getDbConnection().Database; + var dbMISName = this.BaseRepository("CollegeMIS").getDbConnection().Database; + var dp = new DynamicParameters(new { }); + 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 "); + if (queryParam["categoryId"].ToString() == "1") + { + strSql.Append(" and lnp.F_IsFinished= '0' "); + } + else + { + 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() + "%' "); + } + if (!queryParam["LC_name"].IsEmpty()) + { + strSql.Append(" and zb.LC_name like '%" + queryParam["LC_name"].ToString() + "%' "); + } + if (!queryParam["StartTime"].IsEmpty() && !queryParam["EndTime"].IsEmpty()) + { + DateTime startTime = queryParam["StartTime"].ToDate(); + DateTime endTime = queryParam["EndTime"].ToDate(); + strSql.Append(" and ( zb.LC_accept>= '" + startTime + "' and zb.LC_accept <= '" + endTime + "' )"); + } + return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(), dp); + + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + /// /// 根据processid 获取taskid /// /// 流程id From 1cfd411fb4feef8130476150229a8d0a253dc4c4 Mon Sep 17 00:00:00 2001 From: dyy <18335927079@163.com> Date: Wed, 20 Apr 2022 16:20:50 +0800 Subject: [PATCH 8/9] =?UTF-8?q?=E3=80=90=E5=A2=9E=E5=8A=A0=E3=80=91?= =?UTF-8?q?=E5=8A=9E=E4=BA=8B=E5=A4=A7=E5=8E=85=E5=A2=9E=E5=8A=A0=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E7=BB=9F=E8=AE=A1=EF=BC=9A=E5=85=9A=E5=A7=94=E4=BC=9A?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E7=BB=9F=E8=AE=A1=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/NWFProcessController.cs | 30 ++++ .../NWFProcess/MonitorIndexOfdwhsq.cshtml | 72 ++++++++ .../Views/NWFProcess/MonitorIndexOfdwhsq.js | 143 ++++++++++++++++ .../Learun.Application.Web.csproj | 2 + .../LR_LGManager/LC_dwhsqMap.cs | 29 ++++ .../Learun.Application.Mapping.csproj | 1 + .../LR_LGManager/LC_dwhsq/LC_dwhsqEntity.cs | 159 ++++++++++++++++++ .../Learun.Application.TwoDevelopment.csproj | 1 + .../Process/NWFProcessBLL.cs | 25 +++ .../Process/NWFProcessIBLL.cs | 8 + .../Process/NWFProcessSerivce.cs | 90 ++++++++++ 11 files changed, 560 insertions(+) create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/MonitorIndexOfdwhsq.cshtml create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/MonitorIndexOfdwhsq.js create mode 100644 Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/LR_LGManager/LC_dwhsqMap.cs create mode 100644 Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_LGManager/LC_dwhsq/LC_dwhsqEntity.cs diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Controllers/NWFProcessController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Controllers/NWFProcessController.cs index 4147bee19..993bc7bd1 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Controllers/NWFProcessController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Controllers/NWFProcessController.cs @@ -290,6 +290,15 @@ namespace Learun.Application.Web.Areas.LR_NewWorkFlow.Controllers { return View(); } + /// + /// 党委会党委专题会申请统计 + /// + /// + [HttpGet] + public ActionResult MonitorIndexOfdwhsq() + { + return View(); + } #endregion #region 获取数据 @@ -467,6 +476,27 @@ namespace Learun.Application.Web.Areas.LR_NewWorkFlow.Controllers }; return Success(jsonData); } + /// + /// 党委会党委专题会申请流程表单统计 + /// + /// 分页参数 + /// 查询条件 + /// + [HttpGet] + [AjaxOnly] + public ActionResult GetPageListOfdwhsq(string pagination, string queryJson) + { + Pagination paginationobj = pagination.ToObject(); + var list = nWFProcessIBLL.GetPageListOfdwhsq(paginationobj, queryJson); + var jsonData = new + { + rows = list, + total = paginationobj.total, + page = paginationobj.page, + records = paginationobj.records, + }; + return Success(jsonData); + } #endregion diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/MonitorIndexOfdwhsq.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/MonitorIndexOfdwhsq.cshtml new file mode 100644 index 000000000..4b1661d83 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/MonitorIndexOfdwhsq.cshtml @@ -0,0 +1,72 @@ +@{ + ViewBag.Title = "流程监控"; + Layout = "~/Views/Shared/_Index.cshtml"; +} +
+
+
+
+
    +
  • 未完成
    • +
  • 已完成
    • +
+
+
+
+
+
+
+
+ @*
+
+
*@ +
+
+
+
+
申请人
+ +
+
+
会议主题
+ +
+
+
会议内容
+ +
+
+
会议时间
+ +
+
+
+
+
+ +
+
+  查询 +
+
+
+
+ +
+
+  查看 +
+
+
+ +
+
+
+
+
+@Html.AppendJsFile("/Areas/LR_NewWorkFlow/Views/NWFProcess/MonitorIndexOfdwhsq.js") + + + + + diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/MonitorIndexOfdwhsq.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/MonitorIndexOfdwhsq.js new file mode 100644 index 000000000..c28790f7e --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/MonitorIndexOfdwhsq.js @@ -0,0 +1,143 @@ +/* + * 版 本 Learun-ADMS V7.0.3 力软敏捷开发框架(http://www.learun.cn) + * Copyright (c) 2013-2018 上海力软信息技术有限公司 + * 创建人：力软-前端开发组 + * 日 期：2018.12.19 + * 描 述：流程监控 + */ +var bootstrap = function ($, learun) { + "use strict"; + var categoryId = '1'; + var logbegin = ''; + var logend = ''; + + var page = { + init: function () { + $('#lr_verify').hide(); + page.initleft(); + page.initGrid(); + page.bind(); + }, + bind: function () { + $('#datesearch').lrdate({ + dfdata: [ + { name: '今天', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00') }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } }, + { name: '近7天', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'd', -6) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } }, + { name: '近1个月', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'm', -1) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } }, + { name: '近3个月', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'm', -3) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } }, + ], + // 月 + mShow: false, + premShow: false, + // 季度 + jShow: false, + prejShow: false, + // 年 + ysShow: false, + yxShow: false, + preyShow: false, + yShow: false, + selectfn: function (begin, end) { + logbegin = begin; + logend = end; + page.search(); + } + }); + $('#multiple_condition_query').lrMultipleQuery(function (queryJson) { + page.search(queryJson); + }, 280, 400); + // 查询 + $('#btn_Search').on('click', function () { + var keyword = $('#txt_Keyword').val(); + page.search({ keyword: keyword }); + }); + // 刷新 + $('#lr_refresh').on('click', function () { + location.reload(); + }); + // 查看 + $('#lr_eye').on('click', function () { + page.eye(); + }); + }, + initleft: function () { + $('#lr_left_list li').on('click', function () { + var $this = $(this); + var $parent = $this.parent(); + $parent.find('.active').removeClass('active'); + $this.addClass('active'); + categoryId = $this.attr('data-value'); + page.search(); + }); + }, + initGrid: function () { + $('#gridtable').lrAuthorizeJfGridLei({ + url: top.$.rootUrl + '/LR_NewWorkFlow/NWFProcess/GetPageListOfdwhsq', + headData: [ + { label: "会议主题", name: "LC_hyzt", width: 150, align: "center" }, + { label: "会议时间", name: "LC_hysj", width: 100, align: "center" }, + { label: "会议内容", name: "LC_hynr", width: 200, align: "center" }, + { label: "参会人员", name: "LC_chry", width: 100, align: "center" }, + { label: "申请人", name: "F_CreateUserName", width: 100, align: "center" }, + { + label: "流程审批状态", name: "F_EnabledMark", width: 70, align: "center", + formatter: function (cellvalue, row) { + if (row.F_IsFinished == 0) { + if (cellvalue == 1) { + if (row.F_IsUrge == "1" && categoryId == '2') { + return "催办加急"; + } + return "运行中"; + } else if (cellvalue == 2) { + return "草稿"; + } else if (cellvalue == 3) { + return "作废"; + } else { + return "终止"; + } + } + else { + return "结束"; + } + + } + }, + ], + mainId: 'F_Id', + isPage: true, + sidx: 'F_CreateDate DESC', + dblclick: function () { + page.eye(); + } + }); + page.search(); + }, + search: function (param) { + param = param || {}; + param.StartTime = logbegin; + param.EndTime = logend; + param.categoryId = categoryId; + $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); + }, + eye: function () { + var processId = $('#gridtable').jfGridValue('F_Id') || ''; + var title = $('#gridtable').jfGridValue('F_Title'); + var schemeName = $('#gridtable').jfGridValue('F_SchemeName'); + + if (schemeName != title && title) { + title = schemeName + "(" + title + ")"; + } + else { + title = schemeName; + } + + if (learun.checkrow(processId)) { + learun.frameTab.open({ F_ModuleId: 'monitor' + processId, F_FullName: '查看-' + title, F_UrlAddress: '/LR_NewWorkFlow/NWFProcess/MonitorDetailsIndex?processId=' + processId }); + } + } + }; + + page.init(); +} + + diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj b/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj index b427ac022..7fb3e6206 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj @@ -1375,6 +1375,7 @@ + @@ -7725,6 +7726,7 @@ + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/LR_LGManager/LC_dwhsqMap.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/LR_LGManager/LC_dwhsqMap.cs new file mode 100644 index 000000000..617deb4d4 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/LR_LGManager/LC_dwhsqMap.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_dwhsqMap : EntityTypeConfiguration + { + public LC_dwhsqMap() + { + #region 表、主键 + //表 + this.ToTable("LC_DWHSQ"); + //主键 + 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..b6af214cc 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 @@ -148,6 +148,7 @@ + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_LGManager/LC_dwhsq/LC_dwhsqEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_LGManager/LC_dwhsq/LC_dwhsqEntity.cs new file mode 100644 index 000000000..bc5ceae3b --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_LGManager/LC_dwhsq/LC_dwhsqEntity.cs @@ -0,0 +1,159 @@ +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_dwhsqEntity + { + #region 实体成员 + /// + /// ID + /// + /// + [Column("LC_ID")] + public string LC_ID { get; set; } + /// + /// 申请人 + /// + /// + [Column("F_CREATEUSERNAME")] + public string F_CreateUserName { get; set; } + /// + /// 会议主题 + /// + /// + [Column("LC_HYZT")] + public string LC_hyzt { get; set; } + /// + /// 会议内容 + /// + /// + [Column("LC_HYNR")] + public string LC_hynr { get; set; } + /// + /// 参会人员 + /// + /// + [Column("LC_CHRY")] + public string LC_chry { get; set; } + /// + /// LC_fj + /// + /// + [Column("LC_FJ")] + public string LC_fj { get; set; } + /// + /// 会议时间 + /// + /// + [Column("LC_HYSJ")] + public string LC_hysj { get; set; } + + #endregion + + #region 扩展操作 + /// + /// 新增调用 + /// + public void Create() + { + this.LC_ID = Guid.NewGuid().ToString(); + UserInfo userInfo = LoginUserInfo.Get(); + this.F_CreateUserName = userInfo.realName; + } + /// + /// 编辑调用 + /// + /// + 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..681475fd9 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,7 @@ + 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 f873bc1fe..b2b975950 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 @@ -257,6 +257,31 @@ namespace Learun.Application.WorkFlow } } + /// + /// 党委会党委专题会申请流程表单统计 + /// + /// 分页参数 + /// 查询条件 + /// + public IEnumerable GetPageListOfdwhsq(Pagination pagination, string queryJson) + { + try + { + return nWFProcessSerive.GetPageListOfdwhsq(pagination, queryJson); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + #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 cf6f21e8d..069bbac9c 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 @@ -136,6 +136,14 @@ namespace Learun.Application.WorkFlow IEnumerable GetPageListOfmeeting(Pagination pagination, string queryJson); + /// + /// 党委会党委专题会申请流程表单统计 + /// + /// 分页参数 + /// 查询条件 + /// + IEnumerable GetPageListOfdwhsq(Pagination pagination, string queryJson); + #endregion 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 55b25f659..425e8298f 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 @@ -1022,6 +1022,96 @@ namespace Learun.Application.WorkFlow } } + /// + /// 党委会党委专题会申请流程表单统计 + /// + /// 分页参数 + /// 查询条件 + /// + public IEnumerable GetPageListOfdwhsq(Pagination pagination, string queryJson) + { + try + { + var misdbname = BaseRepository("CollegeMIS").getDbConnection().Database; + var basedbname = BaseRepository().getDbConnection().Database; + + var strSql = new StringBuilder(); + strSql.Append("select y.*,t.F_Id,t.F_SchemeId,t.F_SchemeCode,t.F_SchemeName,t.F_Title,t.F_Level,t.F_EnabledMark,t.F_IsFinished,t.F_CreateDate,t.F_CreateUserId,t.F_CreateUserName as F_CreateUserNameInProcess from LR_NWF_Process t left join LR_NWF_SchemeInfo s on t.F_SchemeCode=s.F_Code "); + strSql.Append($" left join {misdbname}.dbo.LC_dwhsq y on y.LC_ID=t.F_Id "); + strSql.Append(" where 1=1 and t.F_EnabledMark !=2 and t.F_EnabledMark != 3 and t.F_IsChild = 0 "); + strSql.Append(" and s.F_Code='LC_dwhsq' "); + + var queryParam = queryJson.ToJObject(); + // 虚拟参数 + var dp = new DynamicParameters(new { }); + + // 分类 + if (!queryParam["categoryId"].IsEmpty()) // 1:未完成 2:已完成 + { + if (queryParam["categoryId"].ToString() == "1") + { + strSql.Append(" and t.F_IsFinished = 0 "); + } + else + { + strSql.Append(" and t.F_IsFinished = 1 "); + } + } + //申请人 + if (!queryParam["F_CreateUserName"].IsEmpty()) + { + dp.Add("F_CreateUserName", "%" + queryParam["F_CreateUserName"].ToString() + "%", DbType.String); + strSql.Append(" AND y.F_CreateUserName like @F_CreateUserName "); + } + //会议主题 + if (!queryParam["LC_hyzt"].IsEmpty()) + { + dp.Add("LC_hyzt", "%" + queryParam["LC_hyzt"].ToString() + "%", DbType.String); + strSql.Append(" AND y.LC_hyzt like @LC_hyzt "); + } + //会议内容 + if (!queryParam["LC_hynr"].IsEmpty()) + { + dp.Add("LC_hynr", "%" + queryParam["LC_hynr"].ToString() + "%", DbType.String); + strSql.Append(" AND y.LC_hynr like @LC_hynr "); + } + //会议时间 + if (!queryParam["LC_hysj"].IsEmpty()) + { + dp.Add("LC_hysj", "%" + queryParam["LC_hysj"].ToString() + "%", DbType.String); + strSql.Append(" AND y.LC_hysj like @LC_hysj "); + } + //关键字：申请人、会议主题、会议内容、会议时间 + if (!queryParam["keyword"].IsEmpty()) + { + dp.Add("keyword", "%" + queryParam["keyword"].ToString() + "%", DbType.String); + strSql.Append(" AND (y.F_CreateUserName like @keyword or y.LC_hyzt like @keyword or y.LC_hysj like @keyword or y.LC_hynr like @keyword ) "); + } + // 会议时间 + if (!queryParam["StartTime"].IsEmpty() && !queryParam["EndTime"].IsEmpty()) + { + dp.Add("StartTime", queryParam["StartTime"].ToString(), DbType.Date); + dp.Add("EndTime", queryParam["EndTime"].ToString(), DbType.Date); + strSql.Append(" and (y.LC_hysj >= @StartTime and y.LC_hysj <= @EndTime)"); + } + + var result = this.BaseRepository().FindList(strSql.ToString(), dp); + + return result; + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + #endregion From 3d7f5f36dce0fbe810249a9c5ec626d723cb47dc Mon Sep 17 00:00:00 2001 From: dyy <18335927079@163.com> Date: Wed, 20 Apr 2022 16:24:22 +0800 Subject: [PATCH 9/9] =?UTF-8?q?=E5=90=88=E5=B9=B6=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Learun.Application.Web/Learun.Application.Web.csproj | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj b/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj index b73496469..f6d1a31e2 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj @@ -1375,6 +1375,7 @@ + @@ -7729,6 +7730,7 @@ +