eims-master.git

			@@ -2,6 +2,7 @@

			import java.util.Date;
			import com.fasterxml.jackson.annotation.JsonFormat;
			import org.dromara.common.mybatis.core.domain.BaseEntity;
			import org.dromara.common.translation.annotation.Translation;
			import org.dromara.common.translation.constant.TransConstant;
			import org.dromara.eims.domain.EimsRepairRes;
			@@ -15,7 +16,7 @@
			import java.io.Serial;
			import java.io.Serializable;
			import java.util.Date;

			import java.util.List;


			/**
			@@ -27,7 +28,7 @@
			@Data
			@ExcelIgnoreUnannotated
			@AutoMapper(target = EimsRepairRes.class)
			public class EimsRepairResVo implements Serializable {
			public class EimsRepairResVo extends BaseEntity implements Serializable {

			@Serial
			private static final long serialVersionUID = 1L;
			@@ -43,6 +44,10 @@
			*/
			@ExcelProperty(value = "报修单id")
			private Long reqId;

			private Long reqUser;//报修人

			private Long reqDept;//报修人部门

			/**
			* 维修单号
			@@ -124,12 +129,18 @@
			@ExcelProperty(value = "备注")
			private String remark;

			/**
			* 评价id
			*/
			private Long fbId;


			// 关联表字段
			private String reqType;//报修类型
			@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
			private Date reqTime;//报修时间
			private String equName;//设备名称
			private String assetNo;//
			private String fixtureName;//工具名称
			private String faultType;//故障类别
			private String reqDeptName;//报修部门
			@@ -138,5 +149,7 @@
			@Translation(type = TransConstant.REPAIR_REQ_ID_TO_CODE, mapper = "reqId")
			private String reqCode;//报修编码

			private List<EimsSpareVo> spareParts;


			}