From 22a759bc8e3987e16207b420ba0748a2f4cbe305 Mon Sep 17 00:00:00 2001 From: lihongjie0209 Date: Tue, 19 Mar 2024 10:50:17 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E8=AE=BE=E5=A4=87=E5=B7=A5?= =?UTF-8?q?=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/CreateDeviceWorkOrderDto.java | 40 ++++++++++- .../dto/DeviceWorkOrderDto.java | 67 +++++++++++++++++++ .../dto/UpdateDeviceWorkOrderDto.java | 35 +++++++++- .../entity/DeviceWorkOrderEntity.java | 6 ++ 4 files changed, 146 insertions(+), 2 deletions(-) diff --git a/src/main/java/cn/lihongjie/coal/deviceWorkOrder/dto/CreateDeviceWorkOrderDto.java b/src/main/java/cn/lihongjie/coal/deviceWorkOrder/dto/CreateDeviceWorkOrderDto.java index cb43b995..49c64172 100644 --- a/src/main/java/cn/lihongjie/coal/deviceWorkOrder/dto/CreateDeviceWorkOrderDto.java +++ b/src/main/java/cn/lihongjie/coal/deviceWorkOrder/dto/CreateDeviceWorkOrderDto.java @@ -2,7 +2,45 @@ package cn.lihongjie.coal.deviceWorkOrder.dto; import cn.lihongjie.coal.base.dto.OrgCommonDto; +import jakarta.persistence.ManyToOne; + import lombok.Data; +import org.hibernate.annotations.Comment; + +import java.time.LocalDateTime; +import java.util.List; + @Data -public class CreateDeviceWorkOrderDto extends OrgCommonDto {} +public class CreateDeviceWorkOrderDto extends OrgCommonDto { + + + + @Comment("提单人名称") + private String proposerName; + + @Comment("提单人联系方式") + private String proposerContact; + + + @ManyToOne + private String device; + + @Comment("工单时间") + private LocalDateTime time; + + @Comment("工单类型") + private String type; + + + @Comment("工单状态") + private String orderStatus; + + + + + private List details; + + + +} diff --git a/src/main/java/cn/lihongjie/coal/deviceWorkOrder/dto/DeviceWorkOrderDto.java b/src/main/java/cn/lihongjie/coal/deviceWorkOrder/dto/DeviceWorkOrderDto.java index 6bfe1ca1..f2e51b9f 100644 --- a/src/main/java/cn/lihongjie/coal/deviceWorkOrder/dto/DeviceWorkOrderDto.java +++ b/src/main/java/cn/lihongjie/coal/deviceWorkOrder/dto/DeviceWorkOrderDto.java @@ -1,12 +1,79 @@ package cn.lihongjie.coal.deviceWorkOrder.dto; import cn.lihongjie.coal.base.dto.OrgCommonDto; +import cn.lihongjie.coal.device.entity.DeviceEntity; +import cn.lihongjie.coal.deviceWorkOrderDetail.dto.DeviceWorkOrderDetailDto; +import cn.lihongjie.coal.user.entity.UserEntity; + +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; import lombok.Data; +import org.hibernate.annotations.ColumnDefault; +import org.hibernate.annotations.Comment; +import org.hibernate.annotations.Formula; + +import java.time.LocalDateTime; +import java.util.List; + @Data public class DeviceWorkOrderDto extends OrgCommonDto { + + @Comment("提单人名称") + private String proposerName; + + @Comment("提单人联系方式") + private String proposerContact; + + + @ManyToOne + private DeviceEntity device; + + @Comment("工单时间") + private LocalDateTime time; + + @Comment("工单类型") + private String type; + + @Formula( + "(select i.name\n" + + "from t_dictionary d,\n" + + " t_dictionary_item i\n" + + "where d.id = i.dictionary_id\n" + + " and d.code = 'device.workOrder.status'\n" + + " and i.code = type)") + private String typeName; + + @Comment("工单状态") + private String orderStatus; + + @Formula( + "(select i.name\n" + + "from t_dictionary d,\n" + + " t_dictionary_item i\n" + + "where d.id = i.dictionary_id\n" + + " and d.code = 'device.workOrder.status'\n" + + " and i.code = order_status)") + private String orderStatusName; + + @Comment("归档状态") + @ColumnDefault("'0'") private String archiveStatus; + @Formula( + "(select i.name\n" + + "from t_dictionary d,\n" + + " t_dictionary_item i\n" + + "where d.id = i.dictionary_id\n" + + " and d.code = 'archiveStatus'\n" + + " and i.code = archive_status)") private String archiveStatusName; + + + private List details; + + + @OneToMany + private List workers; } diff --git a/src/main/java/cn/lihongjie/coal/deviceWorkOrder/dto/UpdateDeviceWorkOrderDto.java b/src/main/java/cn/lihongjie/coal/deviceWorkOrder/dto/UpdateDeviceWorkOrderDto.java index dda416a6..b7639155 100644 --- a/src/main/java/cn/lihongjie/coal/deviceWorkOrder/dto/UpdateDeviceWorkOrderDto.java +++ b/src/main/java/cn/lihongjie/coal/deviceWorkOrder/dto/UpdateDeviceWorkOrderDto.java @@ -2,7 +2,40 @@ package cn.lihongjie.coal.deviceWorkOrder.dto; import cn.lihongjie.coal.base.dto.OrgCommonDto; +import jakarta.persistence.ManyToOne; + import lombok.Data; +import org.hibernate.annotations.Comment; + +import java.time.LocalDateTime; +import java.util.List; + @Data -public class UpdateDeviceWorkOrderDto extends OrgCommonDto {} +public class UpdateDeviceWorkOrderDto extends OrgCommonDto { + + @Comment("提单人名称") + private String proposerName; + + @Comment("提单人联系方式") + private String proposerContact; + + + @ManyToOne + private String device; + + @Comment("工单时间") + private LocalDateTime time; + + @Comment("工单类型") + private String type; + + + @Comment("工单状态") + private String orderStatus; + + + + + private List details; +} diff --git a/src/main/java/cn/lihongjie/coal/deviceWorkOrder/entity/DeviceWorkOrderEntity.java b/src/main/java/cn/lihongjie/coal/deviceWorkOrder/entity/DeviceWorkOrderEntity.java index 3648f704..d2e248e0 100644 --- a/src/main/java/cn/lihongjie/coal/deviceWorkOrder/entity/DeviceWorkOrderEntity.java +++ b/src/main/java/cn/lihongjie/coal/deviceWorkOrder/entity/DeviceWorkOrderEntity.java @@ -1,10 +1,12 @@ package cn.lihongjie.coal.deviceWorkOrder.entity; import cn.lihongjie.coal.base.entity.OrgCommonEntity; +import cn.lihongjie.coal.device.entity.DeviceEntity; import cn.lihongjie.coal.deviceWorkOrderDetail.entity.DeviceWorkOrderDetailEntity; import cn.lihongjie.coal.user.entity.UserEntity; import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; import jakarta.persistence.OneToMany; import lombok.Data; @@ -28,6 +30,10 @@ public class DeviceWorkOrderEntity extends OrgCommonEntity { @Comment("提单人联系方式") private String proposerContact; + + @ManyToOne + private DeviceEntity device; + @Comment("工单时间") private LocalDateTime time;