From 8c36f1c5a147b97968ec0aa40e88cd488c51f616 Mon Sep 17 00:00:00 2001 From: renfan <2206580733@qq.com> Date: Sat, 7 Sep 2024 23:01:34 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90admin&front=E3=80=91=E6=96=B0=E5=A2=9E?= =?UTF-8?q?&=E4=BC=98=E5=8C=96#=201=E3=80=81=E4=BF=AE=E5=A4=8D=E8=8B=A5?= =?UTF-8?q?=E5=B9=B2bug=202=E3=80=81=E6=96=B0=E5=A2=9E=E7=BB=B4=E4=BF=AE?= =?UTF-8?q?=E5=8D=95=E5=88=97=E8=A1=A8=E3=80=81=E6=96=B0=E5=A2=9E=E7=BB=B4?= =?UTF-8?q?=E4=BF=AE=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../validate/order/RepairOrderParam.java | 37 ++++++++++++--- .../admin/vo/order/RepairOrderDetailVo.java | 38 +++++++++++++--- .../hcy/admin/vo/order/RepairOrderListVo.java | 35 +++++++++++++-- .../hcy/common/dto/order/RepairOrderDto.java | 40 ++++++++++++++--- .../hcy/common/entity/order/RepairOrder.java | 45 +++++++++++++++---- .../enums/order/RepairOrderStatusEnum.java | 25 +++++------ .../mapper/MaintenanceOrderMapper.xml | 2 +- .../resources/mapper/RepairOrderMapper.xml | 4 +- .../mapper/RoutingInspectionOrderMapper.xml | 2 +- .../order/impl/RepairOrderServiceImpl.java | 42 +++++------------ .../validate/order/RepairOrderParam.java | 45 ++++++++++++++----- .../front/vo/order/RepairOrderDetailVo.java | 39 +++++++++++++--- .../hcy/front/vo/order/RepairOrderListVo.java | 38 +++++++++++++--- 13 files changed, 293 insertions(+), 99 deletions(-) diff --git a/admin/src/main/java/com/hcy/admin/validate/order/RepairOrderParam.java b/admin/src/main/java/com/hcy/admin/validate/order/RepairOrderParam.java index 4bfefd8..812d745 100644 --- a/admin/src/main/java/com/hcy/admin/validate/order/RepairOrderParam.java +++ b/admin/src/main/java/com/hcy/admin/validate/order/RepairOrderParam.java @@ -50,8 +50,6 @@ public class RepairOrderParam implements Serializable { @Length(max = 32, message = "clientPhone参数不能超出32个字符", groups = {create.class, update.class}) private String clientPhone; - @Length(max = 250, message = "faultDescription参数不能超出250个字符", groups = {create.class, update.class}) - private String faultDescription; @Length(max = 32, message = "moduleNumber参数不能超出32个字符", groups = {create.class, update.class}) private String moduleNumber; @@ -75,8 +73,7 @@ public class RepairOrderParam implements Serializable { @DecimalMin(value = "0", message = "priorityId参数值不能少于0", groups = {create.class, update.class}) private Integer priorityId; - @Length(max = 50, message = "expressName参数不能超出50个字符", groups = {create.class, update.class}) - private String expressName; + @DecimalMin(value = "0", message = "returnOrNot参数值不能少于0", groups = {create.class, update.class}) private Integer returnOrNot; @@ -95,10 +92,40 @@ public class RepairOrderParam implements Serializable { private BigDecimal orderDistance; // 订单距离 private Long receiverId; // 接单人id private Integer repairWorkOrderFlow; // 工单去向 0=工单池 1=检修员 - private Long faultId; // 故障id private BigDecimal totalAmount; // 总金额 private BigDecimal actualAmount; // 实际金额 private String returnCause; //退回原因 + private Integer priority; // 优先级（0=加急，1=普通） + private Integer reassignmentAgreeOrNot; // 改派是否同意（0=是，1=否） + private String dismantleRemark; // 拆机备注 + private String dismantleImg; // 拆机照片 + private String startCleaningRemark; // 开始清洗备注 + private String startCleaningImg; // 开始清洗照片 + private String investigationResultRemark; // 排查结果备注 + private String investigationResultImg; // 排查结果照片 + private String signatureImg; // 签名照片 + private String reinforcingThreeAntiPaintRemark; // 补强三防漆备注 + private String reinforcingThreeAntiPaintImg; // 补强三防漆照片 + private String reinforcingGlueRemark; // 补强点胶备注 + private String reinforcingGlueImg; // 补强点胶照片 + private String moduleAssemblyRemark; // 模块装配备注 + private String moduleAssemblyImg; // 模块装配照片 + private String dcAndPfcAssembleRemark; // DC&PFC组装备注 + private String dcAndPfcAssembleImg; // DC&PFC组装照片 + private Integer functionalTestPassed; // 功能测试是否通过（0=是，1=否） + private String functionalTestRemark; // 功能测试备注 + private String functionalTestImg; // 功能测试照片 + private Integer agingTestPassed; // 老化测试是否通过（0=是，1=否） + private String agingTestRemark; // 老化测试备注 + private String agingTestImg; // 老化测试照片 + private String expressName; // 快递名称 + private String expressNo; // 快递单号 + private String packageAndShipRemark; // 包装出货备注 + private String packageAndShipImg; // 包装出货照片 + private Long faultId; // 维修结论类型id + private String faultDescription; // 维修结论描述 + private String fillInTheReceiptRemark; // 填写回单备注 + private String fillInTheReceiptImg; // 填写回单照片 } diff --git a/admin/src/main/java/com/hcy/admin/vo/order/RepairOrderDetailVo.java b/admin/src/main/java/com/hcy/admin/vo/order/RepairOrderDetailVo.java index 23c15ed..757de1a 100644 --- a/admin/src/main/java/com/hcy/admin/vo/order/RepairOrderDetailVo.java +++ b/admin/src/main/java/com/hcy/admin/vo/order/RepairOrderDetailVo.java @@ -33,9 +33,7 @@ public class RepairOrderDetailVo implements Serializable { private String clientName; // 客户名称 private String clientContacts; // 客户联系人 private String clientPhone; // 客户联系电话 - private Long faultId; // 故障id - private String faultCode; // 故障代码 - private String faultDescription; // 故障描述 + private String moduleNumber; // 模块号 private String brand; // 品牌 private Long receiverId; // 接单人id @@ -49,8 +47,6 @@ public class RepairOrderDetailVo implements Serializable { private Long maintenanceOrderId; // 检修单id private Integer priorityId; // 优先级 0-普通 1-加急 private Integer logisticsMode; // 物流方式 0-物流快递 1=自领带回 - private String expressName; // 快递名称 - private String expressNo; // 快递单号 private Integer returnOrNot; // 是否回寄（0=是 1=否） private Long addressId; // 回寄地址 private String siteImg; // 现场照片 @@ -114,5 +110,35 @@ public class RepairOrderDetailVo implements Serializable { private Integer maintainType; // 客户维修类型 模块维修类型 0-全包 1-半包 private List orderOperateRecords; //订单操作记录 - + private Integer priority; // 优先级（0=加急，1=普通） + private Integer reassignmentAgreeOrNot; // 改派是否同意（0=是，1=否） + private String dismantleRemark; // 拆机备注 + private String dismantleImg; // 拆机照片 + private String startCleaningRemark; // 开始清洗备注 + private String startCleaningImg; // 开始清洗照片 + private String investigationResultRemark; // 排查结果备注 + private String investigationResultImg; // 排查结果照片 + private String signatureImg; // 签名照片 + private String reinforcingThreeAntiPaintRemark; // 补强三防漆备注 + private String reinforcingThreeAntiPaintImg; // 补强三防漆照片 + private String reinforcingGlueRemark; // 补强点胶备注 + private String reinforcingGlueImg; // 补强点胶照片 + private String moduleAssemblyRemark; // 模块装配备注 + private String moduleAssemblyImg; // 模块装配照片 + private String dcAndPfcAssembleRemark; // DC&PFC组装备注 + private String dcAndPfcAssembleImg; // DC&PFC组装照片 + private Integer functionalTestPassed; // 功能测试是否通过（0=是，1=否） + private String functionalTestRemark; // 功能测试备注 + private String functionalTestImg; // 功能测试照片 + private Integer agingTestPassed; // 老化测试是否通过（0=是，1=否） + private String agingTestRemark; // 老化测试备注 + private String agingTestImg; // 老化测试照片 + private String expressName; // 快递名称 + private String expressNo; // 快递单号 + private String packageAndShipRemark; // 包装出货备注 + private String packageAndShipImg; // 包装出货照片 + private Long faultId; // 维修结论类型id + private String faultDescription; // 维修结论描述 + private String fillInTheReceiptRemark; // 填写回单备注 + private String fillInTheReceiptImg; // 填写回单照片 } diff --git a/admin/src/main/java/com/hcy/admin/vo/order/RepairOrderListVo.java b/admin/src/main/java/com/hcy/admin/vo/order/RepairOrderListVo.java index f39b27a..c334c1f 100644 --- a/admin/src/main/java/com/hcy/admin/vo/order/RepairOrderListVo.java +++ b/admin/src/main/java/com/hcy/admin/vo/order/RepairOrderListVo.java @@ -25,8 +25,7 @@ public class RepairOrderListVo implements Serializable { private String shortName; //客户简称 private String clientContacts; // 客户联系人 private String clientPhone; // 客户联系电话 - private Long faultId; // 故障id - private String faultDescription; // 故障描述 + private String moduleNumber; // 模块号 private String brand; // 品牌 private Long receiverId; // 接单人id @@ -40,7 +39,6 @@ public class RepairOrderListVo implements Serializable { private Long maintenanceOrderId; // 检修单id private Integer priorityId; // 优先级 0-普通 1-加急 private Integer logisticsMode; // 物流方式 0-物流快递 1=自领带回 - private String expressName; // 快递名称 private Integer returnOrNot; // 是否回寄（0=是 1=否） private Long addressId; // 回寄地址 private String siteImg; // 现场照片 @@ -75,4 +73,35 @@ public class RepairOrderListVo implements Serializable { private SparePartStockAuditDetailVo sparePartStockAudit; //备件领用信息 + private Integer priority; // 优先级（0=加急，1=普通） + private Integer reassignmentAgreeOrNot; // 改派是否同意（0=是，1=否） + private String dismantleRemark; // 拆机备注 + private String dismantleImg; // 拆机照片 + private String startCleaningRemark; // 开始清洗备注 + private String startCleaningImg; // 开始清洗照片 + private String investigationResultRemark; // 排查结果备注 + private String investigationResultImg; // 排查结果照片 + private String signatureImg; // 签名照片 + private String reinforcingThreeAntiPaintRemark; // 补强三防漆备注 + private String reinforcingThreeAntiPaintImg; // 补强三防漆照片 + private String reinforcingGlueRemark; // 补强点胶备注 + private String reinforcingGlueImg; // 补强点胶照片 + private String moduleAssemblyRemark; // 模块装配备注 + private String moduleAssemblyImg; // 模块装配照片 + private String dcAndPfcAssembleRemark; // DC&PFC组装备注 + private String dcAndPfcAssembleImg; // DC&PFC组装照片 + private Integer functionalTestPassed; // 功能测试是否通过（0=是，1=否） + private String functionalTestRemark; // 功能测试备注 + private String functionalTestImg; // 功能测试照片 + private Integer agingTestPassed; // 老化测试是否通过（0=是，1=否） + private String agingTestRemark; // 老化测试备注 + private String agingTestImg; // 老化测试照片 + private String expressName; // 快递名称 + private String expressNo; // 快递单号 + private String packageAndShipRemark; // 包装出货备注 + private String packageAndShipImg; // 包装出货照片 + private Long faultId; // 维修结论类型id + private String faultDescription; // 维修结论描述 + private String fillInTheReceiptRemark; // 填写回单备注 + private String fillInTheReceiptImg; // 填写回单照片 } diff --git a/common/src/main/java/com/hcy/common/dto/order/RepairOrderDto.java b/common/src/main/java/com/hcy/common/dto/order/RepairOrderDto.java index afc3d3f..4d0615a 100644 --- a/common/src/main/java/com/hcy/common/dto/order/RepairOrderDto.java +++ b/common/src/main/java/com/hcy/common/dto/order/RepairOrderDto.java @@ -23,10 +23,8 @@ public class RepairOrderDto implements Serializable { private Long equipmentId; // 设备id private String clientName; // 客户名称 private String shortName; //客户简称 - private Long faultId; // 故障id - private String faultCode; // 故障代码 - private String faultDescription; // 故障描述 - private String moduleNumber; // 模块号 + + private String moduleNumber; // 模块型号 private String brand; // 品牌 private Long receiverId; // 接单人id private String receiverName; //接单人名称 @@ -37,9 +35,7 @@ public class RepairOrderDto implements Serializable { private Date createTime; // 创建时间 private Date updateTime; // 更新时间 private Long maintenanceOrderId; // 检修单id - private Integer priorityId; // 优先级 0-普通 1-加急 private Integer logisticsMode; // 物流方式 0-物流快递 1=自领带回 - private String expressName; // 快递名称 private Integer returnOrNot; // 是否回寄（0=是 1=否） private Long addressId; // 回寄地址 private String siteImg; // 现场照片 @@ -83,4 +79,36 @@ public class RepairOrderDto implements Serializable { private Long clientScrapAddressId; // 客户报废收货地址 private Long scrapConfirmation; // 报废确认（0=是，1=否） + private Integer priority; // 优先级（0=加急，1=普通） + private Integer reassignmentAgreeOrNot; // 改派是否同意（0=是，1=否） + private String dismantleRemark; // 拆机备注 + private String dismantleImg; // 拆机照片 + private String startCleaningRemark; // 开始清洗备注 + private String startCleaningImg; // 开始清洗照片 + private String investigationResultRemark; // 排查结果备注 + private String investigationResultImg; // 排查结果照片 + private String signatureImg; // 签名照片 + private String reinforcingThreeAntiPaintRemark; // 补强三防漆备注 + private String reinforcingThreeAntiPaintImg; // 补强三防漆照片 + private String reinforcingGlueRemark; // 补强点胶备注 + private String reinforcingGlueImg; // 补强点胶照片 + private String moduleAssemblyRemark; // 模块装配备注 + private String moduleAssemblyImg; // 模块装配照片 + private String dcAndPfcAssembleRemark; // DC&PFC组装备注 + private String dcAndPfcAssembleImg; // DC&PFC组装照片 + private Integer functionalTestPassed; // 功能测试是否通过（0=是，1=否） + private String functionalTestRemark; // 功能测试备注 + private String functionalTestImg; // 功能测试照片 + private Integer agingTestPassed; // 老化测试是否通过（0=是，1=否） + private String agingTestRemark; // 老化测试备注 + private String agingTestImg; // 老化测试照片 + private String expressName; // 快递名称 + private String expressNo; // 快递单号 + private String packageAndShipRemark; // 包装出货备注 + private String packageAndShipImg; // 包装出货照片 + private Long faultId; // 维修结论类型id + private String faultDescription; // 维修结论描述 + private String fillInTheReceiptRemark; // 填写回单备注 + private String fillInTheReceiptImg; // 填写回单照片 + private String moduleCode; // 模块代码 } diff --git a/common/src/main/java/com/hcy/common/entity/order/RepairOrder.java b/common/src/main/java/com/hcy/common/entity/order/RepairOrder.java index e8b8c72..b74773f 100644 --- a/common/src/main/java/com/hcy/common/entity/order/RepairOrder.java +++ b/common/src/main/java/com/hcy/common/entity/order/RepairOrder.java @@ -22,15 +22,12 @@ public class RepairOrder implements Serializable { private Long id; // 主键id private String orderNo; // 订单编号 private Integer orderSource; // 订单来源 0-客户上报；1-系统创建；2-维修员创建；3-检修员创建；4-客服创建；5-维修主管创建 - private Integer orderStatus; // 订单状态 0-待抢单；1-待接单；2-接单超时；3-检测中；4-待客户确认；5-维修中；6-已完成；7-已退单；8-已关闭 + private Integer orderStatus; // 订单状态 0-待接单；1-待维修；2-排查中；3-待确认；4-维修中；5-测试中；6-已完成； private Long clientId; // 客户id private Long equipmentId; // 设备id - private Long faultId; // 故障id - private String faultCode; // 故障代码 - private String faultDescription; // 故障描述 + private String moduleNumber; // 模块号 private String brand; // 品牌 - private Integer receiverType; // 接单类型 0-区域派单；1-距离派单 private BigDecimal orderDistance; // 订单距离 private Long provinceId; // 省id private Long cityId; // 市id @@ -55,15 +52,11 @@ public class RepairOrder implements Serializable { private Date createTime; // 创建时间 private Date updateTime; // 更新时间 private Integer isDelete; // 是否删除 0-未删除 1-删除 - private Integer repairWorkOrderFlow; // 工单去向 0=工单池 1=检修员 private Integer isMaintain; // 是否维修 0-维修 1-不维修 private Integer warehouseType; // 仓库类型 0-我的仓库 1-公共仓库 private Long maintenanceOrderId; // 检修单id private Long userId; // 送修人 - private Integer priorityId; // 优先级 0-普通 1-加急 private Integer logisticsMode; // 物流方式 0-物流快递 1=自领带回 - private String expressName; // 快递名称 - private String expressNo; // 快递单号 private Integer returnOrNot; // 是否回寄（0=是 1=否） private Long addressId; // 回寄地址 private String siteImg; // 现场照片 @@ -83,4 +76,38 @@ public class RepairOrder implements Serializable { private String completeImg; // 完工照片 private Long clientScrapAddressId; // 客户报废收货地址 private Long scrapConfirmation; // 报废确认（0=是，1=否） + + private Integer priority; // 优先级（0=加急，1=普通） + private Integer reassignmentAgreeOrNot; // 改派是否同意（0=是，1=否） + private String dismantleRemark; // 拆机备注 + private String dismantleImg; // 拆机照片 + private String startCleaningRemark; // 开始清洗备注 + private String startCleaningImg; // 开始清洗照片 + private String investigationResultRemark; // 排查结果备注 + private String investigationResultImg; // 排查结果照片 + private String signatureImg; // 签名照片 + private String reinforcingThreeAntiPaintRemark; // 补强三防漆备注 + private String reinforcingThreeAntiPaintImg; // 补强三防漆照片 + private String reinforcingGlueRemark; // 补强点胶备注 + private String reinforcingGlueImg; // 补强点胶照片 + private String moduleAssemblyRemark; // 模块装配备注 + private String moduleAssemblyImg; // 模块装配照片 + private String dcAndPfcAssembleRemark; // DC&PFC组装备注 + private String dcAndPfcAssembleImg; // DC&PFC组装照片 + private Integer functionalTestPassed; // 功能测试是否通过（0=是，1=否） + private String functionalTestRemark; // 功能测试备注 + private String functionalTestImg; // 功能测试照片 + private Integer agingTestPassed; // 老化测试是否通过（0=是，1=否） + private String agingTestRemark; // 老化测试备注 + private String agingTestImg; // 老化测试照片 + private String expressName; // 快递名称 + private String expressNo; // 快递单号 + private String packageAndShipRemark; // 包装出货备注 + private String packageAndShipImg; // 包装出货照片 + private Long faultId; // 维修结论类型id + private String faultDescription; // 维修结论描述 + private String fillInTheReceiptRemark; // 填写回单备注 + private String fillInTheReceiptImg; // 填写回单照片 + + private String moduleCode; // 模块代码 } \ No newline at end of file diff --git a/common/src/main/java/com/hcy/common/enums/order/RepairOrderStatusEnum.java b/common/src/main/java/com/hcy/common/enums/order/RepairOrderStatusEnum.java index 42dbdb0..6bf910d 100644 --- a/common/src/main/java/com/hcy/common/enums/order/RepairOrderStatusEnum.java +++ b/common/src/main/java/com/hcy/common/enums/order/RepairOrderStatusEnum.java @@ -10,22 +10,17 @@ import java.util.Map; */ public enum RepairOrderStatusEnum { - //订单状态 0-待抢单；1-待接单；2-接单超时；3-巡检中；4-已完成；5-已退单；6-待巡检 - WAITING_LIST(0,"待抢单"), - PENDING_ORDER(1,"待接单"), - ORDER_TIMEOUT(2,"接单超时"), - CHECKING(3,"检测中"), - WAIT_CONFIRMATION(4,"待确认"), - MAINTENANCE_ING(5,"维修中"), + //订单状态 0-待接单；1-待维修；2-排查中；3-待确认；4-维修中；5-测试中；6-已完成； + PENDING_ORDER(0,"待接单"), + AWAITING_REPAIR(1,"待维修"), + UNDER_INVESTIGATION(2,"排查中"), + TO_BE_CONFIRMED(3,"待确认"), + IN_MAINTENANCE(4,"维修中"), + TEST_IN_PROCESS(5,"测试中"), FINISHED(6,"已完成"), - CHARGEBACK(7,"已退单"), - CLOSED(8,"已关闭"), - - NEAREST_TO_ME(0,"离我最近"), - TIME_PRIORITY(1,"时间优先"), CLIENT(0,"客户端"), - REPAIRER(1,"检修员"), + REPAIRER(1,"维修员"), MAINTAIN(0,"维修"), NOT_MAINTAIN(1,"不维修"), @@ -33,6 +28,10 @@ public enum RepairOrderStatusEnum { MY_WAREHOUSE(0,"我的仓库"), PUBLIC_WAREHOUSE(1,"全部仓库"), + // 优先级（0=加急，1=普通） + URGENT(0,"加急"), + COMMON(1,"普通"), + // 是否报废（0=是，1=否） YES(0,"是"), NO(1, "否"); diff --git a/common/src/main/resources/mapper/MaintenanceOrderMapper.xml b/common/src/main/resources/mapper/MaintenanceOrderMapper.xml index 843a547..b78b233 100644 --- a/common/src/main/resources/mapper/MaintenanceOrderMapper.xml +++ b/common/src/main/resources/mapper/MaintenanceOrderMapper.xml @@ -65,7 +65,7 @@ and lmo.create_time >= #{param.createTimeStart} - + and lmo.create_time <= #{param.createTimeEnd} diff --git a/common/src/main/resources/mapper/RepairOrderMapper.xml b/common/src/main/resources/mapper/RepairOrderMapper.xml index 7beebd9..9af131e 100644 --- a/common/src/main/resources/mapper/RepairOrderMapper.xml +++ b/common/src/main/resources/mapper/RepairOrderMapper.xml @@ -61,9 +61,9 @@ and c.client_name LIKE concat('%', #{form.clientName}, '%') - + and ro.receiver_id = #{form.receiverId} diff --git a/common/src/main/resources/mapper/RoutingInspectionOrderMapper.xml b/common/src/main/resources/mapper/RoutingInspectionOrderMapper.xml index dadb62d..4aff5d0 100644 --- a/common/src/main/resources/mapper/RoutingInspectionOrderMapper.xml +++ b/common/src/main/resources/mapper/RoutingInspectionOrderMapper.xml @@ -86,7 +86,7 @@ and i.order_status = #{param.orderStatus} - and i.order_status in (#{param.orderStatusIds}) + and find_in_set(i.order_status,#{param.orderStatusIds}) ORDER BY create_time DESC diff --git a/front/src/main/java/com/hcy/front/service/order/impl/RepairOrderServiceImpl.java b/front/src/main/java/com/hcy/front/service/order/impl/RepairOrderServiceImpl.java index 983d408..02d5159 100644 --- a/front/src/main/java/com/hcy/front/service/order/impl/RepairOrderServiceImpl.java +++ b/front/src/main/java/com/hcy/front/service/order/impl/RepairOrderServiceImpl.java @@ -560,16 +560,10 @@ public class RepairOrderServiceImpl implements IRepairOrderService { RepairOrderDto repairOrderDto = new RepairOrderDto(); BeanUtils.copyProperties(repairOrderParam,repairOrderDto); - if(repairOrderParam.getIsClient() == MaintenanceOrderStatusEnum.REPAIRER.getStatus()){ - repairOrderDto.setReceiverId(FrontThreadLocal.getUserId().longValue()); - if(StringUtils.isEmpty(repairOrderParam.getOrderStatusIds())){ - repairOrderDto.setOrderStatusIds("1,2,7,8"); - } + if(repairOrderParam.getIsClient() == RepairOrderStatusEnum.REPAIRER.getStatus()){ + repairOrderDto.setReceiverId(FrontThreadLocal.getUserId().longValue()); // 接单人id }else{ - if(StringUtils.isEmpty(repairOrderParam.getOrderStatusIds())){ - repairOrderDto.setOrderStatusIds("0,1,2,7,8"); - } - repairOrderDto.setClientId(repairOrderDto.getClientId()); + repairOrderDto.setClientId(repairOrderDto.getClientId()); // 根据客户id进行查询 } IPage iPage = repairOrderMapper.pageList(new Page<>(page, limit), repairOrderDto); @@ -578,7 +572,7 @@ public class RepairOrderServiceImpl implements IRepairOrderService { for(RepairOrderDto item : iPage.getRecords()) { RepairOrderListVo vo = new RepairOrderListVo(); BeanUtils.copyProperties(item, vo); - //管辖工厂 + /*//管辖工厂 SystemAuthAdmin authAdmin = systemAuthAdminMapper.selectOne( new QueryWrapper() .eq("user_id", vo.getCreatorId())); @@ -590,7 +584,7 @@ public class RepairOrderServiceImpl implements IRepairOrderService { vo.setPlantId(plant.getId()); vo.setPlantName(plant.getName()); } - } + }*/ //故障类型名称 Fault faultName = faultMapper.selectOne( new LambdaQueryWrapper() @@ -775,25 +769,12 @@ public class RepairOrderServiceImpl implements IRepairOrderService { RepairOrder model = new RepairOrder(); model.setOrderNo(getOrderNo()); //工单编号 - model.setOrderStatus(RepairOrderStatusEnum.WAITING_LIST.getStatus()); // 订单状态 0-待抢单；1-待接单；2-接单超时；3-检测中；4-待客户确认；5-维修中；6-已完成；7-已退单；8-已关闭 + model.setOrderStatus(RepairOrderStatusEnum.PENDING_ORDER.getStatus()); // 维修单工单状态：0-待接单；1-待维修；2-排查中；3-待确认；4-维修中；5-测试中；6-已完成； model.setOrderSource(OrderStateEnum.MAINTENANCE_SUPERVISOR_CREATION.getStatus()); //订单来源 5-维修主管创建 - model.setRepairWorkOrderFlow(OrderStateEnum.WORK_ORDER_TANK.getStatus()); // 工单去向 0=工单池 1=检修员 - model.setReceiverType(OrderStateEnum.REGIONAL_DISPATCH.getStatus()); // 接单类型 0-区域派单；1-距离派单 - model.setClientId(repairOrderParam.getClientId()); // 客户id - model.setEquipmentId(repairOrderParam.getEquipmentId()); // 设备id - model.setFaultDescription(repairOrderParam.getFaultDescription()); // 故障描述 - model.setModuleNumber(repairOrderParam.getModuleNumber()); // 模块号 - model.setBrand(repairOrderParam.getBrand()); // 品牌 - model.setRemark(repairOrderParam.getRemark()); // 备注 - - model.setMaintenanceOrderId(repairOrderParam.getMaintenanceOrderId()); // 检修单id - model.setPriorityId(repairOrderParam.getPriorityId()); // 优先级 0-普通 1-加急 - model.setLogisticsMode(repairOrderParam.getLogisticsMode()); // 物流方式 0-物流快递 1=自领带回 - model.setExpressName(repairOrderParam.getExpressName()); // 快递名称 - model.setReturnOrNot(repairOrderParam.getReturnOrNot()); // 是否回寄（0=是 1=否） - model.setAddressId(repairOrderParam.getAddressId()); // 回寄地址 - model.setSiteImg(repairOrderParam.getSiteImg()); // 现场照片 + model.setModuleNumber(repairOrderParam.getModuleNumber()); // 模块型号 + model.setModuleCode(repairOrderParam.getModuleCode()); // 模块代码 + model.setPriority(repairOrderParam.getPriority()); // 优先级 // 获取当前的用户 model.setCreatorId(FrontThreadLocal.getUserId().longValue()); // 创建人id @@ -895,13 +876,13 @@ public class RepairOrderServiceImpl implements IRepairOrderService { if(repairOrder.getOrderStatus() == MaintenanceOrderStatusEnum.CHECKING.getStatus() || repairOrder.getOrderStatus() == MaintenanceOrderStatusEnum.PENDING_ORDER.getStatus()){ - if(repairOrder.getRepairWorkOrderFlow() == OrderStateEnum.WORK_ORDER_TANK.getStatus()){ + /*if(repairOrder.getRepairWorkOrderFlow() == OrderStateEnum.WORK_ORDER_TANK.getStatus()){ repairOrder.setOrderStatus(MaintenanceOrderStatusEnum.WAITING_LIST.getStatus()); repairOrder.setReceiverId(null); repairOrder.setReceiverTime(null); }else{ repairOrder.setOrderStatus(MaintenanceOrderStatusEnum.CHARGEBACK.getStatus()); - } + }*/ repairOrderMapper.updateById(repairOrder); @@ -995,7 +976,6 @@ public class RepairOrderServiceImpl implements IRepairOrderService { } repairOrder.setFaultId(repairOrderParam.getFaultId()); //故障原因id - repairOrder.setFaultCode(repairOrderParam.getFaultCode()); //故障代码 repairOrder.setPreMaintenanceImg(repairOrderParam.getPreMaintenanceImg()); // 维修前图片 repairOrder.setFaultPointImg(repairOrderParam.getFaultPointImg()); //故障点图片 repairOrder.setScrapOrNot(repairOrderParam.getScrapOrNot()); // 是否报废（0=是，1=否） diff --git a/front/src/main/java/com/hcy/front/validate/order/RepairOrderParam.java b/front/src/main/java/com/hcy/front/validate/order/RepairOrderParam.java index 4dae7bb..b384ff2 100644 --- a/front/src/main/java/com/hcy/front/validate/order/RepairOrderParam.java +++ b/front/src/main/java/com/hcy/front/validate/order/RepairOrderParam.java @@ -52,9 +52,6 @@ public class RepairOrderParam implements Serializable { @Length(max = 32, message = "clientPhone参数不能超出32个字符", groups = {create.class, update.class}) private String clientPhone; - @Length(max = 250, message = "faultDescription参数不能超出250个字符", groups = {create.class, update.class}) - private String faultDescription; - @Length(max = 32, message = "moduleNumber参数不能超出32个字符", groups = {create.class, update.class}) private String moduleNumber; @@ -74,12 +71,6 @@ public class RepairOrderParam implements Serializable { @DecimalMin(value = "0", message = "maintenanceOrderId参数值不能少于0", groups = {create.class, update.class}) private Long maintenanceOrderId; - @DecimalMin(value = "0", message = "priorityId参数值不能少于0", groups = {create.class, update.class}) - private Integer priorityId; - - @Length(max = 50, message = "expressName参数不能超出50个字符", groups = {create.class, update.class}) - private String expressName; - @DecimalMin(value = "0", message = "returnOrNot参数值不能少于0", groups = {create.class, update.class}) private Integer returnOrNot; @@ -102,7 +93,7 @@ public class RepairOrderParam implements Serializable { private Double longitude; // 经度 private Double latitude; // 纬度 private Integer queryType; // 查询类型 0-离我最近 1-时间优先 - private Long faultId; // 故障id + private Date cancelOrderTime; // 取消订单时间 private String cancelCause; // 取消原因 @@ -128,7 +119,6 @@ public class RepairOrderParam implements Serializable { private Long consigneeAddressId; // 收件地址 private String clientScrapRemark; // 客户报废备注 - private String expressNo; // 快递单号 private Long familiarFaultId; // 常见维修结论id private String familiarFaultDescription; // 常见维修结论描述 private Integer isConfirmReceipt; //是否确认收货 0-未收货 1-已收货 @@ -136,4 +126,37 @@ public class RepairOrderParam implements Serializable { private Long clientScrapAddressId; // 客户报废收货地址 private Long scrapConfirmation; // 报废确认（0=是，1=否） + private Integer priority; // 优先级（0=加急，1=普通） + private Integer reassignmentAgreeOrNot; // 改派是否同意（0=是，1=否） + private String dismantleRemark; // 拆机备注 + private String dismantleImg; // 拆机照片 + private String startCleaningRemark; // 开始清洗备注 + private String startCleaningImg; // 开始清洗照片 + private String investigationResultRemark; // 排查结果备注 + private String investigationResultImg; // 排查结果照片 + private String signatureImg; // 签名照片 + private String reinforcingThreeAntiPaintRemark; // 补强三防漆备注 + private String reinforcingThreeAntiPaintImg; // 补强三防漆照片 + private String reinforcingGlueRemark; // 补强点胶备注 + private String reinforcingGlueImg; // 补强点胶照片 + private String moduleAssemblyRemark; // 模块装配备注 + private String moduleAssemblyImg; // 模块装配照片 + private String dcAndPfcAssembleRemark; // DC&PFC组装备注 + private String dcAndPfcAssembleImg; // DC&PFC组装照片 + private Integer functionalTestPassed; // 功能测试是否通过（0=是，1=否） + private String functionalTestRemark; // 功能测试备注 + private String functionalTestImg; // 功能测试照片 + private Integer agingTestPassed; // 老化测试是否通过（0=是，1=否） + private String agingTestRemark; // 老化测试备注 + private String agingTestImg; // 老化测试照片 + private String expressName; // 快递名称 + private String expressNo; // 快递单号 + private String packageAndShipRemark; // 包装出货备注 + private String packageAndShipImg; // 包装出货照片 + private Long faultId; // 维修结论类型id + private String faultDescription; // 维修结论描述 + private String fillInTheReceiptRemark; // 填写回单备注 + private String fillInTheReceiptImg; // 填写回单照片 + + private String moduleCode; // 模块代码 } diff --git a/front/src/main/java/com/hcy/front/vo/order/RepairOrderDetailVo.java b/front/src/main/java/com/hcy/front/vo/order/RepairOrderDetailVo.java index 223cc76..9313622 100644 --- a/front/src/main/java/com/hcy/front/vo/order/RepairOrderDetailVo.java +++ b/front/src/main/java/com/hcy/front/vo/order/RepairOrderDetailVo.java @@ -30,9 +30,6 @@ public class RepairOrderDetailVo implements Serializable { private String clientName; // 客户名称 private String clientContacts; // 客户联系人 private String clientPhone; // 客户联系电话 - private Long faultId; // 故障id - private String faultCode; // 故障代码 - private String faultDescription; // 故障描述 private String moduleNumber; // 模块号 private String brand; // 品牌 private Long receiverId; // 接单人id @@ -44,10 +41,7 @@ public class RepairOrderDetailVo implements Serializable { private Date createTime; // 创建时间 private Date updateTime; // 更新时间 private Long maintenanceOrderId; // 检修单id - private Integer priorityId; // 优先级 0-普通 1-加急 private Integer logisticsMode; // 物流方式 0-物流快递 1=自领带回 - private String expressName; // 快递名称 - private String expressNo; // 快递单号 private Integer returnOrNot; // 是否回寄（0=是 1=否） private Long addressId; // 回寄地址 private String siteImg; // 现场照片 @@ -101,4 +95,37 @@ public class RepairOrderDetailVo implements Serializable { private Long scrapConfirmation; // 报废确认（0=是，1=否） private Integer warehouseType; // 仓库类型 0-我的仓库 1-公共仓库 + private Integer priority; // 优先级（0=加急，1=普通） + private Integer reassignmentAgreeOrNot; // 改派是否同意（0=是，1=否） + private String dismantleRemark; // 拆机备注 + private String dismantleImg; // 拆机照片 + private String startCleaningRemark; // 开始清洗备注 + private String startCleaningImg; // 开始清洗照片 + private String investigationResultRemark; // 排查结果备注 + private String investigationResultImg; // 排查结果照片 + private String signatureImg; // 签名照片 + private String reinforcingThreeAntiPaintRemark; // 补强三防漆备注 + private String reinforcingThreeAntiPaintImg; // 补强三防漆照片 + private String reinforcingGlueRemark; // 补强点胶备注 + private String reinforcingGlueImg; // 补强点胶照片 + private String moduleAssemblyRemark; // 模块装配备注 + private String moduleAssemblyImg; // 模块装配照片 + private String dcAndPfcAssembleRemark; // DC&PFC组装备注 + private String dcAndPfcAssembleImg; // DC&PFC组装照片 + private Integer functionalTestPassed; // 功能测试是否通过（0=是，1=否） + private String functionalTestRemark; // 功能测试备注 + private String functionalTestImg; // 功能测试照片 + private Integer agingTestPassed; // 老化测试是否通过（0=是，1=否） + private String agingTestRemark; // 老化测试备注 + private String agingTestImg; // 老化测试照片 + private String expressName; // 快递名称 + private String expressNo; // 快递单号 + private String packageAndShipRemark; // 包装出货备注 + private String packageAndShipImg; // 包装出货照片 + private Long faultId; // 维修结论类型id + private String faultDescription; // 维修结论描述 + private String fillInTheReceiptRemark; // 填写回单备注 + private String fillInTheReceiptImg; // 填写回单照片 + + private String moduleCode; // 模块代码 } diff --git a/front/src/main/java/com/hcy/front/vo/order/RepairOrderListVo.java b/front/src/main/java/com/hcy/front/vo/order/RepairOrderListVo.java index 8c8bd52..36f130d 100644 --- a/front/src/main/java/com/hcy/front/vo/order/RepairOrderListVo.java +++ b/front/src/main/java/com/hcy/front/vo/order/RepairOrderListVo.java @@ -24,9 +24,6 @@ public class RepairOrderListVo implements Serializable { private String clientName; // 客户名称 private String clientContacts; // 客户联系人 private String clientPhone; // 客户联系电话 - private Long faultId; // 故障id - private String faultCode; // 故障代码 - private String faultDescription; // 故障描述 private String moduleNumber; // 模块号 private String brand; // 品牌 private Long receiverId; // 接单人id @@ -38,9 +35,7 @@ public class RepairOrderListVo implements Serializable { private Date createTime; // 创建时间 private Date updateTime; // 更新时间 private Long maintenanceOrderId; // 检修单id - private Integer priorityId; // 优先级 0-普通 1-加急 private Integer logisticsMode; // 物流方式 0-物流快递 1=自领带回 - private String expressName; // 快递名称 private Integer returnOrNot; // 是否回寄（0=是 1=否） private Long addressId; // 回寄地址 private String siteImg; // 现场照片 @@ -81,4 +76,37 @@ public class RepairOrderListVo implements Serializable { private Long scrapConfirmation; // 报废确认（0=是，1=否） private SparePartStockAuditDetailVo sparePartStockAudit; //备件领用信息 + + private Integer priority; // 优先级（0=加急，1=普通） + private Integer reassignmentAgreeOrNot; // 改派是否同意（0=是，1=否） + private String dismantleRemark; // 拆机备注 + private String dismantleImg; // 拆机照片 + private String startCleaningRemark; // 开始清洗备注 + private String startCleaningImg; // 开始清洗照片 + private String investigationResultRemark; // 排查结果备注 + private String investigationResultImg; // 排查结果照片 + private String signatureImg; // 签名照片 + private String reinforcingThreeAntiPaintRemark; // 补强三防漆备注 + private String reinforcingThreeAntiPaintImg; // 补强三防漆照片 + private String reinforcingGlueRemark; // 补强点胶备注 + private String reinforcingGlueImg; // 补强点胶照片 + private String moduleAssemblyRemark; // 模块装配备注 + private String moduleAssemblyImg; // 模块装配照片 + private String dcAndPfcAssembleRemark; // DC&PFC组装备注 + private String dcAndPfcAssembleImg; // DC&PFC组装照片 + private Integer functionalTestPassed; // 功能测试是否通过（0=是，1=否） + private String functionalTestRemark; // 功能测试备注 + private String functionalTestImg; // 功能测试照片 + private Integer agingTestPassed; // 老化测试是否通过（0=是，1=否） + private String agingTestRemark; // 老化测试备注 + private String agingTestImg; // 老化测试照片 + private String expressName; // 快递名称 + private String expressNo; // 快递单号 + private String packageAndShipRemark; // 包装出货备注 + private String packageAndShipImg; // 包装出货照片 + private Long faultId; // 维修结论类型id + private String faultDescription; // 维修结论描述 + private String fillInTheReceiptRemark; // 填写回单备注 + private String fillInTheReceiptImg; // 填写回单照片 + private String moduleCode; // 模块代码 }