Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
E
Education
Project
Project
Details
Activity
Releases
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
黄奎
Education
Commits
ab252366
Commit
ab252366
authored
Apr 09, 2021
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
页面修改
parent
2dcb0a80
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
31 additions
and
4 deletions
+31
-4
ConvertHelper.cs
Edu.Common/Plugin/ConvertHelper.cs
+4
-0
RB_Web_Advisory_ViewModel.cs
Edu.Model/ViewModel/Web/RB_Web_Advisory_ViewModel.cs
+4
-1
WebAdvisoryModule.cs
Edu.Module.Web/WebAdvisoryModule.cs
+9
-2
RB_Web_AdvisoryRepository.cs
Edu.Repository/Web/RB_Web_AdvisoryRepository.cs
+5
-0
WebManagerController.cs
Edu.WebApi/Controllers/Web/WebManagerController.cs
+9
-1
No files found.
Edu.Common/Plugin/ConvertHelper.cs
View file @
ab252366
...
...
@@ -28,6 +28,10 @@ namespace Edu.Common
try
{
timeStr
=
Convert
.
ToDateTime
(
time
.
ToString
()).
ToString
(
"yyyy-MM-dd HH:mm:ss"
);
if
(
timeStr
==
"0001-01-01 00:00:00"
)
{
timeStr
=
""
;
}
}
catch
{
...
...
Edu.Model/ViewModel/Web/RB_Web_Advisory_ViewModel.cs
View file @
ab252366
...
...
@@ -42,6 +42,9 @@ namespace Edu.Model.ViewModel.Web
public
string
DealTimeStr
{
get
{
return
Common
.
ConvertHelper
.
FormatTime
(
this
.
DealTime
);
}
}
/// <summary>
/// 咨询时间
/// </summary>
public
string
CreateTimeStr
{
get
{
return
Common
.
ConvertHelper
.
FormatTime
(
this
.
CreateDate
);
}
}
}
}
Edu.Module.Web/WebAdvisoryModule.cs
View file @
ab252366
...
...
@@ -2,6 +2,8 @@
using
Edu.Repository.Web
;
using
System.Collections.Generic
;
using
VT.FW.DB
;
using
System.Linq
;
using
Edu.Common.Enum
;
namespace
Edu.Module.Web
{
...
...
@@ -65,9 +67,14 @@ namespace Edu.Module.Web
/// </summary>
/// <param name="Id"></param>
/// <returns></returns>
public
RB_Web_Advisory_ViewModel
GetWebAdvisoryModule
(
objec
t
Id
)
public
RB_Web_Advisory_ViewModel
GetWebAdvisoryModule
(
in
t
Id
)
{
return
web_AdvisoryRepository
.
GetEntity
<
RB_Web_Advisory_ViewModel
>(
Id
);
var
query
=
new
RB_Web_Advisory_ViewModel
()
{
Id
=
Id
,
Status
=
(
DateStateEnum
)(-
1
)
};
return
GetWebAdvisoryPageModule
(
1
,
1
,
out
long
rowsCount
,
query
)?.
FirstOrDefault
();
}
/// <summary>
...
...
Edu.Repository/Web/RB_Web_AdvisoryRepository.cs
View file @
ab252366
...
...
@@ -63,7 +63,12 @@ WHERE 1=1
{
builder
.
AppendFormat
(
@" AND A.{0}={1} "
,
nameof
(
RB_Web_Advisory_ViewModel
.
DealStatus
),
query
.
DealStatus
);
}
if
(
query
.
Id
>
0
)
{
builder
.
AppendFormat
(
@" AND A.{0}={1} "
,
nameof
(
RB_Web_Advisory_ViewModel
.
Id
),
query
.
Id
);
}
}
builder
.
AppendFormat
(
" ORDER BY A.{0} DESC "
,
nameof
(
RB_Web_Advisory_ViewModel
.
Id
));
return
GetPage
<
RB_Web_Advisory_ViewModel
>(
pageIndex
,
pageSize
,
out
rowsCount
,
builder
.
ToString
(),
parameters
).
ToList
();
}
...
...
Edu.WebApi/Controllers/Web/WebManagerController.cs
View file @
ab252366
using
Edu.Common.API
;
using
Edu.Cache.User
;
using
Edu.Common.API
;
using
Edu.Common.Enum
;
using
Edu.Common.Enum.Web
;
using
Edu.Common.Plugin
;
...
...
@@ -522,6 +523,13 @@ namespace Edu.WebApi.Controllers.Web
};
query
.
Group_Id
=
base
.
UserInfo
.
Group_Id
;
var
list
=
advisoryModule
.
GetWebAdvisoryPageModule
(
pageModel
.
PageIndex
,
pageModel
.
PageSize
,
out
long
rowsCount
,
query
);
foreach
(
var
item
in
list
)
{
if
(
item
.
DealBy
>
0
)
{
item
.
DealByName
=
UserReidsCache
.
GetUserLoginInfo
(
item
.
DealBy
)?.
AccountName
??
""
;
}
}
pageModel
.
Count
=
rowsCount
;
pageModel
.
PageData
=
list
;
return
ApiResult
.
Success
(
data
:
pageModel
);
...
...
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