巡检计划优化

op-modules/op-device/src/main/java/com/op/device/service/impl/EquPlanServiceImpl.java

@@ -88,7 +88,27 @@ public class EquPlanServiceImpl implements IEquPlanService {
                 equPlan.setUpdateTimeEnd(formatter.format(equPlan.getUpdateTimeArray().get(1)));
             }
         }
-        return equPlanMapper.selectEquPlanList(equPlan);
+        List<EquPlan> equPlans = equPlanMapper.selectEquPlanList(equPlan);
+
+        //获取当前所选工厂
+        HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+        String key = "#header.poolName";
+        String str = request.getHeader(key.substring(8));
+        int index = str.indexOf("_");
+        String factory = str.substring(index + 1);
+
+        List<WorkCenter> workCenters = equPlanMapper.selectWorkCenter(factory);
+
+
+        for (EquPlan plan : equPlans) {
+            for (WorkCenter center : workCenters) {
+                if (plan.getPlanWorkshop().equals(center.getFactoryCode())) {
+                    plan.setWorkCenterName(center.getFactoryName());
+                }
+            }
+        }
+
+        return equPlans;
     }
 
     /**
@@ -270,7 +290,6 @@ public class EquPlanServiceImpl implements IEquPlanService {
         String str = request.getHeader(key.substring(8));
         int index = str.indexOf("_");
         String factory = str.substring(index + 1);
-        equPlanMapper.selectWorkCenter(factory);
 
         return success(equPlanMapper.selectWorkCenter(factory));
     }