Commit 16a19342 authored by yanzhengyang's avatar yanzhengyang

差旅报销-新增报销功能bug修复

parent 9bd614b8
...@@ -23,7 +23,7 @@ public class FyglTripApplicationDTO extends BaseEntity { ...@@ -23,7 +23,7 @@ public class FyglTripApplicationDTO extends BaseEntity {
//预计结束时间 //预计结束时间
private String tripEndDate; private String tripEndDate;
//出差天数 //出差天数
private double days; private double amount;
//项目经理 //项目经理
private String projectUserName; private String projectUserName;
//审批状态 //审批状态
......
...@@ -25,6 +25,7 @@ public interface IFyglTravelOnBusinessMapper { ...@@ -25,6 +25,7 @@ public interface IFyglTravelOnBusinessMapper {
* @return 结果 * @return 结果
*/ */
public int insertFyglTravelOnBusiness(FyglTravelOnBusinessDTO fyglTravelOnBusinessDTO); public int insertFyglTravelOnBusiness(FyglTravelOnBusinessDTO fyglTravelOnBusinessDTO);
public int updateFyglTripReimburse(FyglTravelOnBusinessDTO fyglTravelOnBusinessDTO);
/** /**
* 修改差旅报销 * 修改差旅报销
......
...@@ -45,6 +45,7 @@ public class IFyglTravelOnBusinessServiceImpl implements IFyglTravelOnBusinessSe ...@@ -45,6 +45,7 @@ public class IFyglTravelOnBusinessServiceImpl implements IFyglTravelOnBusinessSe
fyglTravelOnBusinessDTO.setUpdateTime(nowDate); fyglTravelOnBusinessDTO.setUpdateTime(nowDate);
//设置1未通过2审批中3已通过 //设置1未通过2审批中3已通过
fyglTravelOnBusinessDTO.setStatus(2); fyglTravelOnBusinessDTO.setStatus(2);
onBusinessMapper.updateFyglTripReimburse(fyglTravelOnBusinessDTO);
return onBusinessMapper.insertFyglTravelOnBusiness(fyglTravelOnBusinessDTO); return onBusinessMapper.insertFyglTravelOnBusiness(fyglTravelOnBusinessDTO);
} }
......
...@@ -93,6 +93,14 @@ ...@@ -93,6 +93,14 @@
</trim> </trim>
</insert> </insert>
<update id="updateFyglTripReimburse" parameterType="com.ruoyi.domain.dto.FyglTravelOnBusinessDTO">
update fygl_travel_request
<trim prefix="SET" suffixOverrides=",">
<if test="amount != null">amount = #{amount},</if>
</trim>
where id = #{id}
</update>
<update id="updateFyglTravelOnBusiness" parameterType="com.ruoyi.domain.dto.FyglTravelOnBusinessDTO"> <update id="updateFyglTravelOnBusiness" parameterType="com.ruoyi.domain.dto.FyglTravelOnBusinessDTO">
update fygl_travel_on_business update fygl_travel_on_business
<trim prefix="SET" suffixOverrides=","> <trim prefix="SET" suffixOverrides=",">
......
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
<result property="tripReason" column="travel_cause"/> <result property="tripReason" column="travel_cause"/>
<result property="tripStartDate" column="travel_start_date" /> <result property="tripStartDate" column="travel_start_date" />
<result property="tripEndDate" column="travel_end_date" /> <result property="tripEndDate" column="travel_end_date" />
<result property="amount" column="amount"/>
<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="createBy" column="create_by"/>
...@@ -31,6 +32,7 @@ ...@@ -31,6 +32,7 @@
ftr.travel_cause, ftr.travel_cause,
ftr.travel_start_date, ftr.travel_start_date,
ftr.travel_end_date, ftr.travel_end_date,
ftr.amount,
u1.nick_name AS project_manager_name, u1.nick_name AS project_manager_name,
ftr.status, ftr.status,
ftr.create_by, ftr.create_by,
......
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