Commit d9792849 by lizefeng

fix

parent 2e393080
...@@ -11,6 +11,7 @@ namespace AutoTurnOver.Models ...@@ -11,6 +11,7 @@ namespace AutoTurnOver.Models
public DateTime _create_date { get; set; } public DateTime _create_date { get; set; }
public DateTime _update_date { get; set; } public DateTime _update_date { get; set; }
public string _project { get; set; } public string _project { get; set; }
public string business_user { get; set; }
public int _is_delete { get; set; } public int _is_delete { get; set; }
public DateTime _date { get; set; } public DateTime _date { get; set; }
public DateTime report_end_date { get; set; } public DateTime report_end_date { get; set; }
......
...@@ -913,6 +913,7 @@ namespace AutoTurnOver.Services ...@@ -913,6 +913,7 @@ namespace AutoTurnOver.Services
if (oldData.report_end_date < storageFee.report_end_date) if (oldData.report_end_date < storageFee.report_end_date)
{ {
storageFee._project = oldData._project; storageFee._project = oldData._project;
storageFee.business_user = oldData.business_user;
storageFee.exchange_cny = oldData.exchange_cny; storageFee.exchange_cny = oldData.exchange_cny;
storageFee.id = oldData.id; storageFee.id = oldData.id;
MyMySqlConnection._connection.Update(storageFee); MyMySqlConnection._connection.Update(storageFee);
...@@ -1059,6 +1060,7 @@ namespace AutoTurnOver.Services ...@@ -1059,6 +1060,7 @@ namespace AutoTurnOver.Services
if (oldData != null) if (oldData != null)
{ {
storageFee._project = oldData._project; storageFee._project = oldData._project;
storageFee.business_user = oldData.business_user;
storageFee.exchange_cny = oldData.exchange_cny; storageFee.exchange_cny = oldData.exchange_cny;
storageFee.id = oldData.id; storageFee.id = oldData.id;
MyMySqlConnection._connection.Update(storageFee); MyMySqlConnection._connection.Update(storageFee);
...@@ -1180,6 +1182,9 @@ namespace AutoTurnOver.Services ...@@ -1180,6 +1182,9 @@ namespace AutoTurnOver.Services
// 多份报表都出现同一份数据。已报表实际较晚的为准 // 多份报表都出现同一份数据。已报表实际较晚的为准
if (oldData.report_end_date <= storageFee.report_end_date) if (oldData.report_end_date <= storageFee.report_end_date)
{ {
storageFee._project = oldData._project;
storageFee.business_user = oldData.business_user;
storageFee.exchange_cny = oldData.exchange_cny;
storageFee.id = oldData.id; storageFee.id = oldData.id;
MyMySqlConnection._connection.Update(storageFee); MyMySqlConnection._connection.Update(storageFee);
} }
......
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