fix:回收站修改查询sql，还原和删除方法修改

src/main/java/cn/ezhizao/project/business/recycleBin/controller/BizRecycleBinController.java

@@ -108,7 +108,6 @@ public class BizRecycleBinController extends BaseController {
     public TableDataInfo list(BizRecycleBin bizRecycleBin) throws NoSuchFieldException, IllegalAccessException {
         setTenantId(bizRecycleBin);
         startPage();
-        startOrderBy();
         List<BizRecycleBin> list = bizRecycleBinService.getList(bizRecycleBin);
         return getDataTable(list);
     }
@@ -350,9 +349,21 @@ public class BizRecycleBinController extends BaseController {
     @PreAuthorize("@ss.hasPermi('business:bin:remove')")
     @Log(title = "回收站", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
+    @Transactional(rollbackFor = Exception.class)
     public AjaxResult remove(@PathVariable List<Long> ids) {
-        bizRecycleBinService.remove(ids);
-        return toAjax(bizRecycleBinService.removeBatchByIds(ids));
+//        List<BizArchiveInputDetail> bizArchiveInputDetailList = bizArchiveInputDetailService.
+//                query().in("contract_id",ids)
+//                .list();
+//        bizArchiveInputDetailList.forEach(bizArchiveInputDetailService::physicalDelete);
+        BizArchiveInput bizArchiveInput;
+        for (Long id : ids) {
+            bizArchiveInput = new BizArchiveInput();
+            bizArchiveInput.setId(id);
+            if(null != bizArchiveInput.getId()){
+                bizArchiveInputService.physicalDelete(bizArchiveInput);
+            }
+        }
+        return toAjax(true);
     }
 
     /**
@@ -368,8 +379,8 @@ public class BizRecycleBinController extends BaseController {
      * 还原回收站
      */
     @PreAuthorize("@ss.hasPermi('business:bin:restore')")
-    @PostMapping("/restoreArchive/{ids}")
-    public AjaxResult restoreArchive(@PathVariable List<Long> ids) {
+    @PostMapping("/restoreArchive")
+    public AjaxResult restoreArchive(@RequestBody  List<Long> ids) {
         return toAjax(bizRecycleBinService.restore(ids, ordertabs, false));
     }
 

src/main/java/cn/ezhizao/project/business/recycleBin/domain/BizRecycleBin.java

@@ -13,7 +13,6 @@ import cn.ezhizao.framework.aspectj.lang.annotation.Excel;
  * @date 2023-11-02
  */
 @Data
-@TableName(value = "biz_recycle_bin")
 public class BizRecycleBin extends BaseEntity
 {
     private static final long serialVersionUID = 1L;

src/main/java/cn/ezhizao/project/business/recycleBin/service/impl/BizRecycleBinServiceImpl.java

@@ -79,9 +79,10 @@ public class BizRecycleBinServiceImpl extends ServiceImpl<BizRecycleBinMapper, B
                 bizRecycleBinMapper.restoreData(bin.getSourceId(), tabs);
             }else {
                 //还原订单表数据
-                bizRecycleBinMapper.restoreArchive(bin.getSourceId());
+                bizRecycleBinMapper.restoreArchive(id);
                 //还原子表数据
-                bizRecycleBinMapper.restoreArchiveData(bin.getSourceId(), tabs);
+                String[] str = {"biz_archive_input_detail"};
+                bizRecycleBinMapper.restoreArchiveData(id,str);
             }
 
 

src/main/resources/mybatis/business/BizRecycleBinMapper.xml

@@ -10,21 +10,12 @@
 
 
     <select id="getList" parameterType="BizRecycleBin" resultMap="BizRecycleBinResult">
-        SELECT * FROM biz_recycle_bin
+        SELECT input.id as id,input.id as sourceId,input.contract_no as archiveCode,com.name as sourceValue FROM biz_archive_input input
+        left join biz_company com on com.id =input.company_id
         <trim prefix=" WHERE" suffix="" suffixOverrides="AND">
-            deleted = 0
-            AND from_id = 0
-            AND is_return = 0
-            AND is_clean=0
-            <if test="sourceTableName != null  and sourceTableName != ''">AND source_table_name=#{sourceTableName}
-
-            </if>
-            <if test="sourceValue != null  and sourceValue != ''">AND source_value like concat('%', #{sourceValue},
-                '%')
-            </if>
-            <if test="isClean != null ">AND is_clean = #{isClean}</if>
-            <if test="isReturn != null ">AND is_return = #{isReturn}</if>
+            input.deleted = 1
         </trim>
+        order by input.create_time desc
     </select>
 
     <delete id="physicalDelete">