bug单修改

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/controller/ProductController.java

@@ -11,7 +11,6 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
-
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -21,7 +20,6 @@ import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-import java.util.Optional;
 import java.util.stream.Collectors;
 
 /**
@@ -295,41 +293,42 @@ public class ProductController {
     @RequestMapping("/businessListWithProduct")
     public HttpRespMsg businessListWithProduct(Integer id){
         HttpRespMsg msg=new HttpRespMsg();
-        Integer companyId = userMapper.selectById(request.getHeader("token")).getCompanyId();
-        List<BusinessItemProduct> businessItemProducts = businessItemProductService.list(new LambdaQueryWrapper<BusinessItemProduct>().eq(BusinessItemProduct::getProductId, id));
-        List<Integer> businessIds = businessItemProducts.stream().map(BusinessItemProduct::getBusinessId).distinct().collect(Collectors.toList());
-        businessIds.add(-1);
-        List<BusinessOpportunity> opportunityList = businessOpportunityService.list(new LambdaQueryWrapper<BusinessOpportunity>().in(BusinessOpportunity::getId, businessIds)
-                .eq(BusinessOpportunity::getIsDelete,0)
-        );
-        List<Custom> customList = customService.list(new LambdaQueryWrapper<Custom>().eq(Custom::getCompanyId, companyId));
-        List<User> userList = userMapper.selectList(new LambdaQueryWrapper<User>().eq(User::getCompanyId, companyId));
-//        List<SysDict> businessStageList = sysDictService.list(new LambdaQueryWrapper<SysDict>().eq(SysDict::getCode, "BusinessStage"));
-        List<Stage> businessStageList = stageService.list(new LambdaQueryWrapper<Stage>().eq(Stage::getCompanyId, companyId));
-        List<Contacts> contactsList = contactsService.list(new LambdaQueryWrapper<Contacts>().eq(Contacts::getCompanyId, companyId));
-        opportunityList.forEach(c->{
-            Optional<Custom> custom = customList.stream().filter(ct -> ct.getId().equals(c.getCustomerId())).findFirst();
-            if(custom.isPresent()){
-                c.setCustomerName(custom.get().getCustomName());
-            }
-            Optional<User> user = userList.stream().filter(u -> u.getId().equals(c.getCreatorId())).findFirst();
-            if(user.isPresent()){
-                c.setCreatorName(user.get().getName());
-            }
-            Optional<Contacts> contacts = contactsList.stream().filter(u -> u.getId().equals(c.getContactsId())).findFirst();
-            if(contacts.isPresent()){
-                c.setContactsName(contacts.get().getName());
-            }
-            Optional<User> incharger = userList.stream().filter(u -> u.getId().equals(c.getInchargerId())).findFirst();
-            if(incharger.isPresent()){
-                c.setInchargerName(incharger.get().getName());
-            }
-            Optional<Stage> businessStage = businessStageList.stream().filter(b -> b.getId().equals(c.getStageId())).findFirst();
-            if(businessStage.isPresent()){
-                c.setStageValue(businessStage.get().getName());
-            }
-        });
-        msg.setData(opportunityList);
+        msg = productService.businessListWithProduct(id);
+//        Integer companyId = userMapper.selectById(request.getHeader("token")).getCompanyId();
+//        List<BusinessItemProduct> businessItemProducts = businessItemProductService.list(new LambdaQueryWrapper<BusinessItemProduct>().eq(BusinessItemProduct::getProductId, id));
+//        List<Integer> businessIds = businessItemProducts.stream().map(BusinessItemProduct::getBusinessId).distinct().collect(Collectors.toList());
+//        businessIds.add(-1);
+//        List<BusinessOpportunity> opportunityList = businessOpportunityService.list(new LambdaQueryWrapper<BusinessOpportunity>().in(BusinessOpportunity::getId, businessIds)
+//                .eq(BusinessOpportunity::getIsDelete,0)
+//        );
+//        List<Custom> customList = customService.list(new LambdaQueryWrapper<Custom>().eq(Custom::getCompanyId, companyId));
+//        List<User> userList = userMapper.selectList(new LambdaQueryWrapper<User>().eq(User::getCompanyId, companyId));
+////        List<SysDict> businessStageList = sysDictService.list(new LambdaQueryWrapper<SysDict>().eq(SysDict::getCode, "BusinessStage"));
+//        List<Stage> businessStageList = stageService.list(new LambdaQueryWrapper<Stage>().eq(Stage::getCompanyId, companyId));
+//        List<Contacts> contactsList = contactsService.list(new LambdaQueryWrapper<Contacts>().eq(Contacts::getCompanyId, companyId));
+//        opportunityList.forEach(c->{
+//            Optional<Custom> custom = customList.stream().filter(ct -> ct.getId().equals(c.getCustomerId())).findFirst();
+//            if(custom.isPresent()){
+//                c.setCustomerName(custom.get().getCustomName());
+//            }
+//            Optional<User> user = userList.stream().filter(u -> u.getId().equals(c.getCreatorId())).findFirst();
+//            if(user.isPresent()){
+//                c.setCreatorName(user.get().getName());
+//            }
+//            Optional<Contacts> contacts = contactsList.stream().filter(u -> u.getId().equals(c.getContactsId())).findFirst();
+//            if(contacts.isPresent()){
+//                c.setContactsName(contacts.get().getName());
+//            }
+//            Optional<User> incharger = userList.stream().filter(u -> u.getId().equals(c.getInchargerId())).findFirst();
+//            if(incharger.isPresent()){
+//                c.setInchargerName(incharger.get().getName());
+//            }
+//            Optional<Stage> businessStage = businessStageList.stream().filter(b -> b.getId().equals(c.getStageId())).findFirst();
+//            if(businessStage.isPresent()){
+//                c.setStageValue(businessStage.get().getName());
+//            }
+//        });
+//        msg.setData(opportunityList);
         return msg;
     }
 
@@ -343,48 +342,49 @@ public class ProductController {
     @RequestMapping("/orderWithProduct")
     public HttpRespMsg orderWithProduct(Integer id){
         HttpRespMsg msg=new HttpRespMsg();
-        Integer companyId = userMapper.selectById(request.getHeader("token")).getCompanyId();
-        List<OrderProductDetail> productDetailList = orderProductDetailService.list(new LambdaQueryWrapper<OrderProductDetail>().eq(OrderProductDetail::getProductId, id));
-        List<Integer> orderIds = productDetailList.stream().map(OrderProductDetail::getOrderId).distinct().collect(Collectors.toList());
-        List<Custom> customList = customService.list(new LambdaQueryWrapper<Custom>().eq(Custom::getCompanyId, companyId));
-        List<User> userList = userMapper.selectList(new LambdaQueryWrapper<User>().eq(User::getCompanyId, companyId));
-        orderIds.add(-1);
-        List<SalesOrder> orderList = salesOrderService.list(new LambdaQueryWrapper<SalesOrder>().in(SalesOrder::getId, orderIds).eq(SalesOrder::getIsDelete,0));
-        List<SysDict> orderTypeList = sysDictService.list(new LambdaQueryWrapper<SysDict>().eq(SysDict::getCode, "OrderType"));
-        List<Integer> businessOpportunityIds = orderList.stream().map(SalesOrder::getBusinessOpportunityId).distinct().collect(Collectors.toList());
-        businessOpportunityIds.add(-1);
-        List<BusinessOpportunity> businessOpportunityList = businessOpportunityService.list(new LambdaQueryWrapper<BusinessOpportunity>().in(BusinessOpportunity::getId, businessOpportunityIds));
-        orderList.forEach(o->{
-            Optional<Custom> custom = customList.stream().filter(ct -> ct.getId().equals(o.getCustomId())).findFirst();
-            if(custom.isPresent()){
-                o.setCustomName(custom.get().getCustomName());
-            }
-            Optional<User> user = userList.stream().filter(u -> u.getId().equals(o.getCreatorId())).findFirst();
-            if(user.isPresent()){
-                o.setCreatorName(user.get().getName());
-            }
-            Optional<User> customSigner = userList.stream().filter(u -> u.getId().equals(o.getCustomSigner())).findFirst();
-            if(customSigner.isPresent()){
-                o.setCustomSignerName(customSigner.get().getName());
-            }
-            Optional<User> companySigner = userList.stream().filter(u -> u.getId().equals(o.getCompanySigner())).findFirst();
-            if(companySigner.isPresent()){
-                o.setCompanySigner(companySigner.get().getName());
-            }
-            Optional<User> incharger = userList.stream().filter(u -> u.getId().equals(o.getInchargerId())).findFirst();
-            if(incharger.isPresent()){
-                o.setInchargerName(incharger.get().getName());
-            }
-            Optional<BusinessOpportunity> businessOpportunity = businessOpportunityList.stream().filter(b -> o.getBusinessOpportunityId() != null && b.getId().equals(o.getBusinessOpportunityId())).findFirst();
-            if(businessOpportunity.isPresent()){
-                o.setBusinessOpportunityName(businessOpportunity.get().getName());
-            }
-            Optional<SysDict> orderType = orderTypeList.stream().filter(ot -> ot.getId().equals(o.getType())).findFirst();
-            if(orderType.isPresent()){
-                o.setTypeName(orderType.get().getName());
-            }
-        });
-        msg.setData(orderList);
+        msg = productService.orderWithProduct(id);
+//        Integer companyId = userMapper.selectById(request.getHeader("token")).getCompanyId();
+//        List<OrderProductDetail> productDetailList = orderProductDetailService.list(new LambdaQueryWrapper<OrderProductDetail>().eq(OrderProductDetail::getProductId, id));
+//        List<Integer> orderIds = productDetailList.stream().map(OrderProductDetail::getOrderId).distinct().collect(Collectors.toList());
+//        List<Custom> customList = customService.list(new LambdaQueryWrapper<Custom>().eq(Custom::getCompanyId, companyId));
+//        List<User> userList = userMapper.selectList(new LambdaQueryWrapper<User>().eq(User::getCompanyId, companyId));
+//        orderIds.add(-1);
+//        List<SalesOrder> orderList = salesOrderService.list(new LambdaQueryWrapper<SalesOrder>().in(SalesOrder::getId, orderIds).eq(SalesOrder::getIsDelete,0));
+//        List<SysDict> orderTypeList = sysDictService.list(new LambdaQueryWrapper<SysDict>().eq(SysDict::getCode, "OrderType"));
+//        List<Integer> businessOpportunityIds = orderList.stream().map(SalesOrder::getBusinessOpportunityId).distinct().collect(Collectors.toList());
+//        businessOpportunityIds.add(-1);
+//        List<BusinessOpportunity> businessOpportunityList = businessOpportunityService.list(new LambdaQueryWrapper<BusinessOpportunity>().in(BusinessOpportunity::getId, businessOpportunityIds));
+//        orderList.forEach(o->{
+//            Optional<Custom> custom = customList.stream().filter(ct -> ct.getId().equals(o.getCustomId())).findFirst();
+//            if(custom.isPresent()){
+//                o.setCustomName(custom.get().getCustomName());
+//            }
+//            Optional<User> user = userList.stream().filter(u -> u.getId().equals(o.getCreatorId())).findFirst();
+//            if(user.isPresent()){
+//                o.setCreatorName(user.get().getName());
+//            }
+//            Optional<User> customSigner = userList.stream().filter(u -> u.getId().equals(o.getCustomSigner())).findFirst();
+//            if(customSigner.isPresent()){
+//                o.setCustomSignerName(customSigner.get().getName());
+//            }
+//            Optional<User> companySigner = userList.stream().filter(u -> u.getId().equals(o.getCompanySigner())).findFirst();
+//            if(companySigner.isPresent()){
+//                o.setCompanySigner(companySigner.get().getName());
+//            }
+//            Optional<User> incharger = userList.stream().filter(u -> u.getId().equals(o.getInchargerId())).findFirst();
+//            if(incharger.isPresent()){
+//                o.setInchargerName(incharger.get().getName());
+//            }
+//            Optional<BusinessOpportunity> businessOpportunity = businessOpportunityList.stream().filter(b -> o.getBusinessOpportunityId() != null && b.getId().equals(o.getBusinessOpportunityId())).findFirst();
+//            if(businessOpportunity.isPresent()){
+//                o.setBusinessOpportunityName(businessOpportunity.get().getName());
+//            }
+//            Optional<SysDict> orderType = orderTypeList.stream().filter(ot -> ot.getId().equals(o.getType())).findFirst();
+//            if(orderType.isPresent()){
+//                o.setTypeName(orderType.get().getName());
+//            }
+//        });
+//        msg.setData(orderList);
         return msg;
     }
 

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/mapper/OrderProductDetailMapper.java

@@ -2,6 +2,9 @@ package com.management.platform.mapper;
 
 import com.management.platform.entity.OrderProductDetail;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +16,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface OrderProductDetailMapper extends BaseMapper<OrderProductDetail> {
 
+    List<OrderProductDetail> getUnDelByProductId(@Param("productId") Integer productId);
+
+    List<OrderProductDetail> getUnDelByOrderId(@Param("orderId")Integer orderId);
 }

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/service/ProductService.java

@@ -34,4 +34,8 @@ public interface ProductService extends IService<Product> {
     HttpRespMsg pinProduct(Product product, HttpServletRequest request);
 
     HttpRespMsg undoPin(Product product, HttpServletRequest request);
+
+    HttpRespMsg orderWithProduct(Integer id);
+
+    HttpRespMsg businessListWithProduct(Integer id);
 }

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/service/impl/BusinessOpportunityServiceImpl.java

@@ -107,7 +107,9 @@ public class BusinessOpportunityServiceImpl extends ServiceImpl<BusinessOpportun
         BusinessOpportunity businessOpportunity = bOMapper.selectByIdToInfo(bo.getId());
         businessOpportunity.setActionLogList(actionLogMapper.selectByInfoListBusiness(bo.getId()));
         businessOpportunity.setUploadFilePList(uploadFileMapper.selectByInfoList("business", bo.getId()));
-        List<Task> tasks = taskMapper.selectList(new QueryWrapper<Task>().eq("business_opportunity_id", bo.getId()));
+        List<Task> tasks = taskMapper.selectList(new QueryWrapper<Task>().eq("business_opportunity_id", bo.getId())
+                .eq("is_delete",0)
+        );
         for (Task task : tasks) {
             String executorId = task.getExecutorId();
             if (executorId != null && executorId != ""){

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/service/impl/CustomServiceImpl.java

@@ -268,7 +268,9 @@ public class CustomServiceImpl extends ServiceImpl<CustomMapper, Custom> impleme
         // 附件列表
         custom1.setFiles(uploadFileMapper.selectByInfoList("custom", custom1.getId()));
         //商机列表
-        List<BusinessOpportunity> bos = businessOpportunityMapper.selectList(new QueryWrapper<BusinessOpportunity>().eq("customer_id", custom1.getId()));
+        List<BusinessOpportunity> bos = businessOpportunityMapper.selectList(new QueryWrapper<BusinessOpportunity>().eq("customer_id", custom1.getId())
+                .eq("is_delete",0)
+        );
         if (bos.size() > 0) {
             List<Integer> sIds = bos.stream().map(BusinessOpportunity::getStageId).distinct().collect(Collectors.toList());
             List<Stage> stages = stageMapper.selectList(new QueryWrapper<Stage>().in("id", sIds));
@@ -350,7 +352,9 @@ public class CustomServiceImpl extends ServiceImpl<CustomMapper, Custom> impleme
         }
         custom1.setContacts(contacts);
         //订单
-        List<SalesOrder> orders = salesOrderMapper.selectList((new QueryWrapper<SalesOrder>().eq("custom_id", custom1.getId())));
+        List<SalesOrder> orders = salesOrderMapper.selectList((new QueryWrapper<SalesOrder>().eq("custom_id", custom1.getId()))
+                .eq("is_delete",0)
+        );
         if (orders.size() > 0 ){
             List<Integer> tids = orders.stream().map(SalesOrder::getType).collect(Collectors.toList());
             List<String> ids = orders.stream()

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/service/impl/ProductServiceImpl.java

@@ -20,6 +20,7 @@ import org.apache.poi.xssf.usermodel.XSSFCell;
 import org.apache.poi.xssf.usermodel.XSSFRow;
 import org.apache.poi.xssf.usermodel.XSSFSheet;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
@@ -80,6 +81,21 @@ public class ProductServiceImpl extends ServiceImpl<ProductMapper, Product> impl
     @Resource
     private CompanyDingdingMapper companyDingdingMapper;
 
+    @Resource
+    private OrderProductDetailMapper orderProductDetailMapper;
+    @Autowired
+    private CustomMapper customMapper;
+    @Autowired
+    private SalesOrderMapper salesOrderMapper;
+    @Autowired
+    private BusinessOpportunityMapper businessOpportunityMapper;
+    @Autowired
+    private BusinessItemProductMapper businessItemProductMapper;
+    @Autowired
+    private StageMapper stageMapper;
+    @Autowired
+    private ContactsMapper contactsMapper;
+
     @Override
     public HttpRespMsg getList(Integer companyId,String userId, String productName, String productCode,Integer productType,Integer status,String startDate,String endDate, Integer pageIndex, Integer pageSize) {
         HttpRespMsg msg=new HttpRespMsg();
@@ -805,4 +821,95 @@ public class ProductServiceImpl extends ServiceImpl<ProductMapper, Product> impl
         );
         return respMsg;
     }
+
+    @Override
+    public HttpRespMsg orderWithProduct(Integer id) {
+        HttpRespMsg msg=new HttpRespMsg();
+        Integer companyId = userMapper.selectById(request.getHeader("token")).getCompanyId();
+//        List<OrderProductDetail> productDetailList = orderProductDetailService.list(new LambdaQueryWrapper<OrderProductDetail>().eq(OrderProductDetail::getProductId, id));
+        List<OrderProductDetail> productDetailList = orderProductDetailMapper.getUnDelByProductId(id);
+        List<Integer> orderIds = productDetailList.stream().map(OrderProductDetail::getOrderId).distinct().collect(Collectors.toList());
+        List<Custom> customList = customMapper.selectList(new LambdaQueryWrapper<Custom>().eq(Custom::getCompanyId, companyId));
+        List<User> userList = userMapper.selectList(new LambdaQueryWrapper<User>().eq(User::getCompanyId, companyId));
+        orderIds.add(-1);
+        List<SalesOrder> orderList = salesOrderMapper.selectList(new LambdaQueryWrapper<SalesOrder>().in(SalesOrder::getId, orderIds).eq(SalesOrder::getIsDelete,0));
+        List<SysDict> orderTypeList = sysDictMapper.selectList(new LambdaQueryWrapper<SysDict>().eq(SysDict::getCode, "OrderType"));
+        List<Integer> businessOpportunityIds = orderList.stream().map(SalesOrder::getBusinessOpportunityId).distinct().collect(Collectors.toList());
+        businessOpportunityIds.add(-1);
+        List<BusinessOpportunity> businessOpportunityList = businessOpportunityMapper.selectList(new LambdaQueryWrapper<BusinessOpportunity>().in(BusinessOpportunity::getId, businessOpportunityIds));
+        orderList.forEach(o->{
+            Optional<Custom> custom = customList.stream().filter(ct -> ct.getId().equals(o.getCustomId())).findFirst();
+            if(custom.isPresent()){
+                o.setCustomName(custom.get().getCustomName());
+            }
+            Optional<User> user = userList.stream().filter(u -> u.getId().equals(o.getCreatorId())).findFirst();
+            if(user.isPresent()){
+                o.setCreatorName(user.get().getName());
+            }
+            Optional<User> customSigner = userList.stream().filter(u -> u.getId().equals(o.getCustomSigner())).findFirst();
+            if(customSigner.isPresent()){
+                o.setCustomSignerName(customSigner.get().getName());
+            }
+            Optional<User> companySigner = userList.stream().filter(u -> u.getId().equals(o.getCompanySigner())).findFirst();
+            if(companySigner.isPresent()){
+                o.setCompanySigner(companySigner.get().getName());
+            }
+            Optional<User> incharger = userList.stream().filter(u -> u.getId().equals(o.getInchargerId())).findFirst();
+            if(incharger.isPresent()){
+                o.setInchargerName(incharger.get().getName());
+            }
+            Optional<BusinessOpportunity> businessOpportunity = businessOpportunityList.stream().filter(b -> o.getBusinessOpportunityId() != null && b.getId().equals(o.getBusinessOpportunityId())).findFirst();
+            if(businessOpportunity.isPresent()){
+                o.setBusinessOpportunityName(businessOpportunity.get().getName());
+            }
+            Optional<SysDict> orderType = orderTypeList.stream().filter(ot -> ot.getId().equals(o.getType())).findFirst();
+            if(orderType.isPresent()){
+                o.setTypeName(orderType.get().getName());
+            }
+        });
+        msg.setData(orderList);
+        return msg;
+    }
+
+    @Override
+    public HttpRespMsg businessListWithProduct(Integer id) {
+        HttpRespMsg msg=new HttpRespMsg();
+        Integer companyId = userMapper.selectById(request.getHeader("token")).getCompanyId();
+//        List<BusinessItemProduct> businessItemProducts = businessItemProductService.list(new LambdaQueryWrapper<BusinessItemProduct>().eq(BusinessItemProduct::getProductId, id));
+        List<BusinessItemProduct> businessItemProducts = businessItemProductMapper.getUnDelBIPListByBId(id);
+        List<Integer> businessIds = businessItemProducts.stream().map(BusinessItemProduct::getBusinessId).distinct().collect(Collectors.toList());
+        businessIds.add(-1);
+        List<BusinessOpportunity> opportunityList = businessOpportunityMapper.selectList(new LambdaQueryWrapper<BusinessOpportunity>().in(BusinessOpportunity::getId, businessIds)
+                .eq(BusinessOpportunity::getIsDelete,0)
+        );
+        List<Custom> customList = customMapper.selectList(new LambdaQueryWrapper<Custom>().eq(Custom::getCompanyId, companyId));
+        List<User> userList = userMapper.selectList(new LambdaQueryWrapper<User>().eq(User::getCompanyId, companyId));
+//        List<SysDict> businessStageList = sysDictService.list(new LambdaQueryWrapper<SysDict>().eq(SysDict::getCode, "BusinessStage"));
+        List<Stage> businessStageList = stageMapper.selectList(new LambdaQueryWrapper<Stage>().eq(Stage::getCompanyId, companyId));
+        List<Contacts> contactsList = contactsMapper.selectList(new LambdaQueryWrapper<Contacts>().eq(Contacts::getCompanyId, companyId));
+        opportunityList.forEach(c->{
+            Optional<Custom> custom = customList.stream().filter(ct -> ct.getId().equals(c.getCustomerId())).findFirst();
+            if(custom.isPresent()){
+                c.setCustomerName(custom.get().getCustomName());
+            }
+            Optional<User> user = userList.stream().filter(u -> u.getId().equals(c.getCreatorId())).findFirst();
+            if(user.isPresent()){
+                c.setCreatorName(user.get().getName());
+            }
+            Optional<Contacts> contacts = contactsList.stream().filter(u -> u.getId().equals(c.getContactsId())).findFirst();
+            if(contacts.isPresent()){
+                c.setContactsName(contacts.get().getName());
+            }
+            Optional<User> incharger = userList.stream().filter(u -> u.getId().equals(c.getInchargerId())).findFirst();
+            if(incharger.isPresent()){
+                c.setInchargerName(incharger.get().getName());
+            }
+            Optional<Stage> businessStage = businessStageList.stream().filter(b -> b.getId().equals(c.getStageId())).findFirst();
+            if(businessStage.isPresent()){
+                c.setStageValue(businessStage.get().getName());
+            }
+        });
+        msg.setData(opportunityList);
+        return msg;
+    }
 }

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/service/impl/SalesOrderServiceImpl.java

@@ -97,6 +97,8 @@ public class SalesOrderServiceImpl extends ServiceImpl<SalesOrderMapper, SalesOr
     private CompanyDingdingMapper companyDingdingMapper;
     @Autowired
     private SalesOrderPaymentMapper salesOrderPaymentMapper;
+    @Autowired
+    private OrderProductDetailMapper orderProductDetailMapper;
 
     @Override
     public HttpRespMsg getList(String inchargerId,Integer orderType, String orderName,
@@ -1326,7 +1328,8 @@ public class SalesOrderServiceImpl extends ServiceImpl<SalesOrderMapper, SalesOr
         List<User> userList = userMapper.selectList(new LambdaQueryWrapper<User>().eq(User::getCompanyId, companyId));
         List<SysDict> sysDictOfProductUnit = sysDictService.list(new LambdaQueryWrapper<SysDict>().eq(SysDict::getCode, "ProductUnit"));
         List<SysDict> sysDictOfProductType = sysDictService.list(new LambdaQueryWrapper<SysDict>().eq(SysDict::getCode, "ProductType"));
-        List<OrderProductDetail> orderProductDetails = orderProductDetailService.list(new LambdaQueryWrapper<OrderProductDetail>().eq(OrderProductDetail::getOrderId, id));
+//        List<OrderProductDetail> orderProductDetails = orderProductDetailService.list(new LambdaQueryWrapper<OrderProductDetail>().eq(OrderProductDetail::getOrderId, id));
+        List<OrderProductDetail> orderProductDetails = orderProductDetailMapper.getUnDelByOrderId(id);
         List<Integer> productIds = orderProductDetails.stream().map(OrderProductDetail::getProductId).collect(Collectors.toList());
         productIds.add(-1);
         List<Product> productList = productMapper.selectList(new LambdaQueryWrapper<Product>().in(Product::getId, productIds));

fhKeeper/formulahousekeeper/management-crm/src/main/resources/mapper/OrderProductDetailMapper.xml

@@ -17,5 +17,19 @@
     <sql id="Base_Column_List">
         id, order_id, product_id, seal_price, num, discount, total_price
     </sql>
+    <select id="getUnDelByProductId" resultType="com.management.platform.entity.OrderProductDetail">
+        select opd.*
+        from order_product_detail opd
+        where opd.product_id = #{productId}
+          and exists(select 1 from  product p where opd.product_id = p.id and p.is_delete = 0)
+          and exists(select 1 from  sales_order so where opd.product_id = so.id and so.is_delete = 0)
+    </select>
+    <select id="getUnDelByOrderId" resultType="com.management.platform.entity.OrderProductDetail">
+        select opd.*
+        from order_product_detail opd
+        where opd.order_id = #{orderId}
+          and exists(select 1 from  sales_order so where opd.product_id = so.id and so.is_delete = 0)
+          and exists(select 1 from  product p where opd.product_id = p.id and p.is_delete = 0)
+    </select>
 
 </mapper>