From 31357a6529437620e06a824eb8759ae5418480a3 Mon Sep 17 00:00:00 2001 From: renfan <2206580733@qq.com> Date: Mon, 19 Aug 2024 21:55:51 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90admin=E3=80=91=E6=96=B0=E5=A2=9E&?= =?UTF-8?q?=E4=BC=98=E5=8C=96#=201=E3=80=81=E4=BC=98=E5=8C=96=E5=B7=A1?= =?UTF-8?q?=E6=A3=80=E5=8D=95=E5=88=97=E8=A1=A8=202=E3=80=81=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E6=9F=A5=E7=9C=8B=E5=BD=93=E5=89=8D=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=91=98=E4=BF=A1=E6=81=AF=E5=A2=9E=E5=8A=A0=E5=B7=A5=E5=8E=82?= =?UTF-8?q?=E5=90=8D=E5=92=8C=E5=B7=A5=E5=8E=82id=203=E3=80=81=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E5=B7=A1=E6=A3=80=E5=8D=95=E7=BC=96=E8=BE=91=E5=92=8C?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E8=AF=A6=E6=83=85=204=E3=80=81=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E4=BF=AE=E6=94=B9=E6=B4=BE=E5=8D=95=E6=96=B9=E5=BC=8F?= =?UTF-8?q?=E3=80=81=E4=BF=AE=E6=94=B9=E6=8A=A2=E5=8D=95=E8=8C=83=E5=9B=B4?= =?UTF-8?q?=E3=80=81=E9=87=8D=E6=96=B0=E6=B4=BE=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../RoutingInspectionOrderController.java | 41 +++++ .../order/IRoutingInspectionOrderService.java | 17 ++ .../RoutingInspectionOrderServiceImpl.java | 150 +++++++++++++++--- .../impl/SystemAuthAdminServiceImpl.java | 10 +- .../order/RoutingInspectionOrderParam.java | 4 +- .../order/RoutingInspectionOrderDetailVo.java | 22 ++- .../order/RoutingInspectionOrderListVo.java | 2 + .../common/dto/RoutingInspectionOrderDto.java | 36 +++++ .../entity/order/RoutingInspectionOrder.java | 4 + .../order/RoutingInspectionOrderMapper.java | 11 ++ .../mapper/RoutingInspectionOrderMapper.xml | 46 ++++++ .../mapper/RoutingInspectionOrderMapper.xml | 46 ++++++ 12 files changed, 359 insertions(+), 30 deletions(-) create mode 100644 common/src/main/java/com/hcy/common/dto/RoutingInspectionOrderDto.java create mode 100644 common/src/main/resources/mapper/RoutingInspectionOrderMapper.xml create mode 100644 common/target/classes/mapper/RoutingInspectionOrderMapper.xml diff --git a/admin/src/main/java/com/hcy/admin/controller/order/RoutingInspectionOrderController.java b/admin/src/main/java/com/hcy/admin/controller/order/RoutingInspectionOrderController.java index 80142cc..c6390c7 100644 --- a/admin/src/main/java/com/hcy/admin/controller/order/RoutingInspectionOrderController.java +++ b/admin/src/main/java/com/hcy/admin/controller/order/RoutingInspectionOrderController.java @@ -94,4 +94,45 @@ public class RoutingInspectionOrderController { return AjaxResult.success(); } + /** + * 修改派单方式 + * + * @author hcy + * @param routingInspectionOrderParam 参数 + * @return Object + */ + @Log(title = "修改派单方式") + @PostMapping("/alterReceiverType") + public Object alterReceiverType(@RequestBody RoutingInspectionOrderParam routingInspectionOrderParam) { + iRoutingInspectionOrderService.alterReceiverType(routingInspectionOrderParam); + return AjaxResult.success(); + } + + /** + * 修改抢单范围 + * + * @author hcy + * @param routingInspectionOrderParam 参数 + * @return Object + */ + @Log(title = "修改抢单范围") + @PostMapping("/alterOrderDistance") + public Object alterOrderDistance(@RequestBody RoutingInspectionOrderParam routingInspectionOrderParam) { + iRoutingInspectionOrderService.alterOrderDistance(routingInspectionOrderParam); + return AjaxResult.success(); + } + + /** + * 重新派工 + * + * @author hcy + * @param routingInspectionOrderParam 参数 + * @return Object + */ + @Log(title = "重新派工") + @PostMapping("/reassignment") + public Object reassignment(@RequestBody RoutingInspectionOrderParam routingInspectionOrderParam) { + iRoutingInspectionOrderService.reassignment(routingInspectionOrderParam); + return AjaxResult.success(); + } } diff --git a/admin/src/main/java/com/hcy/admin/service/order/IRoutingInspectionOrderService.java b/admin/src/main/java/com/hcy/admin/service/order/IRoutingInspectionOrderService.java index bd93543..765aa7c 100644 --- a/admin/src/main/java/com/hcy/admin/service/order/IRoutingInspectionOrderService.java +++ b/admin/src/main/java/com/hcy/admin/service/order/IRoutingInspectionOrderService.java @@ -56,4 +56,21 @@ public interface IRoutingInspectionOrderService { */ void del(Integer id); + /** + * 修改派单方式 + * @param routingInspectionOrderParam + */ + void alterReceiverType(RoutingInspectionOrderParam routingInspectionOrderParam); + + /** + * 修改抢单范围 + * @param routingInspectionOrderParam + */ + void alterOrderDistance(RoutingInspectionOrderParam routingInspectionOrderParam); + + /** + * 重新派工 + * @param routingInspectionOrderParam + */ + void reassignment(RoutingInspectionOrderParam routingInspectionOrderParam); } diff --git a/admin/src/main/java/com/hcy/admin/service/order/impl/RoutingInspectionOrderServiceImpl.java b/admin/src/main/java/com/hcy/admin/service/order/impl/RoutingInspectionOrderServiceImpl.java index 159cbbd..be6df13 100644 --- a/admin/src/main/java/com/hcy/admin/service/order/impl/RoutingInspectionOrderServiceImpl.java +++ b/admin/src/main/java/com/hcy/admin/service/order/impl/RoutingInspectionOrderServiceImpl.java @@ -11,14 +11,25 @@ import com.hcy.admin.validate.order.RoutingInspectionOrderParam; import com.hcy.admin.vo.order.RoutingInspectionOrderListVo; import com.hcy.admin.vo.order.RoutingInspectionOrderDetailVo; import com.hcy.common.core.PageResult; +import com.hcy.common.dto.OrderDto; +import com.hcy.common.dto.RoutingInspectionOrderDto; +import com.hcy.common.dto.result.OrderPageResultDto; +import com.hcy.common.entity.client.Client; +import com.hcy.common.entity.client.Equipment; import com.hcy.common.entity.order.Order; import com.hcy.common.entity.order.RoutingInspectionOrder; +import com.hcy.common.entity.system.SystemAuthAdmin; +import com.hcy.common.entity.warehouse.Warehouse; import com.hcy.common.enums.order.OrderStateEnum; +import com.hcy.common.mapper.client.ClientMapper; +import com.hcy.common.mapper.client.EquipmentMapper; import com.hcy.common.mapper.order.RoutingInspectionOrderMapper; +import com.hcy.common.mapper.system.SystemAuthAdminMapper; import com.hcy.common.utils.ArrayUtil; import com.hcy.common.utils.TimeUtil; import com.hcy.common.utils.UrlUtil; import com.hcy.common.config.GlobalConfig; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.util.Assert; @@ -36,6 +47,15 @@ public class RoutingInspectionOrderServiceImpl implements IRoutingInspectionOrde @Resource RoutingInspectionOrderMapper routingInspectionOrderMapper; + @Resource + EquipmentMapper equipmentMapper; + + @Resource + ClientMapper clientMapper; + + @Resource + SystemAuthAdminMapper systemAuthAdminMapper; + /** * 巡检订单列表 * @@ -46,22 +66,27 @@ public class RoutingInspectionOrderServiceImpl implements IRoutingInspectionOrde */ @Override public PageResult list(PageParam pageParam, Map params) { - Integer page = pageParam.getPageNo(); - Integer limit = pageParam.getPageSize(); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("is_delete", 0); - queryWrapper.orderByDesc("id"); + Page page = new Page<>(pageParam.getPageNo(), pageParam.getPageSize()); + RoutingInspectionOrderDto inspectionOrderDto = new RoutingInspectionOrderDto(); + + inspectionOrderDto.setOrderNo(StringUtils.isEmpty(params.get("orderNo")) ? null : params.get("orderNo")); + inspectionOrderDto.setClientName(StringUtils.isEmpty(params.get("clientName")) ? null : params.get("clientName")); + inspectionOrderDto.setDeviceName(StringUtils.isEmpty(params.get("deviceName")) ? null : params.get("deviceName")); + inspectionOrderDto.setReceiverName(StringUtils.isEmpty(params.get("receiverName")) ? null : params.get("receiverName")); + if(StringUtils.isNotEmpty(params.get("orderSource"))){ + inspectionOrderDto.setOrderSource(Long.valueOf(params.get("orderSource"))); + } + if(StringUtils.isNotEmpty(params.get("inspectionOrderStatus"))){ + inspectionOrderDto.setInspectionOrderStatus(Long.valueOf(params.get("inspectionOrderStatus"))); + } + + Page iPage = routingInspectionOrderMapper.pageList(page, inspectionOrderDto); - routingInspectionOrderMapper.setSearch(queryWrapper, params, new String[]{ - "=:orderNo@order_no:str", - "=:orderSource@order_source:long", - }); - IPage iPage = routingInspectionOrderMapper.selectPage(new Page<>(page, limit), queryWrapper); List list = new LinkedList<>(); - for(RoutingInspectionOrder item : iPage.getRecords()) { + for(RoutingInspectionOrderDto item : iPage.getRecords()) { RoutingInspectionOrderListVo vo = new RoutingInspectionOrderListVo(); BeanUtils.copyProperties(item, vo); vo.setCreateTime(String.valueOf(item.getCreateTime())); @@ -91,6 +116,29 @@ public class RoutingInspectionOrderServiceImpl implements IRoutingInspectionOrde RoutingInspectionOrderDetailVo vo = new RoutingInspectionOrderDetailVo(); BeanUtils.copyProperties(model, vo); + //客户名称 + Client client = clientMapper.selectOne( + new QueryWrapper() + .eq("id", model.getClientId()) + .last("limit 1")); + vo.setClientName(client.getClientName()); + //设备编号、名称、地址 + Equipment equipment = equipmentMapper.selectOne( + new QueryWrapper() + .eq("id", model.getDeviceId()) + .last("limit 1")); + vo.setDeviceNumber(equipment.getNumber()); + vo.setDeviceName(equipment.getName()); + vo.setDetailedAddress(equipment.getDetailedAddress()); + //接单人 + SystemAuthAdmin authAdmin = systemAuthAdminMapper.selectOne( + new QueryWrapper() + .eq("id", model.getReceiverId()) + .last("limit 1")); + if(authAdmin != null){ + vo.setReceiverName(authAdmin.getUsername()); + } + return vo; } @@ -106,10 +154,10 @@ public class RoutingInspectionOrderServiceImpl implements IRoutingInspectionOrde //model.setOrderNo(routingInspectionOrderParam.getOrderNo()); // 订单编号 //定时任务创建的巡检单是系统创建，客服的是客服创建 model.setOrderSource(OrderStateEnum.CUSTOMERSERVICECREATION.getStatus()); // 订单来源 1-系统创建；4-客服创建 + model.setRepairWorkOrderFlow(routingInspectionOrderParam.getRepairWorkOrderFlow()); // 工单去向(0=工单池，1=检修员) 工单去向是工单池的话，工单状态是待抢单 - if(routingInspectionOrderParam.getWorkOrderFlow() == OrderStateEnum.WORKORDERTANK.getStatus()){ + if(routingInspectionOrderParam.getRepairWorkOrderFlow() == OrderStateEnum.WORKORDERTANK.getStatus()){ model.setInspectionOrderStatus(OrderStateEnum.WAITINGLIST.getStatus()); // 订单状态 0-待抢单； - }else{ model.setInspectionOrderStatus(OrderStateEnum.PENDINGORDER.getStatus());// 订单状态 1-待接单； } @@ -144,13 +192,12 @@ public class RoutingInspectionOrderServiceImpl implements IRoutingInspectionOrde Assert.notNull(model, "数据不存在!"); - model.setClientId(routingInspectionOrderParam.getClientId()); - model.setDeviceId(routingInspectionOrderParam.getDeviceId()); - model.setProvinceId(routingInspectionOrderParam.getProvinceId()); - model.setCityId(routingInspectionOrderParam.getCityId()); - model.setDistrictId(routingInspectionOrderParam.getDistrictId()); - model.setReceiverId(routingInspectionOrderParam.getReceiverId()); - model.setRemark(routingInspectionOrderParam.getRemark()); + model.setReceiverType(routingInspectionOrderParam.getReceiverType()); // 派单方式 0-区域派单；1-距离派单 + model.setOrderDistance(routingInspectionOrderParam.getOrderDistance()); //派单距离 + model.setRemark(routingInspectionOrderParam.getRemark()); //备注 + if(routingInspectionOrderParam.getReceiverType() == 0){ //派单方式是区域派单的话派单距离清空 + model.setOrderDistance(null); //派单距离 + } routingInspectionOrderMapper.updateById(model); } @@ -174,4 +221,67 @@ public class RoutingInspectionOrderServiceImpl implements IRoutingInspectionOrde routingInspectionOrderMapper.updateById(model); } + /** + * 修改派单方式 + * + * @param routingInspectionOrderParam + */ + @Override + public void alterReceiverType(RoutingInspectionOrderParam routingInspectionOrderParam) { + RoutingInspectionOrder model = routingInspectionOrderMapper.selectOne( + new QueryWrapper() + .eq("id", routingInspectionOrderParam.getId()) + .eq("is_delete", 0) + .last("limit 1")); + + Assert.notNull(model, "数据不存在!"); + + model.setReceiverType(routingInspectionOrderParam.getReceiverType()); // 派单方式 0-区域派单；1-距离派单 + model.setOrderDistance(routingInspectionOrderParam.getOrderDistance()); //派单距离 + if(routingInspectionOrderParam.getReceiverType() == 0){ //派单方式是区域派单的话派单距离清空 + model.setOrderDistance(null); //派单距离 + } + routingInspectionOrderMapper.updateById(model); + } + + /** + * 修改抢单范围 + * + * @param routingInspectionOrderParam + */ + @Override + public void alterOrderDistance(RoutingInspectionOrderParam routingInspectionOrderParam) { + RoutingInspectionOrder model = routingInspectionOrderMapper.selectOne( + new QueryWrapper() + .eq("id", routingInspectionOrderParam.getId()) + .eq("is_delete", 0) + .last("limit 1")); + + Assert.notNull(model, "数据不存在!"); + + model.setOrderDistance(routingInspectionOrderParam.getOrderDistance()); //派单距离 + if(model.getReceiverType() == 0){ //派单方式是区域派单的话派单距离清空 + model.setOrderDistance(null); //派单距离 + } + routingInspectionOrderMapper.updateById(model); + } + + /** + * 重新派工 + * + * @param routingInspectionOrderParam + */ + @Override + public void reassignment(RoutingInspectionOrderParam routingInspectionOrderParam) { + RoutingInspectionOrder model = routingInspectionOrderMapper.selectOne( + new QueryWrapper() + .eq("id", routingInspectionOrderParam.getId()) + .eq("is_delete", 0) + .last("limit 1")); + + Assert.notNull(model, "数据不存在!"); + model.setReceiverId(routingInspectionOrderParam.getReceiverId()); + routingInspectionOrderMapper.updateById(model); + } + } 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 3c9f309..b68a35b 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 @@ -189,7 +189,15 @@ public class SystemAuthAdminServiceImpl implements ISystemAuthAdminService { systemAuthAdminVo.setUpdateTime(TimeUtil.timestampToDate(sysAdmin.getUpdateTime())); systemAuthAdminVo.setCreateTime(TimeUtil.timestampToDate(sysAdmin.getCreateTime())); systemAuthAdminVo.setLastLoginTime(TimeUtil.timestampToDate(sysAdmin.getLastLoginTime())); - + systemAuthAdminVo.setPlantId(sysAdmin.getPlantId()); + Plant model = plantMapper.selectOne( + new QueryWrapper() + .eq("id", sysAdmin.getPlantId()) + .eq("is_delete", 0) + .last("limit 1")); + if(model != null){ + systemAuthAdminVo.setPlantName(model.getName()); //工厂名 + } // 角色权限 List auths = new LinkedList<>(); if (adminId > 1) { diff --git a/admin/src/main/java/com/hcy/admin/validate/order/RoutingInspectionOrderParam.java b/admin/src/main/java/com/hcy/admin/validate/order/RoutingInspectionOrderParam.java index ca29e63..0633284 100644 --- a/admin/src/main/java/com/hcy/admin/validate/order/RoutingInspectionOrderParam.java +++ b/admin/src/main/java/com/hcy/admin/validate/order/RoutingInspectionOrderParam.java @@ -33,11 +33,9 @@ public class RoutingInspectionOrderParam implements Serializable { private Integer inspectionOrderStatus; - @NotNull(message = "clientId参数缺失", groups = {create.class, update.class}) @DecimalMin(value = "0", message = "clientId参数值不能少于0", groups = {create.class, update.class}) private Long clientId; - @NotNull(message = "deviceId参数缺失", groups = {create.class, update.class}) @DecimalMin(value = "0", message = "deviceId参数值不能少于0", groups = {create.class, update.class}) private Long deviceId; @@ -63,6 +61,6 @@ public class RoutingInspectionOrderParam implements Serializable { private Long creatorId; private Integer receiverType; // 接单类型 0-区域派单；1-距离派单 private BigDecimal orderDistance; // 订单距离 - private Integer workOrderFlow; // 工单去向 (0=工单池，1=检修员) + private Integer repairWorkOrderFlow; //工单去向 0=工单池 1=检修员 } diff --git a/admin/src/main/java/com/hcy/admin/vo/order/RoutingInspectionOrderDetailVo.java b/admin/src/main/java/com/hcy/admin/vo/order/RoutingInspectionOrderDetailVo.java index 7a1da38..67b367b 100644 --- a/admin/src/main/java/com/hcy/admin/vo/order/RoutingInspectionOrderDetailVo.java +++ b/admin/src/main/java/com/hcy/admin/vo/order/RoutingInspectionOrderDetailVo.java @@ -1,8 +1,13 @@ package com.hcy.admin.vo.order; +import com.hcy.admin.validate.order.RoutingInspectionOrderParam; import lombok.Data; +import org.hibernate.validator.constraints.Length; +import javax.validation.constraints.DecimalMin; +import javax.validation.constraints.NotNull; import java.io.Serializable; +import java.math.BigDecimal; import java.util.Date; /** @@ -15,16 +20,21 @@ public class RoutingInspectionOrderDetailVo implements Serializable { private Long id; // 主键id private String orderNo; // 订单编号 - private Long orderSource; // 订单来源 1-系统创建；4-客服创建 - private Long inspectionOrderStatus; // 订单状态 0-待抢单；1-待接单；2-接单超时；3-巡检中；4-已完成；5-已退单；6-待巡检 + private Integer orderSource; // 订单来源 1-系统创建；4-客服创建 + private Integer repairWorkOrderFlow; //工单去向 0=工单池 1=检修员 + private Integer inspectionOrderStatus; // 订单状态 0-待抢单；1-待接单；2-接单超时；3-巡检中；4-已完成；5-已退单；6-待巡检 private Long clientId; // 客户id private Long deviceId; // 设备id - private Long provinceId; // 省id - private Long cityId; // 市id - private Long districtId; // 区id private Long receiverId; // 接单人id private Date receiverTime; // 接单时间 private String remark; // 备注 - private Long creatorId; // 创建人id + private Integer creatorId; // 创建人id + private Integer receiverType; // 接单类型 0-区域派单；1-距离派单 + private BigDecimal orderDistance; // 订单距离 + private String clientName; // 客户名称 + private String deviceNumber; //设备编号 + private String deviceName; //设备名称 + private String detailedAddress; // 设备详细地址 + private String receiverName; // 接单人名称 } diff --git a/admin/src/main/java/com/hcy/admin/vo/order/RoutingInspectionOrderListVo.java b/admin/src/main/java/com/hcy/admin/vo/order/RoutingInspectionOrderListVo.java index 62309f2..5cb689b 100644 --- a/admin/src/main/java/com/hcy/admin/vo/order/RoutingInspectionOrderListVo.java +++ b/admin/src/main/java/com/hcy/admin/vo/order/RoutingInspectionOrderListVo.java @@ -18,6 +18,7 @@ public class RoutingInspectionOrderListVo implements Serializable { private String orderNo; // 订单编号 private Long orderSource; // 订单来源 1-系统创建；4-客服创建 private Long receiverType; // 接单类型 0-区域派单；1-距离派单 + private Long repairWorkOrderFlow; //工单去向 0=工单池 1=检修员 private Long provinceId; // 省id private Long cityId; // 市id private Long districtId; // 区id @@ -28,6 +29,7 @@ public class RoutingInspectionOrderListVo implements Serializable { private Long deviceId; // 设备id private String deviceNumber; //设备编号 private String deviceName; //设备名称 + private String detailedAddress; // 设备详细地址 private Long creatorId; // 创建人id private String creatorName; //创建人名称 private String createTime; // 创建时间 diff --git a/common/src/main/java/com/hcy/common/dto/RoutingInspectionOrderDto.java b/common/src/main/java/com/hcy/common/dto/RoutingInspectionOrderDto.java new file mode 100644 index 0000000..95b7744 --- /dev/null +++ b/common/src/main/java/com/hcy/common/dto/RoutingInspectionOrderDto.java @@ -0,0 +1,36 @@ +package com.hcy.common.dto; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +@Data +public class RoutingInspectionOrderDto implements Serializable { + private static final long serialVersionUID = 1L; + private Long id; // 主键id + private String orderNo; // 订单编号 + 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 + private String clientName; // 客户名称 + private Long deviceId; // 设备id + private String deviceNumber; //设备编号 + private String deviceName; //设备名称 + private String detailedAddress; // 设备详细地址 + private Long creatorId; // 创建人id + private String creatorName; //创建人名称 + private String createTime; // 创建时间 + private Long familiarFaultId; // 常见维修结论id + private String familiarFaultName; //故障类型 + private Long inspectionOrderStatus; // 订单状态 0-待抢单；1-待接单；2-接单超时；3-巡检中；4-已完成；5-已退单；6-待巡检 + private Long receiverId; // 接单人id + private String receiverName; // 接单人名称 + private Date receiverTime; // 接单时间 +} diff --git a/common/src/main/java/com/hcy/common/entity/order/RoutingInspectionOrder.java b/common/src/main/java/com/hcy/common/entity/order/RoutingInspectionOrder.java index fba5add..1de0c24 100644 --- a/common/src/main/java/com/hcy/common/entity/order/RoutingInspectionOrder.java +++ b/common/src/main/java/com/hcy/common/entity/order/RoutingInspectionOrder.java @@ -1,6 +1,8 @@ package com.hcy.common.entity.order; +import com.baomidou.mybatisplus.annotation.FieldStrategy; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import lombok.Data; @@ -20,6 +22,7 @@ public class RoutingInspectionOrder implements Serializable { private Long id; // 主键id private String orderNo; // 订单编号 private Integer orderSource; // 订单来源 1-系统创建；4-客服创建 + private Integer repairWorkOrderFlow; //工单去向 0=工单池 1=检修员 private Integer inspectionOrderStatus; // 订单状态 0-待抢单；1-待接单；2-接单超时；3-巡检中；4-已完成；5-已退单；6-待巡检 private Long clientId; // 客户id private Long deviceId; // 设备id @@ -30,6 +33,7 @@ public class RoutingInspectionOrder implements Serializable { private Long provinceId; // 省id private Long cityId; // 市id private Long districtId; // 区id + @TableField(updateStrategy = FieldStrategy.IGNORED) private BigDecimal orderDistance; // 订单距离 private BigDecimal totalAmount; // 总金额 private BigDecimal actualAmount; // 实际金额 diff --git a/common/src/main/java/com/hcy/common/mapper/order/RoutingInspectionOrderMapper.java b/common/src/main/java/com/hcy/common/mapper/order/RoutingInspectionOrderMapper.java index b912a69..dd831ab 100644 --- a/common/src/main/java/com/hcy/common/mapper/order/RoutingInspectionOrderMapper.java +++ b/common/src/main/java/com/hcy/common/mapper/order/RoutingInspectionOrderMapper.java @@ -1,13 +1,24 @@ package com.hcy.common.mapper.order; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.hcy.common.core.basics.IBaseMapper; +import com.hcy.common.dto.RoutingInspectionOrderDto; import com.hcy.common.entity.order.RoutingInspectionOrder; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; /** * 巡检订单Mapper */ @Mapper public interface RoutingInspectionOrderMapper extends IBaseMapper { + + /** + * 巡检单列表 + * @param page + * @param form + * @return + */ + Page pageList(@Param("page") Page page, @Param("form") RoutingInspectionOrderDto form); } diff --git a/common/src/main/resources/mapper/RoutingInspectionOrderMapper.xml b/common/src/main/resources/mapper/RoutingInspectionOrderMapper.xml new file mode 100644 index 0000000..384264c --- /dev/null +++ b/common/src/main/resources/mapper/RoutingInspectionOrderMapper.xml @@ -0,0 +1,46 @@ + + + + + + + + + + diff --git a/common/target/classes/mapper/RoutingInspectionOrderMapper.xml b/common/target/classes/mapper/RoutingInspectionOrderMapper.xml new file mode 100644 index 0000000..384264c --- /dev/null +++ b/common/target/classes/mapper/RoutingInspectionOrderMapper.xml @@ -0,0 +1,46 @@ + + + + + + + + + +