提交

src/main/java/cn/ezhizao/project/business/collection/domain/BizCollectionDetail.java

@@ -31,7 +31,7 @@ public class BizCollectionDetail extends BaseEntity implements Serializable {
     private Long contractDetailId;
 
     @ApiModelProperty(value = "客户外键")
-    private Long customerId;
+    private Long companyId;
 
     @ApiModelProperty(value = "产品外键")
     private Long taskTypeId;

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

@@ -25,6 +25,7 @@ import cn.ezhizao.project.business.workOrder.service.IBizWorkOrderService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import lombok.Getter;
 import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PutMapping;
@@ -75,13 +76,14 @@ public class BizRecycleBinController extends BaseController {
 
     //客户关联的数据表
     @Getter
-    private String[] tabs = {"biz_archive_borrow", "biz_archive_input", "biz_archive_dictionary", "biz_archive_input_detail"
-            , "biz_archive_input_detail_process"
+    private String[] tabs = {"biz_archive_borrow", "biz_archive_input", "biz_archive_dictionary", "biz_archive_input_detail","biz_deduction"
+            ,"biz_payment","biz_payment_detail"
+            , "biz_archive_input_detail_process","biz_work_order", "biz_work_order_detail","biz_work_order_record","biz_collection","biz_collection_detail"
             , "biz_archive_output", "biz_archive_receive_ticket", "biz_company_contactor", "biz_company_follow_detail", "biz_company_original_name",
             "biz_entrust_detail", "biz_entrust_permission", "biz_entrust", "biz_financial_account_adjustment", "biz_financial_individual_income_tax",
             "biz_financial_individual_income_tax_detail", "biz_financial_keep_account", "biz_financial_keep_account_detail", "biz_financial_receive_ticket",
-            "biz_financial_receive_ticket_detail", "biz_financial_receive_ticket_feedback", "biz_financial_receive_ticket_feedback",
-            "biz_financial_report_tax_detail", "biz_financial_salary_detail_employee", "biz_financial_urgent", "biz_housing_fund_confirm",
+            "biz_financial_receive_ticket_detail", "biz_financial_receive_ticket_feedback", "biz_financial_receive_ticket_feedback","biz_financial_report_tax",
+            "biz_financial_report_tax_detail", "biz_financial_salary_detail_employee", "biz_financial_urgent", "biz_housing_fund_confirm","biz_financial_salary",
             "biz_housing_fund_confirm_detail", "biz_housing_fund_confirm_detail_employee", "biz_housing_fund_declare", "biz_housing_fund_declare_detail",
             "biz_social_security_confirm", "biz_social_security_confirm_detail", "biz_social_security_confirm_detail_employee",
             "biz_social_security_declare", "biz_social_security_declare_detail"};
@@ -139,6 +141,7 @@ public class BizRecycleBinController extends BaseController {
     @PreAuthorize("@ss.hasPermi('business:company:remove')")
     @Log(title = "回收站", businessType = BusinessType.INSERT)
     @PostMapping("/{ids}")
+    @Transactional(rollbackFor = Exception.class)
     public AjaxResult add(@PathVariable List<Long> ids) throws NoSuchFieldException, IllegalAccessException {
         BizCompany com = new BizCompany();
         List<BizRecycleBin> recycleBins = new ArrayList<>();

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

@@ -22,7 +22,7 @@
         t1.collection_id,
         t1.collection_contract_id,
         t1.task_type_id,
-        t1.customer_id,
+        t1.company_id,
         t1.contract_id,
         t1.arrive_amount,
         t4.amount as amount,
@@ -36,7 +36,7 @@
         left join biz_collection c on c.id = t1.collection_id
         left join biz_task_type t2 on t2.id = t1.task_type_id
         LEFT JOIN
-        biz_company t3 on t1.customer_id = t3.id
+        biz_company t3 on t1.company_id = t3.id
         left join biz_archive_input_detail t4 on t4.id = t1.contract_detail_id
         <trim prefix=" WHERE" suffix="" suffixOverrides="AND">
             t1.deleted = 0 AND
@@ -65,8 +65,8 @@
             <if test="contractId != null  ">
                 t1.contract_id = #{contractId} AND
             </if>
-            <if test="customerId != null  ">
-                t1.customer_id = #{customerId} AND
+            <if test="companyId != null  ">
+                t1.company_id = #{companyId} AND
             </if>
             <if test="taskTypeId != null  ">
                 t1.task_type_id = #{taskTypeId} AND