diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmFileInfoMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmFileInfoMapper.xml index 185e8cf6..9aa25de3 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmFileInfoMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmFileInfoMapper.xml @@ -22,6 +22,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - where id = #{id} + where id = #{id} and del_flag != 2 @@ -91,33 +92,37 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where id = #{id} - - delete from bm_file_info where id = #{id} - + + update bm_file_info set del_flag = 2 + where id = #{id} + - - delete from bm_file_info where model_id = #{modelId} - + + update bm_file_info set del_flag = 2 + where model_id = #{modelId} + - - delete from bm_file_info where id in + + update bm_file_info set del_flag = 2 + where id in #{id} - + - - delete from bm_file_info + + update bm_file_info set del_flag = 2 and task_type = #{taskType} and task_id = #{taskId} and model_id = #{modelId} and file_type = #{fileType} - + - - delete from bm_file_info where task_id = #{taskId} + + update bm_file_info set del_flag = 2 + where task_id = #{taskId} and task_type = 0 - + \ No newline at end of file diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/part/PartArrivedMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/part/PartArrivedMapper.xml index 9e8110ef..21f48f67 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/part/PartArrivedMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/part/PartArrivedMapper.xml @@ -217,19 +217,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select distinct task_type as taskType,task_id as taskId,model_id as modelId, file_type as fileType from bm_file_info - where task_type = #{taskType} and task_id = #{taskId} and model_id = #{modelId} + where del_flag != 2 and task_type = #{taskType} and task_id = #{taskId} and model_id = #{modelId} - - delete from bm_file_info where task_id = #{taskId} and task_type = 13 - + + update bm_file_info set del_flag = 2 + where task_id = #{taskId} and task_type = 13 +