指标定义添加编码和公式字段

src/main/java/com/keymobile/indicators/model/indicators/IndicatorsDef.java

-package com.keymobile.indicators.model.indicators;
-
-import java.io.Serializable;
-import java.util.Date;
-
-import org.springframework.data.annotation.Id;
-import org.springframework.data.mongodb.core.mapping.Document;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-/**
- * 指标定义表
- */
-@Document(collection="indi_def")
-public class IndicatorsDef implements Serializable{
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 1L;
-
-	@Id
-    private String id;
-	private String indiName;
-	private String indiCnName;
-	private int valueMapping = -1;
-	private String valueMappingName;
-	private String indiUnit;
-	private String dataType;
-	private String status;
-	
-	@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-	private Date createTime;
-	@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-	private Date updateTime;
-	
-	private String creator;
-	private String updator;
-	
-	public String getId() {
-		return id;
-	}
-	public void setId(String id) {
-		this.id = id;
-	}
-	public String getIndiName() {
-		return indiName;
-	}
-	public void setIndiName(String indiName) {
-		this.indiName = indiName;
-	}
-	public String getIndiCnName() {
-		return indiCnName;
-	}
-	public void setIndiCnName(String indiCnName) {
-		this.indiCnName = indiCnName;
-	}
-	public int getValueMapping() {
-		return valueMapping;
-	}
-	public void setValueMapping(int valueMapping) {
-		this.valueMapping = valueMapping;
-	}
-	public String getValueMappingName() {
-		return valueMappingName;
-	}
-	public void setValueMappingName(String valueMappingName) {
-		this.valueMappingName = valueMappingName;
-	}
-	public String getIndiUnit() {
-		return indiUnit;
-	}
-	public void setIndiUnit(String indiUnit) {
-		this.indiUnit = indiUnit;
-	}
-	public String getDataType() {
-		return dataType;
-	}
-	public void setDataType(String dataType) {
-		this.dataType = dataType;
-	}
-	public String getStatus() {
-		return status;
-	}
-	public void setStatus(String status) {
-		this.status = status;
-	}
-	public Date getCreateTime() {
-		return createTime;
-	}
-	public void setCreateTime(Date createTime) {
-		this.createTime = createTime;
-	}
-	public Date getUpdateTime() {
-		return updateTime;
-	}
-	public void setUpdateTime(Date updateTime) {
-		this.updateTime = updateTime;
-	}
-	public String getCreator() {
-		return creator;
-	}
-	public void setCreator(String creator) {
-		this.creator = creator;
-	}
-	public String getUpdator() {
-		return updator;
-	}
-	public void setUpdator(String updator) {
-		this.updator = updator;
-	}
-}
+package com.keymobile.indicators.model.indicators;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import org.springframework.data.annotation.Id;
+import org.springframework.data.mongodb.core.mapping.Document;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+/**
+ * 指标定义表
+ */
+@Document(collection="indi_def")
+public class IndicatorsDef implements Serializable{
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+
+	@Id
+    private String id;
+	private String indiName;
+	private String indiCnName;
+	private int valueMapping = -1;
+	private String valueMappingName;
+	private String indiUnit;
+	private String dataType;
+	private String status;
+	
+	@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+	private Date createTime;
+	@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+	private Date updateTime;
+	
+	private String creator;
+	private String updator;
+	
+	//添加基础指标编号和公式属性
+	private String indiCode;
+	private String indiFormula;
+	
+	public String getId() {
+		return id;
+	}
+	public void setId(String id) {
+		this.id = id;
+	}
+	public String getIndiName() {
+		return indiName;
+	}
+	public void setIndiName(String indiName) {
+		this.indiName = indiName;
+	}
+	public String getIndiCnName() {
+		return indiCnName;
+	}
+	public void setIndiCnName(String indiCnName) {
+		this.indiCnName = indiCnName;
+	}
+	public int getValueMapping() {
+		return valueMapping;
+	}
+	public void setValueMapping(int valueMapping) {
+		this.valueMapping = valueMapping;
+	}
+	public String getValueMappingName() {
+		return valueMappingName;
+	}
+	public void setValueMappingName(String valueMappingName) {
+		this.valueMappingName = valueMappingName;
+	}
+	public String getIndiUnit() {
+		return indiUnit;
+	}
+	public void setIndiUnit(String indiUnit) {
+		this.indiUnit = indiUnit;
+	}
+	public String getDataType() {
+		return dataType;
+	}
+	public void setDataType(String dataType) {
+		this.dataType = dataType;
+	}
+	public String getStatus() {
+		return status;
+	}
+	public void setStatus(String status) {
+		this.status = status;
+	}
+	public Date getCreateTime() {
+		return createTime;
+	}
+	public void setCreateTime(Date createTime) {
+		this.createTime = createTime;
+	}
+	public Date getUpdateTime() {
+		return updateTime;
+	}
+	public void setUpdateTime(Date updateTime) {
+		this.updateTime = updateTime;
+	}
+	public String getCreator() {
+		return creator;
+	}
+	public void setCreator(String creator) {
+		this.creator = creator;
+	}
+	public String getUpdator() {
+		return updator;
+	}
+	public void setUpdator(String updator) {
+		this.updator = updator;
+	}
+	public String getIndiCode() {
+		return indiCode;
+	}
+	public void setIndiCode(String indiCode) {
+		this.indiCode = indiCode;
+	}
+	public String getIndiFormula() {
+		return indiFormula;
+	}
+	public void setIndiFormula(String indiFormula) {
+		this.indiFormula = indiFormula;
+	}
+}