问题处理

hx-account/src/main/java/com/fjhx/account/mapper/account/AccountManagementMapper.java

@@ -1,18 +1,12 @@
 package com.fjhx.account.mapper.account;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.fjhx.account.entity.account.dto.AccountManagementDto;
-import com.fjhx.account.entity.account.po.AccountManagement;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.account.entity.account.po.AccountManagement;
 import com.fjhx.account.entity.account.vo.AccountManagementVo;
-import com.ruoyi.common.annotation.TenantIgnore;
-import com.ruoyi.common.core.domain.BaseSelectDto;
 import com.ruoyi.common.utils.wrapper.IWrapper;
 import org.apache.ibatis.annotations.Param;
 
-import java.util.List;
-
 
 /**
  * <p>
@@ -27,7 +21,7 @@ public interface AccountManagementMapper extends BaseMapper<AccountManagement> {
     /**
      * 账户-管理表分页
      */
-    Page<AccountManagementVo> getPage(@Param("page") Page<Object> page, @Param("ew")LambdaQueryWrapper<AccountManagement> wrapper);
+    Page<AccountManagementVo> getPage(@Param("page") Page<Object> page, @Param("ew") IWrapper<AccountManagement> wrapper);
 
     /**
      * 查询云帆资金账户表的信息

hx-account/src/main/java/com/fjhx/account/service/account/impl/AccountManagementServiceImpl.java

@@ -3,7 +3,6 @@ package com.fjhx.account.service.account.impl;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -27,6 +26,7 @@ import com.fjhx.tenant.service.dict.DictTenantDataService;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.wrapper.IWrapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -66,7 +66,7 @@ public class AccountManagementServiceImpl extends ServiceImpl<AccountManagementM
      */
     @Override
     public Page<AccountManagementVo> getPage(AccountManagementSelectDto dto) {
-        LambdaQueryWrapper<AccountManagement> wrapper = Wrappers.<AccountManagement>lambdaQuery();
+        IWrapper<AccountManagement> wrapper = getWrapper();
         //根据关键字查询（查询的字段有账户别名、账户名称、账号）
         if (StringUtils.isNotEmpty(dto.getKeyword())) {
             wrapper.and(wrapper1 -> {

hx-sale/src/main/java/com/fjhx/sale/service/ext/impl/ExtQuotationServiceImpl.java

@@ -218,13 +218,6 @@ public class ExtQuotationServiceImpl extends ServiceImpl<ExtQuotationMapper, Ext
         saleQuotationDto.setId(id);
         saleQuotationDto.setGroupId(id);//赋值数据分组id
         saleQuotationDto.setStatus(30);
-        saveOrEdit(saleQuotationDto);
-
-        //将对内报价单标记为转对外
-        saleQuotationService.update(q -> q
-                .eq(SaleQuotation::getId, saleQuotationId)
-                .set(SaleQuotation::getExtQuotationId, saleQuotationDto.getId())
-        );
 
         //判断是否需要生成产品
         saleQuotationDto.setCreateProductStatus(2);
@@ -234,6 +227,14 @@ public class ExtQuotationServiceImpl extends ServiceImpl<ExtQuotationMapper, Ext
         if (waitList.size() > 0) {
             saleQuotationDto.setCreateProductStatus(0);
         }
+
+        saveOrEdit(saleQuotationDto);
+
+        //将对内报价单标记为转对外
+        saleQuotationService.update(q -> q
+                .eq(SaleQuotation::getId, saleQuotationId)
+                .set(SaleQuotation::getExtQuotationId, saleQuotationDto.getId())
+        );
     }
 
     @Override