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
93e5f883
Commit
93e5f883
authored
Dec 24, 2020
by
lcx
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
其他模板数据打印数据出错,接口内判断条件出错
parent
9b9962ca
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
6 deletions
+2
-6
performance/Performance.DtoModels/AutoMapper/AutoMapperConfigs.cs
+1
-5
performance/Performance.Services/SecondAllotService.cs
+1
-1
No files found.
performance/Performance.DtoModels/AutoMapper/AutoMapperConfigs.cs
View file @
93e5f883
...
@@ -58,7 +58,6 @@ public AutoMapperConfigs()
...
@@ -58,7 +58,6 @@ public AutoMapperConfigs()
CreateMap
<
AllotResponse
,
per_allot
>();
CreateMap
<
AllotResponse
,
per_allot
>();
CreateMap
<
per_allot
,
AllotResponse
>();
CreateMap
<
per_allot
,
AllotResponse
>();
// sheet 响应
// sheet 响应
CreateMap
<
SheetResponse
,
per_sheet
>()
CreateMap
<
SheetResponse
,
per_sheet
>()
.
ForMember
(
dest
=>
dest
.
ID
,
opt
=>
opt
.
MapFrom
(
src
=>
src
.
SheetID
));
.
ForMember
(
dest
=>
dest
.
ID
,
opt
=>
opt
.
MapFrom
(
src
=>
src
.
SheetID
));
...
@@ -125,7 +124,6 @@ public AutoMapperConfigs()
...
@@ -125,7 +124,6 @@ public AutoMapperConfigs()
.
ForMember
(
dest
=>
dest
.
DoctorGrant
,
opt
=>
opt
.
MapFrom
(
src
=>
src
.
Grant
))
.
ForMember
(
dest
=>
dest
.
DoctorGrant
,
opt
=>
opt
.
MapFrom
(
src
=>
src
.
Grant
))
.
ReverseMap
();
.
ReverseMap
();
//CreateMap<im_accountbasic, PerDataAccountBaisc>()
//CreateMap<im_accountbasic, PerDataAccountBaisc>()
// .ForMember(dest => dest.UnitType, opt => opt.MapFrom(src => ((UnitType)src.UnitType).ToString()))
// .ForMember(dest => dest.UnitType, opt => opt.MapFrom(src => ((UnitType)src.UnitType).ToString()))
// .ForMember(dest => dest.AccountingUnit, opt => opt.MapFrom(src => src.DoctorAccountingUnit))
// .ForMember(dest => dest.AccountingUnit, opt => opt.MapFrom(src => src.DoctorAccountingUnit))
...
@@ -162,7 +160,6 @@ public AutoMapperConfigs()
...
@@ -162,7 +160,6 @@ public AutoMapperConfigs()
CreateMap
<
res_account
,
DeptResponse
>();
CreateMap
<
res_account
,
DeptResponse
>();
//CreateMap<res_account, NurseResponse>();
//CreateMap<res_account, NurseResponse>();
//二次绩效
//二次绩效
CreateMap
<
ag_header
,
PerHeader
>();
CreateMap
<
ag_header
,
PerHeader
>();
CreateMap
<
PerHeader
,
ag_header
>();
CreateMap
<
PerHeader
,
ag_header
>();
...
@@ -222,7 +219,7 @@ public AutoMapperConfigs()
...
@@ -222,7 +219,7 @@ public AutoMapperConfigs()
.
ReverseMap
();
.
ReverseMap
();
CreateMap
<
ag_othersource
,
SecPrintResponse
>()
CreateMap
<
ag_othersource
,
SecPrintResponse
>()
.
ForMember
(
dest
=>
dest
.
WorkPost
,
opt
=>
opt
.
MapFrom
(
src
=>
src
.
WorkNumber
))
.
ForMember
(
dest
=>
dest
.
JobNumber
,
opt
=>
opt
.
MapFrom
(
src
=>
src
.
WorkNumber
))
.
ForMember
(
dest
=>
dest
.
PersonName
,
opt
=>
opt
.
MapFrom
(
src
=>
src
.
Name
))
.
ForMember
(
dest
=>
dest
.
PersonName
,
opt
=>
opt
.
MapFrom
(
src
=>
src
.
Name
))
.
ForMember
(
dest
=>
dest
.
TitlePerfor
,
opt
=>
opt
.
MapFrom
(
src
=>
src
.
TitlePerformance
))
.
ForMember
(
dest
=>
dest
.
TitlePerfor
,
opt
=>
opt
.
MapFrom
(
src
=>
src
.
TitlePerformance
))
.
ReverseMap
();
.
ReverseMap
();
...
@@ -243,7 +240,6 @@ public AutoMapperConfigs()
...
@@ -243,7 +240,6 @@ public AutoMapperConfigs()
public
void
xx
()
public
void
xx
()
{
{
}
}
}
}
}
}
performance/Performance.Services/SecondAllotService.cs
View file @
93e5f883
...
@@ -1716,7 +1716,7 @@ public List<SecPrintResponse> Print(int secondId)
...
@@ -1716,7 +1716,7 @@ public List<SecPrintResponse> Print(int secondId)
var
itemname
=
new
List
<
string
>
{
"人员工号"
,
"姓名"
,
"职称"
,
"职称绩效"
,
"工作量绩效工资"
,
"单项奖励小计"
,
"可分配绩效"
,
"医院其他绩效"
,
"夜班工作量绩效"
};
var
itemname
=
new
List
<
string
>
{
"人员工号"
,
"姓名"
,
"职称"
,
"职称绩效"
,
"工作量绩效工资"
,
"单项奖励小计"
,
"可分配绩效"
,
"医院其他绩效"
,
"夜班工作量绩效"
};
var
fixaitems
=
perforAgfixatitemRepository
.
GetEntities
(
t
=>
t
.
SecondId
==
secondId
&&
itemname
.
Contains
(
t
.
ItemName
));
var
fixaitems
=
perforAgfixatitemRepository
.
GetEntities
(
t
=>
t
.
SecondId
==
secondId
&&
itemname
.
Contains
(
t
.
ItemName
));
if
(
fixaitems
==
null
&&
!
fixaitems
.
Any
(
t
=>
t
.
RowNumber
.
HasValue
&&
t
.
RowNumber
!=
-
1
))
return
new
List
<
SecPrintResponse
>();
if
(
fixaitems
==
null
||
!
fixaitems
.
Any
(
t
=>
t
.
RowNumber
.
HasValue
&&
t
.
RowNumber
!=
-
1
))
return
new
List
<
SecPrintResponse
>();
var
rownumbers
=
fixaitems
.
Where
(
t
=>
t
.
RowNumber
.
HasValue
&&
t
.
RowNumber
!=
-
1
).
Select
(
t
=>
t
.
RowNumber
.
Value
).
Distinct
().
OrderBy
(
t
=>
t
).
ToList
();
var
rownumbers
=
fixaitems
.
Where
(
t
=>
t
.
RowNumber
.
HasValue
&&
t
.
RowNumber
!=
-
1
).
Select
(
t
=>
t
.
RowNumber
.
Value
).
Distinct
().
OrderBy
(
t
=>
t
).
ToList
();
var
result
=
new
List
<
SecPrintResponse
>();
var
result
=
new
List
<
SecPrintResponse
>();
...
...
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