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
d84201ad
Commit
d84201ad
authored
Jul 07, 2021
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
页面修改
parent
b6e6fba3
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
225 additions
and
213 deletions
+225
-213
OKRPeriodModule.cs
Edu.Module.OKR/OKRPeriodModule.cs
+217
-209
CourseController.cs
Edu.WebApi/Controllers/Course/CourseController.cs
+6
-1
FinanceController.cs
Edu.WebApi/Controllers/Finance/FinanceController.cs
+2
-2
OKRPeriodController.cs
Edu.WebApi/Controllers/OKR/OKRPeriodController.cs
+0
-1
No files found.
Edu.Module.OKR/OKRPeriodModule.cs
View file @
d84201ad
...
...
@@ -4784,6 +4784,8 @@ and {ruleModel.Time} >='{dmodel.RuleSTime.Value:yyyy-MM-dd}' and {ruleModel.Time
/// <param name="userInfo"></param>
/// <returns></returns>
public
object
GetOKRMyEmployeeList
(
UserInfo
userInfo
)
{
try
{
var
deptModel
=
departmentRepository
.
GetEntity
(
userInfo
.
DeptId
);
List
<
int
>
UserIdList
=
new
List
<
int
>();
...
...
@@ -5069,6 +5071,12 @@ and {ruleModel.Time} >='{dmodel.RuleSTime.Value:yyyy-MM-dd}' and {ruleModel.Time
})
};
}
catch
(
Exception
ex
)
{
Common
.
Plugin
.
LogHelper
.
Write
(
ex
,
"GetOKRMyEmployeeList:userInfo"
+
Common
.
Plugin
.
JsonHelper
.
Serialize
(
userInfo
));
}
return
new
object
();
}
/// <summary>
/// 根据部门获取部门下所有人员
...
...
Edu.WebApi/Controllers/Course/CourseController.cs
View file @
d84201ad
...
...
@@ -563,7 +563,12 @@ namespace Edu.WebApi.Controllers.Course
[
HttpPost
]
public
ApiResult
BatchRemoveChapter
()
{
var
extModel
=
Common
.
Plugin
.
JsonHelper
.
DeserializeObject
<
RB_Course_Chapter_ViewModel
>(
RequestParm
.
Msg
.
ToString
());
var
extModel
=
new
RB_Course_Chapter_ViewModel
()
{
CourseId
=
base
.
ParmJObj
.
GetInt
(
"CourseId"
),
ChapterNo
=
base
.
ParmJObj
.
GetStringValue
(
"ChapterNo"
),
ChapterId
=
base
.
ParmJObj
.
GetInt
(
"ChapterId"
),
};
bool
flag
=
courseModule
.
BatchRemoveChapterModule
(
extModel
);
return
flag
?
ApiResult
.
Success
()
:
ApiResult
.
Failed
();
}
...
...
Edu.WebApi/Controllers/Finance/FinanceController.cs
View file @
d84201ad
...
...
@@ -1349,7 +1349,7 @@ namespace Edu.WebApi.Controllers.Finance
}
catch
(
Exception
ex
)
{
LogHelper
.
Write
(
ex
,
"OutToExcelOrderStudentClassHoursList
"
);
LogHelper
.
Write
(
ex
,
"OutToExcelOrderStudentClassHoursList
:"
+
Common
.
Plugin
.
JsonHelper
.
Serialize
(
dmodel
)
);
var
byteData1
=
ExcelTempLateHelper
.
ToExcelExtend
(
slist
);
return
File
(
byteData1
,
"application/octet-stream"
,
ExcelName
);
}
...
...
@@ -1545,7 +1545,7 @@ namespace Edu.WebApi.Controllers.Finance
}
catch
(
Exception
ex
)
{
LogHelper
.
Write
(
ex
,
"OutToExcelOrderStudentClassHoursList
"
);
LogHelper
.
Write
(
ex
,
"OutToExcelOrderStudentClassHoursList
:"
+
string
.
Format
(
"TeacherId:{0},SchoolId:{1},StartMonth:{2},EndMonth:{3},Group_Id:{4}"
,
TeacherId
,
SchoolId
,
StartMonth
,
EndMonth
,
userInfo
.
Group_Id
)
);
var
byteData1
=
ExcelTempLateHelper
.
ToExcelExtend
(
slist
);
return
File
(
byteData1
,
"application/octet-stream"
,
ExcelName
);
}
...
...
Edu.WebApi/Controllers/OKR/OKRPeriodController.cs
View file @
d84201ad
...
...
@@ -1014,7 +1014,6 @@ namespace Edu.WebApi.Controllers.OKR
public
ApiResult
GetOKRMyEmployeeList
()
{
var
userInfo
=
base
.
UserInfo
;
var
obj
=
okrPeriodModule
.
GetOKRMyEmployeeList
(
userInfo
);
return
ApiResult
.
Success
(
""
,
obj
);
}
...
...
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