Ver código fonte

试验计划、工单master、工单detail表新增传感器字段,修改试验类型为varchar

liuwj 2 anos atrás
pai
commit
23697eb58f

+ 5 - 2
itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmGongdanDetail/entity/ItdmGongdanDetail.java

@@ -48,7 +48,7 @@ public class ItdmGongdanDetail implements Serializable {
 	@Excel(name = "实绩试验类型", width = 15, dicCode = "shiyan_type")
 	@Dict(dicCode = "shiyan_type")
     @ApiModelProperty(value = "实绩试验类型")
-    private java.lang.Integer shijiShiiyanType;
+    private java.lang.String shijiShiiyanType;
 	/**任务日期*/
 	@Excel(name = "任务日期", width = 15, format = "yyyy-MM-dd")
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
@@ -99,5 +99,8 @@ public class ItdmGongdanDetail implements Serializable {
     private java.util.Date updateTime;
 	/**所属部门*/
     @ApiModelProperty(value = "所属部门")
-    private java.lang.String sysOrgCode;
+    private java.lang.String sysOrgCode;/**传感器*/
+    @Excel(name = "传感器", width = 20)
+    @ApiModelProperty(value = "传感器")
+    private java.lang.String chuanganqi;
 }

+ 5 - 1
itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmGongdanMaster/entity/ItdmGongdanMaster.java

@@ -55,7 +55,7 @@ public class ItdmGongdanMaster implements Serializable {
 	/**试验类型*/
 	@Excel(name = "试验类型", width = 15)
     @ApiModelProperty(value = "试验类型")
-    private java.lang.Integer shiiyanType;
+    private java.lang.String shiiyanType;
 	/**试验员*/
 	@Excel(name = "试验员", width = 15)
     @ApiModelProperty(value = "试验员")
@@ -115,4 +115,8 @@ public class ItdmGongdanMaster implements Serializable {
 	/**所属部门*/
     @ApiModelProperty(value = "所属部门")
     private java.lang.String sysOrgCode;
+    /**传感器*/
+    @Excel(name = "传感器", width = 20)
+    @ApiModelProperty(value = "传感器")
+    private java.lang.String chuanganqi;
 }

+ 4 - 0
itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmTestPlan/entity/ItdmTestPlan.java

@@ -100,4 +100,8 @@ public class ItdmTestPlan implements Serializable {
 	@Excel(name = "备注", width = 15)
     @ApiModelProperty(value = "备注")
     private java.lang.String remark;
+    /**传感器*/
+    @Excel(name = "传感器", width = 20)
+    @ApiModelProperty(value = "传感器")
+    private java.lang.String chuanganqi;
 }