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
76217558
Commit
76217558
authored
Oct 14, 2021
by
钟博
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改导出excel版本,重新计算合计,人员字典单元格类型修改
parent
d37d2479
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
5 deletions
+8
-5
performance/Performance.Services/DownloadService.cs
+0
-0
performance/Performance.Services/PersonService.cs
+8
-5
No files found.
performance/Performance.Services/DownloadService.cs
View file @
76217558
This diff is collapsed.
Click to expand it.
performance/Performance.Services/PersonService.cs
View file @
76217558
...
...
@@ -658,8 +658,11 @@ public HandsonTable GetBatchPersonStructrue(int hospitalId)
var
ss
=
deptdics
?.
Where
(
t
=>
!
new
string
[]
{
UnitType
.
专家组
.
ToString
()
}.
Contains
(
t
.
UnitType
));
if
(
result
.
Columns
!=
null
&&
result
.
Columns
.
Any
())
{
var
columns
=
new
[]
{
"核算单元"
,
"科室名称"
,
"姓名"
,
"员工工号"
};
foreach
(
var
column
in
result
.
Columns
)
{
if
(
columns
.
Contains
(
column
.
Data
))
column
.
Type
=
"text"
;
if
(
column
.
Data
==
"人员类别"
)
{
...
...
@@ -734,13 +737,13 @@ public bool BathSavePerson(int AllotId, int HospitalId, SaveCollectData request)
var
dicData
=
CreateDataRow
(
request
,
dict
);
List
<
per_employee
>
employees
=
new
List
<
per_employee
>();
var
persons
=
peremployeeRepository
.
GetEntities
(
t
=>
t
.
HospitalId
==
HospitalId
&&
t
.
AllotId
==
AllotId
);
var
delPersonsNum
=
new
List
<
string
>();
foreach
(
var
item
in
dicData
)
{
var
json
=
JsonHelper
.
Serialize
(
item
);
var
data
=
JsonHelper
.
Deserialize
<
per_employee
>(
json
);
if
(!
string
.
IsNullOrEmpty
(
item
[
"AttendanceDay"
])
&&
!
string
.
IsNullOrEmpty
(
item
[
"ReservedRatio"
]))
{
decimal
attendanceDay
=
ConvertHelper
.
To
<
decimal
>(
item
[
"AttendanceDay"
]),
reservedRatio
=
ConvertHelper
.
To
<
decimal
>(
item
[
"ReservedRatio"
]);
...
...
@@ -772,7 +775,7 @@ public bool BathSavePerson(int AllotId, int HospitalId, SaveCollectData request)
if
(
employees
!=
null
&&
employees
.
Any
())
peremployeeRepository
.
AddRange
(
employees
.
ToArray
());
//个人绩效查询用户添加
SaveQueryRole
(
HospitalId
,
request
);
SaveQueryRole
(
HospitalId
,
request
);
return
true
;
}
...
...
@@ -1130,12 +1133,12 @@ public void SaveQueryRole(int hospitalId, SaveCollectData request)
var
role
=
perforRoleRepository
.
GetEntity
(
t
=>
t
.
RoleName
==
"绩效查询"
);
var
userRole
=
perforUserroleRepository
.
GetEntities
(
t
=>
t
.
RoleID
==
role
.
ID
)?.
Select
(
t
=>
t
.
UserID
);
var
users
=
perforUserRepository
.
GetEntities
(
t
=>
userRole
.
Contains
(
t
.
ID
));
var
newUsers
=
new
List
<
string
[
]>
();
foreach
(
var
item
in
dicData
)
{
var
json
=
JsonHelper
.
Serialize
(
item
);
var
data
=
JsonHelper
.
Deserialize
<
per_employee
>(
json
);
var
data
=
JsonHelper
.
Deserialize
<
per_employee
>(
json
);
if
(
hospital
.
IsOwnerQuery
==
1
)
{
var
isNewRole
=
!
string
.
IsNullOrEmpty
(
data
.
PersonnelNumber
?.
Trim
())
&&
!
string
.
IsNullOrEmpty
(
item
[
"Password"
]);
...
...
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