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
7da18522
Commit
7da18522
authored
Jan 17, 2022
by
liudong1993
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1
parent
69826cb1
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
21 additions
and
1 deletion
+21
-1
EducationReceiptModule.cs
Edu.Module.EduTask/EducationReceiptModule.cs
+16
-0
StuController.cs
Edu.WebApi/Controllers/Course/StuController.cs
+2
-0
EducationReceiptController.cs
Edu.WebApi/Controllers/EduTask/EducationReceiptController.cs
+1
-0
QYContributeController.cs
Edu.WebApi/Controllers/QYWeChat/QYContributeController.cs
+2
-1
No files found.
Edu.Module.EduTask/EducationReceiptModule.cs
View file @
7da18522
...
...
@@ -1390,6 +1390,22 @@ namespace Edu.Module.EduTask
}
#
endregion
#
region
稿酬状态
if
(
receipt
.
ReceiptType
==
Common
.
Enum
.
Finance
.
ReceiptTypeEnum
.
Contribute
&&
auditModel
.
SpecialNode
==
1
)
{
if
(
auditModel
.
AuditStatus
==
2
)
{
Dictionary
<
string
,
object
>
fileds1
=
new
Dictionary
<
string
,
object
>()
{
{
nameof
(
RB_Contribute_Info_ViewModel
.
RemunerationState
),
auditModel
.
RemunerationState
}
};
flag
=
contribute_InfoRepository
.
Update
(
fileds1
,
new
WhereHelper
(
nameof
(
RB_Contribute_Info_ViewModel
.
Id
),
receipt
.
RelationId
));
}
}
#
endregion
Dictionary
<
string
,
object
>
fileds
=
new
Dictionary
<
string
,
object
>()
{
{
nameof
(
RB_Education_Receipt_ViewModel
.
VerifyStatus
),(
int
)
EduTaskRrocessStatus
.
AuditIng
}
...
...
Edu.WebApi/Controllers/Course/StuController.cs
View file @
7da18522
...
...
@@ -305,6 +305,8 @@ namespace Edu.WebApi.Controllers.Course
JoinType
=
base
.
ParmJObj
.
GetInt
(
"JoinType"
,
0
),
EarlyWarning
=
(
Common
.
Enum
.
Course
.
GuestClassHoursEarlyWarningEnum
)
base
.
ParmJObj
.
GetInt
(
"EarlyWarning"
,
0
),
GuestState
=(
GuestStateEnum
)
base
.
ParmJObj
.
GetInt
(
"GuestState"
),
StuChannelId
=
base
.
ParmJObj
.
GetInt
(
"StuChannelId"
,
0
),
CreateType
=
(
Common
.
Enum
.
User
.
StuCreateTypeEnum
)
base
.
ParmJObj
.
GetInt
(
"CreateType"
,
0
),
};
model
.
School_Id
=
-
1
;
var
schoolId
=
base
.
ParmJObj
.
GetStringValue
(
"School_Id"
);
...
...
Edu.WebApi/Controllers/EduTask/EducationReceiptController.cs
View file @
7da18522
...
...
@@ -145,6 +145,7 @@ namespace Edu.WebApi.Controllers.EduTask
Description
=
base
.
ParmJObj
.
GetStringValue
(
"Description"
),
RecipientIds
=
base
.
ParmJObj
.
GetStringValue
(
"RecipientIds"
),
SpecialNode
=
base
.
ParmJObj
.
GetInt
(
"SpecialNode"
),
RemunerationState
=
base
.
ParmJObj
.
GetInt
(
"RemunerationState"
),
};
var
flag
=
educationReceiptModule
.
AduitEducationReceiptModule
(
auditModel
,
base
.
UserInfo
,
out
string
message
);
...
...
Edu.WebApi/Controllers/QYWeChat/QYContributeController.cs
View file @
7da18522
...
...
@@ -869,7 +869,8 @@ namespace Edu.WebApi.Controllers.QYWeChat
AuditStateName
=
x
.
AuditState
.
ToName
(),
x
.
UpdateBy
,
UpdateByName
=
Cache
.
User
.
UserReidsCache
.
GetUserLoginInfo
(
x
.
UpdateBy
)?.
AccountName
??
""
,
UpdateTime
=
x
.
UpdateTime
.
ToString
(
"yyyy-MM-dd HH:mm"
)
UpdateTime
=
x
.
UpdateTime
.
ToString
(
"yyyy-MM-dd HH:mm"
),
x
.
RemunerationState
});
return
ApiResult
.
Success
(
""
,
pmodel
);
}
...
...
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