[new] deleted

Author: VonChange

jdbc-mybatis/src/main/java/com/vonchange/jdbc/annotation/DeleteProperty.java

@@ -212,10 +212,8 @@ public static  <T> SqlParam generateInsertSql(T entity, boolean ifNullInsert, bo
         for (EntityField entityField : entityFieldList) {
             if(entityField.getIfColumn()){
                 value= BeanUtil.getProperty(entity,entityField.getFieldName());
-                if(entityField.getVersion()){
-                    if(null==value){
-                        value=1;
-                    }
+                if(entityField.getVersion()&&null==value){
+                    value=1;
                 }
                 if(insertColumn(entityField,value,ifNullInsert)){
                     columns.add(entityField.getColumnName());

jdbc-mybatis/src/main/java/com/vonchange/jdbc/core/CrudUtil.java

@@ -13,7 +13,6 @@ public class EntityField extends BaseEntityField{
 	private Boolean insertNot=false;
 
 	private Boolean version=false;
-	private Boolean delete=false;
 
 
 	public Boolean getIfId() {
@@ -48,11 +47,5 @@ public void setInsertNot(Boolean insertNot) {
 		this.insertNot = insertNot;
 	}
 
-	public Boolean getDelete() {
-		return delete;
-	}
 
-	public void setDelete(Boolean delete) {
-		this.delete = delete;
-	}
 }

jdbc-mybatis/src/main/java/com/vonchange/jdbc/model/EntityField.java

@@ -19,7 +19,6 @@ public class EntityInfo {
 
 	private Map<String,Integer> fieldMap;
 	private Map<String,Integer> columnMap;
-	private EntityField logicDeleteField;
 
 	public String getEntityName() {
 		return entityName;
@@ -94,11 +93,5 @@ public void setColumnReturns(List<String> columnReturns) {
 		this.columnReturns = columnReturns;
 	}
 
-	public EntityField getLogicDeleteField() {
-		return logicDeleteField;
-	}
 
-	public void setLogicDeleteField(EntityField logicDeleteField) {
-		this.logicDeleteField = logicDeleteField;
-	}
 }

jdbc-mybatis/src/main/java/com/vonchange/jdbc/model/EntityInfo.java

@@ -6,7 +6,6 @@
 import com.vonchange.common.util.bean.BeanUtil;
 import com.vonchange.common.util.bean.MethodAccessData;
 import com.vonchange.jdbc.annotation.ColumnNot;
-import com.vonchange.jdbc.annotation.DeleteProperty;
 import com.vonchange.jdbc.annotation.InsertOnlyProperty;
 import com.vonchange.jdbc.annotation.InsertReturn;
 import com.vonchange.jdbc.model.BaseEntityField;
@@ -182,13 +181,8 @@ private static synchronized   void initEntity(Class<?> clazz) {
                     columnReturns.add(columnName);
                     continue;
                 }
-                if(annotation instanceof DeleteProperty){
-                    entityField.setDelete(true);
-                    continue;
-                }
                 if (annotation instanceof Transient ||annotation instanceof javax.persistence.Transient||annotation instanceof ColumnNot) {
                     entityField.setIfColumn(false);
-
                 }
             }
             entityFieldList.add(entityField);