diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/DispatchController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/DispatchController.cs index b77ea1219..083a5632f 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/DispatchController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/DispatchController.cs @@ -108,11 +108,14 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers var data = dispatchIBLL.GetPageList(paginationobj, queryJson); foreach (var item in data) { - var NewList = nWFTaskIBLL.GetLogList(item.processId).OrderBy(o => o.F_CreateDate).ToList(); - if (NewList.Count > 0) + if (item.FlowNo != "0") { - item.CreateTime = NewList.First().F_CreateDate; - item.CreateUser = NewList.First().F_CreateUserName; + var NewList = nWFTaskIBLL.GetLogList(item.processId).OrderBy(o => o.F_CreateDate).ToList(); + if (NewList.Count > 0) + { + item.CreateTime = NewList.First().F_CreateDate; + item.CreateUser = NewList.First().F_CreateUserName; + } } } var jsonData = new diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/Index.cshtml index 359de6b30..ecf558057 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/Index.cshtml @@ -8,18 +8,13 @@
-
-
-
-
标题
- -
- @*
-
收文单位
- -
*@ -
-
+
+
+
+ +
+
+  查询
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/Index.js index e4e477839..946200467 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/Index.js @@ -8,6 +8,8 @@ var refreshGirdData; var bootstrap = function ($, learun) { "use strict"; var processId = ''; + var logbegin = ''; + var logend = ''; var page = { init: function () { page.initGird(); @@ -17,6 +19,37 @@ var bootstrap = function ($, learun) { $('#multiple_condition_query').lrMultipleQuery(function (queryJson) { page.search(queryJson); }, 220, 400); + $('#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(); @@ -86,6 +119,7 @@ var bootstrap = function ($, learun) { learun.layerConfirm('是否确认删除该项！', function (res) { if (res) { learun.deleteForm(top.$.rootUrl + '/EducationalAdministration/Dispatch/DeleteForm', { keyValue: keyValue }, function () { + page.search(); }); } }); @@ -239,6 +273,8 @@ var bootstrap = function ($, learun) { search: function (param) { param = param || {}; param.WorkName = 1; + param.StartTime = logbegin; + param.EndTime = logend; $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); }, }; diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/IndexXF.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/IndexXF.cshtml index 2c5f4227a..f4bba2904 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/IndexXF.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/IndexXF.cshtml @@ -8,18 +8,13 @@
-
-
-
-
标题
- -
- @*
-
收文
- -
*@ -
-
+
+
+
+ +
+
+  查询
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/IndexXF.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/IndexXF.js index 1c6f1f519..b210f1f05 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/IndexXF.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/IndexXF.js @@ -8,6 +8,8 @@ var refreshGirdData; var bootstrap = function ($, learun) { "use strict"; var processId = ''; + var logbegin = ''; + var logend = ''; var page = { init: function () { page.initGird(); @@ -17,6 +19,37 @@ var bootstrap = function ($, learun) { $('#multiple_condition_query').lrMultipleQuery(function (queryJson) { page.search(queryJson); }, 220, 400); + $('#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(); @@ -87,6 +120,7 @@ var bootstrap = function ($, learun) { learun.layerConfirm('是否确认删除该项！', function (res) { if (res) { learun.deleteForm(top.$.rootUrl + '/EducationalAdministration/Dispatch/DeleteForm', { keyValue: keyValue }, function () { + page.search(); }); } }); @@ -234,6 +268,8 @@ var bootstrap = function ($, learun) { search: function (param) { param = param || {}; param.WorkName = 2; + param.StartTime = logbegin; + param.EndTime = logend; $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); }, downLoad: function (fileId) { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Controllers/DTListController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Controllers/DTListController.cs index 7e1aac7f2..60130b163 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Controllers/DTListController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Controllers/DTListController.cs @@ -189,7 +189,10 @@ namespace Learun.Application.Web.Areas.LR_Desktop.Controllers dtListEntity.F_Sql = dtListEntity.F_Sql.Replace("MMM", strSql.ToString()); } - + if (dtListEntity.F_Name.Contains("下发公文查阅")) + { + dtListEntity.F_Sql = dtListEntity.F_Sql.Replace("@@@userId", "'" + loginUserInfo.userId + "'"); + } var reqDataTable = databaseLinkIbll.FindTable(dtListEntity.F_DataSourceId.Trim(), dtListEntity.F_Sql); if (dtListEntity.F_Id == "88f94781-acb8-47ca-864b-f96e3d9b5587") { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/Index.js index e8cd3a6aa..188fdb0e1 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/Index.js @@ -282,7 +282,8 @@ var bootstrap = function ($, learun) { { label: "标题", name: "F_Title", width: 300, align: "left", formatter: function (cellvalue, row) { if (row.F_SchemeName != row.F_Title && row.F_Title) { - return row.F_SchemeName + "(" + row.F_Title + ")"; + //return row.F_SchemeName + "(" + row.F_Title + ")"; + return row.F_SchemeName + row.F_Title; } else { return row.F_SchemeName; @@ -421,14 +422,12 @@ var bootstrap = function ($, learun) { } }, eye: function () { - var processId = $('#gridtable').jfGridValue('F_Id') || ''; var taskId = $('#gridtable').jfGridValue('F_TaskId') || ''; var title = $('#gridtable').jfGridValue('F_Title'); var schemeName = $('#gridtable').jfGridValue('F_SchemeName'); var taskType = $('#gridtable').jfGridValue('F_TaskType'); - console.log(taskId); if (schemeName != title && title) { title = schemeName + "(" + title + ")"; } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/NWFContainerForm.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/NWFContainerForm.js index cd93fef49..090db1c3a 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/NWFContainerForm.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/NWFContainerForm.js @@ -39,7 +39,6 @@ var bootstrap = function ($, learun) { if (btn.next == '2') { isNext = '1'; } - if (isNext == '1') {// 获取下一节点数据 var param = { code: shcemeCode, @@ -309,6 +308,11 @@ var bootstrap = function ($, learun) { //$('#savedraft').show(); $('#savedraft').showBtn(); $('#savedraft').on('click', function () { + // 验证表单数据完整性 + if (!custmerForm.validForm('create'))// create创建流程 + { + return false; + } tabProcessId = nwflow.processId; // 保存表单数据 custmerForm.save(nwflow.processId, nwflow.currentNode.wfForms, function () { @@ -490,6 +494,11 @@ var bootstrap = function ($, learun) { //$('#savedraft').show(); $('#savedraft').showBtn(); $('#savedraft').on('click', function () { + // 验证表单数据完整性 + if (!custmerForm.validForm('create'))// create创建流程 + { + return false; + } tabProcessId = nwflow.processId; // 保存表单数据 custmerForm.save(nwflow.processId, nwflow.currentNode.wfForms, function () { @@ -689,6 +698,7 @@ var bootstrap = function ($, learun) { return top[id].acceptClick(function (auditers) { // 保存表单数据 custmerForm.save(nwflow.processId, nwflow.currentNode.wfForms, function () { + // 审批流程 learun.loading(true, '审批流程...'); var postData = { @@ -701,13 +711,13 @@ var bootstrap = function ($, learun) { signUrl: signUrl, stamp: stamp }; - learun.httpAsync('Post', top.$.rootUrl + '/LR_NewWorkFlow/NWFProcess/AuditFlow', postData, function (_data) { - learun.loading(false); - if (_data) { - learun.frameTab.parentIframe().refreshGirdData && learun.frameTab.parentIframe().refreshGirdData(); - learun.frameTab.close(tabIframeId); - } - }); + learun.httpAsync('Post', top.$.rootUrl + '/LR_NewWorkFlow/NWFProcess/AuditFlow', postData, function (_data) { + learun.loading(false); + if (_data) { + learun.frameTab.parentIframe().refreshGirdData && learun.frameTab.parentIframe().refreshGirdData(); + learun.frameTab.close(tabIframeId); + } + }); }); }); } @@ -785,7 +795,7 @@ var bootstrap = function ($, learun) { processId: nwflow.processId, taskId: nwflow.taskId }; - learun.httpAsync('Post', top.$.rootUrl + '/LR_NewWorkFlow/NWFProcess/SignFlowTwo', postData, function (data) { + learun.httpAsync('Post', top.$.rootUrl + '/LR_NewWorkFlow/NWFProcess/SignFlow', postData, function (data) { learun.loading(false); if (data) { //learun.frameTab.parentIframe().refreshGirdData(); @@ -936,7 +946,7 @@ var bootstrap = function ($, learun) { processId: nwflow.processId, taskId: nwflow.taskId }; - learun.httpAsync('Post', top.$.rootUrl + '/LR_NewWorkFlow/NWFProcess/SignFlowTwo', postData, function (data) { + learun.httpAsync('Post', top.$.rootUrl + '/LR_NewWorkFlow/NWFProcess/SignFlow', postData, function (data) { learun.loading(false); if (data) { //learun.frameTab.parentIframe().refreshGirdData(); @@ -1223,7 +1233,6 @@ var bootstrap = function ($, learun) { // 加载表单 loadForm: function (formList, isLoadData, isLook) { - console.log() var $ul = $('#form_list_tabs'); var $iframes = $('#form_list_iframes'); if (formList.length > 1) { @@ -1429,13 +1438,14 @@ var bootstrap = function ($, learun) { content: content, time: item.F_CreateDate }; - //liangkun 2021-1-11 去掉第一个条件判断 - //if (!anodeinfo[item.F_NodeId + item.F_CreateUserId] && item.F_TaskType != '0' && item.F_TaskType != '4' && item.F_TaskType != '5' && item.F_TaskType != '6') { - if (item.F_TaskType != '0' && item.F_TaskType != '4' && item.F_TaskType != '5' && item.F_TaskType != '6') { + + + if (!anodeinfo[item.F_NodeId + item.F_CreateUserId] && item.F_TaskType != '0' && item.F_TaskType != '4' && item.F_TaskType != '5' && item.F_TaskType != '6') { var apoint = {}; apoint.type = 'anodeinfo'; apoint.title = point.title; + anodeinfo[item.F_NodeId + item.F_CreateUserId] = '1'; anodeinfo_flag = true; var html = '
\ @@ -1828,13 +1838,24 @@ var bootstrap = function ($, learun) { html = $('.tab-flow-audit').html(); } + var isContract = false; + + var $iframes = $('#form_list_iframes'); var iframeId = $iframes.find('.form-list-iframe.active').attr('id'); if (iframeId) { var $iframe = learun.iframe(iframeId, frames); //$iframe.$('.lr-form-wrap:visible').jqprint(); var res = $iframe.$('body').lrGetFormShow(); + if (res[0].text.indexOf('合同审批流程单') > -1) { + isContract = true; + } for (var len = ainfo.length, i = ainfo.length - 1; i >= 0; i--) { + if (isContract) { + if (ainfo[i].user.indexOf('关亮') > -1) { + continue; + } + } res.push(ainfo[i]); } $.jqprintForm(res); @@ -1844,8 +1865,18 @@ var bootstrap = function ($, learun) { //$iframes.find(".lr-scroll-box")[0].style.top = 0; //$iframes.find(".lr-formselect i").removeClass(); //$iframes.find('.form-list-container.active').find('.lr-form-wrap:visible').jqprint(null,html); + var res1 = $iframes.lrGetFormShow(); + if (res1[0].text.indexOf('合同审批流程单') > -1) { + isContract = true; + } + for (var len1 = ainfo.length, i1 = ainfo.length - 1; i1 >= 0; i1--) { + if (isContract) { + if (ainfo[i1].user.indexOf('关亮') > -1) { + continue; + } + } res1.push(ainfo[i1]); } $.jqprintForm(res1); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/SelectUserForm.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/SelectUserForm.js index 1c9bbbd24..302fd1bfe 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/SelectUserForm.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/SelectUserForm.js @@ -27,7 +27,7 @@ var bootstrap = function ($, learun) { data: _list, value: 'Id', text: 'Name', - allowSearch:true + allowSearch: true }); } }); @@ -45,9 +45,13 @@ var bootstrap = function ($, learun) { auditers[id] = formData[id]; } }); - - callBack(auditers); - return true; - }; + if (Object.keys(auditers).length > 0) { + callBack(auditers); + return true; + } else { + learun.alert.warning("请选择相关人员！"); + return false; + } + } page.init(); } \ No newline at end of file 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 47cdceb87..26ba23281 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 @@ -319,6 +319,7 @@ + @@ -7520,11 +7521,11 @@ - False + True True 20472 / - http://localhost:20873/ + http://localhost:12345/ False False diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminDesktop/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminDesktop/Index.js index 150e46747..a273dd58d 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminDesktop/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminDesktop/Index.js @@ -112,7 +112,16 @@ //F_UrlAddress: '/LR_WorkFlowModule/WfMyTask/CustmerWorkFlowForm?tabIframeId=' + p.f_id + '&type=' + p.f_tasktype + '' + "&processId=" + p.f_processid + "&taskId=" + p.f_id }); } - } else { + } + else if (d[o].F_Id == "574a4149-6556-4e4a-8f40-b022c5b90b14") { + top.learun.frameTab.open({ + F_ModuleId: p.f_id + "_homeopen", + F_Icon: 'fa magic', + F_FullName: '公文查阅', + F_UrlAddress: '/EducationalAdministration/Sys_ReceiveFile/Index' + }); + } + else { top["dtlist" + p.f_id] = p; top.learun.frameTab.open({ F_ModuleId: "dtlist" + p.f_id, diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/script/lr-form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/script/lr-form.js index 7cfffdd8b..ad6311067 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/script/lr-form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/script/lr-form.js @@ -665,6 +665,26 @@ _obj.push($obj); }); }; + //获取角色 + $.fn.lrRoleSelect = function (op) { + // op:parentId 父级id,maxHeight 200, + var dfop = { + type: 'tree', + // 是否允许搜索 + allowSearch: true, + // 访问数据接口地址 + url: top.$.rootUrl + '/LR_OrganizationModule/Role/GetTree', + // 访问数据接口参数 + param: { parentId: '0' } + }; + op = op || {}; + dfop.param.companyId = op.companyId; + dfop.param.parentId = op.parentId; + if (!!op.type) { + dfop.type = op.type; + } + return $(this).lrselect(dfop); + }; // 数据库选择 $.fn.lrDbSelect = function (op) { // op:maxHeight 200, 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 663bcb34e..e84d2aed3 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 @@ -77,6 +77,8 @@ + + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Dispatch/DispatchService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Dispatch/DispatchService.cs index a63db7583..cabc94476 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Dispatch/DispatchService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Dispatch/DispatchService.cs @@ -37,21 +37,27 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration var queryParam = queryJson.ToJObject(); // 虚拟参数 var dp = new DynamicParameters(new { }); - - if (!queryParam["WorkName"].IsEmpty()) - { - dp.Add("WorkName", queryParam["WorkName"].ToString(), DbType.String); - strSql.Append(" AND t.WorkName = @WorkName "); - } - if (!queryParam["DisTitle"].IsEmpty()) + if (!queryParam["keyword"].IsEmpty()) { - dp.Add("DisTitle", "%" + queryParam["DisTitle"].ToString() + "%", DbType.String); - strSql.Append(" AND t.DisTitle Like @DisTitle "); + dp.Add("keyword", "%" + queryParam["keyword"].ToString() + "%", DbType.String); + strSql.Append(" AND t.DisFrom like @keyword "); } - if (!queryParam["DisFrom"].IsEmpty()) + string beginDate = queryParam["StartTime"].ToString(); + string endDate = queryParam["EndTime"].ToString(); + if (!string.IsNullOrEmpty(beginDate) && !string.IsNullOrEmpty(endDate)) { - dp.Add("DisFrom", "%" + queryParam["DisFrom"].ToString() + "%", DbType.String); - strSql.Append(" AND t.DisTitle Like @DisFrom "); + #region 获取日期(年 月 日) + string bYaer = beginDate.Substring(0, 4); + string bMonth = beginDate.Substring(5, 2); + string bdate = beginDate.Substring(8, 2); + string eYaer = endDate.Substring(0, 4); + string eMonth = endDate.Substring(5, 2); + #endregion + string edate = endDate.Substring(8, 2); + strSql.Append(@" and (t.DisYear BETWEEN '" + bYaer + "' and '" + eYaer + "') " + + "and (t.DisMonth BETWEEN '" + bMonth + "' and '" + eMonth + "') " + + " and (t.DisDay BETWEEN '" + bdate + "' and '" + edate + "') "); + } if (!queryParam["userId"].IsEmpty()) { 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 67d9adffb..302c06ac5 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 @@ -132,6 +132,14 @@ + + + + + + + + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Workflow/Learun.Workflow.Engine/NWFEngine.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Workflow/Learun.Workflow.Engine/NWFEngine.cs index 754a7559f..5827af313 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Workflow/Learun.Workflow.Engine/NWFEngine.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Workflow/Learun.Workflow.Engine/NWFEngine.cs @@ -298,16 +298,7 @@ namespace Learun.Workflow.Engine List lineList1 = new List(); if (overFW) { - var lastLine = wfScheme.lines.FirstOrDefault(a => !String.IsNullOrEmpty(a.iocName)); - if (lastLine == null) - { - lineList1.Add(wfScheme.lines.Last()); - } - else - { - lineList1.Add(lastLine); - } } else { @@ -318,7 +309,7 @@ namespace Learun.Workflow.Engine // 找到与当前节点相连的线条 foreach (var line in lineList1) { - if (line.from == nodeId || overFW) + if (line.from == nodeId) { bool isOk = false; if (string.IsNullOrEmpty(line.strategy) || line.strategy == "1")