项目费用报销-删除

ruoyi-psa/src/main/java/com/ruoyi/controller/FyglProjectCostReimbursementController.java

@@ -61,4 +61,11 @@ public class FyglProjectCostReimbursementController extends BaseController {
     {
         return AjaxResult.success(reimbursementService.updateReimbursement(reimbursementVo));
     }
+
+    //删除-逻辑
+    @PutMapping("/delflag/{id}")
+    public AjaxResult delflag(@PathVariable("id") Integer id)
+    {
+        return AjaxResult.success(reimbursementService.delflag(id));
+    }
 }

ruoyi-psa/src/main/java/com/ruoyi/domain/vo/FyglDailyReimbursementVo.java

@@ -26,6 +26,9 @@ public class FyglDailyReimbursementVo extends BaseEntity {
     //附件
     private String accessory;
 
+    //删除标志 0未删除1已删除
+    private Integer delFlag;
+
     private Integer id;
     private Integer rid;
     private String serialNumber;

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

@@ -25,4 +25,6 @@ public interface FyglProjectCostReimbursementMapper {
 
     public int updateReimbursement(FyglDailyReimbursementVo fyglDailyReimbursementVo);
 
+    int deleteReimbursement(Integer id);
+
 }

ruoyi-psa/src/main/java/com/ruoyi/service/IFyglProjectCostReimbursementService.java

@@ -18,4 +18,5 @@ public interface IFyglProjectCostReimbursementService {
 
     public int updateReimbursement(FyglDailyReimbursementVo fyglDailyReimbursementVo);
 
+    int delflag(Integer id);
 }

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

@@ -67,4 +67,9 @@ public class IFyglProjectCostReimbursementServiceImpl implements IFyglProjectCos
         fyglDailyReimbursementVo.setUpdateTime(DateUtils.getNowDate());
         return reimbursementMapper.updateReimbursement(fyglDailyReimbursementVo);
     }
+
+    @Override
+    public int delflag(Integer id) {
+        return 0;
+    }
 }

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

@@ -60,6 +60,9 @@
         where id = #{id}
 
     </update>
+    <update id="deleteReimbursement">
+        update fygl_project_cost_reimbursement set del_flag = 1 where id =#{id}
+    </update>
 
 
     <select id="getList" resultMap="listDTO" parameterType="com.ruoyi.domain.dto.FyglProjectCostReimbursementDTO">
@@ -80,6 +83,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
             <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>
@@ -108,7 +112,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}
+        where r1.id = #{id} and p.del_flag = 0
     </select>
 
     <resultMap type="com.ruoyi.domain.dto.FyglProjectCostDTO" id="list1DTO">
@@ -155,7 +159,7 @@
         LEFT JOIN sys_user u ON u.user_id = p.department_leader_id
 
         <where>
-            and fp.approve_status = 3
+            and fp.approve_status = 3  and p.del_flag = 0
             <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>