From e5444ff98d2d039f59fdde339ccffea52d32e960 Mon Sep 17 00:00:00 2001 From: zhangli <1109134334@qq.com> Date: Tue, 8 Jun 2021 18:04:36 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8B=89=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SSO_Drag_CollectManageController.cs | 121 +++++++++ .../Views/SSO_Drag_CollectManage/Form.cshtml | 27 ++ .../Views/SSO_Drag_CollectManage/Form.js | 38 +++ .../Views/SSO_Drag_CollectManage/Index.cshtml | 39 +++ .../Views/SSO_Drag_CollectManage/Index.js | 94 +++++++ .../Content/js/DragSSO/main.js | 81 +++++- .../Controllers/SSOSystemController.cs | 83 +++++- .../Views/SSOSystem/DragModelOne.cshtml | 122 ++++++--- .../Views/SSOSystem/DragModelTwo.cshtml | 85 ++++-- .../DataItem/DataItemDetailEntity.cs | 5 + .../LR_Desktop/SSO_Drag_CollectManageMap.cs | 29 +++ .../DBModel/资产系统.PDM | 6 +- .../SSO_Drag_CardSortManageEntity.cs | 2 +- .../SSO_Drag_CollectManageBLL.cs | 171 +++++++++++++ .../SSO_Drag_CollectManageEntity.cs | 86 +++++++ .../SSO_Drag_CollectManageIBLL.cs | 61 +++++ .../SSO_Drag_CollectManageService.cs | 242 ++++++++++++++++++ .../WfProcess/WfProcessInstanceEntity.cs | 5 + 18 files changed, 1228 insertions(+), 69 deletions(-) create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Controllers/SSO_Drag_CollectManageController.cs create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/SSO_Drag_CollectManage/Form.cshtml create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/SSO_Drag_CollectManage/Form.js create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/SSO_Drag_CollectManage/Index.cshtml create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/SSO_Drag_CollectManage/Index.js create mode 100644 Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/LR_Desktop/SSO_Drag_CollectManageMap.cs create mode 100644 Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/SSO_Drag_CollectManage/SSO_Drag_CollectManageBLL.cs create mode 100644 Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/SSO_Drag_CollectManage/SSO_Drag_CollectManageEntity.cs create mode 100644 Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/SSO_Drag_CollectManage/SSO_Drag_CollectManageIBLL.cs create mode 100644 Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/SSO_Drag_CollectManage/SSO_Drag_CollectManageService.cs diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Controllers/SSO_Drag_CollectManageController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Controllers/SSO_Drag_CollectManageController.cs new file mode 100644 index 000000000..ad49423fa --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Controllers/SSO_Drag_CollectManageController.cs @@ -0,0 +1,121 @@ +using Learun.Application.TwoDevelopment.LR_Desktop; +using Learun.Util; +using System.Data; +using System.Web.Mvc; + +namespace Learun.Application.Web.Areas.LR_Desktop.Controllers +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2021-06-02 16:12 + /// 描 述：网上办事大厅拖拽版-可用应用收藏管理 + /// + public class SSO_Drag_CollectManageController : MvcControllerBase + { + private SSO_Drag_CollectManageIBLL sSO_Drag_CollectManageIBLL = new SSO_Drag_CollectManageBLL(); + + #region 视图功能 + + /// + /// 主页面 + /// + /// + [HttpGet] + public ActionResult Index() + { + return View(); + } + /// + /// 表单页 + /// + /// + [HttpGet] + public ActionResult Form() + { + return View(); + } + #endregion + + #region 获取数据 + + /// + /// 获取列表数据 + /// + /// 查询参数 + /// + [HttpGet] + [AjaxOnly] + public ActionResult GetList( string queryJson ) + { + var data = sSO_Drag_CollectManageIBLL.GetList(queryJson); + return Success(data); + } + /// + /// 获取列表分页数据 + /// + /// 分页参数 + /// 查询参数 + /// + [HttpGet] + [AjaxOnly] + public ActionResult GetPageList(string pagination, string queryJson) + { + Pagination paginationobj = pagination.ToObject(); + var data = sSO_Drag_CollectManageIBLL.GetPageList(paginationobj, queryJson); + var jsonData = new + { + rows = data, + total = paginationobj.total, + page = paginationobj.page, + records = paginationobj.records + }; + return Success(jsonData); + } + /// + /// 获取表单数据 + /// + /// 主键 + /// + [HttpGet] + [AjaxOnly] + public ActionResult GetFormData(string keyValue) + { + var data = sSO_Drag_CollectManageIBLL.GetEntity(keyValue); + return Success(data); + } + #endregion + + #region 提交数据 + + /// + /// 删除实体数据 + /// + /// 主键 + /// + [HttpPost] + [AjaxOnly] + public ActionResult DeleteForm(string keyValue) + { + sSO_Drag_CollectManageIBLL.DeleteEntity(keyValue); + return Success("删除成功！"); + } + /// + /// 保存实体数据（新增、修改） + /// + /// 主键 + /// 实体 + /// + [HttpPost] + [ValidateAntiForgeryToken] + [AjaxOnly] + public ActionResult SaveForm(string keyValue,SSO_Drag_CollectManageEntity entity) + { + sSO_Drag_CollectManageIBLL.SaveEntity(keyValue, entity); + return Success("保存成功！"); + } + #endregion + + } +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/SSO_Drag_CollectManage/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/SSO_Drag_CollectManage/Form.cshtml new file mode 100644 index 000000000..aad72b2c0 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/SSO_Drag_CollectManage/Form.cshtml @@ -0,0 +1,27 @@ +@{ + ViewBag.Title = "网上办事大厅拖拽版-可用应用收藏管理"; + Layout = "~/Views/Shared/_Form.cshtml"; +} +
+
+
主键*
+ +
+
+
用户*
+ +
+
+
模式编号：one办事大厅模式，two效率优先模式，three管理驾驶舱模式*
+ +
+
+
可用应用Id*
+ +
+
+
收藏时间*
+ +
+
+@Html.AppendJsFile("/Areas/LR_Desktop/Views/SSO_Drag_CollectManage/Form.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/SSO_Drag_CollectManage/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/SSO_Drag_CollectManage/Form.js new file mode 100644 index 000000000..6661dbddc --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/SSO_Drag_CollectManage/Form.js @@ -0,0 +1,38 @@ +/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn) + * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + * 创建人：超级管理员 + * 日 期：2021-06-02 16:12 + * 描 述：网上办事大厅拖拽版-可用应用收藏管理 + */ +var acceptClick; +var keyValue = request('keyValue'); +var bootstrap = function ($, learun) { + "use strict"; + var selectedRow = learun.frameTab.currentIframe().selectedRow; + var page = { + init: function () { + page.initData(); + }, + bind: function () { + }, + initData: function () { + if (!!selectedRow) { + $('#form').lrSetFormData(selectedRow); + } + } + }; + // 保存数据 + acceptClick = function (callBack) { + if (!$('#form').lrValidform()) { + return false; + } + var postData = $('#form').lrGetFormData(); + $.lrSaveForm(top.$.rootUrl + '/LR_Desktop/SSO_Drag_CollectManage/SaveForm?keyValue=' + keyValue, postData, function (res) { + // 保存成功后才回调 + if (!!callBack) { + callBack(); + } + }); + }; + page.init(); +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/SSO_Drag_CollectManage/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/SSO_Drag_CollectManage/Index.cshtml new file mode 100644 index 000000000..b20aff474 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/SSO_Drag_CollectManage/Index.cshtml @@ -0,0 +1,39 @@ +@{ + ViewBag.Title = "网上办事大厅拖拽版-可用应用收藏管理"; + Layout = "~/Views/Shared/_Index.cshtml"; +} +
+
+
+
树形目录
+
+
+
+
+
+
标题
+
+
+
+ +
+
+  查询 +
+
+
+
+ +
+
+  新增 +  编辑 +  删除 +
+
+
+
+
+
+
+@Html.AppendJsFile("/Areas/LR_Desktop/Views/SSO_Drag_CollectManage/Index.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/SSO_Drag_CollectManage/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/SSO_Drag_CollectManage/Index.js new file mode 100644 index 000000000..e1e98bb3e --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/SSO_Drag_CollectManage/Index.js @@ -0,0 +1,94 @@ +/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn) + * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + * 创建人：超级管理员 + * 日 期：2021-06-02 16:12 + * 描 述：网上办事大厅拖拽版-可用应用收藏管理 + */ +var selectedRow; +var refreshGirdData; +var bootstrap = function ($, learun) { + "use strict"; + var page = { + init: function () { + page.initGird(); + page.bind(); + }, + bind: function () { + // 查询 + $('#btn_Search').on('click', function () { + var keyword = $('#txt_Keyword').val(); + page.search({ keyword: keyword }); + }); + // 刷新 + $('#lr_refresh').on('click', function () { + location.reload(); + }); + // 新增 + $('#lr_add').on('click', function () { + selectedRow = null; + learun.layerForm({ + id: 'form', + title: '新增', + url: top.$.rootUrl + '/LR_Desktop/SSO_Drag_CollectManage/Form', + width: 700, + height: 400, + callBack: function (id) { + return top[id].acceptClick(refreshGirdData); + } + }); + }); + // 编辑 + $('#lr_edit').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('Id'); + selectedRow = $('#gridtable').jfGridGet('rowdata'); + if (learun.checkrow(keyValue)) { + learun.layerForm({ + id: 'form', + title: '编辑', + url: top.$.rootUrl + '/LR_Desktop/SSO_Drag_CollectManage/Form?keyValue=' + keyValue, + width: 700, + height: 400, + callBack: function (id) { + return top[id].acceptClick(refreshGirdData); + } + }); + } + }); + // 删除 + $('#lr_delete').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('Id'); + if (learun.checkrow(keyValue)) { + learun.layerConfirm('是否确认删除该项！', function (res) { + if (res) { + learun.deleteForm(top.$.rootUrl + '/LR_Desktop/SSO_Drag_CollectManage/DeleteForm', { keyValue: keyValue}, function () { + }); + } + }); + } + }); + }, + initGird: function () { + $('#gridtable').lrAuthorizeJfGrid({ + url: top.$.rootUrl + '/LR_Desktop/SSO_Drag_CollectManage/GetPageList', + headData: [ + { label: '主键', name: 'Id', width: 200, align: "left" }, + { label: '用户', name: 'UserId', width: 200, align: "left" }, + { label: '模式编号：one办事大厅模式，two效率优先模式，three管理驾驶舱模式', name: 'ModelCode', width: 200, align: "left" }, + { label: '可用应用Id', name: 'SchemeInfoId', width: 200, align: "left" }, + { label: '收藏时间', name: 'Time', width: 200, align: "left" }, + ], + mainId:'Id', + isPage: true + }); + page.search(); + }, + search: function (param) { + param = param || {}; + $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); + } + }; + refreshGirdData = function () { + $('#gridtable').jfGridSet('reload'); + }; + page.init(); +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/js/DragSSO/main.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/js/DragSSO/main.js index 712f454ab..2295edbc5 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/js/DragSSO/main.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/js/DragSSO/main.js @@ -24,7 +24,7 @@ $(document).ready(function () { var keyword = $('#headSearchInput').val(); if ($.trim(keyword) != "") { $.each($('.search').find('.searchLi'), function (i, item) { - if ($(item).children('.searchLiTxt').html().indexOf(keyword) != -1) { + if ($(item).find('.searchLiTxt').html().indexOf(keyword) != -1) { $(item).show(); } else { $(item).hide(); @@ -77,12 +77,85 @@ $(document).ready(function () { } } }); - }).on('click', '.inSec1List2 .fa', function () { + }).on('click', '#flowList .fa', function () {//可用应用 //是否收藏 + var modelCode = $('#ModelCode').val(); + var userId = $('#UserId').val(); + var Id = $(this).parent('li').attr('data-Id'); + var isCollect = true; + var tipMsg = ""; if ($(this).hasClass('fa-heart')) { - $(this).removeClass('fa-heart').addClass('fa-heart-o'); + //ajax取消收藏操作 + isCollect = false; + tipMsg = "取消收藏成功！"; } else { - $(this).removeClass('fa-heart-o').addClass('fa-heart'); + //ajax收藏操作 + isCollect = true; + tipMsg = "收藏成功！"; + } + if (userId != "" && userId != undefined && modelCode != "" && modelCode != undefined && Id != "" && Id != undefined) { + $.ajax({ + url: "/SSOSystem/DoCollectFlow", + headers: { __RequestVerificationToken: $.lrToken }, + data: { userId: userId, modelCode: modelCode, id: Id, isCollect: isCollect }, + type: "post", + dataType: "json", + success: function (res) { + if (res.code == 200) { + //操作成功执行代码 + layer.msg(tipMsg); + //刷新可用应用列表 + flowListJson = res.data.flowList; + $("#flowTypeList").find("li.active .itemName").trigger("click"); + //刷新我的收藏列表 + flowListOfCollectJson = res.data.flowListOfCollect; + updateCollectCount(flowListOfCollectJson); + $("#flowTypeListOfCollect").find("li.active .itemName").trigger("click"); + } + else if (res.code == 400) { + layer.msg(res.info); + } + else if (res.code == 500) { + layer.msg('服务端异常，请联系管理员'); + } + } + }); + } + }).on('click', '#flowListOfCollect .fa', function () {//我的收藏 + //是否收藏 + var modelCode = $('#ModelCode').val(); + var userId = $('#UserId').val(); + var Id = $(this).parent('li').attr('data-Id'); + if ($(this).hasClass('fa-heart')) { + //ajax取消收藏操作 + if (userId != "" && userId != undefined && modelCode != "" && modelCode != undefined && Id != "" && Id != undefined) { + $.ajax({ + url: "/SSOSystem/DoCollectFlow", + headers: { __RequestVerificationToken: $.lrToken }, + data: { userId: userId, modelCode: modelCode, id: Id, isCollect: false }, + type: "post", + dataType: "json", + success: function (res) { + if (res.code == 200) { + //操作成功执行代码 + layer.msg('取消收藏成功！'); + //刷新我的收藏列表 + flowListOfCollectJson = res.data.flowListOfCollect; + updateCollectCount(flowListOfCollectJson); + $("#flowTypeListOfCollect").find("li.active .itemName").trigger("click"); + //刷新可用应用列表 + flowListJson = res.data.flowList; + $("#flowTypeList").find("li.active .itemName").trigger("click"); + } + else if (res.code == 400) { + layer.msg(res.info); + } + else if (res.code == 500) { + layer.msg('服务端异常，请联系管理员'); + } + } + }); + } } }); //登录 diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/SSOSystemController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/SSOSystemController.cs index e6dd2a1b3..cefa58f67 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/SSOSystemController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/SSOSystemController.cs @@ -56,6 +56,7 @@ namespace Learun.Application.Web.Controllers private TeachSwitchIBLL teachSwitchIBLL = new TeachSwitchBLL(); private StuSaverecordIBLL stuSaverecordIBLL = new StuSaverecordBLL(); private StuConsumptionIBLL stuConsumptionIBLL = new StuConsumptionBLL(); + private SSO_Drag_CollectManageIBLL sSO_Drag_CollectManageIBLL = new SSO_Drag_CollectManageBLL(); #region 统一身份认证2.0 /// @@ -1190,18 +1191,34 @@ namespace Learun.Application.Web.Controllers ViewBag.StuByMajorStr = JsonConvert.SerializeObject(stuByMajor); //流程 var flowType = dataItemIBLL.GetDetailList("FlowSort", ""); - var flowList = wfSchemeIBLL.GetWfSchemeStart().ToList(); + var flowList = wfSchemeIBLL.GetWfSchemeStart().ToList().OrderBy(x => x.F_Id); + var flowListOfCollect = sSO_Drag_CollectManageIBLL.GetList("{\"UserId\":\"" + userInfo.userId + "\",\"ModelCode\":\"one\"}").OrderBy(x => x.SchemeInfoId); + foreach (var item in flowList) + { + item.IsCollect = false; + if (flowListOfCollect.Where(x => x.SchemeInfoId == item.F_Id).Any()) + { + item.IsCollect = true; + } + } var allCount = 0; + var allCountOfCollect = 0; foreach (var flow in flowType) { - var count = flowList.Count(a => a.F_Category == flow.F_ItemName); + var count = flowList.Count(a => a.F_Category == flow.F_ItemValue); flow.FlowCount = count; allCount += count; + var countOfCollect = flowListOfCollect.Count(x => x.F_Category == flow.F_ItemValue); + flow.FlowCountOfCollect = countOfCollect; + allCountOfCollect += countOfCollect; } ViewBag.AllCount = allCount; ViewBag.FlowType = flowType; ViewBag.FlowList = JsonConvert.SerializeObject(flowList); + //流程-收藏 + ViewBag.AllCountOfCollect = allCountOfCollect; + ViewBag.FlowListOfCollect = JsonConvert.SerializeObject(flowListOfCollect); //校园一卡通余额 ViewBag.StuSaveRecordTotalNum = 0; var stuSaveRecordList = stuSaverecordIBLL.GetListByAccount(userInfo.account).OrderByDescending(x => x.UPLOADDATE); @@ -1471,15 +1488,6 @@ namespace Learun.Application.Web.Controllers }).ToList(); ViewBag.OffenusedGroup = mm; ViewBag.OffenusedGroupStr = JsonConvert.SerializeObject(ViewBag.OffenusedGroup); - //todo: - //删begin - ViewBag.OffenusedJiao = modulelist.Where(x => x.F_FullName.Contains("教")); - ViewBag.OffenusedGuan = modulelist.Where(x => x.F_FullName.Contains("管理")); - ViewBag.Offenused = modulelist.Except(modulelist.Where(x => x.F_FullName.Contains("教") || x.F_FullName.Contains("管理"))).Take(6); - ViewBag.OffenusedJiaoStr = JsonConvert.SerializeObject(ViewBag.OffenusedJiao); - ViewBag.OffenusedGuanStr = JsonConvert.SerializeObject(ViewBag.OffenusedGuan); - ViewBag.OffenusedStr = JsonConvert.SerializeObject(ViewBag.Offenused); - //删end //查找服务 List searchmodulelist = new List(); foreach (var item in moduledata) @@ -1520,18 +1528,34 @@ namespace Learun.Application.Web.Controllers ViewBag.StuByMajorStr = JsonConvert.SerializeObject(stuByMajor); //流程 var flowType = dataItemIBLL.GetDetailList("FlowSort", ""); - var flowList = wfSchemeIBLL.GetWfSchemeStart().ToList(); + var flowList = wfSchemeIBLL.GetWfSchemeStart().ToList().OrderBy(x => x.F_Id); + var flowListOfCollect = sSO_Drag_CollectManageIBLL.GetList("{\"UserId\":\"" + userInfo.userId + "\",\"ModelCode\":\"two\"}").OrderBy(x => x.SchemeInfoId); + foreach (var item in flowList) + { + item.IsCollect = false; + if (flowListOfCollect.Where(x => x.SchemeInfoId == item.F_Id).Any()) + { + item.IsCollect = true; + } + } var allCount = 0; + var allCountOfCollect = 0; foreach (var flow in flowType) { - var count = flowList.Count(a => a.F_Category == flow.F_ItemName); + var count = flowList.Count(a => a.F_Category == flow.F_ItemValue); flow.FlowCount = count; allCount += count; + var countOfCollect = flowListOfCollect.Count(x => x.F_Category == flow.F_ItemValue); + flow.FlowCountOfCollect = countOfCollect; + allCountOfCollect += countOfCollect; } ViewBag.AllCount = allCount; ViewBag.FlowType = flowType; ViewBag.FlowList = JsonConvert.SerializeObject(flowList); + //流程-收藏 + ViewBag.AllCountOfCollect = allCountOfCollect; + ViewBag.FlowListOfCollect = JsonConvert.SerializeObject(flowListOfCollect); //校园一卡通余额 ViewBag.StuSaveRecordTotalNum = 0; var stuSaveRecordList = stuSaverecordIBLL.GetListByAccount(userInfo.account).OrderByDescending(x => x.UPLOADDATE); @@ -1815,5 +1839,38 @@ namespace Learun.Application.Web.Controllers return Success("操作成功"); } + /// + /// 网上办事大厅拖拽版-收藏应用 + /// + /// + /// + /// + /// true:收藏，false:取消收藏 + /// + public ActionResult DoCollectFlow(string userId, string modelCode, string id, bool isCollect) + { + sSO_Drag_CollectManageIBLL.DoCollectFlow(userId, modelCode, id, isCollect); + + //可用应用列表数据 + var flowList = wfSchemeIBLL.GetWfSchemeStart().ToList().OrderBy(x => x.F_Id); + //我的收藏列表数据 + var flowListOfCollect = sSO_Drag_CollectManageIBLL.GetList("{\"UserId\":\"" + userId + "\",\"ModelCode\":\"" + modelCode + "\"}").OrderBy(x => x.SchemeInfoId); + foreach (var item in flowList) + { + item.IsCollect = false; + if (flowListOfCollect.Where(x => x.SchemeInfoId == item.F_Id).Any()) + { + item.IsCollect = true; + } + } + var data = new + { + flowList = flowList, + flowListOfCollect = flowListOfCollect + }; + + return Success("操作成功", data); + } + } } \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/SSOSystem/DragModelOne.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/SSOSystem/DragModelOne.cshtml index c955538ce..fe76349bb 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/SSOSystem/DragModelOne.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/SSOSystem/DragModelOne.cshtml @@ -308,7 +308,7 @@ html += '' + ''; } - + html+='' +'' +'' @@ -732,6 +732,7 @@ .desktopSetBox b { font-weight: normal; } + .searchLi > a { width: 100%; } @@ -739,7 +740,15 @@ .searchLi > a > * { display: inline-block; vertical-align: middle; - } + } + .inSec1List2 li{ + padding-right:30px; + position:relative; + } + .inSec1List2 .fa{ + right:15px; + top:5px; + }
@@ -765,29 +774,29 @@
@*
- 服务角色 -
    -
  • 全部
    • -
  • 校领导
    • -
  • 游客
    • -
  • 教师
    • -
  • 学生
    • -
-
-
- 服务角色 -
    -
  • 全部
    • -
  • 最新应用
    • -
  • 常用链接
    • -
-
*@ + 服务角色 +
    +
  • 全部
    • +
  • 校领导
    • +
  • 游客
    • +
  • 教师
    • +
  • 学生
    • +
+
+
+ 服务角色 +
    +
  • 全部
    • +
  • 最新应用
    • +
  • 常用链接
    • +
+
*@
@{ var searchModule = ViewBag.SearchModule as List;
- A-D (@searchModule.Where(x=>"abcd".Contains(x.FirstLetter)).Count()) + A-D (@searchModule.Where(x => "abcd".Contains(x.FirstLetter)).Count())
@{ @@ -951,21 +960,24 @@
-
@@ -980,7 +992,7 @@ @foreach (DataItemDetailEntity item in ViewBag.FlowType) {
  • - + @item.F_ItemName @item.FlowCount
    • @@ -1648,15 +1660,59 @@ var category = $(this).attr("itemName"); $('#flowTypeList').find('li.active').removeClass('active'); $(this).parent('li').addClass("active"); - $.each(flowListJson,function(i, item) { + $.each(flowListJson, function (i, item) { + var collectClass = "fa-heart-o"; + if (item.IsCollect == true) { + collectClass = "fa-heart"; + } if (category == "全部") { - html += "
  • "+item.F_Name+"
    • "; + html += "
  • " + item.F_Name + "
    • "; }else if (item.F_Category==category) { - html += "
  • "+item.F_Name+"
    • "; + html += "
  • " + item.F_Name + "
    • "; } }); $("#flowList").html(html); }) $("#flowTypeList").find(".itemName").eq(0).trigger("click"); + //左侧-我的收藏 + var flowListOfCollect = '@ViewBag.FlowListOfCollect'; + flowListOfCollect = flowListOfCollect.replace(/"/g, "\""); + var flowListOfCollectJson = JSON.parse(flowListOfCollect); + $("#flowTypeListOfCollect").find(".itemName").bind("click", function() { + var html = ""; + var category = $(this).attr("itemName"); + $('#flowTypeListOfCollect').find('li.active').removeClass('active'); + $(this).parent('li').addClass("active"); + $.each(flowListOfCollectJson, function (i, item) { + var collectClass = "fa-heart"; + if (category == "全部") { + html += "
  • " + item.F_Name + "
    • "; + }else if (item.F_Category==category) { + html += "
  • " + item.F_Name + "
    • "; + } + }); + $("#flowListOfCollect").html(html); + }) + $("#flowTypeListOfCollect").find(".itemName").eq(0).trigger("click"); + + //更新“左侧-我的收藏”左侧分类数量 + var updateCollectCount = function (data) { + $.each($("#flowTypeListOfCollect").find(".itemName"), function (i, item) { + var category = $(item).attr("itemName"); + if (category == "全部") { + $(item).find('.collectCount').html(data.length); + } else { + var count = 0; + $.each(data, function (j, jtem) { + if (jtem.F_Category == category) { + count++; + } + }); + $(item).find('.collectCount').html(count); + } + }); + }; + + diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/SSOSystem/DragModelTwo.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/SSOSystem/DragModelTwo.cshtml index 1da5c8c0d..be71b99ef 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/SSOSystem/DragModelTwo.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/SSOSystem/DragModelTwo.cshtml @@ -740,7 +740,16 @@ .searchLi > a > * { display: inline-block; vertical-align: middle; - } + } + .inSec1List2 li { + padding-right: 30px; + position: relative; + } + + .inSec1List2 .fa { + right: 15px; + top: 5px; + }
    @@ -952,22 +961,24 @@
    -
    @@ -981,7 +992,7 @@ @foreach (DataItemDetailEntity item in ViewBag.FlowType) {
  • - + @item.F_ItemName @item.FlowCount
    • @@ -1599,15 +1610,59 @@ var category = $(this).attr("itemName"); $('#flowTypeList').find('li.active').removeClass('active'); $(this).parent('li').addClass("active"); - $.each(flowListJson,function(i, item) { + $.each(flowListJson, function (i, item) { + var collectClass = "fa-heart-o"; + if (item.IsCollect == true) { + collectClass = "fa-heart"; + } if (category == "全部") { - html += "
  • "+item.F_Name+"
    • "; + html += "
  • " + item.F_Name + "
    • "; }else if (item.F_Category==category) { - html += "
  • "+item.F_Name+"
    • "; + html += "
  • " + item.F_Name + "
    • "; } }); $("#flowList").html(html); }) $("#flowTypeList").find(".itemName").eq(0).trigger("click"); + //左侧-我的收藏 + var flowListOfCollect = '@ViewBag.FlowListOfCollect'; + flowListOfCollect = flowListOfCollect.replace(/"/g, "\""); + var flowListOfCollectJson = JSON.parse(flowListOfCollect); + $("#flowTypeListOfCollect").find(".itemName").bind("click", function() { + var html = ""; + var category = $(this).attr("itemName"); + $('#flowTypeListOfCollect').find('li.active').removeClass('active'); + $(this).parent('li').addClass("active"); + $.each(flowListOfCollectJson, function (i, item) { + var collectClass = "fa-heart"; + if (category == "全部") { + html += "
  • " + item.F_Name + "
    • "; + }else if (item.F_Category==category) { + html += "
  • " + item.F_Name + "
    • "; + } + }); + $("#flowListOfCollect").html(html); + }) + $("#flowTypeListOfCollect").find(".itemName").eq(0).trigger("click"); + + //更新“左侧-我的收藏”左侧分类数量 + var updateCollectCount = function (data) { + $.each($("#flowTypeListOfCollect").find(".itemName"), function (i, item) { + var category = $(item).attr("itemName"); + if (category == "全部") { + $(item).find('.collectCount').html(data.length); + } else { + var count = 0; + $.each(data, function (j, jtem) { + if (jtem.F_Category == category) { + count++; + } + }); + $(item).find('.collectCount').html(count); + } + }); + }; + + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/SystemModule/DataItem/DataItemDetailEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/SystemModule/DataItem/DataItemDetailEntity.cs index 1137551e2..576dca49a 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/SystemModule/DataItem/DataItemDetailEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/SystemModule/DataItem/DataItemDetailEntity.cs @@ -142,6 +142,11 @@ namespace Learun.Application.Base.SystemModule ///
    [NotMapped] public int FlowCount { get; set; } + /// + /// 新增调用 + /// + [NotMapped] + public int FlowCountOfCollect { get; set; } public void Create() { this.F_ItemDetailId = Guid.NewGuid().ToString(); diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/LR_Desktop/SSO_Drag_CollectManageMap.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/LR_Desktop/SSO_Drag_CollectManageMap.cs new file mode 100644 index 000000000..b55ff8407 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/LR_Desktop/SSO_Drag_CollectManageMap.cs @@ -0,0 +1,29 @@ +using Learun.Application.TwoDevelopment.LR_Desktop; +using System.Data.Entity.ModelConfiguration; + +namespace Learun.Application.Mapping +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2021-06-02 16:12 + /// 描 述：网上办事大厅拖拽版-可用应用收藏管理 + /// + public class SSO_Drag_CollectManageMap : EntityTypeConfiguration + { + public SSO_Drag_CollectManageMap() + { + #region 表、主键 + //表 + this.ToTable("SSO_DRAG_COLLECTMANAGE"); + //主键 + this.HasKey(t => t.Id); + #endregion + + #region 配置关系 + #endregion + } + } +} + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/DBModel/资产系统.PDM b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/DBModel/资产系统.PDM index fc71cf1d6..8d9a30f01 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/DBModel/资产系统.PDM +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/DBModel/资产系统.PDM @@ -1,5 +1,5 @@ - + @@ -12256,9 +12256,9 @@ LABL 0 新宋体,8,N 1623119171 -1623119537 +1623119875 -1 -((-360307,105060), (-343953,116308)) +((-361447,105240), (-345093,116488)) 0 12615680 16570034 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/SSO_Drag_CardSortManage/SSO_Drag_CardSortManageEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/SSO_Drag_CardSortManage/SSO_Drag_CardSortManageEntity.cs index ba8a007d7..c69e25ea4 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/SSO_Drag_CardSortManage/SSO_Drag_CardSortManageEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/SSO_Drag_CardSortManage/SSO_Drag_CardSortManageEntity.cs @@ -27,7 +27,7 @@ namespace Learun.Application.TwoDevelopment.LR_Desktop [Column("USERID")] public string UserId { get; set; } /// - /// 模式编号：0办事大厅模式，1效率优先模式，2管理驾驶舱模式 + /// 模式编号：one办事大厅模式，two效率优先模式，three管理驾驶舱模式 /// /// [Column("MODELCODE")] diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/SSO_Drag_CollectManage/SSO_Drag_CollectManageBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/SSO_Drag_CollectManage/SSO_Drag_CollectManageBLL.cs new file mode 100644 index 000000000..89667d44f --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/SSO_Drag_CollectManage/SSO_Drag_CollectManageBLL.cs @@ -0,0 +1,171 @@ +using Learun.Util; +using System; +using System.Data; +using System.Collections.Generic; + +namespace Learun.Application.TwoDevelopment.LR_Desktop +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2021-06-02 16:12 + /// 描 述：网上办事大厅拖拽版-可用应用收藏管理 + /// + public class SSO_Drag_CollectManageBLL : SSO_Drag_CollectManageIBLL + { + private SSO_Drag_CollectManageService sSO_Drag_CollectManageService = new SSO_Drag_CollectManageService(); + + #region 获取数据 + + /// + /// 获取列表数据 + /// + /// 查询参数 + /// + public IEnumerable GetList(string queryJson) + { + try + { + return sSO_Drag_CollectManageService.GetList(queryJson); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + /// + /// 获取列表分页数据 + /// + /// 分页参数 + /// 查询参数 + /// + public IEnumerable GetPageList(Pagination pagination, string queryJson) + { + try + { + return sSO_Drag_CollectManageService.GetPageList(pagination, queryJson); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + /// + /// 获取实体数据 + /// + /// 主键 + /// + public SSO_Drag_CollectManageEntity GetEntity(string keyValue) + { + try + { + return sSO_Drag_CollectManageService.GetEntity(keyValue); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + #endregion + + #region 提交数据 + + /// + /// 删除实体数据 + /// + /// 主键 + public void DeleteEntity(string keyValue) + { + try + { + sSO_Drag_CollectManageService.DeleteEntity(keyValue); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + /// + /// 保存实体数据（新增、修改） + /// + /// 主键 + /// 实体 + public void SaveEntity(string keyValue, SSO_Drag_CollectManageEntity entity) + { + try + { + sSO_Drag_CollectManageService.SaveEntity(keyValue, entity); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + /// + /// 收藏 + /// + /// 主键 + public void DoCollectFlow(string userId, string modelCode, string id, bool isCollect) + { + try + { + sSO_Drag_CollectManageService.DoCollectFlow(userId, modelCode, id, isCollect); + } + 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.TwoDevelopment/LR_Desktop/SSO_Drag_CollectManage/SSO_Drag_CollectManageEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/SSO_Drag_CollectManage/SSO_Drag_CollectManageEntity.cs new file mode 100644 index 000000000..2b00ddf84 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/SSO_Drag_CollectManage/SSO_Drag_CollectManageEntity.cs @@ -0,0 +1,86 @@ +using Learun.Util; +using System; +using System.ComponentModel.DataAnnotations.Schema; +namespace Learun.Application.TwoDevelopment.LR_Desktop + +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2021-06-02 16:12 + /// 描 述：网上办事大厅拖拽版-可用应用收藏管理 + /// + public class SSO_Drag_CollectManageEntity + { + #region 实体成员 + /// + /// 主键 + /// + /// + [Column("ID")] + public string Id { get; set; } + /// + /// 用户 + /// + /// + [Column("USERID")] + public string UserId { get; set; } + /// + /// 模式编号：one办事大厅模式，two效率优先模式，three管理驾驶舱模式 + /// + /// + [Column("MODELCODE")] + public string ModelCode { get; set; } + /// + /// 可用应用Id + /// + /// + [Column("SCHEMEINFOID")] + public string SchemeInfoId { get; set; } + /// + /// 收藏时间 + /// + /// + [Column("TIME")] + public DateTime? Time { get; set; } + #endregion + + #region 扩展操作 + /// + /// 新增调用 + /// + public void Create() + { + this.Id = Guid.NewGuid().ToString(); + } + /// + /// 编辑调用 + /// + /// + public void Modify(string keyValue) + { + this.Id = keyValue; + } + #endregion + #region 扩展字段 + /// + /// 流程设计分类编号 + /// + [NotMapped] + public string F_Category { get; set; } + /// + /// 流程设计编号 + /// + [NotMapped] + public string F_Code { get; set; } + /// + /// 流程设计名称 + /// + [NotMapped] + public string F_Name { get; set; } + + #endregion + } +} + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/SSO_Drag_CollectManage/SSO_Drag_CollectManageIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/SSO_Drag_CollectManage/SSO_Drag_CollectManageIBLL.cs new file mode 100644 index 000000000..ddb640ae0 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/SSO_Drag_CollectManage/SSO_Drag_CollectManageIBLL.cs @@ -0,0 +1,61 @@ +using Learun.Util; +using System.Data; +using System.Collections.Generic; + +namespace Learun.Application.TwoDevelopment.LR_Desktop +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2021-06-02 16:12 + /// 描 述：网上办事大厅拖拽版-可用应用收藏管理 + /// + public interface SSO_Drag_CollectManageIBLL + { + #region 获取数据 + + /// + /// 获取列表数据 + /// + /// 查询参数 + /// + IEnumerable GetList(string queryJson); + /// + /// 获取列表分页数据 + /// + /// 分页参数 + /// 查询参数 + /// + IEnumerable GetPageList(Pagination pagination, string queryJson); + /// + /// 获取实体数据 + /// + /// 主键 + /// + SSO_Drag_CollectManageEntity GetEntity(string keyValue); + #endregion + + #region 提交数据 + + /// + /// 删除实体数据 + /// + /// 主键 + void DeleteEntity(string keyValue); + /// + /// 保存实体数据（新增、修改） + /// + /// 主键 + /// 实体 + void SaveEntity(string keyValue, SSO_Drag_CollectManageEntity entity); + + /// + /// 收藏 + /// + /// 主键 + void DoCollectFlow(string userId, string modelCode, string id, bool isCollect); + #endregion + + } +} diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/SSO_Drag_CollectManage/SSO_Drag_CollectManageService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/SSO_Drag_CollectManage/SSO_Drag_CollectManageService.cs new file mode 100644 index 000000000..e99ac0429 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/SSO_Drag_CollectManage/SSO_Drag_CollectManageService.cs @@ -0,0 +1,242 @@ +using Dapper; +using Learun.DataBase.Repository; +using Learun.Util; +using System; +using System.Collections.Generic; +using System.Data; +using System.Text; + +namespace Learun.Application.TwoDevelopment.LR_Desktop +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2021-06-02 16:12 + /// 描 述：网上办事大厅拖拽版-可用应用收藏管理 + /// + public class SSO_Drag_CollectManageService : RepositoryFactory + { + #region 构造函数和属性 + + private string fieldSql; + /// + /// 构造方法 + /// + public SSO_Drag_CollectManageService() + { + fieldSql = @" + t.Id, + t.UserId, + t.ModelCode, + t.SchemeInfoId, + t.Time + "; + } + #endregion + + #region 获取数据 + + /// + /// 获取列表数据 + /// + /// 条件参数 + /// + public IEnumerable GetList(string queryJson) + { + try + { + //参考写法 + var queryParam = queryJson.ToJObject(); + // 虚拟参数 + var dp = new DynamicParameters(new { }); + var strSql = new StringBuilder(); + strSql.Append("SELECT t.*,s.F_Category,s.F_Code,s.F_Name "); + strSql.Append(" FROM SSO_Drag_CollectManage t "); + strSql.Append(" left join LR_NWF_SchemeInfo s on t.SchemeInfoId=s.F_Id "); + strSql.Append(" where 1=1 "); + if (!queryParam["UserId"].IsEmpty()) + { + dp.Add("UserId", queryParam["UserId"].ToString(), DbType.String); + strSql.Append(" AND t.UserId = @UserId "); + } + if (!queryParam["ModelCode"].IsEmpty()) + { + dp.Add("ModelCode", queryParam["ModelCode"].ToString(), DbType.String); + strSql.Append(" AND t.ModelCode = @ModelCode "); + } + return this.BaseRepository().FindList(strSql.ToString(), dp); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + + /// + /// 获取列表分页数据 + /// + /// 分页参数 + /// 条件参数 + /// + public IEnumerable GetPageList(Pagination pagination, string queryJson) + { + try + { + var strSql = new StringBuilder(); + strSql.Append("SELECT t.* "); + strSql.Append(" FROM SSO_Drag_CollectManage t "); + return this.BaseRepository().FindList(strSql.ToString(), pagination); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + + /// + /// 获取实体数据 + /// + /// 主键 + /// + public SSO_Drag_CollectManageEntity GetEntity(string keyValue) + { + try + { + return this.BaseRepository().FindEntity(keyValue); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + + #endregion + + #region 提交数据 + + /// + /// 删除实体数据 + /// + /// 主键 + public void DeleteEntity(string keyValue) + { + try + { + this.BaseRepository().Delete(t => t.Id == keyValue); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + + /// + /// 保存实体数据（新增、修改） + /// 主键 + /// 实体 + /// + public void SaveEntity(string keyValue, SSO_Drag_CollectManageEntity entity) + { + try + { + if (!string.IsNullOrEmpty(keyValue)) + { + entity.Modify(keyValue); + this.BaseRepository().Update(entity); + } + else + { + entity.Create(); + this.BaseRepository().Insert(entity); + } + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + + /// + /// 收藏 + /// + /// 主键 + public void DoCollectFlow(string userId, string modelCode, string id, bool isCollect) + { + try + { + if (isCollect) + { + //收藏 + var model = this.BaseRepository().FindEntity(x => x.UserId == userId && x.ModelCode == modelCode && x.SchemeInfoId == id); + if (model == null) + { + var entity = new SSO_Drag_CollectManageEntity() + { + UserId = userId, + ModelCode = modelCode, + SchemeInfoId = id, + Time = DateTime.Now + }; + entity.Create(); + this.BaseRepository().Insert(entity); + } + } + else + { + //取消收藏 + this.BaseRepository().Delete(x => x.UserId == userId && x.ModelCode == modelCode && x.SchemeInfoId == id); + } + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + + #endregion + + } +} diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/WfProcess/WfProcessInstanceEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/WfProcess/WfProcessInstanceEntity.cs index 881d03bcf..899991231 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/WfProcess/WfProcessInstanceEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/WfProcess/WfProcessInstanceEntity.cs @@ -187,6 +187,11 @@ namespace Learun.Application.WorkFlow /// [NotMapped] public string F_Kind { get; set; } + /// + /// 是否收藏【网上办事大厅拖拽版】 + /// + [NotMapped] + public bool IsCollect { get; set; } #endregion }