From 70596b68349550f26666f605312716c29e572552 Mon Sep 17 00:00:00 2001 From: liwen Date: Tue, 30 Jan 2024 15:19:57 +0800 Subject: [PATCH 1/2] =?UTF-8?q?update:=20=E5=8D=AB=E7=94=9F=E8=87=AA?= =?UTF-8?q?=E6=9F=A5=E8=AE=A1=E5=88=92=E5=AF=BC=E5=87=BA=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/hnac/hzims/safeproduct/entity/HygienePlanEntity.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/entity/HygienePlanEntity.java b/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/entity/HygienePlanEntity.java index 943287e..a8393d4 100644 --- a/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/entity/HygienePlanEntity.java +++ b/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/entity/HygienePlanEntity.java @@ -1,5 +1,6 @@ package com.hnac.hzims.safeproduct.entity; +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; @@ -20,6 +21,7 @@ import java.util.Date; */ @Data @EqualsAndHashCode(callSuper = true) +@ExcelIgnoreUnannotated @TableName("hzims_hygiene_plan") @ApiModel(value = "卫生自查计划实体类") public class HygienePlanEntity extends BaseEntity { From bbffae4494a608db27a547e15d766d945b620f6b Mon Sep 17 00:00:00 2001 From: haungxing <1203316822@qq.com> Date: Tue, 30 Jan 2024 16:00:52 +0800 Subject: [PATCH 2/2] =?UTF-8?q?#=20=E6=97=A5=E5=B8=B8=E7=BB=B4=E6=8A=A4?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=B7=BB=E5=8A=A0=E7=A5=A8=E6=8D=AE=E5=90=8D?= =?UTF-8?q?=E7=A7=B0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operational/maintenance/entity/OperMaintenanceTaskEntity.java | 3 +++ hzims-service/operational/src/main/resources/db/1.0.1.sql | 2 ++ 2 files changed, 5 insertions(+) diff --git a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/maintenance/entity/OperMaintenanceTaskEntity.java b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/maintenance/entity/OperMaintenanceTaskEntity.java index 2f9fa11..a06949a 100644 --- a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/maintenance/entity/OperMaintenanceTaskEntity.java +++ b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/maintenance/entity/OperMaintenanceTaskEntity.java @@ -141,6 +141,9 @@ public class OperMaintenanceTaskEntity extends TenantEntity { @JsonSerialize(nullsUsing = NullSerializer.class) private Long ticketId; + @ApiModelProperty(value = "票据名称") + private String ticketName; + @ApiModelProperty(value = "延期状态") @JsonSerialize(nullsUsing = NullSerializer.class) private Integer delayStatus; diff --git a/hzims-service/operational/src/main/resources/db/1.0.1.sql b/hzims-service/operational/src/main/resources/db/1.0.1.sql index 962bc44..a981cd1 100644 --- a/hzims-service/operational/src/main/resources/db/1.0.1.sql +++ b/hzims-service/operational/src/main/resources/db/1.0.1.sql @@ -7,3 +7,5 @@ alter table `hzims_oper_maintenance_task` add column `update_user_name` varchar( alter table `hzims_oper_maintenance_plan` add column `disposer_name` varchar(255) comment '执行人姓名'; alter table `hzims_oper_maintenance_plan` add column `create_user_name` varchar(255) comment '创建人姓名'; alter table `hzims_oper_maintenance_plan` add column `update_user_name` varchar(255) comment '更新人姓名'; +-- 日常维护任务添加工作票名称 +alter table `hzims_oper_maintenance_task` add COLUMN `ticket_name` VARCHAR(255) comment '票据名称';