优化

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

@@ -346,7 +346,8 @@ warn_status,forecast_status,
 
     <select id="getInOrOut" parameterType="com.platform.dao.dto.sqarepartmanage.SparePartInfoDTO"
             resultType="com.platform.dao.vo.query.sparepartmanage.SparePartInfoVO">
-        select info.*, SUM(spareStore.num) currentStock,store.name as storeName,spareStore.id as spareStoreId
+        select info.*, SUM(spareStore.num) currentStock,store.name as storeName,spareStore.id as spareStoreId,
+        store.id as storeId
         from t_spare_part_info info
         LEFT JOIN t_spare_store spareStore on spareStore.spare_id = info.id
         left join t_store store on spareStore.store_id = store.id

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

@@ -23,6 +23,7 @@ import java.util.List;
 public interface SparePartInfoService extends IBaseService<SparePartInfo, SparePartInfoDTO> {
 
 
+
  AbstractPageResultBean<SparePartInfoVO> getInOrOut(SparePartInfoDTO dto,Integer pageNum,Integer pageSize);
 
    /**

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

@@ -43,6 +43,7 @@ import com.platform.dao.util.MessageTemplateUtil;
 import com.platform.dao.vo.query.check.CheckStandardSpareVO;
 import com.platform.dao.vo.query.sparepartmanage.SparePartInfoVO;
 import com.platform.dao.vo.query.store.InStoreFormVO;
+import com.platform.dao.vo.query.store.StoreVO;
 import com.platform.dao.vo.repair.RepairApplicationFormVO;
 import com.platform.dao.vo.report.InAndOutStoretReportVO;
 import com.platform.dao.vo.report.RepairReport24VO;
@@ -104,8 +105,40 @@ public class SparePartInfoServiceImpl extends BaseServiceImpl<SparePartInfoMappe
 
     @Override
     public AbstractPageResultBean<SparePartInfoVO> getInOrOut(SparePartInfoDTO dto, Integer pageNum, Integer pageSize) {
+        List<StoreVO> stores = storeMapper.selectList(null);
+        Map<String,String> map = new HashMap<>();
+        first:for (StoreVO vo:stores){
+            if (vo.getLevel()==3){
+                for (StoreVO vo1:stores){
+                    System.out.println("11111111111");
+                    if (vo.getParentId().equals(vo1.getId())){
+                        for (StoreVO vo2:stores){
+                            System.out.println("22222222222");
+                            if (vo1.getParentId().equals(vo2.getId())){
+                                System.out.println("33333333333");
+                                String name1 = vo2.getName().replaceAll("\\s*","").replaceAll("[^(0-9)]","");
+                                String name2 = vo1.getName().replaceAll("\\s*","").replaceAll("[^(0-9)]","");
+                                String name =name1+"-"+name2+"-"+vo.getName();
+                                map.put(vo.getId(),name);
+                                break first;
+                            }
+                        }
+                    }
+                }
+            }
+        }
         PageHelper.startPage(pageNum, pageSize);
-        AbstractPageResultBean<SparePartInfoVO> pageInfos = new MyPage(mapper.getInOrOut(dto));
+        List<SparePartInfoVO> sparePartInfoVOS = mapper.getInOrOut(dto);
+        Set<String> ids = map.keySet();
+        for (String id:ids){
+            for (SparePartInfoVO vo:sparePartInfoVOS){
+                if (vo.getStoreId().equals(id)){
+                    vo.setStoreName(map.get(id));
+                    continue;
+                }
+            }
+        }
+        AbstractPageResultBean<SparePartInfoVO> pageInfos = new MyPage(sparePartInfoVOS);
         return pageInfos;
     }