优化

platform-dao/src/main/java/com/platform/dao/dto/store/InStoreFormDTO.java

@@ -24,6 +24,7 @@ import java.util.List;
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = true)
 public class InStoreFormDTO extends BaseDTO implements Serializable {
+    private String model;
     private String producerName;
     private String supplierName;
     private List<String> spareIdList;

platform-dao/src/main/java/com/platform/dao/dto/store/OutStoreFormDTO.java

@@ -24,6 +24,7 @@ import java.util.List;
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = true)
 public class OutStoreFormDTO extends BaseDTO implements Serializable {
+    private String model;
     private String producerName;
     private String supplierName;
     private List<String> spareIdList;

platform-service/src/main/java/com/platform/service/sqarepartmanage/impl/SparePartInfoServiceImpl.java

@@ -131,6 +131,13 @@ public class SparePartInfoServiceImpl extends BaseServiceImpl<SparePartInfoMappe
                 }
             }
         }
+        if(StringUtils.isNotEmpty(dto.getModel())){
+            SbModelSpareBomDTO sbModelDTO = new SbModelSpareBomDTO();
+            sbModelDTO.setKeyword(dto.getModel());
+            List<SbModelSpareBomVO> modelList = sbModelSpareBomMapper.selectVOList(sbModelDTO);
+            List<String> spareList = modelList.stream().map(item -> item.getSpareId()).distinct().collect(Collectors.toList());
+            dto.setSpareIdList(spareList);
+        }
         PageHelper.startPage(pageNum, pageSize);
         List<SparePartInfoVO> sparePartInfoVOS = mapper.getInOrOut(dto);
         Set<String> ids = map.keySet();

platform-service/src/main/java/com/platform/service/store/impl/InStoreFormServiceImpl.java

@@ -10,6 +10,7 @@ import com.platform.common.exception.BusinessException;
 import com.platform.common.model.UserInfo;
 import com.platform.common.util.*;
 import com.platform.dao.bean.MyPage;
+import com.platform.dao.dto.sb.SbModelSpareBomDTO;
 import com.platform.dao.dto.store.*;
 import com.platform.dao.entity.purchase.PurchaseDispatchOrder;
 import com.platform.dao.entity.purchase.PurchaseDispatchOrderList;
@@ -24,6 +25,7 @@ import com.platform.dao.enums.*;
 import com.platform.dao.mapper.purchase.PurchaseDispatchOrderListMapper;
 import com.platform.dao.mapper.purchase.PurchaseDispatchOrderMapper;
 import com.platform.dao.mapper.purchase.PurchaseListMapper;
+import com.platform.dao.mapper.sb.SbModelSpareBomMapper;
 import com.platform.dao.mapper.sqarepartmanage.SparePartInfoMapper;
 import com.platform.dao.mapper.store.InStoreDetailMapper;
 import com.platform.dao.mapper.store.InStoreFormMapper;
@@ -38,6 +40,7 @@ import com.platform.dao.vo.query.store.StoreVO;
 import com.platform.dao.vo.repair.RepairApplicationFormVO;
 import com.platform.dao.vo.report.InStoreFormReportVO;
 import com.platform.dao.vo.report.RepairReport24VO;
+import com.platform.dao.vo.sb.SbModelSpareBomVO;
 import com.platform.service.base.impl.BaseServiceImpl;
 import com.platform.service.business.PurchaseBusinessService;
 import com.platform.service.event.WorkplaceBacklogEvent;
@@ -73,6 +76,7 @@ public class InStoreFormServiceImpl extends BaseServiceImpl<InStoreFormMapper, I
     private StoreService storeService;
     private SpareBackFormMapper spareBackFormMapper;
     private SparePartInfoMapper sparePartInfoMapper;
+    private SbModelSpareBomMapper sbModelSpareBomMapper;
 
     @Override
     public int batchDelete(List<String> ids) {
@@ -93,6 +97,13 @@ public class InStoreFormServiceImpl extends BaseServiceImpl<InStoreFormMapper, I
             UserInfo userInfo = SecurityUtils.getUserInfo();
             model.setUserId(userInfo.getUserId());
         }
+        if(StringUtils.isNotEmpty(model.getModel())){
+            SbModelSpareBomDTO sbModelDTO = new SbModelSpareBomDTO();
+            sbModelDTO.setKeyword(model.getModel());
+            List<SbModelSpareBomVO> modelList = sbModelSpareBomMapper.selectVOList(sbModelDTO);
+            List<String> spareList = modelList.stream().map(item -> item.getSpareId()).distinct().collect(Collectors.toList());
+            model.setSpareIdList(spareList);
+        }
         PageHelper.startPage(pageNum, pageSize);
         return new MyPage(mapper.selectList(model));
     }
@@ -239,6 +250,13 @@ public class InStoreFormServiceImpl extends BaseServiceImpl<InStoreFormMapper, I
 
     @Override
     public AbstractPageResultBean<InStoreFormVO> getInStoreFormCollect(InStoreFormDTO dto, Integer pageNum,Integer pageSize) {
+        if(StringUtils.isNotEmpty(dto.getModel())){
+            SbModelSpareBomDTO sbModelDTO = new SbModelSpareBomDTO();
+            sbModelDTO.setKeyword(dto.getModel());
+            List<SbModelSpareBomVO> modelList = sbModelSpareBomMapper.selectVOList(sbModelDTO);
+            List<String> spareList = modelList.stream().map(item -> item.getSpareId()).distinct().collect(Collectors.toList());
+            dto.setSpareIdList(spareList);
+        }
         PageHelper.startPage(pageNum,pageSize);
         List<InStoreFormVO> list = mapper.getInStoreFormCollect(dto);
         return new MyPage<>(list);

platform-service/src/main/java/com/platform/service/store/impl/OutStoreFormServiceImpl.java

@@ -8,12 +8,14 @@ import com.platform.common.model.UserInfo;
 import com.platform.common.util.*;
 import com.platform.dao.bean.MyPage;
 import com.github.pagehelper.PageHelper;
+import com.platform.dao.dto.sb.SbModelSpareBomDTO;
 import com.platform.dao.dto.store.*;
 import com.platform.dao.dto.store.OutStoreDetailDTO;
 import com.platform.dao.entity.sb.SbOil;
 import com.platform.dao.entity.store.*;
 import com.platform.dao.entity.store.OutStoreDetail;
 import com.platform.dao.enums.*;
+import com.platform.dao.mapper.sb.SbModelSpareBomMapper;
 import com.platform.dao.mapper.store.*;
 import com.platform.dao.util.MessageTemplateUtil;
 import com.platform.dao.vo.export.store.ExportInStoreSpareNumVO;
@@ -21,6 +23,7 @@ import com.platform.dao.vo.export.store.ExportOutStoreSpareNumVO;
 import com.platform.dao.vo.query.store.*;
 import com.platform.dao.vo.report.InStoreFormReportVO;
 import com.platform.dao.vo.report.OutStoreFormReportVO;
+import com.platform.dao.vo.sb.SbModelSpareBomVO;
 import com.platform.service.event.WorkplaceBacklogEvent;
 import com.platform.service.store.OutStoreFormService;
 import com.platform.service.store.StoreService;
@@ -60,9 +63,18 @@ public class OutStoreFormServiceImpl extends BaseServiceImpl<OutStoreFormMapper,
     private SparePickFormMapper sparePickFormMapper;
     private SparePickDetailMapper sparePickDetailMapper;
 
+    private SbModelSpareBomMapper sbModelSpareBomMapper;
+
 
     @Override
     public AbstractPageResultBean<OutStoreFormVO> getOutStoreFormCollect(OutStoreFormDTO dto, Integer pageNum,Integer pageSize) {
+        if(StringUtils.isNotEmpty(dto.getModel())){
+            SbModelSpareBomDTO sbModelDTO = new SbModelSpareBomDTO();
+            sbModelDTO.setKeyword(dto.getModel());
+            List<SbModelSpareBomVO> modelList = sbModelSpareBomMapper.selectVOList(sbModelDTO);
+            List<String> spareList = modelList.stream().map(item -> item.getSpareId()).distinct().collect(Collectors.toList());
+            dto.setSpareIdList(spareList);
+        }
         PageHelper.startPage(pageNum,pageSize);
         return new MyPage(mapper.getOutStoreFormCollect(dto));
     }
@@ -178,7 +190,13 @@ public class OutStoreFormServiceImpl extends BaseServiceImpl<OutStoreFormMapper,
 
     @Override
     public AbstractPageResultBean<OutStoreFormVO> selectPageList(OutStoreFormDTO model, int pageNum, int pageSize) {
-
+        if(StringUtils.isNotEmpty(model.getModel())){
+            SbModelSpareBomDTO sbModelDTO = new SbModelSpareBomDTO();
+            sbModelDTO.setKeyword(model.getModel());
+            List<SbModelSpareBomVO> modelList = sbModelSpareBomMapper.selectVOList(sbModelDTO);
+            List<String> spareList = modelList.stream().map(item -> item.getSpareId()).distinct().collect(Collectors.toList());
+            model.setSpareIdList(spareList);
+        }
         if (model.getFilter() != null && DataFilterTypeEnum.SELF.getValue() == model.getFilter().intValue()) {
             UserInfo userInfo = SecurityUtils.getUserInfo();
             model.setUserId(userInfo.getUserId());