Explorar el Código

调整删除记录时同时删除附件

zjc hace 1 año
padre
commit
1611070d24

+ 2 - 0
ruoyi-admin/src/main/java/com/ruoyi/web/controller/invest/TProjectContractController.java

@@ -175,6 +175,8 @@ public class TProjectContractController extends BaseController
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable String[] ids)
     {
+        //删除附件
+        tUnifyFileService.updateTUnifyFileBusinessIds(ids);
         return toAjax(tProjectContractService.deleteTProjectContractByIds(ids));
     }
 }

+ 2 - 0
ruoyi-admin/src/main/java/com/ruoyi/web/controller/invest/TProjectInformationController.java

@@ -174,6 +174,8 @@ public class TProjectInformationController extends BaseController
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable String[] ids)
     {
+        //删除附件
+        tUnifyFileService.updateTUnifyFileBusinessIds(ids);
         return toAjax(tProjectInformationService.updateTProjectInformationByIds(ids));
     }
 

+ 2 - 2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/invest/TProjectInvestigateController.java

@@ -177,8 +177,8 @@ public class TProjectInvestigateController extends BaseController
      */
     @ApiOperation("修改尽调完成")
     @Log(title = "修改尽调完成", businessType = BusinessType.UPDATE)
-    @DeleteMapping("/editStatus")
-    public AjaxResult editStatus(String id)
+    @PutMapping("/editStatus")
+    public AjaxResult editStatus(@RequestBody String id)
     {
         return toAjax(tProjectInvestigateService.editStatus(id));
     }

+ 2 - 0
ruoyi-admin/src/main/java/com/ruoyi/web/controller/invest/TProjectInvestigatePersonController.java

@@ -157,6 +157,8 @@ public class TProjectInvestigatePersonController extends BaseController
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable String[] ids)
     {
+        //删除附件
+        tUnifyFileService.updateTUnifyFileBusinessIds(ids);
         return toAjax(tProjectInvestigatePersonService.deleteTProjectInvestigatePersonByIds(ids));
     }
 

+ 2 - 0
ruoyi-admin/src/main/java/com/ruoyi/web/controller/invest/TProjectMeetingController.java

@@ -184,6 +184,8 @@ public class TProjectMeetingController extends BaseController
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable String[] ids)
     {
+        //删除附件
+        tUnifyFileService.updateTUnifyFileBusinessIds(ids);
         return toAjax(tProjectMeetingService.updateTProjectMeetingByIds(ids));
     }
 

+ 2 - 0
ruoyi-admin/src/main/java/com/ruoyi/web/controller/invest/TProjectRecordController.java

@@ -173,6 +173,8 @@ public class TProjectRecordController extends BaseController
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable String[] ids)
     {
+        //删除附件
+        tUnifyFileService.updateTUnifyFileBusinessIds(ids);
         return toAjax(tProjectRecordService.updateTProjectRecordByIds(ids));
     }
 

+ 2 - 0
ruoyi-admin/src/main/java/com/ruoyi/web/controller/invest/TStudyInformationController.java

@@ -64,6 +64,7 @@ public class TStudyInformationController extends BaseController
     public TableDataInfo list(TStudyInformation tStudyInformation)
     {
         startPage();
+        tStudyInformation.setCreateBy(getNickName());//默认登陆人权限
         List<TStudyInformation> list = tStudyInformationService.selectTStudyInformationList(tStudyInformation);
         return getDataTable(list);
     }
@@ -77,6 +78,7 @@ public class TStudyInformationController extends BaseController
     @PostMapping("/export")
     public void export(HttpServletResponse response, TStudyInformation tStudyInformation)
     {
+        tStudyInformation.setCreateBy(getNickName());//默认登陆人权限
         List<TStudyInformation> list = tStudyInformationService.selectTStudyInformationList(tStudyInformation)
                 .stream().map(n -> {
                     n.setContractType(dictDataService.selectDictLabel("file_type",n.getContractType()));

+ 8 - 0
ruoyi-system/src/main/java/com/ruoyi/tool/mapper/TUnifyFileMapper.java

@@ -81,4 +81,12 @@ public interface TUnifyFileMapper
      * @return
      */
     List<TUnifyFile> listFileId(@Param("fileId")String fileId);
+
+    /**
+     * 批量删除附件
+     *
+     * @param fileBusinessIds
+     * @return
+     */
+    int updateTUnifyFileBusinessIds(@Param("fileBusinessIds")String[] fileBusinessIds);
 }

+ 8 - 0
ruoyi-system/src/main/java/com/ruoyi/tool/service/ITUnifyFileService.java

@@ -70,6 +70,14 @@ public interface ITUnifyFileService
      */
     public int updateTUnifyFileByIds(String[] ids);
 
+    /**
+     * 批量删除附件
+     *
+     * @param fileBusinessIds
+     * @return
+     */
+    public int updateTUnifyFileBusinessIds(String[] fileBusinessIds);
+
     /**
      * 根据附件业务ID()获取附件详情信息列表
      *

+ 11 - 0
ruoyi-system/src/main/java/com/ruoyi/tool/service/impl/TUnifyFileServiceImpl.java

@@ -114,6 +114,17 @@ public class TUnifyFileServiceImpl implements ITUnifyFileService
         return tUnifyFileMapper.updateTUnifyFileByIds(ids);
     }
 
+    /**
+     * 批量删除附件
+     *
+     * @param fileBusinessIds
+     * @return
+     */
+    @Override
+    public int updateTUnifyFileBusinessIds(String[] fileBusinessIds) {
+        return tUnifyFileMapper.updateTUnifyFileBusinessIds(fileBusinessIds);
+    }
+
     /**
      * 根据附件业务ID()获取附件详情信息列表
      * @param fileBusinessId

+ 1 - 1
ruoyi-system/src/main/resources/mapper/invest/TProjectInvestigateMapper.xml

@@ -130,7 +130,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <update id="editStatus" parameterType="String">
         update t_project_investigate
-        set editStatus = 1
+        set status = 1
         where id = #{id}
     </update>
 

+ 9 - 0
ruoyi-system/src/main/resources/mapper/tool/TUnifyFileMapper.xml

@@ -116,6 +116,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </foreach>
     </update>
 
+    <update id="updateTUnifyFileBusinessIds" parameterType="String">
+        update t_unify_file
+        set del_flag = 1
+        where file_business_id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </update>
+
     <select id="selectTUnifyFileByBusinessIdList" parameterType="String" resultMap="TUnifyFileResult">
         <include refid="selectTUnifyFileVo"/>
         where file_business_id = #{fileBusinessId} and del_flag = 0