bjquanjiang
/
DigitalScholl
1
0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

公文接收优化

中职版本
zhichao lei 4 years ago
parent
d43f233b4f
commit
5245f0fb25
12 changed files with 21 additions and 428 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +1
    -5
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveFile/Form.cshtml
  2. +6
    -0
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveFile/Form.js
  3. +0
    -28
      Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/_sgbak/database.config.49266.17.2020-01-06.17-54-33.6315
  4. +0
    -28
      Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/_sgbak/database.config.50042.25.2020-01-17.15-24-12.7808
  5. +0
    -34
      Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/_sgbak/database.config.70131.30.2020-04-17.13-34-11.6306
  6. +0
    -34
      Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/_sgbak/database.config.73081.31.2020-05-25.09-50-16.1906
  7. +0
    -34
      Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/_sgbak/database.config.73164.32.2020-07-30.11-01-55.8521
  8. +0
    -135
      Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/_sgbak/system.config.107241.23.2020-08-14.16-11-33.0902
  9. +0
    -124
      Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/_sgbak/system.config.49102.11.2020-01-06.17-54-33.6375
  10. +4
    -4
      Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/database.config
  11. +0
    -1
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_ReceiveDocument/Sys_ReceiveDocumentEntity.cs
  12. +10
    -1
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Workflow/Learun.Workflow.Engine/NWFEngine.cs

+ 1
- 5
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveFile/Form.cshtml View File

@@ -5,16 +5,12 @@
<div class="lr-form-wrap">
<div class="col-xs-12 lr-form-item" data-table="Sys_ReceiveFile">
<div class="lr-form-item-title">发送人</div>
<input id="Sender" type="text" class="form-control" readonly="readonly" />
<div id="SenderId"></div>
</div>
<div class="col-xs-12 lr-form-item" data-table="Sys_ReceiveFile">
<div class="lr-form-item-title">主题</div>
<input id="Title" type="text" class="form-control" readonly="readonly" />
</div>
<div class="col-xs-12 lr-form-item" data-table="Sys_ReceiveFile">
<div class="lr-form-item-title">接收对象</div>
<div id="SendType" readonly="readonly"></div>
</div>
<div class="col-xs-12 lr-form-item" data-table="Sys_ReceiveFile">
<div class="lr-form-item-title">发送时间</div>
<input id="SendTime" type="text" class="form-control" readonly="readonly" />


+ 6
- 0
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveFile/Form.js View File

@@ -16,6 +16,12 @@ var bootstrap = function ($, learun) {
page.initData();
},
bind: function () {
$('#SenderId').lrformselect({
layerUrl: top.$.rootUrl + '/LR_OrganizationModule/User/SelectOnlyForm',
layerUrlW: 400,
layerUrlH: 300,
dataUrl: top.$.rootUrl + '/LR_OrganizationModule/User/GetListByUserIds'
});
$('#SendType').lrDataItemSelect({ code: 'FileSendType' });
if (selectedRow.ReadFlag == true) {//已读
$('#Url').lrUploader();


+ 0
- 28
Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/_sgbak/database.config.49266.17.2020-01-06.17-54-33.6315 View File

@@ -1,28 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<connectionStrings>
<!--本机-->
<!--<add name="BaseDb" connectionString="Server=.;Initial Catalog=adms7ultimate2;User ID=sa;Password=1" providerName="System.Data.SqlClient" />
<add name="CollegeMIS" connectionString="Server=.;Initial Catalog=CollegeMIS;User ID=sa;Password=1" 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" />-->
<!--126-->
<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="hangfireString" connectionString="Server=192.168.2.126;Initial Catalog=Hangfire;User ID=sa;Password=bjqj@2015!" providerName="System.Data.SqlClient" />
<!--西昌-->
<!--<add name="BaseDb" connectionString="Server=112.45.152.8;Initial Catalog=adms7ultimate2;User ID=sa;Password=qj@2018" providerName="System.Data.SqlClient" />
<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" />-->
<!--demo.quanjiang.com-->
<!--<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="BaseDb" connectionString="Server=192.168.100.225;Initial Catalog=adms7ultimate2;User ID=sa;Password=Jykj@2019" providerName="System.Data.SqlClient" />
<add name="CollegeMIS" connectionString="Server=192.168.100.225;Initial Catalog=CollegeMIS;User ID=sa;Password=Jykj@2019" providerName="System.Data.SqlClient" />
<add name="hangfireString" connectionString="Server=192.168.100.225;Initial Catalog=Hangfire;User ID=sa;Password=Jykj@2019" providerName="System.Data.SqlClient" />-->
<!--126西昌测试-->
<!--<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="hangfireString" connectionString="Server=192.168.2.126;Initial Catalog=Hangfire;User ID=sa;Password=bjqj@2015!" providerName="System.Data.SqlClient" />-->

</connectionStrings>

+ 0
- 28
Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/_sgbak/database.config.50042.25.2020-01-17.15-24-12.7808 View File

@@ -1,28 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<connectionStrings>
<!--本机-->
<!--<add name="BaseDb" connectionString="Server=.;Initial Catalog=adms7ultimate2;User ID=sa;Password=1" providerName="System.Data.SqlClient" />
<add name="CollegeMIS" connectionString="Server=.;Initial Catalog=CollegeMIS;User ID=sa;Password=1" 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" />-->
<!--126-->
<!--<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="hangfireString" connectionString="Server=192.168.2.126;Initial Catalog=Hangfire;User ID=sa;Password=bjqj@2015!" providerName="System.Data.SqlClient" />-->
<!--西昌-->
<!--<add name="BaseDb" connectionString="Server=112.45.152.8;Initial Catalog=adms7ultimate2;User ID=sa;Password=qj@2018" providerName="System.Data.SqlClient" />
<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" />-->
<!--demo.quanjiang.com-->
<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="BaseDb" connectionString="Server=192.168.100.225;Initial Catalog=adms7ultimate2;User ID=sa;Password=Jykj@2019" providerName="System.Data.SqlClient" />
<add name="CollegeMIS" connectionString="Server=192.168.100.225;Initial Catalog=CollegeMIS;User ID=sa;Password=Jykj@2019" providerName="System.Data.SqlClient" />
<add name="hangfireString" connectionString="Server=192.168.100.225;Initial Catalog=Hangfire;User ID=sa;Password=Jykj@2019" providerName="System.Data.SqlClient" />-->
<!--126西昌测试-->
<!--<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="hangfireString" connectionString="Server=192.168.2.126;Initial Catalog=Hangfire;User ID=sa;Password=bjqj@2015!" providerName="System.Data.SqlClient" />-->

</connectionStrings>

+ 0
- 34
Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/_sgbak/database.config.70131.30.2020-04-17.13-34-11.6306 View File

@@ -1,34 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<connectionStrings>
<!--本机-->
<!--<add name="BaseDb" connectionString="Server=.;Initial Catalog=adms7ultimate2;User ID=sa;Password=1" providerName="System.Data.SqlClient" />
<add name="CollegeMIS" connectionString="Server=.;Initial Catalog=CollegeMIS;User ID=sa;Password=1" 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" />-->
<!--126-->
<!--<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="hangfireString" connectionString="Server=192.168.2.126;Initial Catalog=Hangfire;User ID=sa;Password=bjqj@2015!" providerName="System.Data.SqlClient" />-->
<!--西昌-->
<!--<add name="BaseDb" connectionString="Server=112.45.152.8;Initial Catalog=adms7ultimate2;User ID=sa;Password=qj@2018" providerName="System.Data.SqlClient" />
<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" />-->
<!--demo.quanjiang.com-->
<!--<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="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="BaseDb" connectionString="Server=123.57.209.16;Initial Catalog=adms7ultimate2_20200403test;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
<add name="CollegeMIS" connectionString="Server=123.57.209.16;Initial Catalog=CollegeMIS_20200403test;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="BaseDb" connectionString="Server=192.168.100.225;Initial Catalog=adms7ultimate2;User ID=sa;Password=Jykj@2019" providerName="System.Data.SqlClient" />
<add name="CollegeMIS" connectionString="Server=192.168.100.225;Initial Catalog=CollegeMIS;User ID=sa;Password=Jykj@2019" providerName="System.Data.SqlClient" />
<add name="hangfireString" connectionString="Server=192.168.100.225;Initial Catalog=Hangfire;User ID=sa;Password=Jykj@2019" providerName="System.Data.SqlClient" />-->
<!--126西昌测试-->
<!--<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="hangfireString" connectionString="Server=192.168.2.126;Initial Catalog=Hangfire;User ID=sa;Password=bjqj@2015!" providerName="System.Data.SqlClient" />-->

</connectionStrings>

+ 0
- 34
Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/_sgbak/database.config.73081.31.2020-05-25.09-50-16.1906 View File

@@ -1,34 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<connectionStrings>
<!--本机-->
<!--<add name="BaseDb" connectionString="Server=.;Initial Catalog=adms7ultimate2;User ID=sa;Password=1" providerName="System.Data.SqlClient" />
<add name="CollegeMIS" connectionString="Server=.;Initial Catalog=CollegeMIS;User ID=sa;Password=1" 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" />-->
<!--126-->
<!--<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="hangfireString" connectionString="Server=192.168.2.126;Initial Catalog=Hangfire;User ID=sa;Password=bjqj@2015!" providerName="System.Data.SqlClient" />-->
<!--西昌-->
<add name="BaseDb" connectionString="Server=112.45.152.8;Initial Catalog=adms7ultimate2;User ID=sa;Password=qj@2018" providerName="System.Data.SqlClient" />
<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" />
<!--demo.quanjiang.com-->
<!--<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="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="BaseDb" connectionString="Server=123.57.209.16;Initial Catalog=adms7ultimate2_20200403test;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
<add name="CollegeMIS" connectionString="Server=123.57.209.16;Initial Catalog=CollegeMIS_20200403test;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="BaseDb" connectionString="Server=192.168.100.225;Initial Catalog=adms7ultimate2;User ID=sa;Password=Jykj@2019" providerName="System.Data.SqlClient" />
<add name="CollegeMIS" connectionString="Server=192.168.100.225;Initial Catalog=CollegeMIS;User ID=sa;Password=Jykj@2019" providerName="System.Data.SqlClient" />
<add name="hangfireString" connectionString="Server=192.168.100.225;Initial Catalog=Hangfire;User ID=sa;Password=Jykj@2019" providerName="System.Data.SqlClient" />-->
<!--126西昌测试-->
<!--<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="hangfireString" connectionString="Server=192.168.2.126;Initial Catalog=Hangfire;User ID=sa;Password=bjqj@2015!" providerName="System.Data.SqlClient" />-->

</connectionStrings>

+ 0
- 34
Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/_sgbak/database.config.73164.32.2020-07-30.11-01-55.8521 View File

@@ -1,34 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<connectionStrings>
<!--本机-->
<!--<add name="BaseDb" connectionString="Server=.;Initial Catalog=adms7ultimate2;User ID=sa;Password=1" providerName="System.Data.SqlClient" />
<add name="CollegeMIS" connectionString="Server=.;Initial Catalog=CollegeMIS;User ID=sa;Password=1" 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" />-->
<!--126-->
<!--<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="hangfireString" connectionString="Server=192.168.2.126;Initial Catalog=Hangfire;User ID=sa;Password=bjqj@2015!" providerName="System.Data.SqlClient" />-->
<!--西昌-->
<add name="BaseDb" connectionString="Server=112.45.152.8;Initial Catalog=adms7ultimate2;User ID=sa;Password=qj@2018" providerName="System.Data.SqlClient" />
<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" />
<!--demo.quanjiang.com-->
<!--<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="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="BaseDb" connectionString="Server=123.57.209.16;Initial Catalog=adms7ultimate2_20200403test;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
<add name="CollegeMIS" connectionString="Server=123.57.209.16;Initial Catalog=CollegeMIS_20200403test;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="BaseDb" connectionString="Server=192.168.100.225;Initial Catalog=adms7ultimate2;User ID=sa;Password=Jykj@2019" providerName="System.Data.SqlClient" />
<add name="CollegeMIS" connectionString="Server=192.168.100.225;Initial Catalog=CollegeMIS;User ID=sa;Password=Jykj@2019" providerName="System.Data.SqlClient" />
<add name="hangfireString" connectionString="Server=192.168.100.225;Initial Catalog=Hangfire;User ID=sa;Password=Jykj@2019" providerName="System.Data.SqlClient" />-->
<!--126西昌测试-->
<!--<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="hangfireString" connectionString="Server=192.168.2.126;Initial Catalog=Hangfire;User ID=sa;Password=bjqj@2015!" providerName="System.Data.SqlClient" />-->

</connectionStrings>

+ 0
- 135
Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/_sgbak/system.config.107241.23.2020-08-14.16-11-33.0902 View File

@@ -1,135 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<appSettings>
<!-- ================== 1：开发系统相关配置 ================== -->
<!-- 启用系统日志-->
<add key="IsLog" value="true" />
<!-- 是否启用js、css压缩-->
<add key="JsCompressor" value="false" />
<!-- 是否启用js、css缓存-->
<add key="JsCompressorCache" value="false" />
<!-- 代码生成器路径-->
<add key="BackProject" value="Learun.Application.TwoDevelopment" />
<add key="MappingDirectory" value="\Learun.Framework.Module\Learun.Application.Module\Learun.Application.Mapping" />
<add key="ServiceDirectory" value="\Learun.Framework.Module\Learun.Application.Module\Learun.Application.TwoDevelopment" />
<add key="WebDirectory" value="\Learun.Application.Web" />
<add key="ApiDirectory" value="\Learun.Application.WebApi" />
<add key="AppDirectory" value="\Learun.Application.Mobile" />
<!-- ================== 2：这里主要是微信配置项内容部分 ================== -->
<!--企业号CorpId -->
<add key="CorpId" value="" />
<!--企业号凭证密钥 -->
<add key="CorpSecret" value="" />
<!--开放平台AppId -->
<add key="AppId" value="" />
<!--开放平台凭证密钥 -->
<add key="AppSecret" value="" />
<!-- ================== 3：访问过滤配置 ================== -->
<!--设置IP过滤 -->
<add key="FilterIP" value="false" />
<!--设置时段过滤 -->
<add key="FilterTime" value="false" />
<!-- ================== 4：系统软件参数配置 ================== -->
<!-- 联系我们 -->
<add key="Contact" value="www.xx.cn" />
<!-- 公司名称 -->
<add key="CustomerCompanyName" value="数字化智慧校园" />
<!-- 系统名称 -->
<add key="SystemName" value="数字化智慧校园" />
<!-- 软件名称 -->
<add key="SoftName" value="数字化智慧校园" />
<!-- 软件版本 -->
<add key="Version" value="3.0.1" />
<!-- 软件注册码，备用 -->
<add key="RegisterKey" value="NO:LR20180307002" />
<!-- ================== 5：外部邮件参数 ================== -->
<!-- 系统错误自动发送邮件 -->
<add key="ErrorToMail" value="false" />
<!-- 接收错误信息的邮箱 -->
<add key="RereceiveErrorMail" value="" />
<!-- 发出邮箱的名称 -->
<add key="MailName" value="" />
<!-- 发出邮箱的地址 -->
<add key="MailUserName" value="" />
<!-- 发出邮箱的密码 -->
<add key="MailPassword" value="" />
<!-- 发出邮箱设置邮箱主机 -->
<add key="MailHost" value="" />
<!--内控材料上传角色名-->
<add key="MPRoleName" value="内控材料上传员" />
<!-- ================== 6：即时通信参数 ================== -->
<!-- SignalR服务接口-->
<add key="IMUrl" value="http://192.168.2.126:8012/signalr" />
<add key="userKey" value="14B417B0-463D-4F2B-8075-0A20EEDB773A" />
<!-- ==================注意附件上传地址 修改到部署目录下的Resource要不然飞星会报错================== -->
<add key="AnnexesFile" value="D:\Project\数字化校园\Learun.Framework.Ultimate V7\Learun.Application.Web\Resource" />
<!-- ================== 8：流程服务地址 ================== -->
<add key="workflowapi" value="http://localhost:8013" />
<!--Redis 缓存前缀 -->
<add key="RedisPrev" value="LRADMS" />
<!--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" />
<!-- ================== 9：禁用BrowserLink，解决进度条卡在99%问题 ================== -->
<add key="vs:EnableBrowserLink" value="false"/>
<!--获取高职版跳转地址url -->
<!--<add key="DigitalschoolMisLoginurl" value="http://192.168.2.126:9000/LoginHandler.ashx"/>-->
<!--<add key="DigitalschoolMisLoginurl" value="http://192.168.100.225:9000/LoginHandler.ashx"/>-->
<add key="DigitalschoolMisLoginurl" value="http://123.57.209.16:9000/LoginHandler.ashx"/>
<!--<add key="DigitalschoolMisLoginurl" value="http://112.45.152.8:8082/LoginHandler.ashx"/>-->
<!-- ================== 默认密码 ================== -->
<add key="defaultpwd" value="123456" />
<add key="defaultpwdeight" value="abc123**" />
<!-- ================== 统一身份认证公钥密钥 ================== -->
<add key="SSOPublicSecret" value="bjquanjiang" />
<add key="SSOUserSecret" value="123456789" />
<!-- ================== 飞星通讯地址 下发新闻用 ================== -->
<!--<add key="CommunicationServeraddress" value="http://127.0.0.1:8866/ChatConnection" />-->
<add key="CommunicationServeraddress" value="http://123.57.209.16:8866/ChatConnection" />
<!-- ================== 默认头像 ================== -->
<add key="defaultheadimg" value="/Content/images/head/on-boy.jpg" />
<!--排课接口-->
<add key="ArrangeLessonAPI" value="http://112.45.152.8:9002/interface/paike/paike" />
<!--初始化排课接口-->
<add key="ModifyArrangeLessonAPI" value="http://112.45.152.8:9002/interface/paike/updatePaike" />
<!--开课计划接口-->
<add key="OpenLessonPlanAPI" value="http://112.45.152.8:9002/interface/paike/majorInterface" />

<!--选修排课接口-->
<add key="ArrangeLessonOfElectiveAPI" value="http://112.45.152.8:9002/interface/paike/xuanxiupaike" />
<!--初始化选修排课接口-->
<add key="ModifyArrangeLessonOfElectiveAPI" value="http://112.45.152.8:9002/interface/paike/updateXuanXiuPaike" />

<!--排考接口-->
<add key="ArrangeExamAPI" value="http://112.45.152.8:9002/interface/paikao/paikao" />
<!--选修排考接口-->
<add key="ArrangeExamOfElectiveAPI" value="http://112.45.152.8:9002/interface/paikao/xuanxiupaikao" />
<!--排考结构接口-->
<add key="ArrangeExamStructureAPI" value="http://112.45.152.8:9002/interface/paikao/geitime" />
<!--考试成绩接口-->
<add key="ExamScoreAPI" value="http://123.57.209.16:12203/jeeplus/app/stuScore" />

<!--考试系统学生端-->
<add key="kaoshisystemurl" value="http://ks.bjquanjiang.com/RereClientConnector" />
<!--批量生成学生帐号时默认的角色Id-->
<add key="GenerateStudentsRoleId" value="0cfc388c-80e6-4cf0-b53b-02201827490a" />
<!--批量生成教师帐号时默认的角色Id-->
<add key="GenerateTeachersRoleId" value="e1702746-185a-4480-8f19-3892066555cf" />
<add key="QingJuurl" value="http://xy.bjquanjiang.com/Student/LoginForSSOHandler.ashx" />
<add key="QingJuRegisterurl" value="http://xy.bjquanjiang.com/Service/ServiceStudent.ashx" />
<add key="dbbackuppath" value="D:\数字化校园\lr7test\Publish\Resource\DataBaseBackup"/>

<!-- 报名选修课排队需要调用的WebApi -->
<add key="WebApi" value="http://localhost:8081/" />
<!-- 河南对接登录 -->
<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="192.168.90.2"/>
<add key="ACIp2" value="192.168.200.252"/>
<!-- 是否强制验证强密码 -->
<add key="verifypwd" value="false"/>
<!--疫情防控组角色Id-->
<add key="EpidemicControlTeamRoleId" value="87f38e4e-b0a6-472c-b01a-2620b8f1ec46" />
</appSettings>

+ 0
- 124
Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/_sgbak/system.config.49102.11.2020-01-06.17-54-33.6375 View File

@@ -1,124 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<appSettings>
<!-- ================== 1：开发系统相关配置 ================== -->
<!-- 启用系统日志-->
<add key="IsLog" value="true" />
<!-- 是否启用js、css压缩-->
<add key="JsCompressor" value="false" />
<!-- 是否启用js、css缓存-->
<add key="JsCompressorCache" value="false" />
<!-- 代码生成器路径-->
<add key="BackProject" value="Learun.Application.TwoDevelopment" />
<add key="MappingDirectory" value="\Learun.Framework.Module\Learun.Application.Module\Learun.Application.Mapping" />
<add key="ServiceDirectory" value="\Learun.Framework.Module\Learun.Application.Module\Learun.Application.TwoDevelopment" />
<add key="WebDirectory" value="\Learun.Application.Web" />
<add key="ApiDirectory" value="\Learun.Application.WebApi" />
<add key="AppDirectory" value="\Learun.Application.Mobile" />
<!-- ================== 2：这里主要是微信配置项内容部分 ================== -->
<!--企业号CorpId -->
<add key="CorpId" value="" />
<!--企业号凭证密钥 -->
<add key="CorpSecret" value="" />
<!--开放平台AppId -->
<add key="AppId" value="" />
<!--开放平台凭证密钥 -->
<add key="AppSecret" value="" />
<!-- ================== 3：访问过滤配置 ================== -->
<!--设置IP过滤 -->
<add key="FilterIP" value="false" />
<!--设置时段过滤 -->
<add key="FilterTime" value="false" />
<!-- ================== 4：系统软件参数配置 ================== -->
<!-- 联系我们 -->
<add key="Contact" value="www.xx.cn" />
<!-- 公司名称 -->
<add key="CustomerCompanyName" value="数字化智慧校园" />
<!-- 系统名称 -->
<add key="SystemName" value="数字化智慧校园" />
<!-- 软件名称 -->
<add key="SoftName" value="数字化智慧校园" />
<!-- 软件版本 -->
<add key="Version" value="3.0.1" />
<!-- 软件注册码，备用 -->
<add key="RegisterKey" value="NO:LR20180307002" />
<!-- ================== 5：外部邮件参数 ================== -->
<!-- 系统错误自动发送邮件 -->
<add key="ErrorToMail" value="false" />
<!-- 接收错误信息的邮箱 -->
<add key="RereceiveErrorMail" value="" />
<!-- 发出邮箱的名称 -->
<add key="MailName" value="" />
<!-- 发出邮箱的地址 -->
<add key="MailUserName" value="" />
<!-- 发出邮箱的密码 -->
<add key="MailPassword" value="" />
<!-- 发出邮箱设置邮箱主机 -->
<add key="MailHost" value="" />
<!-- ================== 6：即时通信参数 ================== -->
<!-- SignalR服务接口-->
<add key="IMUrl" value="http://192.168.2.126:8012/signalr" />
<add key="userKey" value="14B417B0-463D-4F2B-8075-0A20EEDB773A" />
<!-- ==================注意附件上传地址 修改到部署目录下的Resource要不然飞星会报错================== -->
<add key="AnnexesFile" value="D:\leiprojects\西昌单校区\Learun.Application.Web\Resource" />
<!-- ================== 8：流程服务地址 ================== -->
<add key="workflowapi" value="http://localhost:8013" />
<!--Redis 缓存前缀 -->
<add key="RedisPrev" value="LRADMS" />
<!--head 头像存储地址 -->
<add key="fileHeadImg" value="C:/fileHeadImg" />
<add key="fileAppDTImg" value="C:/fileAppDTImg" />
<add key="fileLogoImg" value="C:/fileLogoImg" />
<!-- ================== 9：禁用BrowserLink，解决进度条卡在99%问题 ================== -->
<add key="vs:EnableBrowserLink" value="false"/>
<!--获取高职版跳转地址url -->
<add key="DigitalschoolMisLoginurl" value="http://192.168.2.126:9000/LoginHandler.ashx"/>
<!--<add key="DigitalschoolMisLoginurl" value="http://123.57.209.16:9000/LoginHandler.ashx"/>-->
<!-- ================== 默认密码 ================== -->
<add key="defaultpwd" value="123456" />
<add key="defaultpwdeight" value="abc123**" />
<!-- ================== 统一身份认证公钥密钥 ================== -->
<add key="SSOPublicSecret" value="bjquanjiang" />
<add key="SSOUserSecret" value="123456789" />
<!-- ================== 飞星通讯地址 下发新闻用 ================== -->
<!--<add key="CommunicationServeraddress" value="http://127.0.0.1:8866/ChatConnection" />-->
<add key="CommunicationServeraddress" value="http://123.57.209.16:8866/ChatConnection" />
<!-- ================== 默认头像 ================== -->
<add key="defaultheadimg" value="/Content/images/head/on-boy.jpg" />
<!--排课接口-->
<add key="ArrangeLessonAPI" value="http://112.45.152.8:9002/interface/paike/paike" />
<!--初始化排课接口-->
<add key="ModifyArrangeLessonAPI" value="http://112.45.152.8:9002/interface/paike/updatePaike" />
<!--开课计划接口-->
<add key="OpenLessonPlanAPI" value="http://112.45.152.8:9002/interface/paike/majorInterface" />

<!--选修排课接口-->
<add key="ArrangeLessonOfElectiveAPI" value="http://112.45.152.8:9002/interface/paike/xuanxiupaike" />
<!--初始化选修排课接口-->
<add key="ModifyArrangeLessonOfElectiveAPI" value="http://112.45.152.8:9002/interface/paike/updateXuanXiuPaike" />

<!--排考接口-->
<add key="ArrangeExamAPI" value="http://112.45.152.8:9002/interface/paikao/paikao" />
<!--选修排考接口-->
<add key="ArrangeExamOfElectiveAPI" value="http://112.45.152.8:9002/interface/paikao/xuanxiupaikao" />
<!--排考结构接口-->
<add key="ArrangeExamStructureAPI" value="http://112.45.152.8:9002/interface/paikao/geitime" />
<!--考试成绩接口-->
<add key="ExamScoreAPI" value="http://123.57.209.16:12203/jeeplus/app/stuScore" />

<!--考试系统学生端-->
<add key="kaoshisystemurl" value="http://ks.bjquanjiang.com/RereClientConnector" />
<!--批量生成学生帐号时默认的角色Id-->
<add key="GenerateStudentsRoleId" value="0cfc388c-80e6-4cf0-b53b-02201827490a" />
<!--批量生成教师帐号时默认的角色Id-->
<add key="GenerateTeachersRoleId" value="e1702746-185a-4480-8f19-3892066555cf" />
<add key="QingJuurl" value="http://xy.bjquanjiang.com/Student/LoginForSSOHandler.ashx" />
<add key="QingJuRegisterurl" value="http://xy.bjquanjiang.com/Service/ServiceStudent.ashx" />
<add key="dbbackuppath" value="D:\数字化校园\lr7test\Publish\Resource\DataBaseBackup"/>

<!-- 报名选修课排队需要调用的WebApi -->
<add key="WebApi" value="http://localhost:8061/" />
<!-- 河南对接登录 -->
<add key="appid" value="TZ6RW1DUNIN6C5M88I" />
<add key="secret" value="55848ef07e0f4e0c991bc8b4426100b2" />
<add key="redirecturl" value="http://123.6.9.199:6060/Login/SSOLogin" />
</appSettings>

+ 4
- 4
Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/database.config View File

@@ -16,17 +16,17 @@
<!--<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="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="hangfireString" connectionString="Server=123.57.209.16;Initial Catalog=Hangfire;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />-->
<!--<add name="BaseDb" connectionString="Server=123.57.209.16;Initial Catalog=adms7ultimate2_20200403test;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
<add name="CollegeMIS" connectionString="Server=123.57.209.16;Initial Catalog=CollegeMIS_20200403test;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="BaseDb" connectionString="Server=192.168.100.225;Initial Catalog=adms7ultimate2;User ID=sa;Password=Jykj@2019" providerName="System.Data.SqlClient" />
<add name="BaseDb" connectionString="Server=192.168.100.225;Initial Catalog=adms7ultimate2;User ID=sa;Password=Jykj@2019" providerName="System.Data.SqlClient" />
<add name="CollegeMIS" connectionString="Server=192.168.100.225;Initial Catalog=CollegeMIS;User ID=sa;Password=Jykj@2019" providerName="System.Data.SqlClient" />
<add name="hangfireString" connectionString="Server=192.168.100.225;Initial Catalog=Hangfire;User ID=sa;Password=Jykj@2019" providerName="System.Data.SqlClient" />-->
<add name="hangfireString" connectionString="Server=192.168.100.225;Initial Catalog=Hangfire;User ID=sa;Password=Jykj@2019" providerName="System.Data.SqlClient" />
<!--126西昌测试-->
<!--<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" />


+ 0
- 1
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_ReceiveDocument/Sys_ReceiveDocumentEntity.cs View File

@@ -89,7 +89,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
{
var loginUser = LoginUserInfo.Get();
this.RID = Guid.NewGuid().ToString();
this.RFile = Guid.NewGuid().ToString();
this.SenderId = loginUser.userId;
this.RSendFlag = "0";
}


+ 10
- 1
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Workflow/Learun.Workflow.Engine/NWFEngine.cs View File

@@ -303,7 +303,16 @@ namespace Learun.Workflow.Engine
}
else
{
line = wfScheme.lines.FirstOrDefault(a => a.from == nodeId);
List<NWFLineInfo> listLine = new List<NWFLineInfo>();
listLine = wfScheme.lines.Where(a => a.from == nodeId).ToList();
if (listLine.Count > 1)
{
line = wfScheme.lines.FirstOrDefault(a => a.from == nodeId && a.agreeList == code);
}
else
{
line = listLine.FirstOrDefault();
}
}




Write Preview
Loading…
Cancel
Save