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
acb2f8b4
Commit
acb2f8b4
authored
Apr 15, 2025
by
yanzhengyang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
新增差旅报销列表导出
parent
617142b1
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
63 additions
and
0 deletions
+63
-0
FyglTravelOnBusinessController.java
.../com/ruoyi/controller/FyglTravelOnBusinessController.java
+14
-0
FyglTravelOnBusinessDTO.java
...in/java/com/ruoyi/domain/dto/FyglTravelOnBusinessDTO.java
+9
-0
IFyglTravelOnBusinessMapper.java
...in/java/com/ruoyi/mapper/IFyglTravelOnBusinessMapper.java
+4
-0
IFyglTravelOnBusinessService.java
.../java/com/ruoyi/service/IFyglTravelOnBusinessService.java
+4
-0
IFyglTravelOnBusinessServiceImpl.java
.../ruoyi/service/impl/IFyglTravelOnBusinessServiceImpl.java
+6
-0
IFyglTravelOnBusinessMapper.xml
...per/IFyglTravelOnBusiness/IFyglTravelOnBusinessMapper.xml
+26
-0
No files found.
ruoyi-psa/src/main/java/com/ruoyi/controller/FyglTravelOnBusinessController.java
View file @
acb2f8b4
...
@@ -4,11 +4,16 @@ import com.ruoyi.common.annotation.Anonymous;
...
@@ -4,11 +4,16 @@ import com.ruoyi.common.annotation.Anonymous;
import
com.ruoyi.common.core.controller.BaseController
;
import
com.ruoyi.common.core.controller.BaseController
;
import
com.ruoyi.common.core.domain.AjaxResult
;
import
com.ruoyi.common.core.domain.AjaxResult
;
import
com.ruoyi.common.core.page.TableDataInfo
;
import
com.ruoyi.common.core.page.TableDataInfo
;
import
com.ruoyi.common.utils.poi.ExcelUtil
;
import
com.ruoyi.domain.dto.FyglTravelOnBusinessDTO
;
import
com.ruoyi.domain.dto.FyglTravelOnBusinessDTO
;
import
com.ruoyi.domain.dto.FyglTripApplicationDTO
;
import
com.ruoyi.service.IFyglTravelOnBusinessService
;
import
com.ruoyi.service.IFyglTravelOnBusinessService
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.web.bind.annotation.*
;
import
org.springframework.web.bind.annotation.*
;
import
javax.servlet.http.HttpServletResponse
;
import
java.util.List
;
@RestController
@RestController
@RequestMapping
(
"/FyglTravelOnBusiness"
)
@RequestMapping
(
"/FyglTravelOnBusiness"
)
public
class
FyglTravelOnBusinessController
extends
BaseController
{
public
class
FyglTravelOnBusinessController
extends
BaseController
{
...
@@ -32,6 +37,15 @@ public class FyglTravelOnBusinessController extends BaseController {
...
@@ -32,6 +37,15 @@ public class FyglTravelOnBusinessController extends BaseController {
return
success
(
travelOnBusinessService
.
selectFyglTravelOnBusinessListById
(
id
));
return
success
(
travelOnBusinessService
.
selectFyglTravelOnBusinessListById
(
id
));
}
}
//导出列表
@PostMapping
(
"/getList/export"
)
public
void
export
(
HttpServletResponse
response
,
Long
[]
ids
)
{
List
<
FyglTravelOnBusinessDTO
>
travelOnBusinessByIds
=
travelOnBusinessService
.
getTravelOnBusinessList
(
ids
);
ExcelUtil
<
FyglTravelOnBusinessDTO
>
util
=
new
ExcelUtil
<
FyglTravelOnBusinessDTO
>(
FyglTravelOnBusinessDTO
.
class
);
util
.
exportExcel
(
response
,
travelOnBusinessByIds
,
"差旅报销数据"
);
}
//新增差旅报销
//新增差旅报销
@PostMapping
(
"/getList/insert"
)
@PostMapping
(
"/getList/insert"
)
public
AjaxResult
insertFyglTravelOnBusiness
(
@RequestBody
FyglTravelOnBusinessDTO
fyglTravelOnBusinessDTO
)
public
AjaxResult
insertFyglTravelOnBusiness
(
@RequestBody
FyglTravelOnBusinessDTO
fyglTravelOnBusinessDTO
)
...
...
ruoyi-psa/src/main/java/com/ruoyi/domain/dto/FyglTravelOnBusinessDTO.java
View file @
acb2f8b4
package
com
.
ruoyi
.
domain
.
dto
;
package
com
.
ruoyi
.
domain
.
dto
;
import
com.ruoyi.common.annotation.Excel
;
import
com.ruoyi.common.core.domain.BaseEntity
;
import
com.ruoyi.common.core.domain.BaseEntity
;
import
lombok.Data
;
import
lombok.Data
;
import
lombok.EqualsAndHashCode
;
import
lombok.EqualsAndHashCode
;
...
@@ -14,13 +15,21 @@ public class FyglTravelOnBusinessDTO extends BaseEntity {
...
@@ -14,13 +15,21 @@ public class FyglTravelOnBusinessDTO extends BaseEntity {
private
Long
id
;
private
Long
id
;
//当前用户ID
//当前用户ID
private
Long
currentUserId
;
private
Long
currentUserId
;
@Excel
(
name
=
"项目编号"
)
private
String
projectNumber
;
private
String
projectNumber
;
@Excel
(
name
=
"项目名称"
)
private
String
projectName
;
private
String
projectName
;
@Excel
(
name
=
"项目类型"
,
dictType
=
"project_type"
)
private
String
projectType
;
private
String
projectType
;
@Excel
(
name
=
"出差地点"
)
private
String
travelAddress
;
private
String
travelAddress
;
@Excel
(
name
=
"出差事由"
)
private
String
travelCause
;
private
String
travelCause
;
@Excel
(
name
=
"申请报销金额"
)
private
Double
amount
;
private
Double
amount
;
@Excel
(
name
=
"项目经理"
)
private
String
projectUserName
;
private
String
projectUserName
;
@Excel
(
name
=
"审批状态"
,
dictType
=
"cost_daily_status"
)
private
Integer
status
;
private
Integer
status
;
//当前节点id
//当前节点id
...
...
ruoyi-psa/src/main/java/com/ruoyi/mapper/IFyglTravelOnBusinessMapper.java
View file @
acb2f8b4
package
com
.
ruoyi
.
mapper
;
package
com
.
ruoyi
.
mapper
;
import
com.ruoyi.domain.dto.FyglTravelOnBusinessDTO
;
import
com.ruoyi.domain.dto.FyglTravelOnBusinessDTO
;
import
com.ruoyi.domain.dto.FyglTripApplicationDTO
;
import
org.apache.ibatis.annotations.Mapper
;
import
org.apache.ibatis.annotations.Mapper
;
import
java.util.List
;
import
java.util.List
;
...
@@ -18,6 +19,9 @@ public interface IFyglTravelOnBusinessMapper {
...
@@ -18,6 +19,9 @@ public interface IFyglTravelOnBusinessMapper {
//列表
//列表
List
<
FyglTravelOnBusinessDTO
>
getFyglTravelOnBusinessList
(
FyglTravelOnBusinessDTO
fyg
);
List
<
FyglTravelOnBusinessDTO
>
getFyglTravelOnBusinessList
(
FyglTravelOnBusinessDTO
fyg
);
//根据ids搜索(导出功能)
List
<
FyglTravelOnBusinessDTO
>
getTravelOnBusinessList
(
Long
[]
ids
);
/**
/**
* 新增差旅报销
* 新增差旅报销
*
*
...
...
ruoyi-psa/src/main/java/com/ruoyi/service/IFyglTravelOnBusinessService.java
View file @
acb2f8b4
package
com
.
ruoyi
.
service
;
package
com
.
ruoyi
.
service
;
import
com.ruoyi.domain.dto.FyglTravelOnBusinessDTO
;
import
com.ruoyi.domain.dto.FyglTravelOnBusinessDTO
;
import
com.ruoyi.domain.dto.FyglTripApplicationDTO
;
import
java.util.List
;
import
java.util.List
;
...
@@ -15,6 +16,9 @@ public interface IFyglTravelOnBusinessService {
...
@@ -15,6 +16,9 @@ public interface IFyglTravelOnBusinessService {
List
<
FyglTravelOnBusinessDTO
>
getFyglTravelOnBusinessList
(
FyglTravelOnBusinessDTO
fyg
);
List
<
FyglTravelOnBusinessDTO
>
getFyglTravelOnBusinessList
(
FyglTravelOnBusinessDTO
fyg
);
//导出功能
List
<
FyglTravelOnBusinessDTO
>
getTravelOnBusinessList
(
Long
[]
ids
);
/**
/**
* 新增差旅报销
* 新增差旅报销
*
*
...
...
ruoyi-psa/src/main/java/com/ruoyi/service/impl/IFyglTravelOnBusinessServiceImpl.java
View file @
acb2f8b4
...
@@ -3,6 +3,7 @@ package com.ruoyi.service.impl;
...
@@ -3,6 +3,7 @@ package com.ruoyi.service.impl;
import
com.ruoyi.common.utils.DateUtils
;
import
com.ruoyi.common.utils.DateUtils
;
import
com.ruoyi.common.utils.SecurityUtils
;
import
com.ruoyi.common.utils.SecurityUtils
;
import
com.ruoyi.domain.dto.FyglTravelOnBusinessDTO
;
import
com.ruoyi.domain.dto.FyglTravelOnBusinessDTO
;
import
com.ruoyi.domain.dto.FyglTripApplicationDTO
;
import
com.ruoyi.mapper.IFyglTravelOnBusinessMapper
;
import
com.ruoyi.mapper.IFyglTravelOnBusinessMapper
;
import
com.ruoyi.service.IFyglTravelOnBusinessService
;
import
com.ruoyi.service.IFyglTravelOnBusinessService
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
...
@@ -37,6 +38,11 @@ public class IFyglTravelOnBusinessServiceImpl implements IFyglTravelOnBusinessSe
...
@@ -37,6 +38,11 @@ public class IFyglTravelOnBusinessServiceImpl implements IFyglTravelOnBusinessSe
return
onBusinessMapper
.
getFyglTravelOnBusinessList
(
fyg
);
return
onBusinessMapper
.
getFyglTravelOnBusinessList
(
fyg
);
}
}
@Override
public
List
<
FyglTravelOnBusinessDTO
>
getTravelOnBusinessList
(
Long
[]
ids
)
{
return
onBusinessMapper
.
getTravelOnBusinessList
(
ids
);
}
@Override
@Override
@Transactional
@Transactional
public
int
insertFyglTravelOnBusiness
(
FyglTravelOnBusinessDTO
fyglTravelOnBusinessDTO
)
{
public
int
insertFyglTravelOnBusiness
(
FyglTravelOnBusinessDTO
fyglTravelOnBusinessDTO
)
{
...
...
ruoyi-psa/src/main/resources/mapper/IFyglTravelOnBusiness/IFyglTravelOnBusinessMapper.xml
View file @
acb2f8b4
...
@@ -69,6 +69,32 @@
...
@@ -69,6 +69,32 @@
f.id = #{id}
f.id = #{id}
</select>
</select>
<select
id=
"getTravelOnBusinessList"
resultMap=
"listDTO"
>
SELECT
f.id,
f.current_audit_role_id as currentAuditRoleId,
p.project_number,
p.project_name,
p.project_type,
fr.travel_address,
fr.travel_cause,
f.actual_amount,
u.nick_name AS project_manager_name,
f.`status`,
f.create_by as createBy,
f.update_by
FROM
fygl_travel_on_business f
LEFT JOIN fygl_travel_request fr ON fr.id = f.tid
left join project_manage p on p.id = fr.project_id
left join sys_user u on u.user_id = p.project_manager_id
where f.id in
<foreach
item=
"item"
index=
"index"
collection=
"array"
open=
"("
separator=
","
close=
")"
>
#{item}
</foreach>
</select>
<insert
id=
"insertFyglTravelOnBusiness"
parameterType=
"com.ruoyi.domain.dto.FyglTravelOnBusinessDTO"
>
<insert
id=
"insertFyglTravelOnBusiness"
parameterType=
"com.ruoyi.domain.dto.FyglTravelOnBusinessDTO"
>
insert into fygl_travel_on_business
insert into fygl_travel_on_business
<trim
prefix=
"("
suffix=
")"
suffixOverrides=
","
>
<trim
prefix=
"("
suffix=
")"
suffixOverrides=
","
>
...
...
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