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
7cceffee
Commit
7cceffee
authored
Jul 12, 2021
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
页面修改
parent
58294349
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
23 additions
and
12 deletions
+23
-12
RB_Student_MakeupRepository.cs
Edu.Repository/Course/RB_Student_MakeupRepository.cs
+5
-3
RB_Education_ReceiptRepository.cs
Edu.Repository/EduTask/RB_Education_ReceiptRepository.cs
+13
-9
EducationReceiptController.cs
Edu.WebApi/Controllers/EduTask/EducationReceiptController.cs
+5
-0
No files found.
Edu.Repository/Course/RB_Student_MakeupRepository.cs
View file @
7cceffee
...
...
@@ -114,9 +114,11 @@ WHERE 1=1
/// <returns></returns>
public
int
CheckStudentMakeUpExistsRepository
(
RB_Student_Makeup
model
)
{
List
<
WhereHelper
>
whereHelpers
=
new
List
<
WhereHelper
>();
whereHelpers
.
Add
(
new
WhereHelper
(
nameof
(
RB_Student_Makeup
.
ClassCheckId
),
model
.
ClassCheckId
));
whereHelpers
.
Add
(
new
WhereHelper
(
nameof
(
RB_Student_Makeup
.
OrderGuestId
),
model
.
OrderGuestId
));
List
<
WhereHelper
>
whereHelpers
=
new
List
<
WhereHelper
>
{
new
WhereHelper
(
nameof
(
RB_Student_Makeup
.
ClassCheckId
),
model
.
ClassCheckId
),
new
WhereHelper
(
nameof
(
RB_Student_Makeup
.
OrderGuestId
),
model
.
OrderGuestId
)
};
return
base
.
Exists
(
"Id"
,
whereHelpers
);
}
}
...
...
Edu.Repository/EduTask/RB_Education_ReceiptRepository.cs
View file @
7cceffee
...
...
@@ -69,13 +69,17 @@ namespace Edu.Repository.EduTask
SELECT A.* {0}
FROM RB_Education_Receipt AS A
WHERE 1=1
"
,
isSpecNode
);
"
,
isSpecNode
);
if
(
query
!=
null
)
{
if
(
query
.
Group_Id
>
0
)
{
builder
.
AppendFormat
(
@" AND A.{0}={1} "
,
nameof
(
RB_Education_Receipt_ViewModel
.
Group_Id
),
query
.
Group_Id
);
}
if
(!
string
.
IsNullOrEmpty
(
query
.
QIds
))
{
builder
.
AppendFormat
(
@" AND A.{0}IN({1}) "
,
nameof
(
RB_Education_Receipt_ViewModel
.
Id
),
query
.
QIds
);
}
if
(!
string
.
IsNullOrEmpty
(
query
.
Title
))
{
builder
.
AppendFormat
(
@" AND A.{0} LIKE @Title "
,
nameof
(
RB_Education_Receipt_ViewModel
.
Title
));
...
...
@@ -213,8 +217,8 @@ WHERE 1=1
//系统角色
else
if
(
subItem
.
AuditType
==
Common
.
Enum
.
User
.
WFTAuditTypeEnum
.
Post
)
{
var
postIds
=
GetPostIdsRepository
(
model
.
Group_Id
,
subItem
.
PostType
.
ToString
());
if
(
postIds
!=
null
&&
postIds
.
Count
>
0
)
var
postIds
=
GetPostIdsRepository
(
model
.
Group_Id
,
subItem
.
PostType
.
ToString
());
if
(
postIds
!=
null
&&
postIds
.
Count
>
0
)
{
AuditedId
+=
string
.
Join
(
","
,
postIds
)
+
","
;
subItem
.
PostUserIds
=
string
.
Join
(
","
,
postIds
);
...
...
@@ -231,9 +235,9 @@ WHERE 1=1
AuditType
=
item
.
FlowAduitList
[
0
].
AuditType
,
OriginalAuditId
=
0
,
RoleOrInitiator
=
0
,
PostIds
=
""
,
PostIds
=
""
,
UserIds
=
""
,
SysPostIds
=
""
,
SysPostIds
=
""
,
ToAuditId
=
AuditedId
.
TrimEnd
(
','
),
Sort
=
item
.
SortNum
,
SpecialNode
=
item
.
FlowAduitList
[
0
].
IsSpecNode
,
...
...
@@ -382,13 +386,13 @@ WHERE 1=1
/// <returns></returns>
public
List
<
int
>
GetPostIdsRepository
(
int
GroupId
,
string
PostId
)
{
List
<
int
>
result
=
new
List
<
int
>
();
List
<
int
>
result
=
new
List
<
int
>();
var
list
=
accountRepository
.
GetAccountListExtRepository
(
new
Model
.
ViewModel
.
User
.
RB_Account_ViewModel
()
{
Group_Id
=
GroupId
,
QPostIds
=
PostId
});
if
(
list
!=
null
&&
list
.
Count
>
0
)
if
(
list
!=
null
&&
list
.
Count
>
0
)
{
foreach
(
var
item
in
list
)
{
...
...
Edu.WebApi/Controllers/EduTask/EducationReceiptController.cs
View file @
7cceffee
...
...
@@ -45,6 +45,11 @@ namespace Edu.WebApi.Controllers.EduTask
ReceiptType
=
base
.
ParmJObj
.
GetInt
(
"ReceiptType"
),
Title
=
base
.
ParmJObj
.
GetStringValue
(
"Title"
),
};
var
id
=
base
.
ParmJObj
.
GetInt
(
"Id"
);
if
(
id
>
0
)
{
query
.
QIds
=
id
.
ToString
();
}
query
.
CreateBy
=
base
.
UserInfo
.
Id
;
var
list
=
educationReceiptModule
.
GetEducationReceiptPageModule
(
pageModel
.
PageIndex
,
pageModel
.
PageSize
,
out
long
rowsCount
,
query
);
pageModel
.
PageData
=
list
;
...
...
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