优化

platform-dao/src/main/resources/mapper/sqarepartmanage/SparePartInfoMapper.xml

@@ -82,9 +82,10 @@ warn_status,forecast_status,
     </sql>
     <select id="selectPageList" parameterType="com.platform.dao.dto.sqarepartmanage.SparePartInfoDTO"
             resultType="com.platform.dao.vo.query.sparepartmanage.SparePartInfoVO">
-        select info.*, SUM(spareStore.num) currentStock
+        select info.*, SUM(spareStore.num) currentStock,store.id as storeId,store.name as storeName
         from t_spare_part_info info
         LEFT JOIN t_spare_store spareStore on spareStore.spare_id = info.id
+        left join t_store store on store.id = spareStore.store_id
         <if test="producerName != null and producerName != ''">
             LEFT JOIN t_firm_producer producer on producer.id = info.producer_id
         </if>
@@ -230,10 +231,14 @@ warn_status,forecast_status,
         tcpsr.period,
         tcpsr.period_type as periodType,
         tcpsr.sb_id as sbId, tcpsr.num as num,
-               part.name as sbPartName
+               part.name as sbPartName,
+               store.id as storeId,
+               store.name as storeName
         from t_spare_part_info spare
         left join t_sb_model_spare_bom tcpsr on tcpsr.spare_id=spare.id
         LEFT JOIN t_part_info part on tcpsr.sb_part_id = part.id
+        left join t_spare_store spareStore on spareStore.spare_id = spare.id
+        left join t_store store on store.id = spareStore.store_id
         where tcpsr.sb_id = #{id}
     </select>
 

platform-rest/src/main/java/com/platform/rest/controller/sqarepartmanage/SparePartInfoController.java

@@ -180,8 +180,8 @@ public class SparePartInfoController {
      * @return R
      */
     @GetMapping("/page")
-    public R<AbstractPageResultBean<SparePartInfo>> query(SparePartInfoDTO sparePartInfoDTO, @RequestParam(defaultValue = "1") int pageNum, @RequestParam(defaultValue = "20") int pageSize) {
-        return new R<>(sparePartInfoService.selectPageInfo(sparePartInfoDTO, pageNum, pageSize));
+    public R<SparePartInfo> query(SparePartInfoDTO sparePartInfoDTO, @RequestParam(defaultValue = "1") int pageNum, @RequestParam(defaultValue = "20") int pageSize) {
+        return new R(sparePartInfoService.selectPageInfo2(sparePartInfoDTO, pageNum, pageSize));
     }
 
     /**

platform-service/src/main/java/com/platform/service/sqarepartmanage/SparePartInfoService.java

@@ -21,6 +21,7 @@ import java.util.List;
  * @Version Copyright (c) 2019,北京乾元坤和科技有限公司 All rights reserved.
  */
 public interface SparePartInfoService extends IBaseService<SparePartInfo, SparePartInfoDTO> {
+ List<SparePartInfoVO> selectPageInfo2(SparePartInfoDTO record, int pageNum, int pageSize);
 
 
 

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

@@ -387,7 +387,7 @@ public class SparePartInfoServiceImpl extends BaseServiceImpl<SparePartInfoMappe
     }
 
     @Override
-    public AbstractPageResultBean<SparePartInfo> selectPageInfo(SparePartInfoDTO record, int pageNum, int pageSize) {
+    public List<SparePartInfoVO> selectPageInfo2(SparePartInfoDTO record, int pageNum, int pageSize) {
 
         if(StringUtils.isNotEmpty(record.getModel())){
             SbModelSpareBomDTO sbModelDTO = new SbModelSpareBomDTO();
@@ -400,10 +400,11 @@ public class SparePartInfoServiceImpl extends BaseServiceImpl<SparePartInfoMappe
         // 选择设备对应的备件bom列表
         if (record.getSbId() != null) {
             SbInfoVO sbInfo = sbInfoMapper.getById(record.getSbId());
-            List<SparePartInfoVO> partList = mapper.selectSpareInfoList(sbInfo.getModelId());
+//            List<SparePartInfoVO> partList = mapper.selectSpareInfoList(sbInfo.getModelId());
             PageHelper.startPage(pageNum, pageSize);
-            AbstractPageResultBean<SparePartInfo> pageInfo = new MyPage(partList);
-            return pageInfo;
+            List<SparePartInfoVO> partList = mapper.selectSpareInfoList(sbInfo.getModelId());
+//            AbstractPageResultBean<SparePartInfo> pageInfo = new MyPage(partList);
+            return partList;
         } else {
             List<SpareType> typeList = spareTypeMapper.selectAll();
             if (StringUtils.isNotBlank(record.getTypeName())) {
@@ -451,8 +452,8 @@ public class SparePartInfoServiceImpl extends BaseServiceImpl<SparePartInfoMappe
                     }
                 }
             }
-            AbstractPageResultBean<SparePartInfo> pageInfo = new MyPage(list);
-            return pageInfo;
+//            AbstractPageResultBean<SparePartInfo> pageInfo = new MyPage(list);
+            return list;
         }
     }