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
c57dc571
Commit
c57dc571
authored
Jun 15, 2021
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
页面修改
parent
8f27509b
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
6 deletions
+8
-6
Edu.Cache.AssemblyInfo.cs
Edu.Cache/obj/Debug/netcoreapp3.0/Edu.Cache.AssemblyInfo.cs
+4
-3
DutyPlanModule.cs
Edu.Module.Duty/DutyPlanModule.cs
+2
-2
DutyPlanController.cs
Edu.WebApi/Controllers/Duty/DutyPlanController.cs
+1
-0
appsettings.json
Edu.WebApi/appsettings.json
+1
-1
No files found.
Edu.Cache/obj/Debug/netcoreapp3.0/Edu.Cache.AssemblyInfo.cs
View file @
c57dc571
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// 此代码由工具生成。
// 运行时版本:4.0.30319.42000
//
//
Changes to this file may cause incorrect behavior and will be lost if
//
the code is regenerated.
//
对此文件的更改可能会导致不正确的行为,并且如果
//
重新生成代码,这些更改将会丢失。
// </auto-generated>
//------------------------------------------------------------------------------
...
...
Edu.Module.Duty/DutyPlanModule.cs
View file @
c57dc571
...
...
@@ -133,11 +133,11 @@ namespace Edu.Module.Duty
{
var
dutyItem
=
dutyItemList
?.
Where
(
qitem
=>
qitem
.
Shifts
.
Contains
(
subItem
.
Shift
.
ToString
())
&&
qitem
.
Id
==
dItem
.
ItemId
&&
qitem
.
ItemSchools
.
Contains
(
item
.
School_Id
.
ToString
()))?.
FirstOrDefault
();
int
isFinish
=
0
;
if
(
dutyItem
.
ItemType
==
ItemTypeEnum
.
Choice
)
if
(
dutyItem
!=
null
&&
dutyItem
.
ItemType
==
ItemTypeEnum
.
Choice
)
{
isFinish
=
dItem
.
WorkIsFinish
;
}
else
if
(
dutyItem
.
ItemType
==
ItemTypeEnum
.
FillIn
)
else
if
(
dutyItem
!=
null
&&
dutyItem
.
ItemType
==
ItemTypeEnum
.
FillIn
)
{
if
(!
string
.
IsNullOrEmpty
(
dItem
.
WorkContent
))
{
...
...
Edu.WebApi/Controllers/Duty/DutyPlanController.cs
View file @
c57dc571
...
...
@@ -283,6 +283,7 @@ namespace Edu.WebApi.Controllers.Duty
{
UserId
=
DutyMan
;
}
UserId
=
0
;
var
obj
=
dutyPlanModule
.
OnDutyModule
(
Id
,
Shift
,
UserId
,
isQueryWork
:
true
);
return
ApiResult
.
Success
(
data
:
obj
);
}
...
...
Edu.WebApi/appsettings.json
View file @
c57dc571
{
"ConnectionStrings"
:
{
"DefaultConnection"
:
"server=192.168.20.214;user id=reborn;password=Reborn@2018;database=
reborn
_edu;CharSet=utf8mb4; Convert Zero Datetime=true; "
,
"DefaultConnection"
:
"server=192.168.20.214;user id=reborn;password=Reborn@2018;database=
test
_edu;CharSet=utf8mb4; Convert Zero Datetime=true; "
,
"DefaultConnectionPName"
:
"MySql.Data.MySqlClient"
,
"FinanceConnection"
:
"server=192.168.20.214;user id=reborn;password=Reborn@2018;database=test_reborn_finance;CharSet=utf8mb4; Convert Zero Datetime=true; "
,
"FinanceConnectionPName"
:
"MySql.Data.MySqlClient"
,
...
...
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