CP点间距离设置修改

src/main/java/com/dlbridge/jadp/plugins/cmpt/bean/Remark.java

+/**
+ * Copyright (c) 2015 by Neusoft Geexek
+ * All rights reserved.
+ */
+package com.dlbridge.jadp.plugins.cmpt.bean;
+/**
+ * @author shuxing.yang
+ *
+ * @date   2016-11-18 自定义项
+ *
+ * @description 
+ */
+public class Remark {
+
+	private int id;
+	
+	private String value;
+
+	public Remark(){}
+	
+	public Remark(int id, String value){
+		this.id = id;
+		this.value = value;
+	}
+	
+	public int getId() {
+		return id;
+	}
+
+	public void setId(int id) {
+		this.id = id;
+	}
+
+	public String getValue() {
+		return value;
+	}
+
+	public void setValue(String value) {
+		this.value = value;
+	}
+
+	@Override
+	public int hashCode() {
+		final int prime = 31;
+		int result = 1;
+		result = prime * result + id;
+		return result;
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj)
+			return true;
+		if (obj == null)
+			return false;
+		if (getClass() != obj.getClass())
+			return false;
+		Remark other = (Remark) obj;
+		if (id != other.id)
+			return false;
+		return true;
+	}
+
+	@Override
+	public String toString() {
+		return "{\"id\":\"" + id + "\", \"value\":\"" + value + "\"}";
+	}
+	
+	
+}

src/main/java/com/dlbridge/jadp/plugins/cmpt/bean/UserDefined.java

+package com.dlbridge.jadp.plugins.cmpt.bean;
+
+
+/**
+ * 
+ * @author ZHC
+ * 
+ *         报名自定义项POJO
+ */
+public class UserDefined {
+
+	/* id 自增长 */
+	private Integer id;
+
+	/* 报名自定义项ID */
+	private Integer userdefinedId;
+	//报名对应字段
+	private String definedColumnName;
+	//报名信息的值
+	private Object  definedValue;
+	/* 报名项所属的赛事 */
+	private Integer cmptId;
+	/* 报名项所属的项目Id */
+	private Integer roadId;
+	/* 报名项的名称 */
+	private Integer roleId;
+	/* 报名项的角色的Id */
+	private String name;
+	/* 是否必填 */
+	private int isRequired; // 0:不是必填项 1:是必填项
+	/* 创建报名是否是必选项 */
+	private Integer definedType;// 自定义项的类别：1：必选的 2：可选项 3：用户自己定义项
+	/* 自定义项的选项的值 */
+	private String definedContent;
+
+	private Integer dependOn;// ?
+	/* 提示信息 */
+	private String hint;
+	/* 自定义的展示形式：1，输入框 2.时间，3，文本域，4，单选框，5，多选框，6，下拉框，7图片， 8日期 */
+	private Integer optionType;
+	private Integer isTeam;
+	private Integer sort;
+
+	public UserDefined(){}
+	
+	public UserDefined(Integer cmptId, Integer roadId, String definedContent, Integer definedType, String hint
+			, int isRequired, Integer isTeam, String name, Integer optionType, Integer sort, Integer userdefinedId, Integer roleId){
+		this.cmptId=cmptId;
+		this.roadId=roadId;
+		this.definedContent=definedContent;
+		this.definedType=definedType;
+		this.hint=hint;
+		this.isRequired=isRequired;
+		this.isTeam=isTeam;
+		this.name=name;
+		this.optionType=optionType;
+		this.sort=sort;
+		this.userdefinedId=userdefinedId;
+		this.roleId=roleId;
+	}
+	
+	public Integer getRoleId() {
+		return roleId;
+	}
+
+	public void setRoleId(Integer roleId) {
+		this.roleId = roleId;
+	}
+
+	public UserDefined(int userDefinedId){
+		this.userdefinedId = userDefinedId;
+	}
+
+	public Integer getId() {
+		return id;
+	}
+
+
+	public void setId(Integer id) {
+		this.id = id;
+	}
+
+
+	public Integer getUserdefinedId() {
+		return userdefinedId;
+	}
+
+
+	public void setUserdefinedId(Integer userdefinedId) {
+		this.userdefinedId = userdefinedId;
+	}
+
+
+	public Integer getCmptId() {
+		return cmptId;
+	}
+
+
+	public void setCmptId(Integer cmptId) {
+		this.cmptId = cmptId;
+	}
+
+
+	public Integer getRoadId() {
+		return roadId;
+	}
+
+
+	public void setRoadId(Integer roadId) {
+		this.roadId = roadId;
+	}
+
+
+	public String getName() {
+		return name;
+	}
+
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+
+	public int getIsRequired() {
+		return isRequired;
+	}
+
+
+	public void setIsRequired(int isRequired) {
+		this.isRequired = isRequired;
+	}
+
+
+	public Integer getDefinedType() {
+		return definedType;
+	}
+
+
+	public void setDefinedType(Integer definedType) {
+		this.definedType = definedType;
+	}
+
+
+	public String getDefinedContent() {
+		return definedContent;
+	}
+
+
+	public void setDefinedContent(String definedContent) {
+		this.definedContent = definedContent;
+	}
+
+
+	public Integer getDependOn() {
+		return dependOn;
+	}
+
+
+	public void setDependOn(Integer dependOn) {
+		this.dependOn = dependOn;
+	}
+
+
+	public String getHint() {
+		return hint;
+	}
+
+
+	public void setHint(String hint) {
+		this.hint = hint;
+	}
+
+
+	public Integer getOptionType() {
+		return optionType;
+	}
+
+
+	public void setOptionType(Integer optionType) {
+		this.optionType = optionType;
+	}
+
+
+	public Integer getIsTeam() {
+		return isTeam;
+	}
+
+
+	public void setIsTeam(Integer isTeam) {
+		this.isTeam = isTeam;
+	}
+
+
+	public Integer getSort() {
+		return sort;
+	}
+
+
+	public void setSort(Integer sort) {
+		this.sort = sort;
+	}
+
+
+	public String getDefinedColumnName() {
+		return definedColumnName;
+	}
+
+
+	public void setDefinedColumnName(String definedColumnName) {
+		this.definedColumnName = definedColumnName;
+	}
+
+
+	public Object getDefinedValue() {
+		return definedValue;
+	}
+
+
+	public void setDefinedValue(Object definedValue) {
+		this.definedValue = definedValue;
+	}
+
+
+	@Override
+	public int hashCode() {
+		final int prime = 31;
+		int result = 1;
+		result = prime * result
+				+ ((userdefinedId == null) ? 0 : userdefinedId.hashCode());
+		return result;
+	}
+
+
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj)
+			return true;
+		if (obj == null)
+			return false;
+		if (getClass() != obj.getClass())
+			return false;
+		UserDefined other = (UserDefined) obj;
+		if (userdefinedId == null) {
+			if (other.userdefinedId != null)
+				return false;
+		} else if (!userdefinedId.equals(other.userdefinedId))
+			return false;
+		return true;
+	}
+
+	@Override
+	public String toString() {
+		return "UserDefined [id=" + id + ", userdefinedId=" + userdefinedId
+				+ ", definedColumnName=" + definedColumnName
+				+ ", definedValue=" + definedValue + ", cmptId=" + cmptId
+				+ ", roadId=" + roadId + ", name=" + name + ", isRequired="
+				+ isRequired + ", definedType=" + definedType
+				+ ", definedContent=" + definedContent + ", dependOn="
+				+ dependOn + ", hint=" + hint + ", optionType=" + optionType
+				+ ", isTeam=" + isTeam + ", sort=" + sort + "]";
+	}
+
+}

src/main/webapp/static/js/road-new.js

@@ -345,7 +345,9 @@ function getPlaceMakers(roadId) {
                         '<input type="checkbox" '+(e.isTime ? "checked=checked":"")+'></div>');
 
                     for (let j = 0; j < data.content.length; j++) {
-                        if(j>i) {
+                        if(j==i){
+                            continue;
+                        }else{
                             editCpDisHtml += '<div class="editCpDis-box" road-id="'+roadId+'">' +
                                 '                        <div class="dis-name">' +
                                 e.name+'-'+data.content[j].name +