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

ruoyi-psa/src/main/java/com/ruoyi/domain/dto/FyglTripApplicationDTO.java

@@ -23,7 +23,7 @@ public class FyglTripApplicationDTO extends BaseEntity {
     //预计结束时间
     private String tripEndDate;
     //出差天数
-    private double days;
+    private double amount;
     //项目经理
     private String projectUserName;
     //审批状态

ruoyi-psa/src/main/java/com/ruoyi/mapper/IFyglTravelOnBusinessMapper.java

@@ -25,6 +25,7 @@ public interface IFyglTravelOnBusinessMapper {
      * @return 结果
      */
     public int insertFyglTravelOnBusiness(FyglTravelOnBusinessDTO fyglTravelOnBusinessDTO);
+    public int updateFyglTripReimburse(FyglTravelOnBusinessDTO fyglTravelOnBusinessDTO);
     
     /**
      * 修改差旅报销

ruoyi-psa/src/main/java/com/ruoyi/service/impl/IFyglTravelOnBusinessServiceImpl.java

@@ -45,6 +45,7 @@ public class IFyglTravelOnBusinessServiceImpl implements IFyglTravelOnBusinessSe
         fyglTravelOnBusinessDTO.setUpdateTime(nowDate);
         //设置1未通过2审批中3已通过
         fyglTravelOnBusinessDTO.setStatus(2);
+        onBusinessMapper.updateFyglTripReimburse(fyglTravelOnBusinessDTO);
         return onBusinessMapper.insertFyglTravelOnBusiness(fyglTravelOnBusinessDTO);
     }
     

ruoyi-psa/src/main/resources/mapper/IFyglTravelOnBusiness/IFyglTravelOnBusinessMapper.xml

@@ -93,6 +93,14 @@
         </trim>
     </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 fygl_travel_on_business
         <trim prefix="SET" suffixOverrides=",">

ruoyi-psa/src/main/resources/mapper/tripApplication/FyglTripApplicationMapper.xml

@@ -14,6 +14,7 @@
         <result property="tripReason" column="travel_cause"/>
         <result property="tripStartDate"    column="travel_start_date"    />
         <result property="tripEndDate"    column="travel_end_date"    />
+        <result property="amount"  column="amount"/>
         <result property="projectNumber"    column="project_number"    />
         <result property="status"  column="status"/>
         <result property="createBy"  column="create_by"/>
@@ -31,6 +32,7 @@
         ftr.travel_cause,
         ftr.travel_start_date,
         ftr.travel_end_date,
+        ftr.amount,
         u1.nick_name AS project_manager_name,
         ftr.status,
         ftr.create_by,