Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
P
performance
Overview
Overview
Details
Activity
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
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
zry
performance
Commits
791e75c6
Commit
791e75c6
authored
Feb 09, 2022
by
lcx
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
接口内容调整
parent
c9a93855
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
136 additions
and
95 deletions
+136
-95
performance/Performance.Api/Controllers/EmployeeController.cs.rej
+0
-9
performance/Performance.Api/Controllers/ExtractController.cs
+106
-74
performance/Performance.DtoModels/AutoMapper/AutoMapperConfigs.cs
+1
-1
performance/Performance.DtoModels/Response/ExtractConfigResponse.cs
+8
-11
performance/Performance.DtoModels/Response/HospitalConfigResponse.cs
+21
-0
performance/Performance.Services/ExtractExcelService/ExtractPreConfigService.cs
+0
-0
No files found.
performance/Performance.Api/Controllers/EmployeeController.cs.rej
deleted
100644 → 0
View file @
c9a93855
diff a/performance/Performance.Api/Controllers/EmployeeController.cs b/performance/Performance.Api/Controllers/EmployeeController.cs (rejected hunks)
@@ -824,6 +824,7 @@
if (allotId <= 0)
return new ApiResponse(ResponseType.Fail, "参数错误", "allotid无效");
+ var result = employeeService.GetGatherTotal(allotId, request);
return new ApiResponse(ResponseType.OK, result);
}
performance/Performance.Api/Controllers/ExtractController.cs
View file @
791e75c6
This diff is collapsed.
Click to expand it.
performance/Performance.DtoModels/AutoMapper/AutoMapperConfigs.cs
View file @
791e75c6
...
@@ -257,7 +257,7 @@ public AutoMapperConfigs()
...
@@ -257,7 +257,7 @@ public AutoMapperConfigs()
.
ForMember
(
dest
=>
dest
.
TypeId
,
opt
=>
opt
.
MapFrom
(
src
=>
src
.
Id
))
.
ForMember
(
dest
=>
dest
.
TypeId
,
opt
=>
opt
.
MapFrom
(
src
=>
src
.
Id
))
.
ReverseMap
();
.
ReverseMap
();
CreateMap
<
ex_script
,
Extract
ScriptConfig
>()
CreateMap
<
ex_script
,
Extract
ConfigResponse
>()
.
ForMember
(
dest
=>
dest
.
ExScriptId
,
opt
=>
opt
.
MapFrom
(
src
=>
src
.
Id
))
.
ForMember
(
dest
=>
dest
.
ExScriptId
,
opt
=>
opt
.
MapFrom
(
src
=>
src
.
Id
))
.
ReverseMap
();
.
ReverseMap
();
}
}
...
...
performance/Performance.DtoModels/Response/ExtractConfigResponse.cs
View file @
791e75c6
...
@@ -8,19 +8,16 @@ public class ExtractConfigResponse
...
@@ -8,19 +8,16 @@ public class ExtractConfigResponse
public
string
EName
{
get
;
set
;
}
public
string
EName
{
get
;
set
;
}
public
string
Description
{
get
;
set
;
}
public
int
Source
{
get
;
set
;
}
public
int
Source
{
get
;
set
;
}
public
string
SheetType
{
get
;
set
;
}
public
string
SheetType
{
get
;
set
;
}
public
decimal
TotalTime
{
get
;
set
;
}
public
string
Description
{
get
;
set
;
}
public
List
<
ExtractScriptConfig
>
Children
{
get
;
set
;
}
=
new
List
<
ExtractScriptConfig
>();
public
decimal
TimeConsuming
{
get
;
set
;
}
}
#
region
Children
public
class
ExtractScriptConfig
{
public
int
ExScriptId
{
get
;
set
;
}
public
int
ExScriptId
{
get
;
set
;
}
public
string
ExecScript
{
get
;
set
;
}
public
string
ExecScript
{
get
;
set
;
}
...
@@ -29,12 +26,12 @@ public class ExtractScriptConfig
...
@@ -29,12 +26,12 @@ public class ExtractScriptConfig
public
string
ConfigName
{
get
;
set
;
}
public
string
ConfigName
{
get
;
set
;
}
public
int
IsEnable
{
get
;
set
;
}
public
int
IsExecSuccess
{
get
;
set
;
}
public
int
IsExecSuccess
{
get
;
set
;
}
public
string
ErrorMessag
e
{
get
;
set
;
}
public
int
IsEnabl
e
{
get
;
set
;
}
public
decimal
TimeConsuming
{
get
;
set
;
}
#
endregion
public
List
<
ExtractConfigResponse
>
Children
{
get
;
set
;
}
=
new
List
<
ExtractConfigResponse
>();
}
}
}
}
performance/Performance.DtoModels/Response/HospitalConfigResponse.cs
0 → 100644
View file @
791e75c6
namespace
Performance.DtoModels
{
public
class
HospitalConfigResponse
{
public
int
Id
{
get
;
set
;
}
public
string
ConfigName
{
get
;
set
;
}
public
string
DbSource
{
get
;
set
;
}
public
string
DbName
{
get
;
set
;
}
public
string
DbUser
{
get
;
set
;
}
public
string
DbPassword
{
get
;
set
;
}
public
string
DataBaseType
{
get
;
set
;
}
public
string
IsConnectioned
{
get
;
set
;
}
}
}
performance/Performance.Services/ExtractExcelService/ExtractPreConfigService.cs
View file @
791e75c6
This diff is collapsed.
Click to expand it.
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