仓库报表

platform-dao/src/main/java/com/platform/dao/entity/repair/RepairApplicationForm.java

@@ -29,6 +29,7 @@ public class RepairApplicationForm implements Serializable {
      */
     @Id
     private String id;
+    private String model;
 
     /**
      * 设备型号ID

platform-dao/src/main/java/com/platform/dao/vo/repair/RepairApplicationFormVO.java

@@ -31,6 +31,8 @@ public class RepairApplicationFormVO extends BaseVO implements Serializable {
      * 报修人员id
      */
     private String userId;
+
+    private String model;
     /**
      * 多长时间修复好
      */

platform-dao/src/main/resources/mapper/repair/RepairApplicationFormMapper.xml

@@ -6,6 +6,7 @@
         user.real_name as userName,
         user2.real_name as repairUserName,
         user3.real_name as checkUserName,
+        sb.model as model,
         sb.name as sbName,part.name as partName,
         sb.no as sbNo, sb.cph as sbCph, sb.model_id as modelId,
         error.name as repairErrorTypeName

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

@@ -176,13 +176,14 @@ public class SpareStoreServiceImpl extends BaseServiceImpl<SpareStoreMapper, Spa
         }*/
         // 查询设备型号下面的备件
 
-
-        if(StringUtils.isNotEmpty(model.getModel())){
-            SbModelSpareBomDTO sbModelDTO = new SbModelSpareBomDTO();
-            sbModelDTO.setKeyword(model.getModel());
-            List<SbModelSpareBomVO> modelList = sbModelSpareBomService.selectVOList(sbModelDTO);
-            List<String> spareList = modelList.stream().map(item -> item.getSpareId()).distinct().collect(Collectors.toList());
-            model.setSpareIdList(spareList);
+        if(model.getIsSpecial()==1) {
+            if (StringUtils.isNotEmpty(model.getModel())) {
+                SbModelSpareBomDTO sbModelDTO = new SbModelSpareBomDTO();
+                sbModelDTO.setKeyword(model.getModel());
+                List<SbModelSpareBomVO> modelList = sbModelSpareBomService.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));