Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
D
DataCenter_Core2.1_20190520
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
bltdc
DataCenter_Core2.1_20190520
Commits
0765965b
Commit
0765965b
authored
Sep 27, 2019
by
guanzhenshan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
增加菜单权限
parent
771f7bc6
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
121 additions
and
7 deletions
+121
-7
dc_menu.cs
Bailun.DC.Models/Menu/dc_menu.cs
+48
-0
dc_menu_permission.cs
Bailun.DC.Models/Menu/dc_menu_permission.cs
+38
-0
dc_menu_user.cs
Bailun.DC.Models/Menu/dc_menu_user.cs
+28
-0
Program.cs
Bailun.DC.SkuDailyPurchaseAndSales/Program.cs
+1
-1
FinanceController.cs
Bailun.DC.Web/Areas/Reports/Controllers/FinanceController.cs
+6
-6
No files found.
Bailun.DC.Models/Menu/dc_menu.cs
0 → 100644
View file @
0765965b
using
System
;
using
System.Collections.Generic
;
using
System.Text
;
namespace
Bailun.DC.Models.Menu
{
/// <summary>
/// 菜单信息
/// </summary>
public
class
dc_menu
{
/// <summary>
///
/// </summary>
public
int
id
{
get
;
set
;
}
/// <summary>
/// 父级菜单id
/// </summary>
public
int
parentid
{
get
;
set
;
}
/// <summary>
/// 图标
/// </summary>
public
string
icon
{
get
;
set
;
}
/// <summary>
/// 菜单名称
/// </summary>
public
string
name
{
get
;
set
;
}
/// <summary>
/// 链接
/// </summary>
public
string
path
{
get
;
set
;
}
/// <summary>
/// 排序
/// </summary>
public
int
sort
{
get
;
set
;
}
/// <summary>
/// 是否已删除,1:已删除,0:未删除
/// </summary>
public
int
delstatus
{
get
;
set
;
}
}
}
Bailun.DC.Models/Menu/dc_menu_permission.cs
0 → 100644
View file @
0765965b
using
System
;
using
System.Collections.Generic
;
using
System.Text
;
namespace
Bailun.DC.Models.Menu
{
/// <summary>
/// 授权信息
/// </summary>
public
class
dc_menu_permission
{
/// <summary>
///
/// </summary>
public
int
id
{
get
;
set
;
}
/// <summary>
/// 菜单id
/// </summary>
public
int
menuid
{
get
;
set
;
}
/// <summary>
/// 用户名称
/// </summary>
public
string
username
{
get
;
set
;
}
/// <summary>
/// 是否开放所有菜单,1:是,0:否
/// </summary>
public
int
isall
{
get
;
set
;
}
/// <summary>
/// 是否删除,1:已删除,0:未删除
/// </summary>
public
int
delstatus
{
get
;
set
;
}
}
}
Bailun.DC.Models/Menu/dc_menu_user.cs
0 → 100644
View file @
0765965b
using
System
;
using
System.Collections.Generic
;
using
System.Text
;
namespace
Bailun.DC.Models.Menu
{
/// <summary>
/// 用户信息
/// </summary>
public
class
dc_menu_user
{
/// <summary>
///
/// </summary>
public
int
id
{
get
;
set
;
}
/// <summary>
/// 用户名称
/// </summary>
public
string
username
{
get
;
set
;
}
/// <summary>
/// 用户id
/// </summary>
public
int
userid
{
get
;
set
;
}
}
}
Bailun.DC.SkuDailyPurchaseAndSales/Program.cs
View file @
0765965b
...
...
@@ -20,7 +20,7 @@ namespace Bailun.DC.SkuDailyPurchaseAndSales
//static void Main(string[] args)
//{
// var start = DateTime.Parse("2019-0
7-01
");
// var start = DateTime.Parse("2019-0
9-10
");
// while (start < DateTime.Now)
// {
// Console.WriteLine(start.ToString("yyyy-MM-dd"));
...
...
Bailun.DC.Web/Areas/Reports/Controllers/FinanceController.cs
View file @
0765965b
...
...
@@ -3527,8 +3527,8 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
var
url
=
"http://api.fee.bailuntec.com/purchase/other/cost/api/manageCostList?o=0"
;
var
cwurl
=
"http://cw.bailuntec.com/api/api/GetRepayPlanDetails?"
;
url
+=
"&startDate="
+
start
.
ToString
(
"yyyy-MM-dd HH:mm:ss"
)
+
"&endDate="
+
end
.
ToString
(
"yyyy-MM-dd HH:mm:ss"
);
cwurl
+=
"BeginRepayTime="
+
start
.
ToString
(
"yyyy-MM-dd HH:mm:ss"
)
+
"&EndRepayTime="
+
end
.
ToString
(
"yyyy-MM-dd HH:mm:ss"
);
url
+=
"&startDate="
+
start
.
ToString
(
"yyyy-MM-dd HH:mm:ss"
)
+
"&endDate="
+
end
.
AddDays
(
1
).
ToString
(
"yyyy-MM-dd HH:mm:ss"
);
cwurl
+=
"BeginRepayTime="
+
start
.
ToString
(
"yyyy-MM-dd HH:mm:ss"
)
+
"&EndRepayTime="
+
end
.
AddDays
(
1
).
ToString
(
"yyyy-MM-dd HH:mm:ss"
);
//利息支出
var
listInterest
=
new
Bailun
.
DC
.
Services
.
FinanceReportServices
().
ListInterestExpense
(
cwurl
);
...
...
@@ -3584,7 +3584,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
public
string
ListPayAdminCostJson
(
DateTime
start
,
DateTime
end
,
int
type
)
{
var
url
=
"http://api.fee.bailuntec.com/purchase/other/cost/api/manageCostList?o=0"
;
url
+=
"&startDate="
+
start
.
ToString
(
"yyyy-MM-dd HH:mm:ss"
)
+
"&endDate="
+
end
.
ToString
(
"yyyy-MM-dd HH:mm:ss"
);
url
+=
"&startDate="
+
start
.
ToString
(
"yyyy-MM-dd HH:mm:ss"
)
+
"&endDate="
+
end
.
AddDays
(
1
).
ToString
(
"yyyy-MM-dd HH:mm:ss"
);
//管理成本
var
list
=
new
Bailun
.
DC
.
Services
.
FinanceReportServices
().
ListOtherCost
(
url
);
...
...
@@ -3615,7 +3615,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
public
ActionResult
ExportPayAdminCost
(
DateTime
start
,
DateTime
end
,
int
type
)
{
var
url
=
"http://api.fee.bailuntec.com/purchase/other/cost/api/manageCostList?o=0"
;
url
+=
"&startDate="
+
start
.
ToString
(
"yyyy-MM-dd HH:mm:ss"
)
+
"&endDate="
+
end
.
ToString
(
"yyyy-MM-dd HH:mm:ss"
);
url
+=
"&startDate="
+
start
.
ToString
(
"yyyy-MM-dd HH:mm:ss"
)
+
"&endDate="
+
end
.
AddDays
(
1
).
ToString
(
"yyyy-MM-dd HH:mm:ss"
);
//管理成本
var
obj
=
new
Bailun
.
DC
.
Services
.
FinanceReportServices
().
ListOtherCost
(
url
);
...
...
@@ -3675,7 +3675,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
public
string
ListPayAdminCostInterestJson
(
DateTime
start
,
DateTime
end
)
{
var
cwurl
=
"http://cw.bailuntec.com/api/api/GetRepayPlanDetails?"
;
cwurl
+=
"BeginRepayTime="
+
start
.
ToString
(
"yyyy-MM-dd HH:mm:ss"
)
+
"&EndRepayTime="
+
end
.
ToString
(
"yyyy-MM-dd HH:mm:ss"
);
cwurl
+=
"BeginRepayTime="
+
start
.
ToString
(
"yyyy-MM-dd HH:mm:ss"
)
+
"&EndRepayTime="
+
end
.
AddDays
(
1
).
ToString
(
"yyyy-MM-dd HH:mm:ss"
);
//利息支出
var
listInterest
=
new
Bailun
.
DC
.
Services
.
FinanceReportServices
().
ListInterestExpense
(
cwurl
);
...
...
@@ -3692,7 +3692,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
public
ActionResult
ExportPayAdminCostInterest
(
DateTime
start
,
DateTime
end
)
{
var
cwurl
=
"http://cw.bailuntec.com/api/api/GetRepayPlanDetails?"
;
cwurl
+=
"BeginRepayTime="
+
start
.
ToString
(
"yyyy-MM-dd HH:mm:ss"
)
+
"&EndRepayTime="
+
end
.
ToString
(
"yyyy-MM-dd HH:mm:ss"
);
cwurl
+=
"BeginRepayTime="
+
start
.
ToString
(
"yyyy-MM-dd HH:mm:ss"
)
+
"&EndRepayTime="
+
end
.
AddDays
(
1
).
ToString
(
"yyyy-MM-dd HH:mm:ss"
);
//利息支出
var
listInterest
=
new
Bailun
.
DC
.
Services
.
FinanceReportServices
().
ListInterestExpense
(
cwurl
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment