From ff9dc3f8220dfeb9acddd2f86c28718001e70314 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期一, 30 十月 2023 09:44:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/RepairOrderActualWorkHours.java | 125 ++++++++++++++++++++++++++++++-----------
1 files changed, 92 insertions(+), 33 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/RepairOrderActualWorkHours.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/RepairOrderActualWorkHours.java
index c9ede15..e508dc3 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/RepairOrderActualWorkHours.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/RepairOrderActualWorkHours.java
@@ -1,6 +1,7 @@
package org.jeecg.modules.eam.entity;
import java.io.Serializable;
+
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
@@ -13,49 +14,89 @@
import org.jeecg.modules.eam.vo.UsetTeamVo;
import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel;
+
import java.util.Date;
+
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
+
import java.io.UnsupportedEncodingException;
import java.util.List;
/**
* @Description: 瀹為檯宸ユ椂
* @Author: jeecg-boot
- * @Date: 2023-04-25
+ * @Date: 2023-04-25
* @Version: V1.0
*/
@Data
@TableName("mom_eam_repair_order_actual_work_hours")
-@ApiModel(value="mom_eam_repair_order_actual_work_hours瀵硅薄", description="瀹為檯宸ユ椂")
+@ApiModel(value = "mom_eam_repair_order_actual_work_hours瀵硅薄", description = "瀹為檯宸ユ椂")
@Accessors(chain = true)
public class RepairOrderActualWorkHours implements Serializable {
private static final long serialVersionUID = 1L;
- /**涓婚敭id*/
- @TableId(type = IdType.ASSIGN_ID)
+ /**
+ * 涓婚敭id
+ */
+ @TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "涓婚敭id")
private String id;
- /**鐢ㄦ埛id*/
- @Excel(name = "鐢ㄦ埛id", width = 15)
+ /**
+ * 鐢ㄦ埛id
+ */
+ @Excel(name = "鐢ㄦ埛id", width = 15)
@ApiModelProperty(value = "鐢ㄦ埛id")
- @Dict(dictTable = "sys_user",dicCode = "id",dicText = "realname")
+ @Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
private String userId;
- /**缁翠慨宸ュ崟id*/
+ /**
+ * 缁翠慨宸ュ崟id
+ */
@ApiModelProperty(value = "缁翠慨宸ュ崟id")
private String repairOrderId;
- /**淇悗姹囨姤鍗昳d*/
+ /**
+ * 淇悗姹囨姤鍗昳d
+ */
@ApiModelProperty(value = "淇悗姹囨姤鍗昳d")
private String reportAfterRepairId;
- /**鐝粍id*/
- @Excel(name = "鐝粍id", width = 15)
+ /**
+ * 鐝粍id
+ */
+ @Excel(name = "鐝粍id", width = 15)
@ApiModelProperty(value = "鐝粍id")
- @Dict(dictTable = "mom_base_team",dicCode = "id",dicText = "name")
+ @Dict(dictTable = "mom_base_team", dicCode = "id", dicText = "name")
private String teamId;
- /**瀹為檯宸ユ椂*/
- @Excel(name = "瀹為檯宸ユ椂", width = 15)
+
+ @Excel(name = "鐝粍id", width = 15)
+ @ApiModelProperty(value = "鐝粍id")
+ @Dict(dicCode = "yn")
+ private String principalContractor;
+ /**
+ * 瀹為檯宸ユ椂
+ */
+ @Excel(name = "瀹為檯宸ユ椂", width = 15)
@ApiModelProperty(value = "瀹為檯宸ユ椂")
private java.math.BigDecimal actualHour;
+
+ @ApiModelProperty(value = "寮�濮嬫椂闂�")
+ @Excel(name = "寮�濮嬫椂闂�", width = 20, format = "yyyy-MM-dd HH:mm")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
+ private java.util.Date startTime;
+
+ @ApiModelProperty(value = "缁撴潫鏃堕棿")
+ @Excel(name = "缁撴潫鏃堕棿", width = 20, format = "yyyy-MM-dd HH:mm")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
+ private java.util.Date endTime;
+
+ /**
+ * 瀹為檯宸ユ椂
+ */
+ @Excel(name = "鐞嗚宸ユ椂", width = 15)
+ @ApiModelProperty(value = "鐞嗚宸ユ椂")
+ private String theoreticalTime;
+
/**
* 鍒涘缓浜�
*/
@@ -87,40 +128,58 @@
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private java.util.Date updateTime;
- /**绉熸埛id*/
- @Excel(name = "绉熸埛id", width = 15)
+ /**
+ * 绉熸埛id
+ */
+ @Excel(name = "绉熸埛id", width = 15)
@ApiModelProperty(value = "绉熸埛id")
private String tenantId;
- /**鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)*/
- @Excel(name = "鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)", width = 15)
+ /**
+ * 鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)
+ */
+ @Excel(name = "鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)", width = 15)
@ApiModelProperty(value = "鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)")
- private Integer delFlag= CommonConstant.DEL_FLAG_0;
- /**澶囨敞*/
- @Excel(name = "澶囨敞", width = 15)
+ private Integer delFlag = CommonConstant.DEL_FLAG_0;
+ /**
+ * 澶囨敞
+ */
+ @Excel(name = "澶囨敞", width = 15)
@ApiModelProperty(value = "澶囨敞")
private String remark;
- /**澶囩敤瀛楁1*/
- @Excel(name = "澶囩敤瀛楁1", width = 15)
+ /**
+ * 澶囩敤瀛楁1
+ */
+ @Excel(name = "澶囩敤瀛楁1", width = 15)
@ApiModelProperty(value = "澶囩敤瀛楁1")
private String repairOrderActualHoursUda1;
- /**澶囩敤瀛楁2*/
- @Excel(name = "澶囩敤瀛楁2", width = 15)
+ /**
+ * 澶囩敤瀛楁2
+ */
+ @Excel(name = "澶囩敤瀛楁2", width = 15)
@ApiModelProperty(value = "澶囩敤瀛楁2")
private String repairOrderActualHoursUda2;
- /**澶囩敤瀛楁3*/
- @Excel(name = "澶囩敤瀛楁3", width = 15)
+ /**
+ * 澶囩敤瀛楁3
+ */
+ @Excel(name = "澶囩敤瀛楁3", width = 15)
@ApiModelProperty(value = "澶囩敤瀛楁3")
private String repairOrderActualHoursUda3;
- /**澶囩敤瀛楁4*/
- @Excel(name = "澶囩敤瀛楁4", width = 15)
+ /**
+ * 澶囩敤瀛楁4
+ */
+ @Excel(name = "澶囩敤瀛楁4", width = 15)
@ApiModelProperty(value = "澶囩敤瀛楁4")
private String repairOrderActualHoursUda4;
- /**澶囩敤瀛楁5*/
- @Excel(name = "澶囩敤瀛楁5", width = 15)
+ /**
+ * 澶囩敤瀛楁5
+ */
+ @Excel(name = "澶囩敤瀛楁5", width = 15)
@ApiModelProperty(value = "澶囩敤瀛楁5")
private String repairOrderActualHoursUda5;
- /**鐘舵�� 0 绂佺敤 1 鍚敤*/
- @Excel(name = "鐘舵�� 0 绂佺敤 1 鍚敤", width = 15)
+ /**
+ * 鐘舵�� 0 绂佺敤 1 鍚敤
+ */
+ @Excel(name = "鐘舵�� 0 绂佺敤 1 鍚敤", width = 15)
@ApiModelProperty(value = "鐘舵�� 0 绂佺敤 1 鍚敤")
private String status;
--
Gitblit v1.9.3