Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
P
poc-api
Project
Project
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
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
poc
poc-api
Commits
4e85ba7d
Commit
4e85ba7d
authored
Jun 27, 2025
by
alex yao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 修复审核单异常信息
parent
7be07740
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
29 additions
and
43 deletions
+29
-43
ApprovalService.java
...n/java/cn/com/poc/approval/aggregate/ApprovalService.java
+3
-3
ApprovalServiceImpl.java
.../com/poc/approval/aggregate/impl/ApprovalServiceImpl.java
+20
-34
ApprovalRest.java
src/main/java/cn/com/poc/approval/rest/ApprovalRest.java
+3
-3
ApprovalRestImpl.java
.../java/cn/com/poc/approval/rest/impl/ApprovalRestImpl.java
+3
-3
No files found.
src/main/java/cn/com/poc/approval/aggregate/ApprovalService.java
View file @
4e85ba7d
...
...
@@ -30,7 +30,7 @@ public interface ApprovalService {
* @param approvalProfessionalId 审批人ID
* @return 审批单状态
*/
String
updateStatus
(
Long
approvalId
,
ApprovalEnum
.
ApprovalStatusEnum
approvalStatus
,
Long
approvalProfessionalId
);
String
updateStatus
(
Long
approvalId
,
ApprovalEnum
.
ApprovalStatusEnum
approvalStatus
,
Long
approvalProfessionalId
)
throws
Exception
;
/**
* 删除审批单
...
...
@@ -38,7 +38,7 @@ public interface ApprovalService {
* @param approvalId 审批单ID
* @param userId 用户ID
*/
void
delete
(
Long
approvalId
,
Long
userId
);
void
delete
(
Long
approvalId
,
Long
userId
)
throws
Exception
;
/**
* 获取审批单详情
...
...
@@ -46,7 +46,7 @@ public interface ApprovalService {
* @param approvalId 审批单ID
* @return 审批单详情
*/
BizApprovalDto
getDetail
(
Long
approvalId
);
BizApprovalDto
getDetail
(
Long
approvalId
)
throws
Exception
;
/**
...
...
src/main/java/cn/com/poc/approval/aggregate/impl/ApprovalServiceImpl.java
View file @
4e85ba7d
...
...
@@ -61,8 +61,7 @@ public class ApprovalServiceImpl implements ApprovalService {
}
@Override
public
String
updateStatus
(
Long
approvalId
,
ApprovalEnum
.
ApprovalStatusEnum
approvalStatus
,
Long
approvalProfessionalId
)
{
try
{
public
String
updateStatus
(
Long
approvalId
,
ApprovalEnum
.
ApprovalStatusEnum
approvalStatus
,
Long
approvalProfessionalId
)
throws
Exception
{
BizApprovalEntity
bizApprovalEntity
=
bizApprovalService
.
get
(
approvalId
);
if
(
bizApprovalEntity
==
null
)
{
throw
new
BusinessException
(
"审批单不存在"
);
...
...
@@ -71,39 +70,26 @@ public class ApprovalServiceImpl implements ApprovalService {
bizApprovalEntity
.
setApprovalProfessional
(
approvalProfessionalId
);
bizApprovalService
.
update
(
bizApprovalEntity
);
return
approvalStatus
.
getCode
();
}
catch
(
Exception
e
)
{
logger
.
error
(
"Update Approval Status Error"
,
e
);
throw
new
BusinessException
(
"更新审批单状态失败"
);
}
}
@Override
public
void
delete
(
Long
approvalId
,
Long
userId
)
{
try
{
public
void
delete
(
Long
approvalId
,
Long
userId
)
throws
Exception
{
BizApprovalEntity
bizApprovalEntity
=
bizApprovalService
.
get
(
approvalId
);
if
(
bizApprovalEntity
==
null
)
{
throw
new
BusinessException
(
"审批单不存在"
);
}
bizApprovalService
.
deletedById
(
approvalId
);
}
catch
(
Exception
e
)
{
logger
.
error
(
"Delete Approval Error"
,
e
);
throw
new
BusinessException
(
"审批单删除失败"
);
}
}
@Override
public
BizApprovalDto
getDetail
(
Long
approvalId
)
{
try
{
public
BizApprovalDto
getDetail
(
Long
approvalId
)
throws
Exception
{
BizApprovalEntity
bizApprovalEntity
=
bizApprovalService
.
get
(
approvalId
);
if
(
bizApprovalEntity
==
null
)
{
throw
new
BusinessException
(
"审批单不存在"
);
}
return
BizApprovalConvert
.
entityToDto
(
bizApprovalEntity
);
}
catch
(
Exception
e
)
{
logger
.
error
(
"Delete Approval Error"
,
e
);
throw
new
BusinessException
(
"审批单删除失败"
);
}
}
@Override
...
...
src/main/java/cn/com/poc/approval/rest/ApprovalRest.java
View file @
4e85ba7d
...
...
@@ -28,17 +28,17 @@ public interface ApprovalRest extends BaseRest {
/**
* 更新审批状态
*/
String
updateStatus
(
@RequestBody
BizApprovalDto
dto
);
String
updateStatus
(
@RequestBody
BizApprovalDto
dto
)
throws
Exception
;
/**
* 删除审批单
*/
void
delete
(
@RequestParam
Long
approvalId
);
void
delete
(
@RequestParam
Long
approvalId
)
throws
Exception
;
/**
* 获取审批单详情
*/
BizApprovalDto
getDetail
(
@RequestParam
Long
approvalId
);
BizApprovalDto
getDetail
(
@RequestParam
Long
approvalId
)
throws
Exception
;
/**
...
...
src/main/java/cn/com/poc/approval/rest/impl/ApprovalRestImpl.java
View file @
4e85ba7d
...
...
@@ -43,7 +43,7 @@ public class ApprovalRestImpl implements ApprovalRest {
}
@Override
public
String
updateStatus
(
BizApprovalDto
dto
)
{
public
String
updateStatus
(
BizApprovalDto
dto
)
throws
Exception
{
Assert
.
notNull
(
dto
,
"approvalDto can not be null"
);
Assert
.
notNull
(
dto
.
getApprovalStatus
(),
"approval status can not be null"
);
Assert
.
notNull
(
dto
.
getId
(),
"id can not be null"
);
...
...
@@ -61,7 +61,7 @@ public class ApprovalRestImpl implements ApprovalRest {
}
@Override
public
void
delete
(
Long
approvalId
)
{
public
void
delete
(
Long
approvalId
)
throws
Exception
{
Assert
.
notNull
(
approvalId
,
"approvalId can not be null"
);
UserBaseEntity
userBaseEntity
=
BlContext
.
getCurrentUserNotException
();
if
(
userBaseEntity
==
null
)
{
...
...
@@ -71,7 +71,7 @@ public class ApprovalRestImpl implements ApprovalRest {
}
@Override
public
BizApprovalDto
getDetail
(
Long
approvalId
)
{
public
BizApprovalDto
getDetail
(
Long
approvalId
)
throws
Exception
{
Assert
.
notNull
(
approvalId
,
"approvalId can not be null"
);
return
approvalService
.
getDetail
(
approvalId
);
}
...
...
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