Commit 77b0a851 authored by qiyaxin's avatar qiyaxin

出差申请-改bug

parent 48079aa1
...@@ -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;
} }
...@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment