人事文件

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Controllers/EnrollDataController.cs

@@ -160,7 +160,8 @@ namespace Learun.Application.Web.Areas.LR_Desktop.Controllers
                 return;
             }
             string filename = Server.UrlDecode(data.F_FileName);//客户端保存的文件名  
-            string filepath = data.F_FilePath;// DirFileHelper.GetAbsolutePath(data.F_FilePath);//路径 
+            data.F_FilePath ="/"+ data.F_FilePath.Substring(data.F_FilePath.IndexOf("Resource"));
+            string filepath = DirFileHelper.GetAbsolutePath(data.F_FilePath);//路径 
             if (data.F_FileType == "xlsx" || data.F_FileType == "xls")
             {
                 filepath = filepath.Substring(0, filepath.LastIndexOf(".")) + ".pdf";//文件名

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/EnrollTemplate/Index.cshtml

@@ -20,7 +20,8 @@
                 </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>
+                        <a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i></a> 
+                        <a id="lr-preview" class="btn btn-default"><i class="fa fa-eye"></i>&nbsp;<span class="lrlt">预览</span></a>
                     </div>
                     <div class=" btn-group btn-group-sm" learun-authorize="yes">
                         <a id="lr_add"   class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;新增</a>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/EnrollTemplate/Index.js

@@ -66,13 +66,34 @@ var bootstrap = function ($, learun) {
             $('#lr_print').on('click', function () {
                 $('#gridtable').jqprintTable();
             });
+            //文件预览
+            $('#lr-preview').on('click', function () {
+                var keyValue = $("#gridtable").jfGridValue("Id");
+                var Path = $("#gridtable").jfGridValue("Path");
+                if (keyValue) {
+                    learun.layerForm({
+                        id: 'PreviewForm',
+                        title: '文件预览',
+                        url: top.$.rootUrl + '/LR_Desktop/EnrollData/PreviewFile?folderid=' + Path,
+                        width: 1080,
+                        height: 850,
+                        btn: null,
+                        callBack: function (id) {
+                            return top[id].acceptClick(refreshGirdData);
+                        }
+                    });
+                } else {
+                    learun.alert.warning('请选择要预览的文件！');
+                }
+            });
         },
         // 初始化列表
         initGird: function () {
-            $('#gridtable').lrAuthorizeJfGrid({
+            $('#gridtable').jfGrid({
                 url: top.$.rootUrl + '/LR_Desktop/EnrollTemplate/GetPageList',
                 headData: [
                     { label: "模板名称", name: "Name", width: 200, align: "left" },
+                    { label: "文件名称", name: "F_FileName", width: 200, align: "left" },
                     //{ label: "模板上传", name: "Path", width: 100, align: "left"},
                     {
                         label: "是否启用", name: "Enabled", width: 100, align: "left",

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/EnrollTemplate/IndexPersonnel.cshtml

@@ -21,6 +21,7 @@
                 <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>
+                        <a id="lr-preview" class="btn btn-default"><i class="fa fa-eye"></i>&nbsp;<span class="lrlt">预览</span></a>
                     </div>
                     <div class=" btn-group btn-group-sm" learun-authorize="yes">
                         <a id="lr_add"   class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;新增</a>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/EnrollTemplate/IndexPersonnel.js

@@ -66,6 +66,26 @@ var bootstrap = function ($, learun) {
             $('#lr_print').on('click', function () {
                 $('#gridtable').jqprintTable();
             });
+            //文件预览
+            $('#lr-preview').on('click', function () {
+                var keyValue = $("#gridtable").jfGridValue("Id");
+                var Path = $("#gridtable").jfGridValue("Path");
+                if (keyValue) {
+                    learun.layerForm({
+                        id: 'PreviewForm',
+                        title: '文件预览',
+                        url: top.$.rootUrl + '/LR_Desktop/EnrollData/PreviewFile?folderid=' + Path,
+                        width: 1080,
+                        height: 850,
+                        btn: null,
+                        callBack: function (id) {
+                            return top[id].acceptClick(refreshGirdData);
+                        }
+                    });
+                } else {
+                    learun.alert.warning('请选择要预览的文件！');
+                }
+            });
         },
         // 初始化列表
         initGird: function () {
@@ -73,6 +93,7 @@ var bootstrap = function ($, learun) {
                 url: top.$.rootUrl + '/LR_Desktop/EnrollTemplate/GetPageList',
                 headData: [
                     { label: "模板名称", name: "Name", width: 200, align: "left" },
+                    { label: "文件名称", name: "F_FileName", width: 200, align: "left" },
                     //{ label: "模板上传", name: "Path", width: 100, align: "left"},
                     {
                         label: "是否启用", name: "Enabled", width: 100, align: "left",

Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/system.config

@@ -65,7 +65,7 @@
 
 	<add key="userKey" value="14B417B0-463D-4F2B-8075-0A20EEDB773A" />
 	<!-- ==================注意附件上传地址  修改到部署目录下的Resource要不然飞星会报错================== -->
-	<add key="AnnexesFile" value="D:\西昌程序单校区版2019_09_16\Learun.Framework.Ultimate V7\Learun.Application.Web\Resource" />
+	<add key="AnnexesFile" value="D:\work\DigitalScholl\Learun.Framework.Ultimate V7\Learun.Application.Web\Resource" />
 	<!-- ================== 8：流程服务地址 ================== -->
 	<add key="workflowapi" value="http://localhost:8013" />
 	<!--Redis 缓存前缀 -->
@@ -77,11 +77,11 @@
 	<add key="RedisExchangeHosts" value="127.0.0.1:6379,allowadmin=true"/>
 
 	<!--head 头像存储地址 -->
-	<add key="fileHeadImg" value="D:\西昌程序单校区版2019_09_16\Learun.Framework.Ultimate V7\Learun.Application.Web\bin\Release\Publish\Content\images\head" />
+	<add key="fileHeadImg" value="E:\西昌程序单校区版2019_09_16\Learun.Framework.Ultimate V7\Learun.Application.Web\bin\Release\Publish\Content\images\head" />
 	<add key="fileAppDTImg" value="C:/fileAppDTImg" />
 	<add key="fileLogoImg" value="C:/fileLogoImg" />
 	<!--印章管理存储图片路径 -->
-	<add key="Stamp" value="D:\授权版706\Learun.Application.Web\Resource/StampImg" />
+	<add key="Stamp" value="E:\授权版706\Learun.Application.Web\Resource/StampImg" />
 	<add key="Intervals" value="1"/>
 
 
@@ -143,16 +143,16 @@
 	<add key="dbbackuppath" value="D:\数字化校园\lr7test\Publish\Resource\DataBaseBackup"/>
 
 	<!-- 报名选修课排队需要调用的WebApi -->
-	<add key="WebApi" value="http://localhost:8088/" />
+	<add key="WebApi" value="http://localhost:8081/" />
 	<!-- 报名选修课的最大课程数 -->
-	<add key="ElectiveLessonApplyMax" value="5" />
+	<add key="ElectiveLessonApplyMax" value="2" />
 	<!-- 河南对接登录 -->
 	<add key="appid" value="TZ6RW1DUNIN6C5M88I" />
 	<add key="secret" value="55848ef07e0f4e0c991bc8b4426100b2" />
 	<add key="redirecturl" value="http://123.6.9.199:6060/Login/SSOLogin" />
 	<!-- 深信服ACIp -->
-	<add key="ACIp" value=""/>
-	<add key="ACIp2" value=""/>
+	<add key="ACIp" value="192.168.90.2"/>
+	<add key="ACIp2" value="192.168.200.252"/>
 	<!-- 是否强制验证强密码 -->
 	<add key="verifypwd" value="false"/>
 	<!--疫情防控组角色Id-->
@@ -160,7 +160,7 @@
 	<!--注册教师生成编号 金隅:jy;西昌：xc；大厂：dc-->
 	<add key="EmpNoRule" value="jy"/>
 	<!--考勤明细统计时查询的职工编号前缀 大厂：DCZZ-->
-	<add key="ADR_RecordUserNoPrev" value=""/>
+	<add key="ADR_RecordUserNoPrev" value="DCZZ"/>
 	<!--第三方登录跳转地址（最后不加/）-->
 	<add key="redirect_url" value="http://localhost:20472"/>
 	<add key="QJUrl" value="www.qj.com"/>
@@ -172,7 +172,9 @@
 	<add key="ForbidLoginMinutes" value="10"/>
 
 	<!--下发新闻配置-->
-	<add key="SiteId" value="1"/>
-	<add key="ChannelId" value="6"/>
-	<add key="ApiKey" value="fafc361a-40c1-4060-8eee-ea796640c39c"/>
+	<add key="SiteId" value="39"/>
+	<add key="ChannelId" value="49"/>
+  <add key="ApiKey" value="fafc361a-40c1-4060-8eee-ea796640c39c"/>
+  <add key="Ports" value="192.168.50.127:8007"/>
+  
 </appSettings>

Learun.Framework.Ultimate V7/Learun.Application.WebApi/XmlConfig/database.config

@@ -1,11 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <connectionStrings>
-  <!--本机-->
-  <!--<add name="BaseDb" connectionString="Server=.;Initial Catalog=adms7ultimate2_塔里木;User ID=sa;Password=123456" providerName="System.Data.SqlClient" />
-  <add name="CollegeMIS" connectionString="Server=.;Initial Catalog=NewCollegeMIS_塔里木;User ID=sa;Password=123456" providerName="System.Data.SqlClient" />
-  <add name="hangfireString" connectionString="Server=123.57.209.16;Initial Catalog=Hangfire;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
-  <add name="paikeDbString" connectionString="Data Source=10.30.0.11;Database=paike;User ID=root;Password=12345678;" providerName="MySql.Data.MySqlClient" />-->
-
   <!--<add name="BaseDb" connectionString="Server=192.168.2.126;Initial Catalog=adms7ultimate2;User ID=sa;Password=bjqj@2015!" providerName="System.Data.SqlClient" />
   <add name="CollegeMIS" connectionString="Server=192.168.2.126;Initial Catalog=CollegeMIS;User ID=sa;Password=bjqj@2015!" providerName="System.Data.SqlClient" />-->
   <!--<add name="BaseDb" connectionString="Server=123.57.209.16;Initial Catalog=adms7ultimate2_西昌;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
@@ -25,8 +19,13 @@
   <add name="CollegeMIS" connectionString="Server=112.45.152.8;Initial Catalog=NewCollegeMIS;User ID=sa;Password=qj@2018" providerName="System.Data.SqlClient" />
   <add name="hangfireString" connectionString="Server=112.45.152.8;Initial Catalog=HangFire;User ID=sa;Password=qj@2018" providerName="System.Data.SqlClient" />-->
 	<!--塔里木测试-->
-	<add name="BaseDb" connectionString="Server=123.57.209.16;Initial Catalog=adms7ultimate2_塔里木;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
+	<!--<add name="BaseDb" connectionString="Server=123.57.209.16;Initial Catalog=adms7ultimate2_塔里木;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
 	<add name="CollegeMIS" connectionString="Server=123.57.209.16;Initial Catalog=CollegeMIS_塔里木;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
 	<add name="hangfireString" connectionString="Server=123.57.209.16;Initial Catalog=Hangfire;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
-	<add name="paikeDbString" connectionString="Data Source=10.30.0.11;Database=paike;User ID=root;Password=12345678;" providerName="MySql.Data.MySqlClient" />
+	<add name="paikeDbString" connectionString="Data Source=10.30.0.11;Database=paike;User ID=root;Password=12345678;" providerName="MySql.Data.MySqlClient" />-->
+
+  <!--西昌-->
+  <add name="BaseDb" connectionString="Server=123.57.209.16;Initial Catalog=adms7ultimate2_娄底;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
+  <add name="CollegeMIS" connectionString="Server=123.57.209.16;Initial Catalog=CollegeMIS_娄底;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
+  <add name="hangfireString" connectionString="Server=123.57.209.16;Initial Catalog=Hangfire;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
 </connectionStrings>

Learun.Framework.Ultimate V7/Learun.Application.WebApi/XmlConfig/system.config

@@ -65,7 +65,7 @@
 
   <add key="userKey" value="14B417B0-463D-4F2B-8075-0A20EEDB773A" />
   <!-- ==================注意附件上传地址  修改到主网站部署目录下的Resource要不然飞星会报错================== -->
-  <add key="AnnexesFile" value="D:\leiprojects\西昌单校区\Learun.Application.Web\Resource" />
+  <add key="AnnexesFile" value="D:\work\DigitalScholl\Learun.Framework.Ultimate V7\Learun.Application.Web\Resource" />
   <add key="ReportFile" value="~/Reports" />
   <!-- ================== 工作流服务地址 ================== -->
   <add key="workflowapi" value="http://localhost:8013" />

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/EnrollData/EnrollDataService.cs

@@ -36,7 +36,7 @@ namespace Learun.Application.TwoDevelopment.LR_Desktop
                  t.*,f.F_FileName
                 ");
                 strSql.Append("  FROM EnrollData t ");
-                strSql.Append("  left join "+ basedbname + ".dbo.LR_Base_AnnexesFile f on t.[Path]=f.f_folderid ");
+                strSql.Append("  left join " + basedbname + ".dbo.LR_Base_AnnexesFile f on t.[Path]=f.f_folderid ");
                 strSql.Append("  WHERE 1=1 ");
                 var queryParam = queryJson.ToJObject();
                 // 虚拟参数
@@ -48,10 +48,10 @@ namespace Learun.Application.TwoDevelopment.LR_Desktop
                 }
                 if (!queryParam["keyword"].IsEmpty())
                 {
-                    dp.Add("keyword", queryParam["keyword"].ToString(), DbType.String);
+                    dp.Add("keyword", "%" + queryParam["keyword"].ToString() + "%", DbType.String);
                     strSql.Append(" AND f.F_FileName like  @keyword ");
                 }
-                return this.BaseRepository("CollegeMIS").FindList<EnrollDataEntity>(strSql.ToString(),dp, pagination);
+                return this.BaseRepository("CollegeMIS").FindList<EnrollDataEntity>(strSql.ToString(), dp, pagination);
             }
             catch (Exception ex)
             {
@@ -102,7 +102,7 @@ namespace Learun.Application.TwoDevelopment.LR_Desktop
         {
             try
             {
-                this.BaseRepository("CollegeMIS").Delete<EnrollDataEntity>(t=>t.Id == keyValue);
+                this.BaseRepository("CollegeMIS").Delete<EnrollDataEntity>(t => t.Id == keyValue);
             }
             catch (Exception ex)
             {

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/EnrollTemplate/EnrollTemplateEntity.cs

@@ -83,6 +83,9 @@ namespace Learun.Application.TwoDevelopment.LR_Desktop
         }
         #endregion
         #region 扩展字段
+        [NotMapped]
+        public string F_FileName { get; set; }
+
         #endregion
     }
 }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/EnrollTemplate/EnrollTemplateService.cs

@@ -29,15 +29,17 @@ namespace Learun.Application.TwoDevelopment.LR_Desktop
         {
             try
             {
+                var basedbname = BaseRepository().getDbConnection().Database;
                 var strSql = new StringBuilder();
                 strSql.Append("SELECT ");
                 strSql.Append(@"
                 t.Id,
                 t.Name,
                 t.Path,
-                t.Enabled
+                t.Enabled,f.F_FileName
                 ");
                 strSql.Append("  FROM EnrollTemplate t ");
+                strSql.Append("  left join " + basedbname + ".dbo.LR_Base_AnnexesFile f on t.[Path]=f.f_folderid ");
                 strSql.Append("  WHERE 1=1 ");
                 var queryParam = queryJson.ToJObject();
                 // 虚拟参数