From 21cbdad6f59a045910b22bb3bf771e47d56c096f Mon Sep 17 00:00:00 2001
From: cuilei <ray_tsu1@163.com>
Date: 星期五, 13 六月 2025 11:36:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcEquipmentPunch.java | 104 ++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 76 insertions(+), 28 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcEquipmentPunch.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcEquipmentPunch.java
index b64bcc4..9ae8010 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcEquipmentPunch.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcEquipmentPunch.java
@@ -1,22 +1,24 @@
package org.jeecg.modules.mdc.entity;
-import java.io.Serializable;
-import java.util.Date;
-
import cn.hutool.core.date.DatePattern;
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 lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
-import org.jeecg.common.aspect.annotation.Dict;
-import org.springframework.format.annotation.DateTimeFormat;
-import org.jeecgframework.poi.excel.annotation.Excel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
+import org.jeecg.common.aspect.annotation.Dict;
+import org.jeecg.common.system.base.entity.JeecgEntity;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
/**
* @Description: mdc_equipment_punch
@@ -29,7 +31,7 @@
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@ApiModel(value = "mdc_equipment_punch瀵硅薄", description = "mdc_equipment_punch")
-public class MdcEquipmentPunch implements Serializable {
+public class MdcEquipmentPunch extends JeecgEntity implements Serializable {
private static final long serialVersionUID = 1L;
/**
@@ -49,18 +51,18 @@
*/
@Excel(name = "鎵撳崱鐢ㄦ埛", width = 15)
@ApiModelProperty(value = "鎵撳崱鐢ㄦ埛")
+ @Dict(dicCode = "id", dictTable = "sys_user", dicText = "realname")
private String punchUser;
/**
* 鎵撳崱鐢ㄦ埛璐﹀彿
*/
- @Excel(name = "鎵撳崱鐢ㄦ埛璐﹀彿", width = 15)
+
@ApiModelProperty(value = "鎵撳崱鐢ㄦ埛璐﹀彿")
@TableField(exist = false)
private String punchUserRealName;
/**
* 鎵撳崱鐢ㄦ埛鍚嶇О
*/
- @Excel(name = "鎵撳崱鐢ㄦ埛鍚嶇О", width = 15)
@ApiModelProperty(value = "鎵撳崱鐢ㄦ埛鍚嶇О")
@TableField(exist = false)
private String punchUserUserName;
@@ -87,7 +89,7 @@
@ApiModelProperty(value = "璁板綍鏃ユ湡")
private String recordDate;
/**
- * 鐝
+ * 鐝
*/
@Excel(name = "鐝", width = 15)
@ApiModelProperty(value = "鐝")
@@ -107,7 +109,7 @@
@ApiModelProperty(value = "鏄惁缂哄崱")
private Integer isAbsent;
/**
- * 鏄惁杩熷埌
+ * 鏄惁杩熷埌锛�0鏈棭閫�锛�1鏃╅��锛�
*/
@Excel(name = "鏄惁杩熷埌", width = 15)
@ApiModelProperty(value = "鏄惁杩熷埌")
@@ -118,28 +120,74 @@
@Excel(name = "鏄惁鏃╅��", width = 15)
@ApiModelProperty(value = "鏄惁鏃╅��")
private Integer isEarly;
+
/**
- * 鍒涘缓浜�
+ * 鏃╃彮涓婄彮鎵撳崱鐜�
*/
- @ApiModelProperty(value = "鍒涘缓浜�")
- private String createBy;
+ @TableField(exist = false)
+ @Excel(name = "鏃╃彮涓婄彮鎵撳崱鐜�", width = 15)
+ @ApiModelProperty(value = "鏃╃彮涓婄彮鎵撳崱鐜�")
+ private BigDecimal morningShiftInRate;
+
/**
- * 鍒涘缓鏃堕棿
+ * 鏅氱彮涓婄彮鎵撳崱鐜�
*/
- @JsonFormat(timezone = "GMT+8", pattern = DatePattern.NORM_DATETIME_PATTERN)
- @DateTimeFormat(pattern = DatePattern.NORM_DATETIME_PATTERN)
- @ApiModelProperty(value = "鍒涘缓鏃堕棿")
- private Date createTime;
+ @TableField(exist = false)
+ @Excel(name = "鏅氱彮涓婄彮鎵撳崱鐜�", width = 15)
+ @ApiModelProperty(value = "鏅氱彮涓婄彮鎵撳崱鐜�")
+ private BigDecimal eveningShiftInRate;
+
/**
- * 鏇存柊浜�
+ * 鏃╃彮涓嬬彮鎵撳崱鐜�
*/
- @ApiModelProperty(value = "鏇存柊浜�")
- private String updateBy;
+ @TableField(exist = false)
+ @Excel(name = "鏃╃彮涓嬬彮鎵撳崱鐜�", width = 15)
+ @ApiModelProperty(value = "鏃╃彮涓嬬彮鎵撳崱鐜�")
+ private BigDecimal morningShiftOutRate;
+
/**
- * 鏇存柊鏃堕棿
+ * 鏅氱彮涓嬬彮鎵撳崱鐜�
*/
- @JsonFormat(timezone = "GMT+8", pattern = DatePattern.NORM_DATETIME_PATTERN)
- @DateTimeFormat(pattern = DatePattern.NORM_DATETIME_PATTERN)
- @ApiModelProperty(value = "鏇存柊鏃堕棿")
- private Date updateTime;
+ @TableField(exist = false)
+ @Excel(name = "鏅氱彮涓嬬彮鎵撳崱鐜�", width = 15)
+ @ApiModelProperty(value = "鏅氱彮涓嬬彮鎵撳崱鐜�")
+ private BigDecimal eveningShiftOutRate;
+
+ /**
+ * 鐧界彮涓婄彮鎵撳崱璁惧鏁伴噺
+ */
+ @TableField(exist = false)
+ @Excel(name = "鐧界彮涓婄彮鎵撳崱璁惧鏁伴噺", width = 15)
+ @ApiModelProperty(value = "鐧界彮涓婄彮鎵撳崱璁惧鏁伴噺")
+ private Integer morningShiftInDeviceNum;
+
+ /**
+ * 鐧界彮涓嬬彮鎵撳崱璁惧鏁伴噺
+ */
+ @TableField(exist = false)
+ @Excel(name = "鐧界彮涓嬬彮鎵撳崱璁惧鏁伴噺", width = 15)
+ @ApiModelProperty(value = "鐧界彮涓嬬彮鎵撳崱璁惧鏁伴噺")
+ private Integer morningShiftOutDeviceNum;
+ /**
+ * 澶滅彮涓婄彮鎵撳崱璁惧鏁伴噺
+ */
+ @TableField(exist = false)
+ @Excel(name = "澶滅彮涓婄彮鎵撳崱璁惧鏁伴噺", width = 15)
+ @ApiModelProperty(value = "澶滅彮涓婄彮鎵撳崱璁惧鏁伴噺")
+ private Integer eveningShiftInDeviceNum;
+ /**
+ * 澶滅彮涓嬬彮鎵撳崱璁惧鏁伴噺
+ */
+ @TableField(exist = false)
+ @Excel(name = "澶滅彮涓嬬彮鎵撳崱璁惧鏁伴噺", width = 15)
+ @ApiModelProperty(value = "澶滅彮涓嬬彮鎵撳崱璁惧鏁伴噺")
+ private Integer eveningShiftOutDeviceNum;
+ /**
+ * 璁惧鎬绘暟
+ */
+ @TableField(exist = false)
+ @Excel(name = "璁惧鎬绘暟", width = 15)
+ @ApiModelProperty(value = "璁惧鎬绘暟")
+ private Integer deviceCountNum;
+
}
--
Gitblit v1.9.3