From b364530ee03f8b28b64863f6a633daf05dc94e91 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 18 十二月 2024 15:55:19 +0800
Subject: [PATCH] 查询站点的检验时长+产量工时bug+检验任务提交撤销+首页待办查最近七天的信息+高低温检验增加检验表字段
---
performance-server/src/main/java/com/yuanchu/mom/pojo/AuxiliaryOutputWorkingHours.java | 91 +++++++++++++++++++++++++++++++++------------
1 files changed, 67 insertions(+), 24 deletions(-)
diff --git a/performance-server/src/main/java/com/yuanchu/mom/pojo/AuxiliaryOutputWorkingHours.java b/performance-server/src/main/java/com/yuanchu/mom/pojo/AuxiliaryOutputWorkingHours.java
index bfb71ba..f22ebb5 100644
--- a/performance-server/src/main/java/com/yuanchu/mom/pojo/AuxiliaryOutputWorkingHours.java
+++ b/performance-server/src/main/java/com/yuanchu/mom/pojo/AuxiliaryOutputWorkingHours.java
@@ -1,18 +1,18 @@
package com.yuanchu.mom.pojo;
-import com.baomidou.mybatisplus.annotation.FieldFill;
-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 com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.yuanchu.mom.annotation.ValueTableShow;
+import com.yuanchu.mom.common.OrderBy;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
/**
* <p>
@@ -26,77 +26,120 @@
@Setter
@TableName("auxiliary_output_working_hours")
@ApiModel(value = "AuxiliaryOutputWorkingHours瀵硅薄", description = "鏃ュ伐鏃剁鐞嗙殑浜ч噺宸ユ椂")
-public class AuxiliaryOutputWorkingHours implements Serializable {
-
- private static final long serialVersionUID = 1L;
+public class AuxiliaryOutputWorkingHours extends OrderBy implements Serializable {
@TableId(value = "id", type = IdType.AUTO)
+ @ExcelIgnore
private Integer id;
- @ApiModelProperty("妫�娴嬮」鐩�")
+ @ApiModelProperty("妫�娴嬬埗椤�")
+ @ExcelProperty(value = "妫�娴嬬埗椤�")
@ValueTableShow(2)
- private String inspectProject;
+ private String inspectionItem;
+
+ @ApiModelProperty("妫�娴嬪瓙椤�")
+ @ExcelProperty(value = "妫�娴嬪瓙椤�")
+ @ValueTableShow(2)
+ private String inspectionItemSubclass;
+
+ @ApiModelProperty("鏍峰搧缂栧彿")
+ @ExcelProperty(value = "鏍峰搧缂栧彿")
+ @ValueTableShow(2)
+ private String sample;
@ApiModelProperty("鍔犵彮濮旀墭鍗曞彿")
- @ValueTableShow(3)
+ @ExcelProperty(value = "鍔犵彮濮旀墭鍗曞彿")
+ @ValueTableShow(6)
private String overtimeOrderNo;
@ApiModelProperty("鍔犵彮宸ユ椂")
- @ValueTableShow(4)
+ @ExcelProperty(value = "鍔犵彮宸ユ椂")
+ @ValueTableShow(7)
private Double overtimeWorkTime;
@ApiModelProperty("鍔犵彮鏁伴噺")
- @ValueTableShow(5)
+ @ExcelProperty(value = "鍔犵彮鏁伴噺")
+ @ValueTableShow(8)
private Integer overtimeAmount;
@ApiModelProperty("闈炲姞鐝鎵樺崟鍙�")
- @ValueTableShow(6)
+ @ExcelProperty(value = "闈炲姞鐝鎵樺崟鍙�")
+ @ValueTableShow(3)
private String orderNo;
@ApiModelProperty("闈炲姞鐝伐鏃�")
- @ValueTableShow(7)
+ @ExcelProperty(value = "闈炲姞鐝伐鏃�")
+ @ValueTableShow(4)
private Double workTime;
@ApiModelProperty("闈炲姞鐝暟閲�")
- @ValueTableShow(8)
+ @ExcelProperty(value = "闈炲姞鐝暟閲�")
+ @ValueTableShow(5)
private Integer amount;
@ApiModelProperty("浜ч噺宸ユ椂")
+ @ExcelProperty(value = "浜ч噺宸ユ椂")
@ValueTableShow(9)
private Double outputWorkTime;
@ApiModelProperty("鏃ユ湡")
+ @ExcelProperty(value = "鏃ユ湡")
@ValueTableShow(10)
- private LocalDateTime dateTime;
+ private String dateTime;
@ApiModelProperty("鍛ㄦ")
+ @ExcelProperty(value = "鍛ㄦ")
@ValueTableShow(11)
- private Integer week;
+ private String week;
@ApiModelProperty("鏄熸湡")
+ @ExcelProperty(value = "鏄熸湡")
@ValueTableShow(12)
private String weekDay;
- @ApiModelProperty("妫�娴嬩汉")
- @ValueTableShow(13)
- private String check;
+ @ApiModelProperty("妫�娴嬩汉id")
+ @ExcelIgnore
+ @TableField("`check`")
+ private Integer check;
@ApiModelProperty("鍒涘缓鏃堕棿")
@TableField(fill = FieldFill.INSERT)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @ExcelIgnore
private LocalDateTime createTime;
@ApiModelProperty("淇敼鏃堕棿")
@TableField(fill = FieldFill.INSERT_UPDATE)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @ExcelIgnore
private LocalDateTime updateTime;
@ApiModelProperty("鍒涘缓浜篿d")
@TableField(fill = FieldFill.INSERT)
+ @ExcelIgnore
private Integer createUser;
@ApiModelProperty("淇敼浜篿d")
@TableField(fill = FieldFill.INSERT_UPDATE)
+ @ExcelIgnore
private Integer updateUser;
@ApiModelProperty("宸ユ椂鍒嗙粍")
+ @ExcelIgnore
private String manHourGroup;
+
+ @ApiModelProperty("妫�楠岄」鐩甶d")
+ @ExcelIgnore
+ private Integer insProductId;
+
+ @ApiModelProperty("妫�娴嬫鏁�")
+ @ExcelProperty(value = "妫�娴嬫鏁�")
+ @ValueTableShow(2)
+ private Integer num;
+
+ @ValueTableShow(13)
+ @ApiModelProperty("妫�娴嬩汉")
+ @ExcelProperty(value = "妫�娴嬩汉")
+ @TableField(select = false,exist = false)
+ private String name;
}
--
Gitblit v1.9.3