bug单修改

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

@@ -326,18 +326,19 @@ public class ClueController {
     @RequestMapping("delete")
     public Object delete(Clue clue,HttpServletRequest request) {
         HttpRespMsg msg = new HttpRespMsg();
-        String ids1 = clue.getIds();
-        List<Integer> ids = new ArrayList<>();
-        User user = userMapper.selectById(request.getHeader("Token"));
-        if (!ids1.isEmpty()) {
-            for (String id : ids1.split(",")) {
-                ids.add(Integer.parseInt(id));
-            }
-            clueService.isDelete(ids,user.getId());
-            msg.setMsg("操作成功");
-        } else {
-            msg.setError("请选择线索");
-        }
+        msg = clueService.delete(clue,request);
+//        String ids1 = clue.getIds();
+//        List<Integer> ids = new ArrayList<>();
+//        User user = userMapper.selectById(request.getHeader("Token"));
+//        if (!ids1.isEmpty()) {
+//            for (String id : ids1.split(",")) {
+//                ids.add(Integer.parseInt(id));
+//            }
+//            clueService.isDelete(ids,user.getId());
+//            msg.setMsg("操作成功");
+//        } else {
+//            msg.setError("请选择线索");
+//        }
         return msg;
     }
 

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

@@ -299,7 +299,9 @@ public class ProductController {
         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));
+        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"));
@@ -347,7 +349,7 @@ public class ProductController {
         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));
+        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);

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

@@ -372,7 +372,7 @@ public class SalesOrderController {
         HttpRespMsg msg=new HttpRespMsg();
         Integer companyId = userMapper.selectById(request.getHeader("token")).getCompanyId();
         List<User> userList = userMapper.selectList(new LambdaQueryWrapper<User>().eq(User::getCompanyId, companyId));
-        List<Task> taskList = taskService.list(new LambdaQueryWrapper<Task>().eq(Task::getOrderId, id));
+        List<Task> taskList = taskService.list(new LambdaQueryWrapper<Task>().eq(Task::getOrderId, id).eq(Task::getIsDelete,0));
         taskList.forEach(p->{
             String executorIds = p.getExecutorId();
             if (executorIds!=null && !StringUtils.isEmpty(executorIds)) {
@@ -503,15 +503,16 @@ public class SalesOrderController {
     public HttpRespMsg paymentCollectionList(Integer orderId){
         HttpRespMsg msg=new HttpRespMsg();
         User user = userMapper.selectById(request.getHeader("token"));
-        List<User> userList = userMapper.selectList(new LambdaQueryWrapper<User>().eq(User::getCompanyId, user.getCompanyId()));
-        List<SalesOrderPayment> list = salesOrderPaymentService.list(new LambdaQueryWrapper<SalesOrderPayment>().eq(SalesOrderPayment::getOrderId, orderId));
-        list.forEach(l->{
-            Optional<User> first = userList.stream().filter(u -> u.getId().equals(l.getCreatorId())).findFirst();
-            if(first.isPresent()){
-                l.setCreatorName(first.get().getName());
-            }
-        });
-        msg.setData(list);
+        msg = salesOrderService.paymentCollectionList(orderId,user);
+//        List<User> userList = userMapper.selectList(new LambdaQueryWrapper<User>().eq(User::getCompanyId, user.getCompanyId()));
+//        List<SalesOrderPayment> list = salesOrderPaymentService.list(new LambdaQueryWrapper<SalesOrderPayment>().eq(SalesOrderPayment::getOrderId, orderId));
+//        list.forEach(l->{
+//            Optional<User> first = userList.stream().filter(u -> u.getId().equals(l.getCreatorId())).findFirst();
+//            if(first.isPresent()){
+//                l.setCreatorName(first.get().getName());
+//            }
+//        });
+//        msg.setData(list);
         return msg;
     }
 

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/entity/Task.java

@@ -97,7 +97,7 @@ public class Task extends Model<Task> {
     private Integer productId;
 
     /**
-     * 状态 0-未开始 1-进行中 2-完成 3-推迟
+     * 状态 0-未开始 1-进行中 2-完成 3-推迟 [ 未开始状态废弃，默认进行中]
      */
     @TableField("status")
     private Integer status;

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

@@ -2,6 +2,7 @@ package com.management.platform.mapper;
 
 import com.management.platform.entity.BusinessItemProduct;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -16,4 +17,6 @@ import java.util.List;
 public interface BusinessItemProductMapper extends BaseMapper<BusinessItemProduct> {
 
     List<BusinessItemProduct> selectListToBoId(Integer id);
+
+    List<BusinessItemProduct> getUnDelBIPListByBId(@Param("busOppId") Integer busOppId);
 }

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

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

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

@@ -68,4 +68,6 @@ public interface ClueService extends IService<Clue> {
     HttpRespMsg undoPin(Clue clue, HttpServletRequest request);
 
     HttpRespMsg insertAndUpdate(Clue clue, HttpServletRequest request);
+
+    HttpRespMsg delete(Clue clue, HttpServletRequest request);
 }

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

@@ -2,6 +2,7 @@ package com.management.platform.service;
 
 import com.management.platform.entity.SalesOrder;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.management.platform.entity.User;
 import com.management.platform.util.HttpRespMsg;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -40,4 +41,6 @@ public interface SalesOrderService extends IService<SalesOrder> {
     HttpRespMsg pinOrder(SalesOrder order, HttpServletRequest request);
 
     HttpRespMsg undoPin(SalesOrder order, HttpServletRequest request);
+
+    HttpRespMsg paymentCollectionList(Integer orderId, User user);
 }

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

@@ -120,7 +120,8 @@ public class BusinessOpportunityServiceImpl extends ServiceImpl<BusinessOpportun
             }
         }
         businessOpportunity.setTaskList(tasks);
-        List<BusinessItemProduct> businessItemProducts = bipMapper.selectList(new QueryWrapper<BusinessItemProduct>().eq("business_id", bo.getId()));
+//        List<BusinessItemProduct> businessItemProducts = bipMapper.selectList(new QueryWrapper<BusinessItemProduct>().eq("business_id", bo.getId()));
+        List<BusinessItemProduct> businessItemProducts  = bipMapper.getUnDelBIPListByBId(bo.getId());
         if (businessItemProducts.size() > 0) {
 
             List<Integer> productIds = businessItemProducts.stream()

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

@@ -24,6 +24,7 @@ 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.context.ApplicationContext;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.StringUtils;
@@ -78,6 +79,9 @@ public class ClueServiceImpl extends ServiceImpl<ClueMapper, Clue> implements Cl
     @Resource
     private SysDictMapper sysDictMapper;
 
+    @Autowired
+    private ApplicationContext applicationContext;
+
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -188,7 +192,8 @@ public class ClueServiceImpl extends ServiceImpl<ClueMapper, Clue> implements Cl
         Clue clue1 = clueMapper.selectById2Info(clue.getId());
         clue1.setClueLogList(actionLogMapper.selectByInfoList(clue1.getId()));
         clue1.setFiles(uploadFileMapper.selectByInfoList("clue", clue1.getId()));
-        List<Task> tasks = taskMapper.selectList(new QueryWrapper<Task>().in("clue_id", clue.getId()));
+        List<Task> tasks = taskMapper.selectList(new QueryWrapper<Task>().in("clue_id", clue.getId())
+                .eq("is_delete",0));
         for (Task task : tasks) {
             String executorId = task.getExecutorId();
             List<String> ids1 = new ArrayList<>();
@@ -197,7 +202,9 @@ public class ClueServiceImpl extends ServiceImpl<ClueMapper, Clue> implements Cl
                 for (String id : executorId.split(",")) {
                     ids1.add(id);
                 }
-                List<User> users = userMapper.selectList(new QueryWrapper<User>().in("id", ids1));
+                List<User> users = userMapper.selectList(new QueryWrapper<User>().in("id", ids1)
+                .eq("is_active",1)
+                );
                 for (User user : users) {
                     userNames.add(user.getName());
                 }
@@ -754,5 +761,33 @@ public class ClueServiceImpl extends ServiceImpl<ClueMapper, Clue> implements Cl
         return msg;
     }
 
+    @Override
+    public HttpRespMsg delete(Clue clue, HttpServletRequest request) {
+        HttpRespMsg msg = new HttpRespMsg();
+        String ids1 = clue.getIds();
+        List<Integer> ids = new ArrayList<>();
+        User user = userMapper.selectById(request.getHeader("Token"));
+
+        if (!ids1.isEmpty()) {
+            for (String id : ids1.split(",")) {
+                ids.add(Integer.parseInt(id));
+            }
+            Integer taskCount = taskMapper.selectCount(new LambdaQueryWrapper<Task>()
+                    .eq(Task::getIsDelete, 0)
+                    .in(Task::getClueId, ids)
+            );
+            if(null != taskCount && taskCount > 0){
+                msg.setError("存在关联任务");
+                return msg;
+            }
+            ClueService proxy = applicationContext.getBean(ClueService.class);
+            proxy.isDelete(ids,user.getId());
+            msg.setMsg("操作成功");
+        } else {
+            msg.setError("请选择线索");
+        }
+        return msg;
+    }
+
 
 }

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

@@ -353,7 +353,7 @@ public class ContactsServiceImpl extends ServiceImpl<ContactsMapper, Contacts> i
 
             //相关任务
             LambdaQueryWrapper<Task> tLqw = new LambdaQueryWrapper<>();
-            tLqw.eq(Task::getContactsId, contactsSelect.getId());
+            tLqw.eq(Task::getContactsId, contactsSelect.getId()).eq(Task::getIsDelete,0);
             List<Task> taskList = taskMapper.selectList(tLqw);
             taskList.forEach(task -> {
                 if (StringUtils.isNotEmpty(task.getExecutorId())) {
@@ -370,7 +370,7 @@ public class ContactsServiceImpl extends ServiceImpl<ContactsMapper, Contacts> i
 
             //相关商机
             LambdaQueryWrapper<BusinessOpportunity> bLqw = new LambdaQueryWrapper<>();
-            bLqw.eq(BusinessOpportunity::getContactsId,contactsSelect.getId());
+            bLqw.eq(BusinessOpportunity::getContactsId,contactsSelect.getId()).eq(BusinessOpportunity::getIsDelete,0);
             List<BusinessOpportunity> opportunityList = businessOpportunityMapper.selectList(bLqw);
             LambdaQueryWrapper<Stage> stageLQW = new LambdaQueryWrapper<>();
             List<Stage> stages = stageMapper.selectList(stageLQW);

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

@@ -301,7 +301,9 @@ public class CustomServiceImpl extends ServiceImpl<CustomMapper, Custom> impleme
         custom1.setBusinessOpportunitys(bos);
         //操作记录
         List<ActionLog> actionLogs = actionLogMapper.selectByInfoListCustom(custom.getId());
-        List<Task> tasks = taskMapper.selectList(new QueryWrapper<Task>().in("custom_id", custom1.getId()));
+        List<Task> tasks = taskMapper.selectList(new QueryWrapper<Task>().in("custom_id", custom1.getId())
+                .eq("is_delete",1)
+        );
         if (tasks.size()>0){
             List<String> ids = tasks.stream()
                     .flatMap(task -> Optional.ofNullable(task.getExecutorId())
@@ -329,7 +331,9 @@ public class CustomServiceImpl extends ServiceImpl<CustomMapper, Custom> impleme
         custom1.setTasks(tasks);
         custom1.setActionLogs(actionLogs);
         //联系人
-        List<Contacts> contacts = contactsMapper.selectList((new QueryWrapper<Contacts>().eq("custom_id", custom1.getId())));
+        List<Contacts> contacts = contactsMapper.selectList((new QueryWrapper<Contacts>().eq("custom_id", custom1.getId())
+                .eq("is_delete",0)
+        ));
         if (contacts.size() > 0){
             List<String> ids = contacts.stream()
                     .flatMap(contact -> Stream.of(contact.getOwnerId(), contact.getCreatorId()))

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

@@ -477,9 +477,12 @@ public class ProductServiceImpl extends ServiceImpl<ProductMapper, Product> impl
                             String value = String.valueOf(aClass.getMethod("get" + targetName).invoke(product)==null?"":aClass.getMethod("get" + targetName).invoke(product));
                             if(model.equals("inchargerId")){
                                 if(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1){
-                                    value = "$userName="+String.valueOf(aClass.getMethod("getInchargerName").invoke(product))+"$";
+                                    if(null != aClass.getMethod("getInchargerName").invoke(product)){
+                                        value = "$userName="+String.valueOf(aClass.getMethod("getInchargerName").invoke(product))+"$";
+                                    }
+//                                    value = "$userName="+String.valueOf(aClass.getMethod("getInchargerName").invoke(product))+"$";
                                 }else {
-                                    value = String.valueOf(aClass.getMethod("getInchargerName").invoke(product));
+                                    value = String.valueOf(null == aClass.getMethod("getInchargerName").invoke(product)?"":aClass.getMethod("getInchargerName").invoke(product));
                                 }
                             }
                             if(model.equals("unit")){
@@ -504,9 +507,12 @@ public class ProductServiceImpl extends ServiceImpl<ProductMapper, Product> impl
                     String value = String.valueOf(aClass.getMethod("get" + targetName).invoke(product)==null?"":aClass.getMethod("get" + targetName).invoke(product));
                     if(model.equals("inchargerId")){
                         if(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1){
-                            value = "$userName="+String.valueOf(aClass.getMethod("getInchargerName").invoke(product))+"$";
+                            if(null != aClass.getMethod("getInchargerName").invoke(product)){
+                                value = "$userName="+String.valueOf(aClass.getMethod("getInchargerName").invoke(product))+"$";
+                            }
+//                            value = "$userName="+String.valueOf(aClass.getMethod("getInchargerName").invoke(product))+"$";
                         }else {
-                            value = String.valueOf(aClass.getMethod("getInchargerName").invoke(product));
+                            value = String.valueOf(null == aClass.getMethod("getInchargerName").invoke(product)?"":aClass.getMethod("getInchargerName").invoke(product));
                         }
                     }
                     if(model.equals("unit")){

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

@@ -18,6 +18,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.transaction.annotation.Transactional;
@@ -93,6 +94,8 @@ public class SalesOrderServiceImpl extends ServiceImpl<SalesOrderMapper, SalesOr
 
     @Resource
     private CompanyDingdingMapper companyDingdingMapper;
+    @Autowired
+    private SalesOrderPaymentMapper salesOrderPaymentMapper;
 
     @Override
     public HttpRespMsg getList(String inchargerId,Integer orderType, String orderName,
@@ -544,6 +547,21 @@ public class SalesOrderServiceImpl extends ServiceImpl<SalesOrderMapper, SalesOr
         return respMsg;
     }
 
+    @Override
+    public HttpRespMsg paymentCollectionList(Integer orderId, User user) {
+        HttpRespMsg msg=new HttpRespMsg();
+        List<User> userList = userMapper.selectList(new LambdaQueryWrapper<User>().eq(User::getCompanyId, user.getCompanyId()));
+//        List<SalesOrderPayment> list = salesOrderPaymentService.list(new LambdaQueryWrapper<SalesOrderPayment>().eq(SalesOrderPayment::getOrderId, orderId));
+        List<SalesOrderPayment> list = salesOrderPaymentMapper.getUnDelPaymentListByOId(orderId);
+        list.forEach(l->{
+            Optional<User> first = userList.stream().filter(u -> u.getId().equals(l.getCreatorId())).findFirst();
+            if(first.isPresent()){
+                l.setCreatorName(first.get().getName());
+            }
+        });
+        return msg;
+    }
+
     @Override
     @Transactional
     public HttpRespMsg importData(MultipartFile multipartFile) {

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

@@ -138,7 +138,9 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements Ta
         task.setCreateDate(LocalDateTime.now());//任务的创建时间
         //根据任务的开始时间与当下时间判断任务的状态
         if (taskDto.getStartDate()!=null&&taskDto.getStartDate().isAfter(LocalDate.now())){
-            task.setStatus(0);
+//            task.setStatus(0);
+            //20250116 未开始状态废弃，默认进行中
+            task.setStatus(1);
         }else if (taskDto.getEndDate()!=null&&taskDto.getEndDate().isBefore(LocalDate.now())){
             task.setStatus(3);
         } else if (taskDto.getStartDate()!=null&&(taskDto.getStartDate().isBefore(LocalDate.now())||taskDto.getStartDate().isEqual(LocalDate.now()))&&taskDto.getEndDate()!=null&&(taskDto.getEndDate().isAfter(LocalDate.now())||taskDto.getEndDate().isEqual(LocalDate.now()))) {
@@ -293,7 +295,9 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements Ta
             return msg;
         }
         if (taskDto.getStartDate()!=null&&taskDto.getStartDate().isAfter(LocalDate.now())){
-            task.setStatus(0);
+//            task.setStatus(0);
+            //20250116 未开始状态废弃，默认进行中
+            task.setStatus(1);
         }else if (taskDto.getEndDate()!=null&&taskDto.getEndDate().isBefore(LocalDate.now())){
             task.setStatus(3);
         } else if (taskDto.getStartDate()!=null&&taskDto.getStartDate().isBefore(LocalDate.now())&&taskDto.getEndDate()!=null&&taskDto.getEndDate().isAfter(LocalDate.now()))
@@ -817,7 +821,9 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements Ta
                         return msg;
                     }
                     if (task.getStartDate()!=null&&task.getStartDate().isAfter(LocalDate.now())){
-                        task.setStatus(0);
+//                        task.setStatus(0);
+                        //20250116 未开始状态废弃，默认进行中
+                        task.setStatus(1);
                     }else if (task.getEndDate()!=null&&task.getEndDate().isBefore(LocalDate.now())){
                         task.setStatus(3);
                     } else if (task.getStartDate()!=null&&task.getStartDate().isBefore(LocalDate.now())&&task.getEndDate()!=null&&task.getEndDate().isAfter(LocalDate.now()))
@@ -1073,6 +1079,22 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements Ta
             msg.setError("缺少用户的关键信息");
             return msg;
         }
+        if(0 == taskDto.getStatus()){
+            //重启相关判断
+            //重启的任务必须要修改开始时间为当前日期之后
+            LocalDate nowDate = LocalDate.now();
+            if(taskDto.getStartDate().isBefore(nowDate)){
+                msg.setError("开始日期不能早于当前日期");
+                return msg;
+            }
+            if(taskDto.getStartDate().isAfter(taskDto.getEndDate())){
+                msg.setError("开始日期不能晚于结束日期");
+                return msg;
+            }
+            //重启后 状态直接默认为 进行中
+            taskDto.setStatus(1);
+        }
+
         LambdaUpdateWrapper<Task> luw = new LambdaUpdateWrapper<>();
         luw.set(Task::getStatus,taskDto.getStatus())
                 .set(Task::getStartDate,taskDto.getStartDate())

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

@@ -31,5 +31,12 @@
 --         left join sys_dict d on
         where i.business_id = #{id}
     </select>
+    <select id="getUnDelBIPListByBId" resultType="com.management.platform.entity.BusinessItemProduct">
+        select bip.*
+        from business_item_product bip
+                 left join product p on bip.product_id = p.id
+        where bip.business_id = #{busOppId}
+          and p.is_delete = 0
+    </select>
 
 </mapper>

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

@@ -16,5 +16,12 @@
     <sql id="Base_Column_List">
         id, order_id, money, un_received_payment, creator_id, create_time
     </sql>
+    <select id="getUnDelPaymentListByOId" resultType="com.management.platform.entity.SalesOrderPayment">
+        select sop.*
+        from sales_order_payment sop
+                 left join sales_order so on sop.order_id = so.id
+        where sop.order_id = #{orderId}
+          and so.is_delete = 0
+    </select>
 
 </mapper>