diff --git a/admin/src/main/java/com/hcy/admin/service/client/impl/EquipmentServiceImpl.java b/admin/src/main/java/com/hcy/admin/service/client/impl/EquipmentServiceImpl.java index c4c6c63..463c601 100644 --- a/admin/src/main/java/com/hcy/admin/service/client/impl/EquipmentServiceImpl.java +++ b/admin/src/main/java/com/hcy/admin/service/client/impl/EquipmentServiceImpl.java @@ -78,6 +78,14 @@ public class EquipmentServiceImpl implements IEquipmentService { vo.setProvince(regionMap.get(vo.getProvinceId())); vo.setCity(regionMap.get(vo.getCityId())); vo.setDistrict(regionMap.get(vo.getDistrictId())); + //获取客户名称 + Client client = clientMapper.selectOne( + new QueryWrapper() + .eq("id", item.getClientId()) + .last("limit 1")); + if (client != null){ + vo.setClientName(client.getClientName()); + } vo.setCreateTime(TimeUtil.timestampToDate(item.getCreateTime())); list.add(vo); } @@ -122,14 +130,6 @@ public class EquipmentServiceImpl implements IEquipmentService { model.setNumber(equipmentParam.getNumber()); model.setClientId(equipmentParam.getClientId());//客户id - Client client = clientMapper.selectOne( - new QueryWrapper() - .eq("id", equipmentParam.getClientId()) - .eq("is_delete", 0) - .last("limit 1")); - if (client != null){ - model.setClientName(client.getClientName()); - } model.setName(equipmentParam.getName()); model.setModel(equipmentParam.getModel()); // 设备型号 model.setManufacturers(equipmentParam.getManufacturers()); // 设备厂家 @@ -166,14 +166,6 @@ public class EquipmentServiceImpl implements IEquipmentService { model.setId(equipmentParam.getId()); model.setClientId(equipmentParam.getClientId()); - Client client = clientMapper.selectOne( - new QueryWrapper() - .eq("id", equipmentParam.getClientId()) - .eq("is_delete", 0) - .last("limit 1")); - if (client != null){ - model.setClientName(client.getClientName()); - } model.setModuleId(equipmentParam.getModuleId()); model.setNumber(equipmentParam.getNumber()); model.setName(equipmentParam.getName()); @@ -256,14 +248,6 @@ public class EquipmentServiceImpl implements IEquipmentService { for (Equipment equipment : modelList) { equipment.setClientId(equipmentParam.getClientId());//客户id - Client client = clientMapper.selectOne( - new QueryWrapper() - .eq("id", equipment.getClientId()) - .eq("is_delete", 0) - .last("limit 1")); - if (client != null){ - equipment.setClientName(client.getClientName()); - } equipment.setUpdateTime(System.currentTimeMillis() / 1000); equipmentMapper.updateById(equipment); } @@ -360,6 +344,9 @@ public class EquipmentServiceImpl implements IEquipmentService { Integer limit = pageParam.getPageSize(); QueryWrapper queryWrapper = new QueryWrapper<>(); + if(params.get("clientId") != null){ + queryWrapper.eq("client_id", Long.parseLong(params.get("clientId"))); + } queryWrapper.eq("is_delete", 0); queryWrapper.in("device_status", 1,2,3); queryWrapper.orderByDesc("id"); diff --git a/admin/src/main/java/com/hcy/admin/service/largeDataScreen/impl/LargeDataScreenServiceImpl.java b/admin/src/main/java/com/hcy/admin/service/largeDataScreen/impl/LargeDataScreenServiceImpl.java index 58d6134..66c7c6f 100644 --- a/admin/src/main/java/com/hcy/admin/service/largeDataScreen/impl/LargeDataScreenServiceImpl.java +++ b/admin/src/main/java/com/hcy/admin/service/largeDataScreen/impl/LargeDataScreenServiceImpl.java @@ -260,18 +260,19 @@ public class LargeDataScreenServiceImpl implements ILargeDataScreenService { .eq("order_status", OrderStateEnum.DURING_INSPECTION.getStatus()) .ge("create_time", Timestamp.valueOf(startTime)) // 开始时间 .le("create_time", Timestamp.valueOf(endTime))); // 结束时间 - //获取待巡检订单总数 + //获取报修中订单总数 Integer underWarrantyOrderCount = routingInspectionOrderMapper.selectCount( new QueryWrapper() .eq("is_delete", 0) - .eq("order_status", OrderStateEnum.TO_BE_INSPECTED.getStatus()) + .ne("order_status", OrderStateEnum.COMPLETED.getStatus()) + .ne("order_status", OrderStateEnum.DURING_INSPECTION.getStatus()) .ge("create_time", Timestamp.valueOf(startTime)) // 开始时间 .le("create_time", Timestamp.valueOf(endTime))); // 结束时间 LargeDataVo vo = new LargeDataVo(); vo.setOrderSum(routingInspectionOrderCount); //工单总数 vo.setDoneOrderSum(doneOrderCount); //已完成订单数 vo.setUnderOverhaulOrderSum(underOverhaulOrderCount); //巡检中订单数 - vo.setUnderWarrantyOrderSum(underWarrantyOrderCount); //待巡检订单数 + vo.setUnderWarrantyOrderSum(underWarrantyOrderCount); //报修中订单数 return vo; } @@ -322,14 +323,15 @@ public class LargeDataScreenServiceImpl implements ILargeDataScreenService { Integer underOverhaulOrderCount = maintenanceOrderMapper.selectCount( new QueryWrapper() .eq("is_delete", 0) - .eq("order_status", MaintenanceOrderStatusEnum.CHECKING.getStatus()) + .eq("order_status", MaintenanceOrderStatusEnum.MAINTENANCE_ING.getStatus()) .ge("create_time", Timestamp.valueOf(startTime)) // 开始时间 .le("create_time", Timestamp.valueOf(endTime))); // 结束时间 //获取报修中订单总数 Integer underWarrantyOrderCount = maintenanceOrderMapper.selectCount( new QueryWrapper() .eq("is_delete", 0) - .eq("order_status", MaintenanceOrderStatusEnum.MAINTENANCE_ING.getStatus()) + .ne("order_status", MaintenanceOrderStatusEnum.FINISHED.getStatus()) + .ne("order_status", MaintenanceOrderStatusEnum.MAINTENANCE_ING.getStatus()) .ge("create_time", Timestamp.valueOf(startTime)) // 开始时间 .le("create_time", Timestamp.valueOf(endTime))); // 结束时间 LargeDataVo vo = new LargeDataVo(); diff --git a/admin/src/main/java/com/hcy/admin/service/order/impl/MaintenanceOrderServiceImpl.java b/admin/src/main/java/com/hcy/admin/service/order/impl/MaintenanceOrderServiceImpl.java index 490be01..4ed852d 100644 --- a/admin/src/main/java/com/hcy/admin/service/order/impl/MaintenanceOrderServiceImpl.java +++ b/admin/src/main/java/com/hcy/admin/service/order/impl/MaintenanceOrderServiceImpl.java @@ -20,6 +20,7 @@ import com.hcy.common.entity.fault.Fault; import com.hcy.common.entity.order.MaintenanceOrder; import com.hcy.common.entity.system.SystemAuthAdmin; import com.hcy.common.entity.user.User; +import com.hcy.common.enums.equipment.EquipmentStateEnum; import com.hcy.common.enums.order.MaintenanceOrderStatusEnum; import com.hcy.common.enums.order.OrderStateEnum; import com.hcy.common.exception.OperateException; @@ -158,6 +159,15 @@ public class MaintenanceOrderServiceImpl implements IMaintenanceOrderService { MaintenanceOrder model = new MaintenanceOrder(); BeanUtils.copyProperties(maintenanceOrderParam, model); + //创建检修单，设备状态就变成报修中 + Equipment equipment = equipmentMapper.selectOne( + new QueryWrapper() + .eq("id", model.getEquipmentId()) + .eq("is_delete", 0) + .last("limit 1")); + equipment.setDeviceStatus(EquipmentStateEnum.UNDERWARRANTY.getStatus()); + equipmentMapper.updateById(equipment); + //订单去向 Integer repairWorkOrderFlow = maintenanceOrderParam.getRepairWorkOrderFlow(); if (repairWorkOrderFlow == OrderStateEnum.WORK_ORDER_TANK.getStatus()) { diff --git a/admin/src/main/java/com/hcy/admin/service/system/impl/SystemAuthAdminServiceImpl.java b/admin/src/main/java/com/hcy/admin/service/system/impl/SystemAuthAdminServiceImpl.java index 8ecadc6..e9c09a3 100644 --- a/admin/src/main/java/com/hcy/admin/service/system/impl/SystemAuthAdminServiceImpl.java +++ b/admin/src/main/java/com/hcy/admin/service/system/impl/SystemAuthAdminServiceImpl.java @@ -157,6 +157,15 @@ public class SystemAuthAdminServiceImpl implements ISystemAuthAdminService { vo.setProvince(regionMap.get(vo.getProvinceId())); vo.setCity(regionMap.get(vo.getCityId())); vo.setDistrict(regionMap.get(vo.getDistrictId())); + + //获取小程序用户的receiveOrderStatus 接单状态（0=休假/停止接单中 1=作业中 2=可接单） + User user = userMapper.selectOne( + new QueryWrapper() + .eq("id", vo.getUserId())); + if(user != null){ + vo.setReceiveOrderStatus(user.getReceiveOrderStatus()); + } + //只查询没有被该工厂绑定的用户 if(param.getPlantId() != null){ Plant model = plantMapper.selectOne( diff --git a/admin/src/main/java/com/hcy/admin/validate/client/ClientParam.java b/admin/src/main/java/com/hcy/admin/validate/client/ClientParam.java index 0412d9d..b62e47f 100644 --- a/admin/src/main/java/com/hcy/admin/validate/client/ClientParam.java +++ b/admin/src/main/java/com/hcy/admin/validate/client/ClientParam.java @@ -83,5 +83,6 @@ public class ClientParam implements Serializable { private String remark; private Long creatorId; + private String shortName; // 客户简称 } diff --git a/admin/src/main/java/com/hcy/admin/vo/client/ClientDetailVo.java b/admin/src/main/java/com/hcy/admin/vo/client/ClientDetailVo.java index a0b35b8..2fd6dff 100644 --- a/admin/src/main/java/com/hcy/admin/vo/client/ClientDetailVo.java +++ b/admin/src/main/java/com/hcy/admin/vo/client/ClientDetailVo.java @@ -34,5 +34,6 @@ public class ClientDetailVo implements Serializable { private BigDecimal partMaintainDivisor; // 配件维修价格因子 private String remark; // 备注 private Long creatorId; // 创建人id + private String shortName; // 客户简称 } diff --git a/admin/src/main/java/com/hcy/admin/vo/client/ClientListVo.java b/admin/src/main/java/com/hcy/admin/vo/client/ClientListVo.java index 325ac7d..e544f8e 100644 --- a/admin/src/main/java/com/hcy/admin/vo/client/ClientListVo.java +++ b/admin/src/main/java/com/hcy/admin/vo/client/ClientListVo.java @@ -42,4 +42,6 @@ public class ClientListVo implements Serializable { private Date createTime; // 创建时间 private Date updateTime; // 更新时间 private List equipmentList; //设备列表 + private String shortName; // 客户简称 + } diff --git a/admin/src/main/java/com/hcy/admin/vo/system/SystemAuthAdminVo.java b/admin/src/main/java/com/hcy/admin/vo/system/SystemAuthAdminVo.java index de5f8f8..365f418 100644 --- a/admin/src/main/java/com/hcy/admin/vo/system/SystemAuthAdminVo.java +++ b/admin/src/main/java/com/hcy/admin/vo/system/SystemAuthAdminVo.java @@ -41,4 +41,6 @@ public class SystemAuthAdminVo implements Serializable { private Integer age; // 年龄 private String email; // 邮箱 private String technicalGrade; // 技术等级 + private Integer receiveOrderStatus; //接单状态（0=休假/停止接单中 1=作业中 2=可接单） + } diff --git a/common/src/main/java/com/hcy/common/dto/RoutingInspectionOrderDto.java b/common/src/main/java/com/hcy/common/dto/RoutingInspectionOrderDto.java index 3864d2c..725d339 100644 --- a/common/src/main/java/com/hcy/common/dto/RoutingInspectionOrderDto.java +++ b/common/src/main/java/com/hcy/common/dto/RoutingInspectionOrderDto.java @@ -14,6 +14,9 @@ public class RoutingInspectionOrderDto implements Serializable { private Long orderSource; // 订单来源 1-系统创建；4-客服创建 private Long repairWorkOrderFlow; //工单去向 0=工单池 1=检修员 private Long receiverType; // 接单类型 0-区域派单；1-距离派单 + private Long provinceId; // 省id + private Long cityId; // 市id + private Long districtId; // 区id private String remark; // 备注 private Date orderAccomplishTime; // 订单完成时间 private Long clientId; // 客户id @@ -40,4 +43,7 @@ public class RoutingInspectionOrderDto implements Serializable { private Integer queryType; // 查询类型 0-离我最近 1-时间优先 private Date cancelOrderTime; // 取消订单时间 private String cancelCause; // 取消原因 + private Long equipmentProvinceId; //设备省id + private Long equipmentDistrictId; //设备区id + private Long equipmentCityId; //设备市id } diff --git a/common/src/main/java/com/hcy/common/entity/client/Client.java b/common/src/main/java/com/hcy/common/entity/client/Client.java index 5d45a2e..5983a9f 100644 --- a/common/src/main/java/com/hcy/common/entity/client/Client.java +++ b/common/src/main/java/com/hcy/common/entity/client/Client.java @@ -38,5 +38,5 @@ public class Client implements Serializable { private Date createTime; // 创建时间 private Date updateTime; // 更新时间 private Integer isDelete; // 是否删除 0-未删除 1-删除 - + private String shortName; // 客户简称 } \ No newline at end of file diff --git a/common/src/main/java/com/hcy/common/entity/client/Equipment.java b/common/src/main/java/com/hcy/common/entity/client/Equipment.java index 3b71387..d2de301 100644 --- a/common/src/main/java/com/hcy/common/entity/client/Equipment.java +++ b/common/src/main/java/com/hcy/common/entity/client/Equipment.java @@ -37,5 +37,4 @@ public class Equipment implements Serializable { private Long createTime; // 创建时间 private Long updateTime; // 更新时间 private Long deleteTime; // 删除时间 - private String clientName; // 客户名称 } \ No newline at end of file diff --git a/common/src/main/resources/mapper/RoutingInspectionOrderMapper.xml b/common/src/main/resources/mapper/RoutingInspectionOrderMapper.xml index 084307e..5d7bb3a 100644 --- a/common/src/main/resources/mapper/RoutingInspectionOrderMapper.xml +++ b/common/src/main/resources/mapper/RoutingInspectionOrderMapper.xml @@ -64,7 +64,12 @@ LEFT JOIN la_user as u on i.receiver_id = u.id WHERE i.is_delete = 0 - and i.receiver_id = #{form.receiverId} + + and i.receiver_id = #{form.receiverId} + + + and i.client_id = #{form.clientId} + and (i.order_no like concat('%', #{form.likeWork}, '%') @@ -93,6 +98,9 @@ a.nickname as creatorName, f.`name` as familiarFaultName, u.nickname as receiverName, + e.province_id as equipmentProvinceId, + e.district_id as equipmentDistrictId, + e.city_id as equipmentCityId, e.longitude, e.latitude FROM diff --git a/front/src/main/java/com/hcy/front/controller/order/RoutingInspectionOrderController.java b/front/src/main/java/com/hcy/front/controller/order/RoutingInspectionOrderController.java index ac2bd0f..ea3ba58 100644 --- a/front/src/main/java/com/hcy/front/controller/order/RoutingInspectionOrderController.java +++ b/front/src/main/java/com/hcy/front/controller/order/RoutingInspectionOrderController.java @@ -31,13 +31,13 @@ public class RoutingInspectionOrderController { * * @author hcy * @param pageParam 分页参数 - * @param params 搜索参数 + * @param routingInspectionOrderParam 搜索参数 * @return Object */ @GetMapping("/list") public Object list(@Validated PageParam pageParam, - @RequestParam Map params) { - PageResult list = iRoutingInspectionOrderService.list(pageParam, params); + RoutingInspectionOrderParam routingInspectionOrderParam) { + PageResult list = iRoutingInspectionOrderService.list(pageParam, routingInspectionOrderParam); return AjaxResult.success(list); } diff --git a/front/src/main/java/com/hcy/front/service/order/IRoutingInspectionOrderService.java b/front/src/main/java/com/hcy/front/service/order/IRoutingInspectionOrderService.java index 487caf5..7582ac3 100644 --- a/front/src/main/java/com/hcy/front/service/order/IRoutingInspectionOrderService.java +++ b/front/src/main/java/com/hcy/front/service/order/IRoutingInspectionOrderService.java @@ -20,10 +20,10 @@ public interface IRoutingInspectionOrderService { * * @author hcy * @param pageParam 分页参数 - * @param params 搜索参数 + * @param routingInspectionOrderParam 搜索参数 * @return PageResult */ - PageResult list(PageParam pageParam, Map params); + PageResult list(PageParam pageParam, RoutingInspectionOrderParam routingInspectionOrderParam); /** * 巡检订单详情 diff --git a/front/src/main/java/com/hcy/front/service/order/impl/RoutingInspectionOrderServiceImpl.java b/front/src/main/java/com/hcy/front/service/order/impl/RoutingInspectionOrderServiceImpl.java index 03ac138..b05c5b6 100644 --- a/front/src/main/java/com/hcy/front/service/order/impl/RoutingInspectionOrderServiceImpl.java +++ b/front/src/main/java/com/hcy/front/service/order/impl/RoutingInspectionOrderServiceImpl.java @@ -66,6 +66,9 @@ public class RoutingInspectionOrderServiceImpl implements IRoutingInspectionOrde @Resource UserMapper userMapper; + @Resource + SystemAuthAdminMapper systemAuthAdminMapper; + @Resource FaultMapper faultMapper; @@ -77,22 +80,26 @@ public class RoutingInspectionOrderServiceImpl implements IRoutingInspectionOrde * * @author hcy * @param pageParam 分页参数 - * @param params 搜索参数 + * @param routingInspectionOrderParam 搜索参数 * @return PageResult */ @Override - public PageResult list(PageParam pageParam, Map params) { + public PageResult list(PageParam pageParam, RoutingInspectionOrderParam routingInspectionOrderParam) { Page page = new Page<>(pageParam.getPageNo(), pageParam.getPageSize()); RoutingInspectionOrderDto inspectionOrderDto = new RoutingInspectionOrderDto(); - inspectionOrderDto.setLikeWork(StringUtils.isEmpty(params.get("likeWork")) ? null : params.get("likeWork")); + inspectionOrderDto.setLikeWork(routingInspectionOrderParam.getLikeWork()); //默认查询待接单的巡检单 - if(StringUtils.isNotEmpty(params.get("orderStatus"))){ - inspectionOrderDto.setOrderStatus(Long.valueOf(params.get("orderStatus"))); + inspectionOrderDto.setOrderStatus(routingInspectionOrderParam.getOrderStatus()); + + //isClient; //是否客户 0-客户端 1-检修员端 + if(routingInspectionOrderParam.getIsClient() == MaintenanceOrderStatusEnum.REPAIRER.getStatus()){ + inspectionOrderDto.setReceiverId(FrontThreadLocal.getUserId().longValue()); //只查询当前用户的巡检单 + }else{ + inspectionOrderDto.setClientId(routingInspectionOrderParam.getClientId()); //查询客户的巡检单 } - inspectionOrderDto.setReceiverId(FrontThreadLocal.getUserId().longValue()); //只查询当前用户的巡检单 Page iPage = routingInspectionOrderMapper.frontPageList(page, inspectionOrderDto); List list = new LinkedList<>(); @@ -285,22 +292,44 @@ public class RoutingInspectionOrderServiceImpl implements IRoutingInspectionOrde RoutingInspectionOrderDto inspectionOrderDto = new RoutingInspectionOrderDto(); BeanUtils.copyProperties(routingInspectionOrderParam,inspectionOrderDto); - List routingInspectionOrderDto = routingInspectionOrderMapper.list(inspectionOrderDto); + List routingInspectionOrderList = routingInspectionOrderMapper.list(inspectionOrderDto); + SystemAuthAdmin systemAuthAdmin = systemAuthAdminMapper.selectOne( + new QueryWrapper() + .eq("user_id", FrontThreadLocal.getUserId())); List returnData = new LinkedList<>(); - for (RoutingInspectionOrderDto item : routingInspectionOrderDto) { + for (RoutingInspectionOrderDto item : routingInspectionOrderList) { - //判断抢单距离大于订单距离则返回订单 - double distance = ToolsUtil.getDistance(item.getLongitude(), item.getLatitude() - , routingInspectionOrderParam.getLongitude(), routingInspectionOrderParam.getLatitude()); - if(item.getOrderDistance().compareTo(BigDecimal.valueOf((distance / 1000))) >= 0){ - // 计算距离 + if(routingInspectionOrderParam.getQueryType() == MaintenanceOrderStatusEnum.NEAREST_TO_ME.getStatus()){ + //判断抢单距离大于订单距离则返回订单 + double distance = ToolsUtil.getDistance(item.getLongitude(), item.getLatitude() + , routingInspectionOrderParam.getLongitude(), routingInspectionOrderParam.getLatitude()); + + if(item.getReceiverType() == OrderStateEnum.REGIONAL_DISPATCH.getStatus()){ + if(item.getEquipmentProvinceId().equals(systemAuthAdmin.getProvinceId()) && + item.getEquipmentCityId().equals(systemAuthAdmin.getCityId()) && + item.getEquipmentDistrictId().equals(systemAuthAdmin.getDistrictId()) ){ + + // 计算距离 + RoutingInspectionOrderListVo vo = new RoutingInspectionOrderListVo(); + BeanUtils.copyProperties(item, vo); + vo.setDistance(distance); + returnData.add(vo); + } + }else{ + if(item.getOrderDistance().compareTo(BigDecimal.valueOf((distance / 1000))) >= 0){ + // 计算距离 + RoutingInspectionOrderListVo vo = new RoutingInspectionOrderListVo(); + BeanUtils.copyProperties(item, vo); + vo.setDistance(distance); + returnData.add(vo); + } + } + }else{ RoutingInspectionOrderListVo vo = new RoutingInspectionOrderListVo(); BeanUtils.copyProperties(item, vo); - vo.setDistance(String.valueOf(distance)); returnData.add(vo); } - } if(routingInspectionOrderParam.getQueryType() == MaintenanceOrderStatusEnum.NEAREST_TO_ME.getStatus()){ @@ -310,18 +339,23 @@ public class RoutingInspectionOrderServiceImpl implements IRoutingInspectionOrde .collect(Collectors.toList()); //将米数转换为km - for (RoutingInspectionOrderListVo inspectionOrderListVo : returnData) { - double distance = Double.parseDouble(inspectionOrderListVo.getDistance()); - if(distance < 1000){ - inspectionOrderListVo.setDistance(distance + "米"); - }else{ - double km = distance / 1000; - inspectionOrderListVo.setDistance(df.format(km) + "km"); + for (RoutingInspectionOrderListVo routingInspectionOrderListVo : returnData) { + if(routingInspectionOrderListVo.getDistance() != null){ + double distance = routingInspectionOrderListVo.getDistance(); + if(distance < 1000){ + routingInspectionOrderListVo.setPracticalDistance(df.format(distance) + "米"); + }else{ + double km = distance / 1000; + routingInspectionOrderListVo.setPracticalDistance(df.format(km) + "km"); + } } } } + return returnData; + + } /** diff --git a/front/src/main/java/com/hcy/front/validate/order/RoutingInspectionOrderParam.java b/front/src/main/java/com/hcy/front/validate/order/RoutingInspectionOrderParam.java index 88743a0..74c0b25 100644 --- a/front/src/main/java/com/hcy/front/validate/order/RoutingInspectionOrderParam.java +++ b/front/src/main/java/com/hcy/front/validate/order/RoutingInspectionOrderParam.java @@ -32,7 +32,7 @@ public class RoutingInspectionOrderParam implements Serializable { @DecimalMin(value = "0", message = "orderSource参数值不能少于0", groups = {create.class, update.class}) private Integer orderSource; - private Integer orderStatus; + private Long orderStatus; @DecimalMin(value = "0", message = "clientId参数值不能少于0", groups = {create.class, update.class}) private Long clientId; @@ -83,4 +83,6 @@ public class RoutingInspectionOrderParam implements Serializable { private double latitude; //纬度 private Integer queryType; // 查询类型 0-离我最近 1-时间优先 private String cancelCause; // 取消原因 + + private Integer isClient; //是否客户 0-客户端 1-检修员端 } diff --git a/front/src/main/java/com/hcy/front/vo/order/RoutingInspectionOrderListVo.java b/front/src/main/java/com/hcy/front/vo/order/RoutingInspectionOrderListVo.java index a5ca562..e5a31c1 100644 --- a/front/src/main/java/com/hcy/front/vo/order/RoutingInspectionOrderListVo.java +++ b/front/src/main/java/com/hcy/front/vo/order/RoutingInspectionOrderListVo.java @@ -25,9 +25,14 @@ public class RoutingInspectionOrderListVo implements Serializable { private String detailedAddress; // 设备详细地址 private Date createTime; // 创建时间 private Long orderStatus; // 订单状态 0-待抢单；1-待接单；2-接单超时；3-巡检中；4-已完成；5-已退单；6-待巡检 - private String distance; //距离 + private Double distance; //距离 + private String practicalDistance; //实际距离 + private BigDecimal orderDistance; // 订单距离 private Date cancelOrderTime; // 取消订单时间 private String cancelCause; // 取消原因 + private Long equipmentProvinceId; //设备省id + private Long equipmentDistrictId; //设备区id + private Long equipmentCityId; //设备市id }