From b364530ee03f8b28b64863f6a633daf05dc94e91 Mon Sep 17 00:00:00 2001 From: zss <zss@example.com> Date: 星期三, 18 十二月 2024 15:55:19 +0800 Subject: [PATCH] 查询站点的检验时长+产量工时bug+检验任务提交撤销+首页待办查最近七天的信息+高低温检验增加检验表字段 --- inspect-server/src/main/java/com/yuanchu/mom/pojo/InsOrderUser.java | 81 +++++++++++++++++++++++----------------- 1 files changed, 46 insertions(+), 35 deletions(-) diff --git a/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsOrderUser.java b/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsOrderUser.java index 4fdcf42..220d4d5 100644 --- a/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsOrderUser.java +++ b/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsOrderUser.java @@ -1,51 +1,62 @@ package com.yuanchu.mom.pojo; -import com.baomidou.mybatisplus.annotation.*; - +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; import java.time.LocalDateTime; -import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; +import com.yuanchu.mom.common.OrderBy; +import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import lombok.Data; +import lombok.Getter; +import lombok.Setter; /** - * 妫�楠屽崟璐熻矗浜鸿褰� - * @TableName ins_order_user + * <p> + * 姣忔妫�楠屼换鍔¢噸澶嶈褰� + * </p> + * + * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃 + * @since 2024-09-14 10:08:31 */ -@TableName(value ="ins_order_user") -@Data -public class InsOrderUser implements Serializable { - /** - * - */ - @TableId(type = IdType.AUTO) +@Getter +@Setter +@TableName("ins_order_user") +@ApiModel(value = "InsOrderUser瀵硅薄", description = "姣忔妫�楠屼换鍔¢噸澶嶈褰�") +public class InsOrderUser extends OrderBy implements Serializable { + + @TableId(value = "id", type = IdType.AUTO) private Integer id; - /** - * 澶栭敭锛氭楠屽崟id - */ - private Integer insOrderId; + @ApiModelProperty("澶栭敭锛氭楠屼换鍔d") + private Integer insOrderStateId; - /** - * 澶栭敭锛氱敤鎴穒d 璐熻矗浜� - */ - private Integer userId; + @ApiModelProperty("鎻愪氦浜�") + private Integer submitUser; - /** - * 1锛氱‘璁� 0锛氭湭纭 - */ - private Integer state; + @TableField(select = false,exist = false) + private String submitUserName; - @ApiModelProperty("") - @TableField(fill = FieldFill.INSERT) - private Integer createUser; - /** - * - */ - @ApiModelProperty("鍒涘缓鏃堕棿") - @TableField(fill = FieldFill.INSERT) + @ApiModelProperty("鎻愪氦鏃堕棿") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private LocalDateTime createTime; -} \ No newline at end of file + private LocalDateTime submitTime; + + @ApiModelProperty("妫�楠屾鏁�") + private Integer num; + + @ApiModelProperty("澶囨敞") + private String note; + + @ApiModelProperty("鏉′欢") + private String term; + + @ApiModelProperty("鐞嗙敱") + private String tell; + + @ApiModelProperty("妫�楠屾椂闂�") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime insTime; +} -- Gitblit v1.9.3