Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
I
isoft_psa
Project
Project
Details
Activity
Releases
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
王飞
isoft_psa
Commits
77b0a851
Commit
77b0a851
authored
Mar 28, 2025
by
qiyaxin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
出差申请-改bug
parent
48079aa1
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
1 deletion
+6
-1
FyglTripApplicationDTO.java
...ain/java/com/ruoyi/domain/dto/FyglTripApplicationDTO.java
+1
-0
FyglTripApplicationMapper.xml
...rces/mapper/tripApplication/FyglTripApplicationMapper.xml
+5
-1
No files found.
ruoyi-psa/src/main/java/com/ruoyi/domain/dto/FyglTripApplicationDTO.java
View file @
77b0a851
...
@@ -28,4 +28,5 @@ public class FyglTripApplicationDTO extends BaseEntity {
...
@@ -28,4 +28,5 @@ public class FyglTripApplicationDTO extends BaseEntity {
private
String
projectUserName
;
private
String
projectUserName
;
//审批状态
//审批状态
private
Integer
status
;
private
Integer
status
;
}
}
ruoyi-psa/src/main/resources/mapper/tripApplication/FyglTripApplicationMapper.xml
View file @
77b0a851
...
@@ -16,6 +16,8 @@
...
@@ -16,6 +16,8 @@
<result
property=
"tripEndDate"
column=
"travel_end_date"
/>
<result
property=
"tripEndDate"
column=
"travel_end_date"
/>
<result
property=
"projectNumber"
column=
"project_number"
/>
<result
property=
"projectNumber"
column=
"project_number"
/>
<result
property=
"status"
column=
"status"
/>
<result
property=
"status"
column=
"status"
/>
<result
property=
"createBy"
column=
"create_by"
/>
<result
property=
"updateBy"
column=
"update_by"
/>
</resultMap>
</resultMap>
<select
id=
"selectTripApplicationList"
parameterType=
"com.ruoyi.domain.vo.FyglTripApplicationVo"
resultMap=
"FyglTripApplicationDTOResult"
>
<select
id=
"selectTripApplicationList"
parameterType=
"com.ruoyi.domain.vo.FyglTripApplicationVo"
resultMap=
"FyglTripApplicationDTOResult"
>
...
@@ -29,7 +31,9 @@
...
@@ -29,7 +31,9 @@
ftr.travel_start_date,
ftr.travel_start_date,
ftr.travel_end_date,
ftr.travel_end_date,
u1.nick_name AS project_manager_name,
u1.nick_name AS project_manager_name,
ftr.status
ftr.status,
ftr.create_by,
ftr.update_by
FROM
FROM
fygl_travel_request ftr
fygl_travel_request ftr
LEFT JOIN project_manage p ON p.id = ftr.project_id
LEFT JOIN project_manage p ON p.id = ftr.project_id
...
...
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