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
c9acd34c
Commit
c9acd34c
authored
Jun 25, 2021
by
钟博
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
绩效划拨审核、状态,列表问题修改
parent
d46c8d42
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
34 additions
and
14 deletions
+34
-14
performance/Performance.Api/Controllers/CostTransferController.cs
+5
-5
performance/Performance.Api/wwwroot/Performance.Api.xml
+3
-2
performance/Performance.Api/wwwroot/Performance.DtoModels.xml
+1
-1
performance/Performance.Api/wwwroot/Performance.EntityModels.xml
+6
-1
performance/Performance.DtoModels/Request/CostTransferRequest.cs
+9
-1
performance/Performance.DtoModels/Response/CostTransferResponse.cs
+2
-0
performance/Performance.EntityModels/Entity/cost_transfer.cs
+4
-1
performance/Performance.Services/CostTransfer/CostTransferService.cs
+0
-0
performance/Performance.Services/ExtractExcelService/SheetDataWrite/CostTransferDataWrite.cs
+4
-3
No files found.
performance/Performance.Api/Controllers/CostTransferController.cs
View file @
c9acd34c
...
@@ -63,7 +63,6 @@ public ApiResponse Common(int hospitalId, int allotId)
...
@@ -63,7 +63,6 @@ public ApiResponse Common(int hospitalId, int allotId)
var
result
=
costTransferService
.
Common
(
allotId
,
hospitalId
,
role
.
Type
.
Value
,
user
.
Department
);
var
result
=
costTransferService
.
Common
(
allotId
,
hospitalId
,
role
.
Type
.
Value
,
user
.
Department
);
result
.
deparment
=
user
.
Department
??
""
;
result
.
deparment
=
user
.
Department
??
""
;
return
new
ApiResponse
(
ResponseType
.
OK
,
result
);
return
new
ApiResponse
(
ResponseType
.
OK
,
result
);
}
}
...
@@ -72,10 +71,11 @@ public ApiResponse Common(int hospitalId, int allotId)
...
@@ -72,10 +71,11 @@ public ApiResponse Common(int hospitalId, int allotId)
/// 审核列表
/// 审核列表
/// </summary>
/// </summary>
/// <param name="allotId"></param>
/// <param name="allotId"></param>
/// <param name="menuType"></param>
/// <returns></returns>
/// <returns></returns>
[
Route
(
"auditlist/{allotId}"
)]
[
Route
(
"auditlist/{allotId}
/menuType/{menuType}
"
)]
[
HttpPost
]
[
HttpPost
]
public
ApiResponse
AuditList
(
int
allotId
)
public
ApiResponse
AuditList
(
int
allotId
,
int
menuType
)
{
{
if
(
allotId
<=
0
)
if
(
allotId
<=
0
)
return
new
ApiResponse
(
ResponseType
.
ParameterError
,
"参数AllotId无效!"
);
return
new
ApiResponse
(
ResponseType
.
ParameterError
,
"参数AllotId无效!"
);
...
@@ -83,7 +83,7 @@ public ApiResponse AuditList(int allotId)
...
@@ -83,7 +83,7 @@ public ApiResponse AuditList(int allotId)
var
userid
=
claim
.
GetUserId
();
var
userid
=
claim
.
GetUserId
();
var
user
=
userService
.
GetUser
(
userid
);
var
user
=
userService
.
GetUser
(
userid
);
var
role
=
roleService
.
GetARole
(
user
.
UserID
);
var
role
=
roleService
.
GetARole
(
user
.
UserID
);
var
result
=
costTransferService
.
GetAuditList
(
allotId
,
role
.
Type
.
Value
,
user
.
Department
);
var
result
=
costTransferService
.
GetAuditList
(
allotId
,
menuType
,
role
.
Type
.
Value
,
user
.
Department
);
return
new
ApiResponse
(
ResponseType
.
OK
,
result
);
return
new
ApiResponse
(
ResponseType
.
OK
,
result
);
...
@@ -96,7 +96,7 @@ public ApiResponse AuditList(int allotId)
...
@@ -96,7 +96,7 @@ public ApiResponse AuditList(int allotId)
/// <returns></returns>
/// <returns></returns>
[
Route
(
"costtransferaudit"
)]
[
Route
(
"costtransferaudit"
)]
[
HttpPost
]
[
HttpPost
]
public
ApiResponse
Audit
([
FromBody
]
CostTransferUpdate
Request
request
)
public
ApiResponse
Audit
([
FromBody
]
Audit
Request
request
)
{
{
if
(
request
.
AllotId
<=
0
)
if
(
request
.
AllotId
<=
0
)
return
new
ApiResponse
(
ResponseType
.
ParameterError
,
"参数AllotId无效!"
);
return
new
ApiResponse
(
ResponseType
.
ParameterError
,
"参数AllotId无效!"
);
...
...
performance/Performance.Api/wwwroot/Performance.Api.xml
View file @
c9acd34c
...
@@ -709,14 +709,15 @@
...
@@ -709,14 +709,15 @@
</summary>
</summary>
<returns></returns>
<returns></returns>
</member>
</member>
<member
name=
"M:Performance.Api.Controllers.CostTransferController.AuditList(System.Int32)"
>
<member
name=
"M:Performance.Api.Controllers.CostTransferController.AuditList(System.Int32
,System.Int32
)"
>
<summary>
<summary>
审核列表
审核列表
</summary>
</summary>
<param
name=
"allotId"
></param>
<param
name=
"allotId"
></param>
<param
name=
"menuType"
></param>
<returns></returns>
<returns></returns>
</member>
</member>
<member
name=
"M:Performance.Api.Controllers.CostTransferController.Audit(Performance.DtoModels.
CostTransferUpdate
Request)"
>
<member
name=
"M:Performance.Api.Controllers.CostTransferController.Audit(Performance.DtoModels.
Audit
Request)"
>
<summary>
<summary>
划拨审核
划拨审核
</summary>
</summary>
...
...
performance/Performance.Api/wwwroot/Performance.DtoModels.xml
View file @
c9acd34c
...
@@ -2980,7 +2980,7 @@
...
@@ -2980,7 +2980,7 @@
</member>
</member>
<member
name=
"P:Performance.DtoModels.CostTransferResponse.Status"
>
<member
name=
"P:Performance.DtoModels.CostTransferResponse.Status"
>
<summary>
<summary>
0 未审核 1 部分审核 2 全部审核
3 未含有划拨明细
0 未审核 1 部分审核 2 全部审核
</summary>
</summary>
</member>
</member>
<member
name=
"P:Performance.DtoModels.DeptDataDetails`1.Pandect"
>
<member
name=
"P:Performance.DtoModels.DeptDataDetails`1.Pandect"
>
...
...
performance/Performance.Api/wwwroot/Performance.EntityModels.xml
View file @
c9acd34c
...
@@ -2266,7 +2266,12 @@
...
@@ -2266,7 +2266,12 @@
</member>
</member>
<member
name=
"P:Performance.EntityModels.cost_transfer.Status"
>
<member
name=
"P:Performance.EntityModels.cost_transfer.Status"
>
<summary>
<summary>
0 未审核 1 部分审核 2 全部审核 3 未含有划拨明细
0 未审核 1 全部通过 2 部分通过 3 全部驳回
</summary>
</member>
<member
name=
"P:Performance.EntityModels.cost_transfer.AdminStatus"
>
<summary>
0 未审核 1 全部通过 2 部分通过 3 全部驳回
</summary>
</summary>
</member>
</member>
<member
name=
"T:Performance.EntityModels.cost_transfer_item"
>
<member
name=
"T:Performance.EntityModels.cost_transfer_item"
>
...
...
performance/Performance.DtoModels/Request/CostTransferRequest.cs
View file @
c9acd34c
...
@@ -27,10 +27,18 @@ public class CostTransferUpdateRequest : CostTransferRequest
...
@@ -27,10 +27,18 @@ public class CostTransferUpdateRequest : CostTransferRequest
{
{
public
int
TransferId
{
get
;
set
;
}
public
int
TransferId
{
get
;
set
;
}
public
new
List
<
cost_transfer_item
>
Items
{
get
;
set
;
}
}
public
class
AuditRequest
{
public
int
AllotId
{
get
;
set
;
}
public
int
[]
TransferItemId
{
get
;
set
;
}
public
int
[]
TransferItemId
{
get
;
set
;
}
public
int
Status
{
get
;
set
;
}
public
int
Status
{
get
;
set
;
}
public
new
List
<
cost_transfer_item
>
Items
{
get
;
set
;
}
public
string
Remake
{
get
;
set
;
}
}
}
}
}
performance/Performance.DtoModels/Response/CostTransferResponse.cs
View file @
c9acd34c
...
@@ -64,6 +64,8 @@ public class Common
...
@@ -64,6 +64,8 @@ public class Common
public
class
Option
:
cost_transfer_item
public
class
Option
:
cost_transfer_item
{
{
public
string
[]
options
{
get
;
set
;
}
public
string
[]
options
{
get
;
set
;
}
public
string
ApplicantDepartment
{
get
;
set
;
}
public
string
AdoptedDepartment
{
get
;
set
;
}
}
}
}
}
performance/Performance.EntityModels/Entity/cost_transfer.cs
View file @
c9acd34c
...
@@ -46,10 +46,13 @@ public class cost_transfer
...
@@ -46,10 +46,13 @@ public class cost_transfer
public
string
AdoptedDepartment
{
get
;
set
;
}
public
string
AdoptedDepartment
{
get
;
set
;
}
/// <summary>
/// <summary>
/// 0 未审核 1
部分审核 2 全部审核
/// 0 未审核 1
全部通过 2 部分通过 3 全部驳回 4 含有下发驳回
/// </summary>
/// </summary>
public
int
Status
{
get
;
set
;
}
public
int
Status
{
get
;
set
;
}
/// <summary>
/// 0 未审核 1 全部通过 2 部分通过 3 全部驳回 4 含有下发驳回
/// </summary>
public
int
AdminStatus
{
get
;
set
;
}
public
int
AdminStatus
{
get
;
set
;
}
}
}
}
}
performance/Performance.Services/CostTransfer/CostTransferService.cs
View file @
c9acd34c
This diff is collapsed.
Click to expand it.
performance/Performance.Services/ExtractExcelService/SheetDataWrite/CostTransferDataWrite.cs
View file @
c9acd34c
...
@@ -9,7 +9,7 @@
...
@@ -9,7 +9,7 @@
namespace
Performance.Services.ExtractExcelService.SheetDataWrite
namespace
Performance.Services.ExtractExcelService.SheetDataWrite
{
{
public
class
CostTransferDataWrite
public
class
CostTransferDataWrite
:
IAutoInjection
{
{
private
readonly
ILogger
logger
;
private
readonly
ILogger
logger
;
private
readonly
PerforCosttransferRepository
costtransferRepository
;
private
readonly
PerforCosttransferRepository
costtransferRepository
;
...
@@ -75,7 +75,7 @@ public void WriteSheetData(ISheet sheet, PerSheetPoint point, ExcelStyle style,
...
@@ -75,7 +75,7 @@ public void WriteSheetData(ISheet sheet, PerSheetPoint point, ExcelStyle style,
var
column
=
header
.
GetCell
(
i
)?.
GetDecodeEscapes
().
Replace
(
"("
,
"("
).
Replace
(
")"
,
")"
);
var
column
=
header
.
GetCell
(
i
)?.
GetDecodeEscapes
().
Replace
(
"("
,
"("
).
Replace
(
")"
,
")"
);
if
(!
string
.
IsNullOrEmpty
(
column
)
&&
fixedColumns
.
Any
(
t
=>
t
==
column
))
if
(!
string
.
IsNullOrEmpty
(
column
)
&&
fixedColumns
.
Any
(
t
=>
t
==
column
))
{
{
if
(
pairs
.
ContainsKey
(
column
))
if
(
!
pairs
.
ContainsKey
(
column
))
pairs
.
Add
(
column
,
i
);
pairs
.
Add
(
column
,
i
);
fixedColumns
.
Remove
(
column
);
fixedColumns
.
Remove
(
column
);
...
@@ -90,7 +90,8 @@ public void WriteSheetData(ISheet sheet, PerSheetPoint point, ExcelStyle style,
...
@@ -90,7 +90,8 @@ public void WriteSheetData(ISheet sheet, PerSheetPoint point, ExcelStyle style,
var
cell
=
header
.
CreateCell
(
index
);
var
cell
=
header
.
CreateCell
(
index
);
cell
.
SetCellValue
(
column
);
cell
.
SetCellValue
(
column
);
if
(
pairs
.
ContainsKey
(
column
))
pairs
.
Add
(
column
,
index
);
if
(!
pairs
.
ContainsKey
(
column
))
pairs
.
Add
(
column
,
index
);
index
++;
index
++;
}
}
...
...
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