合并

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();
@@ -309,7 +314,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<Pagination>();
+            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)
         {

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";
+}
+<div id="lr_layout" class="lr-layout lr-layout-left-center">
+    <div class="lr-layout-left">
+        <div class="lr-layout-wrap lr-layout-wrap-notitle" style="padding-top:10px;">
+            <div class="lr-layout-body">
+                <ul class="lr-left-list" id="lr_left_list">
+                    <li class="active lrlg" data-value="1">未完成</li>
+                    <li data-value="2" class="lrlg">已完成</li>
+                </ul>
+            </div>
+        </div>
+    </div>
+    <div class="lr-layout-center">
+        <div class="lr-layout-wrap lr-layout-wrap-notitle">
+            <div class="lr-layout-tool">
+                <div class="lr-layout-tool-left">
+                    <div class="lr-layout-tool-item">
+                        <div id="multiple_condition_query">
+                            <div class="lr-query-formcontent">
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">用车部门</div>
+                                    <input id="LC_ycbm" type="text" class="form-control" />
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">用车人</div>
+                                    <input id="LC_ycr" type="text" class="form-control" />
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">车牌号</div>
+                                    <input id="LC_cph" type="text" class="form-control" />
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">用车时间</div>
+                                    <input id="LC_ycsj" type="text" class="form-control" />
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">司机姓名</div>
+                                    <input id="LC_sjxm" type="text" class="form-control" />
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="lr-layout-tool-right">
+                    <div class=" btn-group btn-group-sm">
+                        <a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i></a>
+                    </div>
+                    <div class=" btn-group btn-group-sm">
+                        <a id="lr_eye" class="btn btn-default"><i class="fa fa-eye"></i>&nbsp;<span class="lrlg">查看</span></a>
+                        @*<a id="lr_appoint" class="btn btn-default"><i class="fa fa-magic"></i>&nbsp;<span class="lrlg">指派审核人</span></a>
+                            <a id="lr_cancel" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;<span class="lrlg">作废</span></a>*@
+                    </div>
+                </div>
+            </div>
+
+            <div class="lr-layout-body" id="gridtable">
+            </div>
+        </div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/LR_NewWorkFlow/Views/NWFProcess/UseCar.js")
+
+
+
+
+

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 "<span class=\"label label-danger\">催办加急</span>";
+                                    }
+                                    return "<span class=\"label label-success\">运行中</span>";
+                                } else if (cellvalue == 2) {
+                                    return "<span class=\"label label-primary\">草稿</span>";
+                                } else {
+                                    return "<span class=\"label label-danger\">作废</span>";
+                                }
+                            }
+                            else {
+                                return "<span class=\"label label-warning\">结束</span>";
+                            }
+
+                        }
+                    },
+                ],
+                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();
+}
+
+

Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj

@@ -1375,7 +1375,6 @@
     <Content Include="Areas\LR_NewWorkFlow\Views\NWFProcess\AddTaskForm.js" />
     <Content Include="Areas\LR_NewWorkFlow\Views\NWFProcess\htPrint.css" />
     <Content Include="Areas\LR_NewWorkFlow\Views\NWFProcess\ContractFiling.js" />
-    <Content Include="Areas\LR_NewWorkFlow\Views\NWFProcess\MonitorIndexOfmeeting.js" />
     <Content Include="Areas\LR_NewWorkFlow\Views\NWFProcess\MonitorIndexOfyyspd.js" />
     <Content Include="Areas\LR_NewWorkFlow\Views\NWFProcess\MonitorIndexZiChan.js" />
     <Content Include="Areas\LR_NewWorkFlow\Views\NWFProcess\MonitorIndexGongWen.js" />
@@ -1384,6 +1383,7 @@
     <Content Include="Areas\LR_NewWorkFlow\Views\NWFProcess\PersonalFiling.js" />
     <Content Include="Areas\LR_NewWorkFlow\Views\NWFProcess\SelectUserForm.js" />
     <Content Include="Areas\LR_NewWorkFlow\Views\NWFProcess\SignForm.js" />
+    <Content Include="Areas\LR_NewWorkFlow\Views\NWFProcess\UseCar.js" />
     <Content Include="Areas\LR_NewWorkFlow\Views\StampInfo\EqualForm.js" />
     <Content Include="Areas\LR_NewWorkFlow\Views\StampInfo\Form.css" />
     <Content Include="Areas\LR_NewWorkFlow\Views\StampInfo\Form.js" />
@@ -7722,7 +7722,7 @@
     <Content Include="Areas\EducationalAdministration\Views\Exam_ExamStudent\Index.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\Exam_ExamStudent\FormClear.cshtml" />
     <Content Include="Areas\LR_NewWorkFlow\Views\NWFProcess\MonitorIndexOfyyspd.cshtml" />
-    <Content Include="Areas\LR_NewWorkFlow\Views\NWFProcess\MonitorIndexOfmeeting.cshtml" />
+    <Content Include="Areas\LR_NewWorkFlow\Views\NWFProcess\UseCar.cshtml" />
     <None Include="Properties\PublishProfiles\CustomProfile.pubxml" />
     <None Include="Properties\PublishProfiles\FolderProfile.pubxml" />
     <Content Include="Views\Login\Default-beifen.cshtml" />

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<NWFProcessEntity> GetUseCar(Pagination pagination, string queryJson)
+        {
+            return nWFProcessSerive.GetUseCar(pagination, queryJson);
+        }
         public string GetFirstTaskByProcessId(string processId)
         {
             return nWFProcessSerive.GetFirstTaskByProcessId(processId);

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/Process/NWFProcessEntity.cs

@@ -180,6 +180,27 @@ namespace Learun.Application.WorkFlow
         /// </summary>
         [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
     }
 }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/Process/NWFProcessIBLL.cs

@@ -28,6 +28,7 @@ namespace Learun.Application.WorkFlow
         /// <param name="queryJson">查询条件</param>
         /// <returns></returns>
         IEnumerable<NWFProcessEntity> GetPageList(Pagination pagination, string queryJson);
+        IEnumerable<NWFProcessEntity> GetUseCar(Pagination pagination, string queryJson);
         string GetFirstTaskByProcessId(string processId);
         IEnumerable<NWFProcessEntity> GetAllList();
         LC_hetongEntity GetHTInfo(string keyValue);

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/Process/NWFProcessSerivce.cs

@@ -159,6 +159,78 @@ namespace Learun.Application.WorkFlow
                 }
             }
         }
+
+        /// <summary>
+        /// 获取流程信息列表
+        /// </summary>
+        /// <param name="pagination">分页参数</param>
+        /// <param name="queryJson">查询条件</param>
+        /// <returns></returns>
+        public IEnumerable<NWFProcessEntity> 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<NWFProcessEntity>(strSql.ToString(), dp);
+
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
         /// <summary>
         /// 根据processid 获取taskid
         /// </summary>
@@ -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<LC_yyspdEntity>(strSql.ToString(),dp);
+                var result = this.BaseRepository().FindList<LC_yyspdEntity>(strSql.ToString(), dp);
 
                 return result;
             }