Skip to content

C
code
Commit e6aa593f authored by solho's avatar solho
Browse files
Options

feat:套件升級相關修改 

feat:部分基底CODE調整
parent edfb1d02
Expand all Show whitespace changes
Inline Side-by-side
Showing with 159 additions and 199 deletions
WebAPI/Areas/HelpPage/Views/Web.config
View file @ e6aa593f
......@@ -9,7 +9,7 @@
</configSections>
<system.web.webPages.razor>
<host factoryType="System.Web.Mvc.MvcWebRazorHostFactory, System.Web.Mvc, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
<host factoryType="System.Web.Mvc.MvcWebRazorHostFactory, System.Web.Mvc, Version=5.2.8.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
<pages pageBaseType="System.Web.Mvc.WebViewPage">
<namespaces>
<add namespace="System.Web.Mvc" />
......
WebAPI/Areas/HelpPage/Views/_ViewStart.cshtml
View file @ e6aa593f
@{
// Change the Layout path below to blend the look and feel of the help page with your existing web pages
Layout = "~/Views/Shared/_Layout.cshtml";
@{
// Change the Layout path below to blend the look and feel of the help page with your existing web pages.
Layout = "~/Areas/HelpPage/Views/Shared/_Layout.cshtml";
}
\ No newline at end of file
WebAPI/Controllers/Esn_Subitem/Esn_Todos_FlowController.cs
View file @ e6aa593f
......@@ -132,7 +132,7 @@ namespace WebAPI.Controllers
ExportEHR_hisModel hisT;
SqlCommand cmd = new SqlCommand("", Conn)
{
CommandText = @"select b.cn_name, a.* from esn_todos_SettleLog a
CommandText = @"select b.cn_name, a.id, a.Country, a.update_time, a.update_user_id, a.Create_user_id, a.Create_time from esn_todos_SettleLog a
left join s_user_info b on a.Create_user_id=b.user_id
where a.Create_user_id=@Create_user_id @wherecase"
};
......@@ -146,7 +146,7 @@ namespace WebAPI.Controllers
hisT = new ExportEHR_hisModel()
{
id = (int)dr["id"],
SaveData = dr["SaveData"].ToString(),
//SaveData = dr["SaveData"].ToString(),
update_time = (DateTime?)dr["update_time"],
update_user_id = dr["update_user_id"].ToString(),
Create_time = (DateTime?)dr["Create_time"],
......
WebAPI/Controllers/Esn_Subitem/Esn_todosController.cs
View file @ e6aa593f
......@@ -16,7 +16,6 @@ using System.Web.Http;
using WebAPI.Models;
using MySql.Data.MySqlClient;
using static WebAPI.Tool.Common;
using System.Web.Script.Serialization;
using System.Text;
namespace WebAPI.Controllers
......@@ -467,8 +466,6 @@ namespace WebAPI.Controllers
public List<validpointModel> validpoint(JObject obj_input)
{
List<validpointModel> resultslist = new List<validpointModel>();
try
{
using (MySqlConnection mconn = new MySqlConnection(ConfigurationManager.ConnectionStrings["essenConnection"].ConnectionString))
{
String sqlstr = @"select v2.text as attr_userID, v22.text as attr_UserName, ROUND(-v21.vInt / 3) AS lastthreeAvg, v21.* from
......@@ -493,10 +490,6 @@ namespace WebAPI.Controllers
resultslist = results.ToList<validpointModel>();
}
}
catch (Exception e)
{
}
return resultslist;
}
......@@ -507,8 +500,7 @@ namespace WebAPI.Controllers
{
using (SqlConnection Conn = new SqlConnection(connString))
{
Dapper.SqlMapper.Settings.CommandTimeout = 60000;
var results = Conn.Query<SP_rpt_PerformanceMonth_FlowModel>("rpt_PerformanceMonth_Flow"
, new
{
......@@ -525,8 +517,9 @@ namespace WebAPI.Controllers
}
}
catch (Exception e)
catch
{
}
return resultslist;
}
......@@ -566,6 +559,11 @@ namespace WebAPI.Controllers
return result;
}
/// <summary>
/// 取得EHR資料 輸出部分
/// </summary>
/// <param name="param"></param>
/// <returns></returns>
[Route("Get_EHRData")]
[CorsHandle]
......@@ -588,11 +586,12 @@ namespace WebAPI.Controllers
if (obj_input["@furtherSql"] == null || obj_input["@furtherSql"].ToString() == "")
{
//給SP預設參數 預設為所有人
obj_input["@furtherSql"] = @"select eemp.user_id from[dbo].[evw_Employee] eemp
left join[dbo].[evw_qResult_EmpDS] eqeds on eemp.Emp_DS = eqeds.Emp_DS
left join[dbo].evw_qResult_EmpItem eqeit on eemp.Emp_Item = eqeit.Emp_Item left join evw_qResult_Dept eqd on eqd.targetID = eemp.Emp_DeptNum";
}
obj_input["@p_params"] = "report,,-999999,"+ Date_settlement_begin + "," + Date_settlement_end + ",Flow,HR,HR";
obj_input["@p_params"] = "report,,-999999,"+ Date_settlement_begin + "," + Date_settlement_end + ",Flow,HR,HR"; //給SP預設參數
obj_input["@strFlowUserID_also"] = "";
List<validpointModel> resultslist檢核扣點 = validpoint(obj_input);
List<SP_rpt_PerformanceMonth_FlowModel> resultslist = rpt_PerformanceMonth_Flow(obj_input);
......@@ -609,11 +608,13 @@ namespace WebAPI.Controllers
}
}
resultslist = resultslist.Where(p => p.處理事項數 > 0).ToList();
foreach (SP_rpt_PerformanceMonth_FlowModel data in resultslist)
{
ExportEhrModel TempExportEhrModel = new ExportEhrModel()
{
userID = data.attr_userID,
所別 = data.所別,
管理中心 = data.管理中心,
一級部門 = data.一級部門,
......@@ -631,13 +632,8 @@ namespace WebAPI.Controllers
}
obj_input["gUserID_wade"] = obj_input["@p_Emp_ID"];
String jstring = JsonConvert.SerializeObject(ExportEhr);
//cmd.Parameters.AddWithValue("@SaveData", obj_input["SaveData"].ToString());
//cmd.Parameters.AddWithValue("@gUserID_wade", obj_input["gUserID_wade"].ToString());
obj_input["SaveData"] = jstring;
DataTable dtsave = Esn_Todos_FlowController.Save_PointSettlement_Log_Base(obj_input);
//var json = new JavaScriptSerializer().Serialize(resultslist[0]);
//JObject json2 =JObject.Parse(new JavaScriptSerializer().Serialize(resultslist));
//json[0]["aaa"] = "12345";
response.Msg = ExportEhr;
response.Code = "1";
}
......
WebAPI/Controllers/FeeOfferConfigController.cs
View file @ e6aa593f
......@@ -271,11 +271,7 @@ namespace WebAPI.Controllers
var table = ds.Tables[0];
DataRow drh = table.Rows[0];
for (int i = 0; i < drh.ItemArray.Length; i++)
{
string a = drh[i].ToString();
Console.WriteLine(ToTraditional(drh[i].ToString()));
table.Columns[i].ColumnName = ToTraditional(drh[i].ToString());
}
Dictionary<String, String> ids = new Dictionary<String, String>(), Temps = new Dictionary<String, String>();
DataRow drRow;
......
WebAPI/Models/Esn_TodosModel.cs
View file @ e6aa593f
......@@ -54,7 +54,7 @@ namespace WebAPI.Models
public String attr_todos2 { get; set; }
public String attr_RejectCount { get; set; }
public String attr_nn_toConfirmAll { get; set; }
public String 處理事項數 { get; set; }
public int 處理事項數 { get; set; }
public String attr_todos3 { get; set; }
public String attr_MapClasslist { get; set; }
......@@ -89,6 +89,7 @@ namespace WebAPI.Models
/// </summary>
public class ExportEhrModel
{
public String userID { get; set; }
public String 所別 { get; set; }
public String 管理中心 { get; set; }
public String 一級部門 { get; set; }
......
WebAPI/Tool/SqlServerHelper.cs
View file @ e6aa593f
......@@ -165,7 +165,9 @@ namespace WebAPI.Tool
if (selectSqlCommand ==null)
throw new Exception("要执行的selectSqlCommand不能为空");
OpenConnection();
if(selectSqlCommand.Connection==null)
selectSqlCommand.Connection = SqlCnt;
SqlDataAdapter sqlDataAdapter = new SqlDataAdapter(selectSqlCommand);
DataTable dataTable = new DataTable();
try
......
WebAPI/Web.config
View file @ e6aa593f
......@@ -13,6 +13,7 @@
<add name="DefaultConnection" connectionString="Data Source=47.91.213.74,6002;Initial Catalog=IPEasy_test;Persist Security Info=True;User ID=ipeasy;Password=ipeasy.123" providerName="System.Data.SqlClient" />
<!--核稿歷史-->
<add name="eflow_cur" connectionString="Data Source=47.91.213.74,6002;Initial Catalog=IPEasy_test;Persist Security Info=True;User ID=ipeasyTest;Password=ipeasy.123" providerName="System.Data.SqlClient" />
<!--內管系統-->
<add name="essenConnection" connectionString="server=192.168.1.174;port=3306;user id=sol; password=FK35cnvbeH3BNAxV; database=essen_test " />
</connectionStrings>
<appSettings>
......@@ -20,7 +21,6 @@
<add key="webpages:Enabled" value="false" />
<add key="ClientValidationEnabled" value="true" />
<add key="UnobtrusiveJavaScriptEnabled" value="true" />
<add key="admin_user_id" value="true" />
</appSettings>
<!--
如需 web.config 變更的說明，請參閱 http://go.microsoft.com/fwlink/?LinkId=235367。
......@@ -60,7 +60,7 @@
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" culture="neutral" publicKeyToken="30ad4fe6b2a6aeed" />
<bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" />
<bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Web.Optimization" publicKeyToken="31bf3856ad364e35" />
......@@ -70,6 +70,14 @@
<assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35" />
<bindingRedirect oldVersion="0.0.0.0-1.6.5135.21930" newVersion="1.6.5135.21930" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.1.1" newVersion="4.0.1.1" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35" />
<bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
......@@ -80,24 +88,22 @@
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
<bindingRedirect oldVersion="1.0.0.0-5.2.7.0" newVersion="5.2.7.0" />
<bindingRedirect oldVersion="1.0.0.0-5.2.8.0" newVersion="5.2.8.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
<assemblyIdentity name="ExcelNumberFormat" publicKeyToken="23c6f5d73be07eca" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.1.0.0" newVersion="1.1.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.1.1" newVersion="4.0.1.1" />
<assemblyIdentity name="BouncyCastle.Crypto" publicKeyToken="0e99375e54769942" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.8.9.0" newVersion="1.8.9.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.Web.Infrastructure" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.0.0.0" newVersion="2.0.0.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
<system.codedom>
<compilers>
<compiler language="c#;cs;csharp" extension=".cs" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.CSharpCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:default /nowarn:1659;1699;1701" />
<compiler language="vb;vbs;visualbasic;vbscript" extension=".vb" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.VBCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:default /nowarn:41008 /define:_MYTYPE=\&quot;Web\&quot; /optionInfer+" />
</compilers>
</system.codedom>
<entityFramework>
<defaultConnectionFactory type="System.Data.Entity.Infrastructure.LocalDbConnectionFactory, EntityFramework">
<parameters>
......@@ -108,4 +114,10 @@
<provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer" />
</providers>
</entityFramework>
<system.codedom>
<compilers>
<compiler language="c#;cs;csharp" extension=".cs" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.CSharpCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=3.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:default /nowarn:1659;1699;1701" />
<compiler language="vb;vbs;visualbasic;vbscript" extension=".vb" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.VBCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=3.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:default /nowarn:41008 /define:_MYTYPE=\&quot;Web\&quot; /optionInfer+" />
</compilers>
</system.codedom>
</configuration>
\ No newline at end of file
WebAPI/WebAPI.csproj
View file @ e6aa593f
This diff is collapsed.
WebAPI/packages.config
View file @ e6aa593f
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Antlr" version="3.5.0.2" targetFramework="net46" />
<package id="bootstrap" version="3.4.1" targetFramework="net46" />
<package id="BouncyCastle" version="1.8.3.1" targetFramework="net46" />
<package id="ClosedXML" version="0.95.3" targetFramework="net46" />
<package id="Antlr" version="3.5.0.2" targetFramework="net48" />
<package id="bootstrap" version="3.4.1" targetFramework="net48" />
<package id="BouncyCastle" version="1.8.9" targetFramework="net48" />
<package id="Dapper" version="2.0.123" targetFramework="net48" />
<package id="Dapper.Contrib" version="2.0.78" targetFramework="net48" />
<package id="DocumentFormat.OpenXml" version="2.7.2" targetFramework="net46" />
<package id="EastAsiaNumericFormatter" version="1.0.0" targetFramework="net46" />
<package id="EastAsiaNumericFormatter" version="1.0.0" targetFramework="net48" />
<package id="EntityFramework" version="6.2.0" targetFramework="net48" />
<package id="EntityFramework.zh-Hant" version="6.2.0" targetFramework="net48" />
<package id="ExcelDataReader" version="3.6.0" targetFramework="net46" />
<package id="ExcelDataReader.DataSet" version="3.6.0" targetFramework="net46" />
<package id="ExcelNumberFormat" version="1.0.10" targetFramework="net46" />
<package id="Google.Protobuf" version="3.11.4" targetFramework="net46" />
<package id="jQuery" version="3.4.1" targetFramework="net46" />
<package id="K4os.Compression.LZ4" version="1.1.11" targetFramework="net46" />
<package id="K4os.Compression.LZ4.Streams" version="1.1.11" targetFramework="net46" />
<package id="K4os.Hash.xxHash" version="1.0.6" targetFramework="net46" />
<package id="log4net" version="2.0.12" targetFramework="net46" />
<package id="Microsoft.AspNet.Cors" version="5.2.7" targetFramework="net46" />
<package id="Microsoft.AspNet.Mvc" version="5.2.7" targetFramework="net46" />
<package id="Microsoft.AspNet.Mvc.zh-Hant" version="5.2.7" targetFramework="net46" />
<package id="Microsoft.AspNet.Razor" version="3.2.7" targetFramework="net46" />
<package id="Microsoft.AspNet.Razor.zh-Hant" version="3.2.7" targetFramework="net46" />
<package id="Microsoft.AspNet.Web.Optimization" version="1.1.3" targetFramework="net46" />
<package id="Microsoft.AspNet.Web.Optimization.zh-Hant" version="1.1.3" targetFramework="net46" />
<package id="Microsoft.AspNet.WebApi" version="5.2.7" targetFramework="net46" />
<package id="Microsoft.AspNet.WebApi.Client" version="5.2.7" targetFramework="net46" />
<package id="Microsoft.AspNet.WebApi.Client.zh-Hant" version="5.2.7" targetFramework="net46" />
<package id="Microsoft.AspNet.WebApi.Core" version="5.2.7" targetFramework="net46" />
<package id="Microsoft.AspNet.WebApi.Core.zh-Hant" version="5.2.7" targetFramework="net46" />
<package id="Microsoft.AspNet.WebApi.Cors" version="5.2.7" targetFramework="net46" />
<package id="Microsoft.AspNet.WebApi.HelpPage" version="5.2.7" targetFramework="net46" />
<package id="Microsoft.AspNet.WebApi.WebHost" version="5.2.7" targetFramework="net46" />
<package id="Microsoft.AspNet.WebApi.WebHost.zh-Hant" version="5.2.7" targetFramework="net46" />
<package id="Microsoft.AspNet.WebPages" version="3.2.7" targetFramework="net46" />
<package id="Microsoft.AspNet.WebPages.zh-Hant" version="3.2.7" targetFramework="net46" />
<package id="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" version="2.0.1" targetFramework="net46" />
<package id="Microsoft.CSharp" version="4.7.0" targetFramework="net46" />
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net46" />
<package id="Modernizr" version="2.8.3" targetFramework="net46" />
<package id="MySql.Data" version="8.0.22" targetFramework="net46" requireReinstallation="true" />
<package id="Newtonsoft.Json" version="12.0.3" targetFramework="net46" />
<package id="SSH.NET" version="2016.1.0" targetFramework="net46" />
<package id="System.Buffers" version="4.5.1" targetFramework="net46" requireReinstallation="true" />
<package id="System.IO.FileSystem.Primitives" version="4.0.1" targetFramework="net46" />
<package id="System.IO.Packaging" version="4.0.0" targetFramework="net46" />
<package id="System.Memory" version="4.5.3" targetFramework="net46" requireReinstallation="true" />
<package id="System.Runtime.CompilerServices.Unsafe" version="4.5.2" targetFramework="net46" requireReinstallation="true" />
<package id="WebGrease" version="1.6.0" targetFramework="net46" />
<package id="ExcelDataReader" version="3.6.0" targetFramework="net48" />
<package id="ExcelDataReader.DataSet" version="3.6.0" targetFramework="net48" />
<package id="ExcelNumberFormat" version="1.1.0" targetFramework="net48" />
<package id="jQuery" version="3.4.1" targetFramework="net48" />
<package id="log4net" version="2.0.14" targetFramework="net48" />
<package id="Microsoft.AspNet.Cors" version="5.2.8" targetFramework="net48" />
<package id="Microsoft.AspNet.Mvc" version="5.2.8" targetFramework="net48" />
<package id="Microsoft.AspNet.Mvc.zh-Hant" version="5.2.8" targetFramework="net48" />
<package id="Microsoft.AspNet.Razor" version="3.2.8" targetFramework="net48" />
<package id="Microsoft.AspNet.Razor.zh-Hant" version="3.2.8" targetFramework="net48" />
<package id="Microsoft.AspNet.Web.Optimization" version="1.1.3" targetFramework="net48" />
<package id="Microsoft.AspNet.Web.Optimization.zh-Hant" version="1.1.3" targetFramework="net48" />
<package id="Microsoft.AspNet.WebApi" version="5.2.8" targetFramework="net48" />
<package id="Microsoft.AspNet.WebApi.Client" version="5.2.8" targetFramework="net48" />
<package id="Microsoft.AspNet.WebApi.Client.zh-Hant" version="5.2.8" targetFramework="net48" />
<package id="Microsoft.AspNet.WebApi.Core" version="5.2.8" targetFramework="net48" />
<package id="Microsoft.AspNet.WebApi.Core.zh-Hant" version="5.2.8" targetFramework="net48" />
<package id="Microsoft.AspNet.WebApi.Cors" version="5.2.8" targetFramework="net48" />
<package id="Microsoft.AspNet.WebApi.WebHost" version="5.2.8" targetFramework="net48" />
<package id="Microsoft.AspNet.WebPages" version="3.2.8" targetFramework="net48" />
<package id="Microsoft.AspNet.WebPages.zh-Hant" version="3.2.8" targetFramework="net48" />
<package id="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" version="3.6.0" targetFramework="net48" />
<package id="Microsoft.CSharp" version="4.7.0" targetFramework="net48" />
<package id="Microsoft.Web.Infrastructure" version="2.0.0" targetFramework="net48" />
<package id="Modernizr" version="2.8.3" targetFramework="net48" />
<package id="Newtonsoft.Json" version="13.0.1" targetFramework="net48" />
<package id="System.Buffers" version="4.5.1" targetFramework="net48" />
<package id="WebGrease" version="1.6.0" targetFramework="net48" />
</packages>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment