项目费用报销-删除

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

+package com.ruoyi.domain.dto;
+
+import com.ruoyi.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 费用管理-差旅报销
+ * @TableName fygl_travel_on_business
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class FyglTravelOnBusinessDTO extends BaseEntity {
+    private Integer id;
+    private String project_number;
+    private String projectName;
+    private String projectType;
+    private String travelAddress;
+    private String travelCause;
+    private Double amount;
+    private String userName;
+    private Integer status;
+}
\ No newline at end of file

ruoyi-psa/src/main/resources/mapper/FyglProjectCostReimbursement/FyglProjectCostReimbursementMapper.xml

@@ -86,7 +86,7 @@
                 LEFT JOIN fygl_project_cost_request r2 ON r2.id = r1.rid
                 LEFT JOIN project_manage p ON p.id = r2.project_id
         <where>
-             p.del_flag = 0
+            r1.del_flag = 0
             <if test="projectName != null  and projectName != ''"> and p.project_name like concat('%',#{projectName},'%') </if>
             <if test="projectType != null  and projectType != ''"> and p.project_type = #{projectType}</if>
             <if test="reimbursmentApproveStatus != null  and reimbursmentApproveStatus != ''">r1.reimbursment_approve_status = #{reimbursmentApproveStatus}</if>
@@ -115,7 +115,7 @@
                 LEFT JOIN fygl_project_cost_request r2 ON r2.id = r1.rid
                 LEFT JOIN project_manage p ON p.id = r2.project_id
                 left join sys_user u on u.user_id = p.department_leader_id
-        where r1.id = #{id} and p.del_flag = 0
+        where r1.id = #{id} and r1.del_flag = 0
     </select>
 
     <resultMap type="com.ruoyi.domain.dto.FyglProjectCostDTO" id="list1DTO">
@@ -162,7 +162,7 @@
         LEFT JOIN sys_user u ON u.user_id = p.department_leader_id
 
         <where>
-            and fp.approve_status = 3  and p.del_flag = 0
+            and fp.approve_status = 3
             <if test="projectName != null  and projectName != ''"> and p.project_name LIKE CONCAT('%',#{projectName},'%') </if>
             <if test="projectNumber != null  and projectNumber != ''"> and p.project_number = #{projectNumber}</if>
             <if test="userId != null  and userId != ''"> and u.user_id = #{userId}</if>