演示问题修复

yun-zuoyi
钮海涛 4 years ago
parent 63a8aef96d
commit 4f697d51ec

@ -17,6 +17,7 @@ import lombok.EqualsAndHashCode;
import javax.persistence.Column; import javax.persistence.Column;
import javax.persistence.Entity; import javax.persistence.Entity;
import javax.persistence.Lob;
import javax.persistence.Table; import javax.persistence.Table;
import java.util.List; import java.util.List;
@ -101,6 +102,16 @@ public class ImportDetail extends BaseAPS {
@FieldAnnotation(relation = "Project", property = false) @FieldAnnotation(relation = "Project", property = false)
private Long projectId; private Long projectId;
@Lob
@Column(name="INNER_FILTER")
@ApiParam(value ="内部对象筛选")
private String innerFilter;
@Lob
@Column(name="OUTTER_FILTER")
@ApiParam(value ="外部对象筛选")
private String outterFilter;
@FieldAnnotation(property = false) @FieldAnnotation(property = false)
private transient ImportDataModel model; private transient ImportDataModel model;

@ -75,7 +75,7 @@ public class StandOperation extends BaseAPS {
@Column(name="TYPE") @Column(name="TYPE")
@ApiParam(value ="工序类型") @ApiParam(value ="工序类型")
private ApsEnumUtil.SANLUX_OPERATION_TYPE type; private ApsEnumUtil.SANLUX_OPERATION_TYPE type = ApsEnumUtil.SANLUX_OPERATION_TYPE.NORMAL;
public WorkShop getWorkShop() { return BeanRelation.get(this, EStandOperation.WorkShop); } public WorkShop getWorkShop() { return BeanRelation.get(this, EStandOperation.WorkShop); }

@ -1260,7 +1260,8 @@ public class ApsEnumUtil {
@JsonFormat(shape = JsonFormat.Shape.OBJECT) @JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum SANLUX_OPERATION_TYPE { public enum SANLUX_OPERATION_TYPE {
NORMAL("NORMAL", "正常工序"), NORMAL("NORMAL", "正常工序"),
FOUR_SULFIDATION("FOUR_SULFIDATION", "四车间硫化"); FOUR_SULFIDATION("FOUR_SULFIDATION", "四车间硫化"),
FOUR_TRAINBEARER("FOUR_TRAINBEARER", "四车间牵纱");
private String value; private String value;
private String description; private String description;

Loading…
Cancel
Save