fix:完成升级时需要把现在首款合同从系统中删除

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

@@ -162,4 +162,6 @@ public class BizCollection extends BaseEntity
     @ApiModelProperty(value = "实际付款时间")
     private Long mainAccountSetsId;
 
+    private Long tenantId;
+
 }

src/main/java/cn/ezhizao/project/business/upgrade/crmUpgradeController.java

@@ -9,6 +9,10 @@ import cn.ezhizao.framework.lock.DistributionLock;
 import cn.ezhizao.framework.lock.LockKey;
 import cn.ezhizao.framework.web.controller.BaseController;
 import cn.ezhizao.framework.web.domain.AjaxResult;
+import cn.ezhizao.project.business.collection.domain.BizCollection;
+import cn.ezhizao.project.business.collection.domain.BizCollectionDetail;
+import cn.ezhizao.project.business.collection.service.IBizCollectionDetailService;
+import cn.ezhizao.project.business.collection.service.IBizCollectionService;
 import cn.ezhizao.project.business.order.domain.OrderExcelImportLoopModel;
 import cn.ezhizao.project.business.order.service.IBizArchiveInputService;
 import cn.ezhizao.project.business.upgrade.domain.*;
@@ -48,6 +52,10 @@ public class crmUpgradeController extends BaseController {
     private IBizWorkOrderService bizWorkOrderService;
     @Resource
     private IFeignClient tenantService;
+    @Resource
+    private IBizCollectionService bizCollectionService;
+    @Resource
+    private IBizCollectionDetailService bizCollectionDetailService;
     @Log(title = "基础版升级合同导入", businessType = BusinessType.IMPORT)
     @PreAuthorize("@ss.hasPermi('business:upgrade:order:import')")
     @PostMapping("/order/importLoop")
@@ -118,6 +126,13 @@ public class crmUpgradeController extends BaseController {
 
             List<BizWorkOrder> stopOrderList = bizWorkOrderUpdateService.getStopTaskOrder();
             stopOrderList.forEach(order->inputService.stopLoopTasks(order));
+            //完成升级时需要真的删除收款合同表和详情表
+            BizCollection delCollection = new BizCollection();
+            delCollection.setTenantId(tenantId);
+            bizCollectionService.physicalDelete(delCollection);
+            BizCollectionDetail delDetail = new BizCollectionDetail();
+            delDetail.setTenantId(tenantId);
+            bizCollectionDetailService.physicallyDelete(delDetail);
             //工单列表页需要添加执行人的sql
         }catch (Exception e){
             logger.error(e.getMessage());

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

@@ -103,5 +103,8 @@
         <if test="collectionId != null">
             AND collection_id = #{collectionId}
         </if>
+        <if test="tenantId != null">
+            AND tenant_id = #{tenantId}
+        </if>
     </delete>
 </mapper>

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

@@ -41,11 +41,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <delete id="physicalDelete">
         DELETE FROM biz_collection
-        <trim prefix=" WHERE" suffix="" suffixOverrides="AND">
-            <if test="id != null">
-                id = #{id} AND
+        <where>
+            <if test="tenantId != null">
+                AND  tenant_id = #{tenantId}
             </if>
-       <!-- 删除条件为其他外键可以在这里加 -->
-        </trim>
+        </where>
+
     </delete>
 </mapper>