优化

platform-dao/src/main/java/com/platform/dao/vo/query/store/StoreVO.java

@@ -23,6 +23,7 @@ import java.time.LocalDate;
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = true)
 public class StoreVO extends BaseVO implements Serializable {
+    private Integer level1;
 
     /**
      * 主键

platform-dao/src/main/resources/mapper/store/InStoreFormMapper.xml

@@ -118,7 +118,7 @@
         select instoreform.*, store.name storeName,
         info.type_id,info.no,info.name,info.ggxh,info.brand,
         info.initial_value,info.unit,spareStore.num currentStock,
-        info.max_stock,info.min_stock,info.level,info.producer_id,
+        info.max_stock,info.min_stock,info.level,info.producer_id,store.id as storeId,
         info.yt,producer.name as producerName,spareType.name as typeName
         from t_in_store_form as instoreform
         left join t_spare_part_info info on info.id = instoreform.spare_id
@@ -337,7 +337,7 @@
     <select id="getInStoreFormCollect" resultType="com.platform.dao.vo.query.store.InStoreFormVO"
             parameterType="com.platform.dao.dto.store.InStoreFormDTO">
             select info.*,sum(form.in_num ) totalNum,
-            form.id inId,form.in_no inNo,store.id storeId,spareStore.spare_id spareId,
+            form.id inId,form.in_no inNo,store.id storeId,spareStore.spare_id spareId,store.name as storeName,
               spareType.name as typeName,spareStore.num currentStock,producer.name as producerName
               from t_spare_part_info info
 

platform-dao/src/main/resources/mapper/store/OutStoreFormMapper.xml

@@ -99,7 +99,7 @@
         info.type_id,info.no,info.name,info.ggxh,info.brand,
         info.initial_value,info.unit,spareStore.num currentStock,
         info.max_stock,info.min_stock,info.level,info.producer_id,producer.name as producerName,
-        info.yt,spareType.name as typeName,info.is_special
+        info.yt,spareType.name as typeName,info.is_special,store.id as storeId
         from t_out_store_form as outstoreform
         left join t_spare_part_info info on outstoreform.spare_id = info.id
         left join t_spare_store spareStore on

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

@@ -111,9 +111,9 @@ public class SparePartInfoServiceImpl extends BaseServiceImpl<SparePartInfoMappe
     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){
+        for (StoreVO vo:stores){
             if (vo.getLevel()==3){
-                for (StoreVO vo1:stores){
+                first:for (StoreVO vo1:stores){
                     System.out.println("11111111111");
                     if (vo.getParentId().equals(vo1.getId())){
                         for (StoreVO vo2:stores){
@@ -396,9 +396,9 @@ public class SparePartInfoServiceImpl extends BaseServiceImpl<SparePartInfoMappe
     private List<SparePartInfoVO> getSparePartInfoVOS(List<SparePartInfoVO> sparePartInfoVOS){
         List<StoreVO> stores = storeMapper.selectList(null);
         Map<String,String> map = new HashMap<>();
-        first:for (StoreVO vo:stores){
+        for (StoreVO vo:stores){
             if (vo.getLevel()==3){
-                for (StoreVO vo1:stores){
+                first:for (StoreVO vo1:stores){
                     System.out.println("11111111111");
                     if (vo.getParentId().equals(vo1.getId())){
                         for (StoreVO vo2:stores){

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

@@ -279,11 +279,16 @@ public class InStoreFormServiceImpl extends BaseServiceImpl<InStoreFormMapper, I
     }
 
     private List<InStoreFormVO> getSparePartInfoVOS(List<InStoreFormVO> sparePartInfoVOS){
-        List<StoreVO> stores = storeMapper.selectList(null);
+        StoreDTO dto = new StoreDTO();
+//        dto.setName("B-2");
+        List<StoreVO> stores = storeMapper.selectList(dto);
         Map<String,String> map = new HashMap<>();
-        first:for (StoreVO vo:stores){
+        for (StoreVO vo:stores){
+//            if (vo.getName().trim().equals("A-2")){
+//                int i=0;
+//            }
             if (vo.getLevel()==3){
-                for (StoreVO vo1:stores){
+                first:for (StoreVO vo1:stores){
                     System.out.println("11111111111");
                     if (vo.getParentId().equals(vo1.getId())){
                         for (StoreVO vo2:stores){
@@ -294,6 +299,7 @@ public class InStoreFormServiceImpl extends BaseServiceImpl<InStoreFormMapper, I
                                 String name2 = vo1.getName().replaceAll("\\s*","").replaceAll("[^(0-9)]","");
                                 String name =name1+"-"+name2+"-"+vo.getName();
                                 map.put(vo.getId(),name);
+                                System.out.println("========="+name);
                                 break first;
                             }
                         }

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

@@ -118,9 +118,9 @@ public class OutStoreFormServiceImpl extends BaseServiceImpl<OutStoreFormMapper,
     private List<OutStoreFormVO> getSparePartInfoVOS(List<OutStoreFormVO> sparePartInfoVOS){
         List<StoreVO> stores = storeMapper.selectList(null);
         Map<String,String> map = new HashMap<>();
-        first:for (StoreVO vo:stores){
+        for (StoreVO vo:stores){
             if (vo.getLevel()==3){
-                for (StoreVO vo1:stores){
+                first:for (StoreVO vo1:stores){
                     System.out.println("11111111111");
                     if (vo.getParentId().equals(vo1.getId())){
                         for (StoreVO vo2:stores){