获取路线数据

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/impl/PlanTaskServiceImpl.java

@@ -670,8 +670,8 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
         }
         //3.生成含有人员信息的日期执行数据
         // 获取路线中的企业类型和设备类型
-//        Route route = routeDao.getOne(plan.getRouteId());
-        Route route = new Route();
+        Route route = routeDao.getOne(plan.getRouteId());
+//        Route route = new Route();
         List<UserDetailsDto> userDetailsDtos = new ArrayList<>();
         // 获取用户组下所有的用户信息
         try{

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/util/PlanTaskUtil.java

@@ -512,10 +512,10 @@ public static List<HashMap<String, Object>> genWholeExeData(List<HashMap<String,
 		return null;
 	}
 	List<HashMap<String, Object>> wholeList = new ArrayList<>();
-//        String deviceType = route.getDeviceType();
-//        String unitType = route.getUnitType();
-	String deviceType = "3000";
-	String unitType = "1232";
+        String deviceType = route.getEquipType();
+        String unitType = route.getEnterpriseType();
+//	String deviceType = "3000";
+//	String unitType = "1232";
 
 	if (!CollectionUtils.isEmpty(userDetailsDtoList)) {
 		Map<String, List<UserDetailsDto>> userDetailsDtoMap = userDetailsDtoList.stream().